34 Commits 2626fab5f8 ... 9effc5bc53

Author SHA1 Message Date
  Caniculasrs 9effc5bc53 Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife 5 years ago
  KevinSmarts 48f140065a Merge remote-tracking branch 'julzor/master' 5 years ago
  KevinSmarts d3e6a7e069 [fixes] Action being different not clear in code. 5 years ago
  julzor ffb9e4039d [fixes] wrong video in fedorEv4 5 years ago
  julzor 712f1c786f [fixes] missing action and cla's in casino 5 years ago
  julzor f409a8234b [fixes] wear clothes after leaving the banya in gadbana 5 years ago
  julzor ad1c06c123 [fixes] wrong file encoding (qwBarBilliard) 5 years ago
  julzor 87537d41c3 [fixes] missed one prst_bribe in street_walker 5 years ago
  julzor c4d8855b1d [fixes] the variables prst_bribe 1/2 is used the other way around in police_station 5 years ago
  julzor 7db5e77983 Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife 5 years ago
  julzor a597ae5e6b [fixes] wrong variable in lover_pref, location not found error in gdktoilet and cleaning your clothes shouldn't clean your face in din_van 5 years ago
  KevinSmarts 595a6a2776 [fixes] Exit action in middle of another action making it not showup or be in the wrong place. 5 years ago
  KevinSmarts cc8258ae24 [fixes] boyStat not set for event at the salon 5 years ago
  julzor 44b8331368 [fixes] increased mood gains/loses, added more missing gs 'stat', moved the money loss 5 years ago
  julzor 654e9e1433 [fixes] missing gs 'stat' 5 years ago
  julzor 5fef46b6bd [changed] move the leave option to the top in fedorev3 and the text below the image in gpoli 5 years ago
  julzor d4fc6dcf20 [fixes] menu was blocked at the start of every hour 5 years ago
  julzor 45531d3870 Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife 5 years ago
  KevinSmarts 9de7128057 Merge remote-tracking branch 'julzor/master' 5 years ago
  KevinSmarts 3e61637a2b [fixes] Variable check prevented getting dressed in the banya 5 years ago
  julzor 5890afda20 [fixes] small edits to club 5 years ago
  julzor 90efe7374d [fixes] moved the leave option to the top in gadriver 5 years ago
  julzor 0622dadd45 [fixes] missing $loc, $metka in train 5 years ago
  julzor 7c994f438e [fixes] removed a cla and a small [text edit] in seeporn 5 years ago
  julzor c6b6c72970 [Ìfixes] removed an unnecessary action in street_event 5 years ago
  julzor cca5bc59a0 Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife 5 years ago
  julzor 56bceeace2 [fixes] the wrong cumspcInt in din_van and removed the incorrect image 5 years ago
  julzor c44d9a25cf [fixes] missing pictures in seeporn 5 years ago
  julzor b07986fd28 [fixes] missing end in brother_voyeur 5 years ago
  KevinSmarts 5b21f51639 [fixes] Correction of attribute as it wasn't posted by the person who did it 5 years ago
  KevinSmarts 3c04294b71 [added] Version history and start info for 0.7.3 release 5 years ago
  KevinSmarts d1d4e6c4bc [text edit] Made the drunk messages clearer and added some colour change to show a little progression 5 years ago
  julzor 31f75b20f3 [text edit] defrenched the text 5 years ago
  julzor b838f067c8 [fixes] for alko values 5 years ago

+ 0 - 2
locations/Autofight.qsrc

@@ -1,7 +1,5 @@
 # Autofight
 
-
-menu_off = 1
 if Formula = 0:Formula = 3
 
 $endurdin = {

+ 1 - 1
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

+ 12 - 12
locations/FedorEv3.qsrc

@@ -445,6 +445,12 @@ if $ARGS[0] = 'Ladies Room':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/movies/restroom/ladies/ladiesrestroom.jpg"></center>'
 	'The ladies room is very clean and has 3 <a href="exec:gt ''mirror'', ''start''">mirrors</a>, 3 sinks and 4 stalls.'
 	
+	if EndMovie = 1:
+		act 'Leave the restroom':gt 'FedorEv3', 'Movies 3'
+	else
+		act 'Go back to the theater':gt 'FedorEv3', 'Movies 2'
+	end	
+	
 	act 'Have a quick wash (0:10)':
 		VK = rand(1,10)
 		if VK <= 4:
@@ -453,12 +459,6 @@ if $ARGS[0] = 'Ladies Room':
 			gt 'FedorEv3', 'Restroom Wash'
 		end	
 	end	
-	
-	if EndMovie = 1:
-		act 'Leave the restroom':gt 'FedorEv3', 'Movies 3'
-	else
-		act 'Go back to the theater':gt 'FedorEv3', 'Movies 2'
-	end	
 end		
 		
 if $ARGS[0] = 'Mens Room':
@@ -476,6 +476,12 @@ if $ARGS[0] = 'Mens Room':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/movies/restroom/ladies/ladiesrestroom.jpg"></center>'
 	'The Men''s room is a little dirty and has a long <a href="exec:gt ''mirror'', ''start''">mirror</a>, 2 sinks and 4 stalls.'		
 
+	if EndMovie = 1:
+		act 'Leave the restroom':gt 'FedorEv3', 'Movies 3'
+	else
+		act 'Go back to the theater':gt 'FedorEv3', 'Movies 2'
+	end	
+	
 	act 'Have a quick wash (0:10)':
 		VK = rand(1,20)
 		if VK <= 5 and WithFedor = 0:
@@ -490,12 +496,6 @@ if $ARGS[0] = 'Mens Room':
 			gt 'FedorEv3', 'Restroom Wash 2'
 		end	
 	end	
-	
-	if EndMovie = 1:
-		act 'Leave the restroom':gt 'FedorEv3', 'Movies 3'
-	else
-		act 'Go back to the theater':gt 'FedorEv3', 'Movies 2'
-	end	
 end	
 		
 if $ARGS[0] = 'Restroom Fedor':

+ 1 - 1
locations/FedorEv4.qsrc

@@ -715,7 +715,7 @@ if $ARGS[0] =  'Movie Action':
 	pcs_willpwr += 15
 	minut += 90
 	gs'stat'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/tv/tvkino'+rand(2,3)+'.mp4"></center>'
+	'<center><video autoplay loop src="images/locations/pavlovsk/resident/apartment/shulginhome/tv/tvkino'+rand(2,3)+'.mp4"></video></center>'
 	'You and Fedor begin watching an action/drama movie while occasionally discussing your favorite scenes as you see them.'
 
 	act 'Finish movie':gt 'FedorEv4', 'Home 3'

+ 2 - 1
locations/Gadbana.qsrc

@@ -27,11 +27,12 @@ end
 gs 'stat'
 
 if mira = 0:
-	if clothesAtLocation = 1 and $clothingworntype = 'nude':
+	if $clothingworntype = 'nude':
 		act 'Get dressed and leave':
 			minut += 1
 			menu_off = 1
 			!!gs 'clothing', 'recover_lost_clothes', 'Gadbana', 1
+			gs 'clothing', 'wear_last_worn'
 			if banya_underwear = 1: gs 'underwear', 'wear'
 			gs 'stat'
 			killvar 'banya_underwear'

+ 1 - 1
locations/MartinSex2.qsrc

@@ -66,7 +66,7 @@ if $ARGS[0] = 'MartinSexPrep':
 	if pcs_vag = 0:
 		'But before either of you can make another move, a nagging thought that''s been floating around the back of your head pushes to the foreground of your mind: You are a virgin. Is Martin <i>really</i> the man you want to have your first time with? Not to mention all the risks involved if you didn''t take all necessary precautions against pregnancy...'
 	elseif prezik > 0 and preziktype ! 2 and tabletkishot < 1 and pillcon2 < 30000 and ovulate > 0: 
-		'But before either of you can make another move, a simple, powerful thought crosses your mind: You could get pregnant. And unless your count is off, today is a dangerous day to boot. You take a tentative look at your ' + iif(bag > 0,'purse','pocket') + ', the condoms sitting in it materializing before your inner eye.' + iif(preziktype=1,' You usually prefer to have sex sans condoms, but...', ' ')
+		'But before either of you can make another move, a simple, powerful thought crosses your mind: You could get pregnant. And unless your count is off, today is a dangerous day to boot. You take a tentative look at your ' + iif(bag > 0,'purse','pocket') + ', the condoms sitting in it materializing before your inner eye.' + iif(preziktype=1,' You usually prefer to have sex without condoms, but...', ' ')
 	elseif prezik > 0 and preziktype ! 2 and tabletkishot < 1 and pillcon2 < 30000: 
 		'But before either of you can make another move, a simple, powerful thought crosses your mind: You could get pregnant. Today isn''t really a dangerous day, but it might be better to be safe than sorry. And while Martin doesn''t seem like the type who fucks random sluts, you can never be entirely sure of that, can you? You take a tentative look at your ' + iif(bag > 0,'purse','pocket') + ', the condoms sitting in it materializing before your inner eye.' + iif(preziktype=1,' You usually prefer to have sex sans condoms, but...')
 	elseif prezik > 0 and preziktype = 2 and tabletkishot < 1 and pillcon2 < 30000 and ovulate > 0: 

+ 5 - 5
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

+ 15 - 6
locations/casino.qsrc

@@ -141,24 +141,28 @@ if $ARGS[0] = 'roulette_bet2':
 	end
 	
 	act 'Red / Black':
+		cla
 		act 'Reconsider': gt 'casino', 'roulette_bet2'
 		act 'Red': kh = 1 & gt 'casino', 'roulette_result'
 		act 'Black': kh = 2 & gt 'casino', 'roulette_result'
 	end
 
 	act 'Even / Odd':
+		cla
 		act 'Reconsider': gt 'casino', 'roulette_bet2'
 		act 'Even':	chnch = 1 & gt 'casino', 'roulette_result'
 		act 'Odd': chnch = 2 & gt 'casino', 'roulette_result'
 	end
 
 	act 'Small / Large':
+		cla
 		act 'Reconsider': gt 'casino', 'roulette_bet2'
 		act 'Small: 1-18': mb = 1 & gt 'casino', 'roulette_result'
 		act 'Large: 19-36':	mb = 2 & gt 'casino', 'roulette_result'
 	end
 
 	act 'Dozen':
+		cla
 		act 'Reconsider': gt 'casino', 'roulette_bet2'
 		act 'First dozen: 1-12': du = 1 & gt 'casino', 'roulette_result'
 		act 'Second dozen: 13-24': du = 2 & gt 'casino', 'roulette_result'
@@ -166,6 +170,7 @@ if $ARGS[0] = 'roulette_bet2':
 	end
 
 	act 'Series':
+		cla
 		act 'Reconsider': gt 'casino', 'roulette_bet2'
 		act 'First row: 1, 4, 7, 10, 13, 16, 19, 22, 25, 28, 31, 34': series = 1 & gt 'casino', 'roulette_result'
 		act 'Second row: 2, 5, 8, 11, 14, 17, 20, 23, 26, 29, 32, 35': series = 2 & gt 'casino', 'roulette_result'
@@ -173,13 +178,17 @@ if $ARGS[0] = 'roulette_bet2':
 	end
 
 	act 'Number':
-		chi = input 'Enter a number from 0-36'
+		cla
+		act 'Reconsider': gt 'casino', 'roulette_bet2'
+		act 'Choose a number':
+			chi = input 'Enter a number from 0-36'
 
-		if chi < 0 and chi > 36:
-			msg 'You need to choose a number between 0 and 36.'
-			gt 'casino', 'roulette_bet2'
-		else
-			gt 'casino', 'roulette_result'
+			if chi < 0 and chi > 36:
+				msg 'You need to choose a number between 0 and 36.'
+				gt 'casino', 'roulette_bet2'
+			else
+				gt 'casino', 'roulette_result'
+			end
 		end
 	end
 end

+ 27 - 38
locations/club.qsrc

@@ -2,11 +2,13 @@
 CLOSE ALL
 
 if $ARGS[0] = 'start':
-	$sexloc = $CURLOC
-    $location_type = 'public_outdoors'
+	$loc = 'club'
+	$metka = 'start'
 	$menu_loc = 'club'
 	$menu_arg = 'start'
 	menu_off = 0
+	$location_type = 'public_outdoors'
+	$sexloc = $curloc
 	*clr & cla
 	minut += 5
 	gs 'stat'
@@ -15,10 +17,7 @@ if $ARGS[0] = 'start':
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/club.jpg"></center>'
 	'The entrance area of the club is full of young people. The entrance itself is guarded by the heavy and strong type of men, who check everyones passport. A Ticket costs 250 <b>₽</b>.'
 
-	act 'Return to the city center':
-		minut += 5
-		gt 'down'
-	end
+	act 'Return to the city center': minut += 5 & gt 'down'
 
 	if clubwork = 1:
 		act 'Meet Erik for work':
@@ -79,9 +78,12 @@ if $ARGS[0] = 'start':
 end
 
 if $ARGS[0] = 'inside':
+	$loc = 'club'
+	$metka = 'inside'
 	$menu_loc = 'club'
 	$menu_arg = 'inside'
 	menu_off = 0
+	$location_type = 'public_indoors'
 	*clr & cla
 	minut += 5
 	frost = 0
@@ -89,27 +91,25 @@ if $ARGS[0] = 'inside':
 	gs 'themes', 'indoors'
 	'<center><b><font color="maroon">Night club</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/club9.jpg"></center>'
-	'<a href="exec:gt ''club'', ''vip''">Vip-room.</a>'
 	'The music here is loud and the bass is thumping. You see a laser show on the stage and on the poorly lit dancefloor you see the people dancing, like there''s no tomorrow.'
+	*nl
+	'There is also a <a href="exec:gt ''club'', ''vip''">vip-room</a>.'
 
 	if hour >= 18 and pcs_apprnc > 88 and clubwork = 0 and clubno = 0 and rand (0,10) = 0:
-		cla
-		*clr
+		*clr & cla
 		menu_off = 1
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/club11.jpg"></center>'
 		'You are approached by a man in a suit, at first you think he must be security, but his suit looks too expensive.'
 		'"Hi there, my name''s Erik, I''m the promoter for the club. I''m looking for someone for some casual work and you have the right look."'
 		act 'Hear him out':
-			cla
-			*clr
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/club11.jpg"></center>'
 			'"The club opens at 6pm you can work for an hour at a time upto 1am. The jobs vary according to time and demand, It includes finding customers to bring to the club, promoting drinks and some dancing."'
 			'"The pay depends on results, get more people in, get people taking up drink promotions or dance well and you get 200 <b>₽</b>. Do worse, you get less, do well, you get a bonus. When you finish you can stay in the club, so you get free entry."'
 			'"So, are you interested?"'
 			act 'No':clubno = 1 & gt 'club', 'inside'
 			act 'Yes':
-				cla
-				*clr
+				*clr & cla
 				clubwork = 1
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/club11.jpg"></center>'
 				'You tell Erik you are interested and he takes your details.'
@@ -128,10 +128,9 @@ if $ARGS[0] = 'inside':
 		gt 'down'
 	end
 	
-	if hour >= 18  and clubwork = 0 and clubno = 1:
+	if hour >= 18 and clubwork = 0 and clubno = 1:
 		act 'Look for the promoter':
-			cla
-			*clr
+			*clr & cla
 			menu_off = 1
 			minut += 5
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/club11.jpg"></center>'
@@ -159,14 +158,13 @@ if $ARGS[0] = 'inside':
 
 	if hour <= 3 or hour >= 18:
 		act 'Use the toilet':gt 'club', 'toi'
-		act 'Have a dance':gt 'club', 'dance'
+		act 'Go to the dance floor':gt 'club', 'dance'
 		act 'Go to the bar':gt 'club', 'bar'
 	end
 
 	if (hour < 1 or hour >= 18) and clubwork = 1:
 		act 'Find Erik for work':
-			cla
-			*clr
+			*clr & cla
 			minut += 5
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/club11.jpg"></center>'
 			'You search around and it only takes a few minutes to find Erik in his suit.'
@@ -180,6 +178,7 @@ if $ARGS[0] = 'toi':
 	$menu_arg = 'toi'
 	menu_off = 0
 	*clr & cla
+	gs 'stat'
 	'Shit, there''s a very long queue infront of the womens toilet. You can''t tell how long this is going to take.'
 
 	act 'Wait in line':
@@ -220,10 +219,8 @@ if $ARGS[0] = 'toi':
 end
 
 if $ARGS[0] = 'tou':
-	$metkaM = $ARGS[0]
-	$locM = $CURLOC
-	$metka = $ARGS[0]
-	$loc = $CURLOC
+	$metka = 'tou'
+	$loc = 'club'
 	$locM = 'club'
 	$metkaM = 'tou'
     $location_type = 'bathroom'
@@ -236,7 +233,7 @@ if $ARGS[0] = 'tou':
 	gs 'themes', 'indoors'
 	'<center><b><font color="maroon">WC</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/club3.jpg"></center>'
-	''
+	*nl
 
 	act 'Leave the toilet':gt 'club', 'inside'
 
@@ -259,7 +256,7 @@ if $ARGS[0] = 'dance':
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/club9.jpg"></center>'
 	'The club is filled to the brink with people. Most of which are dancing on the dancefloor.'
 	
-	act 'Leave':gt 'club', 'inside'
+	act 'Leave the dance floor':gt 'club', 'inside'
 	
 	if hour <= 3 or hour >= 18:
 		act 'Dance (0:15)':
@@ -285,8 +282,7 @@ if $ARGS[0] = 'dance':
 				act 'Stop dancing':gt 'club', 'inside'
 				
 				act 'Dance with him':
-					cla
-					*clr
+					*clr & cla
 					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/club8.jpg"></center>'
 					'You continue to dance with the guy on the dancefloor, but he doesn''t stop touching your. It somehow gets you excited, when a random guy is touching you in public.'
 
@@ -309,10 +305,7 @@ if $ARGS[0] = 'dance':
 							gs 'stat'
 							picrand = 38
 
-							if pcs_horny < 70:
-								act 'Go to the dance floor':gt 'club', 'dance'
-							end
-
+							if pcs_horny < 70: act 'Go to the dance floor':gt 'club', 'dance'
 							act 'Go to Vip-room with the guy':$sexloc = 'vipclub' & xgt 'sex', 'var'
 						elseif dansexclub = 0:
 							'You''re passionately kissing the guy, while he''s continously groping you, always dedicating one of his hands to either your tits or your ass. "Let''s go to the toilet.", he says with a smile.'
@@ -320,18 +313,14 @@ if $ARGS[0] = 'dance':
 							gs 'arousal', 'kiss', 15, 'sub'
 							gs 'stat'
 
-							if pcs_horny < 70:
-								act 'Go to the dance floor':gt 'club', 'dance'
-							end
-
+							if pcs_horny < 70: act 'Go to the dance floor':gt 'club', 'dance'
 							act 'Go to the toilet with a guy':gt 'club', 'sex'
 						end
 					end
 				end
 
 				if clrand > 85:
-					cla
-					*clr
+					*clr & cla
 					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/dancelezb.jpg"></center>'
 					'While you''re dancing you a hand groping your ass. You turn around to see who touched your, but you''re surprised to see women smiling at you, she seems to be biting her lips.'
 					dansexclub = rand(0, 1)
@@ -425,7 +414,7 @@ if $ARGS[0] = 'dance':
 	else
 		menu_off = 1
 		'Its getting late and the music stops, looks like it might be time to go home.'
-		act 'Leave':gt 'club', 'inside'
+		act 'Leave the dance floor': gt 'club', 'inside'
 	end	
 end
 

+ 4 - 5
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.'
 
@@ -534,11 +533,11 @@ $basin = {
 		end
 	end
 
-	if (cumloc[6] = 1 or cumloc[7] = 1):
+	if cumloc[2] = 1 or cumloc[5] = 1 or cumloc[6] = 1 or cumloc[7] = 1:
 		act 'Wash the cum off your clothes (0:10)':
 			menu_off = 1
 			*clr & cla
-			cumspclnt = 13
+			cumspclnt = 9
 			gs 'cum_cleanup'
 			cumspclnt = 6
 			gs 'cum_cleanup'

+ 5 - 2
locations/experiment.qsrc

@@ -2401,8 +2401,11 @@ if $ARGS[0] = 'testarea:treatment:impreg':
 	'Lying on the bed you hear the door open once again. You have lost count of how many times you have been abused, how many ejaculations have you taken inside you...'
 	'You do not even watch to see who is coming in, you automatically turn around on the bed, sticking your ass up, getting ready to be fucked once again...'
 
-	act 'Await penetration':gt 'experiment', 'testarea:treatment:impreg:doctor'
-	if expVolunteer = 1:act 'Await penetration':gt 'experiment', 'testarea:treatment:impreg:doctor:volunteer'
+	if expVolunteer = 0:
+		act 'Await penetration':gt 'experiment', 'testarea:treatment:impreg:doctor'
+	else
+		act 'Await penetration':gt 'experiment', 'testarea:treatment:impreg:doctor:volunteer'
+	end
 end
 
 if $ARGS[0] = 'testarea:treatment:impreg:doctor:volunteer':

+ 28 - 27
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

+ 2 - 2
locations/gdkin.qsrc

@@ -159,9 +159,9 @@ if $ARGS[0] = '':
 			if alko >= 6:
 				'You''re too drunk to dance and you lean against the wall for support to keep from falling down.'
 				if rand (0,1) = 0:gt 'gdkin', 'too_drunk_dance'
-			elseif alko = 1:
+			elseif alko > 0 and alko <= 3:
 				'You''re tipsy, and standing against the wall watching the others dance.'
-			elseif alko > 1:
+			elseif alko > 3 and alko < 6:
 				'You''re drunk, and standing against the wall watching the others dance.'
 			else
 				'You are standing next to the wall while watching the others dance.'

+ 1 - 1
locations/gdksex.qsrc

@@ -25,7 +25,7 @@ if $ARGS[0] = 'outside':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/dk_night.jpg"></center>'
 			if alko < 6:'You smile at him but say: "No thanks, I''m not really in the mood for beer right now..."'
-			if alko >= 6:'You''re already fairly tipsy and mumble: "I don''t thi-*hic* think I should... *hic*"'
+			if alko >= 6:'You''re already really drunk and mumble: "I don''t thi-*hic* think I should... *hic*"'
 			'<<$boydesc>> offers you a disarming smile and says: "Alright, no problem! We can just chat!"'
 				act'Chat with him':
 				*clr & cla

+ 81 - 87
locations/gdktoilet.qsrc

@@ -8,7 +8,7 @@ if $ARGS[0] = 'start':
 	$menu_loc = 'gdktoilet'
 	$menu_arg = 'start'
 	menu_off = 0
-	cls
+	*clr & cla
 	gs 'stat'
 	ghnow = 0
 	gs 'themes', 'indoors'
@@ -71,7 +71,7 @@ if $ARGS[0] = 'mens_entrance_events':
 		'It''s unusually empty, but you see someone near the urinals.'
 		act 'Look closer':
 			minut +=2
-			cls
+			*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/ghmanstand.jpg"></center>'
@@ -79,10 +79,10 @@ if $ARGS[0] = 'mens_entrance_events':
 			if pcs_vag >= 1:
 				if pcs_horny >=80:
 					act 'Seduce him':
-						cls
+						*clr & cla
 						gs 'stat'
 						if pcs_cupsize >= 20:
-							cls
+							*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/grabbig.jpg"></center>'
@@ -91,7 +91,7 @@ if $ARGS[0] = 'mens_entrance_events':
 							gs 'stat'
 							act 'Kiss him': gt'gdktoilet', 'mensglory'
 						elseif $pantyworntype ! 'none':
-							cls
+							*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/seducesmall.jpg"></center>'
@@ -100,7 +100,7 @@ if $ARGS[0] = 'mens_entrance_events':
 							gs 'stat'
 							act 'Kiss him': gt'gdktoilet', 'mensglory'
 						else
-							cls
+							*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/nakedsmall.jpg"></center>'
@@ -112,7 +112,7 @@ if $ARGS[0] = 'mens_entrance_events':
 					end
 				elseif pcs_horny >=40 and pcs_dom >= 40:
 					act 'Masturbate':
-						cls
+						*clr & cla
 						gs 'stat'
 						pcs_mood += 15
 						pcs_willpwr += 15
@@ -124,7 +124,7 @@ if $ARGS[0] = 'mens_entrance_events':
 						gs 'stat'
 						if pcs_apprnc >= 80:
 							if pcs_dom <=80:
-								cls
+								*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/1kissing.jpg"></center>'
@@ -133,7 +133,7 @@ if $ARGS[0] = 'mens_entrance_events':
 								gs 'stat'
 								act 'Give In': gt'gdktoilet', 'mensglory'
 							else
-								cls
+								*clr & cla
 								gs 'stat'
 								'<center><b><font color="maroon">Men''s Room</font></b></center>'
 								'<center><img <<$set_imgh>> src="images/pc/fuckoff2.jpg"></center>'
@@ -162,7 +162,7 @@ if $ARGS[0] = 'mens_entrance_events':
 	elseif temp >= 50 and temp <=79 and soniaPS >= 1 and hour >= 20 and hour <=23:
 		pcs_horny += 5
 		minut += 5
-		cls
+		*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>'
@@ -179,7 +179,7 @@ if $ARGS[0] = 'mens_entrance_events':
 		end
 !!Ivan and Vicky
 	elseif temp >= 40 and temp <= 45 and hour >= 20 and hour <=23:
-		cls
+		*clr & cla
 		pcs_horny += 10
 		minut += 5
 		gs 'stat'
@@ -191,7 +191,7 @@ if $ARGS[0] = 'mens_entrance_events':
 		act 'Leave': gt'gdktoilet', 'start'
 !!Gopnik''s:
 	elseif temp >= 30 and temp <= 39 and hour >= 20 and hour <=23:
-		cls
+		*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>'
@@ -205,7 +205,7 @@ if $ARGS[0] = 'mens_entrance_events':
 		act 'Leave': gt'gdktoilet', 'start'
 !!Dimka:
 	elseif temp >= 20 and temp <= 29 and hour >= 20 and hour <=23:
-		cls
+		*clr & cla
 		minut += 5
 		gs 'stat'
 		'<center><b><font color="maroon">Men''s Room</font></b></center>'
@@ -215,7 +215,7 @@ if $ARGS[0] = 'mens_entrance_events':
 			'You look at her giving him the blowjob and you want to be punished too.'
 			if DimaRudeQW = 0:
 				act 'Interrupt':
-					cls
+					*clr & cla
 					minut += 5
 					pcs_horny += 10
 					gs 'stat'
@@ -226,7 +226,7 @@ if $ARGS[0] = 'mens_entrance_events':
 				end
 			elseif DimaRudeQW > 0:
 				act 'Interrupt':
-					cls
+					*clr & cla
 					minut += 5
 					dimkawarn = 0
 					gs 'stat'
@@ -234,7 +234,7 @@ if $ARGS[0] = 'mens_entrance_events':
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/bathroom/womens/sex/smiling.jpg"></center>'
 					'Wanting some attention from your boyfriend you decide to interrupt them. Dimka sees you and says, "Look what we have here, one more of my bitches to join us." He turns to the girl on the ground and says to her "Get on the ground and lay down."'
 					act 'Climb on top':
-						cls
+						*clr & cla
 						gs 'stat'
 						'<center><b><font color="maroon">Men''s Room</font></b></center>'
 						'<center><video autoplay loop src="images/locations/pavlovsk/community/bathroom/mens/sex/threesomeanal.mp4"></video></center>'
@@ -244,7 +244,7 @@ if $ARGS[0] = 'mens_entrance_events':
 						minut -= 10
 						gs 'stat'
 						act 'Continue':
-							cls
+							*clr & cla
 							pcs_mood += 15
 							pcs_willpwr += 15
 							sub += 5
@@ -269,7 +269,7 @@ if $ARGS[0] = 'mens_entrance_events':
 		end
 !!No Event/With Gloryhole2:
 	else
-		cls
+		*clr & cla
 		minut += 1
 		temp = RAND(1,2)
 		gs 'stat'
@@ -286,7 +286,7 @@ if $ARGS[0] = 'mens':
 	$menu_loc = 'gdktoilet'
 	$menu_arg = 'mens'
 	menu_off = 0
-	cls
+	*clr & cla
 	gs 'stat'
 	
 	if hour >=20 and hour <=23:
@@ -309,7 +309,7 @@ if $ARGS[0] = 'mens':
 	act 'Leave': gt 'gdktoilet', 'start'
 	
 	act 'Look at the hole':
-		cls
+		*clr & cla
 		menu_off = 1
 		gs 'stat'
 		'<center><b><font color="maroon">Men''s Room</font></b></center>'
@@ -328,7 +328,7 @@ if $ARGS[0] = 'mens':
 			end
 		end
 		act 'Move away':
-			cls
+			*clr & cla
 			minut += 1
 			gs 'stat'
 			gt'gdktoilet', 'mens'
@@ -348,11 +348,11 @@ if $ARGS[0] = 'mensmast':
 	menu_off = 1
 	gs 'stat'
 	if picrand = 1:
-		cls
+		*clr & cla
 		gs 'stat'
 		'<center><video autoplay loop src="images/locations/pavlovsk/community/bathroom/womens/sex/caress1.mp4"></video></center>'
 	else
-		cls
+		*clr & cla
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/shared/sex/mast/mastr.jpg"></center>'
 	end
@@ -367,7 +367,7 @@ if $ARGS[0] = 'mensmast':
 	end
 	if pcs_horny >= 90:
 		act 'Climax':
-			cls
+			*clr & cla
 			pcs_mood += 15
 			pcs_willpwr += 15
 			minut += 5
@@ -379,7 +379,7 @@ if $ARGS[0] = 'mensmast':
 			gs 'arousal', 'masturbate', 2
 			gs 'stat'
 			act 'Clean yourself':
-				cls
+				*clr & cla
 				minut += 1
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/bathroom/mens/sex/mensmast2.jpg"></center>'
@@ -409,7 +409,7 @@ if $ARGS[0] = 'mensmast':
 						end
 					else
 						act 'Suck':
-							cls
+							*clr & cla
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/bathroom/mens/sex/mensmast3.jpg"></center>'
 							'You open your mouth and begin to suck his dick. You can feel your pussy getting itchy again so you start to rub it. You continue to rub your clit until the man is about to cum.'
@@ -418,7 +418,7 @@ if $ARGS[0] = 'mensmast':
 							minut -= 5
 							gs 'stat'
 							act 'Climax again':
-								cls
+								*clr & cla
 								pcs_mood += 15
 								pcs_willpwr += 15
 								minut += 5
@@ -432,7 +432,7 @@ if $ARGS[0] = 'mensmast':
 								gs 'arousal', 'end'
 								gs 'stat'
 								act 'Rest':
-									cls
+									*clr & cla
 									minut += 5
 									gs 'stat'
 									'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/bathroom/mens/sex/mensmast5.jpg"></center>'
@@ -467,7 +467,7 @@ if $ARGS[0] = 'mensglory':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/bathroom/mens/sex/1kissing.jpg"></center>'
 	act 'Submit':
-		cls
+		*clr & cla
 		gs 'stat'
 		'<center><video autoplay loop src="images/locations/pavlovsk/community/bathroom/mens/sex/2turning.mp4"></video></center>'
 		'He turns you around against the wall. He presses your face and breasts to the wall, while pulling your hips back away from the wall. Despite his aggressive behavior you rather enjoy his rough behavior.'
@@ -475,7 +475,7 @@ if $ARGS[0] = 'mensglory':
 		gs 'stat'
 		act 'Spread your ass cheeks':
 			guy += 1
-			cls
+			*clr & cla
 			gs 'stat'
 			'<center><video autoplay loop src="images/locations/pavlovsk/community/bathroom/mens/sex/3doggy.mp4"></video></center>'
 			'He licks his fingers and coats the tip of his dick with his saliva. He then takes his <<npc_dick[$npclastgenerated]>>cm dick and guides it into your wet pussy. Grabbing your hips he begins to thrust, into you hard and fast. You are so overwhelmed and turned on, that you fail to notice other men that just walked in and are now watching.'
@@ -484,7 +484,7 @@ if $ARGS[0] = 'mensglory':
 			act 'Turn Around':
 				pcs_mood += 15
 				pcs_willpwr += 15
-				cls
+				*clr & cla
 				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 a 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.'
@@ -493,7 +493,7 @@ if $ARGS[0] = 'mensglory':
 				gs 'stat'
 				act 'Suck':
 					pcs_throat += 1
-					cls
+					*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.'
@@ -503,14 +503,14 @@ if $ARGS[0] = 'mensglory':
 						act 'Pull away':
 							minut +=5
 							gs 'stat'
-							cls
+							*clr & cla
 							'<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
-								cls
+								*clr & cla
 								gs 'cum_manage'
 								gs 'stat'
 								'<center><video autoplay loop src="images/shared/sex/cum/mouth/cum1,1.mp4"></video></center>'
@@ -523,7 +523,7 @@ if $ARGS[0] = 'mensglory':
 								gs 'cum_manage'
 								spafinloc = 14
 								gs 'cum_manage'
-								cls
+								*clr & cla
 								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.'
@@ -537,7 +537,7 @@ if $ARGS[0] = 'mensglory':
 								spafinloc = 12
 								gs 'cum_manage'
 								gs 'stat'
-								cls
+								*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'
@@ -546,14 +546,14 @@ if $ARGS[0] = 'mensglory':
 								spafinloc = 12
 								gs 'cum_manage'
 								gs 'stat'
-								cls
+								*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'
 							end
 						end
 						act 'Ride':
-							cls
+							*clr & cla
 							'<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'
@@ -563,7 +563,7 @@ if $ARGS[0] = 'mensglory':
 							if prezik >= 1:
 								if sexcontra = 4:
 									act 'Get up':
-										cls
+										*clr & cla
 										spafinloc = 0
 										if pcs_vag < dick: pcs_vag += 1
 										gs 'fame', 'pav', 'sex', 5
@@ -577,7 +577,7 @@ if $ARGS[0] = 'mensglory':
 									end
 								else
 									act 'Get up':
-										cls
+										*clr & cla
 										spafinloc = 17
 										if pcs_vag < dick: pcs_vag += 1
 										gs 'fame', 'pav', 'sex', 5
@@ -591,7 +591,7 @@ if $ARGS[0] = 'mensglory':
 							else
 								if sexcontra = 2:
 									act 'Complain':
-										cls
+										*clr & cla
 										spafinloc = 0
 										if pcs_vag < dick: pcs_vag += 1
 										gs 'cum_manage'
@@ -603,7 +603,7 @@ if $ARGS[0] = 'mensglory':
 									end
 								else
 									act 'Complain':
-										cls
+										*clr & cla
 										spafinloc = 0
 										if pcs_vag < dick: pcs_vag += 1
 										gs 'cum_manage'
@@ -632,7 +632,7 @@ if $ARGS[0] = 'womens':
 	$menu_arg = 'womens'
 	menu_off = 0
 	$location_type = 'bathroom'
-	cls
+	*clr & cla
 	gs 'stat'
 	'<center><b><font color="maroon">Women''s Room</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/bathroom/womens/bathroom_women.jpg"></center>'
@@ -647,7 +647,7 @@ if $ARGS[0] = 'womens':
 end
 
 if $ARGS[0] = 'emptystall':
-	cls
+	*clr & cla
 	minut +=5
 	menu_off = 1
 	gs 'stat'
@@ -664,11 +664,11 @@ if $ARGS[0] = 'emptystall':
 	if pcs_horny >=40:
 		act 'Caress Yourself':
 			if pcs_inhib < 40:inhib_exp += rand(1,3)
-			cls
+			*clr & cla
 			gs 'stat'
 			picrand = RAND(1,2)
 			if picrand = 1:
-				cls
+				*clr & cla
 				gs 'stat'
 				'<center><video autoplay loop src="images/locations/pavlovsk/community/bathroom/womens/sex/caress1.mp4"></video></center>'
 				'Feeling a bit turned on, you close the door to the stall and you behind to reach down your underwear and start rubbing your clit.'
@@ -676,7 +676,7 @@ if $ARGS[0] = 'emptystall':
 				gs 'stat'
 				act 'Continue': gs 'gdktoilet', 'contmast'
 			else
-				cls
+				*clr & cla
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/shared/sex/mast/mastr.jpg"></center>'
 				'Feeling a bit turned on, you close the door to the stall and you sit down exposing your pussy and begin to run your clit.'
@@ -700,11 +700,11 @@ if $ARGS[0] = 'contmast':
 	menu_off = 1
 	gs 'stat'
 	if picrand = 1:
-		cls
+		*clr & cla
 		gs 'stat'
 		'<center><video autoplay loop src="images/locations/pavlovsk/community/bathroom/womens/sex/caress1.mp4"></video></center>'
 	else
-		cls
+		*clr & cla
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/shared/sex/mast/mastr.jpg"></center>'
 	end
@@ -719,7 +719,7 @@ if $ARGS[0] = 'contmast':
 	end
 	if pcs_horny >= 90:
 		act 'Climax':
-			cls
+			*clr & cla
 			pcs_mood += 15
 			pcs_willpwr += 15
 			if pcs_inhib < 40:inhib_exp += rand(1,3)
@@ -745,7 +745,7 @@ if $ARGS[0] = 'contmast':
 end
 
 if $ARGS[0] = 'hole':
-	cls
+	*clr & cla
 	menu_off = 1
 	gs 'npcgeneratec', 0, 'unknown guy', rand(18,40)
 	gs 'boyStat', $npclastgenerated
@@ -755,7 +755,7 @@ if $ARGS[0] = 'hole':
 	wait 700
 	if gloryhole = 0:
 		act 'Sign the wall':
-			cls
+			*clr & cla
 			gs 'stat'
 			'<center><video autoplay loop src="images/locations/pavlovsk/community/bathroom/womens/sex/ghstartled.mp4"></video></center>'
 			'While looking through the hole you decided to write something on the wall just above it. While you were focused on writing, you didn''t notice the dick poking through the hole until the tip of it nearly went into your mouth. Startled you jerk away from the offending penis.'
@@ -770,12 +770,12 @@ if $ARGS[0] = 'hole':
 			end
 		end
 	elseif rand(1, 10) >= 7 - (ghnow * 2):
-		cls
+		*clr & cla
 		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 'Stick your finger in the hole':
-			cls
+			*clr & cla
 			money += 100
 			minut += 10
 			gs 'stat'
@@ -809,7 +809,7 @@ if $ARGS[0] = 'hole':
 			act 'Leave':gt 'gdktoilet', 'womens'
 		end
 	else
-		cls
+		*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.'
@@ -827,26 +827,26 @@ if $ARGS[0] = 'virgin':
 	'You tentatively reach out and gently touch the dick, half afraid to, but also half wanting to.'
 
 	act 'Quickly leave the stall':
-		cls
+		*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 'Grab it':
-		cls
+		*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 'Slide your hand on his penis':
-			cls
+			*clr & cla
 			gs 'stat'
 			'<center><video autoplay loop src="images/locations/pavlovsk/community/bathroom/womens/sex/ghstroke1.mp4"></video></center>'
 			'You decide to gently slide your hand on his dick. You feel his hard penis throb as you continue to slide your hand up and down. To your surprise you are really enjoying stroking the dick, your pussy starts to itch from the experience. As you get more turned on, you grab it with both hands and stroke it.'
 			gs 'arousal', 'hj', 5, 'unknown'
 			gs 'stat'
 			act 'Continue Stroking':
-				cls
+				*clr & cla
 				spafinloc = 13
 				minut +=5
 				gs 'arousal', 'end'
@@ -859,7 +859,7 @@ if $ARGS[0] = 'virgin':
 			end
 		end
 		act 'Stop':
-			cls
+			*clr & cla
 			gs 'arousal', 'end'
 			gs 'stat'
 			'<center><video autoplay loop src="images/locations/pavlovsk/community/bathroom/womens/sex/eww.mp4"></video></center>'
@@ -892,7 +892,7 @@ if $ARGS[0] = 'blowjob':
 		gs 'arousal', 'bj', 5, 'unknown', 'sub'
 		gs 'stat'
 		act 'Swallow':
-			cls
+			*clr & cla
 			gs 'arousal', 'end'
 			swallow += 1
 			spafinloc = 12
@@ -903,7 +903,7 @@ if $ARGS[0] = 'blowjob':
 			act 'Get up': gt'gdktoilet', 'emptystall'
 		end
 		act 'Step back':
-			cls
+			*clr & cla
 			gs 'arousal', 'end'
 			spafinloc = 11
 			facial += 1
@@ -917,7 +917,7 @@ if $ARGS[0] = 'blowjob':
 end
 
 if $ARGS[0] = 'ghsex':
-	cls
+	*clr & cla
 	gs 'stat'
 	'<center><b><font color="maroon">Empty Stall</font></b></center>'
 	'<center><video autoplay loop src="images/locations/pavlovsk/community/bathroom/womens/sex/ghundress.mp4"></video></center>'
@@ -942,7 +942,7 @@ if $ARGS[0] = 'anal':
 	minut -= 5
 	gs 'stat'
 	act 'Keep Going':
-		cls
+		*clr & cla
 		gs 'stat'
 		'<center><video autoplay loop src="images/locations/pavlovsk/community/bathroom/womens/sex/ghanal.mp4"></video></center>'
 
@@ -963,7 +963,7 @@ if $ARGS[0] = 'anal':
 		end
 
 		act 'Let him cum in your ass':
-			cls
+			*clr & cla
 			spafinloc = 3
 			gs 'cum_manage'
 			'<center><video autoplay loop src="images/locations/pavlovsk/community/bathroom/womens/sex/ghanalcream1.mp4"></video></center>'
@@ -975,7 +975,7 @@ if $ARGS[0] = 'anal':
 			act 'Get up': gt'gdktoilet', 'emptystall'
 		end
 		act 'Let him cum all over your ass':
-			cls
+			*clr & cla
 			spafinloc = 4
 			gs 'cum_manage'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/bathroom/womens/sex/ghcumonass.jpg"></center>'
@@ -987,7 +987,7 @@ if $ARGS[0] = 'anal':
 			act 'Get up': gt'gdktoilet', 'emptystall'
 		end
 		act 'Turn around, kneel and let him cum in your mouth':
-			cls
+			*clr & cla
 			spafinloc = 12
 			swallow += 1
 			gs 'cum_manage'
@@ -1000,7 +1000,7 @@ if $ARGS[0] = 'anal':
 			act 'Get up': gt'gdktoilet', 'emptystall'
 		end
 		act 'Turn around, kneel and let him cum on your face':
-			cls
+			*clr & cla
 			spafinloc = 11
 			facial += 1
 			gs 'cum_manage'
@@ -1042,7 +1042,7 @@ if $ARGS[0] = 'pussy':
 end
 
 if $ARGS[0] = 'pussy2':
-	cls
+	*clr & cla
 	gs 'stat'
 	if protect = 1:
 		'<center><video autoplay loop src="images/locations/pavlovsk/community/bathroom/womens/sex/ghsexcon.mp4"></video></center>'
@@ -1055,7 +1055,7 @@ if $ARGS[0] = 'pussy2':
 	gs 'stat'
 	if protect ! 1:
 		act 'Allow him to cum inside':
-			cls
+			*clr & cla
 			spafinloc = 0
 			gs 'cum_manage'
 			'<center><video autoplay loop src="images/locations/pavlovsk/community/bathroom/womens/sex/ghcreampie.mp4"></video></center>'
@@ -1068,11 +1068,9 @@ if $ARGS[0] = 'pussy2':
 			act 'Get dressed': gt'gdktoilet', 'emptystall'
 		end
 		act 'Quickly turn around and get on your knees':
-			cla
-			*clr
-
+			*clr & cla
 			act 'Let him cum in your mouth':
-				cls
+				*clr & cla
 				spafinloc = 12
 				swallow += 1
 				gs 'cum_manage'
@@ -1084,7 +1082,7 @@ if $ARGS[0] = 'pussy2':
 				act 'Get dressed': gt'gdktoilet', 'emptystall'
 			end
 			act 'Let him cum on your face':
-				cls
+				*clr & cla
 				spafinloc = 11
 				facial += 1
 				gs 'cum_manage'
@@ -1112,10 +1110,9 @@ if $ARGS[0] = 'pussy2':
 end
 
 if $ARGS[0] = 'rape':
-	cla
-	*clr
+	*clr & cla
 	menu_off = 1
-	gs 'atat'
+	gs 'stat'
 	dick = rand(9, 25)
 	if rand(1, 20) > 12:
 		gs 'npcgeneratec', 0, 'rapist', rand(19,45)
@@ -1123,20 +1120,20 @@ if $ARGS[0] = 'rape':
 		'<center><video autoplay loop src="images/locations/pavlovsk/community/bathroom/mens/sex/mensrape3.mp4"></video></center>'
 		'Just as you are leaving the women''s restroom a naked man storms out of the men''s restroom and grabs you by the hair and drags you inside the men''s room. He rips off your top and forces you down on your knees, shoving his dick in your mouth, forcing you to suck his dick.'
 		act 'Continue':
-			cls
+			*clr & cla
 			'<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'
 			gs 'stat'
 			act 'Continue':
-				cls
+				*clr & cla
 				'<center><video autoplay loop src="images/locations/pavlovsk/community/bathroom/mens/sex/mensrape1.mp4"></video></center>'
 				'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'
 				gs 'stat'
 				act 'Continue':
-					cls
+					*clr & cla
 					spafinloc = 12
 					rape += 1
 					gs 'cum_manage'
@@ -1169,21 +1166,18 @@ if $ARGS[0] = 'rape':
 			close all
 			pl '<a href="exec: music_on = 1 & gt $loc">Play music</a>'
 		end
-		cla
-		*clr
+		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club_yaho.jpg"></center>'
 		'You run into the crowd and start dancing to blend in. You hear a man yell out, "Where''s that bitch that took my money?" He storms off and you feel like it''s your lucky day today.'
 		act 'Dance':
-			cla
-			*clr
+			*clr & cla
 			minut +=10
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club_dance.jpg"></center>'
 			'You continue to dance until the man has left.'
 			act 'Stop': gt 'gdkin'
 		end
 	else
-		cla
-		*clr
+		*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':

+ 2 - 4
locations/gpoli.qsrc

@@ -668,9 +668,7 @@ if $ARGS[0] = '':
 				end
 			end
 		end
-		if StoryLine > 0 and SchoolAtestat = 0 and Gspravka < 3 and motherKnowSpravka = 0:
-			act 'Go to the gynaecologist for a referral': gt 'gpoli', 'referral'
-		end
+		if StoryLine > 0 and SchoolAtestat = 0 and Gspravka < 3 and motherKnowSpravka = 0: act 'Go to the gynaecologist for a referral': gt 'gpoli', 'referral'
 	else
 		'The clinic is closed. It''s open every day between 06:00 and 21:00.'
 	end
@@ -714,8 +712,8 @@ if $ARGS[0] = 'referral':
 			*clr & cla
 			minut += 5
 			gs 'stat'
-			'The doctor breathes on his stethoscope to warm it up and says: "Lift your shirt, please."'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/gyno/gpoli_2.jpg"></center>'
+			'The doctor breathes on his stethoscope to warm it up and says: "Lift your shirt, please."'
 			'Lift your shirt? What does that have to do with your virginity?'
 			'He sees your hesitation, and reassures you: "I''m just doing some basic check-ups while you''re here anyway. Now... your shirt, please?"'
 			'That makes sense. You expose your <<$titsize>> breasts to him when you lift your shirt up, and he examines you. You''re no medical professional, but you''re fairly sure he''s not supposed to put the stethoscope on your boob like that! Nevertheless... you need him to give you that referral, and calling him out on it will definitely not help your cause.'

+ 1 - 7
locations/lover_pref.qsrc

@@ -100,9 +100,6 @@ else
 	clotTopMax = 999
 end
 
-
-
-
 !!THIS IS THE EQUATION FOR THE TIT ADDITION
 if tits < 2:
 	titConstant = 0
@@ -116,9 +113,6 @@ else
 	titConstant = 0
 end
 
-
-
-
 !! This is for pants and skirt shortness and will be grouped together as such.
 !! 0 - no preference, 1 - 1 to 2 units or ankle to calf length, 2 - 3 to 5 units or knee to miniskirt, 3 - 5 units to 6 or slut to hoe.
 bottShorPrefTmp = bottShorPref[lover_number]
@@ -156,7 +150,7 @@ elseif clotThinPrefTmp = 3:
 	clotThinMin = 4
 	clotThinMax = 6
 else
-	pierPrefTmpMin = 0
+	clotThinMin = 0
 	clotThinMax = 999
 end
 

+ 2 - 4
locations/mirror.qsrc

@@ -17,9 +17,7 @@ if $ARGS[0] = 'start':
 	if mirror_steam ! hour: mirror_steam = 100
 	if $loc = 'vanrPar' and mirror_steam = hour or $loc = 'vanr' and mirror_steam = hour or $loc = 'yvan'and mirror_steam = hour: gt'mirror','steam'
 
-	if pcs_hairbsh = 0:
-		act 'Brush your hair': xgt 'mirror', 'brush'
-	end
+	if pcs_hairbsh = 0: act 'Brush your hair': xgt 'mirror', 'brush'
 
 	*nl
 	if daystart  < 10 and StoryLine = 0 and ntstart = 0:'In the mirror, you see a strange woman''s face looking back at you that exactly copies all your actions. You can hardly accept the idea that this is now you.'
@@ -205,7 +203,7 @@ if $ARGS[0] = 'start':
 !	if (pcs_makeup <= 1 and kosmetica > 0) or (lipbalm > 0 and pcs_lipbalm <= 0 and pcs_hairbsh = 0):
 !		act 'Do the works': gt 'mirror', 'works'
 !	end
-	act 'Create a custom make-up routine': dynamic $createcustroutine
+	act 'Manage your custom make-up routines': dynamic $createcustroutine
 	!!New makeup setting
 	!!This imforms the person what makeup they have pre selected
 	!! 0 - none, 1 - light, 2 - moderate, 3 - heavy

+ 1 - 1
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

+ 2 - 2
locations/obekt.qsrc

@@ -15,6 +15,8 @@ if car > 0 and cardrive = 12:
 	'The <a href="exec:gs ''carF'', ''start''"> <<$car>></a> is standing in the parking.'
 end
 
+act 'Go to the road':minut += 15 & nroad = 16 & gt 'road'
+
 act 'Sneak into the construction site':
 	*clr & cla
 	minut += 5
@@ -31,8 +33,6 @@ act 'Sneak into the construction site':
 			gt 'obekt2'
 		end
 	end
-
-	act 'Go to the road':minut += 15 & nroad = 16 & gt 'road'
 end
 
 --- obekt ---------------------------------

+ 25 - 20
locations/qwBarBilliard.qsrc

@@ -371,8 +371,9 @@ if $ARGS[0] = 'billiard_ev2':
 				*clr & cla
 				minut += 20
 				pool_exp += rand(3,5)
-				pcs_mood += rand(1,3)
+				pcs_mood += rand(5,15)
 				Jaska_Friend_Bill = 1
+				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/sex/pool/pool2.jpg"></center>'
 				'Time flies when you''re having fun and, as sleazy as the two - they introduce themselves as Artyom and Victor - come across, they are pretty decent company once you get used to their bawdy comments.'
 				'The game ends up being quite close as you take shots on your own while they play together. You end up winning closely.'
@@ -381,15 +382,16 @@ if $ARGS[0] = 'billiard_ev2':
 				'"I do what I can", you humblebrag as you lean the billiard cue against the table. "It''s been fun though."'
 				'"Yeah," Artyom agrees. After the briefest of pauses and quick exchange of glances between the two, he continues: "How about we make it even more fun?"'
 				'The grin they have on their faces reminds you of how they looked at Jaska. "What are you thinking?"'
-				'"How about a little wager?" Victor suggests, tellingly aware of what his friend had in mind. "Nothing too insane... Maybe 500 rubles each, winner takes all?"'
+				'"How about a little wager?" Victor suggests, tellingly aware of what his friend had in mind. "Nothing too insane... Maybe 500 <b>₽</b> each, winner takes all?"'
 
 				if money >= 500:
 					act 'Sure, let''s play':
 						*clr & cla
 						minut += 20
 						pool_exp += rand(3,5)
-						pcs_mood += rand(3,5)
+						pcs_mood += rand(15,25)
 						money += 1000
+						gs 'stat'
 						'<center><video src="images/locations/city/industrial/bar/sex/pool/pool4.mp4"></center>'
 						'"Sure, I''m game if you are." You rummage through your ' + iif(bag>0,'purse','pocket') + ' and put a couple of bills on the table. Your two opponents quickly follow suit and set up the game.'
 						*nl
@@ -422,7 +424,8 @@ if $ARGS[0] = 'billiard_ev2':
 							*clr & cla
 							minut += 20
 							pool_exp += rand(3,5)
-							pcs_mood += rand(1,3)
+							pcs_mood += rand(5,15)
+							gs 'stat'
 							'<center><video src="images/locations/city/industrial/bar/sex/pool/pool4.mp4"></center>'
 							'You agree to play another friendly match. You cannot help but notice the scowl on Artyom''s face, and it seems to have very little to do with the fact that you are, once again, coming out ahead at the end.'
 							'Victor once again applauds your skill while Artyom merely gives you an acknowledging nod. Victor seems annoyed at his friend''s bad mood but doesn''t let it keep himself from having a friendly chat with you for a few minutes.'
@@ -464,7 +467,7 @@ if $ARGS[0] = 'billiard_ev2':
 			'"Hold on," Artyom interjects. "Are we playing for money? Cause Victor and I were and you interrupted our game."'
 			*nl
 			'You don''t see any cash on the table, but that doesn''t have to mean anything. "How much were you playing for?"'
-			'"1000 rubles each."'
+			'"1000 <b>₽</b> each."'
 
 			act 'I don''t wanna play for that much':
 				cla
@@ -479,9 +482,7 @@ if $ARGS[0] = 'billiard_ev2':
 
 			act 'Sounds fun - I''m almost broke, though': gt 'VicArt_Billiard', 'VicArt_Ev1_Broke'
 
-			if money >= 1000:
-				act 'Sure, let''s play (for cash)': gt 'VicArt_Billiard', 'VicArt_Ev1_Cash'
-			end
+			if money >= 1000: act 'Sure, let''s play (for cash)': gt 'VicArt_Billiard', 'VicArt_Ev1_Cash'
 
 		!!if Sveta has stripped for them before [PlayVariable = 2], has masturbated [PlayVariable = 3] but hasn''t yet given them a blowjob [PlayVariable = 4]
 		elseif Jaska_Friend_Bill <= 3:
@@ -514,10 +515,10 @@ if $ARGS[0] = 'billiard_ev2':
 		'As they set up a new one, they invite you to play with them.'
 
 		if money >= 250:
-			act 'Suggest playing for money (250 <b>?</b>)':
+			act 'Suggest playing for money (250 <b></b>)':
 				cla
 				*nl
-				'"How about we make this more interesting?" You suggest. "We could play for money. Maybe like 250 rubles each?"'
+				'"How about we make this more interesting?" You suggest. "We could play for money. Maybe like 250 <b>₽</b> each?"'
 
 				if bill_rand > 3:
 					if pcs_pool >= 60: temp = rand(1,4)
@@ -528,6 +529,8 @@ if $ARGS[0] = 'billiard_ev2':
 
 						act 'Return to the bar': gt 'qwBarPolet', 'bar'
 					else
+						money -= 250
+						gs 'stat'
 						'"Sure," one of them agrees and his friends nod, "we can do another match for cash."'
 						'Without further ado, they set up the table again.'
 
@@ -541,9 +544,10 @@ if $ARGS[0] = 'billiard_ev2':
 					act 'Have a friendly match instead':
 						cla & *clr
 						pool_exp += rand(1,4)
-						pcs_mood += rand(1,3)
+						pcs_mood += rand(5,15)
 						minut += 30
 						temp = rand(1,4)
+						gs 'stat'
 						'<center><video src="images/locations/city/industrial/bar/sex/pool/pool4.mp4"></center>'
 						'You agree to playing a friendly match instead, though you have to admit you would have liked to maybe make a little money this way.'
 						*nl
@@ -558,9 +562,10 @@ if $ARGS[0] = 'billiard_ev2':
 		act 'Suggest a friendly match':
 			*clr & cla
 			pool_exp += rand(1,4)
-			pcs_mood += rand(1,3)
+			pcs_mood += rand(5,15)
 			minut += 30
 			temp = rand(1,4)
+			gs 'stat'
 			'<center><video src="images/locations/city/industrial/bar/sex/pool/pool4.mp4"></center>'
 			'You suggest playing a friendly match and they agree to keep money out of this.'
 			*nl
@@ -582,10 +587,10 @@ if $ARGS[0] = 'billiard_friendly':
 	else
 		'The match is friendly and remains close until the end. It''s one of those games that starts off friendly but gets more tense and engaging as you take turns.'
 		if temp = 3:
-			pcs_mood += 1
+			pcs_mood += 5
 			'Which makes it even more satisfying when your opponents miss their final shot and you end up winning by a hair.'
 		else
-			pcs_mood -= 1
+			pcs_mood -= 5
 			'Which makes it a little frustrating when your opponents perfectly aim their final shot and win, your own victory just one shot away. That''s what you get for feeling competitive.'
 		end
 	end
@@ -606,20 +611,20 @@ if $ARGS[0] = 'billiard_money':
 	gs 'qwBarBilliard', 'billiard_engine'
 
 	if billwin >= 8:
-		pcs_mood += rand(1,4)
 		money += 500
+		pcs_mood += rand(5,20)
 		'Lady Luck seems to be smiling on you tonight - you end up ' + iif(pcs_pool>50,'comfortably','closely') + ' winning the game.'
 		'Your opponents look disappointed but remain friendly as they hand over your winnings.'
-		'Understandably, they don''t feel like playing another round, so you all return to the main room together. Still, 500 rubles isn''t a bad turnout for half an hour''s work.'
-
+		'Understandably, they don''t feel like playing another round, so you all return to the main room together. Still, 500 <b>₽</b> isn''t a bad turnout for half an hour''s work.'
 	else
-		pcs_mood -= rand(1,4)
-		money -= 250
+		pcs_mood -= rand(5,20)
 		'Luck really wasn''t on your side this time: You ' + iif(pcs_pool>50,'give them a run for their money but end up fumbling several critical shots','are getting absolutely destroyed by them') + ' and have to admit defeat.'
 		'You commend them for their skill as you hand over the cash, since you don''t wanna be a sore loser, but you don''t really feel like playing another round with them.'
-		'Since they also have to leave, you return to the main room with them where you part ways, 250 rubles poorer than half an hour ago.'
+		'Since they also have to leave, you return to the main room with them where you part ways, 250 <b>₽</b> poorer than half an hour ago.'
 	end
 
+	gs 'stat'
+	
 	act 'Return to the bar': gt 'qwBarPolet', 'bar'
 end
 

+ 2 - 0
locations/salon.qsrc

@@ -313,6 +313,8 @@ if $ARGS[0] = '0':
 		orgasm += 1
 		pcs_dom += 1
 		girl += 1
+		gs 'npcgeneratec', 0, 'salon worker', rand(35,55)
+		gs 'boyStat', $npclastgenerated
 		'You nod at his offer. "Fine but I want this bitch punished now!'
 		'He seems a bit taken back by your attitude. "Very well, how would you like her punished? Perhaps we can take it out of her pay, or she can do this procedure at no wages." He seems to think these are fitting punishments.'
 		'You shake your head no, no the bitch made your clothes look like they have cum on them. It''s only fitting you return the favor. "No I want you to fuck her right here as I tell you to."'

+ 36 - 34
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."'

+ 40 - 40
locations/sny.qsrc

@@ -1,7 +1,7 @@
 # sny
 
 if $ARGS[0] = '3':
-	cls
+	*clr & cla
 	menu_off = 1
 	gs 'stat'
 	if music_on = 1:
@@ -18,8 +18,8 @@ if $ARGS[0] = '3':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/dimkahome/newyear/tusa3.jpg"></center>'
 	'The whole class went to Dimka home. He house had music playing and lots of alcohol to drink, you go up to a table with a couple of the other girls and get a glass of vodka. Soon everyone is drinking and celebrating the new year.'
 
-	act 'drink':
-		cls
+	act 'Drink':
+		*clr & cla
 		minut += 15
 		alko += 3
 		cumspclnt = 2
@@ -37,8 +37,8 @@ if $ARGS[0] = '3':
 		act 'Nostrovia!': minut += 5 & gt 'sny', '4'
 	end
 
-	act 'Refuse drink':
-		cls
+	act 'Refuse to drink':
+		*clr & cla
 		minut += 15
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/dimkahome/newyear/tusa3.jpg"></center>'
@@ -49,13 +49,13 @@ if $ARGS[0] = '3':
 end
 
 if $ARGS[0] = '4':
-	cls
+	*clr & cla
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/dimkahome/newyear/tusa4.jpg"></center>'
 	'Boys and girls start to relax and break up into groups to talk. Someone poured more vodka into a glass and handed you another glass of vodka.'
 
-	act 'drink':
-		cls
+	act 'Drink':
+		*clr & cla
 		minut += 15
 		alko += 3
 		cumspclnt = 2
@@ -73,8 +73,8 @@ if $ARGS[0] = '4':
 		act 'Nostrovia!': minut += 5 & gt 'sny', '5'
 	end
 
-	act 'Refuse drink':
-		cls
+	act 'Refuse to drink':
+		*clr & cla
 		minut += 15
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/dimkahome/newyear/tusa4.jpg"></center>'
@@ -85,13 +85,13 @@ if $ARGS[0] = '4':
 end
 
 if $ARGS[0] = '5':
-	cls
+	*clr & cla
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/dimkahome/newyear/tusa5.jpg"></center>'
 	'Albina went into the center of the room and began to dance, she is a very talented dancer and knows how to move her body. She was quickly joined by Katja and her sister Vicky. While you are watching the girls, someone hands you another glass of vodka.'
 
-	act 'drink':
-		cls
+	act 'Drink':
+		*clr & cla
 		minut += 15
 		alko += 3
 		cumspclnt = 2
@@ -109,8 +109,8 @@ if $ARGS[0] = '5':
 		act 'Nostrovia!': minut += 5 & gt 'sny', '6'
 	end
 
-	act 'Refuse drink':
-		cls
+	act 'Refuse to drink':
+		*clr & cla
 		minut += 15
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/dimkahome/newyear/tusa5.jpg"></center>'
@@ -121,13 +121,13 @@ if $ARGS[0] = '5':
 end
 
 if $ARGS[0] = '6':
-	cls
+	*clr & cla
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/dimkahome/newyear/tusa6.jpg"></center>'
 	'Albina and Katja are dancing face to face in the middle of the room. Suddenly Albina kisses Katja on the lips. The room erupts into howling kids encouraging them to continuing. Someone hands you another glass of vodka.'
 
 	act 'Drink':
-		cls
+		*clr & cla
 		minut += 15
 		alko += 3
 		cumspclnt = 2
@@ -145,8 +145,8 @@ if $ARGS[0] = '6':
 		act 'Nostrovia!': minut += 5 & gt 'sny', '7'
 	end
 
-	act 'Refuse drink':
-		cls
+	act 'Refuse to drink':
+		*clr & cla
 		minut += 15
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/dimkahome/newyear/tusa6.jpg"></center>'
@@ -157,14 +157,14 @@ if $ARGS[0] = '6':
 end
 
 if $ARGS[0] = '7':
-	cls
+	*clr & cla
 	gs 'stat'
 	if alko >= 10:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/dimkahome/newyear/vomit.jpg"></center>'
 		'You start feeling dizzy and sick to your stomach, you mutter something about throwing up and Dale helps you rush to the toilet.'
 
-		act 'barf':
-			cls
+		act 'Barf':
+			*clr & cla
 			minut += 60 * alko
 			gs 'stat'
 
@@ -195,15 +195,15 @@ if $ARGS[0] = '7':
 		end
 	elseif alko >= 6 and alko < 10:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/dimkahome/newyear/tit.jpg"></center>'
-		'You are quite tipsy and has not thinking straight. Someone''s hand pulls you into the center of the room with the dancing boys and girls. Nosov suddenly pulls your top down, exposing your breasts to everyone in the room. You sluggish pull your top back up. Dimka takes you by the hand and drags you out of the room.'
+		'You are quite drunk and has not thinking straight. Someone''s hand pulls you into the center of the room with the dancing boys and girls. Nosov suddenly pulls your top down, exposing your breasts to everyone in the room. You sluggish pull your top back up. Dimka takes you by the hand and drags you out of the room.'
 
 		act 'Hey! Where are you dragging me?': minut += 5 & gt 'sny', '10'
-	elseif alko > 1 and alko < 6:
+	elseif alko > 3 and alko < 6:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/dimkahome/newyear/alb.jpg"></center>'
 		'You are a little drunk, but having fun. When you notice, Albina sitting on the couch and kissing Vanka, while Fedka paws at her breasts. Looking around you some more you notice that Katja nowhere to be seen.'
 
 		act 'Search for Katja':
-			cls
+			*clr & cla
 			SeeKatBang = 1
 			KatjaLust += 10
 			KatjaSlut += 10
@@ -215,12 +215,12 @@ if $ARGS[0] = '7':
 			gs 'stat'
 			act 'Go into the room': minut += 5 & gt 'sny', '8'
 		end
-	elseif alko = 1:
+	elseif alko > 0 and alko <= 3:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/dimkahome/newyear/idi.jpg"></center>'
 		'You are a bit tipsy and feel fairly relaxed at the party. There''s some vodka shots lined up so you could have another drink or maybe it''s time to head home?'
 
 		act 'drink':
-			cls
+			*clr & cla
 			minut += 15
 			alko += 3
 			cumspclnt = 2
@@ -248,13 +248,13 @@ if $ARGS[0] = '7':
 end
 
 if $ARGS[0] = '8':
-	cls
+	*clr & cla
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/dimkahome/newyear/tusa8.jpg"></center>'
 	'Back in the main room, you saw, that most continue to drink and dance. Albina, Vanka and Fedka are no where to be seen anymore. Some of the girls are getting wild in the middle of the room Kristinka even pulls down her pants showing off her bare ass.'
 
 	act 'Search Albina':
-		cls
+		*clr & cla
 		seeAlbinaFuck = 1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/dimkahome/newyear/alb.jpg"></center>'
@@ -267,13 +267,13 @@ if $ARGS[0] = '8':
 end
 
 if $ARGS[0] = '9':
-	cls
+	*clr & cla
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/dimkahome/newyear/tusa9.jpg"></center>'
 	'Virtually everyone is passed on the floor, some in varies stats of undress. Dimka comes over to you "And you''re still on your feet? Good for you, the others have already left or passed out, let''s_go, I need you to help me with something."'
 
 	act 'I have to go now':
-		cls
+		*clr & cla
 		minut += 15
 		gs 'stat'
 		'You told Dimka, you to go now.'
@@ -285,7 +285,7 @@ if $ARGS[0] = '9':
 end
 
 if $ARGS[0] = '10':
-	cls
+	*clr & cla
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/dimkahome/newyear/kiss.jpg"></center>'
 	'He takes you into another room, one the two of you are alone. Dimka began to paw at your chest and gave you a long slobbery kiss.'
@@ -310,7 +310,7 @@ if $ARGS[0] = '10':
 end
 
 if $ARGS[0] = 'kiss':
-	cls
+	*clr & cla
 	!!1 and 4
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/dimkahome/newyear/sex/pett.jpg"></center>'
@@ -320,7 +320,7 @@ if $ARGS[0] = 'kiss':
 	minut -= 5
 	gs 'stat'
 	act 'wait':
-		cls
+		*clr & cla
 		!1 and 4
 		gs 'boyStat', 'A1'
 		gs 'stat'
@@ -331,7 +331,7 @@ if $ARGS[0] = 'kiss':
 		minut -= 5
 		gs 'stat'
 		act 'wait':
-			cls
+			*clr & cla
 
 			if npcSex[1] = 0:npcSex[1] = 1 & guy += 1
 
@@ -344,7 +344,7 @@ if $ARGS[0] = 'kiss':
 			gs 'arousal', 'vaginal', 5, 'sub'
 			gs 'stat'
 			act 'Suck him':
-				cls
+				*clr & cla
 
 				if npcSex[4] = 0:npcSex[4] = 1 & guy += 1
 
@@ -359,7 +359,7 @@ if $ARGS[0] = 'kiss':
 				gs 'stat'
 
 				act 'Suck':
-					cls
+					*clr & cla
 					spafinloc = 11
 					gs 'cum_manage'
 					facial += 1
@@ -372,7 +372,7 @@ if $ARGS[0] = 'kiss':
 					gs 'stat'
 					if condomDima = 1:
 						act 'Further':
-							cls
+							*clr & cla
 							facial += 1
 							spafinloc = 11
 							gs 'cum_manage'
@@ -384,7 +384,7 @@ if $ARGS[0] = 'kiss':
 						end
 					elseif condomDima = 0:
 					    act 'Further':
-							cls
+							*clr & cla
 							facial += 1
 							spafinloc = 11
 							gs 'cum_manage'
@@ -427,7 +427,7 @@ if $ARGS[0] = 'no':
 end
 
 if $ARGS[0] = 'end':
-	cls
+	*clr & cla
 	minut += 5
 	SNYnoseGang += 1
 	gs 'stat'

+ 1 - 1
locations/start.qsrc

@@ -16,7 +16,7 @@ $counter = 'counter'
 $usercom = 'inputProcessing'
 $fname = 'Tahoma'
 fsize = 12
-$version = '0.7.2 The one with pee on it version.'
+$version = '0.7.3 Crime and Punishment version.'
 
 opPRE = 1
 

+ 11 - 5
locations/stat_display.qsrc

@@ -1285,13 +1285,19 @@ if meetday[2] < daystart and svidanie[2] = 1:pcs_lovers_rel[2] -= 10 & svidanie[
 if StrongNarkota > 20:$stat_msg += '<BR><b><font color="red">You are stoned.</font></b>'
 if amphHigh > 0: $stat_msg += '<BR><b><font color="red">You feel a little wired.</font></b>'
 
-if alko > 2:
-	if alko < 6:
+if alko > 0:
+	if alko = 1:
 		slut_bonus = 0
-		$stat_msg += '<BR><b><font color="red">You feel a little buzz from drinking.</font></b>'
-	elseif alko < 9:
-		slut_bonus = 25
+		$stat_msg += '<BR><b>You feel a little buzz from drinking.</b>'
+	elseif alko < 4:
+		slut_bonus = 10
+		$stat_msg += '<BR><b><font color="orange">You''re feeling a bit tipsy.</font></b>'
+	elseif alko < 6:
+		slut_bonus = 20
 		$stat_msg += '<BR><b><font color="red">You''re drunk.</font></b>'
+	elseif alko < 10:
+		slut_bonus = 30
+		$stat_msg += '<BR><b><font color="red">You''re very drunk.</font></b>'
 	else
 		slut_bonus = 50
 		$stat_msg += '<BR><b><font color="red">You''re wasted.</font></b>'

+ 1 - 6
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):

+ 5 - 5
locations/street_walker.qsrc

@@ -574,7 +574,7 @@ if $ARGS[0] = 'policeblowjob':
 					else
 						act 'Finish him':
 							*clr & cla
-							prst_bribe = 1
+							prst_bribe = 2
 							gs 'cum_call', 'mouth', 'police officer'
 							'<center><img <<$set_imgh>> src="images/locations/city/shared/streetwalker/sex/bj4.jpg"></center>'
 							'As you suck him, you feel the hot splash of cum hit your tongue, as spurt after spurt of it fills your mouth. He moans loudly as he sperm fills your mouth, you keep sucking until there is no more hot spurts. You raise up showing him his own cum and then swallow it. He gives you a brief smile, then quickly slips his dick away and rebuttons his pants.'
@@ -590,7 +590,7 @@ if $ARGS[0] = 'policeblowjob':
 			end
 		end
 	else
-		prst_bribe = 1
+		prst_bribe = 2
 		*nl
 		'<center><img <<$set_imgh>> src="images/locations/shared/police/arrested.jpg"></center>'
 		'"What is wrong with you girl? Are you trying to solicitate a member of the law?" the police office angrily responds.'
@@ -706,7 +706,7 @@ if $ARGS[0] = 'briberyreaction':
 		act 'Walk away':gt 'street_walker', 'work'
 	elseif temp_rand <= 7:
 		!!elseif he refuses the bribe and arrests you, lose all the money the player earned
-		prst_bribe = 2
+		prst_bribe = 1
 		gs 'pain', 6, 'armL', 'break'
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/shared/police/arrested.jpg"></center>'
@@ -720,7 +720,7 @@ if $ARGS[0] = 'briberyreaction':
 		act 'Drive to the police station': gt 'police_station', 'entrance', 'prst'
 	elseif temp_rand <= 9:
 	!!elseif he takes the bribe but still arrests you
-		prst_bribe = 2
+		prst_bribe = 1
 		'<center><img <<$set_imgh>> src="images/locations/shared/police/arrested.jpg"></center>'
 		*nl
 		'The cop sighs heavily before taking the money. He takes a moment to count it, occasionally glancing your way as he does. "It''s one thing to be a whore, but to be dumb too?" he laughs cruelly as he pockets the money. You stare at him, hurt and confused before you realize that he''s still planning to arrest you. Your first instinct is to run, maybe he''s just trying to scare you and won''t chase after you, but if he''s being serious then it could mean you getting hurt.'
@@ -747,7 +747,7 @@ if $ARGS[0] = 'briberyreaction':
 		act 'Agree': gt 'street_walker', 'policesub1'
 		act 'Refuse':
 			*clr & cla
-			prst_bribe = 2
+			prst_bribe = 1
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/shared/police/arrested.jpg"></center>'
 			'"No...no, I can''t do that..." You tell him as you pull your hand back and pocket your money again. The officer looks disappointed but doesn''t seem to dwell on it. He probably has another girl like you he''s forced into fucking him...'

+ 4 - 1
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:

+ 34 - 1
locations/version.qsrc

@@ -2,7 +2,40 @@
 
 act 'Return': gt 'start'
 
-
+'0.7.3'
+'- Inhibition skill added to replace large parts of exhibitionism, exhibitionism now a trait by Hornguy6 and Kevin Smarts'
+'- School schedule with next class listing from 3xpurt'
+'- Change to game file extensions when split for editing, not noticeable in game but an ease of use fix for the devs from 3xpurt'
+'- Lay out changes to some city screens from Akossi'
+'- Some new atmospheric sounds from nutluck'
+'- New item descriptions from Akossi'
+'- New difficulty settings from Mona Lisa'
+'- Bimbo system converted to the trait system for further clarity by Kevin Smarts'
+'- Pubic hair styling from Hornguy6 with fancy image table by 3xpurt'
+'- New modelling shoot and standardization of brother sex progression from Hornguy6'
+'- Expansion of car wash event by sovietmercader'
+'- Lactation system overhaul and new events by milky_boobs'
+'- Flashing centralized and logic fixes by Mona Lisa'
+'- More info and ease of use for stripping from Hornguy6'
+'- More tattoos from nutluck'
+'- New selfie handling to allow for images based on clothed, underwear or nude from nutluck and Kevin Smarts'
+'- School girl starts now have the option of Pavlovsk or your grandparent''s place thanks to 3xpurt'
+'- Scale for intoxication from alcohol changed to give more flexibility and realism by 3xpurt'
+'- New menu system from 3xpurt with seeding through the game by blatte, julzor and Kevin Smarts'
+'- Crime and punishment system with street walker and a thieving event by blate and nutluck with code from Kevin Smarts'
+'- Fixes to the many broken village events by sovietmercader and 3xpurt'
+'- New grey theme for when the night theme is too dark by 3xpurt'
+'- Height adjustments in the cheat menu and a bmi value for Sveta by 3xpurt and julzor'
+'- Food and menu fixes by 3xpurt with menu designs from Akossi'
+'- New start - Cursed School Boy from Pandora with some code fixes/changes from julzor'
+'- Exercise options tidied up with less blank screens and clothing requirements by 3xpurt'
+'- image links and files all changed to lowercase by bicobus, image repo updated by nutluck'
+'- New syntax packages for Atom, Sublime and VS Code from Xorgroth (F95 zone)'
+'- Reshaping of the Pavlovsk setup to make it 4 main hubs and to remove the individual blocks except for the Parents one by Kevin Smarts'
+'- Code clean up and massive amounts of fixes by julzor and 3xpurt'
+'- Text edits from nutluck and blatte'
+'- Translations by Blatte, jmts16 and Akossi'
+'- Bug fixes from hornguy6, test234, sovietmercader, Mona Lisa, nyanobot and Kevin Smarts. Plus much assistance from people on the forum.'
 
 '0.7.2'
 '- Mod plug in system, based on Provincial Girl system and adapted and reworked by illume'