Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife

locations/_attributes_school.qsrc

@@ -81,6 +81,7 @@ elseif ARGS[1] = 10:
 	CloBimbo = 1
 	CloExhibit = 35
 	CloStyle = 4
+	CloStyle2 = 4
 elseif ARGS[1] = 11:
 	CloQuality = 3
 	CloThinness = 4
@@ -114,6 +115,7 @@ elseif ARGS[1] = 15:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 3
+	CloStyle2 = 4
 	CloSkirtShortness = 5
 	CloExhibit = 30
 elseif ARGS[1] = 16:
@@ -363,6 +365,7 @@ elseif ARGS[1] = 50:
 	CloQuality = 4
 	CloThinness = 2
 	CloTopCut = 1
+	CloStyle2 = 4
 	CloExhibit = 20
 	CloSkirtShortness = 4
 elseif ARGS[1] = 51:

locations/dateF.qsrc

@@ -419,7 +419,7 @@ if $ARGS[0] = 'bartalk':
 	gs 'stat'
 	'<center><img src="images/locations/shared/date/barinside.jpg"></center>'
 	'<<$boydesc>> goes to the bar counter and after a while returns with the drinks.'
-	'"This place is packed." you say to <<$boydesc.>>'
+	'"This place is packed." you say to <<$boydesc>>'
 	'"Yeah, it''s pretty cool, I think it''s the night when there is a band playing live here, so I guess that''s why it''s so packed."'
 	act 'Continue on':
 		*clr & cla

locations/fight.qsrc

@@ -554,7 +554,7 @@ if $ARGS[0] = 'fightAlgorithm':
 			else
 				gs 'fight', 'Attack', 'Jab', $TargetType, AttackerNumber, TargetNumber
 			end
-		end!
+		end
 	!!This should never happen
 	else
 		gt 'fight', 'main'

locations/foto.qsrc

@@ -520,7 +520,7 @@ if $ARGS[0] = 'interview2':
 				else
 					'You take off your clothes and leave them on the floor while the photographer examines you.'
 				end
-				'He circles you slowly, occasionally asking you to adjust your pose slightly, carefully inspecting every aspect of your nude body. Your <<$pcs_eyecol>> eyes framed by your <<$pcs_haircol>> hair, your <<$liptalk3>>, your <<$titsize>> breasts, your <<$skin1>> <<$pcs_tan>> skin, your thighs, even your <<$$pcdesc_pubes>> pussy...'
+				'He circles you slowly, occasionally asking you to adjust your pose slightly, carefully inspecting every aspect of your nude body. Your <<$pcs_eyecol>> eyes framed by your <<$pcs_haircol>> hair, your <<$liptalk3>>, your <<$titsize>> breasts, your <<$skin1>> <<$pcs_tan>> skin, your thighs, even your <<$pcdesc_pubes>> pussy...'
 				'He spends several minutes doing this without saying anything. Several people walk by while he does, including several beautiful and nude women who glance at you, whispering to each other before moving on.'
 				act'Continue':
 					if bmi_calc < 25:
@@ -541,7 +541,7 @@ if $ARGS[0] = 'interview2':
 			'<center><video autoplay loop src="images/locations/city/citycenter/photo/strip1.mp4"></video><video autoplay loop src="images/locations/city/citycenter/photo/strip2.mp4"></video></center>'
 			'You take a deep breath and begin to take off your clothes. As long as it''s just this one time, you can handle it for now. You leave them on the floor while the photographer examines you.'
 			!if pcs_inhib <= 20'You instinctively cover up as he steps closer, your hands trying to shield your nipples and pussy.'
-			'He circles you slowly, occasionally asking you to adjust your pose slightly, carefully inspecting every aspect of your nude body. Your <<$pcs_eyecol>> eyes framed by your <<$pcs_haircol>> hair, your <<$liptalk3>>, your <<$titsize>> breasts, your <<$skin1>> <<$pcs_tan>> skin, your thighs, even your <<$$pcdesc_pubes>> pussy...'
+			'He circles you slowly, occasionally asking you to adjust your pose slightly, carefully inspecting every aspect of your nude body. Your <<$pcs_eyecol>> eyes framed by your <<$pcs_haircol>> hair, your <<$liptalk3>>, your <<$titsize>> breasts, your <<$skin1>> <<$pcs_tan>> skin, your thighs, even your <<$pcdesc_pubes>> pussy...'
 			'He spends several minutes doing this without saying anything. Several people walk by while he does, including several beautiful and nude women who glance at you, whispering to each other before moving on.'
 			'You blush furiously at the attention, both his and the other models.'
 			act'Continue':

locations/gopskver.qsrc

@@ -1,51 +1,36 @@
 # gopskver
 
-$metka = $ARGS[0]
-$prevloc = $loc
-$loc = $CURLOC
-$location_type = 'event_outdoors'
-
-*clr & cla
-menu_off = 1
-gs 'stat'
-
-gs 'dinsexFX'
-if $prevloc = 'gkafe':
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/trainstation/cafe/gkafe2.jpg"></center>'
-elseif $prevloc = 'pavtrainhall':
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/trainstation/vokzal.jpg"></center>'
-else
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/skver.jpg"></center>'
-end
-*nl
-
-if kotovLoveQW > 0:
-	if hour < 20:
-		if $prevloc = 'gkafe':
-			'Vitek Kotov sees you entering the cafe and tells you to come over. When you approach him, he explains he''s drinking some beer with his friends, and offers you to join them.'
-		elseif $prevloc = 'pavtrainhall':
-			'Vitek Kotov sees you entering the train station and tells you to come over. When you approach him, he explains he''s drinking some beer with his friends, and offers you to join them.'
-		else
-			'Vitek Kotov sees you walking in the park, and tells you to come over. When you approach him, he explains he''s drinking some beer with his friends in the park, and offers you to join them.'
-		end
+if $ARGS[0] = '':
+	$metka = $ARGS[0]
+	$prevloc = $loc
+	$loc = $CURLOC
+	$location_type = 'event_outdoors'
 
-		act 'Decline and leave':
+	*clr & cla
+	menu_off = 1
+	gs 'stat'
+
+	gs 'dinsexFX'
+	if $prevloc = 'gkafe':
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/trainstation/cafe/gkafe2.jpg"></center>'
+	elseif $prevloc = 'pavtrainhall':
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/trainstation/vokzal.jpg"></center>'
+	else
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/skver.jpg"></center>'
+	end
+	*nl
+
+	if kotovLoveQW > 0:
+		if hour < 20:
 			if $prevloc = 'gkafe':
-				gt 'gkafe'
+				'Vitek Kotov sees you entering the cafe and tells you to come over. When you approach him, he explains he''s drinking some beer with his friends, and offers you to join them.'
+			elseif $prevloc = 'pavtrainhall':
+				'Vitek Kotov sees you entering the train station and tells you to come over. When you approach him, he explains he''s drinking some beer with his friends, and offers you to join them.'
 			else
-				gt 'gskver', 'start'
+				'Vitek Kotov sees you walking in the park, and tells you to come over. When you approach him, he explains he''s drinking some beer with his friends in the park, and offers you to join them.'
 			end
-		end
-
-		act 'Drink beer with Vitek and the guys':
-			*clr & cla
-			minut += 15
-			gs 'drugs', 'alcohol', 'beer'
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/bigroom/drunk_ev/beer3.jpg"></center>'
-			'The guys pour out a beer for you, and you enjoy a nice cold beer in their company.'
 
-			act 'Continue':
+			act 'Decline and leave':
 				if $prevloc = 'gkafe':
 					gt 'gkafe'
 				else
@@ -53,46 +38,49 @@ if kotovLoveQW > 0:
 				end
 			end
 
-			if hour = 20:
-				*nl
-				if week = 5 or week = 6:
-					'It''s evening, and the boys are getting ready to go to the disco like they do every friday and saturday. You could call it a night and leave them alone, or tag along.'
-					act 'Go to the disco with the boys':minut += 15 & gt 'gdkin'
-				else
-					'It''s evening, and the boys are getting ready to go to Vasily'' Home. You could call it a night and leave them alone, or tag along.'
-					act 'Go with the boys':minut += 15 & gt 'shulgahall'
+			act 'Drink beer with Vitek and the guys':
+				*clr & cla
+				minut += 15
+				gs 'drugs', 'alcohol', 'beer'
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/bigroom/drunk_ev/beer3.jpg"></center>'
+				'The guys pour out a beer for you, and you enjoy a nice cold beer in their company.'
+
+				act 'Continue':
+					if $prevloc = 'gkafe':
+						gt 'gkafe'
+					else
+						gt 'gskver', 'start'
+					end
+				end
+
+				if hour = 20:
+					*nl
+					if week = 5 or week = 6:
+						'It''s evening, and the boys are getting ready to go to the disco like they do every friday and saturday. You could call it a night and leave them alone, or tag along.'
+						act 'Go to the disco with the boys':minut += 15 & gt 'gdkin'
+					else
+						'It''s evening, and the boys are getting ready to go to Vasily'' Home. You could call it a night and leave them alone, or tag along.'
+						act 'Go with the boys':minut += 15 & gt 'shulgahall'
+					end
 				end
+				exit
 			end
-			exit
-		end
 
-		if alko > 3:
-			'Vitek comes over to you and quietly asks: "Hey baby... do you want to keep drinking with the boys, or do you want to go to my house with me?"'
+			if alko > 3:
+				'Vitek comes over to you and quietly asks: "Hey baby... do you want to keep drinking with the boys, or do you want to go to my house with me?"'
 
-			act 'Go with Vitek':
-				*clr & cla
-				minut += 15
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big9.jpg"></center>'
-				'You take Vitek by the hand and almost feel like he''s showing you off, ' + iif($prevloc='gkafe','when he walks you to the exit of the cafe. You take a little walk','when you walk across the park square towards the exit.  You leave the park') + ' and Vitek guides you to where he lives. It''s a rather worn-down house from the outside, and the inside doesn''t look much better. Crumpled heaps of clothes lie everywhere, and the floor is littered with empty bottles.'
+				act 'Go with Vitek':
+					*clr & cla
+					minut += 15
+					gs 'stat'
+					'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big9.jpg"></center>'
+					'You take Vitek by the hand and almost feel like he''s showing you off, ' + iif($prevloc='gkafe','when he walks you to the exit of the cafe. You take a little walk','when you walk across the park square towards the exit.  You leave the park') + ' and Vitek guides you to where he lives. It''s a rather worn-down house from the outside, and the inside doesn''t look much better. Crumpled heaps of clothes lie everywhere, and the floor is littered with empty bottles.'
 
-				act 'Continue':gt 'kotovSex'
+					act 'Continue':gt 'kotovSex'
+				end
 			end
-		end
-	elseif hour >= 20:
-		*nl
-		act 'Leave':gt 'gskver', 'start'
-		if week = 5 or week = 6:
-			'It''s evening, and the boys are getting ready to go to the disco like they do every friday and saturday. You could call it a night and leave them alone, or tag along.'
-			act 'Go to the disco with the boys': minut += 15 & gt 'gdkin'
-		else
-			'It''s evening, and the boys are getting ready to go to Vasily''s home. You could call it a night and leave them alone, or tag along.'
-			act 'Go to with the boys': minut += 15 & gt 'shulgahall'
-		end
-	end
-else
-	if hour >= 20:
-		if alko < 6:
+		elseif hour >= 20:
 			*nl
 			act 'Leave':gt 'gskver', 'start'
 			if week = 5 or week = 6:
@@ -102,78 +90,38 @@ else
 				'It''s evening, and the boys are getting ready to go to Vasily''s home. You could call it a night and leave them alone, or tag along.'
 				act 'Go to with the boys': minut += 15 & gt 'shulgahall'
 			end
-		elseif alko >= 6 and alko < 9 and DansOralSlut = 1:
-			'You''re quite drunk, and before heading out Dan offers to walk you home.'
-			gs 'willpower', 'misc', 'resist', 'medium'
-			if will_cost <= pcs_willpwr:
-				act '"No need, I can find my own way home"(<<will_cost>> Willpower)':
-					*clr & cla
-					gs 'willpower', 'pay', 'resist'
-					gs 'stat'
-					gt 'pavComplex', 'start'
-				end
-			else
-				act '"No need, I can find my own way home" (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-			end	
-			act 'Go with Dan':
-				*clr & cla
-				pcs_horny += 10
-				minut += 15
-				gs 'stat'
-				'You''re walking down the street, feeling a bit wobbly from the alcohol while Dan supports your weight. He tells you funny stories and anecdotes along the way, and before you know it you''re at your apartment building. When you open the door and enter the building, Dan suddenly pulls you to the side. He''s quite rough about it, and shoves you into a dark corner of the stairwell. He takes your hand by the chin and whispers in your ear: "Your turn to make me feel good, slut. Otherwise I''m telling everyone."'
-				act 'Do as he says':gt 'gopskver', 'dan_blowjob'
-				gs 'willpower', 'bj', 'resist', 'medium'
-				if will_cost <= pcs_willpwr:
-					act 'Push him away(<<will_cost>> Willpower)':
-						*clr & cla
-						gs 'willpower', 'pay', 'resist'
-						gs 'fame', 'pav', 'sex', 5
-						gs 'stat'
-						'You push him away from you and say indignantly: "No way, Dan! Leave me alone!"'
-						'Dan''s eyes look murderous, but he doesn''t touch you. After a few seconds he bounces back, and he grins as he says: "Suit yourself, whore... your reputation in town will be ruined", and then walks away before you can get another word in.'
-						act 'Go home': gt 'pavComplex', 'start'
-					end
+		end
+	else
+		if hour >= 20:
+			if alko < 6:
+				*nl
+				act 'Leave':gt 'gskver', 'start'
+				if week = 5 or week = 6:
+					'It''s evening, and the boys are getting ready to go to the disco like they do every friday and saturday. You could call it a night and leave them alone, or tag along.'
+					act 'Go to the disco with the boys': minut += 15 & gt 'gdkin'
 				else
-					act 'Push him away (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-				end	
-			end
-		elseif alko >= 6 and alko < 9 and DansOralSlut = 0:
-			'You''re quite drunk, and before heading out Dan offers to walk you home.'
-			gs 'willpower', 'misc', 'resist', 'medium'
-			if will_cost <= pcs_willpwr:
-				act '"No need, I can find my own way home"(<<will_cost>> Willpower)':
-					*clr & cla
-					gs 'willpower', 'pay', 'resist'
-					gs 'stat'
-					gt 'pavComplex', 'start'
+					'It''s evening, and the boys are getting ready to go to Vasily''s home. You could call it a night and leave them alone, or tag along.'
+					act 'Go to with the boys': minut += 15 & gt 'shulgahall'
 				end
-			else
-				act '"No need, I can find my own way home" (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-			end
-
-			act 'Go with Dan':
-				*clr & cla
-				pcs_horny += 10
-				minut += 15
-				gs 'stat'
-				'You''re walking down the street, feeling a bit wobbly from the alcohol while Dan supports your weight. He tells you funny stories and anecdotes along the way, and before you know it you''re at your apartment building. When you open the door and enter the building, Dan suddenly pulls you to the side. He''s quite rough about it, and shoves you into a dark corner of the stairwell. He takes your hand by the chin and kisses your lips hard.'
-				gs 'willpower', 'kiss', 'resist', 'medium'
+			elseif alko >= 6 and alko < 9 and DansOralSlut = 1:
+				'You''re quite drunk, and before heading out Dan offers to walk you home.'
+				gs 'willpower', 'misc', 'resist', 'medium'
 				if will_cost <= pcs_willpwr:
-					act 'Push him away and go home(<<will_cost>> Willpower)':
+					act '"No need, I can find my own way home"(<<will_cost>> Willpower)':
 						*clr & cla
 						gs 'willpower', 'pay', 'resist'
 						gs 'stat'
 						gt 'pavComplex', 'start'
 					end
 				else
-					act 'Push him away and go home (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+					act '"No need, I can find my own way home" (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 				end	
-
-				act 'Kiss him back':
+				act 'Go with Dan':
 					*clr & cla
 					pcs_horny += 10
+					minut += 15
 					gs 'stat'
-					'You return his kiss, unsure why he''s kissing you... he never seemed to be that interested in you. Then you feel his hands on your shoulders, and Dan firmly presses down on them trying to get you to drop to your knees. He whispers reassuringly: "Don''t worry, <<$pcs_nickname>>... I didn''t tell anyone about all the things you did. Do a good job, and your secret will stay safe."'
+					'You''re walking down the street, feeling a bit wobbly from the alcohol while Dan supports your weight. He tells you funny stories and anecdotes along the way, and before you know it you''re at your apartment building. When you open the door and enter the building, Dan suddenly pulls you to the side. He''s quite rough about it, and shoves you into a dark corner of the stairwell. He takes your hand by the chin and whispers in your ear: "Your turn to make me feel good, slut. Otherwise I''m telling everyone."'
 					act 'Do as he says':gt 'gopskver', 'dan_blowjob'
 					gs 'willpower', 'bj', 'resist', 'medium'
 					if will_cost <= pcs_willpwr:
@@ -188,109 +136,133 @@ else
 						end
 					else
 						act 'Push him away (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+					end	
+				end
+			elseif alko >= 6 and alko < 9 and DansOralSlut = 0:
+				'You''re quite drunk, and before heading out Dan offers to walk you home.'
+				gs 'willpower', 'misc', 'resist', 'medium'
+				if will_cost <= pcs_willpwr:
+					act '"No need, I can find my own way home"(<<will_cost>> Willpower)':
+						*clr & cla
+						gs 'willpower', 'pay', 'resist'
+						gs 'stat'
+						gt 'pavComplex', 'start'
 					end
+				else
+					act '"No need, I can find my own way home" (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 				end
-			end
-		elseif alko >= 9:
-			'You got absolutely hammered in the park, and are swaying from side to side when you walk down the pathway. Suddenly Vasily hugs your waist tightly and begins to lead you somewhere, with his friends following him.'
-			gs 'willpower', 'gangbang', 'resist', 'medium'
-			if will_cost <= pcs_willpwr:
-				act 'Say you have to go and leave them(<<will_cost>> Willpower)':
+
+				act 'Go with Dan':
 					*clr & cla
-					gs 'willpower', 'pay', 'resist'
+					pcs_horny += 10
+					minut += 15
 					gs 'stat'
-					gt 'pavComplex', 'start'
-				end
-			else
-				act 'Say you have to go and leave them (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-			end	
-
-			act 'Go with the guys':
-				*clr & cla
-
-				if sgopgang = 0:sgopgang = 1
-				if npc_Sex['A9'] = 0: npc_Sex['A9'] = 1 & guy += 1
-				if npc_Sex['A10'] = 0: npc_Sex['A10'] = 1 & guy += 1
-				if npc_Sex['A11'] = 0: npc_Sex['A11'] = 1 & guy += 1
-
-				stat['vaginal'] += 3
-				gang += 1
-				pcs_vag += 3
-				gs 'boyStat', 'A11'
-				cumprecheck = 1
-				gs 'cum_manage'
-				gs 'boyStat', 'A11'
-				sexpartkno = 1
-				spafinloc = 14
-				gs 'cum_manage'
-				gs 'boyStat', 'A10'
-				sexpartkno = 1
-				spafinloc = 14
-				gs 'cum_manage'
-				gs 'boyStat', 'A9'
-				sexpartkno = 1
-				spafinloc = 14
-				gs 'cum_manage'
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/gop/sex/gop/gopgang.jpg"></center>'
-				'At some point, you pass out. When you wake up you''re lying on your back, and you feel something moving inside your pussy. You carefully open your eyes, and between the blinking you see Vasily''s contorted face, hammering his hips against yours. Is he fucking you!?'
-				'A few seconds later, he pulls out and you feel several warm drops landing on your stomach. You lose consciousness again, and a little while later you wake up to find yourself getting fucked by Dan. He''s just about finished, and shoots his load onto your stomach as well. Vitek immediately replaces him, and roughly fucks you as if you''re little more than a few fuckholes to him. Then again, maybe that''s how they really see you.'
-				'He quickly adds his load to that of his friends, and you fade out of consciousness again with a soft groan. When you finally come to your senses you find yourself alone on the sofa, and just rest for a moment. The boys are sitting at the table in the room, drinking more beers. You should probably get going soon, before they decide they''re ready for another round.'
-
-				act 'Leave':gt 'pavResidential'
-			end
-		end
-	elseif hour < 20:
-		iif($prevloc = 'gkafe','You see Vitek, Dan and Vasily sitting at a table, drinking some beers','You see Vitek, Dan and Vasily sitting on a park bench, drinking some beers.')
-
-		if pav_slut < 125:
-			if alko < 6:
-				iif($prevloc = 'gkafe','The boys ordered some extra beers ','The boys have some extra beers with them,') + 'and invite you to have a seat and join them.'
-
-				act 'Decline the beer and leave':
-					if $prevloc = 'gkafe' or $prevloc = 'pavtrainhall':
-						gt $prevloc
+					'You''re walking down the street, feeling a bit wobbly from the alcohol while Dan supports your weight. He tells you funny stories and anecdotes along the way, and before you know it you''re at your apartment building. When you open the door and enter the building, Dan suddenly pulls you to the side. He''s quite rough about it, and shoves you into a dark corner of the stairwell. He takes your hand by the chin and kisses your lips hard.'
+					gs 'willpower', 'kiss', 'resist', 'medium'
+					if will_cost <= pcs_willpwr:
+						act 'Push him away and go home(<<will_cost>> Willpower)':
+							*clr & cla
+							gs 'willpower', 'pay', 'resist'
+							gs 'stat'
+							gt 'pavComplex', 'start'
+						end
 					else
-						gt 'gskver', 'start'
+						act 'Push him away and go home (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+					end	
+
+					act 'Kiss him back':
+						*clr & cla
+						pcs_horny += 10
+						gs 'stat'
+						'You return his kiss, unsure why he''s kissing you... he never seemed to be that interested in you. Then you feel his hands on your shoulders, and Dan firmly presses down on them trying to get you to drop to your knees. He whispers reassuringly: "Don''t worry, <<$pcs_nickname>>... I didn''t tell anyone about all the things you did. Do a good job, and your secret will stay safe."'
+						act 'Do as he says':gt 'gopskver', 'dan_blowjob'
+						gs 'willpower', 'bj', 'resist', 'medium'
+						if will_cost <= pcs_willpwr:
+							act 'Push him away(<<will_cost>> Willpower)':
+								*clr & cla
+								gs 'willpower', 'pay', 'resist'
+								gs 'fame', 'pav', 'sex', 5
+								gs 'stat'
+								'You push him away from you and say indignantly: "No way, Dan! Leave me alone!"'
+								'Dan''s eyes look murderous, but he doesn''t touch you. After a few seconds he bounces back, and he grins as he says: "Suit yourself, whore... your reputation in town will be ruined", and then walks away before you can get another word in.'
+								act 'Go home': gt 'pavComplex', 'start'
+							end
+						else
+							act 'Push him away (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+						end
 					end
 				end
+			elseif alko >= 9:
+				'You got absolutely hammered in the park, and are swaying from side to side when you walk down the pathway. Suddenly Vasily hugs your waist tightly and begins to lead you somewhere, with his friends following him.'
+				gs 'willpower', 'gangbang', 'resist', 'medium'
+				if will_cost <= pcs_willpwr:
+					act 'Say you have to go and leave them(<<will_cost>> Willpower)':
+						*clr & cla
+						gs 'willpower', 'pay', 'resist'
+						gs 'stat'
+						gt 'pavComplex', 'start'
+					end
+				else
+					act 'Say you have to go and leave them (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+				end	
 
-				act 'Drink beer with the guys':
+				act 'Go with the guys':
 					*clr & cla
-					minut += 15
-					gs 'drugs', 'alcohol', 'beer'
+
+					if sgopgang = 0:sgopgang = 1
+					if npc_Sex['A9'] = 0: npc_Sex['A9'] = 1 & guy += 1
+					if npc_Sex['A10'] = 0: npc_Sex['A10'] = 1 & guy += 1
+					if npc_Sex['A11'] = 0: npc_Sex['A11'] = 1 & guy += 1
+
+					stat['vaginal'] += 3
+					gang += 1
+					pcs_vag += 3
+					gs 'boyStat', 'A11'
+					cumprecheck = 1
+					gs 'cum_manage'
+					gs 'boyStat', 'A11'
+					sexpartkno = 1
+					spafinloc = 14
+					gs 'cum_manage'
+					gs 'boyStat', 'A10'
+					sexpartkno = 1
+					spafinloc = 14
+					gs 'cum_manage'
+					gs 'boyStat', 'A9'
+					sexpartkno = 1
+					spafinloc = 14
+					gs 'cum_manage'
 					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/bigroom/drunk_ev/beer3.jpg"></center>'
-					'The guys cheer and pour out a beer for you. Vasily gives you ' + iif($prevloc = 'gkafe','a glass','the cup') +' while the others propose a toast, already having beers in their hands. You happily join them in their toast, and spend the next 15 minutes chatting with them and having sips of your cold beer.'
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/gop/sex/gop/gopgang.jpg"></center>'
+					'At some point, you pass out. When you wake up you''re lying on your back, and you feel something moving inside your pussy. You carefully open your eyes, and between the blinking you see Vasily''s contorted face, hammering his hips against yours. Is he fucking you!?'
+					'A few seconds later, he pulls out and you feel several warm drops landing on your stomach. You lose consciousness again, and a little while later you wake up to find yourself getting fucked by Dan. He''s just about finished, and shoots his load onto your stomach as well. Vitek immediately replaces him, and roughly fucks you as if you''re little more than a few fuckholes to him. Then again, maybe that''s how they really see you.'
+					'He quickly adds his load to that of his friends, and you fade out of consciousness again with a soft groan. When you finally come to your senses you find yourself alone on the sofa, and just rest for a moment. The boys are sitting at the table in the room, drinking more beers. You should probably get going soon, before they decide they''re ready for another round.'
 
-					act 'Continue':
+					act 'Leave':gt 'pavResidential'
+				end
+			end
+		elseif hour < 20:
+			iif($prevloc = 'gkafe','You see Vitek, Dan and Vasily sitting at a table, drinking some beers','You see Vitek, Dan and Vasily sitting on a park bench, drinking some beers.')
+
+			if pav_slut < 125:
+				if alko < 6:
+					iif($prevloc = 'gkafe','The boys ordered some extra beers ','The boys have some extra beers with them,') + 'and invite you to have a seat and join them.'
+
+					act 'Decline the beer and leave':
 						if $prevloc = 'gkafe' or $prevloc = 'pavtrainhall':
 							gt $prevloc
 						else
 							gt 'gskver', 'start'
 						end
 					end
-					if hour = 20:
-						*nl
-						if week = 5 or week = 6:
-							'It''s evening, and the boys are getting ready to go to the disco like they do every friday and saturday. You could call it a night and leave them alone, or tag along.'
-							act 'Go to the disco with the boys': minut += 15 & gt 'gdkin'
-						else
-							'It''s evening, and the boys are getting ready to go to Vasily''s home. You could call it a night and leave them alone, or tag along.'
-							act 'Go with the boys': minut += 15 & gt 'shulgahall'
-						end
-					end
-				end
-			elseif alko >= 6:
-				'You''re already not exactly sober any more, and feel a bit looser while you chat with the guys.'
 
-				if pav_slut < 50:
 					act 'Drink beer with the guys':
 						*clr & cla
-						minut += 5
+						minut += 15
+						gs 'drugs', 'alcohol', 'beer'
 						gs 'stat'
-						'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big11.jpg"></center>'
-						'Vasily puts his hand on your shoulder and tells you that his friends aren''t the kind of guys a nice girl should be getting drunk with and sends you on your way.'
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/bigroom/drunk_ev/beer3.jpg"></center>'
+						'The guys cheer and pour out a beer for you. Vasily gives you ' + iif($prevloc = 'gkafe','a glass','the cup') +' while the others propose a toast, already having beers in their hands. You happily join them in their toast, and spend the next 15 minutes chatting with them and having sips of your cold beer.'
 
 						act 'Continue':
 							if $prevloc = 'gkafe' or $prevloc = 'pavtrainhall':
@@ -299,90 +271,137 @@ else
 								gt 'gskver', 'start'
 							end
 						end
+						if hour = 20:
+							*nl
+							if week = 5 or week = 6:
+								'It''s evening, and the boys are getting ready to go to the disco like they do every friday and saturday. You could call it a night and leave them alone, or tag along.'
+								act 'Go to the disco with the boys': minut += 15 & gt 'gdkin'
+							else
+								'It''s evening, and the boys are getting ready to go to Vasily''s home. You could call it a night and leave them alone, or tag along.'
+								act 'Go with the boys': minut += 15 & gt 'shulgahall'
+							end
+						end
 					end
-				elseif pav_slut < 75:
-					if $prevloc = 'gkafe':
-						'Vasily suggests to the guys to leave the cafe and continue drinking in the park. You are too drunk to resist so you just follow them to the park'
-					elseif $prevloc = 'pavtrainhall':
-						'Vasily suggests to the guys to leave the train station and continue drinking in the park. You are too drunk to resist so you just follow them to the park'
-					end
-					'At one point, Vasily sits down next to you and says: "Hey <<$pcs_nickname>>... I''ve heard from someone that you''re a huge tease, is that true?"'
+				elseif alko >= 6:
+					'You''re already not exactly sober any more, and feel a bit looser while you chat with the guys.'
 
-					act '"Yes that''s true"':
-						*clr & cla
-						gs 'stat'
-						'You smile and nod at him: "I like getting guys all worked up with my body, that''s true. Why?"'
-						'Vasily stutters for a moment, and then manages to say: "Oh n- no reason, I was just curious is all."'
+					if pav_slut < 50:
+						act 'Drink beer with the guys':
+							*clr & cla
+							minut += 5
+							gs 'stat'
+							'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big11.jpg"></center>'
+							'Vasily puts his hand on your shoulder and tells you that his friends aren''t the kind of guys a nice girl should be getting drunk with and sends you on your way.'
 
-						act 'Thank them for the beer and leave':gt 'gskver', 'start'
-					end
+							act 'Continue':
+								if $prevloc = 'gkafe' or $prevloc = 'pavtrainhall':
+									gt $prevloc
+								else
+									gt 'gskver', 'start'
+								end
+							end
+						end
+					elseif pav_slut < 75:
+						if $prevloc = 'gkafe':
+							'Vasily suggests to the guys to leave the cafe and continue drinking in the park. You are too drunk to resist so you just follow them to the park'
+						elseif $prevloc = 'pavtrainhall':
+							'Vasily suggests to the guys to leave the train station and continue drinking in the park. You are too drunk to resist so you just follow them to the park'
+						end
+						'At one point, Vasily sits down next to you and says: "Hey <<$pcs_nickname>>... I''ve heard from someone that you''re a huge tease, is that true?"'
 
-					act '"What? No!"':
-						*clr & cla
-						gs 'stat'
-						'You raise your voice a little and act surprised: "What? No way! Whoever told you that was lying!"'
-						'However, Dan doesn''t fall for your act, and matter-of-factly says: "<<$pcs_nickname>>, you''re a slut. We''ve all seen you, the whole town knows it. Why are you even trying to deny it? You''re such a terrible liar..."'
+						act '"Yes that''s true"':
+							*clr & cla
+							gs 'stat'
+							'You smile and nod at him: "I like getting guys all worked up with my body, that''s true. Why?"'
+							'Vasily stutters for a moment, and then manages to say: "Oh n- no reason, I was just curious is all."'
 
-						act 'Leave':gt 'gskver', 'start'
-					end
-				elseif pav_slut < 125:
-					if $prevloc = 'gkafe':'Vasily suggests to the guys to leave the cafe and continue drinking in the park. You are too drunk to resist so you just follow them to the park'
-					'At one point, Vasily sits down next to you and says: "Hey <<$pcs_nickname>>... I''ve heard from someone that you like sucking dicks... is that true?"'
+							act 'Thank them for the beer and leave':gt 'gskver', 'start'
+						end
 
-					act '"Yes, that''s true"':
-						*clr & cla
-						gs 'stat'
-						'You have a slight blush on your face when you confess: yes, you do like giving blowjobs. Vasily has a cheeky smile when he continues: "And is it true that you let them finish inside your mouth?"'
+						act '"What? No!"':
+							*clr & cla
+							gs 'stat'
+							'You raise your voice a little and act surprised: "What? No way! Whoever told you that was lying!"'
+							'However, Dan doesn''t fall for your act, and matter-of-factly says: "<<$pcs_nickname>>, you''re a slut. We''ve all seen you, the whole town knows it. Why are you even trying to deny it? You''re such a terrible liar..."'
+
+							act 'Leave':gt 'gskver', 'start'
+						end
+					elseif pav_slut < 125:
+						if $prevloc = 'gkafe':'Vasily suggests to the guys to leave the cafe and continue drinking in the park. You are too drunk to resist so you just follow them to the park'
+						'At one point, Vasily sits down next to you and says: "Hey <<$pcs_nickname>>... I''ve heard from someone that you like sucking dicks... is that true?"'
 
-						act '"Yes, that''s true too"':
+						act '"Yes, that''s true"':
 							*clr & cla
 							gs 'stat'
-							'You blush again but confirm: "Yes, I let them cum inside my mouth."'
-							'Vasily is excited now, squirming in his seat: "So... how about you put that pretty mouth of yours to work on us?"'
+							'You have a slight blush on your face when you confess: yes, you do like giving blowjobs. Vasily has a cheeky smile when he continues: "And is it true that you let them finish inside your mouth?"'
 
-							act '"No way!"':
+							act '"Yes, that''s true too"':
 								*clr & cla
 								gs 'stat'
-								'You indignantly reject Vasily''s proposal: "No way, Shulga! I can''t just do that for everyone who asks!"'
-								'Dan suddenly growls at you: "Shut up, whore. I''ve seen you suck cocks of just about anyone you meet, and swallow their loads to the last drop! They make videos when you''re not paying attention... and now suddenly we''re not good enough for you?"'
-								'You''re a bit afraid of his sudden outburst and try to explain yourself: "Dan please, you have to understand! I don''t just su-"'
-								'He interrupts you: "Shut up! We won''t ask again... are you going to be a nice little slut and do as we ask, or are you going to keep pretending to be some stuck up bitch?"'
+								'You blush again but confirm: "Yes, I let them cum inside my mouth."'
+								'Vasily is excited now, squirming in his seat: "So... how about you put that pretty mouth of yours to work on us?"'
 
-								act 'Be a nice little slut':
+								act '"No way!"':
 									*clr & cla
 									gs 'stat'
-									'You don''t want to anger Dan any further, and decide to back down. You softly say: "Relax, Dan... I''m sorry, I didn''t mean to insult you or your friends. I''ll do it."'
-									'Dan smirks at you: "I forgive you, slut... I guess you just didn''t know what to do yet, when someone asks you for your whore mouth. We''ll teach you what you need to know about your place in the world. Get down before me and start sucking!"'
-									gs 'gopskver', 'triple_blow'
-								end
+									'You indignantly reject Vasily''s proposal: "No way, Shulga! I can''t just do that for everyone who asks!"'
+									'Dan suddenly growls at you: "Shut up, whore. I''ve seen you suck cocks of just about anyone you meet, and swallow their loads to the last drop! They make videos when you''re not paying attention... and now suddenly we''re not good enough for you?"'
+									'You''re a bit afraid of his sudden outburst and try to explain yourself: "Dan please, you have to understand! I don''t just su-"'
+									'He interrupts you: "Shut up! We won''t ask again... are you going to be a nice little slut and do as we ask, or are you going to keep pretending to be some stuck up bitch?"'
 
-								gs 'willpower', 'bj', 'resist'
-								if will_cost <= pcs_willpwr:
-									act 'Keep refusing(<<will_cost>> Willpower)':
-										gs 'willpower', 'pay', 'resist'
-										minut += 5
-										fingal += 1
-										body_write = 1
-										pcs_mood -= 5
+									act 'Be a nice little slut':
 										*clr & cla
 										gs 'stat'
+										'You don''t want to anger Dan any further, and decide to back down. You softly say: "Relax, Dan... I''m sorry, I didn''t mean to insult you or your friends. I''ll do it."'
+										'Dan smirks at you: "I forgive you, slut... I guess you just didn''t know what to do yet, when someone asks you for your whore mouth. We''ll teach you what you need to know about your place in the world. Get down before me and start sucking!"'
+										gs 'gopskver', 'triple_blow'
+									end
 
-										'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/gop/sex/gop/body_cocksucker.jpg"></center>'
-										'You keep refusing, and try to get up and leave. Dan slaps your face hard, however, and you fall to the ground. He immediately pins you down, and begins to rip your clothes off. "Too proud, huh? We''ll have to take you down a peg!"'
-										'The boys take out some markers and write several obscene words onto your skin. Soon, the whole town can read what a huge slut you are!'
-										'You don''t want to anger them any further, knowing the boys are much stronger than you, and don''t dare to protest while they keep writing more things on you. Eventually they''re satisfied, and let you get up. They even let you put your clothes back on, so you can cover up at least the majority of the writings. Dan smirks: "Maybe that''ll help you remember what you are, slut. When you''re ready to apologize, you know where to find us."'
-
-										act 'Leave':gt 'gskver', 'start'
+									gs 'willpower', 'bj', 'resist'
+									if will_cost <= pcs_willpwr:
+										act 'Keep refusing(<<will_cost>> Willpower)':
+											gs 'willpower', 'pay', 'resist'
+											minut += 5
+											fingal += 1
+											body_write = 1
+											pcs_mood -= 5
+											*clr & cla
+											gs 'stat'
+
+											'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/gop/sex/gop/body_cocksucker.jpg"></center>'
+											'You keep refusing, and try to get up and leave. Dan slaps your face hard, however, and you fall to the ground. He immediately pins you down, and begins to rip your clothes off. "Too proud, huh? We''ll have to take you down a peg!"'
+											'The boys take out some markers and write several obscene words onto your skin. Soon, the whole town can read what a huge slut you are!'
+											'You don''t want to anger them any further, knowing the boys are much stronger than you, and don''t dare to protest while they keep writing more things on you. Eventually they''re satisfied, and let you get up. They even let you put your clothes back on, so you can cover up at least the majority of the writings. Dan smirks: "Maybe that''ll help you remember what you are, slut. When you''re ready to apologize, you know where to find us."'
+
+											act 'Leave':gt 'gskver', 'start'
+										end
+									else
+										act 'Keep refusing (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 									end
-								else
-									act 'Keep refusing (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+								end
+
+								act '"Well, maybe... just don''t tell anyone!"':
+									*clr & cla
+									gs 'stat'
+									'Dan grins at you while he reaches for his pants: "Your secret is safe with us, baby. Now get down on your knees and take my cock in your mouth!"'
+									gs 'gopskver', 'triple_blow'
 								end
 							end
 
-							act '"Well, maybe... just don''t tell anyone!"':
+							act '"No, that''s a lie!"':
 								*clr & cla
 								gs 'stat'
-								'Dan grins at you while he reaches for his pants: "Your secret is safe with us, baby. Now get down on your knees and take my cock in your mouth!"'
+								'You spit on the ground, and pretend to be insulted: "No way, Vasily! That''s disgusting!"'
+
+								if swallow > 0:
+									'Dan suddenly snaps, and shouts at you: "<<$pcs_nickname>>, don''t bullshit us! The whole town knows you''re a huge cum guzzler, who loves little more than to take a big load into her mouth and swallow it all down! Stop lying!"'
+								elseif swallow = 0 and facial > 0:
+									'Dan suddenly chuckles: "But you love taking loads all over your face, right? I''ve seen several pictures of you, with your face and mouth all covered in cum."'
+								else
+									'Dan chuckles: "Maybe you can''t get a guy off with your mouth yet? Don''t worry <<$pcs_nickname>>, we will help you with your technique..."'
+								end
+
+								'Dan sharply says as he reaches for his pants and exposes his hard cock: "Enough talk! I think it''s time <<$pcs_nickname>> shows us what a good little slut she is. Take it in your mouth!"'
 								gs 'gopskver', 'triple_blow'
 							end
 						end
@@ -390,56 +409,39 @@ else
 						act '"No, that''s a lie!"':
 							*clr & cla
 							gs 'stat'
-							'You spit on the ground, and pretend to be insulted: "No way, Vasily! That''s disgusting!"'
-
-							if swallow > 0:
-								'Dan suddenly snaps, and shouts at you: "<<$pcs_nickname>>, don''t bullshit us! The whole town knows you''re a huge cum guzzler, who loves little more than to take a big load into her mouth and swallow it all down! Stop lying!"'
-							elseif swallow = 0 and facial > 0:
-								'Dan suddenly chuckles: "But you love taking loads all over your face, right? I''ve seen several pictures of you, with your face and mouth all covered in cum."'
-							else
-								'Dan chuckles: "Maybe you can''t get a guy off with your mouth yet? Don''t worry <<$pcs_nickname>>, we will help you with your technique..."'
-							end
-
-							'Dan sharply says as he reaches for his pants and exposes his hard cock: "Enough talk! I think it''s time <<$pcs_nickname>> shows us what a good little slut she is. Take it in your mouth!"'
+							'You pretend to be insulted at the mere notion, but Dan gets angry: "<<$pcs_nickname>>, you''re a slut! I know it, you know it, the whole fucking town knows it! Don''t be a stuck up bitch and start sucking!"'
 							gs 'gopskver', 'triple_blow'
 						end
 					end
-
-					act '"No, that''s a lie!"':
-						*clr & cla
-						gs 'stat'
-						'You pretend to be insulted at the mere notion, but Dan gets angry: "<<$pcs_nickname>>, you''re a slut! I know it, you know it, the whole fucking town knows it! Don''t be a stuck up bitch and start sucking!"'
-						gs 'gopskver', 'triple_blow'
-					end
 				end
-			end
-		else
-			shultextrand = rand(0, 2)
+			else
+				shultextrand = rand(0, 2)
 
-			if shultextrand = 0:$shultextrand = 'Looking for something to put in your mouth?'
-			if shultextrand = 1:$shultextrand = 'We can give you something to suck on!'
-			if shultextrand = 2:$shultextrand = 'Looking for something to suck on?'
+				if shultextrand = 0:$shultextrand = 'Looking for something to put in your mouth?'
+				if shultextrand = 1:$shultextrand = 'We can give you something to suck on!'
+				if shultextrand = 2:$shultextrand = 'Looking for something to suck on?'
 
-			'Vasily grins and shouts as he sees you walk by: "Look guys, it''s our favourite slut! <<$shultextrand>>" His friends laugh loudly at your expense.'
+				'Vasily grins and shouts as he sees you walk by: "Look guys, it''s our favourite slut! <<$shultextrand>>" His friends laugh loudly at your expense.'
 
-			if $prevloc = 'gkafe':
-				act 'Blush and quickly leave the cafe': gt $prevloc
-			elseif $prevloc = 'pavtrainhall':
-				act 'Blush and quickly leave the train station': gt $prevloc
-			else
-				act 'Blush and keep walking':gt 'gskver', 'start'
-				if BjBeerQW >= 5:
-					act 'Approach the guys': gt'zsoft_gopskverGorSlut','1'
-				elseif BjBeerQW < 5:
-					act 'Ask for a beer':
-						if BjBeerDay = daystart:
-							*clr & cla
-							'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big11.jpg"></center>'
-							'Vasily smirks and slaps your hand away: "Go beg somewhere else, whore. You''ve had enough for today, the open bar is closed for sluts like you. Come back tomorrow."'
-							act 'Leave them and walk away':gt 'gskver', 'start'
+				if $prevloc = 'gkafe':
+					act 'Blush and quickly leave the cafe': gt $prevloc
+				elseif $prevloc = 'pavtrainhall':
+					act 'Blush and quickly leave the train station': gt $prevloc
+				else
+					act 'Blush and keep walking':gt 'gskver', 'start'
+					if BjBeerQW >= 5:
+						act 'Approach the guys': gt'zsoft_gopskverGorSlut','1'
+					elseif BjBeerQW < 5:
+						act 'Ask for a beer':
+							if BjBeerDay = daystart:
+								*clr & cla
+								'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big11.jpg"></center>'
+								'Vasily smirks and slaps your hand away: "Go beg somewhere else, whore. You''ve had enough for today, the open bar is closed for sluts like you. Come back tomorrow."'
+								act 'Leave them and walk away':gt 'gskver', 'start'
 
-						else
-							gt 'gopskver', 'BjBeerStart'
+							else
+								gt 'gopskver', 'BjBeerStart'
+							end
 						end
 					end
 				end

locations/grandmahelp.qsrc

@@ -188,5 +188,5 @@ if $ARGS[0] = 'harvest':
 	end
 end
 
---grandmahelp ---------------------------------
+--- grandmahelp ---------------------------------
 

locations/kotovSex.qsrc

@@ -996,7 +996,7 @@ if $ARGS[0] = 'sex_cow5':
 	menu_off = 1
 	gs 'stat'
 	'<center><video autoplay loop src="images/shared/sex/vag/hug/kotovsex61.mp4"></video></center>'
-	'You kiss passionately, while you continue to buck your hips against his. He pulls you even tighter against him, and you can''t help but feel safe and secure in his arms while you share an intimate moment together.',1
+	'You kiss passionately, while you continue to buck your hips against his. He pulls you even tighter against him, and you can''t help but feel safe and secure in his arms while you share an intimate moment together.'
 	gs 'arousal', 'vaginal', 5, 'sub'
 	gs 'stat'
 	act 'blowjob':gt 'kotovSex', 'bj<<rand(1,13)>>'

locations/obj_din.qsrc

@@ -2436,7 +2436,7 @@ if $ARGS[0] = 'wait':
 	waiting = 0
 	if $waitStr = '':
 		waiting = 15
-	else if strcomp($waitStr, '\d\d:\d\d'):
+	elseif strcomp($waitStr, '\d\d:\d\d'):
 		waiting = val(strfind($waitStr, '(\d\d):\d\d', 1)) * 60 + val(strfind($waitStr, '\d\d:(\d\d)', 1)) - minut - hour * 60
 	else
 		waiting = val($waitStr)

locations/pornhist.qsrc

@@ -115,7 +115,7 @@ $pornfilmdesc = {
 	$porndesc[1] = 'Handjob'
 	$porndesc[2] = 'Blowjob'
 	$porndesc[3] = 'Straight sex with facial'
-	$porndesc[4] = 'Straight and anal sex with facial'
+	$porndesc[4] = 'Straight anal sex with facial'
 	$porndesc[5] = 'Threesome with anal creampie and facial'
 	$porndesc[6] = 'Threesome with double penetration, facial and swallowing'
 	$porndesc[7] = 'Straight sex with creampie'
@@ -126,19 +126,25 @@ $pornfilmdesc = {
 	$porndesc[12] = 'Four guy gangbang with anal sex and anal creampies'
 	$porndesc[13] = 'Two double penetration with four guys, vaginal and anal creampies'
 	$porndesc[14] = 'Gangbang with 50 guys'
+	$porndesc[15] = 'Straight sex, bj and anal sex with creampie'
+	$porndesc[16] = 'Straight sex, bj and anal sex with cum on ass'
+	$porndesc[17] = 'Lesbian sex with cuni, tribbing and double dildo'
+	$porndesc[18] = 'Lesbian sex with cuni, vaginal strapon and giving anal strapon'
+	$porndesc[19] = 'Threesome with guy and girl, bj, vaginal, anal, cumshare after anal creampie'
+	$porndesc[20] = 'Threesome with guy and girl, bj, cuni, cumshare after anal creampie'
 	if film_type = 1:
 		pfType = 0
 		pcash = 20
 		pfactor = 1
 		actbonus = 1
-		$tags = 'handjob'
+		$tags = 'handjob, cumshot'
 		$pfilmtext = 'You jerked off a guy and he came on your tits.'
 	elseif film_type = 2:
 		pfType = 0
 		pcash = 30
 		pfactor = 1
 		actbonus = 1
-		$tags = 'blowjob'
+		$tags = 'blowjob, facial'
 		$pfilmtext = 'You blew a guy and got a facial.'
 	elseif film_type = 3:
 		pfType = 0
@@ -153,13 +159,13 @@ $pornfilmdesc = {
 		pfactor = 1
 		actbonus = rand(1,2)
 		$tags = 'blowjob, facial, vaginal, anal'
-		$pfilmtext = 'You blew and fucked a guy in pussy and ass, then got a facial.'
+		$pfilmtext = 'You blew and fucked a guy letting him use all your holes, then got a facial.'
 	elseif film_type = 5:
 		pfType = 0
 		pcash = 70
 		pfactor = 2
 		actbonus = rand(1,3)
-		$tags = 'facial, vaginal, anal, blowjob'
+		$tags = 'facial, vaginal, anal, blowjob, creampie'
 		$pfilmtext = 'A guy fucked your ass and pussy, getting an anal creampie while you sucked off an another guy, getting facial.'
 	elseif film_type = 6:
 		pfType = 0
@@ -173,21 +179,21 @@ $pornfilmdesc = {
 		pcash = 80
 		pfactor = 1
 		actbonus = rand(1,2)
-		$tags = 'vaginal'
+		$tags = 'vaginal, creampie'
 		$pfilmtext = 'You blew and fucked a guy, getting a creampie.'
 	elseif film_type = 8:
 		pfType = 1
 		pcash = 100
 		pfactor = 2
 		actbonus = rand(1,2)
-		$tags = 'DP, vaginal, anal'
+		$tags = 'DP, vaginal, anal, creampie'
 		$pfilmtext = 'Two guys fucked you in double penetration, getting a double creampie.'
 	elseif film_type = 9:
 		pfType = 1
 		pcash = 90
 		pfactor = 2
 		actbonus = rand(1,3)
-		$tags = 'blowjob, vaginal, swallowing'
+		$tags = 'blowjob, vaginal, swallowing, creampie'
 		$pfilmtext = 'Two guys fucked your pussy and mouth, getting a creampie and swallowing cum.'
 	elseif film_type = 10:
 		pfType = 1
@@ -195,27 +201,27 @@ $pornfilmdesc = {
 		pfactor = 4
 		actbonus = rand(2,3)
 		$tags = 'vaginal, cumshot'
-		$pfilmtext = 'Four guys fucked your pussy and they all cum on your mons.'
+		$pfilmtext = 'Four guys fucked your pussy and they all cum on your body and face.'
 	elseif film_type = 11:
 		pfType = 1
 		pcash = 150
 		pfactor = 4
 		actbonus = rand(2,3)
-		$tags = 'vaginal'
-		$pfilmtext = 'Four guys fucked your pussy, getting four creampie.'
+		$tags = 'vaginal, creampie'
+		$pfilmtext = 'Four guys fucked your pussy, getting four creampies.'
 	elseif film_type = 12:
 		pfType = 0
 		pcash = 150
 		pfactor = 4
 		actbonus = rand(2,3)
 		$tags = 'anal'
-		$pfilmtext = 'Four guys fucked your ass, getting four ass creampie.'
+		$pfilmtext = 'Four guys fucked your ass, getting four ass creampies.'
 	elseif film_type = 13:
 		pfType = 1
 		pcash = 150
 		pfactor = 4
 		actbonus = rand(2,3)
-		$tags = 'DP, vaginal, anal'
+		$tags = 'DP, vaginal, anal, creampie'
 		$pfilmtext = 'Four guys fucked you in double penetration in pairs. You got two double creampie.'
 	elseif film_type = 14:
 		pfType = 1
@@ -225,6 +231,50 @@ $pornfilmdesc = {
 		$tags = 'vaginal, anal, blowjob, cumshot, facial, swallowing'
 		$pfilmtext = 'Fifty of your fans fucked you however they could. Most everyone came in your pussy.'
 		$pstory = 'You called out to your fans on the internet that they have an opportunity to fuck you and cum in or on you free of charge. Of course they flocked to you.'
+	elseif film_type = 15:
+		pfType = 0
+		pcash = 50
+		pfactor = 1
+		actbonus = rand(1,2)
+		$tags = 'blowjob, anal, creampie'
+		$pfilmtext = 'You gave a blowjob and then let a guy fuck your ass until he came inside.'
+	elseif film_type = 16:
+		pfType = 0
+		pcash = 50
+		pfactor = 1
+		actbonus = rand(1,2)
+		$tags = 'blowjob, anal, cumshot'
+		$pfilmtext = 'You gave a blowjob and then let a guy fuck your ass until he came all over your ass.'
+	elseif film_type = 17:
+		pfType = 0
+		pcash = 50
+		pfactress = 1
+		actbonus = rand(1,2)
+		$tags = 'lesbian, tribbing, double dildo'
+		$pfilmtext = 'You had lesbian sex, licking eachother''s pussies, tribbing and using a double dildo.'
+	elseif film_type = 18:
+		pfType = 0
+		pcash = 50
+		pfactress = 1
+		actbonus = rand(1,2)
+		$tags = 'lesbian, strapon, vaginal, anal'
+		$pfilmtext = 'You had lesbian sex, licking eachother''s pussies, had your pussy fucked with a strapon and fucked the other girl''s ass.'
+	elseif film_type = 19:
+		pfType = 0
+		pcash = 100
+		pfactor = 1
+		pfactress = 1
+		actbonus = rand(2,3)
+		$tags = 'threesome, mff, blowjob, anal, creampie, cumshare'
+		$pfilmtext = 'You had a threesome with a guy and a girl, sucking him off before he fucked your ass until he creampied you while the girl licked your pussy, ending with cumsharing.'
+	elseif film_type = 20:
+		pfType = 0
+		pcash = 100
+		pfactor = 1
+		pfactress = 1
+		actbonus = rand(2,3)
+		$tags = 'threesome, mff, blowjob, anal, creampie, cumshare'
+		$pfilmtext = 'You had a threesome with a guy and a girl, sucking him off before he fucked her ass until he creampied her while you licked her pussy, ending with cumsharing.'
 	end
 	dynamic $porntag
 }
@@ -246,13 +296,39 @@ $porntag = {
 		end
 	end
 	
-	if pfactor > 2:
+	if pfactor = 0 and pfactress > 0:
+		if $pfilmtags <> '':
+			$pfilmtags += ', lesbian'
+		else
+			$pfilmtags = 'lesbian'
+		end
+	end
+	
+	if pfactor > 2 and pfactress = 0:
 		if $pfilmtags <> '':
 			$pfilmtags += ', gangbang'
 		else
 			$pfilmtags = 'gangbang'
 		end
-	elseif pfactor = 2:
+	elseif pfactor > 2 and pfactress > 1:
+		if $pfilmtags <> '':
+			$pfilmtags += ', orgy'
+		else
+			$pfilmtags = 'orgy'
+		end
+	elseif pfactor = 2 and pfactress = 0:
+		if $pfilmtags <> '':
+			$pfilmtags += ', threesome'
+		else
+			$pfilmtags = 'threesome'
+		end
+	elseif pfactor = 1 and pfactress = 1:
+		if $pfilmtags <> '':
+			$pfilmtags += ', threesome'
+		else
+			$pfilmtags = 'threesome'
+		end
+	elseif pfactor = 0 and pfactress = 2:
 		if $pfilmtags <> '':
 			$pfilmtags += ', threesome'
 		else

locations/pornschedule.qsrc

@@ -26,18 +26,22 @@ if $ARGS[0] = 'schedule':
 				if pornvariable <= 1:
 					!50 person
 					pornplan['<<days+1>>,<<porns>>'] = 14
-				elseif pornvariable <= 11:
+				elseif pornvariable <= 10:
 					!4 person
 					!some way to randomize the scene
 					pornplan['<<days+1>>,<<porns>>'] = rand(10,13)
-				elseif pornvariable <= 33:
+				elseif pornvariable <= 30:
 					!2 person
 					!some way to randomize the scene
 					pornplan['<<days+1>>,<<porns>>'] = rand(8,9)
-				elseif pornvariable <= 90:
+				elseif pornvariable <= 60:
 					!single person
 					!some way to randomize the scene
 					pornplan['<<days+1>>,<<porns>>'] = rand(1,7)
+				elseif pornvariable <= 80:
+					!single person
+					!some way to randomize the scene
+					pornplan['<<days+1>>,<<porns>>'] = rand(15,20)
 				else
 					!masturbation scene
 					!some way to randomize the scene - if there will be more than one(???)

locations/pornstudio.qsrc

@@ -904,6 +904,7 @@ if $ARGS[0] = 'medical':
 				pf = ARGS[1]
 				dynamic $pornfilmdesc, pf
 				gs 'pornfilm', 'pornactor'
+				gs 'pornfilm', 'pornactress'
 				*clr & cla
 				'<center><img width=700 src="images/locations/city/citycenter/studio/makeup.jpg"></center>'
 				minut += 30
@@ -951,7 +952,7 @@ if $ARGS[0] = 'postvideo':
 	film += 1
 	if film = 1:
 		$porntitle[film] = 'Girls Jerk Guys #36 - '
-		$pornfilmstory[film] = '<<$pfname>>''s introduction to the world of porn, where she jerk off <<$pakter[1]>> on her tits.'
+		$pornfilmstory[film] = '<<$pfname>>''s introduction to the world of porn, where she jerks off <<$pakter[1]>> on her tits.'
 	else
 		if $pstory = '' and editpornname = 1:
 			$pornfilmstory[film] = input('You can enter the story of the porn movie. This action can be done only once, but you can choose to do it later! (Just hit Enter/Esc when blank)<br>Tags of the current movie: <font color=#541717 size=2><<$pfilmtags>></font>')
@@ -1127,7 +1128,7 @@ if $ARGS[0] = '1':
 									'<center><img <<$set_imgh>> src="images/locations/city/citycenter/studio/pierre_2.jpg"></center>'
 									'Good for, girl, walk and not take away from me more time'
 
-									gt'pornstudio','start'
+									gt 'pornstudio', 'start'
 								end
 							end
 						end

locations/reks.qsrc

@@ -941,5 +941,5 @@ if $ARGS[0] = 'party':
 	if $metka = 'party_gost': act 'Dance together':gt 'dinParty', 'rex_dance'
 end
 
---reks ---------------------------------
+--- reks ---------------------------------
 

locations/stat_display.qsrc

@@ -485,7 +485,7 @@ elseif $clothingworntype = 'swimwear':
 		$stat_clothes_style = 'swimsuit_eb'
 	elseif (CloInhibit >= 50 or CloThinness = 6) and (PCloBimbo = 0 or cheatBimbo = 1):
 		$stat_clothes_msg = 'You are wearing an exhibitionist swimsuit.'
-		$$stat_clothes_tooltip = 'Exhibitionist swimsuit.'
+		$stat_clothes_tooltip = 'Exhibitionist swimsuit.'
 		$stat_clothes_style = 'swimsuit_e'
 	elseif PCloBimbo = 1 and cheatBimbo = 0:
 		$stat_clothes_text = '<BR><font color = #FF00FF>You are dressed as a bimbo</font>'
@@ -526,7 +526,7 @@ elseif $clothingworntype = 'office':
 		$stat_clothes_style = 'office_eb'
 	elseif (CloExhibit >= 40 or CloThinness = 6) and (PCloBimbo = 0 or cheatBimbo = 1):
 		$stat_clothes_msg = 'You are wearing an exhibitionist office dress.'
-		$$stat_clothes_tooltip = 'Exhibitionist office dress.'
+		$stat_clothes_tooltip = 'Exhibitionist office dress.'
 		$stat_clothes_style = 'office_e'
 	elseif PCloBimbo = 1 and cheatBimbo = 0:
 		$stat_clothes_text = '<BR><font color = #FF00FF>You are dressed as a bimbo</font>'
@@ -604,7 +604,7 @@ else
 		$stat_clothes_style = 'clothes_eb'
 	elseif (CloExhibit >= 40 or CloThinness = 6) and (PCloBimbo = 0 or cheatBimbo = 1):
 		$stat_clothes_msg = 'You are wearing exhibitionist clothes.'
-		$$stat_clothes_tooltip = 'Exhibitionist outfit.'
+		$stat_clothes_tooltip = 'Exhibitionist outfit.'
 		$stat_clothes_style = 'clothes_e'
 	elseif PCloBimbo = 1 and cheatBimbo = 0:
 		$stat_clothes_text = '<BR><font color = #FF00FF>You are dressed as a bimbo</font>'
@@ -1353,9 +1353,9 @@ if cheatStatusIcons = 0:
 		$statusIconBarTab += '<td><a href="exec:msg $stat_smoker_msg"><img title="<<$stat_smoker_msg>>" height = 54 src="images/system/icon/status_icons/cigarettes.png"></a></td>'
 	end
 
-	if smoker >= 20 and NarkImmune = 0 and smokerNeed > 0 and siga > 0:
+	if smoker >= 20 and NarkImmune = 0 and smokerNeed > 20 and siga > 0:
 		$statusIconBarTab += '<td><a href="exec: gs ''drugs'',''smoke'' & ''You are smoking a cigarette.''"><img title="You really need to smoke, click to smoke a cigarette." height = 54 src="images/system/icon/status_icons/craving_nicotine.png"></a></td>'
-	elseif smoker >= 20 and NarkImmune = 0 and smokerNeed > 0 and siga <= 0:
+	elseif smoker >= 20 and NarkImmune = 0 and smokerNeed > 20 and siga <= 0:
 		$statusIconBarTab += '<td><a href="exec:msg ''You really need to smoke, but you have no cigarettes.''"><img title="You really need to smoke, but you have no cigarettes." height = 54 src="images/system/icon/status_icons/craving_nicotine.png"></a></td>'
 	elseif siga > 0:
 		$statusIconBarTab += '<td><a href="exec: gs ''drugs'',''smoke'' & ''You are smoking a cigarette.''"><img title="Click to smoke a cigarette." height = 54 src="images/system/icon/status_icons/smoke_cigarette.png"></a></td>'