diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt index 50bca093dc72dd97dc6f4d7b153e57dcf8eceb82..aae3348af0bf6ce81a0c1a9698a1bdba9a61998a 100644 --- a/devNotes/twine JS.txt +++ b/devNotes/twine JS.txt @@ -1830,13 +1830,16 @@ window.getCost = function(array) { var dairy = State.variables.dairy; var farmyard = State.variables.farmyard; var servantsQuarters = State.variables.servantsQuarters; + var nursery = State.variables.nursery; var incubator = State.variables.incubator; var mercCosts = State.variables.mercenaries * 2000; var policyCost = State.variables.policyCost; - var costs = (State.variables.brothel * facilityCost) - + (State.variables.arcade * facilityCost * 0.5) - + (State.variables.club * facilityCost) - + (State.variables.dairy * facilityCost) + var costs = (brothel * facilityCost) + + (arcade * facilityCost * 0.5) + + (club * facilityCost) + + (dairy * facilityCost) + + (nursery * facilityCost) + + (farmyard * facilityCost) + (State.variables.incubator * facilityCost * 10); var secExpCost = 0; var soldierMod = 0; @@ -1865,9 +1868,6 @@ window.getCost = function(array) { if(club > 0) { costs += State.variables.clubAdsSpending; } - if (farmyard > 0) { - costs += farmyard*facilityCost; - } if(incubator > 0) { costs += ((State.variables.incubatorWeightSetting + State.variables.incubatorMusclesSetting + State.variables.incubatorReproductionSetting + State.variables.incubatorGrowthStimsSetting) * 500); } diff --git a/src/js/economyJS.tw b/src/js/economyJS.tw index f718a383faa6c01c53a8fd6862af541b76bfa15d..e78d98e2e1692e3d738ab39500b80bea573658c5 100644 --- a/src/js/economyJS.tw +++ b/src/js/economyJS.tw @@ -22,13 +22,16 @@ window.getCost = function(array) { var dairy = State.variables.dairy; var farmyard = State.variables.farmyard; var servantsQuarters = State.variables.servantsQuarters; + var nursery = State.variables.nursery; var incubator = State.variables.incubator; var mercCosts = State.variables.mercenaries * 2000; var policyCost = State.variables.policyCost; - var costs = (State.variables.brothel * facilityCost) - + (State.variables.arcade * facilityCost * 0.5) - + (State.variables.club * facilityCost) - + (State.variables.dairy * facilityCost) + var costs = (brothel * facilityCost) + + (arcade * facilityCost * 0.5) + + (club * facilityCost) + + (dairy * facilityCost) + + (nursery * facilityCost) + + (farmyard * facilityCost) + (State.variables.incubator * facilityCost * 10); var secExpCost = 0; var soldierMod = 0; @@ -57,9 +60,6 @@ window.getCost = function(array) { if(club > 0) { costs += State.variables.clubAdsSpending; } - if (farmyard > 0) { - costs += farmyard*facilityCost; - } if(incubator > 0) { costs += ((State.variables.incubatorWeightSetting + State.variables.incubatorMusclesSetting + State.variables.incubatorReproductionSetting + State.variables.incubatorGrowthStimsSetting) * 500); }