Просмотр исходного кода

Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife

Lusticon 1 месяц назад
Родитель
Сommit
f8741236f9

+ 2 - 2
locations/AppearanceSystem.qsrc

@@ -141,9 +141,9 @@ if $ARGS[0] = 'SetBodyShapeBonus':
 		tempBodyShapeBonus = func('body_structure', 'appearance_bonus')
 
 		!!This modifies bodykoef for high or low pcs_mass['body'] values
-		if salocatnow = 0 or salocatnow >= 7:
+		if pcs_mass['body'] < 8 or pcs_mass['body'] >= 98:
 			tempBodyShapeBonus -= 8
-		elseif salocatnow = 1 or salocatnow = 6:
+		elseif pcs_mass['body'] < 23 or pcs_mass['body'] >= 83:
 			tempBodyShapeBonus -= 4
 		end
 

+ 33 - 16
locations/Cheatmenu_din.qsrc

@@ -226,39 +226,39 @@ $cheatmenu['bodyMod'] = {
 	''
 	if knowpreg = 1 or (preg = 1 and (thinkpreg = 1 or PregChem > 3600)):
 		if (pregchem < 2688) = 0:
-			'<a href="exec:pregchem = 100 & pregtime = 4 & gs ''body'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<func(''body_structure'', ''body_desc'', pcs_bmi, strenbuf, 100)>></a>'
+			'<a href="exec: dynamic $cheatmenu[''set_preg_body''], 100"><<func(''body_structure'', ''body_desc'', pcs_bmi, strenbuf, 100)>></a>'
 			''
 		end
 		if (pregchem >= 2688 and pregchem < 3192) = 0:
-			'<a href="exec:pregchem = 2688 & pregtime = 112 & gs ''body'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<func(''body_structure'', ''body_desc'', pcs_bmi, strenbuf, 2688)>></a>'
+			'<a href="exec: dynamic $cheatmenu[''set_preg_body''], 2688"><<func(''body_structure'', ''body_desc'', pcs_bmi, strenbuf, 2688)>></a>'
 			''
 		end
 		if (pregchem >= 3192 and pregchem < 3696) = 0:
-			'<a href="exec:pregchem = 3192 & pregtime = 133 & gs ''body'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<func(''body_structure'', ''body_desc'', pcs_bmi, strenbuf, 3192)>></a>'
+			'<a href="exec: dynamic $cheatmenu[''set_preg_body''], 3192"><<func(''body_structure'', ''body_desc'', pcs_bmi, strenbuf, 3192)>></a>'
 			''
 		end
 		if (pregchem >= 3696 and pregchem < 4200) = 0:
-			'<a href="exec:pregchem = 3696 & pregtime = 154 & gs ''body'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<func(''body_structure'', ''body_desc'', pcs_bmi, strenbuf, 3696)>></a>'
+			'<a href="exec: dynamic $cheatmenu[''set_preg_body''], 3696"><<func(''body_structure'', ''body_desc'', pcs_bmi, strenbuf, 3696)>></a>'
 			''
 		end
 		if (pregchem >= 4200 and pregchem < 4704) = 0:
-			'<a href="exec:pregchem = 4200 & pregtime = 175 & gs ''body'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<func(''body_structure'', ''body_desc'', pcs_bmi, strenbuf, 4200)>></a>'
+			'<a href="exec: dynamic $cheatmenu[''set_preg_body''], 4200"><<func(''body_structure'', ''body_desc'', pcs_bmi, strenbuf, 4200)>></a>'
 			''
 		end
 		if (pregchem >= 4704 and pregchem < 5208) = 0:
-			'<a href="exec:pregchem = 4704 & pregtime = 196 & gs ''body'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<func(''body_structure'', ''body_desc'', pcs_bmi, strenbuf, 4704)>></a>'
+			'<a href="exec: dynamic $cheatmenu[''set_preg_body''], 4704"><<func(''body_structure'', ''body_desc'', pcs_bmi, strenbuf, 4704)>></a>'
 			''
 		end
 		if (pregchem >= 5208 and pregchem < 5712) = 0:
-			'<a href="exec:pregchem = 5208 & pregtime = 217 & gs ''body'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<func(''body_structure'', ''body_desc'', pcs_bmi, strenbuf, 5208)>></a>'
+			'<a href="exec: dynamic $cheatmenu[''set_preg_body''], 5208"><<func(''body_structure'', ''body_desc'', pcs_bmi, strenbuf, 5208)>></a>'
 			''
 		end
 		if (pregchem >= 5712 and pregchem < 6216) = 0:
-			'<a href="exec:pregchem = 5712 & pregtime = 238 & gs ''body'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<func(''body_structure'', ''body_desc'', pcs_bmi, strenbuf, 5712)>></a>'
+			'<a href="exec: dynamic $cheatmenu[''set_preg_body''], 5712"><<func(''body_structure'', ''body_desc'', pcs_bmi, strenbuf, 5712)>></a>'
 			''
 		end
 		if (pregchem >= 6216) = 0:
-			'<a href="exec:pregchem = 6216 & pregtime = 259 & gs ''body'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<func(''body_structure'', ''body_desc'', pcs_bmi, strenbuf, 6216)>></a>'
+			'<a href="exec: dynamic $cheatmenu[''set_preg_body''], 6216"><<func(''body_structure'', ''body_desc'', pcs_bmi, strenbuf, 6216)>></a>'
 			''
 		end
 	else
@@ -266,31 +266,31 @@ $cheatmenu['bodyMod'] = {
 		'starving (No, you may not select ''starving'', it''s here to show where the scale starts)'
 		''
 		if (bs_temp_bs_class / 100) ! 1:
-			'<a href="exec: pcs_mass[''body''] = func(''body'', ''CalcOptBodyMass'', 170) & gs ''body'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<func(''body_structure'', ''body_desc'', 17, strenbuf)>></a>'
+			'<a href="exec: dynamic $cheatmenu[''set_body_class''], 170"><<func(''body_structure'', ''body_desc'', 17, strenbuf)>></a>'
 			''
 		end
 		if (bs_temp_bs_class / 100) ! 2:
-			'<a href="exec: pcs_mass[''body''] = func(''body'', ''CalcOptBodyMass'', 200) & gs ''body'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<func(''body_structure'', ''body_desc'', 20, strenbuf)>></a>'
+			'<a href="exec: dynamic $cheatmenu[''set_body_class''], 200"><<func(''body_structure'', ''body_desc'', 20, strenbuf)>></a>'
 			''
 		end
 		if (bs_temp_bs_class / 100) ! 3:
-			'<a href="exec: pcs_mass[''body''] = func(''body'', ''CalcOptBodyMass'', 230) & gs ''body'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<func(''body_structure'', ''body_desc'', 23, strenbuf)>></a>'
+			'<a href="exec: dynamic $cheatmenu[''set_body_class''], 230"><<func(''body_structure'', ''body_desc'', 23, strenbuf)>></a>'
 			''
 		end
 		if (bs_temp_bs_class / 100) ! 4:
-			'<a href="exec: pcs_mass[''body''] = func(''body'', ''CalcOptBodyMass'', 270) & gs ''body'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<func(''body_structure'', ''body_desc'', 27, strenbuf)>></a>'
+			'<a href="exec: dynamic $cheatmenu[''set_body_class''], 270"><<func(''body_structure'', ''body_desc'', 27, strenbuf)>></a>'
 			''
 		end
 		if (bs_temp_bs_class / 100) ! 5:
-			'<a href="exec: pcs_mass[''body''] = func(''body'', ''CalcOptBodyMass'', 320) & gs ''body'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<func(''body_structure'', ''body_desc'', 32, strenbuf)>></a>'
+			'<a href="exec: dynamic $cheatmenu[''set_body_class''], 320"><<func(''body_structure'', ''body_desc'', 32, strenbuf)>></a>'
 			''
 		end
 		if (bs_temp_bs_class / 100) ! 6:
-			'<a href="exec: pcs_mass[''body''] = func(''body'', ''CalcOptBodyMass'', 370) & gs ''body'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<func(''body_structure'', ''body_desc'', 37, strenbuf)>></a>'
+			'<a href="exec: dynamic $cheatmenu[''set_body_class''], 370"><<func(''body_structure'', ''body_desc'', 37, strenbuf)>></a>'
 			''
 		end
 		if (bs_temp_bs_class / 100) ! 7:
-			'<a href="exec: pcs_mass[''body''] = func(''body'', ''CalcOptBodyMass'', 420) & gs ''body'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<func(''body_structure'', ''body_desc'', 42, strenbuf)>></a>'
+			'<a href="exec: dynamic $cheatmenu[''set_body_class''], 420"><<func(''body_structure'', ''body_desc'', 42, strenbuf)>></a>'
 			''
 		end
 		killvar 'bs_temp_bs_class'
@@ -299,6 +299,23 @@ $cheatmenu['bodyMod'] = {
 	'</tr></table></b></center>'
 }
 
+$cheatmenu['set_preg_body'] = {
+	pregchem = ARGS[0]
+	pregtime = ARGS[0] / 24
+	gs 'body', 'reset_preg_mass'
+	gs 'body', 'softreset'
+	gs 'stat'
+	dynamic $cheatmenu['bodyMod']
+}
+
+$cheatmenu['set_body_class'] = {
+	pcs_mass['body'] = func('body', 'CalcOptBodyMass', ARGS[0])
+	gs 'body', 'softreset'
+	gs 'stat'
+	dynamic $cheatmenu['bodyMod']
+}
+
+
 $cheatmenu['addict'] = {
 	if drugVars['cheat_immune'] = 0:
 		drugVars['cheat_immune'] = 1

+ 1 - 1
locations/NikoEv2.qsrc

@@ -718,7 +718,7 @@ if $ARGS[0] = 'Diner 1':
 									'<center><img <<$set_imgh>> src="images/pc/body/cum/cumface/blonde/15.jpg"></center>'
 									'"Wow, she walks around like that?" one of the bikers asks.'
 									'"Well she''s obviously a slut looking for customers," another replies.'
-									if salocatnow >= 5:
+									if pcs_bmi >= 26:
 										'"A slut, huh?" a trucker asks. "She looks more like a cow to me."'
 										'"Yeah, she looks like my old lady," another biker says. "But a pussy''s a pussy, I guess."'
 									else

+ 2 - 2
locations/NikoWhore.qsrc

@@ -152,7 +152,7 @@ if $ARGS[0] = 'Locker Room':
 															'"I told you she was a freak! She loves getting fucked. She was basically begging me to fuck her ass!" Dan laughs.'
 															'"Come on guys, we already have Sonia. We don''t need <<$pcs_nickname>> too," Vasily responds.'
 															'"She might be Sonia 2.0! It would be wrong for us <i>not</i> to show her off. Now is the perfect time too. The boys are still on the stairwell," Dan adds.'
-															if hotcat >= 7 and salocatnow < 5:
+															if hotcat >= 7 and pcs_bmi <= 25:
 																'"That sounds like a great idea. <<$pcs_nickname>> is much hotter than Sonia anyway. Let''s do it," Vitek responds before pulling you to your feet. "You''re coming with us."'
 															else
 																'"That sounds like a great idea. She looks like an overgrown pig, but we can always fuck her from behind. Alright, let''s do it," Vitek responds before pulling you to your feet. "You''re coming with us."'
@@ -331,7 +331,7 @@ if $ARGS[0] = 'Exposed':
 	'"What the fuck was she thinking? Why would she do this to herself? Is she that desperate for dick?" Lariska asks.'
 	'"I always thought she was a nice girl, but I guess she was just a whore all along. She hid it well," Lina responds.'
 	'Christina laughs. "You''re both so stupid! I knew she was a fucking whore all along, you just have to look at how she acts. So weak and pathetic and eager to please any boy that paid any attention to her." You hear several of the other girls agree with her.'
-	if hotcat >= 6 and salocatnow < 5:
+	if hotcat >= 6 and pcs_bmi <= 25:
 		'"Fuck yeah! I''ve been wanting to fuck <<$pcs_nickname>> since I first saw her drop that chalk in math class!" Roman laughs.'
 	else
 		'"I always thought about what it would be like to fuck <<$pcs_firstname>> since I first saw her drop that chalk in math class. If only she wasn''t so ugly..." Roman laughs.'

+ 10 - 10
locations/ballet_secrets.qsrc

@@ -13,7 +13,7 @@ if $ARGS[0] = 'init':
 	gs 'shortgs', 'setloc', 'ballet_secrets', $ARGS[0] 
 	$location_type = 'public_indoors'
 	$setloc['StageTitle'] = 'Ballet Secrets'
-	$setloc['StageImage'] =	'<<$default_img_path>>ballet-shop-window'
+	$setloc['StageImage'] =	'<<$default_img_path>>ballet-shop-window.jpg'
 	$location_type = 'public_indoors'
 	gs 'themes', 'indoors'
 	gs 'core_library', 'stage_title'
@@ -45,7 +45,7 @@ end
 if $ARGS[0] = 'first_visit':
 	balletqw['ballet_secrets_visit'] = 1
 	balletqw['shoe_order'] = daystart + 14
-	$setloc['StageImage'] =	'<<$default_img_path>>ballet_secrets_fitting_1'
+	$setloc['StageImage'] =	'<<$default_img_path>>ballet_secrets_fitting_1.jpg'
 	minut += 60
 	gs 'core_library', 'stage_title'
 	gs 'stat'
@@ -71,7 +71,7 @@ if $ARGS[0] = 'reception':
 	gs 'shortgs', 'setloc', 'ballet_secrets', $ARGS[0] 
 	$location_type = 'public_indoors'
 	$setloc['StageTitle'] = 'Ballet Secrets - Reception'
-	$setloc['StageImage'] =	'<<$default_img_path>>reception'
+	$setloc['StageImage'] =	'<<$default_img_path>>reception.jpg'
 	$location_type = 'public_indoors'
 	gs 'themes', 'indoors'
 	gs 'core_library', 'stage_title'
@@ -195,7 +195,7 @@ if $ARGS[0] = 'physio':
 	gs 'shortgs', 'setloc', 'ballet_secrets', $ARGS[0] 
 	$location_type = 'public_indoors'
 	$setloc['StageTitle'] = 'Ballet Secrets - Physio'
-	$setloc['StageImage'] =	'<<$default_img_path>>physio'
+	$setloc['StageImage'] =	'<<$default_img_path>>physio.jpg'
 	$location_type = 'public_indoors'
 	gs 'themes', 'indoors'
 	gs 'core_library', 'stage_title'
@@ -210,7 +210,7 @@ if $ARGS[0] = 'gymnastics_courses':
 	gs 'shortgs', 'setloc', 'ballet_secrets', $ARGS[0] 
 	$location_type = 'public_indoors'
 	$setloc['StageTitle'] = 'Ballet Secrets - Gymnastics Class'
-	$setloc['StageImage'] =	'<<$default_img_path>>gymnastics'
+	$setloc['StageImage'] =	'<<$default_img_path>>gymnastics.jpg'
 	$location_type = 'public_indoors'
 	gs 'themes', 'indoors'
 	gs 'core_library', 'stage_title'
@@ -224,7 +224,7 @@ if $ARGS[0] = 'ballet_courses':
 	gs 'shortgs', 'setloc', 'ballet_secrets', $ARGS[0] 
 	$location_type = 'public_indoors'
 	$setloc['StageTitle'] = 'Ballet Secrets - Courses'
-	$setloc['StageImage'] =	'<<$default_img_path>>ballet_class'
+	$setloc['StageImage'] =	'<<$default_img_path>>ballet_class.jpg'
 	$location_type = 'public_indoors'
 	gs 'themes', 'indoors'
 	gs 'core_library', 'stage_title'
@@ -236,7 +236,7 @@ if $ARGS[0] = 'yoga_courses':
 	gs 'shortgs', 'setloc', 'ballet_secrets', $ARGS[0] 
 	$location_type = 'public_indoors'
 	$setloc['StageTitle'] = 'Ballet Secrets - Yoga Class'
-	$setloc['StageImage'] =	'<<$default_img_path>>yoga_class'
+	$setloc['StageImage'] =	'<<$default_img_path>>yoga_class.jpg'
 	$location_type = 'public_indoors'
 	gs 'themes', 'indoors'
 	gs 'core_library', 'stage_title'
@@ -282,7 +282,7 @@ if $ARGS[0] = 'clothing':
 	gs 'shortgs', 'setloc', 'ballet_secrets', $ARGS[0] 
 	$location_type = 'public_indoors'
 	$setloc['StageTitle'] = 'Ballet Secrets - Dancewear'
-	$setloc['StageImage'] =	'<<$default_img_path>>sports_shop'
+	$setloc['StageImage'] =	'<<$default_img_path>>sports_shop.jpg'
 	$location_type = 'public_indoors'
 	gs 'themes', 'indoors'
 	gs 'core_library', 'stage_title'
@@ -294,7 +294,7 @@ if $ARGS[0] = 'quest':
 	gs 'shortgs', 'setloc', 'ballet_secrets', $ARGS[0] 
 	$location_type = 'public_indoors'
 	$setloc['StageTitle'] = 'Ballet Secrets'
-	$setloc['StageImage'] =	'<<$default_img_path>>quest'
+	$setloc['StageImage'] =	'<<$default_img_path>>quest.jpg'
 	$location_type = 'public_indoors'
 	gs 'themes', 'indoors'
 	gs 'core_library', 'stage_title'
@@ -305,7 +305,7 @@ if $ARGS[0] = 'food':
 	gs 'shortgs', 'setloc', 'ballet_secrets', $ARGS[0] 
 	$location_type = 'public_indoors'
 	$setloc['StageTitle'] = 'Food Court'
-	$setloc['StageImage'] =	'<<$default_img_path>>food_court'
+	$setloc['StageImage'] =	'<<$default_img_path>>food_court.jpg'
 	$location_type = 'public_indoors'
 	gs 'themes', 'indoors'
 	gs 'core_library', 'stage_title'

+ 5 - 6
locations/bedrPar.qsrc

@@ -14,18 +14,17 @@
 
 
 !! Begin location content
-if $ARGS[0] = '' or $ARGS[0] = 'start':
+if $ARGS[0] = '' or $ARGS[0] = 'start':	
+	!! Call in location default actions
+	gs 'home_family_init', 'init'
 	!! Set location vars:
 	fromoutside = iif($loc = 'bedrPar',0,1)
-	minut += 1
+	
 	!!day check so mom doesn''t think you have been out all night if you get up very early 
 	motherworry[1] = daystart
 	!! This is runs only once, just to make sure that Sveta can sing from the start, does not have to wait a whole day for `cikl` to run.
 	if ml_performance['max_perform_minutes'] = 0: ml_performance['max_perform_minutes'] = pcs_instrmusic + pcs_vokal
 
-	!! Call in location default actions
-	gs 'home_family_init', 'init'
-
 	!! Set up game location data
 	$locclass = 'bedr'
 	gs 'shortgs', 'setloc', 'bedrpar', $ARGS[0]
@@ -91,7 +90,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 		end
 		gs 'stat'
 
-		act 'Leave': gt 'korrPar'
+		act 'Leave': minut += 1 & gt 'korrPar'
 	else
 		if func('homes_properties', 'can_live_here'):
 			$setloc['StageTitle'] = 'Your bedroom'

+ 5 - 4
locations/bedrPar2.qsrc

@@ -6,14 +6,15 @@
 !! 
 !! Desc: Paernts bedroom links to family flat corridor
 
+!! Call in location default actions
+gs 'home_family_init', 'init'
+
 !! Set location header - img path is set in init
 $setloc['StageTitle'] = 'Parents Bedroom'
 $setloc['StageImage'] = '<<$default_img_path>>/bedrpar2.jpg'
 
 !! Set location vars:
-minut += 1
-!! Call in location default actions
-gs 'home_family_init', 'init'
+
 
 !! Set up game location data
 $locclass = 'bedr'
@@ -41,7 +42,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 		end
 	end
 
-	act 'Return to the hallway':gt 'korrPar'
+	act 'Return to the hallway':minut += 1 & gt 'korrPar'
 
 	if locat['Fam_inGad'] = 1 or (locat['Fam_inGad'] = 0 and hour > 6 and hour < 21):
 		if kamasutra_day ! daystart:

+ 68 - 19
locations/body.qsrc

@@ -32,6 +32,13 @@
 !! imgset6ovr[x] and imgset7ovr[x] = a flag to indicate that an image set (x) has its own image 6 and/or 7
 !! extended lash functionality; pcs_lashes = n are: {2, largest natural size}, {3, with temporary false lashes on or basic 2D lash extensions}, {4, with ornate false lashes on or lavish 4D extensions}, {5, with extremely ornate, 6D-style extensions} - xerya
 
+
+!! Pregnancy weight gain:
+!! Weight gain in the first 5 weeks (roughly pregChem < 800. -> Pregtime = pregchem / 24) is negligable
+!! Afterwards we approximate the weight gain as mass = ((pregChem - 800)^2 * 33 / (7000 - 800)^2) approx (pregChem - 800)^2 / (1080)^2
+
+
+
 if $ARGS[0] = 'RegularUpdate':
 	if dounspell = 0:
 		gs 'body', 'UpdateBodyMeasurement'
@@ -58,7 +65,7 @@ if $ARGS[0] = 'UpdateBodyMeasurement':
 	pcs_hips  = (pcs_hgt   * bodyVars['hratio']) / 100 + bodyVars['vhips']
 	pcs_waist = (pcs_hips  * bodyVars['wratio']) / 100 + bodyVars['vofat']
 	pcs_band  = (pcs_waist * bodyVars['bratio']) / 100 + bodyVars['vofat']
-	pcs_bust  = (pcs_waist * bodyVars['bratio']) / 100 + pcs_mass['bust'] + bodyVars['bust_magic'] + bodyVars['bust_silicone'] + max(-10, min(bodyVars['bust_other'], 10))
+	pcs_bust  = (pcs_waist * bodyVars['bratio']) / 100 + pcs_mass['bust'] + bodyVars['bust_magic'] + bodyVars['bust_silicone'] + max(-10, min(bodyVars['bust_other'], 10)) + pcs_mass['preg'] / 5
 	pcs_butt  = min(pcs_mass['butt'], 50) + bodyVars['butt_bonus'] + bodyVars['butt_silicone'] + bodyVars['butt_cheat'] + pcs_butt_tr + max(-10, min(bodyVars['butt_other'], 10))
 
 	!! pcs_cupsize = pcs_mass['bust'] + bodyVars['bust_magic'] + bodyVars['bust_silicone'] - bodyVars['vofat']
@@ -71,7 +78,7 @@ if $ARGS[0] = 'CalcWeight':
 	This is an approximation, so that a sveta with a different height has the same BMI for the same pcs_mass['body'] values.
 	The default height of 170 cm is used as a starting point. The bmi deviates by 0.06 for a deviation of 10cm and 0.4 for a deviation of 20cm.}
 
-	result = (2820 + 33 * (pcs_mass['body'] + pcs_mass['bust'] + pcs_mass['butt']) + 70 * (pcs_hgt - 165)) / 100
+	result = (2820 + 33 * (pcs_mass['body'] + pcs_mass['bust'] + pcs_mass['butt'] + pcs_mass['preg']) + 70 * (pcs_hgt - 165)) / 100
 
 	!{Do not remove (julzor)
 	This is the old more complex function, but it doesn''t work correctly.
@@ -83,7 +90,7 @@ end
 
 if $ARGS[0] = 'CalcWeight2':
 	!! weight2 = 10 * weight
-	result = (2820 + 33 * (pcs_mass['body'] + pcs_mass['bust'] + pcs_mass['butt']) + 70 * (pcs_hgt - 165)) / 10
+	result = (2820 + 33 * (pcs_mass['body'] + pcs_mass['bust'] + pcs_mass['butt'] + pcs_mass['preg']) + 70 * (pcs_hgt - 165)) / 10
 	!result = (pcs_hgt * 62 / 17) + (10 * (vhips + (bodyVars['vofat'] * 2))) / 4 + 10 * tits
 end
 
@@ -322,15 +329,44 @@ if $ARGS[0] = 'Update_Body':
 	if bodyresetflag = 1 or cheatNoFat = 1:
 		fat = 0
 	else
-		if fat > (17 + vitalbuf / 25):
-			pcs_mass['body'] += 1
-			fat = 0
-		elseif fat < -(2 + vitalbuf / 10):
-			pcs_mass['body'] -= 1
-			fat = 0
+		if pregChem >= 800 and (pregChem - 800)*(pregChem - 800) >= bodyVars['pchem_next']:
+			pcs_mass['preg'] += 1
+			bodyVars['pchem_next'] += 1166400	& !! 1080 * 1080
+		elseif bodyVars['pchem_next'] > 0 and bodyVars['pchem_next'] - 1166400 >= (pregChem - 800) * (pregChem - 800):
+			if pcs_mass['preg'] > 0:
+				pcs_mass['preg'] -= 1
+				bodyVars['pchem_next'] -= 1166400	& !! 1080 * 1080
+			else
+				pcs_mass['preg'] = 0
+				bodyVars['pchem_next'] = 0
+			end
+		end
+		if pregChem >= 800:
+			if fat > (12 + vitalbuf / 25):
+				pcs_mass['body'] += 1
+				fat = 0
+			elseif fat < -(7 + vitalbuf / 10):
+				pcs_mass['body'] -= 1
+				fat = 0
+			else
+				if fat < 0:
+					fat = fat / 2
+				else
+					fat = fat / 6
+				end
+			end
 		else
-			fat = fat / 4
+			if fat > (17 + vitalbuf / 25):
+				pcs_mass['body'] += 1
+				fat = 0
+			elseif fat < -(2 + vitalbuf / 10):
+				pcs_mass['body'] -= 1
+				fat = 0
+			else
+				fat = fat / 4
+			end
 		end
+
 	end
 
 	!!This is the pcs_mass['body'] cap for the weight approximation
@@ -379,9 +415,9 @@ if $ARGS[0] = 'Update_Body':
 
 	!!This will trigger the warning notices in the bathing code (the +/- 12 should always be +/- 11 + the max change to pcs_mass['body'] w/ fat)
 
-!	if salolast > pcs_mass['body'] and pcs_mass['body'] <= (20 * (salocatnow - 1)) + 12:
+!	if salolast > pcs_mass['body'] + pcs_mass['butt'] and pcs_mass['body'] + pcs_mass['butt'] <= (20 * (salocatnow - 1)) + 12:
 !		bodyVars['weight_warning'] = 1
-!	elseif salolast < pcs_mass['body'] and pcs_mass['body'] >= (20 * (salocatnow + 1)) - 12:
+!	elseif salolast < pcs_mass['body'] + pcs_mass['butt'] and pcs_mass['body'] + pcs_mass['butt'] >= (20 * (salocatnow + 1)) - 12:
 !		bodyVars['weight_warning'] = 2
 !	end
 
@@ -398,7 +434,7 @@ if $ARGS[0] = 'Update_Body':
 	!!This will trigger the dream for the option to use magic to increase bust
 	!!Three nos at the dream will lock it out (1 yes resets the count)
 	if pcs_magik >= 5 and MagikDostup = 0 and magf2bdo = 0:
-		if tits < 10 and salolast < pcs_mass['body'] and pcs_mass['body'] >= (20 * (salocatnow + 1)) - 11:
+		if tits < 10 and salolast < pcs_mass['body'] + pcs_mass['butt'] and pcs_mass['body'] + pcs_mass['butt'] >= (20 * (salocatnow + 1)) - 11:
 			if mgf2bnocnt < 3:
 				magf2bdo = 2
 			else
@@ -412,8 +448,8 @@ if $ARGS[0] = 'Update_Body':
 	if salocatnow > salocatlast: salocatlast += 1
 
 	!!This is for use in the warning code and as part of the reset routines
-	if salolast > pcs_mass['body']: salolast -= 1
-	if salolast < pcs_mass['body']: salolast += 1
+	if salolast > pcs_mass['body'] + pcs_mass['butt']: salolast -= 1
+	if salolast < pcs_mass['body'] + pcs_mass['butt']: salolast += 1
 
 	!!Setting the pcs_apprnc bonus based on fat and strength
 	temp_bmi = func('body', 'CalcBMI2')
@@ -750,6 +786,17 @@ if $ARGS[0] = 'Reset_mass_distribution':
 	gs 'body', 'Update_vhips'
 end
 
+if $ARGS[0] = 'Reset_preg_mass':
+	bodyVars['pchem_next'] = 0
+	pcs_mass['preg'] = 0
+	:set_preg_body_loop
+	if pregChem >= 800 and (pregChem - 800) * (pregChem - 800) >= bodyVars['pchem_next']:
+		bodyVars['pchem_next'] += 1166400	& 1080 * 1080
+		pcs_mass['preg'] += 1
+		jump 'set_preg_body_loop'
+	end
+end
+
 
 if $ARGS[0] = 'Set_mass_distribution_using_body':
 	pcs_mass['body'] = ARGS[1]
@@ -847,7 +894,7 @@ if $ARGS[0] = 'softreset':
 	!!This is for use in immediately updating shape if something has caused a large change in pcs_mass['body'], primarily fat burners and plastic surgery
 	bodyresetflag = 1
 	:resetloop
-	if pcs_mass['body'] ! salolast:
+	if pcs_mass['body'] + pcs_mass['butt'] ! salolast:
 		if gamestartflag = 1:
 			salobustdo = 1
 		end
@@ -884,14 +931,14 @@ if $ARGS[0] = 'hardreset':
 		gs 'body', 'Update_Body'
 
 		pcs_mass['body'] = 60 + (2 * pcs_hips) - (pcs_hgt * bodyVars['hratio']) / 50
-		if pcs_mass['body'] < 10:
+		if pcs_mass['body'] + pcs_mass['butt'] < 10:
 			salocatnow = 0
 		else
-			salocatnow = 1 + (pcs_mass['body'] - 10) / 20
+			salocatnow = 1 + (pcs_mass['body'] + pcs_mass['butt'] - 10) / 20
 		end
 
 		salocatlast = salocatnow
-		salolast = pcs_mass['body']
+		salolast = pcs_mass['body'] + pcs_mass['butt']
 
 		if pcs_mass['butt_gen'] = 0:
 			pcs_mass['butt_gen'] = 20
@@ -917,6 +964,8 @@ if $ARGS[0] = 'hardreset':
 		pcs_mass['bust_message'] = pcs_mass['bust']
 		pcs_mass['butt_message'] = pcs_mass['butt']
 
+		gs 'body', 'reset_preg_mass'
+
 		bodyresetflag = 0
 		normbuffpick = 0
 		bodyVars['weight_warning'] = 0

+ 1 - 1
locations/foto_shoot.qsrc

@@ -228,7 +228,7 @@ if $ARGS[0] = 'glamour_shoot':
 	act 'Sexy clothing':
 		*clr & cla
 		$modelfoto['shoot_type'] = 'sexy_clo'
-		if modelfoto['sexy'] >= 10 and modelfoto['trans_ling'] + modelfoto['trans_ling'] < 1 and modelfoto['nip'] < 1 and modelfoto['nude'] < 1: gt'foto_events','trans_persuasion'
+		if modelfoto['sexy'] >= 10 and modelfoto['transparent'] + modelfoto['trans_ling'] < 1 and modelfoto['nip'] < 1 and modelfoto['nude'] < 1: gt'foto_events','trans_persuasion'
 		if pcs_inhib < 30:
 			if modelfoto['sexy'] > 0:
 				'You think about asking to do this shoot but hesitate. You''ve done it before but still... Are you really comfortable with <i>more</i> of these kinds of pictures of you floating around?'

+ 20 - 9
locations/gadsarai.qsrc

@@ -301,8 +301,7 @@ end
 if $ARGS[0] = 'barn_room':
 	$location_type = 'private'
 	$setloc['StageTitle'] = 'Guest Room'
-	$setloc['StageImage'] =   '<<$default_img_path>>village/gad_room'
-	minut += 5
+	$setloc['StageImage'] =   '<<$default_img_path>>village/gad_room.jpg'
 	gs 'shortgs', 'setloc', 'gadsarai', $ARGS[0]
 	gs 'themes', 'indoors'
 	gs 'stat'
@@ -311,24 +310,36 @@ if $ARGS[0] = 'barn_room':
 	gs 'core_library', 'stage_title'
 	act '<b>Leave and go to the yard</b>':
 		if $clothingworntype ! 'nude':
+			minut += 5
 			gt 'gaddvor'
 		else
 			msg'<b><font color = red>You need to get dressed.</font></b>'
 			gt $loc, $loc_arg
 		end
 	end
+	act '<b>Leave and enter the dacha</b>':
+		if $clothingworntype ! 'nude':
+			minut += 5
+			gt 'gadhouse', 'start'
+		else
+			msg'<b><font color = red>You need to get dressed.</font></b>'
+			gt $loc, $loc_arg
+		end
+	end
 	
 	'A small rustic loft space converted from your grandparents barn. A pair of sleeping pallets of dubious comfort is laid out for guests. The room walls are whitewashed with some clothes lines to dry your clothes with some farming tools. It''s not much to look at but it''s somewhere you can call home and have some privacy.'
 
-
 	!! Activities - basic only. There is no internet so laptop is consigned to grandparents only. Room is too small for exercise, use yard or forest meadow.
-
-
 	gs 'events', 'read'
+	act 'Relax on your bed': gt 'bed', 'start'
+	if pcs_horny >= 50:
+		act 'Masturbate':gt 'selfplay', 'start'
+	end
+	if vcard > 0: act 'View your vintage porn cards':card_deck = 0 & gt 'card'
+	if card > 0: act 'View your new porn cards':card_deck = 1 & gt 'card'
 	gs 'music_actions', 'music_icon'
-
 	!! Activities End
-	act 'Relax on your bed': gt 'bed', 'start'
+	!! TODO: if winter create task for chopping wood for log stove.
 	!! act 'light log stove': gt  'gadsarai', 'log_stove' 
 
 	!! Game functions
@@ -337,9 +348,9 @@ if $ARGS[0] = 'barn_room':
 	'<table><tr><td valign="top">Your <a href="exec:gt ''alarmclock'', ''start''">alarm clock</a> is set to <<func(''alarmclock'', ''alarm_display'', alarmVars[''timerH''], alarmVars[''timerM''])>> during the week and <<func(''alarmclock'', ''alarm_display'', alarmVars[''timerEndH''], alarmVars[''timerEndM''])>> during the weekend. It is currently turned ' + iif(alarmVars['alarmOn'] = 0, '<a href="exec: alarmVars[''alarmOn''] = 1 & gt $loc, $loc_arg">OFF</a>.', '<a href="exec: alarmVars[''alarmOn''] = 0 & gt $loc, $loc_arg">ON</a>.')
 
 	if mc_inventory['contraceptive_pill'] > 0 and mc_inventory['equipped_condoms'] + mc_inventory['normal_condoms'] + mc_inventory['sabotaged_condoms'] > 0:
-		'Your <a href="exec:gt ''stol'', ''bc''">birth control</a> is hidden in one of your desk drawers, as are your <a href="exec:gt ''stol'', ''bc''">condoms</a>.'
+		'Your <a href="exec:gt ''stol'', ''bc''">birth control</a> are hidden a small nook, as are your <a href="exec:gt ''stol'', ''bc''">condoms</a>.'
 	elseif mc_inventory['contraceptive_pill'] > 0:
-		'Your <a href="exec:gt ''stol'', ''bc''">birth control</a> is hidden in a small box under your pallet.'
+		'Your <a href="exec:gt ''stol'', ''bc''">birth control</a> are hidden in a small box under your pallet.'
 	elseif mc_inventory['equipped_condoms'] + mc_inventory['normal_condoms'] + mc_inventory['sabotaged_condoms'] > 0:
 		'Your <a href="exec:gt ''stol'', ''bc''">condoms</a> are hidden behind a loose brick.'
 	end

+ 1 - 1
locations/gschool_lessons4.qsrc

@@ -225,7 +225,7 @@ if $ARGS[0] = 'math':
 			gs'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/phone.jpg"></center>'
 			'The day seems to be dragging in and you find yourself constantly staring at the clock, waiting for the class to finally be over. You decide to play on your phone to pass the time.'
-		    if VK = 1 and (christinaQW['fight'] = -1 or christinaQW['subpath'] >= 2) and salocatnow >= 5:
+		    if VK = 1 and (christinaQW['fight'] = -1 or christinaQW['subpath'] >= 2) and pcs_bmi >= 25:
 				gs 'npc_relationship', 'modify', 'A18', 'loathe'
 				'As you''re browsing the web, you receive a text message from Christina reading; "Hey there piggy, are you looking up discounts on Peremech so that you can shove them down your throat? Why don''t you lose some weight before the teachers decide to add bovine etiquette to the curriculum because they may feel it necessary to teach the students how to talk to a cow like you?" You can feel your face flushing in embarrassment while reading Christina''s hurtful comments. You quickly turn off your phone and try not to make eye contact with Christina for the rest of the lesson.'
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'

+ 5 - 6
locations/home_family_init.qsrc

@@ -9,14 +9,13 @@
 !! Internal rooms to location: BedrPar, BedrPar2, korrPar, kuhrPar, sitrPar, vanrPar
 !! External links to location: pav_residential, pod_ezd
 
-!! Set up default image paths for npc and location:
-
-$default_img_path = 'locations/pavlovsk/resident/apartment/home'
-$mother_img_path = 'images/characters/pavlovsk/resident/mom/'
+if $ARGS[0] = '' or $ARGS[0] = 'init':
+    !! Set up default image paths for npc and location:
 
-!! clear and initialise location for content:
+    $default_img_path = 'locations/pavlovsk/resident/apartment/home'
+    $mother_img_path = 'images/characters/pavlovsk/resident/mom/'
 
-if $ARGS[0] = '' or $ARGS[0] = 'init':
+    !! clear and initialise location for content:
     *clr & cla
     CLOSE ALL	
     music_loop = 0

+ 4 - 5
locations/korrPar.qsrc

@@ -6,6 +6,8 @@
 !! 
 !! Desc: Family home kitchen links to family flat corridor
 
+!! Call in location default actions
+gs 'home_family_init', 'init'
 
 !! Set location header - img path is set in init
 $setloc['StageTitle'] = 'Corridor'
@@ -20,10 +22,6 @@ saunaYouRoom = 0
 boycherdaksex = 0
 bonusZ = 0
 display_bb = 0
-
-!! Call in location default actions
-gs 'home_family_init', 'init'
-
 !! Set up game location data
 gs 'shortgs', 'setloc', 'korrPar', $ARGS[0]
 
@@ -57,6 +55,7 @@ act '<b>Leave and go to the stairwell</b>':
 	if $clothingworntype ! 'nude':
 		$default_img_path = 'reset'
 		killvar '$mother_img_path'
+		minut += 5
 		gt'pod_ezd','etaj_2'
 	else
 		msg'<b><font color = red>You need to get dressed.</font></b>'
@@ -152,7 +151,7 @@ elseif locat['Kolka'] = 10:
 elseif locat['Anya'] = 5:
 	act 'Go to the bathroom':msg'You try to open the bathroom door, but it immediately stops and bangs against the latch. You hear the water running and your sister yell "I''ll be done in a few minutes!"'
 else
-	act 'Go to the bathroom':minut += 1 & gt 'vanrPar'
+	act 'Go to the bathroom':minut += 1 & gt 'vanrPar', 'start'
 end
 
 if motherQW['bathroom_dildos'] > 0 and locat['Mom_athome'] = 1: gt'mother_sextalk','bathroom_dildos1'

+ 4 - 5
locations/kuhrPar.qsrc

@@ -7,19 +7,17 @@
 !! Desc: Family home kitchen links to family flat corridor
 
 !! Start location initialisation
+!! Call in location default actions
+gs 'home_family_init', 'init'
 !! Set location header - img path is set in init
 $setloc['StageTitle'] = 'Parents Kitchen'
 $setloc['StageImage'] = '<<$default_img_path>>/kuhrpar.jpg'
 
 !! Set location vars:
-minut += 1
 
 !! Call in kitchen library:
 gs 'kit_din'
 
-!! Call in location default actions
-gs 'home_family_init', 'init'
-
 !! Set up game location data
 gs 'shortgs', 'setloc', 'kuhrpar', $ARGS[0]
 !! End location initialisation
@@ -30,7 +28,7 @@ gs 'shortgs', 'setloc', 'kuhrpar', $ARGS[0]
 if fullmorrout = 1:
 	minut += 2
 	act '<font color = maroon><b>Leave the apartment and go outside</b></font>':
-		minut +=1
+		minut += 1
 		killvar 'fullmorrout'
 		gs 'korrPar'
 		gt'pav_residential'
@@ -39,6 +37,7 @@ end
 
 act 'Return to the hallway':
 	killvar 'fullmorrout'
+	minut += 1
 	gt 'korrPar'
 end
 if func('homes_properties', 'can_live_here'):

+ 9 - 1
locations/mey_home.qsrc

@@ -78,7 +78,15 @@ if $ARGS[0] = 'start':
 	'A large and bright hall, this "hallway" stretches for quite a bit. You''ve never seen anything like this before! There is a mirror covering half of one of the walls. You see the kitchen from the hallway. There''s a big oval dining table.'
 	'There are stairs leading to the second floor. You can also see two doors where the signs say "Toilet" and "Bathroom".'
 
-	act 'Leave the house': minut += 5 & gt 'pav_residential'
+	act 'Leave the house':
+		if $clothingworntype ! 'nude':
+			minut += 5
+			gt 'pav_residential'
+		else
+			msg'<b><font color = red>You need to get dressed.</font></b>'
+			gt 'mey_home', 'start'
+		end
+	end
 
 	if mey_vika['mey_vika_qw'] = 30 and mey_vika['qw_day'] ! daystart and locat['Vicky'] = 15: gs 'mey_vika_events', 'case_gift'
 	if mey_vika['mey_vika_qw'] >= 32 and mey_vika['gym_day'] ! daystart and locat['Vicky'] = 12: gs 'mey_vika_events', 'gym0'

+ 1 - 1
locations/pav_complex.qsrc

@@ -161,7 +161,7 @@ if $ARGS[0] = 'garages':
 	'Along the back street is a row of garages available for the residents of the apartments to rent. The weather in Pavlovsk can be brutal, especially in the winter, so people who own a car often have a garage to put it away safely. Between the garages and the courtyard is a series of smaller storage buildings that can be rented, as well as the complex''s maintenance and laundry buildings. The layout of the buildings leaves a maze of walkways between them, which are a popular place for kids to play or for teenagers to hang out.'
 	*nl
 	if mid($start_type,1,2) = 'sg':'Your <a href="exec:minut += 5 & gt ''gargazel''">stepfather''s garage</a> is around here somewhere.'
-	if gopnikbandQW['practice_invite'] = 1:'The converted <a href="exec:minut += 5 & gt ''praiders_garage'', ''band_garage''">band garage</a> the band uses to practice in is around here.'
+	if gopnikbandQW['practice_invite'] = 1:'The converted <a href="exec:minut += 5 & gt ''praiders_garage'', ''band_garage''">garage</a> the band uses to practice in is around here.'
 	if gopnik_initiation = 1 and gopnik_initiation_day = daystart and hour = 20: act '<b>Meet Lena and Lera</b>': gt 'gopnik_initiation','initiation'
 	if ((week < 6 and hour => 18 and hour < 22) or (week >= 6 and hour >= 15 and hour < 22)) and ed_event_day ! daystart:
 		if anushkaQw['seen_ed'] = 0:

+ 6 - 6
locations/pav_shared_nestor.qsrc

@@ -128,18 +128,18 @@ if $ARGS[0] = 'nestor_Chat':
 		if say = 1:
 			if $clothingworntype = 'nude':
 				'<<$npc_firstname[$boy]>> is scanning your nude body with his eyes.'
-				if salocatnow <= 2:
+				if pcs_bmi <= 18:
 					'He obviously enjoys the sight: <font color=#<<$nestor_font>>>"Nice body <<$pcs_firstname>>. Are you here to offer it?"</font>'
-				elseif salocatnow > 2 and salocatnow <= 4:
+				elseif pcs_bmi <= 25:
 					'He is not very content with the sight: <font color=#<<$nestor_font>>>"You should lose some weight, <<$pcs_firstname>>, you are getting fat."</font>'
 				else
 					'He seems almost disgusted by the sight: <font color=#<<$nestor_font>>>"Jeezus <<$pcs_firstname>>, stop eating you are beginning to look like an elephant!"</font>'
 				end
 				!panties on
-				if salocatnow <= 4 and $pantyworntype ! 'none':
+				if pcs_bmi <= 25 and $pantyworntype ! 'none':
 					'<font color=#<<$nestor_font>>>"Why did you leave those panties on <<$pcs_firstname>>? Such a shame."</font>'
 				!panties off, anal plug
-				elseif salocatnow <= 4 and $pantyworntype = 'none' and analplugIN = 1:
+				elseif pcs_bmi <= 25 and $pantyworntype = 'none' and analplugIN = 1:
 					'As you accidentally turn around, he gazes between your asscheeks on the plug stuck in your ass.'
 					'<font color=#<<$nestor_font>>>"Wow, you just can''t be a second without something filling your holes, do you?"</font>'
 					if rand(0, 100) < 30:
@@ -149,14 +149,14 @@ if $ARGS[0] = 'nestor_Chat':
 				end
 			elseif CloBimbo = 1:
 				'<<$npc_firstname[$boy]>> is scanning your outfit with his eyes.'
-				if salocatnow <= 4:
+				if pcs_bmi <= 25:
 					'<font color=#<<$nestor_font>>>"You know I like when you dress like a mindless bimbo. Not that you aren''t, but anyway, good job!"</font>'
 				else
 					'<font color=#<<$nestor_font>>>"I like girls dressed like bimbos, but they should have the body shape for it. Waste of good clothes on you."</font>'
 				end
 			elseif CloStyle = 4:
 				'<<$npc_firstname[$boy]>> is scanning your outfit with his eyes.'
-				if salocatnow <= 4:
+				if pcs_bmi <= 25:
 					'<font color=#<<$nestor_font>>>"Only thing that I like more than stupid bimbos are whores. I won''t pay you anyway, but good job!"</font>'
 				else
 					'<font color=#<<$nestor_font>>>"I literally love whores, but with your body shape you won''t be earning much money, darling."</font>'

+ 4 - 4
locations/pav_shared_oleg.qsrc

@@ -56,9 +56,9 @@ if $ARGS[0] = 'oleg_Chat':
 			!clothing and bodyshape reactions
 			if $clothingworntype = 'nude':
 				'<<$npc_firstname[$boy]>> is looking at your nude body with obvious shame, blurring.'
-				if salocatnow <= 1:
+				if pcs_bmi <= 15:
 					'He is not very content with the sight: <font color=#<<$oleg_font>>>"<<$pcs_firstname>>, you should eat more, it is unhealthy to be too thin."</font>'
-				elseif salocatnow > 1 and salocatnow <= 4:
+				elseif pcs_bmi <= 25:
 					'Even though he is ashamed, he is obviously pleased with the sight: <font color=#<<$oleg_font>>>"<<$pcs_firstname>>, you have a beautiful body you know... But please, put on some clothes!"</font>'
 				else
 					'He is not very content with the sight: <font color=#<<$oleg_font>>>"<<$pcs_firstname>>, you should eat less, it is unhealthy to be too fat."</font>'
@@ -79,14 +79,14 @@ if $ARGS[0] = 'oleg_Chat':
 				end
 			elseif CloBimbo = 1:
 				'<<$npc_firstname[$boy]>> is looking at your outfit with suspicion.'
-				if salocatnow >= 1 and salocatnow <= 4:
+				if pcs_bmi >= 12 and pcs_bmi <= 25:
 					'<font color=#<<$oleg_font>>>"You know nice girls like you should not wear so skimpy dresses. Some people can''t hold themselves, you know?"</font>'
 				else
 					'<font color=#<<$oleg_font>>>"Girls should not wear so skimpy dresses, it may be offending to other people, you know?"</font>'
 				end
 			elseif CloBimbo = 4:
 				'<<$npc_firstname[$boy]>> is looking at your outfit with suspicion.'
-				if salocatnow <= 4:
+				if pcs_bmi <= 25:
 					'<font color=#<<$oleg_font>>>"You know nice girls like you should not dress like whores. Some people can''t know that they actually are not, you know?"</font>'
 				else
 					'<font color=#<<$oleg_font>>>"Girls should not dress like a whores when they aren''t."</font>'

+ 4 - 4
locations/pav_shared_yakov.qsrc

@@ -56,9 +56,9 @@ if $ARGS[0] = 'yakov_Chat':
 			!clothing and bodyshape reactions
 			if $clothingworntype = 'nude':
 				'<<$npc_firstname[$boy]>> is looking at your nude body wondering...'
-				if salocatnow <= 1:
+				if pcs_bmi <= 15:
 					'He is not very content with the sight: <font color=#<<$yakov_font>>>"<<$pcs_firstname>>, are you not anorexic? Better not, it is a terrible thing."</font>'
-				elseif salocatnow > 1 and salocatnow <= 3:
+				elseif pcs_bmi >= 15 and pcs_bmi <= 20:
 					'<font color=#<<$yakov_font>>>"<<$pcs_firstname>>, you have nice bodyshape you know. Do you exercise or are you mp4ten from nature?"</font>'
 				else
 					'He is not very content with the sight: <font color=#<<$yakov_font>>>"<<$pcs_firstname>>, you should eat less, too much body fat is bad for your sports performance."</font>'
@@ -83,14 +83,14 @@ if $ARGS[0] = 'yakov_Chat':
 				end
 			elseif CloBimbo = 1:
 				'<<$npc_firstname[$boy]>> is looking at your outfit with suspicion.'
-				if salocatnow >= 1 and salocatnow <= 4:
+				if pcs_bmi >= 12 and pcs_bmi <= 25:
 					'<font color=#<<$yakov_font>>>"What a sexy dress are you wearing! Aren''t you afraid it is too sexy for some people in the town, though?"</font>'
 				else
 					'<font color=#<<$yakov_font>>>"Nice dress sweetie, but it would look better if you lost some fat, you know..."</font>'
 				end
 			elseif CloStyle = 4:
 				'<<$npc_firstname[$boy]>> is looking at your outfit with suspicion.'
-				if salocatnow <= 4:
+				if pcs_bmi <= 25:
 					'<font color=#<<$yakov_font>>>"I love sexy dresses on you sweetie, but this one makes you look like a... playgirl if you know what I mean."</font>'
 				else
 					'<font color=#<<$yakov_font>>>"Sweetie this dress one makes you look like a... playgirl if you know what I mean."</font>'

+ 1 - 1
locations/pushkin_ballet_center.qsrc

@@ -8,7 +8,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 	gs 'shortgs', 'setloc', 'ballet_pushkin_center', $ARGS[0]
 	$region = 'puskin'
 	$setloc['StageTitle'] = 'Pushkin Residential School'
-	$setloc['StageImage'] =  'pushkin/residence/residence'
+	$setloc['StageImage'] =  'pushkin/residence/residence.jpg'
 	menu_off = 0
 	if sound = 0:PLAY 'sound/street.mp3',30
 	gs'stat'

+ 35 - 41
locations/pushkin_ballet_class.qsrc

@@ -24,7 +24,7 @@ if $ARGS[0] = 'start':
 	*clr & cla
 	$location_type = 'public_indoors'
 	$setloc['StageTitle'] = 'Terpsichore Wing'
-	$setloc['StageImage'] =  '<<$default_img_path>>ballet_school/daily/hall'
+	$setloc['StageImage'] =  '<<$default_img_path>>ballet_school/daily/hall.jpg'
 
 	!! clear switch vars
 	killvar 'sharedmeal' 
@@ -69,7 +69,7 @@ if $ARGS[0] = 'start':
 	elseif balletqw['school'] ! 1 and ballet_day = 1:
 		'You are chaperoned to your school by Bronya. After a short journey, you were standing outside a classroom and told to wait by Bronya. You look around you at various photographs and artwork of dancers and performances.'
 		'You look at the girls you are with, with a few of them trying to catch your attention, but before you can talk to them, Bronya has come back from the classroom. "You can enter now, girls."'
-		 act 'Attend class': gt 'pushkin_ballet_class', 'pilates'
+		act 'Attend class': gt 'pushkin_ballet_class', 'pilates'
 	elseif balletqw['school'] ! 1 and ballet_day > 1:
 		'You head to school with your group, and you can see a few of your classmates gossiping up front, but you are left to your own thoughts. Before you realise it, you''re standing at the doors to your first lesson.'
 		act 'Attend class': gt 'pushkin_ballet_class', 'pilates'
@@ -82,7 +82,7 @@ if $ARGS[0] = 'pilates':
 	$location_type = 'public_indoors'
 	gs 'themes', 'indoors'
 	$setloc['StageTitle'] = 'Pilates'
-	$setloc['StageImage'] =  '<<$default_img_path>>ballet_school/daily/pilates_2'
+	$setloc['StageImage'] =  '<<$default_img_path>>ballet_school/daily/pilates_2.jpg'
 	nclass = 1
 	if ballet_day = 1:
 
@@ -153,7 +153,7 @@ if $ARGS[0] = 'first_lesson':
 	$location_type = 'public_indoors'
 	gs 'themes', 'indoors'
 	$setloc['StageTitle'] = 'Dance Class'
-	$setloc['StageImage'] =  '<<$default_img_path>>ballet_school/daily/ballet_class_002'
+	$setloc['StageImage'] =  '<<$default_img_path>>ballet_school/daily/ballet_class_002.jpg'
 	nclass = 2
 	gs 'stat'
 
@@ -211,7 +211,7 @@ if $ARGS[0] = 'first_lesson':
 		gs 'sweat', 'add', 30
 		gs 'pushkin_ballet_init', 'daily_assessment'
 		gs 'stat'
-		$setloc['StageImage'] =  '<<$default_img_path>>ballet_school/daily/ballet_class_003'
+		$setloc['StageImage'] =  '<<$default_img_path>>ballet_school/daily/ballet_class_003.jpg'
 		gs 'core_library', 'stage_title'
 
 		'As you enter the classroom, there''s an air of excitement this morning. You''re halfway through the week, and anticipation and nervousness are creeping in for the upcoming assessment.'
@@ -266,7 +266,7 @@ if $ARGS[0] = 'first_lesson':
 		gs 'sweat', 'add', 30
 		gs 'pushkin_ballet_init', 'daily_assessment'
 		gs 'stat'
-		$setloc['StageImage'] =  '<<$default_img_path>>ballet_school/daily/ballet_class_005'
+		$setloc['StageImage'] =  '<<$default_img_path>>ballet_school/daily/ballet_class_005.jpg'
 		gs 'core_library', 'stage_title'
 		'You''ve just finished the Pilates class, and enter your classroom dressed in Ballet Blanc. It''s the first time you''ve seen the group dressed as if you''re part of the Corp, which brings a sense of pride for being here.'
 		'<<$npc_firstname[''A3501'']>> grabs your attention, "Hey, <<$pcs_nickname>>, let''s check you over quickly.". <<$npc_firstname[''A3501'']>> quickly goes over your outfit and hair, ensuring that your presentation is perfect and you do the same for her.'
@@ -277,21 +277,21 @@ if $ARGS[0] = 'first_lesson':
 			'"Well done, class, you have done me proud. You have done exactly what I asked." It was rare praise from Biserka. "Now I want you to give me your best. I want you to dance like you never danced."'
 			'With that, she claps her hands. "Take your positions." Sofia starts to play. You lose yourself in the performance of all the lessons coming together from the last week, and you flow through the performance.'
 			'Biserka watches all the girls'' performances critically, taking notes as she goes. The minutes fly by, and before you know it, the first rehearsal is over. "And again," she calls out.'
-			 act 'Continue rehearsals':
+			act 'Continue rehearsals':
 				*clr & cla
-				$setloc['StageImage'] =  '<<$default_img_path>>ballet_school/daily/ballet_teach_1'
+				$setloc['StageImage'] =  '<<$default_img_path>>ballet_school/daily/ballet_teach_1.jpg'
 				gs 'core_library', 'stage_title'
 				'You rehearse several times before she''s happy, and then she hands critique notes to all the girls. When she gives you yours, she compliments you before gathering Maya and Kima aside for a private talk.'
 				'"Tomorrow your assessment will start at 09:00. You will enter the room in First Position and wait for the examiners'' instructions. Once you have performed the Entrance of the Swans, you will be asked to perform a Pas de Deux with your dance partner."'
 				'"Your final examination is a solo divertissement lasting no more than five minutes. This performance shows your ability to the judges and will be freeform."'
 				'"Any questions? If you have any tonight or need assistance, contact Bronya, and she will advise or help as needed."'
-					act 'Reverence':		
-						*clr & cla
-						$setloc['StageImage'] =  '<<$default_img_path>>ballet_school/events/reverance'
-						gs 'core_library', 'stage_title'
-						'You and the girls all look at each other and start to perform a deep curtsy as part of the great reverence you agreed to the previous evening with the girls to pay respect to Biserka and Sofia for their teaching this week. '
-						'Both teachers look taken aback and have a smile on their faces. "Thank you, class. It''s been a pleasure to teach you this week," Biserka says, with Sofia nodding her agreement and repeating her words.'						   
-						act 'Go to the showers' : gt 'pushkin_ballet_class', 'shower'
+				act 'Reverence':		
+					*clr & cla
+					$setloc['StageImage'] =  '<<$default_img_path>>ballet_school/events/reverance.jpg'
+					gs 'core_library', 'stage_title'
+					'You and the girls all look at each other and start to perform a deep curtsy as part of the great reverence you agreed to the previous evening with the girls to pay respect to Biserka and Sofia for their teaching this week. '
+					'Both teachers look taken aback and have a smile on their faces. "Thank you, class. It''s been a pleasure to teach you this week," Biserka says, with Sofia nodding her agreement and repeating her words.'						   
+					act 'Go to the showers' : gt 'pushkin_ballet_class', 'shower'
 				end
 			end
 		end
@@ -316,7 +316,6 @@ if $ARGS[0] = 'shower':
 			act 'Go to next lesson' : gt 'pushkin_ballet_class', 'music_theory'
 		end
 		gs 'core_library', 'bathroom'
-			 
 		'You enter the school showers after your lesson. You and your classmates don''t have much time to talk to each other, with you having little time until your next lesson.'
 		*nl
 	else 
@@ -335,7 +334,6 @@ if $ARGS[0] = 'shower':
 			end
 		end
 		gs 'core_library', 'bathroom'  
-
 	end
 end
 
@@ -348,7 +346,7 @@ if $ARGS[0] = 'makeup':
 		minut = 0
 	end
 	$setloc['StageTitle'] = 'Theatre Make Up'
-	$setloc['StageImage'] =  '<<$default_img_path>>ballet_school/daily/first_mua'
+	$setloc['StageImage'] =  '<<$default_img_path>>ballet_school/daily/first_mua.jpg'
 	$location_type = 'public_indoors'
 	gs 'themes', 'indoors'
 	! set stats for make up gain - makupskl_lvl
@@ -368,13 +366,13 @@ if $ARGS[0] = 'makeup':
 		'<<$npc_firstname[''A3501'']>> slides in beside you and whispers, "A lot to take in?" You nod your head in agreement. She gives a quick wink before turning back to listen to the lesson.'
 	
 	elseif ballet_day = 2:
-		$setloc['StageImage'] =  '<<$default_img_path>>ballet_school/daily/second_mua'
+		$setloc['StageImage'] =  '<<$default_img_path>>ballet_school/daily/second_mua.jpg'
 		gs 'core_library', 'stage_title'
 		'Another day and your teacher still hasn''t introduced herself, instead telling the students to focus. "Did you read through the books I gave you last night?" she asks.'
 		'Everyone in the class looks at each other. "But Miss, you never told us to," Gasha replies.'
 		'"Do I have to tell you to study everything? You''re girls. You should have been learning make-up from your parents as a child!" the teacher snappishly replies.'
 		'"Fine, you''re to practice this look for the next hour, and you will show me the results of your practice tomorrow." She reaches for a remote. A projector lights up the wall of the make-up you''re to replicate.'
-   
+
 	elseif ballet_day = 3:
 		gs 'core_library', 'stage_title'
 		'"Today, I''m going to assess the results of your homework. You have 30 minutes to achieve this look." She then points to the make-up chart on the wall covering the details and colours required.'
@@ -386,7 +384,7 @@ if $ARGS[0] = 'makeup':
 		'Today, you''re learning hairstyles, and you''re all given small red tins. "This is your emergency box. Keep it with you at all times." You look inside and see a small comb, brush, spare hair bands, grips, slides, pins and kirby pins. There''s even a small sewing kit for the inevitable tears.'
 		'"When you do your exams and assessments, you must always look after your appearance. That''s why you always take this with you. You will be marked down if you aren''t presentable."'
 		'The rest of the lesson teaches professional basic hair care, styling, and tips and tricks to get the best results. It''s a surprisingly fun lesson and time flies by.'
-   
+
 	elseif ballet_day = 5:
 		gs 'core_library', 'stage_title'
 		'"Today, we''ll be going over how you present yourself for your assessment on Saturday. The assessors will judge your abilities as a dancer and how well you apply makeup and care for your hair."'
@@ -403,7 +401,7 @@ if $ARGS[0] = 'lunch':
 	*clr & cla
 	gs 'shortgs', 'setloc', 'pushkin_ballet_class', $ARGS[0]
 	$setloc['StageTitle'] = 'School Cafeteria'
-	$setloc['StageImage'] =  '<<$default_img_path>>ballet_school/daily/cafeteria'
+	$setloc['StageImage'] =  '<<$default_img_path>>ballet_school/daily/cafeteria.jpg'
 	$location_type = 'public_indoors'
 	gs 'themes', 'indoors'
 	!! gs lunch events
@@ -420,8 +418,6 @@ if $ARGS[0] = 'lunch':
 		'You quickly fill your plate with a moderate portion and wolf down your dinner.'		
 		gs 'food', 'm_meal'  
 	end
-	
-	
 end
 
 if $ARGS[0] = 'second_lesson':
@@ -439,10 +435,9 @@ if $ARGS[0] = 'second_lesson':
 	gs 'stat'
 	$setloc['StageTitle'] = 'Dance Practice'
 	if mayaqw['grave'] = 4:
-		$setloc['StageImage'] =  '<<$default_img_path>>ballet_school/daily/mirror_ballet'
-
+		$setloc['StageImage'] =  '<<$default_img_path>>ballet_school/daily/mirror_ballet.jpg'
 	else
-		$setloc['StageImage'] =  '<<$default_img_path>>ballet_school/daily/class_three'
+		$setloc['StageImage'] =  '<<$default_img_path>>ballet_school/daily/class_three.jpg'
 	end
 	gs 'core_library', 'stage_title'
 	if ballet_day = 1 :
@@ -459,7 +454,7 @@ if $ARGS[0] = 'second_lesson':
 		'"Thanks, <<$pcs_nickname>>." She''s slightly out of breath from the grand allegro and pirouettes she''s just performed."'
 		'"Well done, <<$npc_firstname[''A3501'']>>, that was a wonderful performance." Birserka sounds impressed with <<$npc_firstname[''A3501'']>>''s performance. "You will go far with talent like that."'
 		'You momentarily look over the rest of the class and see Tanis'' face frowning, you think with jealousy.'
-	
+
 	elseif ballet_day = 2 :
 		'You stand next to <<$npc_firstname[''A3501'']>>  as you work through your barre exercises. Biserka leaves you alone today after yesterday''s impromptu performance. You and <<$npc_firstname[''A3501'']>> quickly finish your warm up and start to work through your pas de deux routine for your assessment.'
 		'"Remember <<$pcs_nickname>>, when doing your plié, your butt should be over your heels and you should balance your weight on the second toe.", <<$npc_firstname[''A3501'']>> chides you.'
@@ -499,10 +494,10 @@ if $ARGS[0] = 'second_lesson':
 	end
 	*nl
 	act 'Finish lesson': 
-		 *clr & cla
-		 $setloc['StageTitle'] = 'Reverance'
-		 $setloc['StageImage'] =  '<<$default_img_path>>ballet_school/daily/ballet_class_006'
-		 gs 'core_library', 'stage_title'
+		*clr & cla
+		$setloc['StageTitle'] = 'Reverance'
+		$setloc['StageImage'] =  '<<$default_img_path>>ballet_school/daily/ballet_class_006.jpg'
+		gs 'core_library', 'stage_title'
 		'You perform a reverence to Maya in thanks for her help, she returns the curtsey, and you head to the showers together.'
 
 		nclass = 4
@@ -517,7 +512,7 @@ if $ARGS[0] = 'music_theory':
 		minut = 0
 	end
 	$setloc['StageTitle'] = 'Music Theory'
-	$setloc['StageImage'] =  '<<$default_img_path>>ballet_school/daily/ballet_class_004'
+	$setloc['StageImage'] =  '<<$default_img_path>>ballet_school/daily/ballet_class_004.jpg'
 	$location_type = 'public_indoors'
 	gs 'themes', 'indoors'
 	killvar 'nclass'
@@ -530,7 +525,6 @@ if $ARGS[0] = 'music_theory':
 	gs 'core_library', 'stage_title'
 	!! set stats for performance, music production and inst. music.
 
-
 	if ballet_day = 1 :
 		'You enter the classroom, and you see Sofia standing beside the door. "Welcome, girls. It''s a pleasure to see you all again. I hope you''ve enjoyed your first day?" She greets you in a warm and rich voice.'
 		'You and your classmates murmur a yes, unsure how to react. Sofia ignores the half-hearted response. "You''re probably wondering why you are here, as you''re not musicians. However, as a dancer, it''s essential to'
@@ -597,7 +591,7 @@ if $ARGS[0] = 'assessment':
 		minut = 0
 	end
 
-	$setloc['StageImage'] =  '<<$default_img_path>>ballet_school/daily/hall'
+	$setloc['StageImage'] =  '<<$default_img_path>>ballet_school/daily/hall.jpg'
 	gs 'core_library', 'stage_title'
 
 	'You arrive at the ballet school and can sense an air of anticipation and nervousness among your classmates. <<$npc_firstname[''A3501'']>> is standing close to you.'
@@ -613,20 +607,20 @@ if $ARGS[0] = 'assessment':
 		*clr & cla
 		minut += 20
 		gs 'stat'
-		$setloc['StageImage'] =  '<<$default_img_path>>ballet_school/exams/exam_1'
+		$setloc['StageImage'] =  '<<$default_img_path>>ballet_school/exams/exam_1.jpg'
 		gs 'core_library', 'stage_title'
 
 		'You all file into the room and assume the first position. An examiner is at the door checking each girl as they enter for any flaws in their outfits or their appearance.'
 		'"Welcome, students. You have been shortlisted for this year''s apprenticeship intake. Three of you will be allowed to join our school, you have been told what we expect of you today, and we will assess all aspects of your appearance, conduct and the elegance of your performance." An elderly man sits at the table continues to list the assessment requirements.'
 		'You recognise Biserka, two other teachers you''ve not seen before, and <<$npc_firstname[''A3502'']>>, all assessing you. <<$npc_firstname[''A3502'']>>  seems to have his eyes mostly on yourself, but you think you are imagining it.'
 		'"Excellent. Shall we start? Then take your positions and at a count of three, and begin!" At those words, you feel a sense of calmness, and your nerves fall away as you concentrate on your performance. The minutes fly by so quickly that the performance is over before you even realise it.'
-		'"Thank you, that was a most wonderful performance from you all," one of the female teachers says to the class. "Now we shall see how you perform a Pas de Deux with your partner. Please wait outside, and we will call you in."'
+		'"Thank you, that was a most wonderfful performance from you all," one of the female teachers says to the class. "Now we shall see how you perform a Pas de Deux with your partner. Please wait outside, and we will call you in."'
 
 		act 'Perform pas de deux': 
 			*clr & cla
 			minut += 60			
 			gs 'stat'
-			$setloc['StageImage'] =  '<<$default_img_path>>ballet_school/exams/exam_2'
+			$setloc['StageImage'] =  '<<$default_img_path>>ballet_school/exams/exam_2.jpg'
 			gs 'core_library', 'stage_title'
 
 			'You wait outside the classroom. You''ve put on your feet warmers to ensure they remain pliable and take the opportunity to drink some water and eat an energy bar. <<$npc_firstname[''A3501'']>> sits down beside you, lost in thought.'
@@ -643,20 +637,20 @@ if $ARGS[0] = 'assessment':
 				*clr & cla
 				minut += 120
 				gs 'stat'
-				$setloc['StageImage'] =  '<<$default_img_path>>ballet_school/exams/solo_2'
+				$setloc['StageImage'] =  '<<$default_img_path>>ballet_school/exams/solo_2.jpg'
 				gs 'core_library', 'stage_title'
 				'Back outside, you and <<$npc_firstname[''A3501'']>> do checks on your outfits. You notice a small tear on <<$npc_firstname[''A3501'']>>''s tights and get your needle and thread out to repair it. You then check each other''s hair and makeup, with <<$npc_firstname[''A3501'']>> applying some hairspray to tame your flyaway hairs.'
 				'There''s some fruit juice and some snacks on a table to eat whilst you wait for your examination performance. Then, you start doing some light exercises with <<$npc_firstname[''A3501'']>> to remain supple.'
 				'Shortly after you finish your snacks and stretches, you''re called in before <<$npc_firstname[''A3501'']>> .'
 				*nl
-				'"<<$pcs_firstname>> <<$pcs_lastname>>, this is your solo performance. You understand what is required of you?" You realise it''s the school''s Ballet Mistress attending the solo performances. Thankfully, <<$npc_firstname[''A3502'']>> isn''t assessing the solo exams.'
+				'"<<$pcs_firstname>> <<$pcs_lastname>>, this is your solo performance. You understand what is required of you?" You realise it''s the school''s Ballet Mistress attending the solo performances. Thankfully, <<$npc_firstname[''A3510'']>> isn''t assessing the solo exams.'
 				'You curtsy and reply, "Yes, Mistress, I''m ready."'
 				*nl
 				'"Very well, let us begin." With that, she taps the table with something you can''t see. Then, on the count of three, you start your performance. As the music starts, you perform the movements you have learned by rote over the last week. You feel you''ve never performed so well in your life, and everything flows together in a way it never has before.'
 				*nl
 				'At the end of the performance, you feel a sense of loss of something extraordinary. You realise the emotional high you''ve been riding has come to a crashing end, and you barely retain your sense of poise and perform the great reverence to your examiners before you are given permission to leave.'
 				
-			   !! gs 'pushkin_ballet_init', 'daily_assessment', 'grade'
+				!! gs 'pushkin_ballet_init', 'daily_assessment', 'grade'
 				act 'Finalé' : gt 'pushkin_ballet_class', 'start'
 			end
 		end

+ 34 - 29
locations/pushkin_ballet_evt.qsrc

@@ -113,7 +113,7 @@ if $ARGS[0] = 'res_events':
 	if $ARGS[1] = 'introductions':
 		!! Sunday night meet some of your classmates.
 
-		'You enter the communal area and are greeted by a gaggle of excited girls who immediately call out and surround you. You spot a small group sitting down and taking a selfie with a tablet and you look around and see Ms <<$npc_lastname[''A3513'']>> watching over the proceedings.'
+        'You enter the communal area and are greeted by a gaggle of excited girls who immediately call out and surround you. You spot a small group sitting down and taking a selfie with a tablet and you look around and see Madam <<$npc_lastname[''A3513'']>> watching over the proceedings.'
 
 		killvar '$mod_student_table'
 		killvar 'mod_table_count'
@@ -184,18 +184,18 @@ if $ARGS[0] = 'res_events':
 
 	if $ARGS[1] = 'homesick':
 
-		'You enter the communal area and see Gasha holding a study book with a sad expression. "Hello Gasha, everything okay?" you ask.'
-		'She looks up to you from the book, "I''m okay, <<$pcs_nickname>>, I''m just not used to being away from home or being in the city."'
-		'"You''re a friend of Nikita?" you ask her, trying to distract her.'
-		'"Yeah, we grew up in the same village and attended the same school until a few years ago when her mother got a job here. We''ve kept in touch, but it''s been difficult as I''ve been stuck in the village."'
-		'"I know what village life is like," you pause to remember your time in Gadukino, "I spent my summers in Gadukino with my grandparents."'
-		'Gasha looks at you with more interest, and you start to gossip and trade stories about your lives in rural Russia. After a while, she''s laughing at your own escapades and local mishaps.'
-		'"Thank you, <<$pcs_nickname>>, for telling me your stories and cheering me up. I''m glad I''m not the only one!" Gasha says with a broad smile on her face.'
-		'"Anytime, Gasha, if you''re feeling down, let me know."'
-	
-		act 'Leave room': gt 'pushkin_ballet_res', 'communal_area'
-	end
-	
+        'You enter the communal area and see Gasha holding a study book with a sad expression. "Hello Gasha, everything okay?" you ask.'
+        'She looks up to you from the book, "I''m okay, <<$pcs_nickname>>, I''m just not used to being away from home or being in the city."'
+        '"You''re a friend of Nikita?" you ask her, trying to distract her.'
+        '"Yeah, we grew up in the same village and attended the same school until a few years ago when her mother got a job here. We''ve kept in touch, but it''s been difficult as I''ve been stuck in the village."'
+        '"I know what village life is like," you pause to remember your time in Gadukino, "I spent my summers in Gadukino with my grandparents."'
+        'Gasha looks at you with more interest, and you start to gossip and trade stories about your lives in rural Russia. After a while, she''s laughing at your own escapades and local mishaps.'
+        '"Thank you, <<$pcs_nickname>>, for telling me your stories and cheering me up. I''m glad I''m not the only one!" Gasha says with a broad grin on her face.'
+        '"Anytime, Gasha, if you''re feeling down, let me know."'
+    
+        act 'Leave room': gt 'pushkin_ballet_res', 'communal_area'
+    end
+    
 
 	if $ARGS[1] = 'tanis_bully':
 		! Tanis tries to bully Sveta
@@ -219,23 +219,28 @@ if $ARGS[0] = 'res_events':
 	
 	!! Communal random events
 
-	if $ARGS[1] = '1':
-		 ! Chess game between Calina and Ruza
-		 'WIP - tbc'
-	end
-	if $ARGS[1] = '2':
-		! TV with Gasha and munchies
-		'WIP - tbc'
-	end
-	if $ARGS[1] = '3':
-		! Random girls doing barre training.
-		'WIP - tbc'
-	end
-	if $ARGS[1] = '4':
-		! Random girls doing yoga.
-		'WIP - tbc'
+    if $ARGS[1] = '1':
+		! Chess game between Calina and Ruza
+		$setloc['StageTitle'] = 'The Chess Match'
+		$setloc['StageImage'] =   '<<$default_img_path>>ballet_events/chess.jpg'
+		gs 'core_library', 'stage_title'
+		
+		'You enter the communal room you see the twins Calina and Ruza sitting in the corner intently staring at a chess board. You notice the game has just started and a few of the other residents had settled down to watch them.'
+		act 'Leave room': gt 'pushkin_ballet_res', 'communal_area'
 	end
-	if $ARGS[1] = '5':
+    if $ARGS[1] = '2':
+        ! TV with Gasha and munchies
+        'WIP - tbc'
+    end
+    if $ARGS[1] = '3':
+        ! Random girls doing barre training.
+        'WIP - tbc'
+    end
+    if $ARGS[1] = '4':
+        ! Random girls doing yoga.
+        'WIP - tbc'
+    end
+    if $ARGS[1] = '5':
 
 		'You enter the communal room and see Gasha at her favorite place watching TV. She looks at you nervously as you enter, you ask if you could join her.'
 		'"Are you going to bully me too?", she asks, her voice trembling..'

+ 7 - 7
locations/pushkin_ballet_init.qsrc

@@ -122,7 +122,7 @@ if $ARGS[0] = 'daily_assessment':
 		if pubestyle = 10: mod_grade_appearance[week] -= 1
 		if alko > 1: mod_grade_discipline[week] -= 1 
 		!!mod_daily_score[week] = mod_grade_mua[week] + mod_grade_attendance[week] + mod_grade_appearance[week] - mod_grade_discipline[week] 
-	   !! msg 'Attend: <<mod_grade_attendance[week]>>, MUA:<<mod_grade_mua[week]>>, Appear: <<mod_grade_appearance[week]>>, Discipline <<mod_grade_disciple[week]>>, <<pcs_hairbsh>>'
+		!! msg 'Attend: <<mod_grade_attendance[week]>>, MUA:<<mod_grade_mua[week]>>, Appear: <<mod_grade_appearance[week]>>, Discipline <<mod_grade_disciple[week]>>, <<pcs_hairbsh>>'
 	end
 	if nclass = 5 and  school_daily_check ! daystart:
 		mod_daily_score[week] = mod_grade_attendance[week] + mod_grade_mua[week] + mod_grade_appearance[week] + mod_homework[week] - mod_grade_discipline[week] 
@@ -134,17 +134,17 @@ if $ARGS[0] = 'daily_assessment':
 
 		!! Three score levels, fail, pass and merit. Fail is one route for corruption path, pass is either low or no pay, merit is low to low +10%. 
 		if final_score <= 40:
-			 balletqw[school] = 5
+			balletqw[school] = 5
 		elseif final_score >=41 and final_score < 60:
 			!! Interim pass until quest lines are created for Maya/Rudolph
 			balletqw[school] = 1
 			balletqw[rank] = 1
 		elseif final_score >= 61 and final_score <= 90:
-			 balletqw[school] = 1
-			 balletqw[rank] = 1
+			balletqw[school] = 1
+			balletqw[rank] = 1
 		elseif final_score >= 91:
-			 balletqw[school] = 4
-			 balletqw[rank] = 1
+			balletqw[school] = 4
+			balletqw[rank] = 1
 		end
 
 		if final_score > 60: gs 'pushkin_ballet_init', 'famemodifier', final_Score
@@ -209,7 +209,7 @@ end
 
 if $ARGS[0] = 'score_debug':   
 	debug_day = 1
-   :jmp_debug_score
+	:jmp_debug_score
 		'Day: <<debug_day>>' 
 		'Make-up Score: <<mod_grade_mua[debug_day]>>'
 		'Appearance: <<mod_grade_appearance[debug_day]>>'

+ 17 - 14
locations/pushkin_ballet_res.qsrc

@@ -42,7 +42,7 @@ if $ARGS[0] = 'bedroom':
 	*clr & cla
 	$location_type = 'private'
 	$setloc['StageTitle'] = 'Residential Bedroom'
-	$setloc['StageImage'] =   '<<$default_img_path>>ballet_residence/bedroom'
+	$setloc['StageImage'] =   '<<$default_img_path>>ballet_residence/bedroom.jpg'
 	gs 'shortgs', 'setloc', 'pushkin_ballet_res', $ARGS[0]
 	gs 'themes', 'indoors'
 	gs 'stat'
@@ -66,7 +66,8 @@ if $ARGS[0] = 'bedroom':
 		if komp = 1: 'Your <a href="exec: gt ''Komp'',''start''">computer</a> is on your desk.'
 		'<table><tr><td valign="top">Your <a href="exec:gt ''alarmclock'', ''start''">alarm clock</a> is set to <<func(''alarmclock'', ''alarm_display'', alarmVars[''timerH''], alarmVars[''timerM''])>> during the week and <<func(''alarmclock'', ''alarm_display'', alarmVars[''timerEndH''], alarmVars[''timerEndM''])>> during the weekend. It is currently turned ' + iif(alarmVars['alarmOn'] = 0, '<a href="exec: alarmVars[''alarmOn''] = 1 & gt $loc, $loc_arg">OFF</a>.', '<a href="exec: alarmVars[''alarmOn''] = 0 & gt $loc, $loc_arg">ON</a>.')
 		
-		if $clothingworntype ! 'nude':
+		gs 'core_library', 'clothing_status'
+		if $apparel['status'] ! 'nude':
 			act 'Go to the hallway': minut += 5 & gt 'pushkin_ballet_res', 'hallway'
 		else
 			act 'Go to the hallway':
@@ -105,7 +106,7 @@ end
 if $ARGS[0] = 'hallway':	
 	*clr & cla
 	$setloc['StageTitle'] = 'Residental Hallway'
-	$setloc['StageImage'] =  '<<$default_img_path>>/ballet_residence/hall'
+	$setloc['StageImage'] =  '<<$default_img_path>>/ballet_residence/hall.jpg'
 	$location_type = 'public_indoors'
 	gs 'shortgs', 'setloc', 'pushkin_ballet_res', $ARGS[0]
 	gs 'core_library', 'corridor'
@@ -119,8 +120,8 @@ if $ARGS[0] = 'hallway':
 		ballet_day = week
 	end
 	nclass = 0
-
-	if $clothingworntype ! 'nude':
+	gs 'core_library', 'clothing_status'
+	if $apparel['status'] ! 'nude' and ($apparel['status'] = 'sport' or $apparel['status'] = 'dance'):
 		if hour = 6 or (hour  = 7 and minut <=  30):
 			act 'Attend Ballet Classes': gt 'pushkin_ballet_class', 'start'
 		elseif hour = 7 and (minut > 30 and minut <= 59):
@@ -130,7 +131,7 @@ if $ARGS[0] = 'hallway':
 			act 'Leave Residence': minut += 5 & ballet_awol = 1 & gt 'pushkin_ballet_center', 'start'
 		end
 	else	   
-		msg '<b><font color = red>Whilst as a dancer you have less worries about showing yourself off Bronya would likely have a few choice words about your behaviour.</font></b>'
+		msg '<b><font color = red>Whilst as a dancer you have less inhibition than most, Bronya would likely have a few choice words about your clothing choices or lack thereof.</font></b>'
 		gt $loc, $loc_arg	
 	end
 
@@ -165,14 +166,16 @@ if $ARGS[0] = 'hallway':
 				'You hear someone playing the piano in the communal room. You don''t recognize the piece being played, but its soothing melody relaxes you.'
 			end
 		end
+		killvar 'amb_event'
 	end
+	
 end
 
 if $ARGS[0] = 'maya_room':
 	*clr & cla
 	$location_type = 'private'	
 	$setloc['StageTitle'] = 'Maya Room'
-	$setloc['StageImage'] =   '<<$default_img_path>>/ballet_residence/maya_room'
+	$setloc['StageImage'] =   '<<$default_img_path>>/ballet_residence/maya_room.jpg'
 	gs 'shortgs', 'setloc', 'pushkin_ballet_res', $ARGS[0]
 	gs 'themes', 'indoors'
 	gs 'stat'
@@ -187,7 +190,7 @@ if $ARGS[0] = 'communal_area':
 	*clr & cla
 
 	$setloc['StageTitle'] = 'Communal Room'
-	$setloc['StageImage'] =   '<<$default_img_path>>/ballet_residence/communal'
+	$setloc['StageImage'] =   '<<$default_img_path>>/ballet_residence/communal.jpg'
 	$location_type = 'public_indoors'
 	gs 'shortgs', 'setloc', 'pushkin_ballet_res', $ARGS[0]
 	gs 'themes', 'indoors'
@@ -215,7 +218,7 @@ if $ARGS[0] = 'kitchen':
 	*clr & cla
 	
 	$setloc['StageTitle'] = 'Residental Kitchen'
-	$setloc['StageImage'] =   '<<$default_img_path>>ballet_residence/kitchen'
+	$setloc['StageImage'] =   '<<$default_img_path>>ballet_residence/kitchen.jpg'
 	$location_type = 'private'
 	gs 'shortgs', 'setloc', 'pushkin_ballet_res', $ARGS[0]
 	gs 'themes', 'indoors'
@@ -286,7 +289,7 @@ if $ARGS[0] = 'warden_room':
 	
 	$location_type = 'private'
 	$setloc['StageTitle'] = 'Wardens Residence'
-	$setloc['StageImage'] =   '<<$default_img_path>>/ballet_residence/warden' 
+	$setloc['StageImage'] =   '<<$default_img_path>>/ballet_residence/warden.jpg' 
 	$location_type = 'public_indoors'
 	gs 'shortgs', 'setloc', 'pushkin_ballet_res', $ARGS[0]
 	gs 'themes', 'indoors'
@@ -337,7 +340,7 @@ if $ARGS[0] = 'radio':
 		mod_daily_score[week] += 1
 	end
 	$setloc['StageTitle'] = 'Radio'
-	$setloc['StageImage'] =   '<<$default_img_path>>ballet_residence/russian_radio'
+	$setloc['StageImage'] =   '<<$default_img_path>>ballet_residence/russian_radio.jpg'
 	gs 'stat'
 	gs 'core_library', 'stage_title'
 
@@ -364,7 +367,7 @@ if $ARGS[0] = 'feetcare':
 	feet_track = daystart
 	gs 'stat'
 	$setloc['StageTitle'] = 'Feet Care'
-	$setloc['StageImage'] =  '<<$default_img_path>>ballet_events/feet_soak'
+	$setloc['StageImage'] =  '<<$default_img_path>>ballet_events/feet_soak.jpg'
 	gs 'core_library', 'stage_title'
 
 	'After the long day at the ballet class, you diligently inspect your calves and feet for injuries, gently massaging Arnica Gel onto your calves and ankles to alleviate stiffness and swelling. Next, you carefully examine your calluses and check for any blisters.'
@@ -385,7 +388,7 @@ if $ARGS[0] = 'study':
 	mod_homework[week] += 1 
 	mod_daily_score[week] += 1
 	$setloc['StageTitle'] = 'Ballet Studies'
-	$setloc['StageImage'] =  '<<$default_img_path>>ballet_residence/study'
+	$setloc['StageImage'] =  '<<$default_img_path>>ballet_residence/study.jpg'
 	gs 'stat'
 	gs 'core_library', 'stage_title'
 	 'You gather your school books and notebook to begin studying ballet movements, history, and musical theory, diligently taking notes as you progress. After an hour of reading, you notice your eyes beginning to glaze over. Recognizing the need for a break, you decide to stand up and stretch.'
@@ -411,7 +414,7 @@ if $ARGS[0] = 'make_up':
 		end
 		gs 'stat'
 		$setloc['StageTitle'] = 'Make Up Practice'
-		$setloc['StageImage'] =  '<<$default_img_path>>/ballet_events/make-up'
+		$setloc['StageImage'] =  '<<$default_img_path>>/ballet_events/make-up.jpg'
 		gs 'core_library', 'stage_title'
 
 		if pcs_makupskl <= 30:

+ 6 - 8
locations/sitrPar.qsrc

@@ -7,7 +7,8 @@
 !! Desc: Family living room and Kolka''s bedroom links to family corridor
 
 if $ARGS[0] = '' or $ARGS[0] = 'start':
-
+	!! Call in location default actions
+	gs 'home_family_init', 'init'
 	!! Start location initialisation
 
 	!! Set location header - img path is set in init
@@ -20,14 +21,11 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 	!! Sitting room variables:
 	$locclass = 'livingr'
 	locat['Fam_livingroom'] = 0
-	minut += 1
-
 
 	!! Set location vars:
-	minut += 1
 
-	!! Call in location default actions
-	gs 'home_family_init', 'init'
+
+
 	
 	!! Check if anyone is in the room
 	gs 'sitrPar', 'occupied'
@@ -50,7 +48,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 		gs 'exercise','start'
 	end
 
-	act 'Leave the room': gt 'korrPar'
+	act 'Leave the room': minut += 1 & gt 'korrPar'
 	act 'Sit on the sofa': gt 'sitrPar', 'sofa'
 
 	if locat['Kolka'] = 2 and brothermorningsex = daystart:
@@ -86,7 +84,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 			'You sit at the festive table laid in front of the TV and celebrate the New Year with your family, the TV providing some background noise. At the table, people strike up a conversation and common problems are forgotten as everyone is has fun talking to each other. At midnight, everyone wishes one another a happy New Year and enjoys the champagne and fireworks outside as your mother gives you an envelope with a greeting card and 5000 <b>₽</b>.' 
 			'You continue to watch TV and enjoy the champagne and company of your family, but everyone eventually grows tired and they go to bed, one by one.'
 
-			act 'Leave': gt 'korrPar'
+			act 'Leave': 	minut += 1 & gt 'korrPar'
 		end
 	elseif month = 1 and day = 1:
 		act 'Eat some leftovers at the festive table':

+ 31 - 26
locations/vanrPar.qsrc

@@ -6,29 +6,30 @@
 !! 
 !! Desc: Family home bathroom links to family flat corridor
 
-!! Start location initialisation
-!! Set location header - img path is set in init
-$setloc['StageTitle'] = 'Parents Bathroom'
-$setloc['StageImage'] = '<<$default_img_path>>/vanrpar.jpg'
 
-!! Set location vars:
-minut += 1
+if $ARGS[0] = '' or $ARGS[0] = 'start':
+	!! Start location initialisation
 
-!! Call in location default actions
+	!! Call in location default actions
+	gs 'home_family_init', 'init'
 
-gs 'home_family_init', 'init'
+	!! Set location header - img path is set in init
+	$setloc['StageTitle'] = 'Parents Bathroom'
+	$setloc['StageImage'] = '<<$default_img_path>>/vanrpar.jpg'
 
-!! Set up game location data
-$location_type = 'bathroom'
-$bathtype = 'bathtub shower'
-gs 'shortgs', 'setloc', 'vanrPar', $ARGS[0]
+	!! Set location vars:
 
-!! End location initialisation
-if $ARGS[0] = '' or $ARGS[0] = 'start':
+	!! Set up game location data
+	$location_type = 'bathroom'
+	$bathtype = 'bathtub shower'
+
+	!! End location initialisation
+
+	!! prevent peek scene setting $loc_arg
+	gs 'shortgs', 'setloc', 'vanrPar', 'start'
 	!! Display header and banner image
 	gs 'core_library', 'stage_title'
 
-
 	!! Begin location content
 	
 	!! Location default description:
@@ -60,12 +61,16 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 
 	if vanr_lock = 0 or vanr_lock = 2:
 		if fullmorrout = 1:
-			act '<b>Finish and go to the kitchen</b>':gt 'kuhrPar'
+			act '<b>Finish and go to the kitchen</b>': minut += 1 & gt 'kuhrPar'
 		else
-			act '<b>Return to the hallway</b>': gt 'korrPar'
+			act '<b>Return to the hallway</b>':minut += 1 & gt 'korrPar'
 		end
 	elseif vanr_lock = 1:
-		act 'Unlatch the door and leave': vanr_lock = 0 & gt 'korrPar'
+		act 'Unlatch the door and leave': 
+			minut += 1 
+			vanr_lock = 0
+			gt 'korrPar'
+		end
 	end
 
 	gs 'din_van', 'private'
@@ -73,17 +78,17 @@ end
 
 if $ARGS[0] = 'latch':
 	vanr_lock = 1
-	gt 'vanrPar'
+	gt 'vanrPar', 'start'
 end
 
 if $ARGS[0] = 'unlatch':
 	vanr_lock = 0
-	gt 'vanrPar'
+	gt 'vanrPar', 'start'
 end
 
 if $ARGS[0] = 'perm_latch':
 	vanr_lock = 2
-	gt 'vanrPar'
+	gt 'vanrPar', 'start'
 end
 
 if $ARGS[0] = 'peek':
@@ -96,7 +101,7 @@ if $ARGS[0] = 'peek':
 			'<center><video autoplay loop src="images/characters/pavlovsk/resident/vladimir/sex/bath_voyer_0.mp4"></video></center>'
 			'As luck would have it, you hear footsteps at the door. Turning around, you catch a glimpse of your stepfather through the gap in the door right before he moves away, muttering something about the door. Once again alone, you find yourself feeling confused, and with a rapidly beating heart.'
 			stepdadqw += 1
-			act 'Finish': gt 'vanrPar'
+			act 'Finish': gt 'vanrPar', 'start'
 		else
 			if npc_sex['A28'] = 0 or stepdadqw < 5 or mesec > 0 or locat['Mom_athome'] = 1:
 				gs 'vanrPar', 'stepdad_nosex'
@@ -147,7 +152,7 @@ if $ARGS[0] = 'stepdad_nosex':
 	'<center><video autoplay loop src="images/characters/pavlovsk/resident/vladimir/sex/bath_voyer_2.mp4"></video></center>'
 	'You hear movement at the door and turn around. It''s your stepfather. It looks like he passed by and accidentally peeked in. Catching his glance, you feel mischievous and excited, so you blow him a kiss. Without a word, he disappears, yet you can''t help smiling and giggling as you continue drying your hair.'
 	stepdadqw += 1
-	act 'Finish': gt 'vanrPar'
+	act 'Finish': gt 'vanrPar', 'start'
 end
 
 if $ARGS[0] = 'stepdad_sex_no':
@@ -157,7 +162,7 @@ if $ARGS[0] = 'stepdad_sex_no':
 	'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shower_coverup.jpg"></center>'
 	'He stands at the threshold for a moment, staring at you and nervously licking his lips. They way he is looking at your makes you feel exposed and you quickly cover yourself up. "Oh my god what you are doing? Get out and close the door." He looks surprised by your outburst, he looks like he is about to say something, but then he just shakes his head and walks out pulling the door closed behind him, letting you finish your shower in peace.'
 	stepdadqw -= 2
-	act 'Finish': gt 'vanrPar'
+	act 'Finish': gt 'vanrPar', 'start'
 end
 
 if $ARGS[0] = 'stepdad_sex':
@@ -342,7 +347,7 @@ if $ARGS[0] = 'stepdad_sex_end':
 		noshampoo = 1
 		dynamic $showerdin
 		gs 'stat'
-		gt 'vanrPar'
+		gt 'vanrPar', 'start'
 	end
 end
 
@@ -358,7 +363,7 @@ if $ARGS[0] = 'stepdad_sex_analend':
 		noshampoo = 1
 		dynamic $showerdin
 		gs 'stat'
-		gt 'vanrPar'
+		gt 'vanrPar', 'start'
 	end
 end