From e8ccbcc85d7d6c364906d3c34b0bf63e38efe2ab Mon Sep 17 00:00:00 2001 From: Arkerthan <arkerthan@gmail.com> Date: Thu, 5 Dec 2019 13:23:03 +0100 Subject: [PATCH] fixes --- src/js/datatypeCleanupJS.js | 2 +- src/uncategorized/manageArcology.tw | 4 ++-- src/uncategorized/reputation.tw | 2 +- src/uncategorized/slaveInteract.tw | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/js/datatypeCleanupJS.js b/src/js/datatypeCleanupJS.js index 74dafc98df6..f3db920c0c8 100644 --- a/src/js/datatypeCleanupJS.js +++ b/src/js/datatypeCleanupJS.js @@ -1711,7 +1711,7 @@ window.EconomyDatatypeCleanup = function EconomyDatatypeCleanup() { V.food = Math.max(+V.food, 0) || 0; V.economy = Math.max(+V.economy, 20) || 100; - V.difficultySwitch = Math.clamp(+V.DifficultySwitch, 0, 1) || 0; + V.difficultySwitch = Math.clamp(+V.difficultySwitch, 0, 1) || 0; if (V.baseDifficulty) { V.baseDifficulty = Math.clamp(+V.baseDifficulty, 1, 5) || 3; } else if (V.economy > 125) { diff --git a/src/uncategorized/manageArcology.tw b/src/uncategorized/manageArcology.tw index f733a4837f8..902e5620684 100644 --- a/src/uncategorized/manageArcology.tw +++ b/src/uncategorized/manageArcology.tw @@ -287,7 +287,7 @@ _percTopClass = Math.trunc(($topClass / ($ACitizens + $ASlaves)) * 1000) / 10>> //Very High// | [[Decrease|Manage Arcology][$rent.lowerClass = $rentDefaults.lowerClass * 1.5, $rentEffectL = 0.94, $whoreBudget.lowerClass *= 9 / 8]] <<elseif $rent.lowerClass > $rentDefaults.lowerClass>> //High// | [[Increase|Manage Arcology][$rent.lowerClass = $rentDefaults.lowerClass * 2, $rentEffectL = 0.85, $whoreBudget.lowerClass *= 8 / 9]] | [[Decrease|Manage Arcology][$rent.lowerClass = $rentDefaults.lowerClass, $rentEffectL = 1, $whoreBudget.lowerClass *= 10 / 9]] -<<elseif $rent.lowerClass > $rentDefaults. lowerClass * 0.5>> +<<elseif $rent.lowerClass > $rentDefaults.lowerClass * 0.5>> //Average// | [[Increase|Manage Arcology][$rent.lowerClass = $rentDefaults.lowerClass * 1.5, $rentEffectL = 0.94, $whoreBudget.lowerClass *= 9 / 10]] | [[Decrease|Manage Arcology][$rent.lowerClass = $rentDefaults.lowerClass * 0.5, $rentEffectL = 1.04, $whoreBudget.lowerClass *= 11 / 10]] <<elseif $rent.lowerClass > 0>> //Low// | [[Increase|Manage Arcology][$rent.lowerClass = $rentDefaults.lowerClass, $rentEffectL = 1, $whoreBudget.lowerClass *= 10 / 11]] | [[Free Rent|Manage Arcology][$rent.lowerClass = 0, $rentEffectL = 1.1, $whoreBudget.lowerClass *= 12 / 11]] @@ -408,4 +408,4 @@ Your arcology is named <<textbox "$arcologies[0].name" $arcologies[0].name "Mana <<if $cheatMode == 1 && $seeExtreme == 1>> <br><br>[[Host Dinner Party|Dinner Party Preparations]] -<</if>> \ No newline at end of file +<</if>> diff --git a/src/uncategorized/reputation.tw b/src/uncategorized/reputation.tw index cdf279c3aa2..8adec7a6b46 100644 --- a/src/uncategorized/reputation.tw +++ b/src/uncategorized/reputation.tw @@ -103,7 +103,7 @@ _enduringRep = $enduringRep>> <<else>> <<set _repLoss = 0, $PC.degeneracy = 0>> <</if>> - Since you are the Prophet, your reputation degrades degrades less. + Since you are the Prophet, your reputation degrades less. <</if>> <<if $arcologies[0].FSRestartDecoration == 100>> <<if _repLoss > 100>> diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw index b42b5890d2d..c6b949e233c 100644 --- a/src/uncategorized/slaveInteract.tw +++ b/src/uncategorized/slaveInteract.tw @@ -537,7 +537,7 @@ <</switch>> /* END CAN BE REASSIGNED */ <<if $activeSlave.assignment == "whore" || $activeSlave.assignment == "work in the brothel">> - <br>Whoring Target: <strong><span id="whoreClass"><<if !$activeSlave.whoreClass>>auto<<elseif $activeSlave.whoreClass == 1>>the lower class<<elseif $activeSlave.whoreClass == 2>>the middle class<<elseif $activeSlave.whoreClass == 3>>the upper class<<elseif $activeSlave.whoreClass == 4>>millionaires<<else>>THERE HAS BEEN AN ERROR<</if>></span></strong>. //This is the highest class they are allowed to service, when eligable// + <br>Whoring Target: <strong><span id="whoreClass"><<if !$activeSlave.whoreClass>>auto<<elseif $activeSlave.whoreClass == 1>>the lower class<<elseif $activeSlave.whoreClass == 2>>the middle class<<elseif $activeSlave.whoreClass == 3>>the upper class<<elseif $activeSlave.whoreClass == 4>>millionaires<<else>>THERE HAS BEEN AN ERROR<</if>></span></strong>. //This is the highest class they are allowed to service, when eligible// <<link "Auto">><<set $activeSlave.whoreClass = 0>><<replace "#whoreClass">>auto<</replace>><</link>> | <<link "Lower Class">><<set $activeSlave.whoreClass = 1>><<replace "#whoreClass">>the lower class<</replace>><</link>> | <<link "Middle Class">><<set $activeSlave.whoreClass = 2>><<replace "#whoreClass">>the middle class<</replace>><</link>> | -- GitLab