diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt index 6d670ebe4914f64d5379ec4d46e719334360d0f4..8200899da6c3abe768fc67fa112b8ff0541ce862 100644 --- a/devNotes/twine JS.txt +++ b/devNotes/twine JS.txt @@ -2051,7 +2051,7 @@ window.getCost = function(array) { secExpCost += State.variables.propHubUpkeep; } if(State.variables.secHQ > 0) { - secExpCost += State.variables.secHQUpkeep + 20 * state.variables.secMenials; + secExpCost += State.variables.secHQUpkeep + 20 * State.variables.secMenials; } if(State.variables.secBarracks > 0) { secExpCost += State.variables.secBarracksUpkeep; @@ -35610,7 +35610,15 @@ window.SFBC = function() { if (V.TradeShowIncome === undefined) V.TradeShowIncome = 0; if (V.TotalTradeShowIncome === undefined) V.TotalTradeShowIncome = 0; if (V.TradeShowMenials === undefined) V.TradeShowMenials = 0; + if (typeof V.TradeShowHelots !== 'undefined' || V.TradeShowHelots !== null) { + V.TradeShowHelots = undefined; + delete(V.TradeShowHelots); + } if (V.TotalTradeShowMenials === undefined) V.TotalTradeShowMenials = 0; + if (typeof V.TotalTradeShowHelots !== 'undefined' || V.TotalTradeShowHelots !== null) { + V.TotalTradeShowHelots = undefined; + delete(V.TotalTradeShowHelots); + } V.SF.MercCon = { History:V.OverallTradeShowAttendance, CanAttend:V.CurrentTradeShowAttendance, diff --git a/src/SecExp/SecExpBackwardCompatibility.tw b/src/SecExp/SecExpBackwardCompatibility.tw index d1e48485b4b31b0a5902382a89374ace713b99df..b1aca7cf1aa6c0eb735e0c4a4c7de4877adfc283 100644 --- a/src/SecExp/SecExpBackwardCompatibility.tw +++ b/src/SecExp/SecExpBackwardCompatibility.tw @@ -259,17 +259,11 @@ <<set $secBarracksUpgrades.loyaltyMod = 0>> <</if>> <<if ndef $secMenials>> - <<set $secMenials = 0>> -<</if>> -<<if ndef $reqMenials>> - <<set $reqMenials = 20>> -<</if>> -<<if def $secHelots>> - <<set $secMenials = $secHelots>> + <<set $secMenials = $secHelots || 0>> <<unset $secHelots>> <</if>> -<<if def $reqHelots>> - <<set $reqMenials = $reqHelots>> +<<if ndef $reqMenials>> + <<set $reqMenials = $reqHelots || 20>> <<unset $reqHelots>> <</if>> <<if ndef $secUpgrades >> @@ -1009,6 +1003,15 @@ <<set $SavedSFI = $SFIntervention>> <</if>> + + +/* TODO: move this to wherever you want it, SFanon */ + +<<if def SF.MercCon = {History:0, CanAttend:0, Income:0, Revenue:0, Helots:0, TotalHelots:0, Mercs:0, TotalMercs:0}>> + <<set SF.MercCon = {History:0, CanAttend:0, Income:0, Revenue:0, Menials:0, TotalMenials:0, Mercs:0, TotalMercs:0}>> + <<unset SF.MercCon>> +<</if>> + /* recalculation widgets */ <<fixBrokenUnits>> <<fixBrokenStats>> diff --git a/src/js/economyJS.tw b/src/js/economyJS.tw index f1853d392373027678983ec610967c6a0546c1fd..e7aebe72ff114a1771771305425e51ee91970451 100644 --- a/src/js/economyJS.tw +++ b/src/js/economyJS.tw @@ -83,7 +83,7 @@ window.getCost = function(array) { secExpCost += State.variables.propHubUpkeep; } if(State.variables.secHQ > 0) { - secExpCost += State.variables.secHQUpkeep + 20 * state.variables.secMenials; + secExpCost += State.variables.secHQUpkeep + 20 * State.variables.secMenials; } if(State.variables.secBarracks > 0) { secExpCost += State.variables.secBarracksUpkeep;