Merge remote-tracking branch 'julzor/master'

locations/FedorEv2.qsrc

@@ -217,9 +217,9 @@ if $ARGS[0] = 'Movies 2':
 	pcs_willpwr += 20
 	minut += 60
 	gs'stat'
+	'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/fedor/fedorev/movies/scare.mp4"></video></center>'
 	'The movie starts and you and Fedor sit quietly watching the movie but you occationally see Fedor staring at you when he thinks you aren''t looking. You continue watching the movie in silence until a jump scare flashes on the screen causing you to jump up in your seat and after you collect yourself, you look down to notice that you were clutching Fedor''s hand. As you look at Fedor''s face, he giggles and wraps his fingers around your hand as he gazes intently into your <<$pcs_eyecol>> eyes and a few seconds of silence Fedor leans in closer to you...'
 	*nl	
-	'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/fedor/fedorev/movies/scare.mp4"></video></center>'
 	
 	act 'Kiss him':
 		*clr & cla

locations/brother_voyeur.qsrc

@@ -917,7 +917,6 @@ if $ARGS[0] = 'showerfun':
 	end
 end
 
-
 if $ARGS[0] = 'brother_shower_shave':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/vanrpar.jpg"></center>'
 	inhib_exp += rand(1,3)
@@ -1094,10 +1093,11 @@ if $ARGS[0] = 'brother_shower_shave':
 							act'Finish showering together':gt'brother_voyeur','brother_shower_end'
 							if brotherfuck > 0 or brotherbj > 0 or brotherwash > 5:
 								act'Have some fun':
-								gs 'arousal','breasts', 1
-								'	Clean from your shower together, and now with freshly shaved legs, you can''t help yourself as you start to get frisky with your brother. His hands slide up your body to caress your breasts. In response, you reach back and start jerking his cock feeling him harden under your touch.'
-								act'Blow him':gt'brother_voyeur','brother_shower_bj'
-								act'Fuck him':gt'brother_voyeur','brother_shower_fuck'
+									gs 'arousal','breasts', 1
+									'	Clean from your shower together, and now with freshly shaved legs, you can''t help yourself as you start to get frisky with your brother. His hands slide up your body to caress your breasts. In response, you reach back and start jerking his cock feeling him harden under your touch.'
+									act'Blow him':gt'brother_voyeur','brother_shower_bj'
+									act'Fuck him':gt'brother_voyeur','brother_shower_fuck'
+								end
 							end
 						end
 					end

locations/din_van.qsrc

@@ -521,12 +521,11 @@ $basin = {
 	if cumloc[13] = 1:
 		act 'Wash the cum from your hands (0:05)':
 			menu_off = 1
-			*clr & cla
-			cumspclnt = 13
+			cla
+			cumspclnt = 9
 			gs 'cum_cleanup'
 			minut += 5
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/shared/home/bathroom/facesp.jpg"></center>'
 			*nl
 			'You wash your hands and get rid of any trace of cum.'
 

locations/gadriver.qsrc

@@ -188,6 +188,34 @@ if $ARGS[0] = 'gadbitch':
 
 	if MiraLoc ! 1 and npc_QW['A63'] >= 13 and RAND(0,10) = 0 and hour >= 8 and hour < 20 and month >= 5 and month <= 9 and temper >= 15 and sunWeather = 1:'<a href="exec: gt ''gadriver'', ''GuysRiver'' ">Bob Colby</a> is resting on the riverbank.'
 
+	act 'Go back to the river':
+		cla
+		if $clothingworntype = 'swimwear':
+			cla
+			'You need to dress in regular clothes first.'
+			act'Return':gt'gadriver', 'gadbitch'
+		elseif $clothingworntype = 'nude':
+			'You need to put some clothes on first.'
+			act'Return':gt'gadriver', 'gadbitch'
+		else
+			minut += 5
+			gt 'gadriver', 'start'
+		end
+	end
+	
+	if ARRSIZE('swimwear') > 0: act 'Get changed':gt 'changingroom', 'view_swim_list'
+	
+	if $clothingworntype = 'nude':
+		act 'Get dressed':
+			clothesAtLocation = FUNC('lost_clothes_here','VillageRiver')
+			cla
+			minut += 5
+			gs 'underwear', 'wear'
+			if clothesAtLocation = 1: gs 'clothing', 'recover_lost_clothes', 'VillageRiver', 1
+				act 'Continue': gt 'gadriver', 'gadbitch'
+		end
+	end
+	
 	if temper >= 15 and month >= 5 and month <= 9:
 		temp_gr = RAND(0,9)
 		if $clothingworntype ! 'nude' and (pcs_inhib >= 25 or exhibitionist_lvl > 1):
@@ -564,34 +592,7 @@ if $ARGS[0] = 'gadbitch':
 			end
 		end
 	end
-	if ARRSIZE('swimwear') > 0:
-		act 'Get changed':gt 'changingroom', 'view_swim_list'
-	end
-	if $clothingworntype = 'nude':
-		act 'Get dressed':
-			clothesAtLocation = FUNC('lost_clothes_here','VillageRiver')
-			cla
-			minut += 5
-			gs 'underwear', 'wear'
-			if clothesAtLocation = 1: gs 'clothing', 'recover_lost_clothes', 'VillageRiver', 1
-				act 'Continue': gt 'gadriver', 'gadbitch'
-		end
-	end
 
-	act 'Leave':
-		cla
-		if $clothingworntype = 'swimwear':
-			cla
-			'You need to dress in regular clothes first.'
-			act'Return':gt'gadriver', 'gadbitch'
-		elseif $clothingworntype = 'nude':
-			'You need to put some clothes on first.'
-			act'Return':gt'gadriver', 'gadbitch'
-		else
-			minut += 5
-			gt 'gadriver', 'start'
-		end
-	end
 !! extraordinary events at the river beach. Be aware, this part has to be at the end because it removes actions, which were set before.
 	if (mira_go_blok = 0 and MiraLoc = 1 and rand(1,10) = 5) or (MiraLoc = 1 and hour >= 20):
 		*clr & cla

locations/nogorslut.qsrc

@@ -69,8 +69,8 @@ if pav_slut < 125:
 				if IvanShowerQW = 11 and $loc ! 'gdkin':
 					if rand(0,4) = 0:
 						'You start to talk to Ivan when he leans in closes and whispers in your ear. "Tell me you''re bored <<$pcs_nickname>>."'
-						act 'Go with him':gt 'gdksport', 'Ivan_bored'
 						act 'Leave': gt 'gschool_lessons', 'short_break'
+						act 'Go with him':gt 'gdksport', 'Ivan_bored'
 					else
 						act 'Tell him you''re bored':gt 'gdksport', 'Ivan_bored'
 					end

locations/seeporn.qsrc

@@ -3,8 +3,8 @@
 gs 'stat'
 'You and the boys sit down around the TV, Kolka puts on a DVD and immediately the screen is filled with porn.'
 see_rand1 = rand(0,100)
-act 'watch porn':
-	cls
+act 'Watch it':
+	*clr & cla
 	minut += 15
 	seepornofut += 1
 	pcs_horny += (seepornofut + stat['mast']) * 2
@@ -21,13 +21,14 @@ act 'watch porn':
 		'The boys intensely watch the porn, you notice a distinct tightness in their pants.'
 
 		if evgenQW = 4:
-			cls
+			*clr & cla
 			boyseeporn += 1
 			gs 'stat'
+			'<center><video autoplay loop src="images/shared/home/tv/seeporn.mp4"></video></center>'
 			'The boys intensely watch porn, you notice that they are all clearly aroused. Zhendos asks "<<$pcs_nickname>>, Want to put that mouth of yours to use?"'
 
 			act 'Keep quiet':
-				cls
+				*clr & cla
 				stat['bj'] += 3
 				sub += 5
 				gang += 1
@@ -36,7 +37,7 @@ act 'watch porn':
 				'Zhendos gets his dick out and pulls your face toward it. You dutifully wrap your lips around it and begin to suck. Your brother Kolka and Mishan also get their cocks out and stand around you. You start jerking them and sucking dick.'
 
 				act 'Suck':
-					cls
+					*clr & cla
 					gs 'boyStat', 'A58'
 					sexvolume = 35
 					spafinloc = 11
@@ -73,7 +74,7 @@ act 'watch porn':
 					gs 'brother', 'brotherSexCount'
 
 					if brotherSex > 6 and evgenrand = 1:
-						cls
+						*clr & cla
 						minut += 5
 						pcs_horny += 10
 						gs 'boyStat', 'A34'
@@ -102,7 +103,7 @@ act 'watch porn':
 
 			if pcs_dom > boyseeporn * 2:
 				act 'They can get lost':
-					cls
+					*clr & cla
 					pcs_dom += 1
 					gs 'stat'
 					$ImageNeededPlacholder
@@ -115,13 +116,13 @@ act 'watch porn':
 
 			exit
 		elseif evgenQW = 3:
-			cls
+			*clr & cla
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/grounds/seeporn/seeporn.jpg"></center>'
 			'The boys intensely watch porn, you notice the bulges in their pants. Zhendos suddenly takes your hand and holds it against his groin, Mishan does the same with your other hand. Your brother Kolka laughs nervously. Mishan tells you conspiratorially "<<$pcs_nickname>>, wank us off."'
 
 			act 'Jerk guys':
-				cls
+				*clr & cla
 
 				if MihJenSex = 0:MihJenSex = 1 & guy += 2
 
@@ -135,7 +136,7 @@ act 'watch porn':
 					'They get their cocks out and you gently rub both members with your hands, Zhendos quickly groans and lets fly a jet of sperm onto your foot, immediately followed by Mishan who also manages to hit your foot.'
 
 					act 'Eew':
-						cls
+						*clr & cla
 						gs 'boyStat', 'A59'
 						spafinloc = 7
 						sexpartkno = 1
@@ -158,7 +159,7 @@ act 'watch porn':
 					'They get their cocks out and you gently rub both members with your hands, your brother Kolka walks over, his eyes filled with lust and puts his dick in your mouth. You eyes widened at this turn of events. Zhendos quickly groans and from his cock flys a jet of sperm onto your foot, immediately followed by Mishan who also manages to hit your foot.'
 
 					act '"Groo gaskers!"':
-						cls
+						*clr & cla
 						gs 'boyStat', 'A59'
 						spafinloc = 7
 						sexpartkno = 1
@@ -188,7 +189,7 @@ act 'watch porn':
 
 			if pcs_dom > boyseeporn * 2:
 				act 'Remove hands':
-					cls
+					*clr & cla
 					pcs_dom += 1
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/pc/fuckoff2.jpg"></center>'
@@ -198,20 +199,20 @@ act 'watch porn':
 				end
 			end
 		elseif evgenQW = 2 and rand(0,1) = 0:
-			cls
+			*clr & cla
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/grounds/seeporn/seeporn.jpg"></center>'
 			'The boys intensely watch porn, you notice the bulges in their pants. Zhendos suddenly takes your hand and holds it against his groin, Mishan does the same with your other hand. Your brother Kolka laughs nervously. Mishan Says conspiratorially "<<$pcs_nickname>>, wank us off."'
 
 			act 'What the fuck?':
-				cls
+				*clr & cla
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/grounds/seeporn/seeporn.jpg"></center>'
 				'You shake your head. Mishan says "Come on, you''re a girl, it''s something good friends do for each other."'
 
 				if pcs_horny >= 70:
-					act 'jerk them':
-						cls
+					act 'Jerk them':
+						*clr & cla
 						stat['hj'] += 2
 
 						if MihJenSex = 0:MihJenSex = 1 & guy += 2
@@ -223,7 +224,7 @@ act 'watch porn':
 						'They get there cocks out and you gently rub both members with your hands, Zhendos quickly groaned and his cock flew jet of sperm on your foot, immediately joined by Mishan and also finished on your foot.'
 
 						act 'Resent':
-							cls
+							*clr & cla
 							gs 'boyStat', 'A59'
 							spafinloc = 7
 							sexpartkno = 1
@@ -241,7 +242,7 @@ act 'watch porn':
 					end
 				elseif pcs_horny < 70:
 					act 'Remove hands':
-						cls
+						*clr & cla
 						pcs_dom += 1
 						gs 'stat'
 						$ImageNeededPlacholder
@@ -254,15 +255,16 @@ act 'watch porn':
 			end
 			exit
 		elseif evgenQW = 1 and rand(0,1) = 0:
-			cls
+			*clr & cla
 			pcs_horny += 10
 			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/grounds/seeporn/assgrab.jpg"></center>'
 			'The boys intensely watch porn, you notice, their boners straining to get out of their pants.'
 			'You feel Zhendos hand gently stroking your ass.'
 
 			if pcs_horny < 70:
 				act 'Remove his hand':
-					cls
+					*clr & cla
 					pcs_dom += 1
 					gs 'stat'
 					$ImageNeededPlacholder
@@ -273,7 +275,7 @@ act 'watch porn':
 				end
 			elseif pcs_horny >= 70:
 				act 'Pretend that nothing is happening':
-					cls
+					*clr & cla
 					sub += 1
 					evgenqw = 2
 					gs 'stat'
@@ -286,14 +288,15 @@ act 'watch porn':
 
 			exit
 		elseif evgenQW = 0 and rand(0,1) = 0:
-			cls
+			*clr & cla
 			gs 'stat'
+			'<center><video autoplay loop src="images/shared/home/tv/seeporn.mp4"></video></center>'
 			'The boys intensely watch porn, you notice, their boners straining to get out of their pants.'
 			'Zhendos looking at the porn asks you "Have you ever done that, <<$pcs_nickname>>?"'
 
 			if pcs_horny < 70:
 				act 'Go to hell, jerk':
-					cls
+					*clr & cla
 					pcs_dom += 1
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/pc/fuckoff2.jpg"></center>'
@@ -303,7 +306,7 @@ act 'watch porn':
 				end
 			elseif pcs_horny >= 70:
 				act 'Keep quiet':
-					cls
+					*clr & cla
 					sub += 1
 					evgenQW = 1
 					gs 'stat'
@@ -322,8 +325,7 @@ act 'watch porn':
 end
 
 if $ARGS[0] = 'SeePornPalevo':
-	cla
-	cls
+	*clr & cla
 	bratrand = RAND(0,1)
 	!boyseeporn += 1
 	'<center><video autoplay loop src="images/shared/home/tv/seeporn.mp4"></video></center>'
@@ -331,14 +333,14 @@ if $ARGS[0] = 'SeePornPalevo':
 	gs 'stat'
 
 	if bratrand = 0:
-		cls
+		*clr & cla
 		boyseeporn += 1
 		gs 'stat'
 
 		'Zhendos suggests "<<$pcs_nickname>>, How about putting that mouth to work? Kolka told us how you entertained the guys in the park so there''s no need to act all innocent. Unless of course you want everyone to know."'
 
 		act 'Say nothing':
-			cls
+			*clr & cla
 			stat['bj'] += 3
 			sub += 3
 			gang += 1
@@ -350,7 +352,7 @@ if $ARGS[0] = 'SeePornPalevo':
 			'Your brother Kolka and Mishan also get their members out and stand around you, you start to masturbate and suck dick. You find the unusual and awkward situation a little exciting.'
 
 			act 'Suck':
-				cls
+				*clr & cla
 				gs 'boyStat', 'A58'
 				sexvolume = 35
 				spafinloc = 11
@@ -390,7 +392,7 @@ if $ARGS[0] = 'SeePornPalevo':
 		end
 
 		act 'Call his bluff':
-			cls
+			*clr & cla
 			BrotherNo = 1
 			'<center><img <<$set_imgh>> src="images/pc/fuckoff2.jpg"></center>'
 			'"Fuck off, who would believe you." Your brother looks at you then says to Zhendos "Better luck next time."'
@@ -403,7 +405,7 @@ if $ARGS[0] = 'SeePornPalevo':
 		'You realise, your brother could not resist and told his friends. Hopefully only them.'
 
 		act 'You can manage two little ones':
-			cls
+			*clr & cla
 			stat['bj'] += 3
 			sub += 3
 			gang += 1
@@ -414,7 +416,7 @@ if $ARGS[0] = 'SeePornPalevo':
 			'"I told you that she would take it in the mouth like a pro, and you didn''t believe me", your brother laughs.'
 
 			act 'Suck':
-				cls
+				*clr & cla
 				pcs_horny += 10
 				gs 'stat'
 				if brotherSex < 6:brotherSex = 6
@@ -425,7 +427,7 @@ if $ARGS[0] = 'SeePornPalevo':
 				'The boys don''t last long and almost simultaneously finish on your face. Seen too much damn porn, juvenile perverts.'
 
 				act 'Close your eyes':
-					cls
+					*clr & cla
 					gs 'boyStat', 'A58'
 					sexvolume = 35
 					spafinloc = 11
@@ -457,7 +459,7 @@ if $ARGS[0] = 'SeePornPalevo':
 		end
 
 		act 'I don''t think so!':
-			cls
+			*clr & cla
 			BrotherNo = 1
 			'<center><img <<$set_imgh>> src="images/pc/disgust.jpg"></center>'
 			'You indignantly reject the kids. Your brother looks at you and announces "Probably for the best, your tiny peckers would only count as one cock."'

locations/street_event.qsrc

@@ -431,12 +431,7 @@ if $ARGS[1] = 'main':
 		'<<$streetev_title>>'
 		'<center><img src="images/locations/shared/street/pursesnatch.jpg"></center>'
 		'As you are walking down the street minding your own business, you are suddenly jerked sideways and nearly pulled off your feet. As you stumble to regain your balance you realize a man has just snatched your purse from you and is running away with it.'
-		act 'It''s only money':
-			*clr & cla
-			money = 0
-			gs 'stat'
-			act 'That jackass':gt $loc
-		end
+		act 'It''s only money': money = 0 & gt $loc
 		act 'Chase him':
 			*clr & cla
 			if pcs_run + pcs_stam < rand(120,250):

locations/train.qsrc

@@ -175,10 +175,13 @@ end
 
 !!destination 4
 if $ARGS[0] = 'village':
-	*clr & cla
+	$loc = 'train'
+	$metka = 'village'
 	$menu_loc = 'train'
 	$menu_arg = 'village'
 	menu_off = 0
+	
+	*clr & cla
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/shared/train/gadplat.jpg" ></center>'
 	if storyline = 1: