costs application and cleanup

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);
 	}

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);
 	}