diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt index cfaa2e41b81a9bf0e5b858fc87043e858907a8db..f19bb769c3643eb6e6f5742756039f98e9233ccd 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 8e63c3806f269e40cf2f67f849c143f7fe9b858f..fc46d2ff5e45079dd0c5436d5bd0216de8298120 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); } } }