Merge branch 'pregmod-master' into 'pregmod-master'

Fixes and test revert

See merge request !671

src/js/pregJS.tw

@@ -7,13 +7,13 @@ window.getPregBellySize = function(s) {
 	var phi = 1.618;
 	
 	if(gestastionWeek <= 32) {
-		var targetLen = ((0.00006396 * (gestastionWeek ^ 4)) - (0.005501 * (gestastionWeek ^ 3)) + (0.161 * (gestastionWeek ^ 2)) - (0.76 * gestastionWeek) + 0.208);
+		var targetLen = ((0.00006396 * Math.pow(gestastionWeek, 4)) - (0.005501 * Math.pow(gestastionWeek, 3)) + (0.161 * Math.pow(gestastionWeek, 2)) - (0.76 * gestastionWeek) + 0.208);
 	} else if(gestastionWeek <= 106) {
-		var targetLen = ((-0.0000004675 * (gestastionWeek ^ 4)) + (0.0001905 * (gestastionWeek ^ 3)) - (0.029 * (gestastionWeek ^ 2)) + (2.132 * gestastionWeek) - 16.575);
+		var targetLen = ((-0.0000004675 * Math.pow(gestastionWeek, 4)) + (0.0001905 * Math.pow(gestastionWeek, 3)) - (0.029 * Math.pow(gestastionWeek, 2)) + (2.132 * gestastionWeek) - 16.575);
 	} else {
-		var targetLen = ((-0.00003266 * (gestastionWeek ^ 2)) + (0.076 * gestastionWeek) + 43.843);
+		var targetLen = ((-0.00003266 * Math.pow(gestastionWeek,2)) + (0.076 * gestastionWeek) + 43.843);
 	}
 	
-	var bellySize = (((4 / 3) * (Math.PI) * (phi / 2) * ((targetLen / 2) ^ 3)) * fetuses);
-	return bellySize
+	var bellySize = ((4 / 3) * (Math.PI) * (phi / 2) * (Math.pow((targetLen / 2), 3)) * fetuses);
+	return bellySize;
 };
\ No newline at end of file

src/pregmod/managePersonalAffairs.tw

@@ -20,7 +20,7 @@ Looking down;
 <<if $PC.boobsBonus > 2>>
 	you have a @@.orange;pair of H-cup breasts.@@ <<if $PC.boobsImplant == 1>>They are big, round, and obviously implants. They barely move when you fuck your slaves<<else>>They are all natural, heavy, and a bit saggy though they have some perk to them. Once they get going, it's hard to make them stop<</if>>.<<if $PC.preg > 30 || $PC.births > 0>> Your breasts feel even more enormous lately; likely a side effect of your lactation.<</if>><<if $PC.markings == "freckles">> The tops of your breasts and your cleavage are lightly freckled.<<elseif $PC.markings == "heavily freckled">> They are covered in freckles, which are particularly dense in the cleft between them.<</if>>
 <<elseif $PC.boobsBonus == 2>>
-	you have a @@.orange;pair of G-cup breasts.@@ <<if $PC.boobsImplant == 1>>They are kind of rounded and much to perky for their size to pass as real. They have a bit of bounce to them as you fuck a slave<<else>>They are all natural and a little heavy. The bounce everywhere when you fuck your slaves.<</if>>.<<if $PC.preg > 30 || $PC.births > 0>> Your breasts feel even more huge lately; likely a side effect of your lactation.<</if>><<if $PC.markings == "freckles">> The tops of your breasts and your cleavage are lightly freckled.<<elseif $PC.markings == "heavily freckled">> They are covered in freckles, which are particularly dense in the cleft between them.<</if>>
+	you have a @@.orange;pair of G-cup breasts.@@ <<if $PC.boobsImplant == 1>>They are kind of rounded and much to perky for their size to pass as real. They have a bit of bounce to them as you fuck a slave<<else>>They are all natural and a little heavy. The bounce everywhere when you fuck your slaves<</if>>.<<if $PC.preg > 30 || $PC.births > 0>> Your breasts feel even more huge lately; likely a side effect of your lactation.<</if>><<if $PC.markings == "freckles">> The tops of your breasts and your cleavage are lightly freckled.<<elseif $PC.markings == "heavily freckled">> They are covered in freckles, which are particularly dense in the cleft between them.<</if>>
 <<elseif $PC.boobsBonus == 1>>
 	you have a @@.orange;pair of F-cup breasts.@@ <<if $PC.boobsImplant == 1>>They are nice, perky and not obviously implants. Though the way they move when you fuck a slave pins them as such<<else>>They are nice and perky, despite their size. They bounce lewdly as you fuck your slaves.<</if>>.<<if $PC.preg > 30 || $PC.births > 0>> Your breasts feel bigger lately; likely a side effect of your lactation.<</if>><<if $PC.markings == "freckles">> The tops of your breasts and your cleavage are lightly freckled.<<elseif $PC.markings == "heavily freckled">> They are covered in freckles, which are particularly dense in the cleft between them.<</if>>
 <<elseif $PC.boobsBonus == -0.5>>
@@ -485,7 +485,7 @@ In total, you have given birth to:
 <br>
 
 <<if $PC.preg >= 8>>
-	You're currently <<print $PC.preg>> week<<if $PC.preg > 1>>s<</if>> pregnant, so contraception doesn't matter right now. <<print $PC.belly>>
+	You're currently <<print $PC.preg>> week<<if $PC.preg > 1>>s<</if>> pregnant, so contraception doesn't matter right now.
 <<elseif $PC.preg >= 6>>
 	You're having morning sickness. 
 <<elseif $PC.preg > 3>>

src/uncategorized/officeDescription.tw

@@ -203,7 +203,7 @@ A $PC.visualAge year old<<if $PC.markings == "freckles">>, freckled<<elseif $PC.
 <<if $PC.boobsBonus > 2>>
 	Your breasts are enormous<<if $PC.markings == "freckles">> with light freckling on the tops and in your cleavage<<elseif $PC.markings == "heavily freckled">> and covered in freckles, which are particularly dense in the cleft between them<</if>>. <<if $PC.boobsImplant == 1>>They are big, round, and obviously implants. They insist on maintaining their shape no matter how you move<<else>>They are all natural, heavy, and a bit saggy though they retain some perk. Every single move you make sends ripples through your cleavage. You catch yourself watching them move in the mirror every so often<</if>>.<<if $PC.preg > 30 || $PC.births > 0>> Your breasts feel even more enormous lately; likely a side effect of your lactation, though you could do without the wetspots forming over your nipples.<</if>>
 <<elseif $PC.boobsBonus == 2>>
-	Your breasts are huge<<if $PC.markings == "freckles">> with light freckling on the tops and in your cleavage<<elseif $PC.markings == "heavily freckled">> and covered in freckles, which are particularly dense in the cleft between them<</if>>. <<if $PC.boobsImplant == 1>>They are unaturally perky for their size. When you shake them, they barely move<<else>>They are all natural and a little heavy. They bounce lewdly when you shake them and take a little too long to calm down.<</if>>.<<if $PC.preg > 30 || $PC.births > 0>> Your breasts feel even more huge lately; likely a side effect of your lactation, though you could do without the wetspots forming over your nipples.<</if>>
+	Your breasts are huge<<if $PC.markings == "freckles">> with light freckling on the tops and in your cleavage<<elseif $PC.markings == "heavily freckled">> and covered in freckles, which are particularly dense in the cleft between them<</if>>. <<if $PC.boobsImplant == 1>>They are unaturally perky for their size. When you shake them, they barely move<<else>>They are all natural and a little heavy. They bounce lewdly when you shake them and take a little too long to calm down<</if>>.<<if $PC.preg > 30 || $PC.births > 0>> Your breasts feel even more huge lately; likely a side effect of your lactation, though you could do without the wetspots forming over your nipples.<</if>>
 <<elseif $PC.boobsBonus == 1>>
 	Your breasts are pretty big<<if $PC.markings == "freckles">> with light freckling on the tops and in your cleavage<<elseif $PC.markings == "heavily freckled">> and covered in freckles, which are particularly dense in the cleft between them<</if>>. <<if $PC.boobsImplant == 1>>They are nice, perky and not obviously implants. They jiggle only slightly when you shake them though<<else>>They are nice and perky, despite their size. They bounce lewdly when you shake them<</if>>.<<if $PC.preg > 30 || $PC.births > 0>> Your breasts feel bigger lately; likely a side effect of your lactation, though you could do without the wetspots forming over your nipples.<</if>>
 <<elseif $PC.boobsBonus == -0.5>>
@@ -231,7 +231,7 @@ A $PC.visualAge year old<<if $PC.markings == "freckles">>, freckled<<elseif $PC.
 	<<elseif $PC.belly >= 30000>>
 		Your chair has taken to creaking ominously whenever you shift your pregnant bulk, while you've taken to keeping your belly uncovered to give it room.
 	<<elseif $PC.belly >= 14000>>
-		You can barely fit before your desk anymore and have had to take measures to accommodate your gravidity
+		You can barely fit before your desk anymore and have had to take measures to accommodate your gravidity.
 	<<elseif $PC.belly >= 12000>>
 		You can barely wrap your arms around your huge pregnant belly, and when you do, your popped navel reminds you just how full you are.
 	<<elseif $PC.belly >= 10000>>