Merge branch 'BugFixes' into 'pregmod-master'

Patch I

See merge request pregmodfan/fc-pregmod!2153

src/cheats/mod_EditArcologyCheat.tw

@@ -149,7 +149,7 @@ International slave variety is
 	 | [[All of the dicks (100%)|MOD_Edit Arcology Cheat][$seeDicks = 100]]
 <</if>>
 
-<br>&nbsp;&nbsp;&nbsp;&nbsp;Go your own dick way: 
+<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))]]
 
@@ -173,9 +173,9 @@ International slave variety is
 <</if>>
 <</nobr>>*/
 
-<br><br>Arcology citizens: $ACitizens
+<br><br>Arcology citizens: <<print commaNum($ACitizens)>>
 <<textbox "$ACitizens" $ACitizens>>
-<br>Arcology sex slaves: $ASlaves
+<br>Arcology sex slaves: <<print commaNum($ASlaves)>>
 <<textbox "$ASlaves" $ASlaves>>
 <br>Arcology prosperity cap: $AProsperityCap
 <<textbox "$AProsperityCap" $AProsperityCap>>
@@ -321,4 +321,4 @@ International slave variety is
 <br>&nbsp;&nbsp;&nbsp;&nbsp;__'' $arcologies[0].name''__ is your arcology.
 <br>You own: ''$arcologies[0].ownership%'' of the arcology <<textbox "$arcologies[0].ownership" $arcologies[0].ownership>>
 <br>Other minority ownership: ''$arcologies[0].minority%'' <<textbox "$arcologies[0].minority" $arcologies[0].minority>>
-<br>$arcologies[0].name's GSP is @@.yellowgreen;<<print cashFormat(Math.trunc(0.1*$arcologies[0].prosperity))>>m@@.
\ No newline at end of file
+<br>$arcologies[0].name's GSP is @@.yellowgreen;<<print cashFormat(Math.trunc(0.1*$arcologies[0].prosperity))>>m@@.

src/pregmod/electiveSurgery.tw

@@ -140,7 +140,7 @@ You have @@.orange;$PC.skin skin.@@<<if $PC.skin != $PC.origSkin>> Your original
 	@@.orange;You're flat.@@ "We can fix that, if you want."
 	<br>[[Get a pair of breasts|PC Surgery Degradation][$PC.boobs = 1, $PC.boobsBonus = -1, $cash -= 15000, $surgeryType = "breasts"]]
 <</if>>
-	
+
 <<if $PC.belly >= 100 && $PC.preg > 3>>
 <br><br>She darts for your middle.
 <<if $PC.belly >= 120000>>
@@ -248,7 +248,7 @@ You have @@.orange;$PC.skin skin.@@<<if $PC.skin != $PC.origSkin>> Your original
 <</if>>
 
 <<if $PC.dick == 1>>
-<br><br>"We could add gel around your testes to make your balls look bigger. Would also dampen any impacts to them as well, if that is anything to consider." She says, running a finger down the length of your shaft. "@@.yellowgreen;<<print cashFormat(7500)>>@@ for draining and @@.yellowgreen;<<print cashFormat(15000)>>@@ for filling, it's not the most simple procedure, you know? Anyway, they'll be very obvious, if that turns you on." 
+<br><br>"We could add gel around your testes to make your balls look bigger. Would also dampen any impacts to them as well, if that is anything to consider." She says, running a finger down the length of your shaft. "@@.yellowgreen;<<print cashFormat(7500)>>@@ for draining and @@.yellowgreen;<<print cashFormat(15000)>>@@ for filling, it's not the most simple procedure, you know? Anyway, they'll be very obvious, if that turns you on."
 <<if $AGrowth == 2>>
 	She takes another look at you before offering another option "of course, if you want bigger balls in a <i>functional</i> sense, we can do that too. The doctor's research in advanced targeted growth hormones has shown promising results in slaves, and he's been able to use them successfully on a few citizen patients so far. A direct injection of hormone gel, and your testes and prostate will grow on their own. Unlike the cosmetic gel, there's no reversing this treatment. It's expensive too, for the high quality drugs you want, @@.yellowgreen;<<print cashFormat(15000)>>@@ for one round of therapy. It'll cost @@.yellowgreen;<<print cashFormat(20000)>>@@ if you want hormone treatment and a gel adjustment at the same time.<br>
 <<else>>
@@ -282,7 +282,7 @@ You have @@.orange;$PC.skin skin.@@<<if $PC.skin != $PC.origSkin>> Your original
 	<<elseif $PC.ballsImplant == 1>>
 		You have a @@.orange;large pair of balls;@@ you can certainly feel them as you move.
 		<br>[[Remove the gel and get hormone treatment|PC Surgery Degradation][$PC.ballsImplant = 1, $PC.balls = 1, $cash -= 20000, $surgeryType = "ballBigShrinkage"]] | [[Just get hormone treatment|PC Surgery Degradation][$PC.balls = 1, $PC.ballsImplant = 2, $cash -= 15000, $surgeryType = "ballEnlargementHorm"]] | [[Just get gel extracted|PC Surgery Degradation][$PC.ballsImplant = 0, $cash -= 7500, $surgeryType = "ballShrinkage"]] | [[Have more gel added|PC Surgery Degradation][$PC.ballsImplant = 2, $cash -= 15000, $surgeryType = "ballEnlargement"]]
-	<<else>>	
+	<<else>>
 		You have a @@.orange;normal, uneventful pair of balls.@@
 		<br>[[Get hormone treatment|PC Surgery Degradation][$PC.balls = 1, $PC.ballsImplant = 1, $cash -= 15000, $surgeryType = "ballEnlargementHorm"]] | [[Have the gel added|PC Surgery Degradation][$PC.ballsImplant = 1, $cash -= 15000, $surgeryType = "ballEnlargement"]]
 	<</if>>
@@ -325,8 +325,8 @@ You have @@.orange;$PC.skin skin.@@<<if $PC.skin != $PC.origSkin>> Your original
 <<if $PC.dick == 1 && $PC.vagina == 1>>
 	You have working @@.orange;male and female reproductive organs@@ and a @@.orange;<<if $PC.title > 0>>masculine<<else>>feminine<</if>> appearance.@@ "We'll store some of your sperm for you, should you decide to lose your maleness, and have it shipped to your arcology. Who you decide to use it on, well... That's up to you!"
 	<br>
-	[[Remove your male half|PC Surgery Degradation][$PC.ballsImplant = 0, $PC.balls = 0, $PC.dick = 0, $PC.storedCum += 10, $cash -= 25000, $surgeryType = "herm2female"]] | 
-	[[Remove your female half|PC Surgery Degradation][$PC.vagina = 0, $PC.preg = 0, WombFlush($PC), $cash -= 25000, $surgeryType = "herm2male"]] 
+	[[Remove your male half|PC Surgery Degradation][$PC.ballsImplant = 0, $PC.balls = 0, $PC.dick = 0, $PC.storedCum += 10, $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.storedCum += 10, $PC.title = 0, $PC.pronoun = "she", $PC.object = "her", $PC.possessive = "her", $cash -= 25000, $surgeryType = "herm2truefemale"]]
 	<<else>>
@@ -335,19 +335,19 @@ You have @@.orange;$PC.skin skin.@@<<if $PC.skin != $PC.origSkin>> Your original
 <<elseif $PC.dick == 1>>
 	You have @@.orange;male genitalia@@ and a @@.orange;<<if $PC.title > 0>>masculine<<else>>feminine<</if>> appearance.@@ "We'll store some of your sperm for you, should you decide to lose your maleness, and have it shipped to your arcology. Who you decide to use it on, well... That's up to you!"
 	<br>
-	[[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"]] | 
+	[[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.storedCum += 10, $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 woman|PC Surgery Degradation][$PC.ballsImplant = 0, $PC.balls = 0, $PC.dick = 0, $PC.storedCum += 10, $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.@@
 	<br>
-	[[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"]] | 
+	[[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.pronoun = "he", $PC.object = "him", $PC.possessive = "his", $PC.boobs = 0, $PC.boobsBonus = 0, $PC.boobsImplant = 0, $cash -= 50000, $surgeryType = "female2truemale"]] | 
+		| [[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>>