From 6a4b70a09dabd2a8b704eea4a0c8b325c87679d8 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Fri, 7 Sep 2018 22:37:34 -0400
Subject: [PATCH] correction
---
devNotes/twine JS.txt | 12 ++++++------
src/js/economyJS.tw | 12 ++++++------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index cfaa2e41b81..f19bb769c36 100644
--- a/devNotes/twine JS.txt
+++ b/devNotes/twine JS.txt
@@ -2240,14 +2240,14 @@ window.getSlaveCost = function(s) {
// TODO: Include them here anyway?
} else {
cost += foodCost * s.pregType * (s.pregControl === 'speed up' ? 3 : 1);
- if (s.pregType >= 10) {
- cost += foodCost * s.pregType * (s.pregControl === 'speed up' ? 3 : 1);
- } else if (s.pregType >= 30) {
- cost += foodCost * 2 * s.pregType * (s.pregControl === 'speed up' ? 3 : 1);
+ if (s.pregType >= 100) {
+ cost += foodCost * 5 * s.pregType * (s.pregControl === 'speed up' ? 3 : 1);
} else if (s.pregType >= 50) {
cost += foodCost * 3 * s.pregType * (s.pregControl === 'speed up' ? 3 : 1);
- } else if (s.pregType >= 100) {
- cost += foodCost * 5 * s.pregType * (s.pregControl === 'speed up' ? 3 : 1);
+ } else if (s.pregType >= 30) {
+ cost += foodCost * 2 * s.pregType * (s.pregControl === 'speed up' ? 3 : 1);
+ } else if (s.pregType >= 10) {
+ cost += foodCost * s.pregType * (s.pregControl === 'speed up' ? 3 : 1);
}
}
}
diff --git a/src/js/economyJS.tw b/src/js/economyJS.tw
index 8e63c3806f2..fc46d2ff5e4 100644
--- a/src/js/economyJS.tw
+++ b/src/js/economyJS.tw
@@ -449,14 +449,14 @@ window.getSlaveCost = function(s) {
// TODO: Include them here anyway?
} else {
cost += foodCost * s.pregType * (s.pregControl === 'speed up' ? 3 : 1);
- if (s.pregType >= 10) {
- cost += foodCost * s.pregType * (s.pregControl === 'speed up' ? 3 : 1);
- } else if (s.pregType >= 30) {
- cost += foodCost * 2 * s.pregType * (s.pregControl === 'speed up' ? 3 : 1);
+ if (s.pregType >= 100) {
+ cost += foodCost * 5 * s.pregType * (s.pregControl === 'speed up' ? 3 : 1);
} else if (s.pregType >= 50) {
cost += foodCost * 3 * s.pregType * (s.pregControl === 'speed up' ? 3 : 1);
- } else if (s.pregType >= 100) {
- cost += foodCost * 5 * s.pregType * (s.pregControl === 'speed up' ? 3 : 1);
+ } else if (s.pregType >= 30) {
+ cost += foodCost * 2 * s.pregType * (s.pregControl === 'speed up' ? 3 : 1);
+ } else if (s.pregType >= 10) {
+ cost += foodCost * s.pregType * (s.pregControl === 'speed up' ? 3 : 1);
}
}
}
--
GitLab