From 2826a5d1b599828fe09b4a09e080bb09a52a9ea9 Mon Sep 17 00:00:00 2001
From: DCoded <dcoded@live.com>
Date: Sun, 30 Dec 2018 00:49:01 -0500
Subject: [PATCH] Minor Changes
---
src/facilities/farmyard/farmyardAnimals.tw | 4 +--
src/facilities/farmyard/farmyardLab.tw | 2 --
src/gui/Encyclopedia/encyclopedia.tw | 4 +--
src/js/DefaultRules.tw | 2 +-
src/uncategorized/BackwardsCompatibility.tw | 2 +-
src/uncategorized/costsReport.tw | 10 ++++---
src/uncategorized/saRules.tw | 30 ++++++++++++---------
src/uncategorized/saWorkTheFarm.tw | 2 +-
8 files changed, 31 insertions(+), 25 deletions(-)
diff --git a/src/facilities/farmyard/farmyardAnimals.tw b/src/facilities/farmyard/farmyardAnimals.tw
index 4a4e6161953..e4edb96bd1e 100644
--- a/src/facilities/farmyard/farmyardAnimals.tw
+++ b/src/facilities/farmyard/farmyardAnimals.tw
@@ -1,7 +1,7 @@
:: FarmyardAnimals [nobr]
-/*TODO: add prices*/
-/*TODO: these prices will definitely need to be adjusted*/
+/* TODO: add prices */
+/* TODO: these prices will definitely need to be adjusted */
<<set $nextButton = "Back", $nextLink = "Farmyard", $returnTo = "FarmyardAnimals", $showEncyclopedia = 1, $encyclopedia = "Farmyard">>
diff --git a/src/facilities/farmyard/farmyardLab.tw b/src/facilities/farmyard/farmyardLab.tw
index 821ba34c44c..9d0d431c657 100644
--- a/src/facilities/farmyard/farmyardLab.tw
+++ b/src/facilities/farmyard/farmyardLab.tw
@@ -2,8 +2,6 @@
<<set $nextButton = "Back", $nextLink = "Farmyard", $returnTo = "FarmyardLab", $showEncyclopedia = 1, $encyclopedia = "Farmyard">>
-//This is currently under development.//
-
/* TODO: add plant types and research for them */
<br>
diff --git a/src/gui/Encyclopedia/encyclopedia.tw b/src/gui/Encyclopedia/encyclopedia.tw
index 3e8a2a660f1..22f6a67080b 100644
--- a/src/gui/Encyclopedia/encyclopedia.tw
+++ b/src/gui/Encyclopedia/encyclopedia.tw
@@ -1683,13 +1683,13 @@ ARCOLOGY FACILITIES
<<case "Nursery">>
- The ''Nursery'' is used to raise children from birth naturally. Once a spot is reserved for the child, they will be placed in the Nursery upon birth and ejected once they are old enough. The Nursery can be furnished according to [[future society|Encyclopedia][$encyclopedia = "Future Societies"]] styles, and doing so will add a slight @@.hotpink;[[devotion|Encyclopedia][$encyclopedia = "From Rebellious to Devoted"]]@@ boost to slaves working there. /* TODO: verify that this is correct */
+ The ''Nursery'' is used to raise children from birth naturally. Once a spot is reserved for the child, they will be placed in the Nursery upon birth and ejected once they are old enough. The Nursery can be furnished according to [[future society|Encyclopedia][$encyclopedia = "Future Societies"]] styles, and doing so can add a slight @@.hotpink;[[devotion|Encyclopedia][$encyclopedia = "From Rebellious to Devoted"]]@@ boost to slaves working there. /* TODO: verify that this is correct */
<br><br>''Extended family mode must be enabled.'' //This entry still needs work and will be updated with more information as it matures. If this message is still here, remind one of the devs to remove it.//
<<case "Farmyard">> /* TODO: this will need more information */
- The ''Farmyard'' is where the majority of the [[food|Encyclopedia][$encyclopedia = "Food"]] in your arcology is grown, once it is built. It also allows you to house animals<<if $seeBestiality == 1>>, which you can have interact with your slaves<</if>>. The Farmyard can be furnished according to [[future society|Encyclopedia][$encyclopedia = "Future Societies"]] styles, and doing so will add a slight @@.hotpink;[[devotion|Encyclopedia][$encyclopedia = "From Rebellious to Devoted"]]@@ boost to slaves working there. /* TODO: this may need to be changed */
+ The ''Farmyard'' is where the majority of the [[food|Encyclopedia][$encyclopedia = "Food"]] in your arcology is grown, once it is built. It also allows you to house animals<<if $seeBestiality == 1>>, which you can have interact with your slaves<</if>>. The Farmyard can be furnished according to [[future society|Encyclopedia][$encyclopedia = "Future Societies"]] styles, and doing so can add a slight @@.hotpink;[[devotion|Encyclopedia][$encyclopedia = "From Rebellious to Devoted"]]@@ boost to slaves working there. /* TODO: this may need to be changed */
<br>//This entry still needs work and will be updated with more information as it matures. If this message is still here, remind one of the devs to remove it.//
diff --git a/src/js/DefaultRules.tw b/src/js/DefaultRules.tw
index b5e7bd140cb..55f22321213 100644
--- a/src/js/DefaultRules.tw
+++ b/src/js/DefaultRules.tw
@@ -189,7 +189,7 @@ window.DefaultRules = (function() {
break;
case "work as a farmhand":
- if ((V.farmyardSlaves < V.farmyard && canWalk(slave))) //TODO: rework these requirements
+ if ((V.farmyardSlaves < V.farmyard)) //TODO: rework these requirements
break;
else {
RAFacilityRemove(slave, rule);
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index ac5db99a776..e48e9757cf3 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -728,7 +728,7 @@
<<if ndef $Matron>>
<<set $Matron = 0>>
<</if>>
-<<if ndef $activeChild>> /* TODO: this might need to be moved to somewhere near the top */
+<<if ndef $activeChild>>
<<set $activeChild = 0>>
<</if>>
<<if ndef $nannyInfluence>>
diff --git a/src/uncategorized/costsReport.tw b/src/uncategorized/costsReport.tw
index d39996755c3..2139a14fc21 100644
--- a/src/uncategorized/costsReport.tw
+++ b/src/uncategorized/costsReport.tw
@@ -380,11 +380,13 @@ $nursery > 0 || $masterSuiteUpgradePregnancy > 0 || $incubator > 0 ||
<<else>>
<<set _livingExpense = $rulesCost>>
<</if>>
- <<case "work as a farmhand">> /* TODO: this may need tweaking */
- <<if $slaves[$i].livingRules == "normal">>
- <<set _livingExpense = ($rulesCost*1.5)>>
+ <<case "work as a farmhand">>
+ <<if $slaves[$i].livingRules == "luxurious">>
+ <<set _livingExpense = ($rulesCost)>>
+ <<elseif $slaves[$i].livingRules == "normal">>
+ <<set _livingExpense = ($rulesCost*2)>>
<<else>>
- <<set _livingExpense = $rulesCost>>
+ <<set _livingExpense = ($rulesCost*.9)>>
<</if>>
<<case "work in the brothel">>
<<if $slaves[$i].livingRules == "normal">>
diff --git a/src/uncategorized/saRules.tw b/src/uncategorized/saRules.tw
index 5e4ddf1689b..d7148fab546 100644
--- a/src/uncategorized/saRules.tw
+++ b/src/uncategorized/saRules.tw
@@ -2153,7 +2153,7 @@
<<set $slaves[$i].trust -= _punishments>>
<</switch>>
<</if>>
- <<case "be the Matron">> /*TODO: this needs major work*/
+ <<case "be the Matron">>
<<set $slaves[$i].need -= ($NurseryiIDs.length*3)>>
<<if $slaves[$i].energy <= 20>>
is frigid and has little interest in getting off<<if ($slaves[$i].releaseRules != "permissive")>>, making the rule restricting $his sexual outlets superfluous<</if>>.
@@ -2477,7 +2477,7 @@
<<set $slaves[$i].trust += 1>>
<</switch>>
<<else>>
- <<switch $nurseryDecoration>> /* TODO: these may need to be rewritten - I'm not much of a writer */
+ <<switch $nurseryDecoration>>
<<case "Chinese Revivalist">>
The Oriental artwork in $his personal room reminds $him of $his position and @@.hotpink;renders $him even more submissive.@@
<<set $slaves[$i].devotion += 1>>
@@ -4191,8 +4191,8 @@
<</switch>>
<</if>>
<</if>>
- <<case "be the Farmer">> /*TODO: this will need a rewrite*/
- <<set $slaves[$i].need -= $DairyiIDs.length*5>>
+ <<case "be the Farmer">>
+ <<set $slaves[$i].need -= $FarmyardiIDs.length*5>>
<<if $slaves[$i].energy <= 20>>
is frigid and has little interest in getting off<<if ($slaves[$i].releaseRules != "permissive")>>, making the rule restricting $his sexual outlets superfluous<</if>>.
<<set $slaves[$i].need = 0>>
@@ -4208,7 +4208,7 @@
<<if ($slaves[$i].releaseRules == "restrictive")>>
willingly begs you to
<<saRulesPlayerFetishPlay>>
- whenever you inspect $dairyName.
+ whenever you inspect $farmyardName.
<<saRulesPlayerEnergy>>
<<saRulesPlayerDiscoversFetish>>
<<saRulesPlayerDrugEffects>>
@@ -4242,28 +4242,28 @@
<</if>> /* closes releaseRules not restrictive */
<</if>>
- $He is @@.hotpink;very happy@@ with $his private room in $dairyName and @@.mediumaquamarine;trusts@@ you a bit more for placing $him in charge of it.
+ $He is @@.hotpink;very happy@@ with $his private room in $farmyardName and @@.mediumaquamarine;trusts@@ you a bit more for placing $him in charge of it.
<<set $slaves[$i].devotion += 1, $slaves[$i].trust += 1>>
<<if ($universalRulesConsent == 0)>>
<<if ($slaves[$i].releaseRules != "restrictive")>>
<<if ($slaves[$i].energy > 95)>>
- <<if $DairyiIDs.length > 2>>
+ <<if $FarmyardiIDs.length > 2>>
Under the rules, $he's allowed to demand that other slaves get $him off, and $he @@.hotpink;adores@@ you for leaving plentiful outlets for $his nymphomania under $his charge.
<<else>>
- Under the rules, $he's allowed to demand that other slaves get $him off, and $he @@.hotpink;eagerly awaits@@ the day you assign more cows to $dairyName.
+ Under the rules, $he's allowed to demand that other slaves get $him off, and $he @@.hotpink;eagerly awaits@@ the day you assign more cows to $farmyardName.
<</if>>
<<set $slaves[$i].devotion += 1>>
<<elseif ($slaves[$i].fetishKnown == 1) && ($slaves[$i].fetishStrength > 60)>>
<<if ($slaves[$i].fetish == "sadist")>>
- <<if $DairyiIDs.length > 2>>
+ <<if $FarmyardiIDs.length > 2>>
Under the rules, $he's allowed to sexually abuse other slaves, and $he @@.hotpink;adores@@ you for providing so many cows for $him to rape.
<<else>>
- Under the rules, $he's allowed to sexually abuse other slaves, and $he @@.hotpink;eagerly awaits@@ the day you assign more cows to $dairyName for $him to rape.
+ Under the rules, $he's allowed to sexually abuse other slaves, and $he @@.hotpink;eagerly awaits@@ the day you assign more cows to $farmyardName for $him to rape.
<</if>>
<<set $slaves[$i].devotion += 1>>
<<elseif ($slaves[$i].fetish == "dom")>>
- <<if $DairyiIDs.length > 2>>
+ <<if $FarmyardiIDs.length > 2>>
Under the rules, $he's allowed to force other slaves to have sex with $him, and $he @@.hotpink;adores@@ you for allowing $him so many cows to dominate.
<<else>>
Under the rules, $he's allowed to force other slaves to have sex with $him, and $he @@.hotpink;eagerly awaits@@ the day you assign more cows to $his domain.
@@ -4311,7 +4311,7 @@
<<if $spa != 0>>
usually spends in $spaName<<if $Attendant != 0>> enjoying $Attendant.slaveName's care<</if>>.
<<else>>
- usually spends relaxing in $his room<<if $DairyiIDs.length > 1>> with the softest cow available<</if>>.
+ usually spends relaxing in $his room<<if $FarmyardiIDs.length > 1>> with the softest cow available<</if>>.
<</if>>
<<if $slaves[$i].relationship > 0>>
$He often asks to save these breaks so $he can spend them with $his <<if $slaves[$i].relationship == 1>>friend<<elseif $slaves[$i].relationship == 2>>best friend<<elseif $slaves[$i].relationship == 3>>friend with benefits<<elseif $slaves[$i].relationship == 4>>sweetheart<<else>>wife<</if>>.
@@ -4508,6 +4508,9 @@
<<case "Aztec Revivalist" "Chinese Revivalist" "Chattel Religionist" "Edo Revivalist" "Arabian Revivalist" "Egyptian Revivalist">>
The spare living conditions and daily tasks @@.hotpink;get $him used@@ to the routine of slavery.
<<set $slaves[$i].devotion += 1>>
+ <<case "Roman Revivalist">>
+ $He is
+ <<set $slaves[$i].devotion += 2, $slaves[$i].trust += 2>>
<<default>>
The reasonable living conditions allow $him to relax after the days work.
<<if $slaves[$i].pregKnown && $farmyardPregSetting >= 1 && $slaves[$i].bellyPreg >= 1500>>
@@ -4560,6 +4563,9 @@
<</if>>
<<case "Aztec Revivalist" "Chinese Revivalist" "Chattel Religionist" "Edo Revivalist" "Arabian Revivalist" "Egyptian Revivalist">>
The living conditions of $farmyardName might be spare, but they are no means meant to be uncomfortable.
+ <<case "Roman Revivalist">>
+ $He is @@.hotpink;very happy@@ about $his cushy living arrangements, and @@.mediumaquamarine;trusts you all the more@@ for it.
+ <<set $slaves[$i].devotion += 2, $slaves[$i].trust += 2>>
<<default>>
$He likes $his personal space in $farmyardName's dormitory, even if it's just a small room.
<</switch>>
diff --git a/src/uncategorized/saWorkTheFarm.tw b/src/uncategorized/saWorkTheFarm.tw
index 04a107fd05b..0f6b72fb477 100644
--- a/src/uncategorized/saWorkTheFarm.tw
+++ b/src/uncategorized/saWorkTheFarm.tw
@@ -1,4 +1,4 @@
-:: SA work the farm [nobr] /* TODO: This entire passage will need to be reworked */
+:: SA Work the Farm [nobr] /* TODO: This entire passage will need to be reworked */
<!-- Statistics gathering -->
<<set _incomeStats = getSlaveStatisticData($slaves[$i], $slaves[$i].assignment === Job.DAIRY ? $facility.farmyard : undefined)>>
--
GitLab