diff --git a/src/js/assayJS.tw b/src/js/assayJS.tw index 2cc8bafdf470ff624fe1cada4061672cc32d5872..36777aebfd60353525b04668548e15a153ac4535 100644 --- a/src/js/assayJS.tw +++ b/src/js/assayJS.tw @@ -234,6 +234,6 @@ window.slaves2indices = function slaves2indices() { window.getSlave = function getSlave(ID) { const index = State.variables.slaveIndices[ID]; - if (index === undefined) return null; + if (index === undefined) return undefined; else return State.variables.slaves[index]; }; diff --git a/src/pregmod/csec.tw b/src/pregmod/csec.tw index 6693efeaeb53ae632bdd0ac867fc9f3d45a66ca1..bef18c32d15e89b976c2dc9f83e35a9450d3adee 100644 --- a/src/pregmod/csec.tw +++ b/src/pregmod/csec.tw @@ -65,7 +65,7 @@ /* ------------------------------------------------ */ Performing a cesarean section is trivial for the remote surgery to carry out. $activeSlave.slaveName is sedated, her child<<if _curBabies > 1>>ren<</if>> extracted, and taken to a bed to recover. By the time she comes to, -<<if _curBabies >0 >> +<<if _curBabies > 0>> <<if $activeSlave.pregSource == -1>> your <<elseif $activeSlave.pregSource == -2>> diff --git a/src/uncategorized/futureSociety.tw b/src/uncategorized/futureSociety.tw index b9e916798cc32a316533365834e6c14282a2c87e..d5bd589f9f801d8d99b51075e1768b4d366c028e 100644 --- a/src/uncategorized/futureSociety.tw +++ b/src/uncategorized/futureSociety.tw @@ -675,6 +675,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc <<if $arcologies[0].FSRestartDecoration != 100>> <br>''You are pursuing'' Eugenics. //<<link [[Abandon|Future Society]]>><<set $arcologies[0].FSRestart = "unset", $arcologies[0].FSRestartDecoration = 20, $arcologies[0].FSRestartSMR = 0, $arcologies[0].FSRestartLaw = 0, $FSCredits += 1>><<if $assistantFSAppearance == "eugenics">><<set $assistantFSAppearance = "default">><</if>><<ClearFacilityDecorations>><</link>>//<br> + <<FSChangeDecoration "FSRestart">> <<else>> <br>''You have established'' Eugenics. <<if $eugenicsFullControl != 1>> diff --git a/src/uncategorized/saRelationships.tw b/src/uncategorized/saRelationships.tw index 5c96282b3e80185d2b823caf6c2d3e7e6b1209a7..d5f7b04a7359dcb2a461199d966a8214ee010087 100644 --- a/src/uncategorized/saRelationships.tw +++ b/src/uncategorized/saRelationships.tw @@ -36,6 +36,9 @@ <<break>> <</if>> <</for>> + <<if _j == _SL>> /* gone through the full loop, found no matches, so reset _SlaveJ */ + <<set _SlaveJ = null>> + <</if>> <<elseif (_SlaveI.origin == "You were acquainted with her before you were an arcology owner; your rival tried to use her to manipulate you, but you rescued her.") && ($rivalryDuration > 20) && (($rivalryFS != "Racial Supremacism") || ($rivalryFS != "Paternalism")) && _SlaveI.newGamePlus == 0>> <<for _j = 0; _j < _SL; _j++>> <<set _SlaveJ = $slaves[_j]>> @@ -51,6 +54,9 @@ <<break>> <</if>> <</for>> + <<if _j == _SL>> /* gone through the full loop, found no matches, so reset _SlaveJ */ + <<set _SlaveJ = null>> + <</if>> <<elseif _SlaveI.relationshipRules != "restrictive">> <<if _SlaveI.devotion > -90>> <<if _SlaveI.behavioralFlaw == "none">> diff --git a/src/utility/miscWidgets.tw b/src/utility/miscWidgets.tw index 100a680f4d6377d2a3beb8aaf79d96b37d010922..950c21031825ed5bf5d093c9858db0a9ecb6b494 100644 --- a/src/utility/miscWidgets.tw +++ b/src/utility/miscWidgets.tw @@ -2200,6 +2200,7 @@ This experience <<widget "FSChangeDecoration">> <<set _FS = $args[0]>> <<set _FSDecoration = _FS + "Decoration">> +<<capture _FS, _FSDecoration>> <<switch $arcologies[0][_FSDecoration]>> <<case 20>> $arcologies[0].name is not customized to support this goal. @@ -2232,6 +2233,7 @@ This experience <<case 100>> $arcologies[0].name's media is supporting this goal; $arcologies[0].name's public spaces are decorated to support it, and have slaves stationed in them to support it. The exterior of the arcology has been remodeled to support it too; the arcology is fully customized for this goal. <</switch>> +<</capture>> <</widget>> <<widget "ValidateFacilityDecoration">>