From 93b71e5dbb6805d4c1808634d6b8788c5f3c367d Mon Sep 17 00:00:00 2001 From: kopareigns <kopareigns@gmail.com> Date: Thu, 15 Nov 2018 01:31:48 -0500 Subject: [PATCH] Pseudo-fix --- devNotes/twine JS.txt | 2 +- src/SpecialForce/Report.tw | 2 +- src/js/datatypeCleanupJS.tw | 2 +- src/uncategorized/nextWeek.tw | 2 ++ 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt index 59863b82c87..7dee8420595 100644 --- a/devNotes/twine JS.txt +++ b/devNotes/twine JS.txt @@ -35145,7 +35145,7 @@ window.ArcologyDatatypeCleanup = function ArcologyDatatypeCleanup() { V.ASlaveLimit = Math.max(+V.ASlaveLimit, 0) || 0; V.shelterAbuse = Math.max(+V.shelterAbuse, 0) || 0; - V.arcologies[0].prosperity = Math.max(+V.arcologies[0].prosperity, 0) || 0; + V.arcologies[0].prosperity = Math.clamp(+V.arcologies[0].prosperity, 1, 300) || 1; V.AProsperityCap = Math.max(+V.AProsperityCap, 0) || 0; V.arcologies[0].ownership = Math.clamp(+V.arcologies[0].ownership, 0, 100) || 0; V.arcologies[0].minority = Math.clamp(+V.arcologies[0].minority, 0, 100) || 0; diff --git a/src/SpecialForce/Report.tw b/src/SpecialForce/Report.tw index 822b22b262f..2ce389413ab 100644 --- a/src/SpecialForce/Report.tw +++ b/src/SpecialForce/Report.tw @@ -103,7 +103,7 @@ <<if $SF.Regs == "none">> <<set _actionMultiplier *= 0.8,_SFD += 0.05,_Trade += _Trade*.95>> <<elseif $SF.Regs == "strict">> <<set _actionMultiplier *= 1.1,_SFD -= 0.05,_Trade += _Trade*1.05>> <</if>> <<set _depravityMultiplier = 1+_SFD>> -<<if _SFD != 0>> +<<if _SFD > -2>> <<set _Trade *= 1+_SFD/2>><</if>> <<if $SF.Target == "recruit">> <<set _FNGs += Math.ceil((_FNGs)*.95)>> diff --git a/src/js/datatypeCleanupJS.tw b/src/js/datatypeCleanupJS.tw index 67819770573..b99a09d3871 100644 --- a/src/js/datatypeCleanupJS.tw +++ b/src/js/datatypeCleanupJS.tw @@ -690,7 +690,7 @@ window.ArcologyDatatypeCleanup = function ArcologyDatatypeCleanup() { V.ASlaveLimit = Math.max(+V.ASlaveLimit, 0) || 0; V.shelterAbuse = Math.max(+V.shelterAbuse, 0) || 0; - V.arcologies[0].prosperity = Math.max(+V.arcologies[0].prosperity, 0) || 0; + V.arcologies[0].prosperity = Math.clamp(+V.arcologies[0].prosperity, 1, 300) || 1; V.AProsperityCap = Math.max(+V.AProsperityCap, 0) || 0; V.arcologies[0].ownership = Math.clamp(+V.arcologies[0].ownership, 0, 100) || 0; V.arcologies[0].minority = Math.clamp(+V.arcologies[0].minority, 0, 100) || 0; diff --git a/src/uncategorized/nextWeek.tw b/src/uncategorized/nextWeek.tw index 249aa596877..ddb6b32412d 100644 --- a/src/uncategorized/nextWeek.tw +++ b/src/uncategorized/nextWeek.tw @@ -77,6 +77,8 @@ <<set $surgeryCost = Math.trunc(30000/$localEcon)>> <</if>> +<<set $arcologies[0].prosperity = Math.clamp($arcologies[0].prosperity, 1, 300)>> + <<set $averageTrust = 0, $averageDevotion = 0, _slavesContributing = 0, _OldHG = -1, _NewHG = -1, _SL = $slaves.length>> <<if $studio == 1>> <<set $pornStars = 0, $pornStarFuckdolls = 0, $pornStarRapees = 0, $pornStarPreggos = 0, -- GitLab