From 4c731b5ecb4ae442661f93ffcca4f3b193ac4c60 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Fri, 29 Dec 2017 01:41:43 -0500
Subject: [PATCH] fixes
---
devNotes/VersionChangeLog-Premod+LoliMod.txt | 4 ++++
devNotes/twine JS | 2 +-
src/js/economyJS.tw | 2 +-
src/uncategorized/endWeek.tw | 2 +-
4 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index 8c1ef9df974..7670cd41937 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -4,6 +4,10 @@
12/29/17
+ 241
+ -fixed bad variable in costs JS
+ -fixed unclosed set in endWeek
+
240
-living rules cost optimization
-code cleanup
diff --git a/devNotes/twine JS b/devNotes/twine JS
index 330d25ec917..9b4057bbacc 100644
--- a/devNotes/twine JS
+++ b/devNotes/twine JS
@@ -2223,7 +2223,7 @@ window.getSlaveCost = function(s) {
cost += rulesCost * .75;
break;
case Job.DAIRY:
- if($State.variables.dairyRestraintsSetting >= 2) {
+ if(State.variables.dairyRestraintsSetting >= 2) {
cost += rulesCost * .75;
} else if(s.livingRules == LivingRule.NORMAL) {
cost += rulesCost * 1.5;
diff --git a/src/js/economyJS.tw b/src/js/economyJS.tw
index fecc4b2200b..8d16e0ad55f 100644
--- a/src/js/economyJS.tw
+++ b/src/js/economyJS.tw
@@ -329,7 +329,7 @@ window.getSlaveCost = function(s) {
cost += rulesCost * .75;
break;
case Job.DAIRY:
- if($State.variables.dairyRestraintsSetting >= 2) {
+ if(State.variables.dairyRestraintsSetting >= 2) {
cost += rulesCost * .75;
} else if(s.livingRules == LivingRule.NORMAL) {
cost += rulesCost * 1.5;
diff --git a/src/uncategorized/endWeek.tw b/src/uncategorized/endWeek.tw
index 7dbb924234f..ca115a5bb29 100644
--- a/src/uncategorized/endWeek.tw
+++ b/src/uncategorized/endWeek.tw
@@ -31,7 +31,7 @@
<</if>>
<</if>>
<<if $slaves[_i].subTarget == 0>>
- <<set $subSlaves++
+ <<set $subSlaves++>>
<</if>>
<</for>>
--
GitLab