Merge remote-tracking branch 'upstream/master' into ml-dev

locations/AlbStars.qsrc

@@ -529,7 +529,7 @@ if $ARGS[0] = 'whore1':
 				'"Only that cute little head dancer has ever taken it in the ass better than you, whore. All the other bitches just cry." You let out a loud yelp as he finishes with a stinging smack on your ass that echoes into the room.'
 				'To your despair and disgust, he then forces you into his now sweaty embrace, his flabby arm wrapped around your neck as he fondles your breast while bragging on his phone to his friend about "some of the best anal" he''s ever had. This post sex torture finally ends 10 minutes later.'
 				gs 'arousal', 'anal', 30, 'sub', 'humiliation', 'rough'
-				gs 'pain', 2 'mouth', 'pull' 
+				gs 'pain', 2, 'mouth', 'pull' 
 				gs 'pain', 2, 'asshole', 'stretch'
 				gs 'cum_call', 'anus', $AlbinaQW['Cust']
 				gs 'pain', 2, 'asscheeks', 'slap'

locations/FedorEv4.qsrc

@@ -2434,8 +2434,8 @@ if $ARGS[0] = 'Toilet 3':
 	*clr & cla
 	menu_off = 1
 	gs 'stat'
-	'<center><b><h4><font color="red">Evil Toilet</font></h4></b></left>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/home/bathroom/toilet/vket.jpg"></left>'
+	'<center><b><h4><font color="red">Evil Toilet</font></h4></b></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/home/bathroom/toilet/vket.jpg"></center>'
 	'<h4><b>FEED ME!!!</b></h4>'
 
 	act 'NOO!':gt 'FedorEv4', 'Bathroom'
@@ -2859,8 +2859,8 @@ if $ARGS[0] = 'Regina Chat':
 	*clr & cla
 	menu_off = 1
 	gs 'stat'
-	'<center><b><h4><font color="#FF00FF"><<"Regina Kozlov">></font></h4></b></left>'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/fedorhome/regina.jpg"></left>'
+	'<center><b><h4><font color="#FF00FF"><<"Regina Kozlov">></font></h4></b></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/fedorhome/regina.jpg"></center>'
 	*nl
 	'Fedor''s mother has long blond hair that is well kept and looks really good for her age.'
 	if $clothingworntype = 'nude' and ReginaKozCaught < 5:
@@ -2907,8 +2907,8 @@ if $ARGS[0] = 'Regina Chat 2':
 	ReginaKozlov += 1
 	minut += 10
 	gs 'stat'
-	'<center><b><h4><font color="#FF00FF"><<"Regina Kozlov">></font></h4></b></left>'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/fedorhome/regina.jpg"></left>'
+	'<center><b><h4><font color="#FF00FF"><<"Regina Kozlov">></font></h4></b></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/fedorhome/regina.jpg"></center>'
 	*nl
 	VK = rand(1,7)
 	if VK = 1:
@@ -2936,8 +2936,8 @@ if $ARGS[0] = 'Dinner 1':
 	minut += 5
 	ReginaKoz_Daystart = daystart
 	gs 'stat'
-	'<center><b><h4><font color="#FF00FF"><<"Regina Kozlov">></font></h4></b></left>'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/fedorhome/regina.jpg"></left>'
+	'<center><b><h4><font color="#FF00FF"><<"Regina Kozlov">></font></h4></b></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/fedorhome/regina.jpg"></center>'
 	*nl
 	'Of course, it''s no problem. Here, have a seat and I''ll make us a nice meal.'
 
@@ -2957,7 +2957,7 @@ if $ARGS[0] = 'Dinner':
 	cumspclnt = 2
 	minut += 20
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/fedorhome/regina.jpg"></left>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/fedorhome/regina.jpg"></center>'
 	*nl
 	'You and Regina spend a few minutes getting to know each other while eating a well prepared meal.'
 
@@ -2990,8 +2990,8 @@ if $ARGS[0] = 'Fedor Livingroom':
 	menu_off = 0
 	minut += 5
 	gs 'stat'
-	'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></left>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/home/livingroom/fedor.jpg"></left>'
+	'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/home/livingroom/fedor.jpg"></center>'
 	*nl
 	'Fedor is sitting on the sofa watching tv and when he notices you, he pats the seat next to him, offering you a seat.'
 	
@@ -3022,8 +3022,8 @@ if $ARGS[0] = 'Fedor Kitchen':
 	$menu_arg = 'Fedor Kitchen'
 	menu_off = 0
 	gs 'stat'
-	'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></left>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/home/kitchen/fedor.jpg"></left>'
+	'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/home/kitchen/fedor.jpg"></center>'
 	*nl
 	'Fedor is sitting down at the table, waiting for his microwaved lunch to finish.'
 	
@@ -3075,8 +3075,8 @@ if $ARGS[0] = 'Fedor Bedroom':
 	$menu_arg = 'Fedor Bedroom'
 	menu_off = 0
 	gs 'stat'
-	'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></left>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/home/bedroom/fedor.jpg"></left>'
+	'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/home/bedroom/fedor.jpg"></center>'
 	*nl
 	'Fedor is laying on his bed, relaxing.'
 	if FedorLove = 0:
@@ -3135,11 +3135,11 @@ if $ARGS[0] = 'Fedor Bedroom 2':
 	menu_off = 0
 	minut += 10
 	gs 'stat'
-	'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></left>'
+	'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
 	if fedorKozlovQW = -15:
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedormisc/outcast/outcast2.jpg"></left>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedormisc/outcast/outcast2.jpg"></center>'
 	else
-		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big5.jpg"></left>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big5.jpg"></center>'
 	end
 	*nl
 	'Fedor is watching videos on his computer. As you approach, Fedor turns to you and asks "Hey <<$pcs_nickname>>, wanna check out some videos?"'
@@ -3226,7 +3226,7 @@ if $ARGS[0] = 'Future':
 	act 'Marriage':
 		*clr & cla
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/home/sitting.jpg"></left>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/home/sitting.jpg"></center>'
 		'<b><h4><font color=#FF00FF>To be continued... Love Violet Kitten.</font></h4></b>'
 
 		act 'Awwww':gt 'FedorEv4', 'Fedor Bedroom'
@@ -3271,8 +3271,8 @@ if $ARGS[0] = 'Fedor Livingroom Chat':
 	menu_off = 1
 	minut += 10
 	gs 'stat'
-	'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></left>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/home/livingroom/fedor.jpg"></left>'
+	'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/home/livingroom/fedor.jpg"></center>'
 	'You sit down next to Fedor and both of you discuss your favorite TV shows.'
 
 	act 'Finish chatting':gt 'FedorEv4', 'Livingroom'
@@ -3283,8 +3283,8 @@ if $ARGS[0] = 'Fedor Kitchen Chat':
 	menu_off = 1
 	minut += 10
 	gs 'stat'
-	'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></left>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/home/kitchen/fedor.jpg"></left>'
+	'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/home/kitchen/fedor.jpg"></center>'
 	'You sit down next to Fedor and both of you discuss your favorite foods.'
 
 	act 'Finish chatting':gt 'FedorEv4', 'Kitchen'
@@ -3295,8 +3295,8 @@ if $ARGS[0] = 'Fedor Bedroom Chat':
 	menu_off = 1
 	minut += 10
 	gs 'stat'
-	'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></left>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/home/bedroom/fedor.jpg"></left>'
+	'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/home/bedroom/fedor.jpg"></center>'
 	'You sit down next to Fedor and both of you share stories about your classmates.'
 
 	act 'Finish chatting':gt 'FedorEv4', 'Bedroom'
@@ -3307,7 +3307,7 @@ if $ARGS[0] = 'Fedor Bedroom Chat 2':
 	menu_off = 1
 	minut += 10
 	gs 'stat'
-	'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></left>'
+	'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedormisc/console1.jpg"></center>'
 	'Fedor gets up and offers you his seat then stands behind you as he shows you his playlist of favorite online videos as you share with him, your favorites.'
 
@@ -3323,7 +3323,7 @@ if $ARGS[0] = 'Private Chat':
 	*clr & cla
 	menu_off = 1
 	gs 'stat'
-	'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></left>'
+	'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/fedorsad.jpg"></center>'
 	'You sit down next to Fedor then ask, "Can we talk for a moment...In private?" Fedor turns to you with a concerned look on his face. "Of course <<$pcs_firstname>>. Let''s head to my room where we can talk in private." Fedor takes your hand then leads you to the bedroom.'
 
@@ -3350,8 +3350,8 @@ if $ARGS[0] = 'Fedor Shelter 2':
 	FedorShelter = 2
 	npc_rel['A5'] += 20
 	gs 'stat'
-	'<center><b><h4><font color="#FF00FF"><<"Regina Kozlov">></font></h4></b></left>'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/fedorhome/regina.jpg"></left>'
+	'<center><b><h4><font color="#FF00FF"><<"Regina Kozlov">></font></h4></b></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/fedorhome/regina.jpg"></center>'
 	'You can see Fedor and Regina sitting down together chatting then Regina notices you. Regina looks up to you with a sad face then says, "Fyodor told me about what happened. You''re mother threw you out? Why?" you lower your head, trying to figure out where to start when Regina says, "It''s ok, you don''t have to tell me. I can''t believe that she would throw out her own daughter. Fyodor and I have been discussing, and I decided that it would be best if you to stay for while, but promise me that you will try to find a place to live when you graduate, okay?" you happily nod, and can feel tears gathering in your eyes, as you reply, "Yes I will. Thank you so much. I thought that I would be living on the street. Thank you." Regina approaches you then wipes away your tears. "I will get you a key." Regina then reaches inside of a drawer then pulls out a set of keys then give you one. Fedor gives you a hug then says, "You will always be welcome here." You return the hug, as you reply, "Thank you for everything Fyodor. You are the best boyfriend ever."'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedormisc/console1.jpg"></center>'
 
@@ -3411,7 +3411,7 @@ if $ARGS[0] = 'Home Entrance':
 	$menu_arg = 'Home Entrance'
 	menu_off = 0
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/fedorhome/house.jpg"></left>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/fedorhome/house.jpg"></center>'
 	'Fedor''s house is a bit weathered but still looks quite lovely. This house is but a short walk away from my parents apartment.'
 	
 	act 'Walk away': minut += 5 & gt 'pav_residential'
@@ -3431,8 +3431,8 @@ if $ARGS[0] = 'Home Entrance 2':
 	elseif week <= 5 and hour >= 19:
 		gt 'FedorEv4', 'Home Entrance 3'
 	elseif week > 5 and hour > 10:
-		'<center><b><h4><font color="#FF00FF"><<"Regina Kozlov">></font></h4></b></left>'
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/fedorhome/regina.jpg"></left>'
+		'<center><b><h4><font color="#FF00FF"><<"Regina Kozlov">></font></h4></b></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/fedorhome/regina.jpg"></center>'
 		'You knock on the door until Regina opens it and invites you inside.'
 		act 'Enter house':gt 'FedorEv4', 'Hallway'
 	else
@@ -3444,11 +3444,11 @@ end
 if $ARGS[0] = 'Home Entrance 3':
 	*clr & cla
 	menu_off = 1
-	'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></left>'
+	'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
 	if fedorKozlovQW = -15:
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedormisc/outcast/outcast2.jpg"></left>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedormisc/outcast/outcast2.jpg"></center>'
 	else
-		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big5.jpg"></left>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big5.jpg"></center>'
 	end
 	'You knock on the door until Fedor opens it and invites you inside.'
 

locations/FedorMisc.qsrc

@@ -78,14 +78,14 @@ if $ARGS[0] = 'Fedor Chat':
 		if $loc = 'gdkin':minut += 5
 		gs 'stat'
 		if fedorKozlovQW = -10:
-			'<center><b><h4><font color=#FF00FF><<"Fyodor [Masha] Kozlov">></font></h4></b></left>'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedormisc/outcast/outcast1.jpg"></left>'
+			'<center><b><h4><font color=#FF00FF><<"Fyodor [Masha] Kozlov">></font></h4></b></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedormisc/outcast/outcast1.jpg"></center>'
 		elseif fedorKozlovQW < -10:
-			'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></left>'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedormisc/outcast/outcast2.jpg"></left>'
+			'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedormisc/outcast/outcast2.jpg"></center>'
 		else
-			'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></left>'
-			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big5.jpg"></left>'
+			'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big5.jpg"></center>'
 		end
 
 		*nl
@@ -132,8 +132,8 @@ if $ARGS[0] = 'Fedor Hate':
 	menu_off = 1
 	minut += 5
 	gs 'stat'
-	'<center><b><h4><font color=#FF00FF><<"Fyodor [Masha] Kozlov">></font></h4></b></left>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/fedorangry.jpg"></left>'
+	'<center><b><h4><font color=#FF00FF><<"Fyodor [Masha] Kozlov">></font></h4></b></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/fedorangry.jpg"></center>'
 	'Fedor looks at you with hatred as he says, "I have nothing to say to you. Go away!"'
 
 	if $loc ! 'gdkin':

locations/UnitAppearance.qsrc

@@ -1,10 +1,12 @@
 # UnitAppearance
 if $ARGS[0] = '':
 	*clr
+    'Hotcat'
 	'<table>'
 		'<tr>
 			<th>Desc</th>
 			<th>hotcat</th>
+			<th>bmi</th>
 			<th>bodykoef</th>
 			<th>HeadBonus</th>
 			<th>AttributeBonus</th>
@@ -17,13 +19,16 @@ if $ARGS[0] = '':
 		</tr>'
 		gs 'UnitAppearance', 'GenerateSvetas'
 	'</table>'
+end
 
+if $ARGS[0] = 'gashtest':
 end
 
 if $ARGS[0] = 'GenRow':
 	'<tr>'
 		'<td><<$svetadesc>></td>'
 		'<td><<unitHotcat>></td>'
+		'<td><<unitbmi_calc>></td>'
 		'<td><<unitbodykoef>></td>'
 		'<td><<unitHeadBonus>></td>'
 		'<td><<unitAttributeBonus>></td>'
@@ -36,9 +41,26 @@ if $ARGS[0] = 'GenRow':
 	'</tr>'
 end 
 
+if $ARGS[0] = 'GenRowBreak':
+	'<tr>'
+		'<td><<$ARGS[1]>></td>'
+		'<td></td>'
+		'<td></td>'
+		'<td></td>'
+		'<td></td>'
+		'<td></td>'
+		'<td></td>'
+		'<td></td>'
+		'<td></td>'
+		'<td></td>'
+		'<td></td>'
+		'<td></td>'
+	'</tr>'
+end 
+
 if $ARGS[0] = 'calcHotcat':
 	unitbmi_calc = FUNC('body_shape', 'bmicalc', unitsalo, unitpcs_hgt)
-	unitbodykoef = FUNC('body_shape', 'setbodykoef', unitsalo, unitpcs_hgt, unitstrenbuf, unitsalocatnow, unitvofat, unitbmi_calc)
+	unitbodykoef = FUNC('body_shape', 'setbodykoef', unitbmi_calc, unitstrenbuf, unitsalocatnow, unitvofat)
 	unitHeadBonus = FUNC('body_shape', 'calcHeadBonus', unitpcs_lashes, unitpcs_eyesize, unitpcs_lip, unitpcs_teeth)
 	unitAttributeBonus = FUNC('body_shape', 'calcAttributeBonus', unitpcs_agil, unitpcs_vital)
 	unitpcs_apprncbase = FUNC('body_shape', 'basebeautycalc2', unitResetBase, unitvidage, unitpcs_skin, unitbodykoef, unitunitHeadBonus, unitunitAttributeBonus, unitpcs_apprncbase)
@@ -51,6 +73,72 @@ if $ARGS[0] = 'calcHotcat':
 	gs 'UnitAppearance', 'GenRow'
 end
 
+if $ARGS[0] = 'headbonus':
+	*clr
+    'HeadBonus'
+	'<table>'
+		'<tr>
+			<th>headbonus</th>
+			<th>pcs_lashes</th>
+			<th>pcs_eyesize</th>
+			<th>pcs_lip</th>
+			<th>pcs_teeth</th>
+		</tr>'
+		gs 'UnitAppearance', 'HeadBonusCalc'
+	'</table>'
+end
+
+if $ARGS[0] = 'HeadBonusCalc':
+    gs 'UnitAppearance', 'GenHeadRow', 5,3,3,-1
+    gs 'UnitAppearance', 'GenHeadRow', 4,3,4,-1
+    gs 'UnitAppearance', 'GenHeadRow', 3,2,2,0
+    gs 'UnitAppearance', 'GenHeadRow', 2,2,2,0
+    gs 'UnitAppearance', 'GenHeadRow', 1,1,1,1
+    gs 'UnitAppearance', 'GenHeadRow', 0,0,0,3
+end
+
+if $ARGS[0] = 'GenHeadRow':
+    unitHeadBonus = FUNC('body_shape', 'calcHeadBonus', ARGS[1], ARGS[2], ARGS[3], ARGS[4])
+    '<tr>'
+        '<td><<unitHeadBonus>></td>'
+        '<td><<ARGS[1]>></td>'
+        '<td><<ARGS[2]>></td>'
+        '<td><<ARGS[3]>></td>'
+        '<td><<ARGS[4]>></td>'
+    '</tr>'
+end
+
+if $ARGS[0] = 'attributebonus':
+	*clr
+    'AttributeBonus'
+	'<table>'
+		'<tr>
+			<th>attributebonus</th>
+			<th>pcs_agil</th>
+			<th>pcs_vital</th>
+		</tr>'
+		gs 'UnitAppearance', 'AttribBonusCalc'
+	'</table>'
+end
+
+if $ARGS[0] = 'AttribBonusCalc':
+    gs 'UnitAppearance', 'GenAttribRow', 100,100
+    gs 'UnitAppearance', 'GenAttribRow', 80,80
+    gs 'UnitAppearance', 'GenAttribRow', 60,60
+    gs 'UnitAppearance', 'GenAttribRow', 40,40
+    gs 'UnitAppearance', 'GenAttribRow', 20,20
+    gs 'UnitAppearance', 'GenAttribRow', 0,0
+end
+
+if $ARGS[0] = 'GenAttribRow':
+    unitAttribBonus = FUNC('body_shape', 'calcAttributeBonus', ARGS[1], ARGS[2])
+    '<tr>'
+        '<td><<unitAttribBonus>></td>'
+        '<td><<ARGS[1]>></td>'
+        '<td><<ARGS[2]>></td>'
+    '</tr>'
+end
+
 if $ARGS[0] = 'GenerateSvetas':
 
 	$svetadesc = 'Current Sveta'
@@ -89,19 +177,7 @@ if $ARGS[0] = 'GenerateSvetas':
 	unitsupnatvnesh = supnatvnesh
     unitpcs_apprncbase = pcs_apprncbase
     unitResetBase = 0
-	gs 'UnitAppearance', 'calcHotcat'
-
-    $svetadesc = 'Naked current Sveta'
-    unitPXCloThinness = 0
-    unitPXCloTopCut = 0
-    unitPXCloBottomShortness = 0
-    unitPCloQuality = 0
-    $unitclothingworntype = 'nude'
-    $unitpantyworntype = ''
-    $unitbraworntype = ''
-    unitpcs_apprncbase = pcs_apprncbase
-    unitResetBase = 0
-    gs 'UnitAppearance', 'calcHotcat'
+	gs 'UnitAppearance', 'GenerateSvetaOptions', $svetadesc
 
     $svetadesc = 'Hot Sveta'
     unitsalo = 65
@@ -139,17 +215,7 @@ if $ARGS[0] = 'GenerateSvetas':
     unitsupnatvnesh = 0
     unitpcs_apprncbase = 0
     unitResetBase = 1
-    gs 'UnitAppearance', 'calcHotcat'
-
-    $svetadesc = 'Naked Hot Sveta'
-    unitPXCloThinness = 0
-    unitPXCloTopCut = 0
-    unitPXCloBottomShortness = 0
-    unitPCloQuality = 0
-    $unitclothingworntype = 'nude'
-    $unitpantyworntype = ''
-    $unitbraworntype = ''
-    gs 'UnitAppearance', 'calcHotcat'
+	gs 'UnitAppearance', 'GenerateSvetaOptions', $svetadesc
 
     $svetadesc = 'Nerd start Sveta'
     unitsalo = 132
@@ -187,17 +253,8 @@ if $ARGS[0] = 'GenerateSvetas':
     unitsupnatvnesh = 0
     unitpcs_apprncbase = 0
     unitResetBase = 1
-    gs 'UnitAppearance', 'calcHotcat'
+	gs 'UnitAppearance', 'GenerateSvetaOptions', $svetadesc
 
-    $svetadesc = 'Naked Nerd start Sveta'
-    unitPXCloThinness = 0
-    unitPXCloTopCut = 0
-    unitPXCloBottomShortness = 0
-    unitPCloQuality = 0
-    $unitclothingworntype = 'nude'
-    $unitpantyworntype = ''
-    $unitbraworntype = ''
-    gs 'UnitAppearance', 'calcHotcat'
 
     $svetadesc = 'Dancer start Sveta'
     unitsalo = 55
@@ -235,17 +292,7 @@ if $ARGS[0] = 'GenerateSvetas':
     unitsupnatvnesh = 0
     unitpcs_apprncbase = 0
     unitResetBase = 1
-    gs 'UnitAppearance', 'calcHotcat'
-
-    $svetadesc = 'Naked Dancer start Sveta'
-    unitPXCloThinness = 0
-    unitPXCloTopCut = 0
-    unitPXCloBottomShortness = 0
-    unitPCloQuality = 0
-    $unitclothingworntype = 'nude'
-    $unitpantyworntype = ''
-    $unitbraworntype = ''
-    gs 'UnitAppearance', 'calcHotcat'
+	gs 'UnitAppearance', 'GenerateSvetaOptions', $svetadesc
 
 
     $svetadesc = 'Popular start Sveta'
@@ -284,17 +331,7 @@ if $ARGS[0] = 'GenerateSvetas':
     unitsupnatvnesh = 0
     unitpcs_apprncbase = 0
     unitResetBase = 1
-    gs 'UnitAppearance', 'calcHotcat'
-
-    $svetadesc = 'Naked Popular start Sveta'
-    unitPXCloThinness = 0
-    unitPXCloTopCut = 0
-    unitPXCloBottomShortness = 0
-    unitPCloQuality = 0
-    $unitclothingworntype = 'nude'
-    $unitpantyworntype = ''
-    $unitbraworntype = ''
-    gs 'UnitAppearance', 'calcHotcat'
+	gs 'UnitAppearance', 'GenerateSvetaOptions', $svetadesc
 
     $svetadesc = 'Gopnik start Sveta'
     unitsalo = 80
@@ -332,17 +369,7 @@ if $ARGS[0] = 'GenerateSvetas':
     unitsupnatvnesh = 0
     unitpcs_apprncbase = 0
     unitResetBase = 1
-    gs 'UnitAppearance', 'calcHotcat'
-
-    $svetadesc = 'Naked Gopnik start Sveta'
-    unitPXCloThinness = 0
-    unitPXCloTopCut = 0
-    unitPXCloBottomShortness = 0
-    unitPCloQuality = 0
-    $unitclothingworntype = 'nude'
-    $unitpantyworntype = ''
-    $unitbraworntype = ''
-    gs 'UnitAppearance', 'calcHotcat'
+	gs 'UnitAppearance', 'GenerateSvetaOptions', $svetadesc
 
     $svetadesc = 'Ugly start Sveta'
     unitsalo = 220
@@ -380,17 +407,7 @@ if $ARGS[0] = 'GenerateSvetas':
     unitsupnatvnesh = 0
     unitpcs_apprncbase = 0
     unitResetBase = 1
-    gs 'UnitAppearance', 'calcHotcat'
-
-    $svetadesc = 'Naked Ugly start Sveta'
-    unitPXCloThinness = 0
-    unitPXCloTopCut = 0
-    unitPXCloBottomShortness = 0
-    unitPCloQuality = 0
-    $unitclothingworntype = 'nude'
-    $unitpantyworntype = ''
-    $unitbraworntype = ''
-    gs 'UnitAppearance', 'calcHotcat'
+	gs 'UnitAppearance', 'GenerateSvetaOptions', $svetadesc
 
     $svetadesc = 'Slut start Sveta'
     unitsalo = 60
@@ -428,17 +445,7 @@ if $ARGS[0] = 'GenerateSvetas':
     unitsupnatvnesh = 0
     unitpcs_apprncbase = 0
     unitResetBase = 1
-    gs 'UnitAppearance', 'calcHotcat'
-
-    $svetadesc = 'Naked Slut start Sveta'
-    unitPXCloThinness = 0
-    unitPXCloTopCut = 0
-    unitPXCloBottomShortness = 0
-    unitPCloQuality = 0
-    $unitclothingworntype = 'nude'
-    $unitpantyworntype = ''
-    $unitbraworntype = ''
-    gs 'UnitAppearance', 'calcHotcat'
+	gs 'UnitAppearance', 'GenerateSvetaOptions', $svetadesc
 
     $svetadesc = 'goth start Sveta'
     unitsalo = 45
@@ -476,20 +483,71 @@ if $ARGS[0] = 'GenerateSvetas':
     unitsupnatvnesh = 0
    unitpcs_apprncbase = 0
    unitResetBase = 1
-
-   gs 'UnitAppearance', 'calcHotcat'
-   $svetadesc = 'Naked goth start Sveta'
-   unitPXCloThinness = 0
-   unitPXCloTopCut = 0
-   unitPXCloBottomShortness = 0
-   unitPCloQuality = 0
-   $unitclothingworntype = 'nude'
-   $unitpantyworntype = ''
-   $unitbraworntype = ''
-   gs 'UnitAppearance', 'calcHotcat'
+   gs 'UnitAppearance', 'GenerateSvetaOptions', $svetadesc
 
 end
 
+if $ARGS[0] = 'GenerateSvetaOptions':
+
+
+    gs 'UnitAppearance', 'GenRowBreak', $svetadesc
+
+    $svetadesc = 'Current Clothes <<$ARGS[1]>>'
+    
+    gs 'UnitAppearance', 'calcHotcat'
+
+    $svetadesc = 'Low Clothes <<$ARGS[1]>>'
+    unitPXCloThinness = 150
+    unitPXCloTopCut = 100
+    unitPXCloBottomShortness = 100
+    unitPCloQuality = 1
+    $unitclothingworntype = ''
+    unitbonusZ = 1
+    unitPShoQuality = 1
+    $unitpantyworntype = ''
+    $unitbraworntype = ''
+    gs 'UnitAppearance', 'calcHotcat'
+
+    $svetadesc = 'Med Clothes <<$ARGS[1]>>'
+    unitPXCloThinness = 250
+    unitPXCloTopCut = 300
+    unitPXCloBottomShortness = 150
+    unitPCloQuality = 4
+    $unitclothingworntype = ''
+    unitbonusZ = 3
+    unitPShoQuality = 4
+    $unitpantyworntype = 'fashionista'
+    $unitbraworntype = 'fashionista'
+    gs 'UnitAppearance', 'calcHotcat'
+
+    $svetadesc = 'High Clothes <<$ARGS[1]>>'
+    unitPXCloThinness = 400
+    unitPXCloTopCut = 500
+    unitPXCloBottomShortness = 400
+    unitPCloQuality = 7
+    $unitclothingworntype = ''
+    unitbonusZ = 5
+    unitPShoQuality = 7
+    $unitpantyworntype = 'boutique'
+    $unitbraworntype = 'boutique'
+    gs 'UnitAppearance', 'calcHotcat'
+
+    $svetadesc = 'Naked <<$ARGS[1]>>'
+    unitPXCloThinness = 0
+    unitPXCloTopCut = 0
+    unitPXCloBottomShortness = 0
+    unitPCloQuality = 0
+    $unitclothingworntype = 'nude'
+    $unitpantyworntype = ''
+    $unitbraworntype = ''
+    gs 'UnitAppearance', 'calcHotcat'
+
+    gs 'UnitAppearance', 'GenRowBreak', ''
+
+end 
+
+
+
 if $ARGS[0] = 'CurVal':
     $SvetaDesc = input("Enter a description for Sveta")
 	*clr

locations/bed2.qsrc

@@ -320,7 +320,7 @@ if $ARGS[0] = 'dream':
 		alarm_set -= 1440
 	end
 	
-	if StoryLine = 1 and indorf = 0 and motherQW['bathroom_dildos'] > 0:gt'mother_sextalk','bathroom_dildos_wakeup1'
+	if StoryLine = 1 and indorf = 0 and motherQW['bathroom_dildos'] > 0:gt'mother_sextalk','dildo_wakeup1'
 
 	if slept_in = 1:
 		gs 'stat'

locations/body.qsrc

@@ -2400,9 +2400,9 @@ if $ARGS[0] = 'calcClothesBonus':
 
 	if $tempclothingworntype = 'nude':
 		!! needs a rethink as this is skewing the results
-		tempCloAdjustedBeauty =  temppcs_apprncbase
+		tempCloAdjustedBeauty =  0
 	else
-		tempCloAdjustedBeauty = temppcs_apprncbase * tempRevealing * tempPCloQuality / 5000
+		tempCloAdjustedBeauty = temppcs_apprncbase * tempRevealing * tempPCloQuality / 10000
 	end
 
 	if $tempclothingworntype = 'exercise': tempCloAdjustedBeauty = tempCloAdjustedBeauty * 2 / 3

locations/body_shape.qsrc

@@ -245,7 +245,7 @@ if $ARGS[0] = '':
 
 !!Setting the pcs_apprnc bonus based on fat and strength
 	bmi_calc = FUNC('body_shape', 'bmicalc', salo, pcs_hgt)
-	bodykoef = FUNC('body_shape', 'setbodykoef', salo, pcs_hgt, strenbuf, salocatnow, vofat, bmi_calc)
+	bodykoef = FUNC('body_shape', 'setbodykoef', bmi_calc, strenbuf, salocatnow, vofat)
 
 !!This is to clean up unused variables
 	killvar 'normbuffpick' & killvar 'nrmbfpckct'
@@ -255,17 +255,15 @@ end
 
 if $ARGS[0] = 'setbodykoef':
 	!!Setting the pcs_apprnc bonus based on fat and strength
-	tempbodyFat = ARGS[1] & !!salo
-	temppcs_hgt = ARGS[2] & !!pcs_hgt
-	tempstrenbuf = ARGS[3] & !!strenbuf
-	tempsalocatnow = ARGS[4] & !! salocatnow
-	tempvofat = ARGS[5] & !! vofat
-	tempbmi_calc = ARGS[6] & !! result of bmicalc
+	tempbmi_calc = ARGS[1] & !! result of bmicalc
+	tempstrenbuf = ARGS[2] & !!strenbuf
+	tempsalocatnow = ARGS[3] & !! salocatnow
+	tempvofat = ARGS[4] & !! vofat
 
 	if tempbmi_calc < 16:
 		tempbodykoef = 35
     elseif tempbmi_calc < 19:
-		botempbodykoefdykoef = 70
+		tempbodykoef = 70
     elseif tempbmi_calc < 25:
 		tempbodykoef = 90
     elseif tempbmi_calc < 30:
@@ -588,18 +586,17 @@ if $args[0] = 'basebeautycalc2':
 
 !!	Setting vidagebonus
 	vidagebonus = 100
-	if tempvidage < 20: vidagebonus = 60 + 2 * tempvidage
-	if tempvidage > 30: vidagebonus = 160 - 2 * tempvidage
+	if tempvidage < 20: vidagebonus = 60 + (2 * tempvidage)
+	if tempvidage > 30: vidagebonus = 160 - (2 * tempvidage)
 
 !!	Preforming the calculation
 	skincalc = (temppcs_skin * 2 / 5)
-	bodykoefcalc = (3 * (2 + tempbodykoef))
-	vneshtemp = vidagebonus * (skincalc + bodykoefcalc + tempAttributeBonus + tempHeadBonus) / 100
+	vneshtemp = vidagebonus * (skincalc + tempbodykoef + tempAttributeBonus + tempHeadBonus) / 100
 
 !!	pcs_skin = skin condition, corrected to a 0 to 40 range; bodykoef set in main body_shape; pcs_teeth is missing teeth or cosmetically improved teeth (-1)
 
 !!	This is the first limiter
-	if vneshtemp > 100: vneshtemp = 100
+	!!if vneshtemp > 100: vneshtemp = 100
 
 !!	This adds the supernatural pcs_apprnc bonus; currently Bimbo and Succubus
 	vneshtemp += supnatvnesh
@@ -613,7 +610,6 @@ if $args[0] = 'basebeautycalc2':
 	!!do not kill vneshtemp here it gets killed in basebeautycalc
 	killvar 'temppcs_apprncbase'
 	killvar 'skincalc'
-	killvar 'bodykoefcalc'
 	killvar 'tempvidage'
 	killvar 'temppcs_skin'
 	killvar 'tempbodykoef'

locations/din_van.qsrc

@@ -156,15 +156,7 @@ $shower = {
 			end
 		end
 		
-		if dyneval('result = <<$loc>>_bath_dildo') = 1:
-			act 'Ride your bathtub dildo':gt'selfplay','shower_bathtub_suction_dildo_ride'
-		end
-		
-		if dyneval('result = <<$loc>>_glass_shower_dildo') = 1:
-			act 'Ride your wall mounted dildo':gt'selfplay','glass_shower_suction_dildo_ride'
-		elseif dyneval('result = <<$loc>>_bath_shower_dildo') = 1:
-			act 'Ride your wall mounted dildo':gt'selfplay','shower_bathtub_wall_dildo_fuck'
-		end
+		gs'selfplay','shower_dildo_check'
 		
 		act 'Take a selfie':
 			gs 'telefon', 'Phone_selfie_image_bathing', 'shower'
@@ -258,9 +250,7 @@ $bath = {
 			dynamic $dryOff
 		end
 		
-		if dyneval('result = <<$loc>>_bath_dildo') = 1:
-			act 'Ride your bathtub dildo':gt'selfplay','shower_bathtub_suction_dildo_ride'
-		end
+		gs'selfplay','bathtub_dildo_check'
 
 		act 'Take a selfie':
 			gs 'telefon', 'Phone_selfie_image_bathing', 'bath'
@@ -313,6 +303,8 @@ $brit = {
 					'You lather up your legs and carefully shave them. Once you''re finished gliding your hands over your smooth legs, ensuring you didn''t miss a spot, you spend some time trimming back your	bush as well.'
 				end
 				dynamic $dryOff
+				gs'selfplay','bathtub_dildo_check'
+				gs'selfplay','shower_dildo_check'
 			end
 			
 			if pcs_leghair > 3:
@@ -336,6 +328,8 @@ $brit = {
 						'You lather your legs up with some soapy water and shave your legs. After a few swift movements, your legs are smooth as silk. The feeling of your smooth legs turns you on a little.'
 					end
 					dynamic $dryOff
+					gs'selfplay','bathtub_dildo_check'
+					gs'selfplay','shower_dildo_check'
 				end
 			end
 		else
@@ -356,6 +350,8 @@ $brit = {
 					*nl
 					'You lather your crotch with some soapy water and carefully shave your pubic hair. After shaving you can''t help but run your fingers over your pussy, enjoying the smooth feeling and getting slightly more aroused by the touch.'
 					dynamic $dryOff
+					gs'selfplay','bathtub_dildo_check'
+					gs'selfplay','shower_dildo_check'
 				end
 			elseif ((pubestyle >= 2 and pubestyle <= 8) or pubestyle >= 12) and pcs_pubes > 19:
 				act 'Trim your pubic hair (0:10)':
@@ -370,6 +366,8 @@ $brit = {
 					*nl
 					'You spend some time carefully shaving your pubic hair to your desired shape, and then trim it to make it neat and tidy.'
 					dynamic $dryOff
+					gs'selfplay','bathtub_dildo_check'
+					gs'selfplay','shower_dildo_check'
 				end
 			elseif pubestyle = 9 and pcs_pubes > 19:
 				act 'Trim your pubic hair (0:10)':
@@ -388,6 +386,8 @@ $brit = {
 					stanok -= 1
 					if obdysh = 1 and rand(0, 5) = 5:gt 'vann', 'brit1'
 					dynamic $dryOff
+					gs'selfplay','bathtub_dildo_check'
+					gs'selfplay','shower_dildo_check'
 				end
 			elseif pubestyle = 10 and pcs_pubes >= 29:
 				act 'Trim back your bush (0:10)':
@@ -402,6 +402,8 @@ $brit = {
 					*nl
 					'You spend some time trimming back your thick bush of pubic hair, tidying it up and keeping your bikini line nice and clean.'
 					dynamic $dryOff
+					gs'selfplay','bathtub_dildo_check'
+					gs'selfplay','shower_dildo_check'
 				end
 			end
 		end
@@ -427,6 +429,8 @@ $brit = {
 					'You lather your legs up with some soapy water and shave your legs. After a few swift movements, your legs are smooth as silk. The feeling of your smooth legs turns you on a little.'
 				end
 				dynamic $dryOff
+				gs'selfplay','bathtub_dildo_check'
+				gs'selfplay','shower_dildo_check'
 			end
 		end
 	end

locations/family_schedule.qsrc

@@ -109,6 +109,7 @@ end
 
 !!momloc [11] = daystart check in salon
 !!indorf = 1 means mom is in the village
+!!momloc['athome'] = 1 means mom is at home and awake
 if indorf = 0:
 	if week <= 5:
 		if hour < 5 or (hour = 5 and minut < 30):
@@ -117,11 +118,15 @@ if indorf = 0:
 		elseif hour = 5 and minut < 50:
 			!!shower
 			momloc = 2
+			momloc['athome'] = 1
+			if vanrPar_suction_dildo > 0:motherQW['bathroom_dildos'] = vanrPar_suction_dildo
 		elseif hour < 6 or (hour = 6 and minut < 10):
 			!! Getting dressed in her room and wakes Vladimir, if Sveta walks by she''ll ask to wake Kolka (Occasional morning quicky)
 			momloc = 3
+			momloc['athome'] = 1
 		elseif hour = 6 or (hour = 7 and minut < 30):
 			momloc = 4
+			momloc['athome'] = 1
 			if hour = 6 and minut < 40:
 				!! Make Breakfast
 				momloc[1] = 1
@@ -139,50 +144,65 @@ if indorf = 0:
 			!!Cleaning random room in the house
 			!!variable set in cikl
 			momloc = momcleaning
+			momloc['athome'] = 1
 		elseif hour = 8 and minut < 30:
-			!! Walking to work
+			!! Using the shower
 			momloc = 5
+			momloc['athome'] = 1
 			if vanrPar_suction_dildo > 0:motherQW['bathroom_dildos'] = vanrPar_suction_dildo
 		elseif hour < 16 and week < 5:
 			!!Working in the cafe. On Friday she stays until 18:00
 			momloc = 6
+			momloc['athome'] = 0
 		elseif hour = 16 and minut < 40 and week < 5:
 			!!Buying groceries for dinner and other stuff needed for home at the supermarket
 			momloc = 7
+			momloc['athome'] = 0
 		elseif hour < 17 and week < 5:
 			!!Walking home
 			momloc = 8
+			momloc['athome'] = 0
 		elseif hour = 17 and minut < 50 and week = 5:
 			!!Working in the cafe. On Friday she stays until 17:50
 			momloc = 9
+			momloc['athome'] = 0
 		elseif hour < 18 and week = 5:
 			!!Walking home
 			momloc = 10
+			momloc['athome'] = 0
 		elseif hour < 18:
 			!!Making dinner (On Friday she brings home leftovers from the cafe)
 			momloc = 11
+			momloc['athome'] = 1
 		elseif hour < 19:
 			!! Cleaning dinner table/Doing dishes
 			momloc = 12
+			momloc['athome'] = 1
 		elseif hour < 20:
 			if week = 1:
 				!! Visiting Luda on mondays for 3 hours
 				momloc = 20
+				momloc['athome'] = 0
 			else
 				!! (cleaning the bathroom, sweeping, mopping, dusting, watching TV, taking a bath, etc in different rooms)
 				momloc = momcleaning2
+				momloc['athome'] = 1
+				if vanrPar_suction_dildo > 0:motherQW['bathroom_dildos'] = vanrPar_suction_dildo
 			end
 		elseif hour < 22:
 			if week = 1:
 				!! Visiting Luda on mondays for 3 hours
 				momloc = 20
+				momloc['athome'] = 0
 			else
 				!! Watches TV with Vladimir
 				momloc = 13
+				momloc['athome'] = 1
 			end
 		else
 			!! Sleep (Small chance she and step dad have sex before sleep)
 			momloc = 1
+			momloc['athome'] = 0
 		end
 	else
 		if hour < 5 or (hour = 5 and minut < 30):
@@ -191,11 +211,15 @@ if indorf = 0:
 		elseif hour = 5 and minut < 50:
 			!! Shower, if Sveta knocks she''ll ask to wake Kolka
 			momloc = 2
+			momloc['athome'] = 1
+			if vanrPar_suction_dildo > 0:motherQW['bathroom_dildos'] = vanrPar_suction_dildo
 		elseif hour < 6 or (hour = 6 and minut < 10):
 			!! Getting dressed in her room and wakes Vladimir, if Sveta walks by she''ll ask to wake Kolka (Occasional morning quicky)
 			momloc = 3
+			momloc['athome'] = 1
 		elseif hour = 6 or (hour = 7 and minut < 30):
 			momloc = 4
+			momloc['athome'] = 1
 			if hour = 6 and minut < 40:
 				!! Make Breakfast
 				momloc[1] = 1
@@ -211,13 +235,16 @@ if indorf = 0:
 			end
 		elseif hour = 11:
 			!!Cleaning random room in the house/laundry
-	!! cleaning kitchen only one in use atm
+			!! cleaning kitchen only one in use atm
 			momloc = 23
+			momloc['athome'] = 1
 		elseif hour = 11 and minut < 30:
 			!! Takes the car to town
 			momloc = 14
+			momloc['athome'] = 0
 		elseif hour < 12 or hour = 12 and minut < 30:
 			!! Gets her nails done/hair cut at the salon or such things - On Sunday goes to the church during these hours
+			momloc['athome'] = 0
 			if week = 5:
 				momloc = 15
 			else
@@ -228,20 +255,26 @@ if indorf = 0:
 		elseif hour < 14:
 			!! Walks around different shops, looking at and buying stuff - On Sunday goes to church during these hours
 			momloc = 15
+			momloc['athome'] = 0
 		elseif hour < 17:
 			!!Helping out Sergey/Luda, going to Kolka's games?
 			momloc = rand(14,15)
+			momloc['athome'] = 0
 		elseif hour < 18:
 			!! Making dinner
 			momloc = 11
+			momloc['athome'] = 1
 		elseif hour = 18 and minut < 30:
 			!!Family dinner (same as the family breakfast, Sveta doesn''t have to join it but we can have some family interactions like mom and step dad asking about how school was etc)
 			momloc = 12
+			momloc['athome'] = 1
 		elseif hour < 19:
 			!! Cleaning dinner table/Doing dishes
 			momloc = 13
+			momloc['athome'] = 1
 		elseif hour < 21:
 			!!Says she goes to see her sister, in reality sometimes see's her sister of fucks around with different people. - Sunday goes to evening mass
+			momloc['athome'] = 0
 			if week = 5:
 				momloc = 17
 			else
@@ -250,9 +283,11 @@ if indorf = 0:
 		elseif hour < 22:
 			!! Watches TV with Vladimir
 			momloc = 19
+			momloc['athome'] = 1
 		else
 			!! Sleep (Small chance she and step dad have sex before sleep)
 			momloc = 1
+			momloc['athome'] = 0
 		end
 	end
 end

locations/foto_events.qsrc

@@ -847,9 +847,8 @@ if $ARGS[0] = 'special':
 		specialjob4 = rand(1,100)
 		specialjob5 = rand(1,100)
 		specialjob6 = rand(1,100)
-!!		specialjob7 = rand(1,100)
-!!		specialjob8 = rand(1,100)
-!!		specialjob9 = rand(1,100)
+		specialjob7 = rand(1,100)
+		specialjob8 = rand(1,100)
 	end
 	cla & *clr
 	'<center><b><font color="maroon">Photographer</font></b></center>'
@@ -884,7 +883,8 @@ if $ARGS[0] = 'list':
 	if specialjob5 >= 95:'<a href="exec:gt ''foto_events'',''independent_art''">	Independent Art Project</a>'
 	!!if specialjob5 >= 95:'<a href="exec:gt ''foto_events'',''independent_art''">	Independent Art Project</a>'
 	if specialjob6 >= 95:'<a href="exec:gt ''foto_events'',''designer_wedding''">	Designer Wedding Dress</a>'
-!!		if specialjob8 >= 95:'<a href="exec:gt ''foto_events'',''model_portraits''">photo albums</a>'
+	if specialjob7 >= 95 and city_kickboxing >=30 and pcs_inhib >= 45:'<a href="exec:gt ''foto_events'',''kickboxing_documentary''">   Kickboxing documentary</a>'
+    if specialjob8 >= 95 and city_running >=30 and pcs_inhib >= 50 and month >= 3 and month <=8:'<a href="exec:gt ''foto_events'',''track_&_field_documentary''">   Track & Field documentary</a>'
 !!		if specialjob9 >= 95:'<a href="exec:gt ''foto_events'',''model_portraits''">photo albums</a>'
 !!	if specialjob6 >= 95:'<a href="exec:gt ''foto_events'',''documentary''">	Documentary</a>'
 end
@@ -911,7 +911,6 @@ if $ARGS[0] = 'high_fasion':
 			mdlng_exp += rand(1,2)
 			city_modelling += rand(5,25)
 			pav_modelling += rand(0,city_modelling)/6
-			gs 'exhibitionism', 1
 			money += modelpayfin
 			modelfotomoney += modelpayfin
 			'You spend the duration of the shoot changing in and out of designer bodices, corsets, and other tops, all of which conspicuously lack any kind of bottom, leaving your pussy exposed.'
@@ -1204,7 +1203,6 @@ if $ARGS[0] = 'modern_art':
 				modelfoto_nude += 1
 				mdlng_exp += rand(9,10)
 				city_modelling += rand(1,21)
-				gs 'exhibitionism', 4
 				modern_art_projet = 1
 				pcs_horny += 20
 				'The girl has you and the other model lie down on your sides and then wrap your legs your heads, both of you grabbing the other''s foot with your hand in a way that allows you to perfectly mirror each other''s position. At the client''s insistence, you bury your face between the other girl''s legs. The aroma of her sex fills your nostrils and you can feel her breath on your own pussy as well.'
@@ -2081,7 +2079,6 @@ if $ARGS[0] = 'wet':
 							mdlng_exp += rand(9,10)
 							city_modelling += rand(18,21)
 							pav_modelling += rand(0,city_modelling)/4
-							gs 'exhibitionism', 4
 							money += modelpayfin
 							modelfotomoney += modelpayfin
 							'Eventually, the shoot is over and they leave you cold, shivering, and with really hard nipples. But at least you''ve also got a dry wad of cash that counts out to <<modelpayfin>> <b>₽</b>.'

locations/foto_events2.qsrc

@@ -114,6 +114,160 @@ if $ARGS[0] = 'champagne1.2':
 	end
 end
 
+!! ----------------------------------------------------------------------------------------------------
+!!
+!! ------------------------------- Kickboxing Documentary ---------------------------------------------
+!!
+!! ----------------------------------------------------------------------------------------------------
+
+if $ARGS[0] = 'kickboxing_documentary':
+    cla & *clr
+    '<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
+    '"A kickboxing documentary?" you ask."'
+    '"Yea. The local sports magazine, is doing a coverage of the Female Kickboxing League. We are doing the graphic part, lots of work doing artistic naked pics, making you women look badass and beautifull. As you are gaining in popularity, they will want a journalist to do an interview. The royalties and the advertising are great. Are you interested?."'
+    '"Hmmm..."'
+    act'Back to the list':gt'foto_events','list'
+    act'Yeah! I''m in!':
+        cla
+        *nl
+        specialjob7 = 0
+        '"Great! The photographers are all ready doing their job in the Havanna Fitness Center. You will meet the journalist there."'
+        act'Do the shoot':
+            cla & *clr
+            '<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/KD1.jpg"></center>'
+            minut += 120
+            modelpayfin = 900 + (modelpay * 2) + (50*rand(0,7)) + ((city_kickboxing + pcs_apprnc)/2)*2
+            modelfoto_naked += 1
+            mdlng_exp += rand(1,2)
+            city_kickboxing += rand(2,12)
+            pav_kickboxing += rand(0,city_modelling)/12  
+            city_modelling += rand(2,12)
+            pav_modelling += rand(0,city_modelling)/12
+			gs 'exhibitionism', 1
+            money += modelpayfin
+            modelfotomoney += modelpayfin
+            inhib_exp += 2
+            gs 'stat'
+            'You aren''t the only one doing this documentay. Around you, walking between photographers, there are others kickboxers trying to follow the instructions to be "dynamic". Beyond that, the modeling, is fairlly artistic, showing skin, but hidding the important bits, between props and poses.'
+            *nl
+            'After doing several shots, finally a journalist has time to talk with you.'
+            act'Do the interview.':
+                cla & *clr
+                gs 'stat'
+                '<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/KD2.jpg"></center>'
+                if city_kickboxing >=150 and razradKik >= 5:
+                    '"You are <<$pcs_lastname>> Isn''t it?"'
+                    'The journalist shakes your hand with a big smile on his face. Interviewing you, must be a great thing, as practically without stopping, you are showered with questions, from the sport-related to the personal, passing for the absolute trivial.'
+                    '"Your feeling about that victory? Your favorite color? A man in your life?"'
+                    'The interview goes and goes like this during a long time, until your allocated time end, and then reluctantly the journalist leaves you to talk to another kickboxer.'            
+                elseif city_kickboxing >=60 and razradKik >= 2:
+                    'Between shots, a journalist comes and asks you questions. Most of them, are fairly generic. Personal data, your opinions about the league, confirmation on their information. In general, it doesn''t seems to deep but it is evident that the journalist has his hands more than full, catching up with all the women in the gymnasium.'
+                else
+                    'You wait between shots, but the journalist seems to find somebody else more interesting and forgets to talk with you.'
+				end
+                act' Finally the job is done':                        
+                    cla & *clr   
+                    gs 'stat'
+                    '<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/KD3.jpg"></center>'
+                    if city_kickboxing >=150 and razradKik >= 5:						                               
+                        'Two hours later, the model session/interviews end. After returning to the studio, you are handed <<modelpayfin>> <b>₽</b> in payment for the job.'
+                        'Sometime later, the article is sent to your phone...' 
+                        'And is a little awkward... The realization, that you are getting famous, as one of the best, if not the BEST, female kickboxer in all St.petersburg. Practically, the article turns around you. With even fans asking all kinds of personal questions. Damn! You are Hot, Mean and Famous!'                            
+                    elseif city_kickboxing >=60 and razradKik >= 2:
+                        'Two hours later, the model session/interviews end. After returning to the studio, you are handed <<modelpayfin>> <b>₽</b> in payment for the job.' 
+                        'Sometime later, the article is sent to your phone...' 
+                        'Being true, is a little dry, mentioning your name, general information and that you are an up-and-coming kickboxer.'
+                    else
+                        'Two hours later, the model session/interviews end. After returning to the studio, you are handed <<modelpayfin>> <b>₽</b> in payment for the job.' 
+                        'Sometime later, the article is sent to your phone...' 
+                        'And is disappointing! Beyond your photo is only your name, and the mention, that you are a participant in the League.'
+                    end
+					act'Go back to the main floor':gt'foto','studio'    
+                end
+            end                   
+        end
+    end
+end
+
+!! ----------------------------------------------------------------------------------------------------
+!!
+!! ------------------------------- Track & Field Documentary ------------------------------------------
+!!
+!! ----------------------------------------------------------------------------------------------------
+
+if $ARGS[0] = 'track_&_field_documentary':
+    cla & *clr
+    '<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
+    '"A Track & Field documentary?" you ask."'
+    '"Aja. During the warmer seasons, local sports magazines, they like to do articles about the women on the running business. With the sun and heat, they can take them to the field and do some artistic photos. We are doing the graphic part in a reserved field. Most photos will be naked, and as they want you to do some runs, it will not be posible to hide all of your bodyparts. As you are gaining in popularity, they will whant a journalist to do an interview. The royalties and the advertising are great. Are you interested?."'
+    '"Hmmm..."'
+    act'Back to the list':gt'foto_events','list'
+    act'I''d like to do this one':
+        cla
+        *nl
+        specialjob8 = 0
+        '"I''d like to do this one."'
+        '"Great! The photographers are all ready doing their job in the field near the Havanna Fitness Center. You will meet a journalist there."'
+        act'Do the shoot':
+            cla & *clr
+            '<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/TD1.jpg"></center>'
+            minut += 120
+            modelpayfin = 1800 + (modelpay * 2) + (50*rand(0,7)) + ((city_running + pcs_apprnc)/2)*2
+            modelfoto_naked += 1
+            mdlng_exp += rand(1,2)
+            city_running += rand(2,12)
+            pav_running += rand(0,city_modelling)/12 
+            city_modelling += rand(2,12)
+            pav_modelling += rand(0,city_modelling)/6
+            money += modelpayfin
+            modelfotomoney += modelpayfin
+            modelfoto_topless += 1
+            gs 'exhibitionism', 1
+            gs 'stat'
+            'You aren''t the only one doing this documentay. Around you, walking between photographers, there are other runners trying to follow the instructions to be "dynamic". Beyond that, the models, try to be fairlly artistic, showing skin, but hiding the important bits, between props and poses, sadlly with all the movement, that is easier said than done, and the security have their hands full, shooing away all the voyeurs trying to catch a peek.'
+            *nl
+            'After doing several shots, finally a journalist has time to talk with you.'
+            act'Do the interview.':
+                cla & *clr   
+                gs 'stat' 
+                '<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/TD2.jpg"></center>'              
+                if city_running >=90 and razradbeg >= 3:
+                    '"You are <<$pcs_lastname>> Isn''t it?"'
+                    'The journalist shakes your hand with a big smile on his face. Interviewing you must be a great thing, as practically without stoping, you are showered with questions, from the sport-related to the personal, passing for the absolute trivial.'
+                    '"Your feeling about that victory? Your favorite color? A man in your life?"'
+                    'The interview goes on and on like this for a long time, until you''re allocated time ends, and then reluctantly the journalist leaves you to talk to another runner.'            
+                elseif city_running >=30 and razradKik >= 1:
+                    'Between shots, a journalist comes and asks you questions. Most of them, are fairly generic. Personal data, your opinions about the Championship, confirmation on their information. In general, it doesn''t seem to deep but it is evident that the journalist has his hands more than full, catching up with all the women in the field.'
+                else
+                    'You wait between shots, but the journalist seems to find somebody else more interesting and forgets to talk with you.'
+				end
+				
+                act' Finally the job is done':
+                    cla & *clr   
+                    gs 'stat'
+                    '<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/TD3.jpg"></center>'                      
+                    if city_running >=90 and razradbeg >= 3:					
+                        'Two hours later, the model session/interviews ends. After returning to the studio, you are handed <<modelpayfin>> <b>₽</b> in payment for the job.'
+                        'Sometime later, the article is sent to your phone...' 
+                        'And is a little awkward... The realization, that you are getting famous, as one of the best, if not THE best runner in The Women''s 400 Meter Dash category in all of St.petersburg. Practically, the article turns around you. With even fans asking all kinds of personal questions. Damn! You are Hot, Fast and Famous!'                            
+                    elseif city_running >=30 and razradKik >= 1:
+                        'Two hours later, the model session/interviews ends. After returning to the studio, you are handed <<modelpayfin>> <b>₽</b> in payment for the job.' 
+                        'Sometime later, the article is sent to your phone...' 
+                        'Being true, is a little dry, mentioning your name, general information and that you are an up-and-coming runner in The Women''s 400 Meter Dash category.'
+                    else
+                        '<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/TD2.jpg"></center>'
+                        'Two hours later, the model session/interview ends. After returning to the studio, you are handed <<modelpayfin>> <b>₽</b> in payment for the job.' 
+                        'Sometime later, the article is sent to your phone...' 
+                        'And is disappointing! Beyond your photo is only your name, and the mention, that you are a new runner in The Women''s 400 Meter Dash category.' 
+					end
+                    act'Go back to the main floor':gt'foto','studio'   
+                end
+            end                   
+        end
+    end
+end
+
+
 !!------------------------------------------------------------------- Special Events ------------------------------------------------------------------
 
 

locations/gschool_chats1.qsrc

@@ -360,57 +360,6 @@ if $ARGS[0] = 'katja':
 	elseif pav_slut >= 250:
 		'"Oh hey, Kat. I was wondering if you had any recommendations for lipstick that won''t smear? Things can get kind of messy when I''m... y''know." You press your tongue against the inside of your cheek to imitate sucking cock.'
 		'She looks at you confused for a long moment before she gasps softly. "That... that''s gross!" she huffs. "How can you even ask me that?!"'
-
-    elseif npc_rel['A14'] >= 30 and pav_slut < 25 and pcs_grades >= 70 and pcs_makupskl >= 40 and hotcat >= 6 and meynoldQW = 0:
-		'<center><table><td><img <<$set_imgh>> src="images/pc/npc_headshots/big14.jpg"></td><td><img <<$set_imgh>> src="images/pc/npc_headshots/big8.jpg"></td></table></center>' 
-		'You see Katja near the lockers, biting her lips and looking around nervously. Leaning against her is none other than Svyatoslav who, according to rumors, has a crush on the redhead (or was it on Christina?). He seems to be trying to convince Katja to go on a date.'
-        '"Come on Katja! It will be fun! I will pay for the popcorn!"'
-        'The shy girl isn''t convinced and plays compulsively with her notebook, obviously trying to look for a way out.'
-        '"Slavik... I don''t like that film. It''s just not my type and... well... I have homework to do."'
-        'Katja''s flimsy excuse and demeanor don''t convince the driven Svyatoslav, who just smiles, knowing that she will eventually agree with him. You ponder what exactly to do when Vicky steps between the two and... Huh?!'
-        '"Get lost you chiseled, sculpted hunk of a man! Don''t charm my sister into marrying you and I am forced to be an incredibly young, pretty and cool aunt!"'
-        'WTF?! That, with some variations, is the reaction all the people present are experiencing at those angrily shouted words, but is enough to break Svyatoslav''s hold and take away his confidence. The jock''s next words sound... somewhat shaken.'
-        '"Ok... Ehm... Look Katja, just think about it, ok? Just... give me a chance... Yeah... Ehm... Until later."'
-        'As Svyatoslav leaves, Katja releases a long-winded sigh.'
-         gs 'stat'
-		
-		act 'Talk with the twins':
-	        *clr & cla
-			'<center><table><td><img <<$set_imgh>> src="images/pc/npc_headshots/big14.jpg"></td><td><img <<$set_imgh>> src="images/pc/npc_headshots/big15.jpg"></td></table></center>' 
-			'"Thanks Vicky. I don''t know how to tell him that I''m not interested... Sigh... But I don''t think that will make him relent... Oh <<$pcs_nickname>>! You heard us?!"'
-            'You don''t answer, only looking around the crowded corridor and at a smiling Lizaveta, who is furiously recording into her phone. "Thankfully, Vicky came to her sister''s rescue."'
-            '"Come on Katja! It isn''t that bad. You didn''t do anything wrong! Relax! If you want to evade Slavik; beyond paying Vitek to break his legs; you only need to hang around other people, tell him that you have a full schedule!"'
-
-			if npc_rel['A14'] >= 30 and npc_rel['A14'] < 50:
-			    '"Thanks Vicky, but I don''t want to pester Vanya and you."'
-                'Vicky looks at her for a moment, then at you. Grabbing your hand, she pushes you towards her sister.'
-                '"Yeah... Right... We don''t want you around as we have "quote" innocent "unquote" fun, but... you... have... more... friends! Like <<$pcs_nickname>>! Just hang around with each other after school!"'
-                'Katja looks at you flabergasted. You don''t know if you feel offended or amused at her reaction. Well.... Yeah, you aren''t exactly friends... more like acquaintances really, but you don''t dislike getting to know her a litte better.'
-                '"Yeah Katja! If I have the time, we can hang around after school."'
-                '"Um... Thanks <<$pcs_nickname>>."'
-                'After this little scene, you chat with the twins until it is time to return to class.'
-			elseif npc_rel['A14'] >= 50 and npc_rel['A14'] < 80:
-		        'Katja rest deflated against the lockers, her troubled eyes looking at you sideways.'
-                '"Vicky... <<$pcs_nickname>>... Sorry, I just don''t want to trouble anybody."'
-                'Katja bites her lips and looks at Vicky, who tilts her red-maned head and a silent dialogue surges between the two... Then, the Xenomorphs turn towards you, showing their teeth.'
-                '"You know <<$pcs_nickname>>... I have my hands more or less full with Vanya. So... I was thinking... Can you protect my sister''s chastity?"'
-                'The twins proceed to give you puppy eyes... Of course by this point, any answer beyond "Of course Katja! Whatever you want Katja! Whenever you want Katja! We can hang around after school Katja!" is socially suicidal with all the class looking at their cute display... Damm... The shit these girls make you do...'
-                'After this little scene, you chat with the twins until it is time to return to class.'
-			else 
-			    'Katja rests against the lockers, pondering her sister''s words, then smiles and turns happily towards you and grabs your hands.'    
-                '"<<$pcs_nickname>> please! You must help me! Can we hang around after school?"'        
-                'She looks at you with puppy eyes, full of hope... looking breathtakingly cute... Yeah... Only Christina would say "no" to the redhead, so you answer with a happy "Yes! Of course Katja!" that prompts her to hug you.'
-                '"Hey that is unjust Katja! We are sisters! I also want a hug!"'
-                'Vicky joins the (now)group embrace and you can think about how all the guys in the hall (and some girls) are going to masturbate furiously tonight thanks to this embarrassing event.'
-                'After this little scene, you chat with the twins until it is time to return to class.'												
-			end
-			meynoldQW = 1
-			npc_rel['A14'] += 1
-			npc_rel['A15'] += 1
-            gs 'stat'
-			
-			act 'Time for the next class': gt 'gschool_lessons', 'short_break'								
-		end
 	else 
 		npc_rel['A14'] += 1
 		'With Katja being a quiet girl, she doesn''t do much talking, but she seems to enjoy some lighthearted banter with you, so long as you''re doing most of the talking. You get the feeling that if you were closer, she''d open up more, but for now you''ll have to settle with this.'
@@ -497,6 +446,65 @@ if $ARGS[0] = 'katja':
 	end	
 end
 
+
+if $ARGS[0] = 'Katjaproblems':
+	cls
+	menu_off = 1
+	gs 'stat'
+	'<center><table><tr><td><img <<$set_imgh>> src="images/pc/npc_headshots/big14.jpg"></td><td><img <<$set_imgh>> src="images/pc/npc_headshots/big8.jpg"></tr></td></table></center>'
+	'You see Katja near the lockers, biting her lips and looking around nervously. Leaning against her is none other than Svyatoslav who, according to rumors, has a crush on the redhead (or was it on Christina?). He seems to be trying to convince Katja to go on a date.'
+    '"Come on Katja! It will be fun! I will pay for the popcorn!"'
+    'The shy girl isn''t convinced and plays compulsively with her notebook, obviously trying to look for a way out.'
+    '"Slavik... I don''t like that film. It''s just not my type and... well... I have homework to do."'
+    'Katja''s flimsy excuse and demeanor don''t convince the driven Svyatoslav, who just smiles, knowing that she will eventually agree with him. You ponder what exactly to do when Vicky steps between the two and... Huh?!'
+    '"Get lost you chiseled, sculpted hunk of a man! Don''t charm my sister into marrying you and I am forced to be an incredibly young, pretty and cool aunt!"'
+    'WTF?! That, with some variations, is the reaction all the people present are experiencing at those angrily shouted words, but is enough to break Svyatoslav''s hold and take away his confidence. The jock''s next words sound... somewhat shaken.'
+    '"Ok... Ehm... Look Katja, just think about it, ok? Just... give me a chance... Yeah... Ehm... Until later."'
+    'As Svyatoslav leaves, Katja releases a long-winded sigh.'
+    gs 'stat'
+		
+	act 'Talk with the twins':
+	    *clr & cla
+		'<center><table><td><img <<$set_imgh>> src="images/pc/npc_headshots/big14.jpg"></td><td><img <<$set_imgh>> src="images/pc/npc_headshots/big15.jpg"></td></table></center>' 
+		'"Thanks Vicky. I don''t know how to tell him that I''m not interested... Sigh... But I don''t think that will make him relent... Oh <<$pcs_nickname>>! You heard us?!"'
+        'You don''t answer, only looking around the crowded corridor and at a smiling Lizaveta, who is furiously recording into her phone. "Thankfully, Vicky came to her sister''s rescue."'
+        '"Come on Katja! It isn''t that bad. You didn''t do anything wrong! Relax! If you want to evade Slavik; beyond paying Vitek to break his legs; you only need to hang around other people, tell him that you have a full schedule!"'
+
+		if npc_rel['A14'] >= 30 and npc_rel['A14'] < 50:
+		    '"Thanks Vicky, but I don''t want to pester Vanya and you."'
+            'Vicky looks at her for a moment, then at you. Grabbing your hand, she pushes you towards her sister.'
+            '"Yeah... Right... We don''t want you around as we have "quote" innocent "unquote" fun, but... you... have... more... friends! Like <<$pcs_nickname>>! Just hang around with each other after school!"'
+            'Katja looks at you flabergasted. You don''t know if you feel offended or amused at her reaction. Well.... Yeah, you aren''t exactly friends... more like acquaintances really, but you don''t dislike getting to know her a litte better.'
+            '"Yeah Katja! If I have the time, we can hang around after school."'
+            '"Um... Thanks <<$pcs_nickname>>."'
+            'After this little scene, you chat with the twins until it is time to return to class.'
+		elseif npc_rel['A14'] >= 50 and npc_rel['A14'] < 80:
+		    'Katja rest deflated against the lockers, her troubled eyes looking at you sideways.'
+            '"Vicky... <<$pcs_nickname>>... Sorry, I just don''t want to trouble anybody."'
+            'Katja bites her lips and looks at Vicky, who tilts her red-maned head and a silent dialogue surges between the two... Then, the Xenomorphs turn towards you, showing their teeth.'
+            '"You know <<$pcs_nickname>>... I have my hands more or less full with Vanya. So... I was thinking... Can you protect my sister''s chastity?"'
+            'The twins proceed to give you puppy eyes... Of course by this point, any answer beyond "Of course Katja! Whatever you want Katja! Whenever you want Katja! We can hang around after school Katja!" is socially suicidal with all the class looking at their cute display... Damm... The shit these girls make you do...'
+            'After this little scene, you chat with the twins until it is time to return to class.'
+		else 
+		    'Katja rests against the lockers, pondering her sister''s words, then smiles and turns happily towards you and grabs your hands.'    
+            '"<<$pcs_nickname>> please! You must help me! Can we hang around after school?"'        
+            'She looks at you with puppy eyes, full of hope... looking breathtakingly cute... Yeah... Only Christina would say "no" to the redhead, so you answer with a happy "Yes! Of course Katja!" that prompts her to hug you.'
+            '"Hey that is unjust Katja! We are sisters! I also want a hug!"'
+            'Vicky joins the (now)group embrace and you can think about how all the guys in the hall (and some girls) are going to masturbate furiously tonight thanks to this embarrassing event.'
+            'After this little scene, you chat with the twins until it is time to return to class.'												
+		end
+		meynoldQW = 1
+		npc_rel['A14'] += 1
+		npc_rel['A15'] += 1
+        gs 'stat'
+			
+		act 'Time for the next class': gt 'gschool_lessons', 'short_break'								
+	end
+end
+
+
+
+
 if $ARGS[0] = 'albina':
 	*clr & cla
 	menu_off = 1

locations/gschool_lunch.qsrc

@@ -135,6 +135,8 @@ if $ARGS[0] = 'break':
 		gt 'nerd_game_night', 'invite', 'lunch'
 	end
 
+	if meynoldQW = 0 and npc_rel['A14'] >= 30 and pav_slut < 25 and pcs_grades >= 70 and pcs_makupskl >= 40 and hotcat >= 6: gt 'gschool_chats1', 'Katjaproblems'
+
 	if $breaktype ! 'long':
 		if dimaRevenge = 4 and dimaRevChoice = 2 and hour < 10: '<br>"Hi Nat did you happen to see Dimka?" "Hi <<$pcs_nickname>>, he was here before speaking with Lena and Lera.'
 

locations/journal.qsrc

@@ -48,8 +48,26 @@ if $ARGS[0] = 'records':
 	if film > 0:$tab_text += dyneval($NoteBookLine,'You are working in the city industrial region as a pornographic actress under the name <<$pfname>>')
 	if bumtolik = 4:$tab_text += dyneval($NoteBookLine,'You have been asked to help the homeless at the Mercy Clinic in the city industrial region.')
 	if bumtolik >= 5:$tab_text += dyneval($NoteBookLine,'You volunteer at the Mercy Clinic in the city industrial region and work with the homeless. Working hours are from 09:00 to 17:00 on Saturday and Sunday.')
-	if model > 0: $tab_text += dyneval($NoteBookLine,'You are a model working at ''Aphrodite Photography'' in St. Petersburg.')
+	
+	if model > 0:	
+		if modelfoto_erotic > 0:
+			$tab_text += dyneval($NoteBookLine,'You are an erotic model working at ''Aphrodite Photography'' in St. Petersburg.')
+		elseif modelfoto_nude > modelfoto_fashion and modelfoto_nude > modelfoto_fitness and modelfoto_nude > modelfoto_glamour and modelfoto_nude > modelfoto_lingerie and modelfoto_nude > modelfoto_catalog:
+			$tab_text += dyneval($NoteBookLine,'You are an artistic nude model working at ''Aphrodite Photography'' in St. Petersburg.')
+		elseif modelfoto_fitness > modelfoto_fashion and modelfoto_fitness > modelfoto_nude and modelfoto_fitness > modelfoto_glamour and modelfoto_fitness > modelfoto_lingerie and modelfoto_fitness > modelfoto_catalog:
+			$tab_text += dyneval($NoteBookLine,'You are a fitness model working at ''Aphrodite Photography'' in St. Petersburg.')
+		elseif modelfoto_glamour > modelfoto_fashion and modelfoto_glamour > modelfoto_nude and modelfoto_glamour > modelfoto_fitness and modelfoto_glamour > modelfoto_lingerie and modelfoto_glamour > modelfoto_catalog:
+			$tab_text += dyneval($NoteBookLine,'You are a glamour model working at ''Aphrodite Photography'' in St. Petersburg.')
+		elseif modelfoto_lingerie > modelfoto_fashion and modelfoto_lingerie > modelfoto_nude and modelfoto_lingerie > modelfoto_fitness and modelfoto_lingerie > modelfoto_glamour and modelfoto_lingerie > modelfoto_catalog:
+			$tab_text += dyneval($NoteBookLine,'You are a lingerie model working at ''Aphrodite Photography'' in St. Petersburg.')
+		elseif modelfoto_fashion > modelfoto_lingerie and modelfoto_fashion > modelfoto_nude and modelfoto_fashion > modelfoto_fitness and modelfoto_fashion > modelfoto_glamour and modelfoto_fashion > modelfoto_catalog:
+			$tab_text += dyneval($NoteBookLine,'You are a fashion model working at ''Aphrodite Photography'' in St. Petersburg.')
+		elseif modelfoto_catalog > 0:
+			$tab_text += dyneval($NoteBookLine,'You are a catalog model working at ''Aphrodite Photography'' in St. Petersburg.')
+		end
+	end
 	*nl
+	
 	if model > 0 and model_week = (daystart - week) / 7 and model_job_week >= 2:
 		$tab_text += dyneval($NoteBookLine,'You have no more modeling jobs available this week.')
 	elseif model > 0 and model_week < (daystart - week) / 7 and model_job_week = 1:

locations/korrPar.qsrc

@@ -141,11 +141,18 @@ else
 end
 act 'Go to the living room':gt 'sitrPar'
 if momloc = 5:
-	if vanrPar_suction_dildo > 0:gt'mother','bathroom_dildo_shriek1'
+	if vanrPar_suction_dildo > 0:
+		motherQW['dildo_shower_discovery'] = 1
+		gt'mother','bathroom_dildo_shriek1'
+	end
 	act 'Go to the bathroom':msg'You try to open the bathroom door but it immediately stops, banging against the latch. You hear the water running and your mother shouting at the door. "Doesn''t anybody in this family know how to knock?!"'
 else
 	act 'Go to the bathroom':minut += 1 & gt 'vanrPar'
 end
+
+if motherQW['bathroom_dildos'] > 0 and momloc['athome'] = 1: gt'mother_sextalk','bathroom_dildos1'
+
+
 act 'Go to the kitchen':gt 'kuhrPar'
 
 !to add a counter if you avoid Dimka

locations/mother_sextalk.qsrc

@@ -4,10 +4,12 @@ if $ARGS[0] = 'bathroom_dildo_shriek1':
 	if motherKnowSpravka > 0 or motherKnowWhore > 0:gt'mother_sextalk','bathroom_dildo_shriek4'
 	motherQW['bathroom_dildos'] = vanrPar_suction_dildo
 	if motherQW['dildo_caught'] = 0:
-		motherQW['dildo_caught'] = 1
+		motherQW['dildo_caught'] += 1
 	elseif motherQW['dildo_caught'] = 1:
+		motherQW['dildo_caught'] += 1
 		gt'mother_sextalk','bathroom_dildo_shriek2'
-	elseif motherQS['dildo_caught'] = 2:
+	elseif motherQS['dildo_caught'] >= 2:
+		motherQW['dildo_caught'] += 1
 		gt'mother_sextalk','bathroom_dildo_shriek3'
 	end
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/korrpar.jpg"></center>'
@@ -86,7 +88,7 @@ end
 
 if $ARGS[0] = 'bathroom_dildo_shriek2':
 	if motherQW['dildo_caught'] = 1:
-		motherQW['dildo_caught'] = 2
+		motherQW['dildo_caught'] += 1
 	elseif motherQW['dildo_caught'] = 2:
 		gt'mother_sextalk','bathroom_dildo_shriek3'
 	end
@@ -158,6 +160,7 @@ if $ARGS[0] = 'bathroom_dildo_shriek3':
 	vanrPar_bathtub_dildo = 0
 	vanrPar_shower_dildo = 0
 	suction_dildo += motherQW['bathroom_dildos']
+	motherQW['dildo_caught'] += 1
 	motherQW['bathroom_dildos'] = 0
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/korrpar.jpg"></center>'
 	'You''re walking down the hall when you suddenly hear a shriek come from the bathroom. Oh shit, not again. Right as you get to the door, it opens up to reveal your very mother. She looks more exhasperated than angry this time though.'
@@ -171,6 +174,7 @@ if $ARGS[0] = 'bathroom_dildo_shriek4':
 	vanrPar_bathtub_dildo = 0
 	vanrPar_shower_dildo = 0
 	suction_dildo += motherQW['bathroom_dildos']
+	motherQW['dildo_caught'] += 1
 	motherQW['bathroom_dildos'] = 0
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/korrpar.jpg"></center>'
 	'You''re walking down the hall when you suddenly hear a shriek come from the bathroom. Oh shit, not again. Right as you get to the door, it flies open to show your very angry mother.'
@@ -186,10 +190,11 @@ end
 if $ARGS[0] = 'bathroom_dildos1':
 	if motherQW['dildo_caught'] = 0:
 		if motherKnowSpravka > 0 or motherKnowWhore > 0:gt'mother_sextalk','bathroom_dildos4'
-		motherQW['dildo_caught'] = 1
+		motherQW['dildo_caught'] += 1
 	elseif motherQW['dildo_caught'] = 1:
+		motherQW['dildo_caught'] += 1
 		gt'mother_sextalk','bathroom_dildos2'
-	elseif motherQW['dildo_caught'] = 2:
+	elseif motherQW['dildo_caught'] >= 2:
 		if motherKnowSpravka > 0 or motherKnowWhore > 0:gt'mother_sextalk','bathroom_dildos5'
 		gt'mother_sextalk','bathroom_dildos3'
 	end
@@ -320,6 +325,7 @@ if $ARGS[0] = 'bathroom_dildos3':
 	gs 'npc_relationship', 'modify', 'A29', -10
 	vanrPar_bathtub_dildo = 0
 	vanrPar_shower_dildo = 0
+	motherQW['dildo_caught'] += 1
 	suction_dildo += motherQW['bathroom_dildos']
 	motherQW['bathroom_dildos'] = 0
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/korrpar.jpg"></center>'
@@ -370,6 +376,8 @@ if $ARGS[0] = 'bathroom_dildos5':
 end
 
 if $ARGS[0] = 'dildo_wakeup1':
+	motherQW['dildo_caught'] += 1
+!!	if motherKnowSpravka > 0 or motherKnowWhore > 0:gt'mother_sextalk','dildo_wakeup4'
 	if motherQW['dildo_wakeup'] = 0:
 		motherQW['dildo_wakeup'] = 1
 	elseif motherQW['dildo_wakeup'] = 1 and motherKnowDildo = 1:
@@ -439,6 +447,7 @@ if $ARGS[0] = 'dildo_wakeup1':
 end
 
 if $ARGS[0] = 'dildo_wakeup2':
+	motherQW['dildo_caught'] += 1
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/mother.jpg"></center>'
 	if motherQW['bathroom_dildos'] = 1:
 		'You wake up in a shock when your door bangs open and you see your mother standing in the doorway holding a dildo.'
@@ -503,6 +512,7 @@ if $ARGS[0] = 'dildo_wakeup2':
 end
 
 if $ARGS[0] = 'dildo_wakeup3':
+	motherQW['dildo_caught'] += 1
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/mother.jpg"></center>'
 	if motherQW['bathroom_dildos'] = 1:
 		'You wake up in shock to something made of rubber slapping you in the face. Startled, you sit up in bed and look around, seeing a dildo laying on your covers.'

locations/noticeboard.qsrc

@@ -30,14 +30,30 @@ if $ARGS[0] = 'look':
 	$noticeboardmap += '<area shape="rect" coords="<<$advert5>>" href="exec:gt ''noticeboard'', ''advert5''" alt="--5--">'
 	$noticeboardmap += '<area shape="rect" coords="<<$advert6>>" href="exec:gt ''noticeboard'', ''advert6''" alt="--6--">'
 	$noticeboardmap += '</map>'
-	$noticeboardmap += '<center><img <<$set_imgh>> src="images/locations/shared/notboard/noticeboard_<<$loc>>.jpg" USEMAP="#noticemap"></center>'
+
+	if $loc = 'pav_commercial':
+		$name_of_the_picure = 'noticeboard_pavcommercial'
+	elseif $loc = 'city_residential':
+		$name_of_the_picure = 'noticeboard_street'
+	elseif $loc = 'torgcentr':
+		$name_of_the_picure = 'noticeboard_torgcentr'
+	elseif $loc = 'city_industrial':
+		$name_of_the_picure = 'noticeboard_nord'
+	else
+		$name_of_the_picure = 'noticeboard'
+	end
+
+	$noticeboardmap += '<center><img <<$set_imgh>> src="images/locations/shared/notboard/<<$name_of_the_picure>>.jpg" USEMAP="#noticemap"></center>'
 
 	*pl $noticeboardmap
 	killvar '$noticeboardmap'
 	if NumberOfNewAdverts = 0: *nl 'There are no interesting adverts at the board.'
 	if NumberOfNewAdverts = 1: *nl 'There is one interesting advert at the board.'
 	if NumberOfNewAdverts > 1: *nl 'There are <<NumberOfNewAdverts>> interesting adverts at the board.'
-	act 'Leave the board': gt 'restoreposition'
+	act 'Leave the board': 
+		killvar '$noticeboardmap'
+		gt 'restoreposition'
+	end
 end
 
 

locations/pav_train_market.qsrc

@@ -477,7 +477,7 @@ if ARGS[0] = 4:
 				pcs_horny += 10
 				TimesBuyPorno += 1
 				'<center><img <<$set_imgh>> src="images/pc/items/15cm.jpg"></center>'
-				if pcs_horny >= 50 and pav_slut < 150:
+				if pcs_inhib < 35:
 					'You buy a dildo and hastily hide it, while your face blushes with embarrassment.'
 				else
 					'You buy a dildo and calmly hide it.'
@@ -486,6 +486,41 @@ if ARGS[0] = 4:
 				act 'Buy something else':gt 'pav_train_market', 4
 			end
 		end
+		if money >= 1000 and suction_dildo = 0:
+			act 'Buy a 15cm suction dildo (1000 <b>₽</b>)':
+				cla
+				minut += 5
+				suction_dildo += 1
+				money -= 1000
+				pcs_horny += 10
+				TimesBuyPorno += 1
+				'<center><img <<$set_imgh>> src="images/pc/items/15cm.jpg"></center>'
+				if  pcs_inhib < 35:
+					'You buy the dildo and hastily hide it, while your face blushes with embarrassment.'
+				else
+					'You buy the dildo and calmly hide it.'
+				end
+				act 'Leave':gt 'pav_train_market', 'start'
+				act 'Buy something else':gt 'pav_train_market', 4
+			end
+		elseif money >= 1000 and suction_dildo > 0:
+			act 'Buy another 15cm suction dildo (1000 <b>₽</b>)':
+				cla
+				minut += 5
+				suction_dildo += 1
+				money -= 1000
+				pcs_horny += 10
+				TimesBuyPorno += 1
+				'<center><img <<$set_imgh>> src="images/pc/items/15cm.jpg"></center>'
+				if  pcs_inhib < 35:
+					'You buy the dildo and hastily hide it, while your face blushes with embarrassment.'
+				else
+					'You buy the dildo and calmly hide it.'
+				end
+				act 'Leave':gt 'pav_train_market', 'start'
+				act 'Buy something else':gt 'pav_train_market', 4
+			end
+		end
 		if money >= 700 and vibrator = 0:
 			act 'Buy vibrator (700 <b>₽</b>)':
 				cla

locations/preSYS2.qsrc

@@ -13,7 +13,7 @@ if $ARGS[0] = 'start':
 	act 'Set money (<<money>>₽)': money = input 'Set Cash Amount' & gt'preSYS2','start'
 	if custom_csb ! 1: act 'Return to preset character menu': gt 'preSYS', 'charselect'
 	act 'Confirm these options':
-		dynamic 'grupvalue[<<grupTipe>>] = 50'
+		dynamic 'grupvalue[<<grupTipe>>] = 600'
 		if $soc_grup = 'nerd':
 			traits['nerd_points'] = 60
 			traits['nerd_status'] = 2

locations/salon.qsrc

@@ -3,9 +3,6 @@ $location_type = 'public_indoors'
 
 if $ARGS[0] = 'start':
 	$sexloc = $CURLOC
-	if week = 1 and hour >= 9 and hour <= 10 and masseuse['jobtype'] = 1:gt 'salon', 'beginwork'
-	if week = 3 and hour >= 9 and hour <= 10 and masseuse['jobtype'] = 1:gt 'salon', 'beginwork'
-	if week = 5 and hour >= 9 and hour <= 10 and masseuse['jobtype'] = 1:gt 'salon', 'beginwork'
 	cla & *clr
 	$menu_loc = 'salon'
 	$menu_arg = 'start'
@@ -1472,7 +1469,7 @@ if $ARGS[0] = 'throat_massage':
 	'"Ma''am. Where would you like your cum?"'
 	act'"Mmm mm mmrph" (in my mouth)':
 		cla & *clr
-		gs'cum_call','mouth_swallow','masseur',1
+		gs'cum_call','mouth_swallow','masseur'
 		'<center><video autoplay loop src="images/locations/city/citycenter/mall/salon/work/sex/bj1.mp4"></video></center>'
 		'"Mmm mm mmrph," you choke around the masseur''s cock. Surprisingly, he understands you perfectly and you immediately feel a hot liquid splash into your mouth, which you swallow. Once you''ve finished gulping down everything, the masseur cleans his cock on a towel, thanks you for your patronage, and leaves while you get dressed.'
 		act 'Leave':
@@ -1485,8 +1482,8 @@ if $ARGS[0] = 'throat_massage':
 	
 	act'"Mmrph mrr mrrrph" (on my face)':
 		cla & *clr
-		gs'cum_call','face','masseur',1
-		gs'cum_call','hair','masseur',1
+		gs'cum_call','face','masseur'
+		gs'cum_call','hair','masseur'
 		'<center><video autoplay loop src="images/locations/city/citycenter/mall/salon/work/sex/facial2.mp4"></video></center>'
 		'"Mmrph mrr mrrrph," you choke around the masseur''s cock. Surprisingly, he understands you perfectly and without hesitation pulls out of your mouth and climbs onto the edge of the table before spraying semen all over youe. The hot sticky liquid coats your face and hair and the masseur continues to smear it everywhere with his cock for as much coverage as possible. It''s strangely comforting after being throatfucked for half an hour Once your face is fully covered, he steps down off the table, cleans his cock with a towel, and thanks you for your patronage before leaving you to get dressed.'
 		act'Wipe the cum off your face':
@@ -1536,7 +1533,7 @@ if $ARGS[0] = 'hardcore_massage':
 	'"Would you like a creampie or a facial ma''am?"'
 	act'Moan incoherrently':
 		cla & *clr
-		gs'cum_call','','masseur',1
+		gs'cum_call','','masseur'
 		orgasm += 1
 		'<center><video autoplay loop src="images/locations/city/citycenter/mall/salon/work/sex/creampie<<rand(2,4)>>.mp4"></video></center>'
 		'You don''t really understand what he''s saying but make some kind of sound with your voice as a response. It didn''t really sound like words, but you thought you should make some kind of response.'
@@ -1553,7 +1550,7 @@ if $ARGS[0] = 'hardcore_massage':
 	
 	act'Inside! Inside!':
 		cla & *clr
-		gs'cum_call','','masseur',1
+		gs'cum_call','','masseur'
 		orgasm += 1
 		'<center><video autoplay loop src="images/locations/city/citycenter/mall/salon/work/sex/creampie<<rand(2,4)>>.mp4"></video></center>'
 		'"Inside! Inside! Inside! <i><b>Inside!</b></i>" you scream.'
@@ -1572,9 +1569,9 @@ if $ARGS[0] = 'hardcore_massage':
 	
 	act'Face! Face! Face!':
 		cla & *clr
-		gs'cum_call','face','masseur',1
-		gs'cum_call','hair','masseur',1
-		gs'cum_call','mouth','masseur',1
+		gs'cum_call','face','masseur'
+		gs'cum_call','hair','masseur'
+		gs'cum_call','mouth','masseur'
 		orgasm += 1
 		'<center><video autoplay loop src="images/locations/city/citycenter/mall/salon/work/sex/facial<<rand(1,2)>>.mp4"></video></center>'
 		'"Face! Face! Face!" you cry out.'
@@ -1616,8 +1613,8 @@ if $ARGS[0] = 'double_hardcore_massage':
 	'But all good things must come to an end. Eventually one of them says, "Time is almost up ma''am. Would you like us to cum inside you or give you a double facial?"'
 	
 	act'"Mm-mm mmm" (inside please)':
-		gs'cum_call','','masseur',1
-		gs'cum_call','mouth','masseur',1
+		gs'cum_call','','masseur'
+		gs'cum_call','mouth','masseur'
 		orgasm += 1
 		gs'stat'
 		cla & *clr
@@ -1634,10 +1631,10 @@ if $ARGS[0] = 'double_hardcore_massage':
 	end
 	
 	act'"Mmm mmm mm mmmmph" (give me the facial)':
-		gs'cum_call','face','masseur',1
-		gs'cum_call','face','masseur',1
-		gs'cum_call','hair','masseur',1
-		gs'cum_call','hair','masseur',1
+		gs'cum_call','face','masseur'
+		gs'cum_call','face','masseur'
+		gs'cum_call','hair','masseur'
+		gs'cum_call','hair','masseur'
 		orgasm += 1
 		gs'stat'
 		cla & *clr
@@ -1677,7 +1674,7 @@ if $ARGS[0] = 'gentle_massage':
 	*nl
 	'Still thrusting slowly and gently, the masseur whispers to you, "Where would you like your cum ma''am? Inside or on your face?"'
 	act'Inside':
-		gs'cum_call','','masseur',1
+		gs'cum_call','','masseur'
 		orgasm += 1
 		cla & *clr
 		'<center><video autoplay loop src="images/shared/sex/cum/vagcreampie/creampie5.mp4"></video></center>'
@@ -1698,9 +1695,9 @@ if $ARGS[0] = 'gentle_massage':
 !!	act'Outside':
 	
 	act'My face':
-		gs'cum_call','mouth','masseur',1
-		gs'cum_call','face','masseur',1
-		gs'cum_call','hair','masseur',1
+		gs'cum_call','mouth','masseur'
+		gs'cum_call','face','masseur'
+		gs'cum_call','hair','masseur'
 		orgasm += 1
 		cla & *clr
 		'<center><video autoplay loop src="images/locations/city/citycenter/mall/salon/work/sex/facial2.mp4"></video></center>'

locations/scandalicious.qsrc

@@ -26,6 +26,7 @@ if $ARGS[0] = 'start':
 		minut += 5
 		gt 'scandalicious', 'swim'
 	end
+end
 
 if $ARGS[0] = 'swim':
 	$loc_arg = 'swim'
@@ -63,11 +64,11 @@ if $ARGS[0] = 'swim':
 
 				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
 
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''scandalicious'', ''swim1''"><img src="images/pc/clothing/12beachbabe/<<i>>.jpg" 	height="250" /></a>'
+					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''scandalicious'', ''swim1''"><img src="images/pc/clothing/15beachbabe/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 4
-		if i <= 199:jump 'loopbeach'
+		if i <= 103:jump 'loopbeach'
 	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality'
 end
 

locations/sexshop.qsrc

@@ -303,14 +303,13 @@ if $ARGS[0] = 'start':
 		end
 	end
 	
-	if suction_dildo = 0 and (money < 1000 and karta + bankDebtLimit < 1000):
-		act 'Buy a 15cm suction dildo (1000 <b>₽</b>)':
+	if suction_dildo = 0 and money >= 1000:
+		act 'Buy a 15cm suction dildo 1000 <b>₽</b> (cash':
 			cla
 			minut += 5
-			suction_dildo = 1
+			suction_dildo += 1
 			money -= 1000
 			pcs_horny += 10
-			TimesBuyPorno += 1
 			'<center><img <<$set_imgh>> src="images/pc/items/15cm.jpg"></center>'
 			if  pcs_inhib < 35:
 				'You buy the dildo and hastily hide it, while your face blushes with embarrassment.'
@@ -320,14 +319,13 @@ if $ARGS[0] = 'start':
 			act 'Leave':gt 'pav_train_market', 'start'
 			act 'Buy something else':gt 'pav_train_market', 4
 		end
-	elseif suction_dildo > 0 and (money < 1000 and karta + bankDebtLimit < 1000):
-		act 'Buy another 15cm suction dildo (1000 <b>₽</b>)':
+	elseif suction_dildo > 0 and money >= 1000:
+		act 'Buy another 15cm suction dildo 1000 <b>₽</b> (cash':
 			cla
 			minut += 5
-			suction_dildo = 1
+			suction_dildo += 1
 			money -= 1000
 			pcs_horny += 10
-			TimesBuyPorno += 1
 			'<center><img <<$set_imgh>> src="images/pc/items/15cm.jpg"></center>'
 			if  pcs_inhib < 35:
 				'You buy the dildo and hastily hide it, while your face blushes with embarrassment.'
@@ -339,6 +337,40 @@ if $ARGS[0] = 'start':
 		end
 	end
 
+	if suction_dildo > 0 and (karta + bankDebtLimit >= 950):
+		act 'Buy another 15cm suction dildo 1000 <b>₽</b> (card0':
+			cla
+			minut += 5
+			suction_dildo += 1
+			karta -= 1000
+			pcs_horny += 10
+			'<center><img <<$set_imgh>> src="images/pc/items/15cm.jpg"></center>'
+			if  pcs_inhib < 35:
+				'You buy the dildo and hastily hide it, while your face blushes with embarrassment.'
+			else
+				'You buy the dildo and calmly hide it.'
+			end
+			act 'Leave':gt 'pav_train_market', 'start'
+			act 'Buy something else':gt 'pav_train_market', 4
+		end
+	elseif (karta + bankDebtLimit >= 950):
+		act 'Buy 15cm suction dildo 1000 <b>₽</b> (card0':
+			cla
+			minut += 5
+			suction_dildo += 1
+			karta -= 1000
+			pcs_horny += 10
+			'<center><img <<$set_imgh>> src="images/pc/items/15cm.jpg"></center>'
+			if  pcs_inhib < 35:
+				'You buy the dildo and hastily hide it, while your face blushes with embarrassment.'
+			else
+				'You buy the dildo and calmly hide it.'
+			end
+			act 'Leave':gt 'pav_train_market', 'start'
+			act 'Buy something else':gt 'pav_train_market', 4
+		end	
+	end
+
 	if bigdildo = 0 and (money < 950 and karta + bankDebtLimit < 950):
 		'You cannot afford the 25cm dildo.'
 	else

locations/sportShop.qsrc

@@ -211,7 +211,7 @@ if $ARGS[0] = 'swim':
 				end
 			end
 			i += 4
-		if i <= 199:jump 'loopswim'
+		if i <= 213:jump 'loopswim'
 	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality'
 end
 

locations/stat.qsrc

@@ -1127,6 +1127,8 @@ if pcs_sleep > 100: pcs_sleep = 100
 
 if insleep = 0: gs 'stat_display'
 
+gs 'family_schedule'
+
 
 --- stat ---------------------------------
 

locations/stat_display.qsrc

@@ -1925,6 +1925,24 @@ if enable_extra_msg = 1:
 			$stat_msg += '<br>You can contract up to <<10-pornstack>> porn shoots at the Porn Studio.'
 		end
 	end
+	
+	if masseuse['jobtype'] > 0:
+		if masseuse['<<week>>_shift_check'] = 1 and masseuse['<<week>>_shift_1'] = 1 and hour < 9:
+			'<BR><b><font color="blue">You have a shift at the salon today at 9:00.</font></b>'
+		elseif masseuse['<<week>>_shift_check'] = 1 and masseuse['<<week>>_shift_1'] = 1 and hour < 9:
+			'<BR><b><font color="red">You''re late for your 9:00 shift at the salon!</font></b>'
+		elseif masseuse['<<week>>_shift_check'] = 1 and masseuse['<<week>>_shift_2'] = 1 and hour < 13:
+			'<BR><b><font color="blue">You have a shift at the salon today at 13:00.</font></b>'
+		elseif masseuse['<<week>>_shift_check'] = 1 and masseuse['<<week>>_shift_2'] = 1 and hour < 13:
+			'<BR><b><font color="red">You''re late for your 13:00 shift at the salon!</font></b>'
+		elseif masseuse['<<week>>_shift_check'] = 1 and masseuse['<<week>>_shift_3'] and hour < 17:
+			'<BR><b><font color="blue">You have a shift at the salon today at 17:00.</font></b>'
+		elseif masseuse['<<week>>_shift_check'] = 1 and masseuse['<<week>>_shift_3'] = 1 and hour < 17:
+			'<BR><b><font color="red">You''re late for your 17:00 shift at the salon!</font></b>'
+		end
+	end
+	
+	
 	if hour < 22 and week >= 2 and week <= 4 and workKafe = 1:$stat_msg += '<BR><b><font color="red">Today you have a shift at The Roadhouse cafe starting at 11:00.</font></b>'
 	if hour < 17 and week < 5 and workSec >= 1 or hour < 17 and week < 5 and workSec = 1:$stat_msg += '<BR><b><font color="red">Today you have a shift as a secretary at Titran-Express from 9:00 to 17:00</font></b>'
 	if hour < 17 and week < 5 and BurgerQW['Secretary'] = 1:$stat_msg += '<BR><b><font color="red">Today you have a shift as a secretary at Diner Bystroeshka from 9:00 to 17:00</font></b>'