Merge branch 'fixes' into 'pregmod-master'

Cheat Fixes

See merge request pregmodfan/fc-pregmod!2121

src/cheats/PCCheatMenuCheatDatatypeCleanup.tw

@@ -2,8 +2,13 @@
 
 <<set $nextButton = "Continue", $nextLink = "Manage Personal Affairs">>
 
-<<set WombImpregnate($PC, $PC.pregType, $PC.pregSource, $PC.preg)>>
-/*<<set WombNormalizePreg($PC)>>*/
+<<set $PC.preg = Number($PC.preg) || 0>>
+<<set $PC.pregSource = Number($PC.pregSource) || 0>>
+<<set $PC.pregType = Number($PC.pregType) || 0>>
+<<set $PC.pregMood = Number($PC.pregMood) || 0>>
+<<set WombInit($PC)>> /* just to make sure */
+<<set $PC.womb.length = 0>> /* simple way to delete all fetuses */
+<<set WombImpregnate($PC, $PC.pregType, $PC.pregSource, $PC.preg)>> /* recreates fetuses */
 <<if $PC.preg > 0>>
 	<<set $PC.belly = WombGetVolume($PC)>>
 	<<set $PC.pregWeek = $PC.preg>>
@@ -12,6 +17,7 @@
 	<<set $PC.pregWeek = 0>>
 <</if>>
 <<set $PC.pregMood = Number($PC.pregMood) || 0>>
+<<set $PC.boobs = ($PC.boobs == 0 ? 0 : 1)>>
 <<if $PC.boobs == 0>>
 	<<set $PC.boobsBonus = 0>>
 	<<set $PC.boobsImplant = 0>>
@@ -23,8 +29,10 @@
 <<if $PC.butt == 0>>
 	<<set $PC.buttImplant = 0>>
 <<else>>
-	<<set $PC.buttImplant = Math.clamp($PC.buttImplant, 0, 1)>>
+	<<set $PC.buttImplant = ($PC.buttImplant == 0 ? 0 : 1)>>
 <</if>>
+<<set $PC.dick = ($PC.dick == 0 ? 0 : 1)>>
+<<set $PC.vagina = ($PC.vagina == 0 ? 0 : 1)>>
 <<if $PC.dick == 1>>
 	<<set $PC.balls = Number($PC.balls) || 0>>
 	<<set $PC.ballsImplant = Number($PC.ballsImplant) || 0>>
@@ -33,9 +41,6 @@
 	<<set $PC.ballsImplant = 0>>
 <</if>>
 
-<<set $PC.dick = Math.clamp($PC.dick, 0, 1)>>
-<<set $PC.vagina = Math.clamp($PC.vagina, 0, 1)>>
-
 <<set $PC.ageImplant = Number($PC.ageImplant) || 0>>
 <<set $playerAging = Number($playerAging) || 0>>
 <<set $PC.ageImplant = Number($PC.ageImplant) || 0>>
@@ -43,5 +48,7 @@
 <<set $PC.visualAge = Number($PC.visualAge) || 14>>
 <<set $PC.actualAge = Number($PC.actualAge) || 14>>
 <<set $PC.ovaryAge = Number($PC.ovaryAge) || 14>>
+<<set $PC.mother = Number($PC.mother) || 0>>
+<<set $PC.father = Number($PC.father) || 0>>
 
 You perform the dark rituals, pray to the dark gods and sold your soul for the power to reshape your body and life at will. What a cheater!
\ No newline at end of file

src/cheats/mod_EditArcologyCheat.tw

@@ -149,10 +149,9 @@ International slave variety is
 	 | [[All of the dicks (100%)|MOD_Edit Arcology Cheat][$seeDicks = 100]]
 <</if>>
 
-<<link "Go your own dick way">>
-	<<textbox "$seeDicks" $seeDicks>>
-	[[Apply|MOD_Edit Arcology Cheat][$seeDicks = Number($seeDicks) || 25]]
-<</link>>
+<br>&nbsp;&nbsp;&nbsp;&nbsp;Go your own dick way: 
+<<textbox "$seeDicks" $seeDicks>>
+[[Apply|MOD_Edit Arcology Cheat][$seeDicks = ($seeDicks == 0 ? 0 : (Math.clamp(Number($seeDicks), 0, 100) || 25))]]
 
 <br>Game mode:
 <<if $plot == 1>>

src/cheats/mod_EditSlaveCheatDatatypeCleanup.tw

@@ -61,7 +61,16 @@
 <<set $activeSlave.attrXY = Number($activeSlave.attrXY) || 0>>
 <<set $activeSlave.attrXX = Number($activeSlave.attrXX) || 0>>
 <<set $activeSlave.energy = Number($activeSlave.energy) || 0>>
-<<set WombNormalizePreg($activeSlave)>>
+<<set $activeSlave.preg = Number($activeSlave.preg) || 0>>
+<<set $activeSlave.pregSource = Number($activeSlave.pregSource) || 0>>
+<<set $activeSlave.pregType = Number($activeSlave.pregType) || 0>>
+<<if $activeSlave.broodmother == 0>>
+	<<set WombInit($activeSlave)>> /* just to make sure */
+	<<set $activeSlave.womb.length = 0>> /* simple way to delete all fetuses */
+	<<set WombImpregnate($activeSlave, $activeSlave.pregType, $activeSlave.pregSource, $activeSlave.preg)>> /* recreates fetuses */
+<<else>>
+	<<set WombNormalizePreg($activeSlave)>>
+<</if>>
 <<if $activeSlave.preg > 0>>
 	<<set $activeSlave.pregKnown = 1, $activeSlave.pregWeek = $activeSlave.preg>>
 <<else>>

src/cheats/mod_EditSlaveCheatDatatypeCleanupNew.tw

@@ -65,7 +65,16 @@
 <<set $tempSlave.vagina = Number($tempSlave.vagina) || 0>>
 <<set $tempSlave.vaginaLube = Number($tempSlave.vaginaLube) || 0>>
 <<set $tempSlave.pubertyAgeXX = Number($tempSlave.pubertyAgeXX) || 13>>
-<<set WombNormalizePreg($tempSlave)>>
+<<set $tempSlave.preg = Number($tempSlave.preg) || 0>>
+<<set $tempSlave.pregSource = Number($tempSlave.pregSource) || 0>>
+<<set $tempSlave.pregType = Number($tempSlave.pregType) || 0>>
+<<if $tempSlave.broodmother == 0>>
+	<<set WombInit($tempSlave)>> /* just to make sure */
+	<<set $tempSlave.womb.length = 0>> /* simple way to delete all fetuses */
+	<<set WombImpregnate($tempSlave, $tempSlave.pregType, $tempSlave.pregSource, $tempSlave.preg)>> /* recreates fetuses */
+<<else>>
+	<<set WombNormalizePreg($tempSlave)>>
+<</if>>
 <<set $tempSlave.pregWeek = Number($tempSlave.pregWeek) || Math.max($tempSlave.preg, 0)>>
 <<if $tempSlave.preg <= 0>>
 	<<set $tempSlave.pregKnown = 0>>