Ver Fonte

Merge remote-tracking branch 'julzor/master'

KevinSmarts há 5 anos atrás
pai
commit
48f140065a

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

+ 1 - 0
locations/Gadbana.qsrc

@@ -32,6 +32,7 @@ if mira = 0:
 			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'

+ 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

+ 2 - 2
locations/din_van.qsrc

@@ -533,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'

+ 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':

+ 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

+ 6 - 6
locations/qwBarBilliard.qsrc

@@ -382,7 +382,7 @@ 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':
@@ -467,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
@@ -515,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)
@@ -615,12 +615,12 @@ if $ARGS[0] = 'billiard_money':
 		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(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'

+ 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...'