From 285f5d1228ff7e855f289806a4bc2c2b8870a66f Mon Sep 17 00:00:00 2001
From: kopareigns <kopareigns@gmail.com>
Date: Wed, 14 Nov 2018 19:49:00 -0500
Subject: [PATCH] Fixes
---
devNotes/twine JS.txt | 2 +-
src/facilities/nursery/placeInNursery.tw | 60 ------------------------
src/js/assignJS.tw | 2 +-
3 files changed, 2 insertions(+), 62 deletions(-)
delete mode 100644 src/facilities/nursery/placeInNursery.tw
diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index 24940631d44..6e719bfda42 100644
--- a/devNotes/twine JS.txt
+++ b/devNotes/twine JS.txt
@@ -9576,7 +9576,7 @@ window.assignJob = function assignJob(slave, job) {
slave.assignmentVisible = 0;
V.farmyardSlaves++;
V.FarmyardiIDs.push(slave.ID);
- switch (V.dairyDecoration) {
+ switch (V.farmyardDecoration) {
case "Aztec Revivalist":
case "Chinese Revivalist":
case "Chattel Religionist":
diff --git a/src/facilities/nursery/placeInNursery.tw b/src/facilities/nursery/placeInNursery.tw
deleted file mode 100644
index a233eae109a..00000000000
--- a/src/facilities/nursery/placeInNursery.tw
+++ /dev/null
@@ -1,60 +0,0 @@
-:: Place In Nursery
-
-/* CURRENTLY NOT IN USE
-<<silently>>
-
-<<set $childrenInLine = []>>
-<<set _activeChildIndex = $childIndices[$activeSlave.ID]>>
-<<set _CL = $cribs.length>>
-
-<<if ($activeSlave.assignmentVisible == 1)>>
- <<for _pin = _activeChildIndex - 1; _pin != _activeChildIndex; _pin-->> /* loops backwards through the $cribs array *//*
- <<if _pin < 0>>
- <<set _pin = _CL>>
- <<continue>>
- <</if>>
- <<if $cribs[_pin].assignmentVisible == 1>>
- <<set $childrenInLine.push(_pin)>> /* index of the previous slave in line *//*
- <<break>>
- <</if>>
- <</for>>
- <<for _pin = _activeChildIndex + 1; _pin != _activeChildIndex; _pin++>> /* this loops forwards through the $cribs array *//*
- <<if _pin == _CL>>
- <<set _pin = -1>>
- <<continue>>
- <</if>>
- <<if $cribs[_pin].assignmentVisible == 1>>
- <<set $childrenInLine.push(_pin)>> /* index of the next slave in line *//*
- <<break>>
- <</if>>
- <</for>>
-<<else>>
- <<for _pin = _activeChildIndex - 1; _pin != _activeChildIndex; _pin-->> /* loops backwards through the $cribs array *//*
- <<if _pin < 0>>
- <<set _pin = _CL>>
- <<continue>>
- <</if>>
- <<if ($cribs[_pin].assignment == $activeSlave.assignment)>>
- <<set $childrenInLine.push(_pin)>> /* index of the previous slave in line *//*
- <<break>>
- <</if>>
- <</for>>
- <<for _pin = _activeChildIndex + 1; _pin != _activeChildIndex; _pin++>> /* this loops forwards through the $cribs array *//*
- <<if _pin == _CL>>
- <<set _pin = -1>>
- <<continue>>
- <</if>>
- <<if ($cribs[_pin].assignment == $activeSlave.assignment)>>
- <<set $childrenInLine.push(_pin)>> /* index of the next slave in line *//*
- <<break>>
- <</if>>
- <</for>>
-<</if>>
-
-<<if $childrenInLine.length == 0>> /* if there are no other cribs available, set previous/next slave to self *//*
- <<set $childrenInLine[0] = _activeChildIndex>>
- <<set $childrenInLine[1] = _activeChildIndex>>
-<</if>>
-
-<</silently>>
-*/
\ No newline at end of file
diff --git a/src/js/assignJS.tw b/src/js/assignJS.tw
index 6beaa0a0785..2ca984e1b0f 100644
--- a/src/js/assignJS.tw
+++ b/src/js/assignJS.tw
@@ -133,7 +133,7 @@ window.assignJob = function assignJob(slave, job) {
slave.assignmentVisible = 0;
V.farmyardSlaves++;
V.FarmyardiIDs.push(slave.ID);
- switch (V.dairyDecoration) {
+ switch (V.farmyardDecoration) {
case "Aztec Revivalist":
case "Chinese Revivalist":
case "Chattel Religionist":
--
GitLab