From 569722b9d7c0b8bc61a66a7881cc2b95d0118284 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Mon, 17 Feb 2020 00:07:16 -0500
Subject: [PATCH] apply saDrugs() function
---
src/facilities/farmyard/farmyardReport.tw | 8 ++++----
src/facilities/nursery/nurseryWidgets.js | 10 +++++-----
src/uncategorized/arcadeReport.tw | 4 ++--
src/uncategorized/brothelReport.tw | 8 ++++----
src/uncategorized/cellblockReport.tw | 8 ++++----
src/uncategorized/clinicReport.tw | 8 ++++----
src/uncategorized/clubReport.tw | 8 ++++----
src/uncategorized/dairyReport.tw | 8 ++++----
src/uncategorized/fullReport.tw | 4 ++--
src/uncategorized/masterSuiteReport.tw | 4 ++--
src/uncategorized/saLiveWithHG.tw | 4 ++--
src/uncategorized/schoolroomReport.tw | 8 ++++----
src/uncategorized/servantsQuartersReport.tw | 8 ++++----
src/uncategorized/spaReport.tw | 8 ++++----
14 files changed, 49 insertions(+), 49 deletions(-)
diff --git a/src/facilities/farmyard/farmyardReport.tw b/src/facilities/farmyard/farmyardReport.tw
index 72e3b5db29f..31c5009c61c 100644
--- a/src/facilities/farmyard/farmyardReport.tw
+++ b/src/facilities/farmyard/farmyardReport.tw
@@ -178,7 +178,7 @@
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
- <<include "SA drugs">>
+ <<= saDrugs($slaves[$i])>>
<<include "SA relationships">>
<<include "SA rivalries">>
<br><<include "SA devotion">>
@@ -188,7 +188,7 @@
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
- <<include "SA drugs">>
+ <<run saDrugs($slaves[$i])>>
<<include "SA relationships">>
<<include "SA rivalries">>
<<include "SA devotion">>
@@ -255,7 +255,7 @@
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
- <<include "SA drugs">>
+ <<= saDrugs($slaves[$i])>>
<<include "SA relationships">>
<<include "SA rivalries">>
<br><<include "SA devotion">>
@@ -267,7 +267,7 @@
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
- <<include "SA drugs">>
+ <<run saDrugs($slaves[$i])>>
<<include "SA relationships">>
<<include "SA rivalries">>
<<include "SA devotion">>
diff --git a/src/facilities/nursery/nurseryWidgets.js b/src/facilities/nursery/nurseryWidgets.js
index 40bcc3a8455..d50ba1e6f30 100644
--- a/src/facilities/nursery/nurseryWidgets.js
+++ b/src/facilities/nursery/nurseryWidgets.js
@@ -19080,17 +19080,17 @@ App.Facilities.Nursery.nurseryReport = function nurseryReport() {
r += `<<include "SA rules">>`;
r += `<<include "SA diet">>`;
r += `<<include "SA long term effects">>`;
- r += `<<include "SA drugs">>`;
+ r += `${saDrugs(Matron)}`;
r += `<<include "SA relationships">>`;
r += `<<include "SA rivalries">>`;
r += `<br><<include "SA devotion">>`;
} else {
r += `<<silently>>
- ${saChoosesOwnClothes(Matron)}
+ ${saChoosesOwnClothes(Matron)};
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
- <<include "SA drugs">>
+ ${saDrugs(Matron);
<<include "SA relationships">>
<<include "SA rivalries">>
<<include "SA devotion">>
@@ -19156,7 +19156,7 @@ App.Facilities.Nursery.nurseryReport = function nurseryReport() {
r += `${saChoosesOwnClothes(slave)} ${saRules(slave)}`;
r += `<<include "SA diet">>`; // TODO:
r += `<<include "SA long term effects">>`; // TODO:
- r += `<<include "SA drugs">>`; // TODO:
+ r += `${saDrugs(slave)}`; // TODO:
r += `<<include "SA relationships">>`; // TODO:
r += `<<include "SA rivalries">>`; // TODO:
r += `<br><<include "SA devotion">>`; // TODO:
@@ -19165,7 +19165,7 @@ App.Facilities.Nursery.nurseryReport = function nurseryReport() {
r += `${choosesOwnJob(slave)} ${saNanny(slave)} ${saChoosesOwnClothes(slave)} ${saRules(slave)}`;
r += `<<include "SA diet">>`;
r += `<<include "SA long term effects">>`;
- r += `<<include "SA drugs">>`;
+ r += `${saDrugs(slave)}`;
r += `<<include "SA relationships">>`;
r += `<<include "SA rivalries">>`;
r += `<<include "SA devotion">>`;
diff --git a/src/uncategorized/arcadeReport.tw b/src/uncategorized/arcadeReport.tw
index 40a1774a99d..b9de81bf9a6 100644
--- a/src/uncategorized/arcadeReport.tw
+++ b/src/uncategorized/arcadeReport.tw
@@ -144,7 +144,7 @@
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
- <<include "SA drugs">>
+ <<= saDrugs($slaves[$i])>>
<<include "SA relationships">>
<<include "SA rivalries">>
<br><<include "SA devotion">>
@@ -153,7 +153,7 @@
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
- <<include "SA drugs">>
+ <<run saDrugs($slaves[$i])>>
<<include "SA relationships">>
<<include "SA rivalries">>
<<include "SA devotion">>
diff --git a/src/uncategorized/brothelReport.tw b/src/uncategorized/brothelReport.tw
index d72678b26bd..46c4650b86f 100644
--- a/src/uncategorized/brothelReport.tw
+++ b/src/uncategorized/brothelReport.tw
@@ -201,7 +201,7 @@
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
- <<include "SA drugs">>
+ <<= saDrugs($slaves[$i])>>
<<include "SA relationships">>
<<include "SA rivalries">>
<br><<include "SA devotion">>
@@ -212,7 +212,7 @@
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
- <<include "SA drugs">>
+ <<run saDrugs($slaves[$i])>>
<<include "SA relationships">>
<<include "SA rivalries">>
<<include "SA devotion">>
@@ -292,7 +292,7 @@
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
- <<include "SA drugs">>
+ <<= saDrugs($slaves[$i])>>
<<include "SA relationships">>
<<include "SA rivalries">>
<br><<include "SA devotion">>
@@ -304,7 +304,7 @@
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
- <<include "SA drugs">>
+ <<run saDrugs($slaves[$i])>>
<<include "SA relationships">>
<<include "SA rivalries">>
<<include "SA devotion">>
diff --git a/src/uncategorized/cellblockReport.tw b/src/uncategorized/cellblockReport.tw
index 5251f5809c2..fc7d032af43 100644
--- a/src/uncategorized/cellblockReport.tw
+++ b/src/uncategorized/cellblockReport.tw
@@ -145,7 +145,7 @@
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
- <<include "SA drugs">>
+ <<= saDrugs($slaves[$i])>>
<<include "SA relationships">>
<<include "SA rivalries">>
<br><<include "SA devotion">>
@@ -156,7 +156,7 @@
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
- <<include "SA drugs">>
+ <<run saDrugs($slaves[$i])>>
<<include "SA relationships">>
<<include "SA rivalries">>
<<include "SA devotion">>
@@ -269,7 +269,7 @@
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
- <<include "SA drugs">>
+ <<= saDrugs($slaves[$i])>>
<<include "SA relationships">>
<<include "SA rivalries">>
<br><<include "SA devotion">>
@@ -280,7 +280,7 @@
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
- <<include "SA drugs">>
+ <<run saDrugs($slaves[$i])>>
<<include "SA relationships">>
<<include "SA rivalries">>
<<include "SA devotion">>
diff --git a/src/uncategorized/clinicReport.tw b/src/uncategorized/clinicReport.tw
index 1ffad45a186..98b84d44f1c 100644
--- a/src/uncategorized/clinicReport.tw
+++ b/src/uncategorized/clinicReport.tw
@@ -217,7 +217,7 @@
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
- <<include "SA drugs">>
+ <<= saDrugs($slaves[$i])>>
<<include "SA relationships">>
<<include "SA rivalries">>
<br><<include "SA devotion">>
@@ -228,7 +228,7 @@
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
- <<include "SA drugs">>
+ <<run saDrugs($slaves[$i])>>
<<include "SA relationships">>
<<include "SA rivalries">>
<<include "SA devotion">>
@@ -363,7 +363,7 @@
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
- <<include "SA drugs">>
+ <<= saDrugs($slaves[$i])>>
<<include "SA relationships">>
<<include "SA rivalries">>
<br><<include "SA devotion">>
@@ -375,7 +375,7 @@
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
- <<include "SA drugs">>
+ <<run saDrugs($slaves[$i])>>
<<include "SA relationships">>
<<include "SA rivalries">>
<<include "SA devotion">>
diff --git a/src/uncategorized/clubReport.tw b/src/uncategorized/clubReport.tw
index 62e3e1e557c..0365f3ad295 100644
--- a/src/uncategorized/clubReport.tw
+++ b/src/uncategorized/clubReport.tw
@@ -124,7 +124,7 @@
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
- <<include "SA drugs">>
+ <<= saDrugs($slaves[$i])>>
<<include "SA relationships">>
<<include "SA rivalries">>
<br><<include "SA devotion">>
@@ -135,7 +135,7 @@
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
- <<include "SA drugs">>
+ <<run saDrugs($slaves[$i])>>
<<include "SA relationships">>
<<include "SA rivalries">>
<<include "SA devotion">>
@@ -201,7 +201,7 @@
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
- <<include "SA drugs">>
+ <<= saDrugs($slaves[$i])>>
<<include "SA relationships">>
<<include "SA rivalries">>
<br><<include "SA devotion">>
@@ -213,7 +213,7 @@
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
- <<include "SA drugs">>
+ <<run saDrugs($slaves[$i])>>
<<include "SA relationships">>
<<include "SA rivalries">>
<<include "SA devotion">>
diff --git a/src/uncategorized/dairyReport.tw b/src/uncategorized/dairyReport.tw
index 8b4b65f1ede..dc7f7d9b32f 100644
--- a/src/uncategorized/dairyReport.tw
+++ b/src/uncategorized/dairyReport.tw
@@ -296,7 +296,7 @@
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
- <<include "SA drugs">>
+ <<= saDrugs($slaves[$i])>>
<<include "SA relationships">>
<<include "SA rivalries">>
<br><<include "SA devotion">>
@@ -307,7 +307,7 @@
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
- <<include "SA drugs">>
+ <<run saDrugs($slaves[$i])>>
<<include "SA relationships">>
<<include "SA rivalries">>
<<include "SA devotion">>
@@ -403,7 +403,7 @@
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
- <<include "SA drugs">>
+ <<= saDrugs($slaves[$i])>>
<<include "SA relationships">>
<<include "SA rivalries">>
<br><<include "SA devotion">>
@@ -414,7 +414,7 @@
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
- <<include "SA drugs">>
+ <<run saDrugs($slaves[$i])>>
<<include "SA relationships">>
<<include "SA rivalries">>
<<include "SA devotion">>
diff --git a/src/uncategorized/fullReport.tw b/src/uncategorized/fullReport.tw
index e714555be74..196169848a3 100644
--- a/src/uncategorized/fullReport.tw
+++ b/src/uncategorized/fullReport.tw
@@ -68,7 +68,7 @@
<<run saChoosesOwnClothes($slaves[$i])>>
<<include "SA diet">>
<<include "SA long term effects">>
- <<include "SA drugs">>
+ <<run saDrugs($slaves[$i])>>
<<include "SA relationships">>
<<include "SA rivalries">>
<</silently>>
@@ -77,7 +77,7 @@
<<= saChoosesOwnClothes($slaves[$i])>>
<<include "SA diet">>
<<include "SA long term effects">>
- <<include "SA drugs">>
+ <<= saDrugs($slaves[$i])>>
<<include "SA relationships">>
<<include "SA rivalries">>
<br>
diff --git a/src/uncategorized/masterSuiteReport.tw b/src/uncategorized/masterSuiteReport.tw
index 3fa83660644..dc52252ef2c 100644
--- a/src/uncategorized/masterSuiteReport.tw
+++ b/src/uncategorized/masterSuiteReport.tw
@@ -378,7 +378,7 @@
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
- <<include "SA drugs">>
+ <<= saDrugs($slaves[$i])>>
<<include "SA relationships">>
<<include "SA rivalries">>
<br><<include "SA devotion">>
@@ -395,7 +395,7 @@
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
- <<include "SA drugs">>
+ <<run saDrugs($slaves[$i])>>
<<include "SA relationships">>
<<include "SA rivalries">>
<<include "SA devotion">>
diff --git a/src/uncategorized/saLiveWithHG.tw b/src/uncategorized/saLiveWithHG.tw
index a00a3765768..02c73dfecc7 100644
--- a/src/uncategorized/saLiveWithHG.tw
+++ b/src/uncategorized/saLiveWithHG.tw
@@ -1020,7 +1020,7 @@
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
- <<include "SA drugs">>
+ <<run saDrugs($slaves[$i])>>
<<include "SA relationships">>
<<include "SA rivalries">>
<<include "SA devotion">>
@@ -1030,7 +1030,7 @@
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
- <<include "SA drugs">>
+ <<= saDrugs($slaves[$i])>>
<<include "SA relationships">>
<<include "SA rivalries">>
<br><<include "SA devotion">>
diff --git a/src/uncategorized/schoolroomReport.tw b/src/uncategorized/schoolroomReport.tw
index cfb9bd5cd9a..c7048109cdb 100644
--- a/src/uncategorized/schoolroomReport.tw
+++ b/src/uncategorized/schoolroomReport.tw
@@ -125,7 +125,7 @@
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
- <<include "SA drugs">>
+ <<= saDrugs($slaves[$i])>>
<<include "SA relationships">>
<<include "SA rivalries">>
<br><<include "SA devotion">>
@@ -136,7 +136,7 @@
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
- <<include "SA drugs">>
+ <<run saDrugs($slaves[$i])>>
<<include "SA relationships">>
<<include "SA rivalries">>
<<include "SA devotion">>
@@ -234,7 +234,7 @@
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
- <<include "SA drugs">>
+ <<= saDrugs($slaves[$i])>>
<<include "SA relationships">>
<<include "SA rivalries">>
<br><<include "SA devotion">>
@@ -246,7 +246,7 @@
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
- <<include "SA drugs">>
+ <<run saDrugs($slaves[$i])>>
<<include "SA relationships">>
<<include "SA rivalries">>
<<include "SA devotion">>
diff --git a/src/uncategorized/servantsQuartersReport.tw b/src/uncategorized/servantsQuartersReport.tw
index 4ee8d3dac30..3db2eae19d4 100644
--- a/src/uncategorized/servantsQuartersReport.tw
+++ b/src/uncategorized/servantsQuartersReport.tw
@@ -198,7 +198,7 @@
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
- <<include "SA drugs">>
+ <<= saDrugs($slaves[$i])>>
<<include "SA relationships">>
<<include "SA rivalries">>
<br><<include "SA devotion">>
@@ -209,7 +209,7 @@
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
- <<include "SA drugs">>
+ <<run saDrugs($slaves[$i])>>
<<include "SA relationships">>
<<include "SA rivalries">>
<<include "SA devotion">>
@@ -295,7 +295,7 @@
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
- <<include "SA drugs">>
+ <<= saDrugs($slaves[$i])>>
<<include "SA relationships">>
<<include "SA rivalries">>
<br><<include "SA devotion">>
@@ -311,7 +311,7 @@
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
- <<include "SA drugs">>
+ <<run saDrugs($slaves[$i])>>
<<include "SA relationships">>
<<include "SA rivalries">>
<<include "SA devotion">>
diff --git a/src/uncategorized/spaReport.tw b/src/uncategorized/spaReport.tw
index 1fcc3fd1318..bc108dc5141 100644
--- a/src/uncategorized/spaReport.tw
+++ b/src/uncategorized/spaReport.tw
@@ -239,7 +239,7 @@
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
- <<include "SA drugs">>
+ <<= saDrugs($slaves[$i])>>
<<include "SA relationships">>
<<include "SA rivalries">>
<br><<include "SA devotion">>
@@ -250,7 +250,7 @@
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
- <<include "SA drugs">>
+ <<run saDrugs($slaves[$i])>>
<<include "SA relationships">>
<<include "SA rivalries">>
<<include "SA devotion">>
@@ -346,7 +346,7 @@
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
- <<include "SA drugs">>
+ <<= saDrugs($slaves[$i])>>
<<include "SA relationships">>
<<include "SA rivalries">>
<br><<include "SA devotion">>
@@ -358,7 +358,7 @@
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
- <<include "SA drugs">>
+ <<run saDrugs($slaves[$i])>>
<<include "SA relationships">>
<<include "SA rivalries">>
<<include "SA devotion">>
--
GitLab