Merge branch 'fixes' into 'pregmod-master'

Fixes

See merge request pregmodfan/fc-pregmod!3033

src/pregmod/manageEconomy.tw

@@ -8,9 +8,9 @@ __Economy__<br>
 	</span>
 	<<if ($cheatMode) && ($cheatModeM)>>
 		<<set _Teconomy = $economy>>
-		<<textbox "$economy" $economy>>
+		<<textbox "_Teconomy" _Teconomy>>
 		<<link "Apply">>
-		<<set $economy = Math.trunc(Number($economy)) || _Teconomy, $cheater = 1>>
+		<<set $economy = Math.trunc(Number(_Teconomy)) || $economy, $cheater = 1>>
 		<<replace "#economy">>
 		@@.yellowgreen;Global Economy@@
 		| <<print $economy>>
@@ -25,9 +25,9 @@ __Economy__<br>
 	</span>
 	<<if ($cheatMode) && ($cheatModeM)>>
 		<<set _TlocalEcon = $localEcon>>
-		<<textbox "$localEcon" $localEcon>>
+		<<textbox "_TlocalEcon" _TlocalEcon>>
 		<<link "Apply">>
-		<<set $localEcon = Math.trunc(Number($localEcon)) || _TlocalEcon, $cheater = 1>>
+		<<set $localEcon = Math.trunc(Number(_TlocalEcon)) || $localEcon, $cheater = 1>>
 		<<replace "#localEcon">>
 		@@.yellowgreen;Local Economy@@
 		| <<print $localEcon>>
@@ -167,9 +167,9 @@ Slave demand is
 	| <<print $menialDemandFactor>>
 	</span>
 	<<set _TmenialDemandFactor = $menialDemandFactor>>
-	<<textbox "$menialDemandFactor" $menialDemandFactor>>
+	<<textbox "_TmenialDemandFactor" _TmenialDemandFactor>>
 	<<link "Apply">>
-	<<set $menialDemandFactor = Math.clamp(Math.trunc(Number($menialDemandFactor)),-50000,50000) || _TmenialDemandFactor, $cheater = 1>>
+	<<set $menialDemandFactor = Math.clamp(Math.trunc(Number(_TmenialDemandFactor)),-50000,50000) || $menialDemandFactor, $cheater = 1>>
 	<<replace "#menialDemandFactor">>
 	@@.yellowgreen; Slave Demand@@
 	| <<print $menialDemandFactor>>
@@ -207,9 +207,9 @@ Slave supply is
 	| <<print $menialSupplyFactor>>
 	</span>
 	<<set _TmenialSupplyFactor = $menialSupplyFactor>>
-	<<textbox "$menialSupplyFactor" $menialSupplyFactor>>
+	<<textbox "_TmenialSupplyFactor" _TmenialSupplyFactor>>
 	<<link "Apply">>
-	<<set $menialSupplyFactor = Math.clamp(Math.trunc(Number($menialSupplyFactor)),-50000,50000) || _TmenialSupplyFactor, $cheater = 1>>
+	<<set $menialSupplyFactor = Math.clamp(Math.trunc(Number(_TmenialSupplyFactor)),-50000,50000) || $menialSupplyFactor, $cheater = 1>>
 	<<replace "#menialSupplyFactor">>
 	@@.yellowgreen; Slave Supply@@
 	| <<print $menialSupplyFactor>>

src/uncategorized/dairyReport.tw

@@ -376,8 +376,8 @@
 		<<set $slaves[$i].livingRules = "normal">>
 	<</switch>>
 	<<if $dairyPregSetting > 0>>
-		<<set WombCleanGenericReserve($slaves[_i], "incubator", 9999)>>
-		<<set WombCleanGenericReserve($slaves[_i], "nursery", 9999)>>
+		<<set WombCleanGenericReserve($slaves[$i], "incubator", 9999)>>
+		<<set WombCleanGenericReserve($slaves[$i], "nursery", 9999)>>
 	<</if>>
 	
 	/* General End of Week effects */