From d8567d974f8c892738ea26ceb75c8a2f647d5b62 Mon Sep 17 00:00:00 2001 From: Svornost <11434-svornost@users.noreply.gitgud.io> Date: Sat, 11 Jan 2020 14:57:03 -0800 Subject: [PATCH] Make organFarm.tw stop using the global "x" variable, since it's the last place it's used. --- src/pregmod/organFarm.tw | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/pregmod/organFarm.tw b/src/pregmod/organFarm.tw index b30db63ba70..75c71432b3b 100644 --- a/src/pregmod/organFarm.tw +++ b/src/pregmod/organFarm.tw @@ -69,20 +69,20 @@ Organ Production <br> <</if>> <<if $incubatorSlaves > 0>> - <<for $x = 0; $x < $incubatorOrgans.length; $x++>> + <<for _x = 0; _x < $incubatorOrgans.length; _x++>> <<for _w = 0; _w < $incubatorSlaves; _w++>> - <<if $tanks[_w].ID == $incubatorOrgans[$x].ID>> + <<if $tanks[_w].ID == $incubatorOrgans[_x].ID>> <br> - $tanks[_w].slaveName's $incubatorOrgans[$x].type, - <<if $incubatorOrgans[$x].weeksToCompletion <= 0>> + $tanks[_w].slaveName's $incubatorOrgans[_x].type, + <<if $incubatorOrgans[_x].weeksToCompletion <= 0>> ready to be implanted as soon as $he exits the incubator. <<else>> <<if $organFarmUpgrade == 1>> - <<print $incubatorOrgans[$x].weeksToCompletion>> + <<print $incubatorOrgans[_x].weeksToCompletion>> <<elseif $organFarmUpgrade == 2>> - <<print Math.ceil($incubatorOrgans[$x].weeksToCompletion/2)>> + <<print Math.ceil($incubatorOrgans[_x].weeksToCompletion/2)>> <<elseif $organFarmUpgrade == 3>> - <<print Math.ceil($incubatorOrgans[$x].weeksToCompletion/4)>> + <<print Math.ceil($incubatorOrgans[_x].weeksToCompletion/4)>> <</if>> weeks from completion. <</if>> <<break>> @@ -94,20 +94,20 @@ Organ Production /* TODO: potentially allow organs to be implanted into children in the nursery <<set _NL = $NurseryiIDs.length>> <<if _NL > 0>> - <<for $x = 0; $x < $nurseryOrgans.length; $x++>> + <<for _x = 0; _x < $nurseryOrgans.length; _x++>> <<for _w = 0; _w < _NL; _w++>> - <<if $cribs[_w].ID == $nurseryOrgans[$x].ID>> + <<if $cribs[_w].ID == $nurseryOrgans[_x].ID>> <br> - $cribs[_w].slaveName's $nurseryOrgans[$x].type, - <<if $nurseryOrgans[$x].weeksToCompletion <= 0>> + $cribs[_w].slaveName's $nurseryOrgans[_x].type, + <<if $nurseryOrgans[_x].weeksToCompletion <= 0>> ready to be implanted as soon as $he exits the nursery. <<else>> <<if $organFarmUpgrade == 1>> - <<print $nurseryOrgans[$x].weeksToCompletion>> + <<print $nurseryOrgans[_x].weeksToCompletion>> <<elseif $organFarmUpgrade == 2>> - <<print Math.ceil($nurseryOrgans[$x].weeksToCompletion/2)>> + <<print Math.ceil($nurseryOrgans[_x].weeksToCompletion/2)>> <<elseif $organFarmUpgrade == 3>> - <<print Math.ceil($nurseryOrgans[$x].weeksToCompletion/4)>> + <<print Math.ceil($nurseryOrgans[_x].weeksToCompletion/4)>> <</if>> weeks from completion. <</if>> <<break>> -- GitLab