Skip to content
Snippets Groups Projects
Commit 3548a1ad authored by kopareigns's avatar kopareigns
Browse files

Fixes

parent 223de01f
No related branches found
No related tags found
No related merge requests found
...@@ -234,6 +234,6 @@ window.slaves2indices = function slaves2indices() { ...@@ -234,6 +234,6 @@ window.slaves2indices = function slaves2indices() {
window.getSlave = function getSlave(ID) { window.getSlave = function getSlave(ID) {
const index = State.variables.slaveIndices[ID]; const index = State.variables.slaveIndices[ID];
if (index === undefined) return null; if (index === undefined) return undefined;
else return State.variables.slaves[index]; else return State.variables.slaves[index];
}; };
...@@ -65,7 +65,7 @@ ...@@ -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, 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>> <<if $activeSlave.pregSource == -1>>
your your
<<elseif $activeSlave.pregSource == -2>> <<elseif $activeSlave.pregSource == -2>>
......
...@@ -675,6 +675,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc ...@@ -675,6 +675,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
<<if $arcologies[0].FSRestartDecoration != 100>> <<if $arcologies[0].FSRestartDecoration != 100>>
<br>''You are pursuing'' Eugenics. <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>&nbsp;&nbsp;&nbsp;&nbsp; //<<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>&nbsp;&nbsp;&nbsp;&nbsp;
<<FSChangeDecoration "FSRestart">>
<<else>> <<else>>
<br>''You have established'' Eugenics. <br>''You have established'' Eugenics.
<<if $eugenicsFullControl != 1>> <<if $eugenicsFullControl != 1>>
......
...@@ -36,6 +36,9 @@ ...@@ -36,6 +36,9 @@
<<break>> <<break>>
<</if>> <</if>>
<</for>> <</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>> <<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++>> <<for _j = 0; _j < _SL; _j++>>
<<set _SlaveJ = $slaves[_j]>> <<set _SlaveJ = $slaves[_j]>>
...@@ -51,6 +54,9 @@ ...@@ -51,6 +54,9 @@
<<break>> <<break>>
<</if>> <</if>>
<</for>> <</for>>
<<if _j == _SL>> /* gone through the full loop, found no matches, so reset _SlaveJ */
<<set _SlaveJ = null>>
<</if>>
<<elseif _SlaveI.relationshipRules != "restrictive">> <<elseif _SlaveI.relationshipRules != "restrictive">>
<<if _SlaveI.devotion > -90>> <<if _SlaveI.devotion > -90>>
<<if _SlaveI.behavioralFlaw == "none">> <<if _SlaveI.behavioralFlaw == "none">>
......
...@@ -2200,6 +2200,7 @@ This experience ...@@ -2200,6 +2200,7 @@ This experience
<<widget "FSChangeDecoration">> <<widget "FSChangeDecoration">>
<<set _FS = $args[0]>> <<set _FS = $args[0]>>
<<set _FSDecoration = _FS + "Decoration">> <<set _FSDecoration = _FS + "Decoration">>
<<capture _FS, _FSDecoration>>
<<switch $arcologies[0][_FSDecoration]>> <<switch $arcologies[0][_FSDecoration]>>
<<case 20>> <<case 20>>
$arcologies[0].name is not customized to support this goal. $arcologies[0].name is not customized to support this goal.
...@@ -2232,6 +2233,7 @@ This experience ...@@ -2232,6 +2233,7 @@ This experience
<<case 100>> <<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. $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>> <</switch>>
<</capture>>
<</widget>> <</widget>>
<<widget "ValidateFacilityDecoration">> <<widget "ValidateFacilityDecoration">>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment