diff --git a/src/js/economyJS.tw b/src/js/economyJS.tw index ccc3c33c625fcc6b99b758829ac2501d5dfcabc9..034ff72a8bfa455fcb35e96a79cc1562a63630e3 100644 --- a/src/js/economyJS.tw +++ b/src/js/economyJS.tw @@ -19,7 +19,7 @@ window.getCost = function(array) { var dairy = State.variables.dairy; var servantsQuarters = State.variables.servantsQuarters; var incubator = State.variables.incubator; - var mercCosts = State.variables.mercenaries; + var mercCosts = State.variables.mercenaries * 2000; var policyCost = State.variables.policyCost; var costs = (State.variables.brothel * facilityCost) + (State.variables.arcade * facilityCost * 0.5) @@ -133,8 +133,6 @@ window.getCost = function(array) { } if(State.variables.mercenaries > 0) { - mercCosts *= 2000; - if(State.variables.barracks) { mercCosts *= 0.5; } diff --git a/src/uncategorized/costs.tw b/src/uncategorized/costs.tw index b8b70553e6b312a67118691047eb8780239b9b3c..9546aa35df7072220dcd2e3eda057f81e187eb9a 100644 --- a/src/uncategorized/costs.tw +++ b/src/uncategorized/costs.tw @@ -48,18 +48,26 @@ <<if $riotCenter != 0>> <<set $costs += $riotUpkeep>> <</if>> + + <<if $soldierWages == 0>> + <<set _soldierMod = 1>> + <<elseif $soldierWages == 1>> + <<set _soldierMod = 1.5>> + <<else>> + <<set _soldierMod = 2>> + <</if>> <<set _mL = $militiaUnits.length>> <<for _i = 0; _i < _mL; _i++>> - <<set $costs += $militiaUnits[_i].troops*$soldierUpkeep>> + <<set $costs += $militiaUnits[_i].troops*$soldierUpkeep * _soldierMod>> <</for>> <<set _sL = $slaveUnits.length>> <<for _i = 0; _i < _sL; _i++>> - <<set $costs += $militiaUnits[_i].troops*$soldierUpkeep*0.5>> + <<set $costs += $militiaUnits[_i].troops*$soldierUpkeep * 0.5 * _soldierMod>> <</for>> <<set _meL = $mercUnits.length>> <<for _i = 0; _i < _meL; _i++>> - <<set $costs += $militiaUnits[_i].troops*$soldierUpkeep*1.5>> + <<set $costs += $militiaUnits[_i].troops*$soldierUpkeep * 1.5 * _soldierMod>> <</for>> <</if>> @@ -435,6 +443,18 @@ <</if>> <</if>> +<<if $secExp == 1>> + <<if $terrain == "oceanic" || $terrain == "marine">> + <<if $docks > 0>> + <<set $costs *= 1 - $docks * 0.05>> + <</if>> + <<else>> + <<if $railway > 0>> + <<set $costs *= 1 - $railway * 0.05>> + <</if>> + <</if>> +<</if>> + <<if $costs < 0>> <<set $costs = 0>> <<else>>