fixes and cheat edit pregnancy fixing

devNotes/VersionChangeLog-Premod+LoliMod.txt

@@ -4,6 +4,10 @@
 
 4/29/2018
 
+	77
+	-fixed some text issues
+	-fixed all cheat edit pregnancies
+
 	76
 	-multiple fixed bugs
 	-tweak to oversized breast decrease rate (it's no longer instant)

src/cheats/PCCheatMenu.tw

 :: PCCheatMenu [nobr]
 
-<<set $showEncyclopedia = 0, $nextButton = "Back", $nextLink = "PCCheatMenuCheatDatatypeCleanup">>
+<<set $showEncyclopedia = 0, $nextButton = "Apply", $nextLink = "PCCheatMenuCheatDatatypeCleanup">>
 
 <<if $PC.title > 0>>
 	''Master''.
@@ -67,14 +67,11 @@
 <br>''PlayerAging'': <<textbox "$playerAging" $playerAging "PCCheatMenu">> //0 - no aging, 1 - no aging, but birthdays, 2 - aging//
 
 <<if $PC.vagina == 1>>
-	<<if $PC.preg >= 1>>
-		__pregnancy__
-		<br>''Pregnancy length'': <<textbox "$PC.preg" $PC.preg "PCCheatMenu">> //How far along the your pregnancy is (pregMood kicks in at 24+ weeks) -2      infertile -1      contraceptives 0      not pregnant 1 - 42 pregnant 43+    giving birth//\
-		<br>''Belly'': <<textbox "$PC.belly" $PC.belly "PCCheatMenu">> //how big your belly is in CCs (preg only). thresholds 100    - bloated 1500   - early pregnancy 5000   - obviously pregnant 10000  - very pregnant 15000  - full term 30000  - full term twins 45000  - full term triplets 60000  - full term quads 75000  - full term quints 90000  - full term sextuplets 105000 - full term septuplets 120000 - full term octuplets//
-		<br>''PregSource'': <<textbox "$PC.pregSource" $PC.pregSource "PCCheatMenu">> //who knocked you up 0 - unknown -1 - Societal Elite -2 - client -3 - former master -4 - male arc owner -5 - citizen -6 - self-impreg//
-	<<else>>
-		<br>''Contraception'': <<textbox "$PC.preg" $PC.preg "PCCheatMenu">> // 0 -fertile, -1 -contraceptives, -2 -infertile , 1+ -pregnant
-	<</if>>
+	<br><br>
+	__pregnancy__
+	<br>''Pregnancy length'': <<textbox "$PC.preg" $PC.preg "PCCheatMenu">> //How far along the your pregnancy is (pregMood kicks in at 24+ weeks) -2      infertile -1      contraceptives 0      not pregnant 1 - 42 pregnant 43+    giving birth//\
+	<br>''Fetus Count'': <<textbox "$PC.pregType" $PC.pregType "PCCheatMenu">> //How many you're having (1-8)//
+	<br>''PregSource'': <<textbox "$PC.pregSource" $PC.pregSource "PCCheatMenu">> //who knocked you up 0 - unknown -1 - Societal Elite -2 - client -3 - former master -4 - male arc owner -5 - citizen -6 - self-impreg//
 	<br>''PregMood'': <<textbox "$PC.pregMood" $PC.pregMood "PCCheatMenu">> //how you act when heavily pregnant. 0: no change 1: submissive and motherly 2: aggressive and dominant//
 <</if>>
 

src/cheats/PCCheatMenuCheatDatatypeCleanup.tw

@@ -2,13 +2,9 @@
 
 <<set $nextButton = "Continue", $nextLink = "Manage Personal Affairs">>
 
-<<if $PC.preg >= 1>>
-	<<set $PC.preg = Number($PC.preg) || 0>>
-	<<set $PC.pregSource = Number($PC.pregSource) || 0>>
-	<<set $PC.pregMood = Number($PC.pregMood) || 0>>
-<</if>>
 <<set WombNormalizePreg($PC), $PC.pregWeek = $PC.preg>>
 <<set $PC.belly = WombGetVolume($PC)>>
+<<set $PC.pregMood = Number($PC.pregMood) || 0>>
 <<if $PC.boobs == 0>>
 	<<set $PC.boobsBonus = 0>>
 	<<set $PC.boobsImplant = 0>>
@@ -39,4 +35,6 @@
 <<set $PC.physicalAge = Number($PC.physicalAge) || 14>>
 <<set $PC.visualAge = Number($PC.visualAge) || 14>>
 <<set $PC.actualAge = Number($PC.actualAge) || 14>>
-<<set $PC.ovaryAge = Number($PC.ovaryAge) || 14>>
+<<set $PC.ovaryAge = Number($PC.ovaryAge) || 14>>
\ No newline at end of file
+
+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_EditSlaveCheatDatatypeCleanup.tw

@@ -50,9 +50,6 @@
 <<set $activeSlave.vaginaLube = Number($activeSlave.vaginaLube) || 0>>
 <<set $activeSlave.vaginalSkill = Number($activeSlave.vaginalSkill) || 0>>
 <<set $activeSlave.preg = Number($activeSlave.preg) || 0>>
-<<if $activeSlave.preg < 0>>
-	<<set $activeSlave.pregKnown = 0>>
-<</if>>
 <<set $activeSlave.dick = Number($activeSlave.dick) || 0>>
 <<set $activeSlave.clit = Number($activeSlave.clit) || 0>>
 <<set $activeSlave.labia = Number($activeSlave.labia) || 0>>
@@ -64,6 +61,12 @@
 <<set $activeSlave.attrXY = Number($activeSlave.attrXY) || 0>>
 <<set $activeSlave.attrXX = Number($activeSlave.attrXX) || 0>>
 <<set $activeSlave.energy = Number($activeSlave.energy) || 0>>
+<<set WombNormalizePreg($activeSlave), $activeSlave.pregWeek = $activeSlave.preg>>
+<<if $activeSlave.preg > 0>>
+	<<set $activeSlave.pregKnown = 1>>
+<<else>>
+	<<set $activeSlave.pregKnown = 0>>
+<</if>>
 <<SetBellySize $activeSlave>>
 
 You perform the dark rituals, pray to the dark gods and sold your soul for the power to change and mold slaves to your will.

src/cheats/mod_EditSlaveCheatDatatypeCleanupNew.tw

@@ -65,11 +65,9 @@
 <<set $tempSlave.vagina = Number($tempSlave.vagina) || 0>>
 <<set $tempSlave.vaginaLube = Number($tempSlave.vaginaLube) || 0>>
 <<set $tempSlave.pubertyAgeXX = Number($tempSlave.pubertyAgeXX) || 13>>
-<<set $tempSlave.preg = Number($tempSlave.preg) || 0>>
-<<set $tempSlave.pregWeek = Number($tempSlave.pregWeek) || 0>>
-<<set $tempSlave.pregType = Number($tempSlave.pregType) || 0>>
-<<set $tempSlave.pregSource = Number($tempSlave.pregSource) || 0>>
-<<if $tempSlave.preg < 0>>
+<<set WombNormalizePreg($tempSlave)>>
+<<set $tempSlave.pregWeek = Number($tempSlave.pregWeek) || $tempSlave.preg>>
+<<if $tempSlave.preg <= 0>>
 	<<set $tempSlave.pregKnown = 0>>
 <<elseif $tempSlave.preg > 0>>
 	<<set $tempSlave.pregKnown = 1>>

src/pregmod/electiveSurgery.tw

@@ -328,9 +328,9 @@ You have @@.orange;$PC.skin skin.@@<<if $PC.skin != $PC.origSkin>> Your original
 	[[Remove your male half|PC Surgery Degradation][$PC.ballsImplant = 0, $PC.balls = 0, $PC.dick = 0, $cash -= 25000, $surgeryType = "herm2female"]] | 
 	[[Remove your female half|PC Surgery Degradation][$PC.vagina = 0, $PC.preg = 0, WombFlush($PC), $cash -= 25000, $surgeryType = "herm2male"]] 
 	<<if $PC.title > 0>>
-		| [[Remove your male half completely|PC Surgery Degradation][$PC.ballsImplant = 0, $PC.balls = 0, $PC.dick = 0, $PC.title = 0, $cash -= 25000, $surgeryType = "herm2truefemale"]]
+		| [[Remove your male half completely|PC Surgery Degradation][$PC.ballsImplant = 0, $PC.balls = 0, $PC.dick = 0, $PC.title = 0, $PC.pronoun = "she", $PC.object = "her", $PC.possessive = "her", $cash -= 25000, $surgeryType = "herm2truefemale"]]
 	<<else>>
-		| [[Remove your female half completely|PC Surgery Degradation][$PC.vagina = 0, $PC.preg = 0, WombFlush($PC), $PC.boobs = 0, $PC.boobsBonus = 0, $PC.boobsImplant = 0, $PC.title = 1, $cash -= 25000, $surgeryType = "herm2truemale"]]
+		| [[Remove your female half completely|PC Surgery Degradation][$PC.vagina = 0, $PC.preg = 0, WombFlush($PC), $PC.boobs = 0, $PC.boobsBonus = 0, $PC.boobsImplant = 0, $PC.title = 1, $PC.pronoun = "he", $PC.object = "him", $PC.possessive = "his", $cash -= 25000, $surgeryType = "herm2truemale"]]
 	<</if>>
 <<elseif $PC.dick == 1>>
 	You have @@.orange;male genitalia@@ and a @@.orange;<<if $PC.title > 0>>masculine<<else>>feminine<</if>> appearance.@@
@@ -338,8 +338,8 @@ You have @@.orange;$PC.skin skin.@@<<if $PC.skin != $PC.origSkin>> Your original
 	[[Have your male organs replaced with female ones|PC Surgery Degradation][$PC.ballsImplant = 0, $PC.balls = 0, $PC.dick = 0, $PC.vagina = 1, $PC.newVag = 1, $cash -= 50000, $surgeryType = "male2female"]] | 
 	[[Add a female reproductive tract|PC Surgery Degradation][$PC.vagina = 1, $PC.newVag = 1, $PC.preg = 0, WombFlush($PC), $cash -= 150000, $surgeryType = "male2herm"]]
 	<<if $PC.title > 0>>
-		 | [[Become a woman|PC Surgery Degradation][$PC.ballsImplant = 0, $PC.balls = 0, $PC.dick == 0, $PC.vagina = 1, $PC.newVag = 1, $PC.preg = 0, $PC.title = 0, $cash -= 50000, $surgeryType = "male2truefemale"]] | 
-		 | [[Become a hermaphrodite girl|PC Surgery Degradation][$PC.vagina = 1, $PC.newVag = 1, $PC.preg = 0, WombFlush($PC), $PC.title = 0, $cash -= 150000, $surgeryType = "male2hermfemale"]]
+		 | [[Become a woman|PC Surgery Degradation][$PC.ballsImplant = 0, $PC.balls = 0, $PC.dick = 0, $PC.vagina = 1, $PC.newVag = 1, $PC.preg = 0, $PC.title = 0, $PC.pronoun = "she", $PC.object = "her", $PC.possessive = "her", $cash -= 50000, $surgeryType = "male2truefemale"]] | 
+		 | [[Become a hermaphrodite girl|PC Surgery Degradation][$PC.vagina = 1, $PC.newVag = 1, $PC.preg = 0, WombFlush($PC), $PC.title = 0, $PC.pronoun = "she", $PC.object = "her", $PC.possessive = "her", $cash -= 150000, $surgeryType = "male2hermfemale"]]
 	<</if>>
 <<else>>
 	You have @@.orange;female genitalia@@ and a @@.orange;<<if $PC.title > 0>>masculine<<else>>feminine<</if>> appearance.@@
@@ -347,8 +347,8 @@ You have @@.orange;$PC.skin skin.@@<<if $PC.skin != $PC.origSkin>> Your original
 	[[Have your female organs replaced with male ones|PC Surgery Degradation][$PC.ballsImplant = 0, $PC.balls = 0, $PC.dick = 1, $PC.vagina = 0, $cash -= 50000, $surgeryType = "female2male"]] | 
 	[[Add a male reproductive tract|PC Surgery Degradation][$PC.ballsImplant = 0, $PC.balls = 0, $PC.dick = 1, $cash -= 150000, $surgeryType = "female2herm"]]
 	<<if $PC.title == 0>>
-		| [[Become a man|PC Surgery Degradation][$PC.ballsImplant = 0, $PC.balls = 0, $PC.dick = 1, $PC.vagina = 0, $PC.preg = 0, WombFlush($PC), $PC.title = 1, $PC.boobs = 0, $PC.boobsBonus = 0, $PC.boobsImplant = 0, $cash -= 50000, $surgeryType = "female2truemale"]] | 
-		| [[Become a hermaphrodite boy|PC Surgery Degradation][$PC.ballsImplant = 0, $PC.balls = 0, $PC.dick = 1, $PC.title = 1, $PC.boobs = 0, $PC.boobsBonus = 0, $PC.boobsImplant = 0, $cash -= 150000, $surgeryType = "female2hermmale"]]
+		| [[Become a man|PC Surgery Degradation][$PC.ballsImplant = 0, $PC.balls = 0, $PC.dick = 1, $PC.vagina = 0, $PC.preg = 0, WombFlush($PC), $PC.title = 1, $PC.pronoun = "he", $PC.object = "him", $PC.possessive = "his", $PC.boobs = 0, $PC.boobsBonus = 0, $PC.boobsImplant = 0, $cash -= 50000, $surgeryType = "female2truemale"]] | 
+		| [[Become a hermaphrodite boy|PC Surgery Degradation][$PC.ballsImplant = 0, $PC.balls = 0, $PC.dick = 1, $PC.title = 1, $PC.pronoun = "he", $PC.object = "him", $PC.possessive = "his", $PC.boobs = 0, $PC.boobsBonus = 0, $PC.boobsImplant = 0, $cash -= 150000, $surgeryType = "female2hermmale"]]
 	<</if>>
 <</if>>
 <</if>>

src/uncategorized/RESS.tw

@@ -1317,7 +1317,7 @@ There is a horrible crash from the shower. You rush in to see <<EventNameLink $a
 <<else>>
 	She <<say>>s, "<<Master>>, I want to know what it'<<s>> like to have a cock in my virgin pu<<ss>>y. <<S>>eeing <<s>>o many of the other <<s>>lave<<s>> getting fucked looks like so much fun. I'm <<s>>o turned on by it. I can't be a proper <<s>>e<<x>> <<s>>lave without u<<s>>ing my pu<<ss>>y. Plea<<s>>e take my virginity, <<Master>>."
 <</if>>
-She spreads her legs and her hips <<if $activeSlave.belly >= 10000>>carefully<<else>>suggestively<</if>> at you.
+She spreads her legs <<if $activeSlave.belly >= 10000>>carefully and cocks her hips<<else>>and cocks her hips suggestively<</if>> at you.
 <<case "devoted anal virgin">>
@@ -8570,7 +8570,7 @@ You tell her kindly that you understand, and that she'll be trained to address t
 	<<elseif canDoAnal($activeSlave)>>
 		Her hungry asshole spasms with orgasm, but she doesn't even pause her anal masturbation.
 	<<else>>
-		Her hole body spasms with orgasm, but she doesn't even pause her efforts to draw out an orgasm by any means possible.
+		Her whole body spasms with orgasm, but she doesn't even pause her efforts to draw out an orgasm by any means possible.
 	<</if>>
 	For the hour or so it takes her to pass out, slaves using the kitchen have to step over her prostrate, orgasming body, lying in a pool of her own drool, tears, sweat, and fluids. The next time you see her in the kitchen, she takes her medicine like a @@.gold;good girl.@@ All your aphrodisiac addicts recognize the symptoms and the punishment, and @@.gold;avoid even thinking@@ about resisting the system.
 	<<set $slaves.forEach(function(s) { if (s.aphrodisiacs > 0 || s.inflationType == "aphrodisiac") { s.trust -= 5; } })>>

src/utility/descriptionWidgetsFlesh.tw

@@ -4680,7 +4680,7 @@ $pronounCap has
 		<<elseif $activeSlave.physicalAge <= 12>>
 			and $pronoun is nothing more than a breaking womb with a loli attached. $pronounCap struggles to not be lost under the squirming mass of infants that threaten to rupture $possessive body.<<if $activeSlave.amp == 0>> $pronounCap requires multiple slaves to get to $possessive feet<<if $saleDescription == 0>>, and uses a wheeled stand to support $possessive pregnancy when $pronoun must walk anywhere<</if>>.<</if>>
 		<<elseif $activeSlave.height >= 185>>
-			but $possessive tall frame can keep $possessive straining belly off the ground; but only for a moment. $pronoun opts to not try this often as $possessive womb is already at its limit and could do without being slammed against the floor.<<if $activeSlave.amp == 0>> $pronounCap requires multiple slaves to get to $possessive feet<<if $saleDescription == 0>>, and uses a wheeled stand to support $possessive pregnancy when $pronoun must walk anywhere<</if>>.<</if>>
+			but $possessive tall frame can keep $possessive straining belly off the ground; but only for a moment. $pronounCap opts to not try this often as $possessive womb is already at its limit and could do without being slammed against the floor.<<if $activeSlave.amp == 0>> $pronounCap requires multiple slaves to get to $possessive feet<<if $saleDescription == 0>>, and uses a wheeled stand to support $possessive pregnancy when $pronoun must walk anywhere<</if>>.<</if>>
 		<<elseif $activeSlave.height < 150>>
 			and $pronoun is nothing more than a breaking womb with a girl attached. $pronounCap struggles to remain seen under the squirming mass of infants that threaten to rupture $possessive body.<<if $activeSlave.amp == 0>> $pronounCap requires multiple slaves to get to $possessive feet<<if $saleDescription == 0>>, and uses a wheeled stand to support $possessive pregnancy when $pronoun must walk anywhere<</if>>.<</if>>
 		<<elseif $activeSlave.muscles > 90>>
@@ -4689,9 +4689,9 @@ $pronounCap has
 			and $pronoun is nothing more than a breaking womb with a girl attached. $pronounCap is physically unable to keep $possessive straining belly off the ground.<<if $activeSlave.amp == 0>> $pronounCap requires multiple slaves to get to $possessive feet<<if $saleDescription == 0>>, and uses a wheeled stand to support $possessive pregnancy when $pronoun must walk anywhere<</if>>.<</if>>
 		<</if>>
 		<<if $activeSlave.weight > 190>>
-			$possessiveCap massively fat belly is stretched to the limit, so much so $possessive folds are pulled flat and $possessive softness, firm. Despite being so taut, you can clearly see the grotesque figures of the infants forced against $possessive uterine walls by their siblings. $possessive womb is so cramped, they can barely squirm at all under the pressure and it is a wonder $pronoun has managed to grow this large.
+			$possessiveCap massively fat belly is stretched to the limit, so much so $possessive folds are pulled flat and $possessive softness, firm. Despite being so taut, you can clearly see the grotesque figures of the infants forced against $possessive uterine walls by their siblings. $possessiveCap womb is so cramped, they can barely squirm at all under the pressure and it is a wonder $pronoun has managed to grow this large.
 		<<else>>
-			Despite being stretched taut, you can clearly see the grotesque figures of the infants forced against $possessive uterine walls by their siblings. $possessive womb is so cramped, they can barely squirm at all under the pressure and it is a wonder $pronoun has managed to grow this large; even the slightest provocation could cause $possessive to burst.
+			Despite being stretched taut, you can clearly see the grotesque figures of the infants forced against $possessive uterine walls by their siblings. $possessiveCap womb is so cramped, they can barely squirm at all under the pressure and it is a wonder $pronoun has managed to grow this large; even the slightest provocation could cause $possessive to burst.
 		<</if>>
 		<<if $activeSlave.preg < 30>>
 			Worse still, $pronoun isn't even close to full term. It will be a miracle if $object manages to complete $possessive pregnancy intact.