Merge remote-tracking branch 'jhawkkaw/master'

locations/Cheatmenu_din.qsrc

@@ -196,36 +196,76 @@ $cheatmenu['bodyMod'] = {
 	''
 	'You may select from the following sizes:'
 	''
-	'starving (No, you may not select ''starving'', it''s here to show where the scale starts)'
-	''
-	if salocatnow ! 1:
-		'<a href="exec:salo = 20 & gs ''body_shape'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<$bodimgsets[((bodset * 10) + 1)]>></a>'
-		''
-	end
-	if salocatnow ! 2:
-		'<a href="exec:salo = 40 & gs ''body_shape'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<$bodimgsets[((bodset * 10) + 2)]>></a>'
-		''
-	end
-	if salocatnow ! 3:
-		'<a href="exec:salo = 60 & gs ''body_shape'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<$bodimgsets[((bodset * 10) + 3)]>></a>'
-		''
-	end
-	if salocatnow ! 4:
-		'<a href="exec:salo = 80 & gs ''body_shape'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<$bodimgsets[((bodset * 10) + 4)]>></a>'
-		''
-	end
-	if salocatnow ! 5:
-		'<a href="exec:salo = 100 & gs ''body_shape'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<$bodimgsets[((bodset * 10) + 5)]>></a>'
-		''
-	end
-	if salocatnow ! 6:
-		'<a href="exec:salo = 120 & gs ''body_shape'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<$bodimgsets[((bodset * 10) + 6)]>></a>'
-		''
-	end
-	if salocatnow ! 7:
-		'<a href="exec:salo = 140 & gs ''body_shape'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<$bodimgsets[((bodset * 10) + 7)]>></a>'
+	if bodset ! 3:
+		'starving (No, you may not select ''starving'', it''s here to show where the scale starts)'
 		''
+		if salocatnow ! 1:
+			'<a href="exec:salo = 20 & gs ''body_shape'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<$bodimgsets[((bodset * 10) + 1)]>></a>'
+			''
+		end
+		if salocatnow ! 2:
+			'<a href="exec:salo = 40 & gs ''body_shape'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<$bodimgsets[((bodset * 10) + 2)]>></a>'
+			''
+		end
+		if salocatnow ! 3:
+			'<a href="exec:salo = 60 & gs ''body_shape'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<$bodimgsets[((bodset * 10) + 3)]>></a>'
+			''
+		end
+		if salocatnow ! 4:
+			'<a href="exec:salo = 80 & gs ''body_shape'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<$bodimgsets[((bodset * 10) + 4)]>></a>'
+			''
+		end
+		if salocatnow ! 5:
+			'<a href="exec:salo = 100 & gs ''body_shape'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<$bodimgsets[((bodset * 10) + 5)]>></a>'
+			''
+		end
+		if salocatnow ! 6:
+			'<a href="exec:salo = 120 & gs ''body_shape'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<$bodimgsets[((bodset * 10) + 6)]>></a>'
+			''
+		end
+		if salocatnow ! 7:
+			'<a href="exec:salo = 140 & gs ''body_shape'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<$bodimgsets[((bodset * 10) + 7)]>></a>'
+			''
+		end
+	else
+		if (pregchem < 2688) = 0:
+			'<a href="exec:pregchem = 100 & pregtime = 4 & gs ''body_shape'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<$bodimgsets[((bodset * 10))]>></a>'
+			''
+		end
+		if (pregchem >= 2688 and pregchem < 3192) = 0:
+			'<a href="exec:pregchem = 2688 & pregtime = 112 & gs ''body_shape'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<$bodimgsets[((bodset * 10) + 1)]>></a>'
+			''
+		end
+		if (pregchem >= 3192 and pregchem < 3696) = 0:
+			'<a href="exec:pregchem = 3192 & pregtime = 133 & gs ''body_shape'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<$bodimgsets[((bodset * 10) + 2)]>></a>'
+			''
+		end
+		if (pregchem >= 3696 and pregchem < 4200) = 0:
+			'<a href="exec:pregchem = 3696 & pregtime = 133 & gs ''body_shape'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<$bodimgsets[((bodset * 10) + 3)]>></a>'
+			''
+		end
+		if (pregchem >= 4200 and pregchem < 4704) = 0:
+			'<a href="exec:pregchem = 4200 & pregtime = 154 & gs ''body_shape'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<$bodimgsets[((bodset * 10) + 4)]>></a>'
+			''
+		end
+		if (pregchem >= 4704 and pregchem < 5208) = 0:
+			'<a href="exec:pregchem = 4704 & pregtime = 175 & gs ''body_shape'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<$bodimgsets[((bodset * 10) + 5)]>></a>'
+			''
+		end
+		if (pregchem >= 5208 and pregchem < 5712) = 0:
+			'<a href="exec:pregchem = 5208 & pregtime = 196 & gs ''body_shape'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<$bodimgsets[((bodset * 10) + 6)]>></a>'
+			''
+		end
+		if (pregchem >= 5712 and pregchem < 6216) = 0:
+			'<a href="exec:pregchem = 5712 & pregtime = 217 & gs ''body_shape'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<$bodimgsets[((bodset * 10) + 7)]>></a>'
+			''
+		end
+		if (pregchem >= 6216) = 0:
+			'<a href="exec:pregchem = 6216 & pregtime = 238 & gs ''body_shape'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<$bodimgsets[((bodset * 10) + 8)]>></a>'
+			''
+		end
 	end
+
 	'</tr></table></b></center>'
 }
 
@@ -2402,16 +2442,9 @@ $cheatmenu['bdimmain'] = {
 	*nl
 	'<a href="exec:chmbodset = 2 & dynamic $cheatmenu[''bdimdisplay'']"><b><<$bodimgsets[29]>></b></a>'
 	*nl
-	if bodsetcnt >= 3:
+	if bodsetcnt >= 4:
 		'You may edit aspects of a custom image set by clicking on their folder names below.'
 		*nl
-		'<a href="exec:chmbodset = 3 & dynamic $cheatmenu[''bdimdisplay'']"><b><<$bodimgsets[39]>></b></a>'
-		*nl
-	elseif bodsetcnt = 2:
-		'<a href="exec:dynamic $cheatmenu[''bdimcstadd'']"><b>Add new set</b></a>'
-		*nl
-	end
-	if bodsetcnt >= 4:
 		'<a href="exec:chmbodset = 4 & dynamic $cheatmenu[''bdimdisplay'']"><b><<$bodimgsets[49]>></b></a>'
 		*nl
 	elseif bodsetcnt = 3:
@@ -2471,10 +2504,15 @@ $cheatmenu['bdimdisplay'] = {
 		'<a href="exec:bdsetlock = 1 & bodset = chmbodset & fixbodset = chmbodset & dynamic $cheatmenu[''bdimdisplay'']"><b>Use this set only.</b></a>'
 	end
 	*nl
-	if chmbodset <= 2:
+	if chmbodset <= 3:
 		'Folder: <<$bodimgsets[((chmbodset * 10) + 9)]>>'
 		'Descriptors:'
-		'<a href="exec:view ''images/pc/body/shape/0.jpg''"><<$bodimgsets[((chmbodset * 10) + 0)]>></a>'
+		*nl
+		if chmbodset = 3:
+			'<a href="exec:view ''images/pc/body/shape/<<$bodimgsets[((chmbodset * 10) + 9)]>>/0.jpg''"><<$bodimgsets[((chmbodset * 10) + 0)]>></a>'
+		else
+			'<a href="exec:view ''images/pc/body/shape/0.jpg''"><<$bodimgsets[((chmbodset * 10) + 0)]>></a>'
+		end
 		*nl
 		'<a href="exec:view ''images/pc/body/shape/<<$bodimgsets[((chmbodset * 10) + 9)]>>/1.jpg''"><<$bodimgsets[((chmbodset * 10) + 1)]>></a>'
 		*nl
@@ -2486,9 +2524,21 @@ $cheatmenu['bdimdisplay'] = {
 		*nl
 		'<a href="exec:view ''images/pc/body/shape/<<$bodimgsets[((chmbodset * 10) + 9)]>>/5.jpg''"><<$bodimgsets[((chmbodset * 10) + 5)]>></a>'
 		*nl
-		'<a href="exec:view ''images/pc/body/shape/6.jpg''"><<$bodimgsets[((chmbodset * 10) + 6)]>></a>'
+		if chmbodset = 3:
+			'<a href="exec:view ''images/pc/body/shape/<<$bodimgsets[((chmbodset * 10) + 9)]>>/6.jpg''"><<$bodimgsets[((chmbodset * 10) + 6)]>></a>'
+		else
+			'<a href="exec:view ''images/pc/body/shape/6.jpg''"><<$bodimgsets[((chmbodset * 10) + 6)]>></a>'
+		end
+		*nl
+		if chmbodset = 3:
+			'<a href="exec:view ''images/pc/body/shape/<<$bodimgsets[((chmbodset * 10) + 9)]>>/7.jpg''"><<$bodimgsets[((chmbodset * 10) + 7)]>></a>'
+		else
+			'<a href="exec:view ''images/pc/body/shape/7.jpg''"><<$bodimgsets[((chmbodset * 10) + 7)]>></a>'
+		end
 		*nl
-		'<a href="exec:view ''images/pc/body/shape/7.jpg''"><<$bodimgsets[((chmbodset * 10) + 7)]>></a>'
+		if chmbodset = 3:
+			'<a href="exec:view ''images/pc/body/shape/<<$bodimgsets[((chmbodset * 10) + 9)]>>/8.jpg''"><<$bodimgsets[((chmbodset * 10) + 8)]>></a>'
+		end
 		*nl
 	else
 		'Folder: <<$bodimgsets[((chmbodset * 10) + 9)]>>'

locations/_body_image.qsrc

@@ -6,23 +6,31 @@
 $body_image_msg = ''
 if $ARGS[0] = 'body':
 !!	This displays the body image; $bodimgsets[x9] is the folder name
-	if salocatnow >= 1 and salocatnow <= 5:
-		$RESULT = 'images/pc/body/shape/<<$bodimgsets[((bodset * 10) + 9)]>>/<<salocatnow>>.jpg'
-	elseif salocatnow <= 0:
-		$RESULT = 'images/pc/body/shape/0.jpg'
-	elseif salocatnow = 6:
-		if imgset6ovr[bodset] = 1:
-			$RESULT = 'images/pc/body/shape/<<$bodimgsets[((bodset * 10) + 9)]>>/6.jpg'
-		else
-			$RESULT = 'images/pc/body/shape/6.jpg'
-		end
-	else
-		if imgset7ovr[bodset] = 1:
-			$RESULT = 'images/pc/body/shape/<<$bodimgsets[((bodset * 10) + 9)]>>/7.jpg'
-		else
-			$RESULT = 'images/pc/body/shape/7.jpg'
-		end
-	end
+	if (knowpreg = 1 or (preg = 1 and thinkpreg = 1) or (preg = 1 and PregChem > 3600)) and bodset = 3:
+                if PregChem > 6216:
+                        $RESULT = 'images/pc/body/shape/<<$bodimgsets[((bodset * 10)+9)]>>/8.jpg'
+                elseif PregChem < 2688:
+                        $RESULT = 'images/pc/body/shape/<<$bodimgsets[((bodset * 10)+9)]>>/0.jpg'
+                else
+                        $RESULT = 'images/pc/body/shape/<<$bodimgsets[((bodset * 10)+9)]>>/<<((PregChem - 2184)/504)>>.jpg'
+                end
+        elseif salocatnow >= 1 and salocatnow <= 5:
+                $RESULT = 'images/pc/body/shape/<<$bodimgsets[((bodset * 10) + 9)]>>/<<salocatnow>>.jpg'
+        elseif salocatnow <= 0:
+                $RESULT = 'images/pc/body/shape/0.jpg'
+        elseif salocatnow = 6:
+                if imgset6ovr[bodset] = 1:
+                        $RESULT = 'images/pc/body/shape/<<$bodimgsets[((bodset * 10) + 9)]>>/6.jpg'
+                else
+                        $RESULT = 'images/pc/body/shape/6.jpg'
+                end
+        else
+                if imgset7ovr[bodset] = 1:
+                        $RESULT = 'images/pc/body/shape/<<$bodimgsets[((bodset * 10) + 9)]>>/7.jpg'
+                else
+                        $RESULT = 'images/pc/body/shape/7.jpg'
+                end
+        end
 	$body_image_msg += 'You are <<pcs_hgt>>cm tall and <<$body>>'
 end
 

locations/body.qsrc

@@ -1851,7 +1851,9 @@ end
 if dounspell = 1:
 	salocatnow = (pcs_hips / 10) - 5
 	if bdsetlock = 0:
-		if strenbuf >= 70:
+		if (knowpreg = 1 or (preg = 1 and thinkpreg = 1) or (preg = 1 and PregChem > 3600)):
+			bodset = 3
+		elseif strenbuf >= 70:
 			bodset = 2
 		elseif strenbuf <= 40:
 			bodset = 0
@@ -1861,9 +1863,27 @@ if dounspell = 1:
 	else
 		bodset = fixbodset
 	end
-end
+elseif (knowpreg = 1 or (preg = 1 and thinkpreg = 1) or (preg = 1 and PregChem > 3600)) and bodet ! 3 and bdsetlock = 0:
+	bodset = 3
+elseif preg = 0 and bodset = 3 and bdsetlock = 0:
+	if strenbuf >= 70:
+		bodset = 2
+	elseif strenbuf <= 40:
+		bodset = 0
+	else
+		bodset = 1
+	end
+end 
 
-if salocatnow <= 7:
+if (knowpreg = 1 or (preg = 1 and thinkpreg = 1) or (preg = 1 and PregChem > 3600)) and bodset = 3:
+	if PregChem > 6216:
+		$body = $bodimgsets[((bodset * 10) + 8)]
+	elseif PregChem < 2688:
+		$body = $bodimgsets[(bodset * 10)]
+	else 
+		$body = $bodimgsets[((bodset * 10)+((PregChem - 2184)/504))]
+	end
+elseif salocatnow <= 7:
 	$body = $bodimgsets[((bodset * 10) + salocatnow)]
 else
 	$body = $bodimgsets[((bodset * 10) + 7)]
@@ -1875,4 +1895,4 @@ musle = strenbuf
 
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
---- body ---------------------------------
+--- body ---------------------------------

locations/body_shape.qsrc

@@ -177,7 +177,9 @@ if $ARGS[0] = '':
 
 !!This sets which image set is to be used when the override is not set
 	if bdsetlock = 0:
-		if strenbuf >= 70:
+		if (knowpreg = 1 or (preg = 1 and thinkpreg = 1) or (preg = 1 and PregChem > 3600)):
+			bodset = 3
+		elseif strenbuf >= 70:
 			bodset = 2
 		elseif strenbuf <= 40:
 			bodset = 0

locations/dina.qsrc

@@ -74,6 +74,17 @@ $bodimgsets[26] = 'stocky'
 $bodimgsets[27] = 'heavy set'
 $bodimgsets[28] = 'OOPS'
 $bodimgsets[29] = 'default_high'
+$bodimgsets[30] = 'pregnant, but not showing'
+$bodimgsets[31] = 'glowing'
+$bodimgsets[32] = 'starting to show'
+$bodimgsets[33] = 'clearly showing'
+$bodimgsets[34] = 'fairly pregnant'
+$bodimgsets[35] = 'quite pregnant'
+$bodimgsets[36] = 'very pregnant'
+$bodimgsets[37] = 'extremely pregnant'
+$bodimgsets[38] = 'ready to pop'
+$bodimgsets[39] = 'default_preg'
+
 !!This sets the first 3 sets to not override images 6 and 7
 imgset6ovr[0] = 0
 imgset6ovr[1] = 0
@@ -82,7 +93,7 @@ imgset7ovr[0] = 0
 imgset7ovr[1] = 0
 imgset7ovr[2] = 0
 !!Sets the default image set count if it is 0
-if bodsetcnt <= 0: bodsetcnt = 2
+if bodsetcnt <= 0: bodsetcnt = 3
 
 $week[1] = 'Monday'
 $week[2] = 'Tuesday'

locations/obj_din.qsrc

@@ -193,6 +193,7 @@ if $ARGS[0] = 'description':
 			*nl
 		end
 	end
+			
 	'<<$lip>>'
 	'<<$pcs_throat>>'
 	'<<$skin>>'