Explorar el Código

[fixes] Small fixes

julzor hace 5 años
padre
commit
79f284d2d5

+ 19 - 21
locations/ParChurch.qsrc

@@ -29,28 +29,28 @@ if $ARGS[0] = 'start':
 	'Vigil is held Saturdays at 19h.'
 	'The Divine Liturgy is on Sundays between 9h and 12h.'
 
-	if Churchbad = 3 and Churchbadtime > daystart:
-		cla
-		'The priest is probably still mad at you. You decide to avoid him for now.'
-		act 'Go to the residential area':minut += 5 & gt 'pavResidential'
-		act 'Go to the commercial area':minut += 10 & gt 'pavCommercial'
-!!	exit
-
-	elseif Churchbad = 3 and Churchbadtime <= daystart:
-		Churchbad = 2
-		'"You figure that the priest has probably calmed down enough by now that you could talk to him."'
-	end
+	act 'Go to the residential area':minut += 5 & gt 'pavResidential'
+	act 'Go to the commercial area':minut += 10 & gt 'pavCommercial'
+	
 	if week = 6 and hour >=19 and hour <= 22 and churchday ! daystart:
 		act 'Attend vigil': gt 'ParChurch', 'vigil'
 	elseif week = 7 and hour >= 9 and hour < 12 and churchday ! daystart:
 		act 'Attend Divine Liturgy': gt 'ParChurch' , 'liturgy'
 	else
-		act 'Enter the church': gt 'ParChurch' , 'Narthex'
-		!!act 'Go to the cemetery': gt 'ParChurch' , 'cemetery'
+		if Churchbad = 3 and Churchbadtime > daystart:
+			cla & nl
+			'The priest is probably still mad at you. You decide to avoid him for now.'
+			act 'Go to the residential area':minut += 5 & gt 'pavResidential'
+			act 'Go to the commercial area':minut += 10 & gt 'pavCommercial'
+		elseif Churchbad = 3 and Churchbadtime <= daystart:
+			Churchbad = 2
+			*nl
+			'"You figure that the priest has probably calmed down enough by now that you could talk to him."'
+			act 'Enter the church': gt 'ParChurch' , 'Narthex'
+		else
+			act 'Enter the church': gt 'ParChurch' , 'Narthex'
+		end
 	end
-	
-	act 'Go to the residential area':minut += 5 & gt 'pavResidential'
-	act 'Go to the commercial area':minut += 10 & gt 'pavCommercial'
 end
 
 if $ARGS[0] = 'vigil':
@@ -277,13 +277,11 @@ if $ARGS[0] = 'pray':
 			*clr & cla
 			menu_off = 1
 			Churchbad += 2
-			gs 'fame', 'pav', 'sex', 1
-			gs 'fame', 'pav', 'prostitute', 1
+			gs 'fame', 'pav', 'sex', 2
+			gs 'exhibitionism', 2
+			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/church/ch_prayingflash.jpg"></center>'
 			'While you''re praying, you get a devious idea. With a sly smile, you expose your butt, giving anyone that looks your way the perfect view of your ass. Finally, you lower your head and pray in silence. Occasionally you can hear some whispers behind you but it only makes you smile.'
-			gs 'arousal', 'flash', 10, 'exhibitionism'
-			gs 'arousal', 'end'
-			gs 'stat'
 			act 'Return to Narthex': gt 'ParChurch', 'Narthex'
 		end
 	end

+ 10 - 8
locations/ParChurch2.qsrc

@@ -209,18 +209,25 @@ if $ARGS[0] = 'confession':
 			'"No, nothing, Father. My mind is going blank. I''m very sorry." you say, "Except, I did something that maybe I shouldn''t have."'
 			'"And what was that thing, my child." the priest encourages you gently, "Remember, Jesus already knows, you merely need to acknowledge your sins in His presence to be forgiven."'
 			'You hesitantly tell the priest how you masturbated <<stat[''hj'']>> guys. It was difficult at first, but you feel better almost right away.'
+			act 'Finish':
+				*clr & cla
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/church/confession.jpg"></center>'
+				'After confessing, Father Kirill kneels next to you and drapes the end of his stole over your head. Together, you chant the prayer of absolution. Father Kirill admonishes you to be a good girl and tells you to come back to see him anytime you feel the need.'
+				act 'Return to Narthex': gt 'ParChurch', 'Narthex'
+			end
 			if Kirill_Crpt <= 20:
 				'"Such acts should be reserved for the marital bed, child. Do not fear that your soul has been stained by your actions, however such behavior may lead to greater sins in the future." the priest scolded you as he draped his stole over your head and began the Prayer of Absolution.'
 			elseif Kirill_Crpt <= 60:
 				'"Such experimentation is to be expected, child. Do not fear that your soul has been stained by your actions, however you must be sure to inform me of such acts lest they lead to greater sins in the future." the priest scolded you as he draped his stole over your head and began the Prayer of Absolution.'
 			else
-				'"Hmmm." Father Kirill answered eagerly, "Such experimentation is to be expected, child. But I fear that your soul will become stained by your actions, if we do not purge this sin from you body at once."'
+				cla
+				'"Hmmm." Father Kirill answers eagerly, "Such experimentation is to be expected, child. But I fear that your soul will become stained by your actions, if we do not purge this sin from you body at once."'
 				'You feel yourself grow concerned maybe their is something to this after all. "How can we do that father?"'
 				'He licks his lips a moment. "I will give of myself and absorb your lust, so that you have no desire to lay your hands upon others."'
-				act 'Let the father slake your lust with his body': gt 'ParChurch2', 'hj'
 				gs 'willpower', 'hj'
 				if will_cost <= pcs_willpwr:
 					act 'Refuse to give the father a hand job (<<will_cost>> Willpower)':
+						*clr & cla
 						gs 'willpower', 'resist'
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/church/confession.jpg"></center>'
@@ -236,12 +243,7 @@ if $ARGS[0] = 'confession':
 				else
 					'<br>You don''t have enough willpower to refuse.'
 				end
-			end
-			act 'Finish':
-				*clr & cla
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/church/confession.jpg"></center>'
-				'After confessing, Father Kirill kneels next to you and drapes the end of his stole over your head. Together, you chant the prayer of absolution. Father Kirill admonishes you to be a good girl and tells you to come back to see him anytime you feel the need.'
-				act 'Return to Narthex': gt 'ParChurch', 'Narthex'
+				act 'Let the father slake your lust with his body': gt 'ParChurch2', 'hj'
 			end
 		end
 	end

+ 7 - 7
locations/beverage.qsrc

@@ -182,7 +182,7 @@ if $ARGS[0] = 'bev_tea':
 end
 
 if $ARGS[0] = 'bev_vod':
-	if pcs_health > 50:
+	if pcs_health > 20:
 		*clr & cla
 		minut += 15
 		money -= val($_drink['<<args[1]>>,price'])
@@ -205,7 +205,7 @@ if $ARGS[0] = 'bev_vod':
 end
 
 if $ARGS[0] = 'bev_bla':
-	if pcs_health > 50:
+	if pcs_health > 20:
 		*clr & cla
 		minut += 15
 		pcs_mood += 10
@@ -228,7 +228,7 @@ if $ARGS[0] = 'bev_bla':
 end
 
 if $ARGS[0] = 'bev_sco':
-	if pcs_health > 50:
+	if pcs_health > 20:
 		*clr & cla
 		minut += 15
 		money -= val($_drink['<<args[1]>>,price'])
@@ -251,7 +251,7 @@ if $ARGS[0] = 'bev_sco':
 end
 
 if $ARGS[0] = 'bev_win':
-	if pcs_health > 50:
+	if pcs_health > 20:
 		*clr & cla
 		minut += 15
 		money -= val($_drink['<<args[1]>>,price'])
@@ -274,7 +274,7 @@ if $ARGS[0] = 'bev_win':
 end
 
 if $ARGS[0] = 'bev_mar':
-	if pcs_health > 50:
+	if pcs_health > 20:
 		*clr & cla
 		minut += 15
 		money -= val($_drink['<<args[1]>>,price'])
@@ -298,7 +298,7 @@ if $ARGS[0] = 'bev_mar':
 end
 
 if $ARGS[0] = 'bev_cha':
-	if pcs_health > 50:
+	if pcs_health > 20:
 		*clr & cla
 		minut += 15
 		money -= val($_drink['<<args[1]>>,price'])
@@ -321,7 +321,7 @@ if $ARGS[0] = 'bev_cha':
 end
 
 if $ARGS[0] = 'bev_bee':
-	if pcs_health > 50:
+	if pcs_health > 20:
 		*clr & cla
 		minut += 15
 		money -= val($_drink['<<args[1]>>,price'])

+ 9 - 17
locations/brothel.qsrc

@@ -42,15 +42,10 @@ if dbg = 1:
 	'caneFeetCount '+caneFeetCount
 end
 
-if orgasmMeter > 100:
-	orgasmMeter = 100
-end
-
-if rageMeter > 100:
-	rageMeter = 100
-end
+if orgasmMeter > 100: orgasmMeter = 100
+if rageMeter > 100: rageMeter = 100
 
-payRate = 2000
+payRate = 1000
 
 if $ARGS[0] = 'lobby':
 	$menu_loc = 'brothel'
@@ -67,7 +62,7 @@ if $ARGS[0] = 'lobby':
 	'Alongside the windows are tables, each for about four to six people.'
 	nroad = 20
 	act 'Leave the hotel':gt 'road'
-	act 'Visit the Hotel bar': gt 'brothel', 'bar'
+	act 'Visit the hotel bar': gt 'brothel', 'bar'
 	act 'Visit the bathroom': gt 'brothel', 'lobby:toilet'
 end
 
@@ -141,7 +136,7 @@ if $ARGS[0] = 'bar:sit':
 	*nl
 	minut += 15
 	gs 'stat'
-	if alko > 6 and abdCh <= prob_abdCh and hotelWhore = 0:
+	if alko >= 6 and abdCh <= prob_abdCh and hotelWhore = 0:
 		'You take a seat behind the bar, looking around at the few guests sitting around the dining room.'
 		'You are too drunk to sit up straight, instead, you rest your head on the bar, mumbling incoherently'
 		'The barman was obviously waiting for this moment.'
@@ -175,7 +170,7 @@ if $ARGS[0] = 'bar:order':
 	*nl
 	'You signal to the barman that you want something.'
 	'"What would you like miss?"'
-	if alko > 6 and abdCh <= prob_abdCh and hotelWhore = 0:
+	if alko >= 6 and abdCh <= prob_abdCh and hotelWhore = 0:
 		*nl
 		'You try to order another drink, but as you faint all that gets out of your mouth is some drunken babble..'
 		'The barman was obviously waiting for this moment.'
@@ -183,9 +178,6 @@ if $ARGS[0] = 'bar:order':
 		'On the way you briefly regain consciousness from time to time, realizing that you are carried somewhere upstairs to what seems as one of the hotel rooms.'
 		act 'Continue':gt 'brothel', 'abducted'
 	else
-		! if hotelWhore = 1:
-			! act 'Order a Blue-blooded Russian.':gt 'brothel','bar:order:password'
-		! end
 		act 'Cancel order':gt 'brothel', 'bar'
 		act 'Order from the menu (0:05)': gs 'food_menu'
 	end
@@ -467,11 +459,11 @@ if $ARGS[0] = 'brothel:getPaid':
 	menu_off = 1
 	hours = custTime / 60
 	pay = custTime * payRate / 60
-	money += pay / 2
+	money += pay
 	gs 'stat'
 	'<h3>Brothel Reception</h3>'
 	'The Receptionist checks something in his book. Probably counting the time you spent working.'
-	'He looks up, smiles at you and says <font color=#<<$rec_font>>>"So <<$pcs_firstname>> you have whored for <<custTime>> minutes, that makes <<pay>> RUB."</font>'
+	'He looks up, smiles at you and says <font color=#<<$rec_font>>>"So <<$pcs_firstname>> you have whored for <<custTime>> minutes, that makes <<pay>> <b>₽</b>."</font>'
 	custTime = 0
 	act 'Thank him and leave': gt 'brothel', 'brothel:reception'
 end
@@ -531,7 +523,7 @@ if $ARGS[0] = 'brothel:section1:girlroom':
 	' 3) The Slave will not be injured in such way that requires hospitalisation or leaves a lasting injury, unless the Slave agrees to such practice voluntarily.'
 	' 4) Each session is for safety purposes recorded on a camera. The record is ownership of the Organization.'
 	' 5) The Master can hide his/her identity by wearing a mask.'
-	' 6) The Slave earns a pay of '+payRate+' RUB for every started hour of a session. The house takes 50% for expenses.'
+	' 6) The Slave earns a pay of '+payRate+' <b>₽</b> for every started hour of a session.'
 	*nl
 	'To begin your work, clean yourself, put on at least vibrant makeup, lip balm, brush your hair and strip of all clothes, then go to the lobby and lock yourself in a cage.'
 	*nl

+ 108 - 188
locations/gdktoilet.qsrc

@@ -48,22 +48,14 @@ if $ARGS[0] = 'start':
 		end
 	end
 
-	if hour >= 8 and hour <= 18:
-		act 'Go to the library': gt 'gdkbibl'
-	end
-
-	if hour >= 12 and hour <= 20:
-		act 'Go upstairs to the hobby clubs': gt 'gdkkru'
-	end
-
-	if hour >= 14 and hour <= 20:
-		act 'Go to the gym': gt 'gdksport', 'start'
-	end
+	if hour >= 8 and hour <= 18: act 'Go to the library': gt 'gdkbibl'
+	if hour >= 12 and hour <= 20: act 'Go upstairs to the hobby clubs': gt 'gdkkru'
+	if hour >= 14 and hour <= 20: act 'Go to the gym': gt 'gdksport', 'start'
 end
 
 if $ARGS[0] = 'mens_entrance_events':
 	menu_off = 1
-	temp = RAND(1,100)
+	temp = rand(1,100)
 !!Gloryhole1
 	if temp >= 80:
 		'<center><b><font color="maroon">Men''s Room</font></b></center>'
@@ -115,7 +107,6 @@ if $ARGS[0] = 'mens_entrance_events':
 						*clr & cla
 						gs 'stat'
 						pcs_mood += 15
-						pcs_willpwr += 15
 						pcs_vag += 1
 						'<center><b><font color="maroon">Men''s Room</font></b></center>'
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/bathroom/mens/sex/masturbate.jpg"></center>'
@@ -134,6 +125,7 @@ if $ARGS[0] = 'mens_entrance_events':
 								act 'Give In': gt'gdktoilet', 'mensglory'
 							else
 								*clr & cla
+								gs 'arousal', 'end'
 								gs 'stat'
 								'<center><b><font color="maroon">Men''s Room</font></b></center>'
 								'<center><img <<$set_imgh>> src="images/pc/fuckoff2.jpg"></center>'
@@ -141,13 +133,14 @@ if $ARGS[0] = 'mens_entrance_events':
 								act 'Leave': gt'gdktoilet', 'start'
 							end
 						else
-							act 'Leave': gt'gdktoilet', 'start'
+							act 'Leave': gs 'arousal', 'end' & gt'gdktoilet', 'start'
 						end
 					end
 				else
 					gs 'stat'
 					'You look at his naked body and you wonder who''s on the other side. You feel a little turned on by the man''s naked body. You decide to leave.'
 					gs 'arousal', 'voyeur', 10
+					gs 'arousal', 'end'
 					gs 'stat'
 					act 'Leave': gt'gdktoilet', 'start'
 				end
@@ -158,7 +151,6 @@ if $ARGS[0] = 'mens_entrance_events':
 				act 'Leave': gt'gdktoilet', 'start'
 			end
 		end
-!!Sonia
 	elseif temp >= 50 and temp <=79 and soniaPS >= 1 and hour >= 20 and hour <=23:
 		pcs_horny += 5
 		minut += 5
@@ -171,13 +163,13 @@ if $ARGS[0] = 'mens_entrance_events':
 			gs 'stat'
 			'You feel excited as you watch Sonia. You decide to leave before you are noticed.'
 			gs 'arousal', 'voyeur', 5
+			gs 'arousal', 'end'
 			gs 'stat'
 			act 'Leave': gt'gdktoilet', 'start'
 		else
 			'You decide to leave before you are noticed.'
 			act 'Leave': gt'gdktoilet', 'start'
 		end
-!!Ivan and Vicky
 	elseif temp >= 40 and temp <= 45 and hour >= 20 and hour <=23:
 		*clr & cla
 		pcs_horny += 10
@@ -187,23 +179,23 @@ if $ARGS[0] = 'mens_entrance_events':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/bathroom/mens/bathroom_mens.jpg"></center>'
 		'You look inside the men''s restroom and hear a couple having sex in one of the stalls. You wonder who''s inside and then decide to leave. While you turn away you hear them stop and the stall slams open moments later hearing giggling from some women. While you''re outside you see Ivan and Vicky leave the men''s restroom and walk out into the crowd.'
 		gs 'arousal', 'voyeur', 10
+		gs 'arousal', 'end'
 		gs 'stat'
 		act 'Leave': gt'gdktoilet', 'start'
-!!Gopnik''s:
 	elseif temp >= 30 and temp <= 39 and hour >= 20 and hour <=23:
 		*clr & cla
 		gs 'stat'
 		'<center><b><font color="maroon">Men''s Room</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/bathroom/mens/sex/gangbangbath.jpg"></center>'
 		'You look inside the men''s restroom and see Vitek, Dan, Vasily, and one other you don''t recongnize and someone else under some woman getting pounded.'
-		gs 'arousal', 'voyeur', 5
-		gs 'stat'
 		if pcs_vag > 0 and pcs_ass > 0:
 			pcs_horny += 30
 			'Your pussy starts to itch. You wish you were that woman in between all those horny men taking it in all your holes. The feeling of excitement is enough to make you want to masturbate in the hallway but you decide to leave before your feelings become too much.'
 		end
+		gs 'arousal', 'voyeur', 5
+		gs 'arousal', 'end'
+		gs 'stat'
 		act 'Leave': gt'gdktoilet', 'start'
-!!Dimka:
 	elseif temp >= 20 and temp <= 29 and hour >= 20 and hour <=23:
 		*clr & cla
 		minut += 5
@@ -246,18 +238,19 @@ if $ARGS[0] = 'mens_entrance_events':
 						act 'Continue':
 							*clr & cla
 							pcs_mood += 15
-							pcs_willpwr += 15
 							sub += 5
-							spafinloc = 3
-							guy += 1
+							if npc_sex['A1'] = 0: npc_sex['A1'] = 1 & guy += 1
 							girl += 1
 							minut += 10
-							gs 'cum_manage'
+							gs 'cum_call', 'anus', 'A1', 1
 							gs 'stat'
 							'<center><b><font color="maroon">Men''s Room</font></b></center>'
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/bathroom/mens/sex/threesomeanalcum.jpg"></center>'
 							'Starting to pound your ass harder, Dimka starts to grunt as he shoots his load in your ass. Pulling out his warm liquid flows out your ass spilling onto the girls face. He takes his dick and puts it in her mouth saying, "Clean the rest of this up slut and don''t forget to clean my bitch too." The girl starts to lick your ass clean. She is really good at it and you begin to have another orgasm. You finish and decide to get up and get dressed. Dimka pleased with your behaviour tells you, "You should come by my house more often, slave."'
 							$orgasm_or = 'yes'
+							cumspclnt = 15
+							gs 'cum_cleanup'
+							gs 'arousal', 'end'
 							gs 'stat'
 							act 'Leave': gt'gdktoilet', 'start'
 						end
@@ -267,12 +260,9 @@ if $ARGS[0] = 'mens_entrance_events':
 		else
 			act 'Leave': gt'gdktoilet', 'start'
 		end
-!!No Event/With Gloryhole2:
 	else
-		*clr & cla
 		minut += 1
-		temp = RAND(1,2)
-		gs 'stat'
+		temp = rand(1,2)
 		gt 'gdktoilet', 'mens'
 	end
 end
@@ -317,6 +307,7 @@ if $ARGS[0] = 'mens':
 		'You look at the hole and see a girl fingering her pussy. You feel your pussy moisten and start to itch.'
 		gs 'arousal', 'voyeur', 5
 		gs 'stat'
+		act 'Move away': minut += 1 & gt'gdktoilet', 'mens'
 		if pcs_horny >=50:
 			act 'Masturbate':
 				cla
@@ -327,12 +318,6 @@ if $ARGS[0] = 'mens':
 				act 'start': gt 'gdktoilet', 'mensmast'
 			end
 		end
-		act 'Move away':
-			*clr & cla
-			minut += 1
-			gs 'stat'
-			gt'gdktoilet', 'mens'
-		end
 	end
 	
 	dynamic $tampon
@@ -342,18 +327,15 @@ if $ARGS[0] = 'mens':
 end
 
 if $ARGS[0] = 'mensmast':
+	*clr & cla
 	minut += 2
 	pcs_horny += 5
 	pcs_mood += 5
 	menu_off = 1
 	gs 'stat'
 	if picrand = 1:
-		*clr & cla
-		gs 'stat'
 		'<center><video autoplay loop src="images/locations/pavlovsk/community/bathroom/womens/sex/caress1.mp4"></video></center>'
 	else
-		*clr & cla
-		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/shared/sex/mast/mastr.jpg"></center>'
 	end
 	if pcs_horny <= 60:
@@ -369,7 +351,6 @@ if $ARGS[0] = 'mensmast':
 		act 'Climax':
 			*clr & cla
 			pcs_mood += 15
-			pcs_willpwr += 15
 			minut += 5
 			if pcs_inhib < 30: inhib_exp += rand(1,3)
 			gs 'stat'
@@ -386,7 +367,7 @@ if $ARGS[0] = 'mensmast':
 				'You grab some toilet paper and clean off your now wet clit. You think to yourself, "I hope nobody heard that."'
 				if rand(1, 100) >= 80:
 					gs 'npcgeneratec', 0, 'guy from the men''s bathroom', rand(19,45)
-					npc_dick[$npclastgenerated] = RAND(10,24)
+					npc_dick[$npclastgenerated] = rand(10,24)
 					gs 'boyStat', $npclastgenerated
 					'You look up and notice the stall door opens. Right then a man in an orange jumpsuit walks in. He tells you, "Do you know where you are?" Unable to respond after your intense orgasm the man unzips his jumpsuit and takes out his <<npc_dick[$npclastgenerated]>>cm dick and places it near your mouth.'
 					if pcs_dom >= 20:
@@ -420,7 +401,6 @@ if $ARGS[0] = 'mensmast':
 							act 'Climax again':
 								*clr & cla
 								pcs_mood += 15
-								pcs_willpwr += 15
 								minut += 5
 								spafinloc = 11
 								facial += 1
@@ -482,9 +462,8 @@ if $ARGS[0] = 'mensglory':
 			gs 'arousal', 'vaginal_finger', 5, 'sub', 'rough'
 			gs 'stat'
 			act 'Turn Around':
-				pcs_mood += 15
-				pcs_willpwr += 15
 				*clr & cla
+				pcs_mood += 15
 				gs 'stat'
 				'<center><video autoplay loop src="images/locations/pavlovsk/community/bathroom/mens/sex/4standmiss.mp4"></video></center>'
 				'He suddenly pulls out of you and roughly turns you back around, and picks you up. You spread your legs and he lowers you back down, till you feel his <<$dick_girth>> dick slide back inside of your pussy. He carries you, fucking you the whole time, you are impressed by his strength, as he manages to not only carry you, but fuck you at the same time. He slams your back roughly but not painfully onto an open stall door and presses your body against it, then he starts fucking you in harder. It seems he is nowhere near ready to cum.'
@@ -492,61 +471,52 @@ if $ARGS[0] = 'mensglory':
 				gs 'arousal', 'vaginal', 5, 'sub', 'rough'
 				gs 'stat'
 				act 'Suck':
-					pcs_throat += 1
 					*clr & cla
 					gs 'stat'
 					'<center><video autoplay loop src="images/locations/pavlovsk/community/bathroom/mens/sex/5blowjob.mp4"></video></center>'
 					'After some time, he pulls out of you and lets you down, you think he is getting a bit tired from holding you up. He leans back on the counter as you bend over and start to suck his dick. He puts his hand on your head and grabs and handful of hair, he pushes your head down while you suck his <<npc_dick[$npclastgenerated]>>cm dick. His hands hold onto your hair, keeping your from pulling away. Not that you would, you are excited and love sucking his dick.'
 					gs 'arousal', 'bj', 5, 'sub', 'rough', 'deepthroat'
 					gs 'stat'
-					if rand(1, 2) = 1:
+					if rand(1,2) = 1:
 						act 'Pull away':
-							minut +=5
-							gs 'stat'
 							*clr & cla
+							minut +=5
+							gs 'cum_call', 'mouth', 'guy from the men''s bathroom'
+							gs 'arousal', 'end'
+							gs 'stat'							
 							'<center><video autoplay loop src="images/shared/sex/cum/mouth/cum1,1.mp4"></video></center>'
 							'You pull away right before he cums. You start to stroke his dick and you open your mouth. His hot load fills your mouth, it tastes salty and warm.'
 							act 'Swallow':
-								minut +=5
-								swallow += 1
-								spafinloc = 12
 								*clr & cla
-								gs 'cum_manage'
+								minut += 5
+								swallow += 1
 								gs 'stat'
 								'<center><video autoplay loop src="images/shared/sex/cum/mouth/cum1,1.mp4"></video></center>'
 								'You decide to swallow his cum. The man says, "You are much better than that hole in the wall." You smile and nod to him and get dressed. You leave the bathroom feeling satisfied and relaxed.'
 								act 'Leave': gt'gdktoilet', 'start'
 							end
 							act 'Spit':
-								minut +=5
-								spafinloc = 10
-								gs 'cum_manage'
-								spafinloc = 14
-								gs 'cum_manage'
 								*clr & cla
+								minut +=5								
 								gs 'stat'
 								'<center><video autoplay loop src="images/locations/pavlovsk/community/bathroom/mens/sex/cumspit.mp4"></video></center>'
-								'You spit out his cum which spills all over your body. The man says, "You don''t like the taste of cum?" You don''t respond and get up to get dressed and leave.'
+								'You spit out his cum which. The man says, "You don''t like the taste of cum?" You don''t respond and get up to get dressed and leave.'
 								act 'Leave': gt'gdktoilet', 'start'
 							end
 						end
 					else
 						act 'Keep sucking':
+							*clr & cla
+							minut += 5
+							swallow += 1
+							gs 'cum_call', 'mouth', 'guy from the men''s bathroom'
+							gs 'arousal', 'end'
+							gs 'stat'
 							if pcs_throat <= 25:
-								minut +=5
-								spafinloc = 12
-								gs 'cum_manage'
-								gs 'stat'
-								*clr & cla
 								'<center><video autoplay loop src="images/shared/sex/blowjob/kotovbj91.mp4"></video></center>'
 								'You keep sucking taking in his entire dick. You stop when you feel his hard penis throbbing as a warm liquid fills your throat. You pull out his penis from your mouth making sure to not let any get spilled. The man says, "You are much better than that hole in the wall." You smile and nod to him and get dressed. You leave the bathroom feeling satisfied and relaxed.'
 								act 'Leave': gt'gdktoilet', 'start'
 							else
-								minut +=5
-								spafinloc = 12
-								gs 'cum_manage'
-								gs 'stat'
-								*clr & cla
 								'<center><video autoplay loop src="images/shared/sex/blowjob/kotovbj26.mp4"></video></center>'
 								'Unable to continue to fit his entire penis inside your mouth you keep sucking the tip of his dick until you feel his hard penis throbbing as a warm liquid fills the back of your mouth. You pull out his penis from your mouth making sure to not let any get spilled. The man says, "You are much better than that hole in the wall." You smile and nod to him and get dressed. You leave the bathroom feeling satisfied and relaxed.'
 								act 'Leave': gt'gdktoilet', 'start'
@@ -557,17 +527,14 @@ if $ARGS[0] = 'mensglory':
 							'<center><video autoplay loop src="images/locations/pavlovsk/community/bathroom/mens/sex/6cowgirl.mp4"></video></center>'
 							'He yanks your head away, as he turns and lays down on the floor, on his back. He pulls you down on top of him, you straddle him and take his dick back into your pussy and you start to ride him. With out warning you feel him thrusting hard as he groaned. You feel warmth deep inside your pussy.'
 							gs 'arousal', 'vaginal', 5, 'sub', 'rough'
+							gs 'arousal', 'end'
 							gs 'stat'
-							if pcs_vag < dick: pcs_vag += 1
-							gs 'stat'
-							if prezik >= 1:
+							if prezik > 0:
 								if sexcontra = 4:
 									act 'Get up':
 										*clr & cla
-										spafinloc = 0
-										if pcs_vag < dick: pcs_vag += 1
 										gs 'fame', 'pav', 'sex', 5
-										gs 'cum_manage'
+										gs 'cum_call', 'vaginal', 'guy from the men''s bathroom'
 										gs 'stat'
 										'<center><video autoplay loop src="images/locations/pavlovsk/community/bathroom/mens/sex/misscream.mp4"></video></center>'
 										'You pull off him, getting up and looking down at him. That is when you noticed your pussy dripping cum all over his penis. The man unable to move breathing heavily. The man replies, "I thought it felt better then it should''ve been." '
@@ -578,10 +545,7 @@ if $ARGS[0] = 'mensglory':
 								else
 									act 'Get up':
 										*clr & cla
-										spafinloc = 17
-										if pcs_vag < dick: pcs_vag += 1
 										gs 'fame', 'pav', 'sex', 5
-										gs 'cum_manage'
 										gs 'stat'
 										'<center><img <<$set_imgh>> src="images/shared/sex/cum/cum61.jpg"></center>'
 										'You pull off him, getting up and looking down at him. The man unable to move breathing heavily. He continues to breath heavily and says, "You were great, perhaps we''ll meet again." He gets up and gets dressed, that is when you finally notice the other men watching. You quickly get dressed and feel embarrassed you didn''t notice them before, leaving while your blushing.'
@@ -592,11 +556,9 @@ if $ARGS[0] = 'mensglory':
 								if sexcontra = 2:
 									act 'Complain':
 										*clr & cla
-										spafinloc = 0
-										if pcs_vag < dick: pcs_vag += 1
-										gs 'cum_manage'
-										gs 'stat'
 										gs 'fame', 'pav', 'sex', 5
+										gs 'cum_call', 'vaginal', 'guy from the men''s bathroom'
+										gs 'stat'
 										'<center><video autoplay loop src="images/locations/pavlovsk/community/bathroom/mens/sex/misscream.mp4"></video></center>'
 										'You pull off him, getting up and looking down at him and say, "Why didn''t you tell me you were going to cum?" The man replies, "Sorry I was trying to hold back and thought I could, didn''t you say you were on the pill?" You reply, "Yeah, but still you could''ve told me. Now I will have to clean up." He continues to breath heavily and says, "Was it really that bad?" He smirks at you, "You were great, perhaps we''ll meet again and next time use no condoms again." He gets up and gets dressed, that is when you finally notice the other men watching. You stop trying to clean yourself and quickly get dressed. You feel embarrassed you didn''t notice them before, leaving while you''re blushing.'
 										act 'Leave': gt'gdktoilet', 'start'
@@ -604,11 +566,8 @@ if $ARGS[0] = 'mensglory':
 								else
 									act 'Complain':
 										*clr & cla
-										spafinloc = 0
-										if pcs_vag < dick: pcs_vag += 1
-										gs 'cum_manage'
-										gs 'stat'
 										gs 'fame', 'pav', 'sex', 5
+										gs 'cum_call', 'vaginal', 'guy from the men''s bathroom'
 										'<center><video autoplay loop src="images/locations/pavlovsk/community/bathroom/mens/sex/misscream.mp4"></video></center>'
 										'You pull off him, getting up and looking down at him and say, "Why didn''t you tell me you were going to cum?" The man replies, "Sorry I was trying to hold back and thought I could, didn''t you say you were on the pill?" You reply, "No. What am I going to do if I get pregnent?" He continues to breath heavily and says, "Don''t worry, I''m sure you won''t get pregnant from just this one time. You were great, perhaps we''ll meet again and maybe use some protection." He gets up and gets dressed, that is when you finally notice the other men watching. You quickly get dressed and feel embarrassed you didn''t notice them before, leaving while you''re blushing.'
 										act 'Leave': gt'gdktoilet', 'start'
@@ -666,7 +625,7 @@ if $ARGS[0] = 'emptystall':
 			if pcs_inhib < 40:inhib_exp += rand(1,3)
 			*clr & cla
 			gs 'stat'
-			picrand = RAND(1,2)
+			picrand = rand(1,2)
 			if picrand = 1:
 				*clr & cla
 				gs 'stat'
@@ -689,41 +648,32 @@ if $ARGS[0] = 'emptystall':
 	act 'Look at the Hole': gt 'gdktoilet', 'hole'
 	act 'Get Up':
 		cla
-		gs 'stat'
 		'You decide not to look in the hole and leave.'
 		act 'Leave': gt'gdktoilet', 'womens'
 	end
 end
 
 if $ARGS[0] = 'contmast':
+	*clr & cla
 	pcs_mood += 5
 	menu_off = 1
-	gs 'stat'
 	if picrand = 1:
-		*clr & cla
-		gs 'stat'
 		'<center><video autoplay loop src="images/locations/pavlovsk/community/bathroom/womens/sex/caress1.mp4"></video></center>'
 	else
-		*clr & cla
-		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/shared/sex/mast/mastr.jpg"></center>'
 	end
 	if pcs_horny <= 60:
-		'You are starting to feel warm and you insert your finger in your pussy.'
-		gs 'arousal', 'masturbate', 5
-		gs 'stat'
+		'You are starting to feel warm and you insert your finger in your pussy.'	
 	else
 		'You are starting to feel warm and you insert your finger in your pussy. You keep fingering your pussy and before long you are breathing heavily and start to moan.'
-		gs 'arousal', 'masturbate', 5
-		gs 'stat'
 	end
+	gs 'arousal', 'masturbate', 5
+	gs 'stat'
 	if pcs_horny >= 90:
 		act 'Climax':
 			*clr & cla
 			pcs_mood += 15
-			pcs_willpwr += 15
-			if pcs_inhib < 40:inhib_exp += rand(1,3)
-			gs 'stat'
+			if pcs_inhib < 40: inhib_exp += rand(1,3)
 			'<center><video autoplay loop src="images/locations/pavlovsk/community/bathroom/womens/sex/orgasm.mp4"></video></center>'
 			$orgasm_or = 'custom'
 			$orgasm_txt = 'As your pussy gets wet you pulls you panties down and slip your fingers inside of yourself. You start finger fucking yourself, with in a few minutes a powerful orgasm rocks your body. Leaving you gasping and trembling as you recover.'
@@ -774,6 +724,11 @@ if $ARGS[0] = 'hole':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/bathroom/womens/sex/ghseemen.jpg"></center>'
 		'You look through the hole and see several men with their backs to you, using the urinals.'
+		act 'Don''t do it':
+			cla
+			'You move away from the hole reconsidering what you were about to do and quickly leave the stall.'
+			act 'Leave':gt 'gdktoilet', 'womens'
+		end
 		act 'Stick your finger in the hole':
 			*clr & cla
 			money += 100
@@ -784,8 +739,7 @@ if $ARGS[0] = 'hole':
 				'You put your finger in the hole hoping to entice a man to come over...'
 				'The man slips 100 <b>₽</b> into the hole, and then puts his erect cock through the hole.'
 				act 'Blow Him': gt 'gdktoilet', 'blowjob'
-			end
-			if gloryhole > 0:
+			elseif gloryhole > 0:
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/bathroom/womens/sex/ready.jpg"></center>'
 				'You poke your finger in the hole showing that you are ready to serve a man. Then you put your face close to the hole and open your mouth.'
 				'The stranger slips 100 <b>₽</b> into the hole, and then his erect cock pokes out of the hole.'
@@ -795,29 +749,21 @@ if $ARGS[0] = 'hole':
 				*clr & cla
 				'Seeing the dick poke through, you reconsider what you are about to do, do you really want to suck some strange man''s dick, through a hole in the bathroom for money?'
 				act 'Take his money and Leave':gt 'gdktoilet', 'rape'
-				act 'Give back the money and Leave':
-					money -= 100
-					gt 'gdktoilet', 'womens'
-				end
+				act 'Give back the money and Leave': money -= 100 & gt 'gdktoilet', 'womens'
 				act 'Blow Him': gt 'gdktoilet', 'blowjob'
 			end
 		end
-		act 'Move away':
-			cla
-			'You move away from the hole reconsidering what you were about to do and quickly leave the stall.'
-			act 'Leave':gt 'gdktoilet', 'womens'
-		end
 	else
 		*clr & cla
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/bathroom/womens/sex/ghseenomen.jpg"></center>'
 		'Looking through the hole, you can see a row of urinals on the other side. The hole must be to the men''s room next door. You don''t see any men currently in there.'
+		act 'Leave': gt 'gdktoilet', 'womens'
 		act 'Wait':
 			cla
 			'You decide stay and wait for someone to come.'
 			act 'Keep looking': gs 'gdktoilet', 'hole'
 		end
-		act 'Leave': gt 'gdktoilet', 'womens'
 	end
 end
 
@@ -829,14 +775,23 @@ if $ARGS[0] = 'virgin':
 		*clr & cla
 		'<center><video autoplay loop src="images/locations/pavlovsk/community/bathroom/womens/sex/eww.mp4"></video></center>'
 		'You shudder in disgust at the thought that you were just touching some stranger''s dick. You get up and quickly leave.'
-			act'Leave':gt 'gdktoilet', 'womens'
-		end
+		act'Leave':gt 'gdktoilet', 'womens'
+	end
+	
 	act 'Grab it':
 		*clr & cla
 		'<center><video autoplay loop src="images/locations/pavlovsk/community/bathroom/womens/sex/ghfeeling.mp4"></video></center>'
 		'Biting your lip and deciding you want to feel it some more, you reach over again and grab it. You caress it with your hand, it is harder than you expected and warm to the touch, it almost feels like it is throbbing in your hand. Unexplained feelings of excitement run through your body. You hear through the wall the guy saying, "Stop playing with it and stroke it." "Huh?" You reply, not knowing why he wants you to stroke it. He replies, "Really, you don''t know? Just grab it with your hand and slide it up and down."'
 		gs 'arousal', 'foreplay', 5, 'unknown'
 		gs 'stat'
+		act 'Stop':
+			*clr & cla
+			gs 'arousal', 'end'
+			gs 'stat'
+			'<center><video autoplay loop src="images/locations/pavlovsk/community/bathroom/womens/sex/eww.mp4"></video></center>'
+			'You let go of him, wondering what possessed you to grab some stranger''s dick in the first place. You quickly leave the stall, you can hear the guy. "Hey why did you stop?... Hello? Are you still there? What the fuck!"'
+			act 'Quickly get out': gt 'gdktoilet', 'womens'
+		end
 		act 'Slide your hand on his penis':
 			*clr & cla
 			gs 'stat'
@@ -846,10 +801,9 @@ if $ARGS[0] = 'virgin':
 			gs 'stat'
 			act 'Continue Stroking':
 				*clr & cla
-				spafinloc = 13
 				minut +=5
 				gs 'arousal', 'end'
-				gs 'cum_manage'
+				gs 'cum_call', 'hands', 'an unknown guy from the gloryhole'
 				gs 'stat'
 				'<center><video autoplay loop src="images/locations/pavlovsk/community/bathroom/womens/sex/ghmastcum.mp4"></video></center>'
 				'Without any warning, hot white liquid spurts out the tip of his penis. You look at your hands, watching the sperm run down the back of your hand and down onto your arm. The man panting says, "That was," he takes another breath, "That was great."'
@@ -857,34 +811,22 @@ if $ARGS[0] = 'virgin':
 				act 'Continue': gt 'gdktoilet', 'emptystall'
 			end
 		end
-		act 'Stop':
-			*clr & cla
-			gs 'arousal', 'end'
-			gs 'stat'
-			'<center><video autoplay loop src="images/locations/pavlovsk/community/bathroom/womens/sex/eww.mp4"></video></center>'
-			'You let go of him, wondering what possessed you to grab some stranger''s dick in the first place. You quickly leave the stall, you can hear the guy. "Hey why did you stop?... Hello? Are you still there? What the fuck!"'
-			act 'Quickly get out': gt 'gdktoilet', 'womens'
-		end
 	end
 end
 
 if $ARGS[0] = 'blowjob':
-	cla
-	*clr
+	*clr & cla
 	guy += 1
 	ghnow += 1
 	gloryhole += 1
-	pcs_throat += 1
-	sexcontra = 0
-	temp = rand(1, 3)
+	temp = rand(1,3)
 	'<center><video autoplay loop src="images/locations/pavlovsk/community/bathroom/womens/sex/ghbj<<temp>>.mp4"></video></center>'
 	'You wrap your lips around his dick and take his <<npc_dick[$npclastgenerated]>>cm long <<$npc_thdick[$npclastgenerated]>> cock in your mouth and start to suck it, you suck the cock enthusiastically.'
 	gs 'arousal', 'bj', 5, 'unknown', 'sub'
 	gs 'stat'
 	if stat['vaginal'] > 0 or stat['anal'] > 0:act 'Undress':gt 'gdktoilet', 'ghsex'
 	act 'Continue to Suck':
-		cla
-		*clr
+		*clr & cla
 		temp = rand(1, 3)
 		'<center><video autoplay loop src="images/locations/pavlovsk/community/bathroom/womens/sex/ghbj<<temp>>.mp4"></video></center>'
 		'You suck on his dick, bobbing your head, sometimes using your hands to stroke his shaft at the same time, other times your hands massage his balls. Before to long you hear the guy moan in pleasure, "I''m cuming."'
@@ -892,10 +834,9 @@ if $ARGS[0] = 'blowjob':
 		gs 'stat'
 		act 'Swallow':
 			*clr & cla
-			gs 'arousal', 'end'
 			swallow += 1
-			spafinloc = 12
-			gs 'cum_manage'
+			gs 'cum_call', 'mouth', 'an unknown guy from the gloryhole'
+			gs 'arousal', 'end'
 			gs 'stat'
 			'<center><video autoplay loop src="images/locations/pavlovsk/community/bathroom/womens/sex/ghswallow.mp4"></video></center>'
 			'Despite what he says you keep sucking his dick, you are looking forward to him filling your mouth up with his tasty sperm. Moments later hot spurts of cum fill your mouth, you savor the taste of it in your mouth, before you swallow it all down.'
@@ -903,10 +844,9 @@ if $ARGS[0] = 'blowjob':
 		end
 		act 'Step back':
 			*clr & cla
-			gs 'arousal', 'end'
-			spafinloc = 11
 			facial += 1
-			gs 'cum_manage'
+			gs 'cum_call', 'face', 'an unknown guy from the gloryhole'
+			gs 'arousal', 'end'
 			gs 'stat'
 			'<center><video autoplay loop src="images/locations/pavlovsk/community/bathroom/womens/sex/ghfacial.mp4"></video></center>'
 			'You pull your mouth off his dick but keep jerking him off, shortly later, hot spurts of cum start flying and covering your face.'
@@ -923,17 +863,12 @@ if $ARGS[0] = 'ghsex':
 	'You let go of him and quickly undress, once you are naked you start stroking him again while you line yourself up with his dick. You badly want to fuck him.'
 	gs 'arousal', 'hj', 5, 'unknown', 'sub'
 	gs 'stat'
-	if stat['anal'] > 0:
-		act 'Ass':gt 'gdktoilet', 'anal'
-	end
-	if stat['vaginal'] > 0:
-		act 'Pussy':gt 'gdktoilet', 'pussy2'
-	end
+	if stat['anal'] > 0: act 'Ass':gt 'gdktoilet', 'anal'
+	if stat['vaginal'] > 0: act 'Pussy':gt 'gdktoilet', 'pussy2'
 end
 
 if $ARGS[0] = 'anal':
-	cla
-	*clr
+	*clr & cla
 	'<center><video autoplay loop src="images/locations/pavlovsk/community/bathroom/womens/sex/ghintoass.mp4"></video></center>'
 	'You rub your wet pussy and get your fingers nice and wet and then rub it on your asshole, you do the same to his dick, then you guide his <<npc_dick[$npclastgenerated]>>cm <<$npc_thdick[$npclastgenerated]>> cock into your ass. You feel his dick enter your tight ass, feelings of pain and pleasure rush through you.'
 	gs 'arousal', 'masturbate', 5, 'unknown', 'sub'
@@ -946,28 +881,31 @@ if $ARGS[0] = 'anal':
 		'<center><video autoplay loop src="images/locations/pavlovsk/community/bathroom/womens/sex/ghanal.mp4"></video></center>'
 
 		if pcs_ass < 10:
-			pcs_ass += 2
-			agape = 2
 			'The pain doesn''t fade and instead it starts to hurt worse after a while and the pleasure starts to fade. You fuck his dick with your ass, at first taking him deeper and deeper, as you get faster and faster. As the pleasure fades and the pain gets worse you slow down and don''t take him as deep. you start to rub your clit to help with the sensation of pleasure. You consider stopping as the pain gets worse, but you can tell by the throbbing of his dick and ragged breathing he is about to cum and decided to keep it up so he can finish.'
 		elseif pcs_ass < 20:
-			pcs_ass += 1
-			agape = 1
 			'The pain fades slowly and soon all you feel pleasure. You fuck his dick with your ass, taking him deeper and deeper, as you get faster and faster, you start to rub your clit as you feel yourself getting close to climax. You can tell by the throbbing of his dick and ragged breathing he is about to cum.'
 		else
-			pcs_ass += 1
 			'The pain fades quickly and soon all you feel pleasure. You fuck his dick with your ass, taking him deeper and deeper, as you get faster and faster, you start to rub your clit as you feel yourself getting close to climax. You can tell by the throbbing of his dick and ragged breathing he is about to cum.'
-			gs 'arousal', 'anal', 5, 'unknown', 'sub'
+		end
+		gs 'arousal', 'anal', 5, 'unknown', 'sub'
+		gs 'stat'
+		
+		act 'Stop':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/bathroom/womens/sex/analpain.jpg"></center>'
+			'The pain gets to be to much and you can''t take it anymore, on the verge of tears you stop and pull your ass off his dick. You quickly get dressed and leave, you wonder if it was supposed to hurt that much. You can hear the guy yelling at you for having stopped before he finished.'
 			gs 'arousal', 'end'
 			gs 'stat'
-		end
 
+			act 'Leave': gt'gdktoilet', 'womens'
+		end
 		act 'Let him cum in your ass':
 			*clr & cla
-			spafinloc = 3
-			gs 'cum_manage'
+			gs 'cum_call', 'anus', 'an unknown guy from the gloryhole'
 			'<center><video autoplay loop src="images/locations/pavlovsk/community/bathroom/womens/sex/ghanalcream1.mp4"></video></center>'
 			'You feel his dick throb as he shoots his load of sperm deep in your ass, filling it up. When you pull your ass off his dick, you feel the hot sperm spilling out of your gaping asshole.'
 			gs 'arousal', 'anal', 10, 'unknown', 'sub'
+			minut -= 9
 			gs 'arousal', 'end'
 			gs 'stat'
 
@@ -975,11 +913,11 @@ if $ARGS[0] = 'anal':
 		end
 		act 'Let him cum all over your ass':
 			*clr & cla
-			spafinloc = 4
-			gs 'cum_manage'
+			gs 'cum_call', 'butt', 'an unknown guy from the gloryhole'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/bathroom/womens/sex/ghcumonass.jpg"></center>'
 			'You pull your ass away, feeling his cock slip out of your asshole, just as you feel hot splashing of cum landing on your butt, coating your cheeks and running down the crack of your ass.'
 			gs 'arousal', 'anal', 10, 'unknown', 'sub'
+			minut -= 9
 			gs 'arousal', 'end'
 			gs 'stat'
 
@@ -987,12 +925,12 @@ if $ARGS[0] = 'anal':
 		end
 		act 'Turn around, kneel and let him cum in your mouth':
 			*clr & cla
-			spafinloc = 12
 			swallow += 1
-			gs 'cum_manage'
+			gs 'cum_call', 'mouth', 'an unknown guy from the gloryhole'
 			'<center><video autoplay loop src="images/locations/pavlovsk/community/bathroom/womens/sex/ghswallow.mp4"></video></center>'
 			'Once down on your knees you take his dick into your mouth and start sucking him, tasting your own ass on his dick. But you are looking forward to him filling your mouth up with his tasty sperm. Moments later hot spurts of cum fill your mouth, you savor the taste of it in your mouth, before you swallow it all down.'
 			gs 'arousal', 'bj', 10, 'unknown', 'sub'
+			minut -= 9
 			gs 'arousal', 'end'
 			gs 'stat'
 
@@ -1000,27 +938,17 @@ if $ARGS[0] = 'anal':
 		end
 		act 'Turn around, kneel and let him cum on your face':
 			*clr & cla
-			spafinloc = 11
 			facial += 1
-			gs 'cum_manage'
+			gs 'cum_call', 'face', 'an unknown guy from the gloryhole'
 			'<center><video autoplay loop src="images/locations/pavlovsk/community/bathroom/womens/sex/ghfacial.mp4"></video></center>'
 			'You put your face near his dick and start jerking him off, shortly later, hot spurts of cum start flying and covering your face.'
 			gs 'arousal', 'hj', 10, 'unknown', 'sub'
+			minut -= 9
 			gs 'arousal', 'end'
 			gs 'stat'
 
 			act 'Get up': gt'gdktoilet', 'emptystall'
 		end
-		act 'Stop':
-			cla
-			*clr
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/bathroom/womens/sex/analpain.jpg"></center>'
-			'The pain gets to be to much and you can''t take it anymore, on the verge of tears you stop and pull your ass off his dick. You quickly get dressed and leave, you wonder if it was supposed to hurt that much. You can hear the guy yelling at you for having stopped before he finished.'
-			gs 'arousal', 'end'
-			gs 'stat'
-
-			act 'Leave': gt'gdktoilet', 'womens'
-		end
 	end
 end
 
@@ -1055,12 +983,12 @@ if $ARGS[0] = 'pussy2':
 	if protect ! 1:
 		act 'Allow him to cum inside':
 			*clr & cla
-			spafinloc = 0
-			gs 'cum_manage'
+			gs 'cum_call', 'vaginal', 'an unknown guy from the gloryhole'
 			'<center><video autoplay loop src="images/locations/pavlovsk/community/bathroom/womens/sex/ghcreampie.mp4"></video></center>'
 			'Instead of pulling away, you moan "Inside me, please," and push yourself hard against the opening in the wall. You feel his hot sperm fill your pussy in spurt after spurt. When you finally pull yourself off him, you can feel the sperm leaking out of your pussy.'
 			gs 'cuminsidereact', 'an unknown guy from the gloryhole'
 			gs 'arousal', 'vaginal', 10, 'unknown', 'sub'
+			minut -= 9
 			gs 'arousal', 'end'
 			gs 'stat'
 
@@ -1070,24 +998,24 @@ if $ARGS[0] = 'pussy2':
 			*clr & cla
 			act 'Let him cum in your mouth':
 				*clr & cla
-				spafinloc = 12
 				swallow += 1
-				gs 'cum_manage'
+				gs 'cum_call', 'mouth', 'an unknown guy from the gloryhole'
 				'<center><video autoplay loop src="images/locations/pavlovsk/community/bathroom/womens/sex/ghswallow.mp4"></video></center>'
 				'Once down on your knees you take his dick into your mouth and start sucking him. You are looking forward to him filling your mouth up with his tasty sperm. Moments later hot spurts of cum fill your mouth, you savor the taste of it in your mouth, before you swallow it all down.'
 				gs 'arousal', 'bj', 10, 'unknown', 'sub'
+				minut -= 9
 				gs 'arousal', 'end'
 				gs 'stat'
 				act 'Get dressed': gt'gdktoilet', 'emptystall'
 			end
 			act 'Let him cum on your face':
 				*clr & cla
-				spafinloc = 11
 				facial += 1
-				gs 'cum_manage'
+				gs 'cum_call', 'face', 'an unknown guy from the gloryhole'
 				'<center><video autoplay loop src="images/locations/pavlovsk/community/bathroom/womens/sex/ghfacial.mp4"></video></center>'
 				'You put your face near his dick and start jerking him off, shortly later, hot spurts of cum start flying and covering your face.'
 				gs 'arousal', 'hj', 10, 'unknown', 'sub'
+				minut -= 9
 				gs 'arousal', 'end'
 				gs 'stat'
 				act 'Get dressed': gt'gdktoilet', 'emptystall'
@@ -1123,6 +1051,7 @@ if $ARGS[0] = 'rape':
 			'<center><video autoplay loop src="images/locations/pavlovsk/community/bathroom/mens/sex/mensrape4.mp4"></video></center>'
 			'You bite down his dick, which makes him pull his dick out of your mouth. "Fine you little fucking cunt, we''ll do this the hard way." He lifts you up and forces you between two urinals with your face up against the wall. He roughly shoves his cock in your ass, the only lubrication is the bit of your saliva still on his dick. It feels like he is ripping your ass open, you cry and scream. He just jackhammers your ass balls deep, while holding you by the throat.'
 			gs 'arousal', 'anal', 10, 'unknown', 'sub', 'rough'
+			minut -= 5
 			gs 'stat'
 			act 'Continue':
 				*clr & cla
@@ -1130,22 +1059,16 @@ if $ARGS[0] = 'rape':
 				'As you scream he reaches up and clamps a hand over your mouth to muffle your screams, he continues you pound your ass balls deep with his dick. Not relenting no matter how much you struggle or cry. "You think it''s funny bitch to steal a man''s hard earned money, well you won''t think it is so funny after I am done with you. I''m going to fuck your ass till it bleeds like your cunt."'
 				'He keeps ripping your ass up with his dick, the pain is unbearable, but there is nothing you can do about it. You really wish you hadn''t taken his money and kept it.'
 				gs 'arousal', 'anal', 10, 'unknown', 'sub', 'rough'
+				minut -= 5
 				gs 'stat'
 				act 'Continue':
 					*clr & cla
-					spafinloc = 12
 					rape += 1
-					gs 'cum_manage'
-					if pcs_ass < 10:
-						pcs_ass += 3 & agape = 3
-					elseif pcs_ass < 20:
-						pcs_ass += 2 & agape = 3
-					else
-						pcs_ass += 2 & agape = 2 & pcs_horny += RAND(20,40)
-					end
+					gs 'cum_call', 'mouth', 'an unknown guy from the gloryhole'
 					'<center><video autoplay loop src="images/locations/pavlovsk/community/bathroom/mens/sex/cumspit.mp4"></video></center>'
 					'Finally he pulls the dick out of your ass and forces you back to your knees, he shoves his dick back in your mouth and you can taste your own ass on his dick. He says to you. "You fucking bite me again bitch and I will call everyone I know and we will train fuck your ass for days." Afraid he is serious you suck his dick until he finally shoots his load in your mouth.'
 					gs 'arousal', 'bj', 10, 'unknown', 'sub', 'rough'
+					minut -= 5
 					gs 'arousal', 'end'
 					gs 'stat'
 					'With that he lets go of you and walks off in disgust.'
@@ -1179,10 +1102,7 @@ if $ARGS[0] = 'rape':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/gorodok.jpg"></center>'
 		'You run from the community center and don''t stop until you are back in the residential area'
-		act 'Catch your breath':
-			minut += 5
-			gt 'pavResidential'
-		end
+		act 'Catch your breath': minut += 5 & gt 'pavResidential'
 	end
 end
 

+ 1 - 1
locations/gschool_grounds.qsrc

@@ -72,8 +72,8 @@ if $ARGS[0] = 'main':
 				pcs_energy += 70
 				gs 'drugs', 'alcohol', 'vodka', rand(2,3)
 				gs 'underwear', 'remove'
-				gs 'stat'
 				gs 'clothing', 'strip'
+				gs 'stat'
 				'After the official graduation, everyone gets hammered at the prom party. You don''t remember much of what happened, only recalling a few flashbacks of going skinny dipping in the town fountain with a group of friends. Your mouth is dry and you can taste beer and what might be a kebab, you are somewhere in the town center, all of your clothes are missing and you are completely naked.'
 				'You make your way back home, you think you are discrete and stick to poorly lit areas but you really don''t remember and somehow have bits of someone''s hedge in your hair.'
 

+ 2 - 2
locations/gschool_lessons1.qsrc

@@ -1775,7 +1775,7 @@ if $ARGS[0] = 'math_late':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/late/latem1.jpg"></center>'
 		'When you open the door and walk in Mr Tsarev stops talking and everyone turns their eyes towards you. "So good of you to join us Miss <<$pcs_lastname>>." Several of the kids smirk, a few look annoyed you interrupted class or that you are getting away with being late.'
-		act 'Say your sorry':
+		act 'Say you''re sorry':
 			*clr & cla
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/late/latem2.jpg"></center>'
@@ -1942,7 +1942,7 @@ if $ARGS[0] = 'literature_late':
 			end
 		else
 			'When you open the door and walk in Mrs Braakman stops talking and everyone turns their eyes towards you. Mrs Braakman address you in a cold tone. "Your late Miss <<$pcs_lastname>>, I will not tolerate students being late to my class." Several of the kids smirk, a few look annoyed you interrupted class.'
-			act 'Say your sorry':
+			act 'Say you''re sorry':
 				*clr & cla
 				demerit += 5
 				gs 'stat'

+ 10 - 9
locations/gskver.qsrc

@@ -117,10 +117,9 @@ if $ARGS[0] = 'start':
 	act 'Go for a walk (0:15)':
 		if pcs_exhib = 100 and exhibitionQW = 0: gt 'kseniyaQW', 'event1', 1
 
-		if StoryLine = 1 and SchoolAtestat = 0 and mey_vika['mey_vika_qw'] = 0 and rand(1,4) = 1:
+		if StoryLine = 1 and SchoolAtestat = 0 and mey_vika['mey_vika_qw'] > 0 and mey_vika['mey_vika_qw'] < 27 and mey_vika['qw_day'] ! daystart and ((week > 5 and hour >= 8 and hour < 20) or (week < 6 and week mod 2 = 1 and hour > 14)):
 			gs 'mey_vika_events', 'park_meet'
 			gs 'stat'
-			if mey_vika['qw_day'] = daystart: delact 'Looking for Vika'
 		else
 			*clr & cla
 			minut += 15
@@ -151,14 +150,16 @@ if $ARGS[0] = 'start':
 			act 'Continue':gt 'gskver', 'start'
 		end
 	end
-
-	! meynold`s events
+		
 	if mey_vika['mey_vika_qw'] > 0 and mey_vika['mey_vika_qw'] < 27 and mey_vika['qw_day'] ! daystart:
-		!disable after can access home
-		act 'Look for Vika (0:05)':
-			minut += 5
-			gs 'mey_vika_events', 'park_meet'
-			gs 'stat'
+		if hour >= 20 or (week > 5 and hour < 8) or (week < 6 and week mod 2 = 0 and hour < 14)) or (week mod 2 = 1 and hour < 18):
+			'<br>Vicky and Vanya never are in the park at this time.'
+		else
+			act 'Look for Vicky and Vanya (0:05)':
+				minut += 5
+				gs 'mey_vika_events', 'park_meet'
+				gs 'stat'
+			end
 		end
 	end
 

+ 3 - 3
locations/kseniyaQW.qsrc

@@ -5,7 +5,7 @@ if $ARGS[0] = 'event1':
 	cls
 	minut += 5
 	exhibitionQW = 1
-	exhibitionist_lvl = 1
+	if exhibitionist_lvl < 1: exhibitionist_lvl = 1
 	menu_off = 1
 	gs 'stat'
 
@@ -53,7 +53,7 @@ if $ARGS[0] = 'event2':
 	cls
 	minut += 5
 	exhibitionQW = 2
-	exhibitionist_lvl = 2
+	if exhibitionist_lvl < 2: exhibitionist_lvl = 2
 	gs 'stat'
 
 	'<center><b><font color="maroon">Kseniya</font></b></center>'
@@ -123,7 +123,7 @@ if $ARGS[0] = 'event3':
 		cls
 		minut += 5
 		exhibitionQW = 3
-		exhibitionist_lvl = 2
+		if exhibitionist_lvl < 2: exhibitionist_lvl = 2
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/shared/park/kseniya/strip1.jpg"></center>'
 		'Cool, the light is not great here at this time but there''s a great spot just around the corner.'

+ 142 - 193
locations/mey_vika_events.qsrc

@@ -1,7 +1,5 @@
 # mey_vika_events
 
-!variable
-!mey_vika['relation']	npc_rel['A15']
 !{
 mey_vika['bath_qw']	mey_vika['bath_qw']
 mey_vika['bath_qw_day']	mey_vika['bath_qw_day']
@@ -26,7 +24,7 @@ mey_tamara['reputation_qw']	mey_tamara['reputation_qw']
 $location_type = 'event'
 menu_off = 1
 
-if $args[0] = 'first_visit':
+if $ARGS[0] = 'first_visit':
 	*clr & cla
 	menu_off = 1
 	! for the first time - familiarity with TM
@@ -66,7 +64,7 @@ if $args[0] = 'first_visit':
 	end
 end
 
-if $args[0] = 'end_game':
+if $ARGS[0] = 'end_game':
 	'Noticing you, Tamara leans over, rubbing against your breasts...'
 	'<font color="maroon"><i>"You can come over and visit us any time you want, <<$pcs_nickname>>. We can sit down and have a chat over a cup of tea."</i></font>'
 	'<font color="navy"><i>"Of course, aunt Tamara! I''ll be sure to come by."</i></font>'
@@ -78,8 +76,7 @@ if $args[0] = 'end_game':
 	act 'Go home': gt 'pavResidential'
 end
 
-if $args[0] = 'play_game':
-	! the beginning of the game
+if $ARGS[0] = 'play_game':
 	*clr & cla
 	menu_off = 1
 	minut += 5
@@ -144,7 +141,7 @@ if $args[0] = 'play_game':
 end
 
 ! wish Ivan from girls
-if $args[0] = 'play_game_wish0':
+if $ARGS[0] = 'play_game_wish0':
 	! Ivan lost
 	*clr & cla
 	menu_off = 1
@@ -220,7 +217,7 @@ if $args[0] = 'play_game_wish0':
 end
 
 ! wish Vicky Svetka, Striptease
-if $args[0] = 'play_game_wish1':
+if $ARGS[0] = 'play_game_wish1':
 	*clr & cla
 	if mey_vika['mey_vika_qw'] < 27 and mey_vika['qw_day'] ! daystart: mey_vika['mey_vika_qw'] += 1
 	pcs_horny += 10
@@ -309,7 +306,7 @@ if $args[0] = 'play_game_wish1':
 end
 
 ! wish Sveta from Ivan, kiss #2
-if $args[0] = 'play_game_wish2':
+if $ARGS[0] = 'play_game_wish2':
 	*clr & cla
 	menu_off = 1
 	if mey_vika['mey_vika_qw'] < 27 and mey_vika['qw_day'] ! daystart: mey_vika['mey_vika_qw'] += 1
@@ -336,7 +333,7 @@ if $args[0] = 'play_game_wish2':
 end
 
 ! wish Sveta from Vicky, kiss
-if $args[0] = 'play_game_wish3':
+if $ARGS[0] = 'play_game_wish3':
 	*clr & cla
 	menu_off = 1
 	if mey_vika['mey_vika_qw'] < 27 and mey_vika['qw_day'] ! daystart: mey_vika['mey_vika_qw'] += 1
@@ -352,7 +349,7 @@ if $args[0] = 'play_game_wish3':
 	act 'Finish': gt 'mey_vika_events', 'end_game'
 end
 
-if $args[0] = 'play_game_sub':
+if $ARGS[0] = 'play_game_sub':
 	! winner
 	! 0 - sveta
 	! 1 - vanya
@@ -367,206 +364,158 @@ if $args[0] = 'play_game_sub':
 	end
 end
 
-if $args[0] = 'near_school':
-	!*clr & cla
+if $ARGS[0] = 'near_school':
 	menu_off = 1
 	vicky_afterschool = daystart
-	!if week < 6 and hour = 14 and minut >= 0 and minut <= 15 and kanikuli = 0:
-		!check condition before gs
-		if week mod 2 = 0:
-			'You see Vicky Meynold leaving the school area holding hands with Vanya.'
 
-			! The beginning of the quest, Sveta doesn`t know anything about the relationship Vicki and Ivan
-			if mey_vika['mey_vika_qw'] = 0:
-				'"Hmm, where they are heading? Vicky''s house is on the opposite side of the city, Vanya''s too..." You think for yourself.'
+	if week mod 2 = 0:
+		'You see Vicky Meynold leaving the school area holding hands with Vanya.'
 
-				! questioning Katya
-				'In the corner of your eye you see Vicky''s twin sister Katja and decided to ask her. <br><font color="navy"><i>"Katja, do you know where they''re heading?"</i></font> You ask, nodding towards the couple?'
+		if mey_vika['mey_vika_qw'] = 0:
+			cla
+			'"Hmm, where they are heading? Vicky''s house is on the opposite side of the city, Vanya''s too..." You think for yourself. In the corner of your eye you see Vicky''s twin sister Katja and decided to ask her.'
+			'"Katja, do you know where they''re heading?" You ask, nodding towards the couple?'
 				
-				! check the relationship with Katya
-				!if mey_katya['relation'] >= 60:
-				if npc_rel[14] >= 60:
-					!relation to Katja
-					'<font color="maroon"><i>"There''s not much to say, <<$pcs_nickname>>."</i></font> Says Katja smiling.'
-					'<font color="maroon"><i>"As far as I know they go for a walk in the park. Though they walk on the off-beat tracks, attempting to stay hidden, away from all the prying eyes."</i></font> Katja continues...'
-
-					mey_vika['mey_vika_qw'] = 1
-					act 'Go to the Park': gt 'gskver', 'start'
-				else
-					'<font color="maroon"><i>"I don''t really know what the two of them are doing."</i></font> Katja answers shortly and starts walking away, not wanting to keep the conversation going.'
-					
-					mey_vika['mey_vika_qw'] = 2
-					act 'Stalk them': minut += rand(5,15) & gt 'gskver', 'start'
-				end
-			else
-				if mey_vika['mey_vika_qw'] >= 18 and mey_vika['mey_vika_qw'] < 20 and mey_vika['qw_day'] ! daystart:
-					gs 'mey_vika_events', 'park_qw'
-				elseif mey_vika['mey_vika_qw'] >= 20 and mey_vika['mey_vika_qw'] < 27 and mey_vika['qw_day'] ! daystart:
-					! goto Meynolds home
-					cla
-					'Vicky won''t accept a no...'			
-					'<font color="maroon"><i>"We should hang out! You won''t bother anyone at my place."</i></font>'
-					'You don''t want to be rude so you gladly agree.'
-
-					! the first visit, the mother
-					act 'Visit Vicky': gt 'mey_vika_events','first_visit'
-				elseif mey_vika['mey_vika_qw'] = 27 and mey_vika['qw_day'] ! daystart:
-					mey_vika['qw_day'] = daystart
-					'<font color="maroon"><i>"My mother was quite intrigued by you, <<$pcs_nickname>>... That friend of yours, <<$pcs_nickname>>? Why doesn''t she visit us more often?"</i></font>'
-					'You start feeling a bit ashamed because Vicky needed to remind you and you promise that you will definitely visit in the near future.'
-
-					act 'Visit aunt Tamara': gt 'mey_tamara_events', 'next_meet'
-				elseif mey_vika['mey_vika_qw'] = 31:
-					mey_vika['mey_vika_qw'] = 32
-					mey_vika['qw_day'] = daystart
-					mey_vika['key'] = 1
-					'<font color="maroon"><i>"My mother likes you very much, <<$pcs_nickname>>, and the three of us hit it off, so here''s the key to our house. Don''t worry about anything, our house is your house. Here you go, come visit any time you like!"</i></font>'
-
-					act 'Depart': gt 'gschool_grounds', 'main'
-				else
-					'"The sweet couple are going to the park again..." you chuckle.'
+			if npc_rel['A14'] >= 60:
+				'"There''s not much to say, <<$pcs_nickname>>." Says Katja smiling.'
+				'"As far as I know they go for a walk in the park. Though they walk on the off-beat tracks, attempting to stay hidden, away from all the prying eyes." Katja continues.'
 
-				end
+				mey_vika['mey_vika_qw'] = 1
+				act 'Go to the Park': gt 'gskver', 'start'
+			else
+				'"I don''t really know what the two of them are doing." Katja answers shortly and starts walking away, not wanting to keep the conversation going.'
+					
+				mey_vika['mey_vika_qw'] = 2
+				act 'Stalk them': minut += rand(5,15) & gt 'gskver', 'start'
 			end
+		elseif mey_vika['mey_vika_qw'] >= 18 and mey_vika['mey_vika_qw'] < 20 and mey_vika['qw_day'] ! daystart:
+			gs 'mey_vika_events', 'park_qw'
+		elseif mey_vika['mey_vika_qw'] >= 20 and mey_vika['mey_vika_qw'] < 27 and mey_vika['qw_day'] ! daystart:
+			cla
+			'Vicky won''t accept a no.'			
+			'"We should hang out! You won''t bother anyone at my place."'
+			'You don''t want to be rude so you gladly agree.'
+
+			act 'Visit Vicky': gt 'mey_vika_events','first_visit'
+		elseif mey_vika['mey_vika_qw'] = 27 and mey_vika['qw_day'] ! daystart:
+			mey_vika['qw_day'] = daystart
+			'<font color="maroon"><i>"My mother was quite intrigued by you, <<$pcs_nickname>>... That friend of yours, <<$pcs_nickname>>? Why doesn''t she visit us more often?"</i></font>'
+			'You start feeling a bit ashamed because Vicky needed to remind you and you promise that you will definitely visit in the near future.'
+
+			act 'Visit aunt Tamara': gt 'mey_tamara_events', 'next_meet'
+		elseif mey_vika['mey_vika_qw'] = 31:
+			mey_vika['mey_vika_qw'] = 32
+			mey_vika['qw_day'] = daystart
+			mey_vika['key'] = 1
+			'<font color="maroon"><i>"My mother likes you very much, <<$pcs_nickname>>, and the three of us hit it off, so here''s the key to our house. Don''t worry about anything, our house is your house. Here you go, come visit any time you like!"</i></font>'
+
+			act 'Depart': gt 'gschool_grounds', 'main'
 		else
-			'Vicky Meynold leaves the school by herself.'
+			'"The sweet couple are going to the park again..." you chuckle.'
 		end
-	!end
+	else
+		'<br>Vicky Meynold leaves the school by herself.'
+	end
 end
 
-if $args[0] = 'park_meet':
+if $ARGS[0] = 'park_meet':
 	menu_off = 1
 	minut += rand(10,20)
 	gs 'stat'
-	! bad weather, nothing to walk, sent a couple of new cafe 
-	if sunWeather = 0 or temper < 5:
-		!mey_vika['qw_day'] = daystart
+	if sunWeather = 0 or temper < 5:		
 		if mey_vika['mey_vika_qw'] < 3:
 			'You wander into a distant part of the park, but you can''t see anyone, the bad weather has scared everyone away.'
 		else
 			'You wander into a distant part of the park where Vicky usually hangs out with Vanya, but you don''t come across them there, perhaps due to bad weather.'
 		end
-
 		exit
 	end
 
-	!rewrite the checking
-	if mey_vika['qw_day'] = daystart or hour >= 20 or (week > 5 and hour < 8) or (week <= 5 and week mod 2 = 0 and hour < 14):
-		!!time range: 6,0 from 8, 2,4 from 16, and disable after 20
-		'You wander into a distant part of the park. You walk for a few minutes, but don''t come across anyone there.'
-	elseif week mod 2 = 1 and hour < 18:
-		!Ivan is training on 1,3,5 so start at 18
-		'You wander into a distant part of the park where  Vicky usually hangs out with Vanya, but don''t come across them. "Perhaps Vanya is away, training." You think to yourself.'
-	else
-		*clr
-		
-		! mey_vika['mey_vika_park_action']: 0 - walk, 1 - kiss
-		if mey_vika['mey_vika_park_action'] = 0:
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/meynolds/vika_park_walk.jpg"></center>'
-		end
+	mey_vika['qw_day'] = daystart
+	
+	*clr
+	if mey_vika['mey_vika_park_action'] = 0:
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/meynolds/vika_park_walk.jpg"></center>'
+	elseif mey_vika['mey_vika_park_action'] = 1:
+		'<center><img <<$set_imgh>> src="'+'images/locations/pavlovsk/resident/meynolds/sex/vika_park_kiss_'+iif(month>10 or month<4,'winter','summer')+'.jpg'+'"></center>'
+	elseif mey_vika['mey_vika_park_action'] = 2:
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/meynolds/vika_park_bench.jpg"></center>'
+	end
 
-		if mey_vika['mey_vika_park_action'] = 1:
-			'<center><img <<$set_imgh>> src="'+'images/locations/pavlovsk/resident/meynolds/sex/vika_park_kiss_'+iif(month>10 or month<4,'winter','summer')+'.jpg'+'"></center>'
-		end
+	if mey_vika['mey_vika_qw'] = 0:
+		'Walking around the square, dreaming yourself away, you don''t pay attention to where you''re headed. You wander to the distant side of the park, where you notice Vicky and Vanya.'
+	elseif mey_vika['mey_vika_qw'] = 1:
+		'You know exactly where to head this time, notice Vicky and Vanya, and wander into the distant part of the park.'
+	elseif mey_vika['mey_vika_qw'] = 2:
+		'You want to avoid meeting Vicky and Vanya so you quietly follow them, avoiding them as best you can, sneaking after the couple in the park.'
+	elseif mey_vika['mey_vika_qw'] >= 3:
+		'You know exactly where to head this time, notice Vicky and Vanya, and wander into the distant part of the park to "accidentally" meet the couple.'
+	end
 
-		if mey_vika['mey_vika_park_action'] = 2:
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/meynolds/vika_park_bench.jpg"></center>'
+	if mey_vika['mey_vika_qw'] < 3:
+		'Nearing them, not having figured out what to do, you simply walk by.'
+	elseif mey_vika['mey_vika_qw'] < 5:
+		'Nearing them all you manage to say is a quick "Hi".'
+		if npc_rel['A15'] < 60:
+			'Vicky and Vanya only glance in your direction and turn away. Not having anything to say, you decide it''s better to go away.'
+		else
+			'Vicky and Vanya unisonally answer "Hi", but not knowing how to continue the conversation, you keep walking on.'
+		end
+	elseif mey_vika['mey_vika_qw'] >= 5:
+		if npc_rel['A15'] < 60:
+			'You approach the couple and greet them, but they don’’t pay any attention to you.'
+		else
+			'You approach the couple and greet them, right away Vicky starts gossiping, as always, Vanya mostly jokes about the things you two are talking about. You chat for a few minutes...'
 		end
 
-		mey_vika['qw_day'] = daystart
-		! accidentally stumble upon the couple in the Park, the beginning of the quest
-		if mey_vika['mey_vika_qw'] = 0:
-			'Walking around the square, dreaming yourself away, you don''t pay attention to where you''re headed. You wander to the distant side of the park, where you notice Vicky and Vanya.'
-		! Kate said - we know the couple here
-		elseif mey_vika['mey_vika_qw'] = 1:
-			'You know exactly where to head this time, notice Vicky and Vanya, and wander into the distant part of the park.'
-		! watch
-		elseif mey_vika['mey_vika_qw'] = 2:
-			'You want to avoid meeting Vicky and Vanya so you quietly follow them, avoiding them as best you can, sneaking after the couple in the park.'
-		! repeat 3 - 4
-		elseif mey_vika['mey_vika_qw'] >= 3:
-			'You know exactly where to head this time, notice Vicky and Vanya, and wander into the distant part of the park to "accidentally" meet the couple.'
+		if npc_rel['A15'] >= 80 and mey_vika['mey_vika_qw'] >= 7:
+			'As you''re leaving, you notice Vicky whispering something to Vanya. You notice Vanya''s hand stroking and squeezing Vicky''s butt, as they stare at you with lust in their eyes...'
 		end
 
-		if mey_vika['mey_vika_qw'] < 3:
-			! monochromatic
-			'Nearing them, not having figured out what to do, you simply walk by.'
+		if npc_rel['A15'] >= 80 and mey_vika['mey_vika_qw'] = 10:
+			cla
+			'Vicky invites you to the new trendy cafe "Del Parco".'
 
-		else
-			! stage 3-4
-			if mey_vika['mey_vika_qw'] < 5:
-				'Nearing them all you manage to say is a quick "Hi".'
-				! connected relationship and response
-				if npc_rel['A15'] < 60:
-					'Vicky and Vanya only glance in your direction and turn away. Not having anything to say, you decide it''s better to go away.'
-				else
-					'Vicky and Vanya unisonally answer "Hi", but not knowing how to continue the conversation, you keep walking on.'
-				end
-			end
-			! stage 5 and.
-			if mey_vika['mey_vika_qw'] >= 5:
-				if npc_rel['A15'] < 60:
-					'You approach the couple and greet them, but they don’’t pay any attention to you.'
-				else
-					'You approach the couple and greet them, right away Vicky starts gossiping, as always, Vanya mostly jokes about the things you two are talking about. You chat for a few minutes...'
-				end
+			if money < 300:
+				act 'Decline':
+					cla
+					'You''re pretty much broke and you don''t want to be impudent by asking Vicky to pay for you, so you decide to thank Vicky for the invite but that you have a thing elsewhere that you need to attend...'
 
-				! something`s going to happen here
-				if npc_rel['A15'] >= 80 and mey_vika['mey_vika_qw'] >= 7:
-					'As you''re leaving, you notice Vicky whispering something to Vanya. You notice Vanya''s hand stroking and squeezing Vicky''s butt, as they stare at you with lust in their eyes...'
+					act 'Go': gt 'gskver', 'start'
 				end
+			end
+			act 'Visit the cafe':
+				mey_vika['mey_vika_qw'] = 15
+				gt 'mey_vika_events', 'cafe_qw'
+			end
+		end
 
-				! prigles in the cafe
-				if npc_rel['A15'] >= 80 and mey_vika['mey_vika_qw'] = 10:
-					cla
-					'Vicky invites you to the new trendy cafe "Del Parco".'
-
-					if money < 300:
-						act 'Decline':
-							cla
-							'You''re pretty much broke and you don''t want to be impudent by asking Vicky to pay for you, so you decide to thank Vicky for the invite but that you have a thing elsewhere that you need to attend...'
+		if npc_rel['A15'] < 80: exit
 
-							act 'Go': gt 'park'
-						end
-					end
-					act 'Visit the cafe':
-						mey_vika['mey_vika_qw'] = 15
-						gt 'mey_vika_events', 'cafe_qw'
-					end
-				end
-				! if the relationship is not great - freeze quest
-				!if npc_rel['A15'] < 80: mey_vika['mey_vika_qw'] -= 1
-				if npc_rel['A15'] < 80: exit
-				! ---- 
-				if mey_vika['mey_vika_qw'] >= 18 and mey_vika['mey_vika_qw'] < 19:
-					if sunWeather = 1 and temper >= 5 and month >= 5 and month <= 10:
-						!also in [glake]
-						cla
-						'Walking through the park, you meet Vicky and Vanya. They are going to the beach and ask you to join them.'
+		if mey_vika['mey_vika_qw'] >= 18 and mey_vika['mey_vika_qw'] < 19:
+			if sunWeather = 1 and temper >= 5 and month >= 5 and month <= 10:
+				cla
+				'Walking through the park, you meet Vicky and Vanya. They are going to the beach and ask you to join them.'
 
-						act 'Decline': gt 'pavResidential'
-						if mesec = 0: act 'Go with them to the beach': gt 'mey_vika_events', 'beach_event0'
-					else
-						cla
-						'Vicky invites you to the new trendy cafe "Del Parco".'
+				act 'Decline': gt 'pavResidential'
+				if mesec = 0: act 'Go with them to the beach': gt 'mey_vika_events', 'beach_event0'
+			else
+				cla
+				'Vicky invites you to the new trendy cafe "Del Parco".'
 
-						act 'Decline': gt 'pavResidential'
-						if money > 300: act 'Visit the cafe': gt 'mey_vika_events', 'cafe_repeat_qw'
-					end
-				end
+					act 'Decline': gt 'pavResidential'
+				if money > 300: act 'Visit the cafe': gt 'mey_vika_events', 'cafe_repeat_qw'
 			end
 		end
-
-		! alternate event
-		mey_vika['mey_vika_park_action'] += 1
-		if mey_vika['mey_vika_park_action'] > 2: mey_vika['mey_vika_park_action'] = 0
-		! transfer counters
-		if mey_vika['mey_vika_qw'] < 10: mey_vika['mey_vika_qw'] += 1
-		exit
 	end
+
+	mey_vika['mey_vika_park_action'] += 1
+	if mey_vika['mey_vika_park_action'] > 2: mey_vika['mey_vika_park_action'] = 0
+	if mey_vika['mey_vika_qw'] < 10: mey_vika['mey_vika_qw'] += 1
+	exit
 end
 
-if $args[0] = 'cafe_qw':
+if $ARGS[0] = 'cafe_qw':
 	*clr & cla
 	menu_off = 1
 	money -= 150
@@ -612,7 +561,7 @@ if $args[0] = 'cafe_qw':
 	end
 end
 
-if $args[0] = 'cafe_repeat_qw':
+if $ARGS[0] = 'cafe_repeat_qw':
 	*clr & cla
 	menu_off = 1
 	money -= 150
@@ -631,7 +580,7 @@ if $args[0] = 'cafe_repeat_qw':
 	act 'Say goodbye and leave': gt 'cafe_parco', 'inner'
 end
 
-if $args[0] = 'park_qw':
+if $ARGS[0] = 'park_qw':
 	*clr & cla
 	menu_off = 1
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/building/gschool.jpg"></center>'
@@ -671,7 +620,7 @@ if $args[0] = 'park_qw':
 	end
 end
 
-if $args[0] = 'beach_event0':
+if $ARGS[0] = 'beach_event0':
 	*clr & cla
 	menu_off = 1
 	if args[1] < 1:
@@ -838,7 +787,7 @@ if $args[0] = 'beach_event0':
 	end
 end
 
-if $args[0] = 'beach_ender':
+if $ARGS[0] = 'beach_ender':
 	act 'Go': 
 		if ($clothingworntype = 'nude' or $clothingworntype = 'swimwear'): gs 'clothing', 'wear', $lastwornclothingtype, lastwornclothingnumber
 		! on vsjak the fireman still wears check whether gg
@@ -847,7 +796,7 @@ if $args[0] = 'beach_ender':
 	end
 end
 
-if $args[0] = 'beach_event1':
+if $ARGS[0] = 'beach_event1':
 	menu_off = 1
 	!if temper >= 20 and sunWeather = 1 and month >= 5 and month <= 9 and hour < 20 and mey_vika['mey_vika_qw'] >= 18 and mey_vika['mey_vika_qw'] < 20 and mey_vika['qw_day'] ! daystart:
 		!if (hour >= 10 and week >= 6) or (hour >= 14 and week < 6):
@@ -890,7 +839,7 @@ if $args[0] = 'beach_event1':
 end
 !move check condition before gs
 ! case with a gift
-if $args[0] = 'case_gift':
+if $ARGS[0] = 'case_gift':
 	menu_off = 1
 	!if mey_vika['mey_vika_qw'] = 30 and mey_vika['qw_day'] ! daystart and hour = 23:
 		zz_stage = args[1]
@@ -1016,13 +965,13 @@ if $args[0] = 'case_gift':
 	!end
 end
 
-if $args[0] = 'case_gift_ender':
+if $ARGS[0] = 'case_gift_ender':
 	mey_vika['qw_day'] = daystart
 	killvar 'zz_stage'
 	gt 'mey_home', '3'
 end
 
-if $args[0] = 'learning0':
+if $ARGS[0] = 'learning0':
 	menu_off = 1
 	!if mey_vika['mey_vika_qw'] >= 32 and mey_vika['mey_vika_qw'] < 35 and mey_vika['qw_day'] ! daystart and hour >= 23:
 		*clr & cla
@@ -1141,7 +1090,7 @@ if $args[0] = 'learning0':
 	!end
 end
 
-if $args[0] = 'gym0':
+if $ARGS[0] = 'gym0':
 	menu_off = 1
 !!	if week mod 2 ! 0 and mey_vika['mey_vika_qw'] >= 32 and mey_vika['gym_day'] ! daystart and hour = 14 and minut >= 30:
 		*clr & cla
@@ -1254,7 +1203,7 @@ if $args[0] = 'gym0':
 	!!end
 end
 
-if $args[0] = 'gym1':
+if $ARGS[0] = 'gym1':
 	menu_off = 1
 	!if week mod 2 ! 0 and mey_vika['mey_vika_qw'] >= 32 and mey_vika['gym_day'] ! daystart and hour = 17 and minut >= 30:
 		zz_stage = args[1]
@@ -1314,7 +1263,7 @@ if $args[0] = 'gym1':
 	!end
 end
 
-if $args[0] = 'bath_qw0':
+if $ARGS[0] = 'bath_qw0':
 	*clr & cla
 	menu_off = 1
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/meynolds/vaccleaner.jpg"></center>'
@@ -1343,7 +1292,7 @@ if $args[0] = 'bath_qw0':
 	end
 end
 
-if $args[0] = 'bath_qw1':
+if $ARGS[0] = 'bath_qw1':
 	cla
 	menu_off = 1
 	mey_vika['bath_qw_day'] = daystart
@@ -1363,7 +1312,7 @@ if $args[0] = 'bath_qw1':
 	end
 end
 
-if $args[0] = 'bath_common':
+if $ARGS[0] = 'bath_common':
 	*clr & cla
 	menu_off = 1
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/vicky/sex/bath_qw1.jpg"></center>'
@@ -1439,7 +1388,7 @@ if $args[0] = 'bath_common':
 	end
 end
 
-if $args[0] = 'bang_katya':
+if $ARGS[0] = 'bang_katya':
 	menu_off = 1
 	zz_stage = args[1]
 	if zz_stage = 0:
@@ -1453,13 +1402,6 @@ if $args[0] = 'bang_katya':
 			'<font color="maroon"><i>"We were thinking about playing a prank on my naughty sister Katja!"</i></font>'
 		end
 
-		act 'Agree':
-			cla
-			'<font color="maroon"><i>"Oh, great! I''m so glad you agree!!!"</i></font> Vicky begins to talk enthusiastically, jumping around you like a goat, while holding your hands.'
-			'Vanya grins too. They were clearly plotting some kind of prank, but knowing them, you are sure that it''s going to be something harmless.'
-
-			act 'Go to Katja''s room': gt 'mey_vika_events', 'bang_katya2'
-		end
 		act 'Decline':
 			cla
 			killvar 'zz_stage'
@@ -1468,10 +1410,17 @@ if $args[0] = 'bang_katya':
 
 			act 'Go to your room': gt 'mey_home', '3'
 		end
+		act 'Agree':
+			cla
+			'<font color="maroon"><i>"Oh, great! I''m so glad you agree!!!"</i></font> Vicky begins to talk enthusiastically, jumping around you like a goat, while holding your hands.'
+			'Vanya grins too. They were clearly plotting some kind of prank, but knowing them, you are sure that it''s going to be something harmless.'
+
+			act 'Go to Katja''s room': gt 'mey_vika_events', 'bang_katya2'
+		end
 	end
 end
 
-if $args[0] = 'bang_katya2':
+if $ARGS[0] = 'bang_katya2':
 	*clr & cla
 	menu_off = 1
 !!Image needed	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/home/bang_katya3.jpg"></center>'

+ 1 - 1
locations/pavaptcourtev.qsrc

@@ -619,7 +619,7 @@ if $ARGS[0] = 'dealer':
 			minut += 1
 			money -= 500
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/pc/no.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/weed.jpg"></center>'
 			'You glance around to make sure no one is watching, then you pull out five hundred from your purse and hand it over to him. He hands you a small bag of weed with some wrapping paper, with a smile and walks off. "Enjoy."'
 			act 'Move away':gt 'pavComplex', 'start'
 		end

+ 22 - 22
locations/pavtrain_market.qsrc

@@ -212,8 +212,8 @@ if $ARGS[0] = 'start':
 			act 'Leave': gt 'pavtrain_market', 'start'
 		end
 	else
+		'The market stalls are empty. The market is only open between 08:00 and 19:00.'
 		act 'Go back to the station': minut += 3 & gt 'pavtrain'
-		act 'Wander through the market': gt 'pavtrain_market','events'
 	end
 end
 
@@ -462,12 +462,12 @@ if ARGS[0] = 4:
 		*clr & cla
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/sextoys.jpg"></center>'
-		'He lets you step behind the counter so you can get a better look, as you do he says. "Take a look and let me know what you would like." You see several 15cm dildos. Each with a tag, "Only 700 <b>₽</b> each." You also see a small selection of vibrators in various colors, mostly pink. "Only 700 <b>₽</b> each." To one side you see many butt plugs, rubber and metal. "Only 700 <b>₽</b>each." Near the bottom is several strapon harnesses. "Only 1000 <b>₽</b>each."'
+		'He lets you step behind the counter so you can get a better look, as you do he says. "Take a look and let me know what you would like." You see several 15cm dildos. Each with a tag, "Only 700 <b>₽</b> each." You also see a small selection of vibrators in various colors, mostly pink. "Only 700 <b>₽</b> each." To one side you see many butt plugs, rubber and metal. "Only 700 <b>₽</b>each." Near the bottom is several strapon harnesses without a dildo. "Only 500 <b>₽</b>each."'
 		act 'Leave':gt 'pavtrain_market', 'start'
 		act 'Look for something else':gt 'pavtrain_market', 4
-		act 'Buy dildo (700 <b>₽</b>)':
-			cla
-			if money >= 700 and dildo = 0:
+		if money >= 700 and dildo = 0:
+			act 'Buy dildo (700 <b>₽</b>)':
+				cla
 				minut += 5
 				dildo = 1
 				money -= 700
@@ -478,13 +478,13 @@ if ARGS[0] = 4:
 				else
 					'You buy a dildo and calmly hide it.'
 				end
+				act 'Leave':gt 'pavtrain_market', 'start'
+				act 'Buy something else':gt 'pavtrain_market', 4
 			end
-			act 'Leave':gt 'pavtrain_market', 'start'
-			act 'Buy something else':gt 'pavtrain_market', 4
 		end
-		act 'Buy vibrator (700 <b>₽</b>)':
-			cla
-			if money >= 700 and vibrator = 0:
+		if money >= 700 and vibrator = 0:
+			act 'Buy vibrator (700 <b>₽</b>)':
+				cla
 				minut += 5
 				vibrator = 1
 				money -= 700
@@ -495,13 +495,13 @@ if ARGS[0] = 4:
 				else
 					'You buy a vibrator and calmly hide it.'
 				end
+				act 'Leave':gt 'pavtrain_market', 'start'
+				act 'Buy something else':gt 'pavtrain_market', 4
 			end
-			act 'Leave':gt 'pavtrain_market', 'start'
-			act 'Buy something else':gt 'pavtrain_market', 4
 		end
-		act 'Buy butt plug (700 <b>₽</b>)':
-			cla
-			if money >= 700 and analplug = 0:
+		if money >= 700 and analplug = 0:
+			act 'Buy butt plug (700 <b>₽</b>)':
+				cla
 				minut += 5
 				money -= 700
 				analplug = 1
@@ -512,13 +512,13 @@ if ARGS[0] = 4:
 				else
 					'You buy a butt plug and calmly hide it.'
 				end
+				act 'Leave':gt 'pavtrain_market', 'start'
+				act 'Buy something else':gt 'pavtrain_market', 4
 			end
-			act 'Leave':gt 'pavtrain_market', 'start'
-			act 'Buy something else':gt 'pavtrain_market', 4
 		end
-		act 'Buy strap-on harness (1000 <b>₽</b>)':
-			cla
-			if money >= 1000 and strapon = 0:
+		if money >= 500 and strapon = 0:
+			act 'Buy strap-on harness (500 <b>₽</b>)':
+				cla
 				minut += 5
 				strapon = 1
 				money -= 1000
@@ -529,9 +529,9 @@ if ARGS[0] = 4:
 				else
 					'You buy a strap-on harness and calmly hide it.'
 				end
+				act 'Leave':gt 'pavtrain_market', 'start'
+				act 'Buy something else':gt 'pavtrain_market', 4
 			end
-			act 'Leave':gt 'pavtrain_market', 'start'
-			act 'Buy something else':gt 'pavtrain_market', 4
 		end
 	end
 end

+ 3 - 2
locations/sexshop.qsrc

@@ -304,12 +304,13 @@ if $ARGS[0] = 'start':
 		'You cannot afford the vibrator.'
 	end
 
-	if money >= 1200 and strapon = 0 and dildo = 0:
+	if money >= 1200 and strapon = 0 and (dildo + middildo + largedildo + bigdildo + extradildo + superdildo + maddildo = 0):
 		act 'Buy a strapon with a 15cm dildo (1,200 <b>₽</b>)':
 			*clr & cla
 			menu_off = 1
 			minut += 5
 			strapon = 1
+			dildo = 1
 			money -= 1200
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/sexshop/sexshop.jpg"></center>'
@@ -317,7 +318,7 @@ if $ARGS[0] = 'start':
 
 			act 'Move away from the counter':gt 'sexshop', 'start'
 		end
-	elseif money >= 500 and strapon = 0 and dildo = 1:
+	elseif money >= 500 and strapon = 0 and (dildo + middildo + largedildo + bigdildo + extradildo + superdildo + maddildo ! 0):
 		act 'Buy a strapon harness (500 <b>₽</b>)':
 			*clr & cla
 			menu_off = 1