diff --git a/src/002-config/mousetrapConfig.js b/src/002-config/mousetrapConfig.js
index c82ac4be193661aef007b894ecbb0a50630f938a..ffcfcb7b0d3da9e458b5d6d55e630b34349bf52a 100644
--- a/src/002-config/mousetrapConfig.js
+++ b/src/002-config/mousetrapConfig.js
@@ -29,7 +29,7 @@ App.UI.Hotkeys = (function() {
const bindings = {};
/**
- * To ensure we only record one at at time
+ * To ensure we only record one at a time
* @type {boolean}
*/
let recording = false;
diff --git a/src/facilities/ads.js b/src/facilities/ads.js
index 63def7e87a51661064f5821c76ac63bb851929cb..2cc8ec00a2051e9e1a134e9101c87b5943f29c6b 100644
--- a/src/facilities/ads.js
+++ b/src/facilities/ads.js
@@ -394,7 +394,7 @@ App.Ads.report = function(building, preview) {
} else if (adCampaign.stacked === -1) {
t += `Its advertisements feature trim girls with little in the way of T&A. `;
} else {
- t += `Its advertisements feature a variety of girls, some that are trim and others that are curvaceous. `;
+ t += `Its advertisements feature a variety of girls, some that are trim and others that are curvaceous. `;
}
t += `</div>`;
}
diff --git a/src/js/extendedFamilyModeJS.js b/src/js/extendedFamilyModeJS.js
index c467ec7bcb5b56fab5970e9e910ba256e1a11444..9ab734dfd28864e16f266cb1827f00fe78e56243 100644
--- a/src/js/extendedFamilyModeJS.js
+++ b/src/js/extendedFamilyModeJS.js
@@ -279,7 +279,7 @@ globalThis.mutualChildren = function(slave1, slave2, slaves) {
/** Returns a random slave related to a given entity
* @param {Relative} slave
- * @param {function(App.Entity.SlaveState): boolean} filterFunction
+ * @param {function(App.Entity.SlaveState): boolean} [filterFunction]
* @returns {App.Entity.SlaveState}
*/
globalThis.randomRelatedSlave = function(slave, filterFunction) {
diff --git a/src/pregmod/killSlave.tw b/src/pregmod/killSlave.tw
index 3cb552dfd4e32927b900631597aadb68aea68cdd..79161249e9934f79eef68a671c11ea63e2040de5 100644
--- a/src/pregmod/killSlave.tw
+++ b/src/pregmod/killSlave.tw
@@ -185,13 +185,11 @@ you <<if canHear($activeSlave)>>quietly <</if>>reach behind your desk and pull o
$slaves[_ss].slaveName is @@.mediumorchid;grieved@@ that you have killed _his2 best source of comfort and companionship in a life of bondage.
<br><br>
<<set $slaves[_ss].devotion -= $slaves[_ss].relationship*10>>
- <<set $display = 1>>
<</if>>
<<elseif $activeSlave.relationship == -3>>
Killing one of your slave $wives is @@.red;socially unacceptable.@@ In addition, your other devoted slaves are @@.gold;worried@@ that you may not respect their status.
<br><br>
<<run repX(-200, "event")>>
- <<set $display = 1>>
<<for _ss = 0; _ss < $slaves.length; _ss++>>
<<if $slaves[_ss].devotion > 50>>
<<set $slaves[_ss].trust -= 10>>
@@ -205,7 +203,6 @@ you <<if canHear($activeSlave)>>quietly <</if>>reach behind your desk and pull o
$slaves[_ss].slaveName is @@.hotpink;pleased@@ that $he won't have to see _his2 rival any more.
<br><br>
<<set $slaves[_ss].devotion += $slaves[_ss].rivalry*3>>
- <<set $display = 1>>
<</if>>
<</if>>
diff --git a/src/uncategorized/nextWeek.tw b/src/uncategorized/nextWeek.tw
index ec4c8c7e9ce1d8800604ee5aed776c71ffd94573..ee545303c1bbbf2fd3cb6c3c11d6e56331822e02 100644
--- a/src/uncategorized/nextWeek.tw
+++ b/src/uncategorized/nextWeek.tw
@@ -334,7 +334,7 @@
/% These are variables that either should be made into _temp vars or should be Zeroed out once done with them instead of here. This can also interfere with debugging or hide NaN's as zeroing things out would clear a NaN. Also could stop from NaN's getting worse? %/
/% Integer and float variables. No real need to zero them out but doesn't hurt to have them in a known state, though this might mask variables NaN'ing out. Takes up the least amount of Memory besides a "" string. %/
-<<set $i = 0, $j = 0, $averageProsperity = 0, $motherSlave = -1, $daughterSlave = -1, $devMother = -1, $devDaughter = -1, $alphaTwin = -1, $betaTwin = -1, $youngerSister = -1, $olderSister = -1, $recruiterSlave = -1>>
+<<set $i = 0, $j = 0, $averageProsperity = 0, $motherSlave = -1, $daughterSlave = -1, $devMother = -1, $devDaughter = -1, $alphaTwin = -1, $betaTwin = -1, $youngerSister = -1, $olderSister = -1>>
<<set $boobsID = -1, $boobsInterestTargetID = -1, $buttslutID = -1, $buttslutInterestTargetID = -1, $cumslutID = -1, $cumslutInterestTargetID = -1, $humiliationID = -1, $humiliationInterestTargetID = -1, $sadistID = -1, $sadistInterestTargetID = -1, $masochistID = -1, $masochistInterestTargetID = -1, $domID = -1, $dominantInterestTargetID = -1, $subID = -1, $submissiveInterestTargetID = -1, $shelterGirlID = -1>>
/% Other arrays %/
diff --git a/src/uncategorized/randomNonindividualEvent.tw b/src/uncategorized/randomNonindividualEvent.tw
index 5d762d66439cbc3aa860d235528445e3f62d1864..24abf725ceeb0aaf86e753276edcb44241b8e4f3 100644
--- a/src/uncategorized/randomNonindividualEvent.tw
+++ b/src/uncategorized/randomNonindividualEvent.tw
@@ -21,7 +21,7 @@
<<else>>
<<silently>>
/* initialize event lists as arrays [], not objects {} */
- <<set $events = [], $RecETSevent = [], $REFIevent = [], $PESSevent = [], $PETSevent = [], $REFSevent = [], $activeSlave = 0, $recruiterSlave = 0, _recruitEvents = []>>
+ <<set $events = [], $RecETSevent = [], $REFIevent = [], $PESSevent = [], $PETSevent = [], $REFSevent = [], $activeSlave = 0, _recruitEvents = []>>
<<set $seed = 0>>
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index 35a67630ff54d57499637f1ca16dbc5ea410750e..fa8c05175ae6765b09e7d554a9678baddd11bde4 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -6410,7 +6410,7 @@
<<if ($slaves[$i].dick > 8)>>
Society @@.green;approves@@ of $his massive member, which might be nonfunctional, but is a wonder of expansionism.
<<set _Dic = $slaves[$i].dick-8>>
- <<= FutureSocieties.ChangePorn("AssetExpansionist", _Dic, $pornFameBonus)>>
+ <<= FutureSocieties.ChangePorn("AssetExpansionist", _Dic)>>
<<elseif ($slaves[$i].dick > 6)>>
Society @@.green;approves@@ of $his enormous penis; $his cock furthers the fashion for dangling dicks on slaves.
<<= FutureSocieties.ChangePorn("AssetExpansionist", 1)>>
diff --git a/src/uncategorized/saRelationships.tw b/src/uncategorized/saRelationships.tw
index e6968eeabedcb1843698379463205605bb9b438e..74330ad71a1f22b9f27fb20ae828770a2ccecdfd 100644
--- a/src/uncategorized/saRelationships.tw
+++ b/src/uncategorized/saRelationships.tw
@@ -70,7 +70,7 @@
<<set _seed = random(1, 80)>>
<</if>>
<<if _seed > 75>>
- <<set $resentment = 0>>
+ <<set _resentment = 0>>
<<for _j = 0; _j < _SL; _j++>>
<<set _SlaveJ = $slaves[_j]>>
<<setLocalPronouns _SlaveJ 2>>
@@ -193,9 +193,9 @@
<<set _SlaveJ.relationship = 1, _SlaveJ.relationshipTarget = _SlaveI.ID, _SlaveI.relationship = 1, _SlaveI.relationshipTarget = _SlaveJ.ID>>
<<break>>
<<else>>
- <<if $resentment == 0>>
+ <<if _resentment == 0>>
_SlaveI.slaveName tries to strike up a friendship with _SlaveJ.slaveName and is @@.gold;punished@@ for breaking the rules against such things; $he @@.mediumorchid;resents@@ being castigated for simple sociability.
- <<set _SlaveI.devotion -= 2, _SlaveI.trust -= 2, $resentment++>>
+ <<set _SlaveI.devotion -= 2, _SlaveI.trust -= 2, _resentment++>>
<</if>>
<</if>>
<</if>>
@@ -217,18 +217,20 @@
<<set _SlaveJ.relationship = 3, _SlaveJ.relationshipTarget = _SlaveI.ID, _SlaveI.relationship = 3, _SlaveI.relationshipTarget = _SlaveJ.ID>>
<<break>>
<<else>>
- _SlaveI.slaveName tries to strike up a sexual relationship with _SlaveJ.slaveName and is @@.gold;punished@@ for breaking the rules against such things; $he @@.mediumorchid;resents@@ being prevented from pursuing _him2.
- <<set _SlaveI.devotion -= 2, _SlaveI.trust -= 2>>
- <</if>>
- <</if>>
- <</if>>
- <</if>>
- <</for>>
- <<if _SlaveI.relationshipTarget != _SlaveJ.ID>>
- <<set _SlaveJ = null>>
+ <<if _resentment == 0>>
+ _SlaveI.slaveName tries to strike up a sexual relationship with _SlaveJ.slaveName and is @@.gold;punished@@ for breaking the rules against such things; $he @@.mediumorchid;resents@@ being prevented from pursuing _him2.
+ <<set _SlaveI.devotion -= 2, _SlaveI.trust -= 2, _resentment++>>
+ <</if>>
+ <</if>>
<</if>>
<</if>>
+ <</if>>
+ <</for>>
+ <<if _SlaveI.relationshipTarget != _SlaveJ.ID>>
+ <<set _SlaveJ = null>>
<</if>>
+ <</if>> /*seed*/
+ <</if>> /*devotion*/
<</if>>
<<set _drop = 1>>
<</if>>
diff --git a/src/uncategorized/slaveSold.tw b/src/uncategorized/slaveSold.tw
index e301f46239399c5e12cd2160f2b6097ce8621c92..cc796ef8c4a0fe2055ac6d062be4716f3800124a 100644
--- a/src/uncategorized/slaveSold.tw
+++ b/src/uncategorized/slaveSold.tw
@@ -3,7 +3,6 @@
<<set $nextButton = "Back to Main", $nextLink = "Main", $returnTo = "Main", $encyclopedia = "Personal Assistant">>
<<setLocalPronouns $activeSlave>>
-<<set $display = 0>>
<<if !["abortion TV", "elite auction", "eugenics arcology", "organ crafter", "peacekeepers", "repopulationist arcology", "tentacle bred", "womb filler"].includes($buyer) && ((($activeSlave.actualAge < $retirementAge-1) && $policies.retirement.physicalAgePolicy == 0) || (($activeSlave.physicalAge < $retirementAge-1) && $policies.retirement.physicalAgePolicy == 1))>> /* organ crafter is not viable now, the elite/peacekeepers won't part so easily with a prize, some take place x months later when the event's max is 15 weeks, and the rest are snuff events. You don't want that slave back. */
<<if !$boomerangSlave || $boomerangWeeks > 15>>
@@ -124,13 +123,11 @@
$slaves[_ss].slaveName is @@.mediumorchid;grieved@@ that you are selling _his2 best source of comfort and companionship in a life of bondage.
<br><br>
<<set $slaves[_ss].devotion -= $slaves[_ss].relationship*10>>
- <<set $display = 1>>
<</if>>
<<elseif $activeSlave.relationship == -3>>
Selling one of your slave $wives is @@.red;socially unacceptable.@@ In addition, your other devoted slaves are @@.gold;worried@@ that you may not respect their status.
<br><br>
<<run repX(-200, "slaveTransfer")>>
- <<set $display = 1>>
<<for _ss = 0; _ss < $slaves.length; _ss++>>
<<if $slaves[_ss].devotion > 50>>
<<set $slaves[_ss].trust -= 5>>
@@ -144,7 +141,6 @@
$slaves[_ss].slaveName is @@.hotpink;pleased@@ that _he2 won't have to see _his2 rival any more.
<br><br>
<<set $slaves[_ss].devotion += $slaves[_ss].rivalry*3>>
- <<set $display = 1>>
<</if>>
<</if>>