Forráskód Böngészése

[added] new location 'drugs' that contains all drug effects
[changed] all drug effects in all locations to the new system (except school until kevin is finished with it and anushka files until I'm finished with them)

julzor 5 éve
szülő
commit
82c7a95a89
78 módosított fájl, 543 hozzáadás és 1143 törlés
  1. 2 1
      glife.qproj
  2. 1 9
      locations/BDSM_Club.qsrc
  3. 2 2
      locations/FedorMisc.qsrc
  4. 1 5
      locations/Gnpc.qsrc
  5. 1 4
      locations/Gnpc2.qsrc
  6. 1 9
      locations/JuliaMilHome.qsrc
  7. 2 2
      locations/MartinSex.qsrc
  8. 1 1
      locations/NikoDates.qsrc
  9. 1 1
      locations/NikoEv.qsrc
  10. 1 1
      locations/NikoEv2.qsrc
  11. 1 2
      locations/NikoPayback.qsrc
  12. 1 1
      locations/ParkKafe.qsrc
  13. 1 6
      locations/Serge_kuh.qsrc
  14. 2 15
      locations/Terminal.qsrc
  15. 7 55
      locations/albinahome.qsrc
  16. 1 6
      locations/artemEv.qsrc
  17. 1 1
      locations/artemev2.qsrc
  18. 1 4
      locations/arturHome.qsrc
  19. 1 1
      locations/balkon2.qsrc
  20. 2 8
      locations/belpicknick.qsrc
  21. 10 103
      locations/beverage.qsrc
  22. 6 10
      locations/club.qsrc
  23. 4 4
      locations/dateF.qsrc
  24. 3 3
      locations/dateM.qsrc
  25. 6 16
      locations/dimaEv.qsrc
  26. 4 20
      locations/din_bad.qsrc
  27. 1 6
      locations/din_van.qsrc
  28. 131 0
      locations/drugs.qsrc
  29. 1 2
      locations/events.qsrc
  30. 4 25
      locations/fbDormD.qsrc
  31. 8 24
      locations/gdksex.qsrc
  32. 2 8
      locations/gevent.qsrc
  33. 2 8
      locations/gopnew.qsrc
  34. 2 13
      locations/gopskver.qsrc
  35. 2 2
      locations/katalkin.qsrc
  36. 1 9
      locations/katalkinAlko.qsrc
  37. 1 4
      locations/kotovEv.qsrc
  38. 2 8
      locations/kotovtalker.qsrc
  39. 55 63
      locations/lesbidomhouse.qsrc
  40. 28 37
      locations/lesbimistress.qsrc
  41. 1 6
      locations/mey_home.qsrc
  42. 3 3
      locations/mey_tamara_events.qsrc
  43. 4 36
      locations/mitkabuh.qsrc
  44. 1 9
      locations/mitkabuh_group.qsrc
  45. 10 26
      locations/narkopriton.qsrc
  46. 3 8
      locations/nastja.qsrc
  47. 2 10
      locations/nichBedroomServant.qsrc
  48. 3 6
      locations/parkivent.qsrc
  49. 3 12
      locations/party_boys.qsrc
  50. 1 4
      locations/party_girls.qsrc
  51. 1 6
      locations/pavSharedApt.qsrc
  52. 22 22
      locations/pavaptcourtev.qsrc
  53. 7 43
      locations/placer_act.qsrc
  54. 1 4
      locations/placer_gop_orgy.qsrc
  55. 1 4
      locations/placer_house.qsrc
  56. 1 4
      locations/placer_house_one.qsrc
  57. 3 14
      locations/placer_sex.qsrc
  58. 3 3
      locations/pod_ezd.qsrc
  59. 4 32
      locations/podezdM.qsrc
  60. 41 58
      locations/postevents.qsrc
  61. 5 1
      locations/qwBarEncounters.qsrc
  62. 64 67
      locations/reks.qsrc
  63. 3 16
      locations/restoranM.qsrc
  64. 17 37
      locations/rolanapt.qsrc
  65. 2 18
      locations/sbReksHome.qsrc
  66. 0 53
      locations/shortgs.qsrc
  67. 2 23
      locations/shulga_room.qsrc
  68. 2 15
      locations/sister.qsrc
  69. 13 45
      locations/sisterQW.qsrc
  70. 1 14
      locations/sister_party.qsrc
  71. 1 9
      locations/soniaDisco.qsrc
  72. 3 3
      locations/stat_display.qsrc
  73. 3 10
      locations/street_event.qsrc
  74. 1 7
      locations/tanspalnya.qsrc
  75. 3 4
      locations/vecher.qsrc
  76. 1 5
      locations/vipclub.qsrc
  77. 2 2
      locations/youry.qsrc
  78. 1 5
      locations/zsoft_gopskverGorSlut.qsrc

+ 2 - 1
glife.qproj

@@ -54,9 +54,11 @@
 		<Location name="femcyc"/>
 		<Location name="exercise"/>
 		<Location name="food"/>
+		<Location name="beverage"/>
 		<Location name="food_menu"/>
 		<Location name="virginity_call"/>
 		<Location name="willpower"/>
+		<Location name="drugs"/>
 	</Folder>
 	<Folder name="Body">
 		<Location name="body"/>
@@ -222,7 +224,6 @@
 	<Folder name="Furniture">
 		<Location name="bed"/>
 		<Location name="bed2"/>
-		<Location name="beverage"/>
 		<Location name="dreams"/>
 		<Location name="budilnik"/>
 		<Location name="divan"/>

+ 1 - 9
locations/BDSM_Club.qsrc

@@ -5,15 +5,7 @@ if $ARGS[0] = 'Hos':
 	minut += 10
 	lesbiday = daystart
 	BDSMClub = 1
-	alko += 2
-	cumspclnt = 2
-	gs 'cum_cleanup'
-	pcs_breath = 0
-	if pcs_hydra >= 100:
-		pcs_hydra -= 5
-	else
-		pcs_hydra -= 10
-	end
+	gs 'drugs', 'alcohol', 'wine'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/hosjaika.jpg"></center>'
 	'After a few visits to your Mistress you are getting a little closer. Seeing her this evening, you catch her a little tipsy. Instead of already familiar perversions, you just sit in the kitchen and drink wine, talking about life. In conversation, the Mistress mentions a BDSM club. Sounds interesting, you and the Mistress pour glass after glass and slowly you gather details from her. Turns out, the city has an elite BDSM-club, and the missus is in it. After much persuasion, she gives you a business card – a piece of cardboard with three-dimensional logo without inscriptions, and explains how to get to the Club.'

+ 2 - 2
locations/FedorMisc.qsrc

@@ -533,7 +533,7 @@ if $ARGS[0] = 'Smoke':
 	menu_off = 1
 	npc_rel['A5'] += 5
 	siga += 1
-	gs 'shortgs','smoker'
+	gs 'drugs', 'smoke'
 	cumspclnt = 2
 	gs 'cum_cleanup'
 	pcs_breath = 0
@@ -552,7 +552,7 @@ if $ARGS[0] = 'Smoke 2':
 	menu_off = 1
 	npc_rel['A5'] += 5
 	siga += 1
-	gs 'shortgs','smoker'
+	gs 'drugs', 'smoke'
 	cumspclnt = 2
 	gs 'cum_cleanup'
 	pcs_breath = 0

+ 1 - 5
locations/Gnpc.qsrc

@@ -193,12 +193,8 @@ act 'Take a walk through the park':
 
 			act 'Drink':
 				cla
-				pcs_mood += 50
 				minut += 30
-				alko += 2
-				cumspclnt = 2
-				gs 'cum_cleanup'
-				pcs_breath = 0
+				gs 'drugs', 'alcohol', 'beer'
 				otnBoyFrend[numnpc] += 5
 				gs 'stat'
 

+ 1 - 4
locations/Gnpc2.qsrc

@@ -403,10 +403,7 @@ $din_gboy_go_to_disco = {
 
 				act 'Have a drink with him':
 					cla
-					alko += 2
-					cumspclnt = 2
-					gs 'cum_cleanup'
-					pcs_breath = 0
+					gs 'drugs', 'alcohol', 'beer'
 					minut += 3
 					pcs_horny += 5
 					gs 'stat'

+ 1 - 9
locations/JuliaMilHome.qsrc

@@ -65,15 +65,7 @@ elseif lernHome = 0:
 				menu_off = 1
 				minut += 30
 				wine = 0
-				alko += 6
-				cumspclnt = 2
-				gs 'cum_cleanup'
-				pcs_breath = 0
-				if pcs_hydra >= 100:
-					pcs_hydra -= 5
-				else
-					pcs_hydra -= 10
-				end
+				gs 'drugs', 'alcohol', 'wine', 2
 				JulMilBestFrend += 1
 				pcs_horny += 10
 				gs 'stat'

+ 2 - 2
locations/MartinSex.qsrc

@@ -544,7 +544,7 @@ if $ARGS[0] = 'MartinTease1':
 end
 
 if $ARGS[0] = 'MartinTease2':
-	alko += 1
+	gs 'drugs', 'alcohol', 'wine'
 	'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/sex/bar/martin/tease/nopant_tease1.jpg"></center>'
 	'You are not in the mood to play hard-to-get; in fact, now that you think about it, maybe the easiest way to get Martin to drop this "you deserve better" spiel is to be <i>easy</i>.'
 	*nl
@@ -765,7 +765,7 @@ if $ARGS[0] = 'MartinTease3':
 end
 
 if $ARGS[0] = 'MartinTease4':
-	alko += 1
+	gs 'drugs', 'alcohol', 'wine'
 	'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/sex/bar/martin/tease/nopant_tease1.jpg"></center>'
 	'Feeling in the mood to give Martin a bit of a show today, you give him a soft push, just strong enough to make him get the hint and sit down on the chair behind him.'
 	*nl

+ 1 - 1
locations/NikoDates.qsrc

@@ -1050,7 +1050,7 @@ if $ARGS[0] = 'Disco':
 
 	act 'Drink':
 		cls
-		alko += 3
+		gs 'drugs', 'alcohol', 'vodka'
 		NikoEv = 8
 		gs'stat'
 		'<center><video autoplay loop src="images/locations/pavlovsk/resident/rekshome/party/party_rex_party_gost_2_2.mp4"></video></center>'

+ 1 - 1
locations/NikoEv.qsrc

@@ -511,7 +511,7 @@ if $ARGS[0] = 'Disco Chat':
 		act 'Drink':	
 			cls
 			NikoAlko = 2
-			alko += 2
+			gs 'drugs', 'alcohol', 'vodka'
 			NikoLuv += 1
 			npc_rel['A189'] += rand(5,10)
 			minut += 10

+ 1 - 1
locations/NikoEv2.qsrc

@@ -973,7 +973,7 @@ if $ARGS[0] =  'Diner Slut':
 
 		act 'Walk to Diner':
 			cls
-			alko += 1
+			gs 'drugs', 'alcohol', 'vodka'
 			NikoDiner = rand(2,3)
 			NikoSlut = 2
 			minut += 10

+ 1 - 2
locations/NikoPayback.qsrc

@@ -726,9 +726,8 @@ if $ARGS[0] = 'Vitek Help 2':
 		*nl
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/fight/down.jpg"></center>'
 	
-		act 'Have a drink then walk away':alko += 1 & gt 'gdkin'
-		
 		act 'Walk away':gt 'gdkin'
+		act 'Have a drink then walk away': gs 'drugs', 'alcohol', 'beer' & gt 'gdkin'
 	end
 end
 

+ 1 - 1
locations/ParkKafe.qsrc

@@ -72,7 +72,7 @@ if $ARGS[0] = 'guys':
 
 			act 'Drink beer with the guys':
 				cla
-				alko += 1
+				gs 'drugs', 'alcohol', 'beer'
 				'You drink a glass of beer, while the guys order another. One of them quietly slipped something into your glass. You got drunk very quickly and the guys guide you to the nearest woods.'
 				if rand(0, 1) = 0:
 					if parkara = 0:guy += 2 & parkara = 1

+ 1 - 6
locations/Serge_kuh.qsrc

@@ -101,12 +101,7 @@ if $ARGS[0] = 'vodka':
 		act 'Accept the beer':
 			*clr & cla
 			minut += 2
-			if beer_count > 0: 
-				alko += 1
-				cumspclnt = 2
-				gs 'cum_cleanup'
-				pcs_breath = 0
-			end
+			if beer_count > 0: gs 'drugs', 'alcohol', 'beer'
 			beer_day = daystart
 			if beer_count > 0: beer_count -= 1
 			gs 'stat'

+ 2 - 15
locations/Terminal.qsrc

@@ -180,15 +180,7 @@ elseif trfatherQW = 3 and week = 6 and hour = 12:
 		'"Hello, beauty, You want to have a drink with us?'
 		act 'Drink':
 			cls
-			alko += 1
-			cumspclnt = 2
-			gs 'cum_cleanup'
-			pcs_breath = 0
-			if pcs_hydra >= 100:
-				pcs_hydra -= 5
-			else
-				pcs_hydra -= 10
-			end
+			gs 'drugs', 'alcohol', 'beer'
 			minut += 5
 			gs'stat'
 			'<center><img <<$set_imgh>> src="images/characters/city/mikhail/terminal/trfatherqw_10.jpg"></center>'
@@ -197,12 +189,7 @@ elseif trfatherQW = 3 and week = 6 and hour = 12:
 			'They shared stories of fuck whores and married women on the road in the cockpits of their trucks.'
 			act 'Drink':
 				cls
-				alko += 3
-				if pcs_hydra >= 100:
-					pcs_hydra -= 5
-				else
-					pcs_hydra -= 10
-				end
+				gs 'drugs', 'alcohol', 'vodka'
 				minut += 5
 				gs'stat'
 				'<center><img <<$set_imgh>> src="images/characters/city/mikhail/terminal/trfatherqw_11.jpg"></center>'

+ 7 - 55
locations/albinahome.qsrc

@@ -19,10 +19,7 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 			act 'Drink':
 				*clr & cla
 				minut += 15
-				alko += 2
-				cumspclnt = 2
-				gs 'cum_cleanup'
-				pcs_breath = 0
+				gs 'drugs', 'alcohol', 'wine'
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/drink_wine.jpg"></center>'
 				'You sat down at the table while Albina grabs a bottle of wine. She deftly opens the bottle and pours wine in two glasses.'
@@ -32,15 +29,7 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 				act 'Ask her how her father reacted when he learned of her business':
 					*clr & cla
 					minut += 15
-					alko += 2
-					cumspclnt = 2
-					gs 'cum_cleanup'
-					if pcs_hydra >= 100:
-						pcs_hydra -= 5
-					else
-						pcs_hydra -= 10
-					end
-					pcs_breath = 0
+					gs 'drugs', 'alcohol', 'wine'
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/drink_wine.jpg"></center>'
 					'You ask Albina "And how did he react when he found out about your business?"'
@@ -53,15 +42,7 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 					act 'Ask her what she''s talking about':
 						*clr & cla
 						minut += 15
-						alko += 2
-						cumspclnt = 2
-						gs 'cum_cleanup'
-						pcs_breath = 0
-						if pcs_hydra >= 100:
-							pcs_hydra -= 5
-						else
-							pcs_hydra -= 10
-						end
+						gs 'drugs', 'alcohol', 'wine'
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/drink_wine.jpg"></center>'
 						'You shake your head in amazement, "What are you talking about?"'
@@ -75,15 +56,7 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 						act 'Ask her how she knows her father is bankrupt':
 							*clr & cla
 							minut += 15
-							alko += 2
-							cumspclnt = 2
-							gs 'cum_cleanup'
-							pcs_breath = 0
-							if pcs_hydra >= 100:
-								pcs_hydra -= 5
-							else
-								pcs_hydra -= 10
-							end
+							gs 'drugs', 'alcohol', 'wine'
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/drink_wine.jpg"></center>'
 							'You asked Albina "How do you know your fathers businesses are bankrupt?"'
@@ -93,15 +66,7 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 							act 'Tell Albina that you didn''t get the whole picture':
 								*clr & cla
 								minut += 15
-								alko += 2
-								cumspclnt = 2
-								gs 'cum_cleanup'
-								pcs_breath = 0
-								if pcs_hydra >= 100:
-									pcs_hydra -= 5
-								else
-									pcs_hydra -= 10
-								end
+								gs 'drugs', 'alcohol', 'wine'
 								gs 'stat'
 								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/drink_wine.jpg"></center>'
 								'You murmur "I''m not quite sure I understand everything."'
@@ -113,15 +78,7 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 								act 'Drink':
 									*clr & cla
 									minut += 15
-									alko += 2
-									cumspclnt = 2
-									gs 'cum_cleanup'
-									pcs_breath = 0
-									if pcs_hydra >= 100:
-										pcs_hydra -= 5
-									else
-										pcs_hydra -= 10
-									end
+									gs 'drugs', 'alcohol', 'wine'
 									gs 'stat'
 									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/drink_wine.jpg"></center>'
 									'Once again you sit quietly for a while, sipping your wine.'
@@ -466,12 +423,7 @@ if $ARGS[0] = 'vine':
 		*clr & cla
 		menu_off = 1
 		minut += 60
-		pcs_mood += 15
-		pcs_willpwr += 20
-		alko += 4
-		cumspclnt = 2
-		gs 'cum_cleanup'
-		pcs_breath = 0
+		gs 'drugs', 'alcohol', 'wine'
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/drink_wine.jpg"></center>'
 		'You drink a glass of wine with Albina.'

+ 1 - 6
locations/artemEv.qsrc

@@ -605,12 +605,7 @@ if $ARGS[0] = 'learn':
 			'The boys noticed as well, and offer you one more glass for good measure. Once they''re positive you''re hammered, Artem pulls out his phone and begins to record.'
 			minut += 5
 			pcs_horny += 10
-			alko += 4
-			if pcs_hydra >= 100:
-				pcs_hydra -= 5
-			else
-				pcs_hydra -= 10
-			end
+			gs 'drugs', 'alcohol', 'wine', 2
 			gs 'stat'
 
 			act 'See what happens next':

+ 1 - 1
locations/artemev2.qsrc

@@ -127,7 +127,7 @@ elseif artQW = 10:
 	else
 		pcs_hydra -= 10
 	end
-	alko += 4
+	gs 'drugs', 'alcohol', 'wine', 2
 	gs 'stat'
 
 	act 'Tell him to stop it':

+ 1 - 4
locations/arturHome.qsrc

@@ -12,10 +12,7 @@ gs 'stat'
 act 'Go to his home':
 	*clr & cla
 	minut += 60
-	alko += 6
-	cumspclnt = 2
-	gs 'cum_cleanup'
-	pcs_breath = 0
+	gs 'drugs', 'alcohol', 'vodka', 2
 	gs 'boyStat', 'A73'
 	$boydesc = $npc_usedname['A73']
 	silavag = npc_sexskill['A73']

+ 1 - 1
locations/balkon2.qsrc

@@ -6,7 +6,7 @@ if $ARGS[0] = 'kurit':
 	cla
 	*clr
 	minut += 10
-	gs 'shortgs','smoker'
+	gs 'drugs', 'smoke'
 	pcs_sleep += 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/kurit.jpg"></center>'

+ 2 - 8
locations/belpicknick.qsrc

@@ -12,14 +12,8 @@ if $ARGS[0] = '':
 	minut += 15
 	'The band of criminals quickly fold out a convenient steel grill, and have it heated up within minutes. The one named Tatar fries the meat they brought with them, while one of the others pours vodka into some glasses. Vadim hands you a glass: "Here, drink". They didn''t bring any other snacks, so you''re pretty much drinking the vodka on an empty stomach.'
 	act'Drink the vodka':
-		cls
-		alko += 6
-		if pcs_hydra >= 100:
-			pcs_hydra -= 5
-		else
-			pcs_hydra -= 10
-		end
-		frost = 0
+		*clr & cla
+		gs 'drugs', 'alcohol', 'vodka'
 		gs'stat'
 		'You drink the vodka as you were told, and feel a shiver run down your spine. Your throat burns when you swallow it, but soon after a pleasant warmth spreads throughout your body. A few minutes later, you feel absolutely hammered.'
 		act'Continue':gt 'belpicknick', '1'

+ 10 - 103
locations/beverage.qsrc

@@ -184,22 +184,9 @@ end
 if $ARGS[0] = 'bev_vod':
 	if pcs_health > 50:
 		*clr & cla
-		frost = 0
-		alko += 2
 		minut += 15
-		fat += 8
 		money -= val($_drink['<<args[1]>>,price'])
-		pcs_health -= 5
-		pcs_mood += 10
-		pcs_energy -= 4
-		if pcs_hydra >= 100:
-			pcs_hydra -= 5
-		else
-			pcs_hydra -= 10
-		end
-		cumspclnt = 2
-		gs 'cum_cleanup'
-		pcs_breath = 0
+		gs 'drugs', 'alcohol', 'vodka'
 		gs 'beverage', 'afteralcohol'
 		'<center><img <<$set_imgh>> src="images/locations/shared/brothel/barordervodka.jpg"></center>'
 		'The vodka shot disappears, like it was only water, and<<$mtxt>>'
@@ -220,28 +207,15 @@ end
 if $ARGS[0] = 'bev_bla':
 	if pcs_health > 50:
 		*clr & cla
-		frost = 0
-		alko += 3
 		minut += 15
-		fat += 8
+		pcs_mood += 10
 		money -= val($_drink['<<args[1]>>,price'])
-		pcs_health -= 5
-		pcs_mood += 15
-		pcs_energy += 5
-		if pcs_hydra >= 100:
-			pcs_hydra -= 5
-		else
-			pcs_hydra -= 10
-		end
-		cumspclnt = 2
-		gs 'cum_cleanup'
-		pcs_breath = 0
+		gs 'drugs', 'alcohol', 'vodka'
 		gs 'beverage', 'afteralcohol'
 		'<center><img <<$set_imgh>> src="images/shared/drinks/blackrussian.jpg"></center>'
 		'You drink a Black Russian, and<<$mtxt>>'
 		gs 'stat'
 		killvar '$_drink'
-
 		if food_loc = 1 and $loc ! 'brothel':
 			act 'Finish': gt 'food_menu'
 		else
@@ -256,22 +230,9 @@ end
 if $ARGS[0] = 'bev_sco':
 	if pcs_health > 50:
 		*clr & cla
-		frost = 0
-		alko += 2
 		minut += 15
-		fat += 6
 		money -= val($_drink['<<args[1]>>,price'])
-		pcs_health -= 5
-		pcs_mood += 10
-		pcs_energy -= 4
-		if pcs_hydra >= 100:
-			pcs_hydra -= 5
-		else
-			pcs_hydra -= 10
-		end
-		cumspclnt = 2
-		gs 'cum_cleanup'
-		pcs_breath = 0
+		gs 'drugs', 'alcohol', 'scotch'
 		gs 'beverage', 'afteralcohol'
 		'<center><img <<$set_imgh>> src="images/shared/drinks/scotch.jpg"></center>'
 		'You drink scotch on the rocks, and<<$mtxt>>'
@@ -292,22 +253,9 @@ end
 if $ARGS[0] = 'bev_win':
 	if pcs_health > 50:
 		*clr & cla
-		frost = 0
-		alko += 2
 		minut += 15
-		fat += 4
 		money -= val($_drink['<<args[1]>>,price'])
-		pcs_health -= 5
-		pcs_mood += 15
-		pcs_energy -= 4
-		if pcs_hydra >= 100:
-			pcs_hydra -= 5
-		else
-			pcs_hydra -= 10
-		end
-		cumspclnt = 2
-		gs 'cum_cleanup'
-		pcs_breath = 0
+		gs 'drugs', 'alcohol', 'wine'
 		gs 'beverage', 'afteralcohol'
 		'<center><img <<$set_imgh>> src="images/shared/drinks/redwine.jpg"></center>'
 		'You drink some red wine, and<<$mtxt>>'
@@ -328,22 +276,10 @@ end
 if $ARGS[0] = 'bev_mar':
 	if pcs_health > 50:
 		*clr & cla
-		frost = 0
-		alko += 3
 		minut += 15
-		fat += 8
 		money -= val($_drink['<<args[1]>>,price'])
-		pcs_health -= 5
-		pcs_mood += 20
-		pcs_energy -= 4
-		if pcs_hydra >= 100:
-			pcs_hydra -= 5
-		else
-			pcs_hydra -= 10
-		end
-		cumspclnt = 2
-		gs 'cum_cleanup'
-		pcs_breath = 0
+		pcs_mood += 10
+		gs 'drugs', 'alcohol', 'vodka'
 		gs 'beverage', 'afteralcohol'
 		'<center><img <<$set_imgh>> src="images/shared/drinks/martini.jpg"></center>'
 		'You drink a vodka martini, and<<$mtxt>>'
@@ -364,22 +300,9 @@ end
 if $ARGS[0] = 'bev_cha':
 	if pcs_health > 50:
 		*clr & cla
-		frost = 0
-		alko += 2
 		minut += 15
-		fat += 4
 		money -= val($_drink['<<args[1]>>,price'])
-		pcs_health -= 5
-		pcs_mood += 20
-		pcs_energy -= 4
-		if pcs_hydra >= 100:
-			pcs_hydra -= 5
-		else
-			pcs_hydra -= 10
-		end
-		cumspclnt = 2
-		gs 'cum_cleanup'
-		pcs_breath = 0
+		gs 'drugs', 'alcohol', 'champagne'
 		gs 'beverage', 'afteralcohol'
 		'<center><img <<$set_imgh>> src="images/shared/drinks/champagne.jpg"></center>'
 		'You drink some champagne, and<<$mtxt>>'
@@ -400,28 +323,14 @@ end
 if $ARGS[0] = 'bev_bee':
 	if pcs_health > 50:
 		*clr & cla
-		frost = 0
-		alko += 1
 		minut += 15
-		fat += 3
 		money -= val($_drink['<<args[1]>>,price'])
-		pcs_health -= 5
-		pcs_mood += 5
-		pcs_energy -= 4
-		if pcs_hydra >= 100:
-			pcs_hydra += 5
-		else
-			pcs_hydra += 10
-		end
-		cumspclnt = 2
-		gs 'cum_cleanup'
-		pcs_breath = 0
+		gs 'drugs', 'alcohol', 'beer'
 		gs 'beverage', 'afteralcohol'
 		'<center><img <<$set_imgh>> src="images/shared/drinks/darkbeer.jpg"></center>'
 		'You drink the beer, enjoying the fresh, mildly bitter taste, and<<$mtxt>>'
 		gs 'stat'
 		killvar '$_drink'
-
 		if food_loc = 1 and $loc ! 'brothel':
 			act 'Finish': gt 'food_menu'
 		else
@@ -433,9 +342,7 @@ if $ARGS[0] = 'bev_bee':
 	end
 end
 
-if $ARGS[0] = 'bev_bbr':
-	food_loc = 0 & gt 'brothel','bar:order:password'
-end
+if $ARGS[0] = 'bev_bbr': food_loc = 0 & gt 'brothel','bar:order:password'
 
 if $ARGS[0] = 'afteralcohol':
 	if pcs_hydra < 100:

+ 6 - 10
locations/club.qsrc

@@ -723,16 +723,9 @@ if $ARGS[0] = 'bar':
 			*clr & cla
 			menu_off = 1
 			minut += 15
-			fat += 1
-			pcs_mood += 10
-			pcs_willpwr += 10
-			alko += 3
-			pcs_breath = 0
-			cumspclnt = 2
-			gs 'cum_cleanup'
+			gs 'drugs', 'alcohol', 'rum'
 			pcs_horny += rand(10, 50)
 			money -= 300
-			frost = 0
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/club6.jpg"></center>'
 			'You found a free bar stool and sat down on it. You ordered the barkeeper to mix you a cocktail and a few moments later, you sipping on a sweet one.'
 
@@ -966,8 +959,11 @@ if $ARGS[0] = 'bar1':
 	'While you sit on one of the bar stools a man comes to and grabs on of your ass cheeks. "Why don''t we both have some fun together, huh?", the bloke says and you can hear, that he had more than one beer.'
 
 	act 'Send':
-		if alko < 4:gt 'club', 'bar'
-		if alko >= 4:gt 'club', 'rape'
+		if alko < 4:
+			gt 'club', 'bar'
+		else
+			gt 'club', 'rape'
+		end
 	end
 
 	if pcs_dom > 10:

+ 4 - 4
locations/dateF.qsrc

@@ -397,7 +397,7 @@ if $ARGS[0] = 'datebar':
 		'As you sit down <<$boydesc>> asks you, "Would you like to drink something?"'
 		act 'I''ll have a beer, thanks':
 			*clr & cla
-			alko += 1
+			gs 'drugs', 'alcohol', 'beer'
 			'<center><img src="images/locations/shared/datef/bar1.jpg"></center>'
 			'"My kind of girl." <<$boydesc>> tells you.'
 			act 'Talk':gt 'dateF', 'bartalk'
@@ -405,7 +405,7 @@ if $ARGS[0] = 'datebar':
 
 		act 'I''ll have some hard liquor, thanks':
 			*clr & cla
-			alko += 2
+			gs 'drugs', 'alcohol', 'vodka'
 			'<center><img src="images/locations/shared/datef/bar1.jpg"></center>'
 			'"My kind of girl." <<$boydesc>> tells you.'
 			act 'Talk':gt 'dateF', 'bartalk'
@@ -431,7 +431,7 @@ if $ARGS[0] = 'bartalk':
 		'<<$boydesc>> nods her head. "Yeah they are, do you want another drink?"'
 		act 'Sure':
 			*clr & cla
-			alko += 2
+			gs 'drugs', 'alcohol', 'vodka'
 			minut += 20
 			gs 'stat'
 			'<center><img src="images/locations/shared/datef/bar2.jpg"></center>'
@@ -452,7 +452,7 @@ if $ARGS[0] = 'bartalk':
 						*clr & cla
 						minut += 15
 						gs 'stat'
-						alko += 2
+						gs 'drugs', 'alcohol', 'vodka'
 						'<center><img src="images/locations/shared/datef/bar3.jpg"></center>'
 						'"Damn <<$pcs_nickname>> you really know how to move. I bet all that dancing made you even thirstier."'
 						'You nod and she quickly gets up and gets more drinks.'

+ 3 - 3
locations/dateM.qsrc

@@ -714,7 +714,7 @@ if $ARGS[0] = 'datebar':
 		'As you sit down <<$boydesc>> asks you, "Would you like to drink something?"'
 		act 'I''ll have a beer, thanks':
 			*clr & cla
-			alko += 1
+			gs 'drugs', 'alcohol', 'beer'
 			'<center><img src="images/locations/shared/date/barorder_'+ rand(1,2) +'.jpg"></center>'
 			'"My kind of girl." <<$boydesc>> tells you.'
 			act 'Talk':gt 'dateM', 'bartalk'
@@ -722,7 +722,7 @@ if $ARGS[0] = 'datebar':
 
 		act 'I''ll have some hard liquor, thanks':
 			*clr & cla
-			alko += 2
+			gs 'drugs', 'alcohol', 'vodka'
 			'<center><img src="images/locations/shared/date/barorder_'+ rand(1,2) +'.jpg"></center>'
 			'"My kind of girl." <<$boydesc>> tells you.'
 			act 'Talk':gt 'dateM', 'bartalk'
@@ -750,7 +750,7 @@ if $ARGS[0] = 'bartalk':
 		!!add to buzz
 		act 'Sure':
 			*clr & cla
-			alko += 2
+			gs 'drugs', 'alcohol', 'vodka'
 			minut += 20
 			gs 'stat'
 			'<center><img src="images/locations/shared/date/bardiscuss.jpg"></center>'

+ 6 - 16
locations/dimaEv.qsrc

@@ -78,11 +78,8 @@ if $ARGS[0] = 'drugged':
 	*clr & cla
 	minut += 15
 	narkday = daystart
-	pcs_health = pcs_vital * 10 + pcs_stren * 5
-	pcs_willpwr = pcs_intel * 5 + pcs_sprt * 5
-	pcs_mood += 1000
-	pcs_horny = 100
-	nark += 10
+	dur += 1
+	gs 'drugs', 'cocaine'
 	gs 'stat'
 	'<center><b><font color="maroon"><<$npc_firstname[''A1'']>> <<$npc_lastname[''A1'']>></font></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/1.jpg"></center>'
@@ -94,11 +91,8 @@ if $ARGS[0] = 'cocaine':
 	*clr & cla
 	minut += 15
 	narkday = daystart
-	pcs_health = pcs_vital * 10 + pcs_stren * 5
-	pcs_willpwr = pcs_intel * 5 + pcs_sprt * 5
-	pcs_mood += 1000
-	pcs_horny = 100
-	nark += 10
+	dur += 1
+	gs 'drugs', 'cocaine'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/shared/drugs/dur.jpg"></center>'
 	'You sniff up the dose of powder. For a moment you just feel numb, then you feel yourself get aroused. The heat coming from your pussy intensifying as it soaks itself. You gasp. It is almost too much to take. You desperately need someone to fuck you. "Oh, fuck". You don''t think this is normal. He must have laced it with something. You blink a few times trying to clear your head, but soon your thoughts grow murky.'
@@ -366,12 +360,8 @@ if $ARGS[0] = 'dimkaplays':
 		*clr & cla
 		minut += 15
 		narkday = daystart
-		pcs_health = pcs_vital * 10 + pcs_stren * 5
-		pcs_willpwr = pcs_intel * 5 + pcs_sprt * 5
-		pcs_mood = 100
-		pcs_horny = 100
-		nark += 10
-		pcs_mood = 100
+		dur += 1
+		gs 'drugs', 'cocaine'
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/shared/drugs/dur.jpg"></center>'
 		'You sniff up the dose of powder. For a moment, you just feel numb, then you feel yourself get aroused, the heat coming from your pussy as it soaks itself, you gasp, it is almost too much to take, you desperately need someone to fuck you. "Oh, fuck". You don''t think this is normal, he must have laced it with something. You blink a few times trying to clear your head, but soon your thoughts grow murky'

+ 4 - 20
locations/din_bad.qsrc

@@ -189,16 +189,8 @@ end
 $dinalkowin1 = {
 	*clr & cla
 	alkowine = 1
-	if pcs_hydra >= 100:
-		pcs_hydra -= 5
-	else
-		pcs_hydra -= 10
-	end
-	if pcs_intel  > 5 : intel_deg -= 1
-	alko += 5
-	cumspclnt = 2
-	gs 'cum_cleanup'
-	pcs_breath = 0
+	minut += 5
+	gs 'drugs', 'alcohol', 'wine'
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/shared/food/alkowin.jpg"></center>'
 	*nl
@@ -209,17 +201,9 @@ $dinalkowin1 = {
 $dinalkowin2 = {
 	*clr & cla
 	alkowine = 0
-	if pcs_hydra >= 100:
-		pcs_hydra -= 5
-	else
-		pcs_hydra -= 10
-	end
 	wine = 0
-	if pcs_intel > 5: intel_deg -= 1
-	alko += 5
-	cumspclnt = 2
-	gs 'cum_cleanup'
-	pcs_breath = 0
+	minut += 5
+	gs 'drugs', 'alcohol', 'wine'
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/shared/food/alkowin.jpg"></center>'
 	*nl

+ 1 - 6
locations/din_van.qsrc

@@ -916,12 +916,7 @@ $palelady = {
 			*clr
 			minut += 5
 			narkday = daystart
-			pcs_health = pcs_vital * 10 + pcs_stren * 5
-			pcs_willpwr = pcs_intel * 5 + pcs_sprt * 5
-			pcs_mood = 100
-			pcs_horny = 100
-			nark += 10
-			dur -= 1
+			gs 'drugs', 'cocaine'
 			'<center><img <<$set_imgh>> src="images/shared/drugs/dur.jpg"></center>'
 			'You snort some Pale Lady, feeling dizzy for just a moment. After that you feel fantastic, and incredibly horny.'
 

+ 131 - 0
locations/drugs.qsrc

@@ -0,0 +1,131 @@
+# drugs
+
+!! How to use:
+!! Smoking: gs 'drugs', 'smoke' (if it isn''t svetas cigarette, you have to add siga += 1)
+!! Joint/Weed: gs 'drugs', 'joint' (if it isn''t svetas joint, you have to add joint += 1)
+!! Heroin: gs 'drugs', 'heroin'
+!! Cocaine: gs 'drugs', 'cocaine' (if it isn''t svetas cocaine, you have to add dur += 1)
+
+!! Alcohol: gs 'drugs', 'alcohol', 'type', count
+!! Types: beer, champagne, moonshine, rum, scotch, vodka, wine, whiskey
+!! Count: Number of drinks of the chosen type sveta drinks (if the number is 1, you don''t have add the count, but it isn''t a problem if you do)
+!! Example 1: sveta drinks vodka gs 'drugs', 'alcohol', 'vodka' (or gs 'drugs', 'alcohol', 'vodka', 1)
+!! Example 2: sveta drinks 2 beer gs 'drugs', 'alcohol', 'beer', 2
+
+if $ARGS[0] = 'smoke':
+	if NarkImmune = 0: smoker += 1
+	siga -= 1
+	smokeDay = daystart
+	smokeHour = hour
+	smokeminut = minut + 5
+	smokerNeed = 0
+	cumspclnt = 2
+	gs 'cum_cleanup'
+	pcs_breath = 0
+	pcs_mood += 100
+	wipo += 100
+	if pcs_hydra >= 100:
+		pcs_hydra -= 5
+	else
+		pcs_hydra -= 10
+	end
+	if pcs_energy < 80: pcs_energy += 4
+	gs '$menu_obnovit'
+elseif $ARGS[0] = 'joint':
+	if NarkImmune = 0: joint_smoked += 1
+	joint -= 1
+	jointday = daystart
+	jointhour = hour
+	jointminut = minut + 5
+	if minut > 30:
+		jointhigh = 2
+	else
+		jointhigh = 1
+	end	
+	cumspclnt = 2
+	gs 'cum_cleanup'
+	pcs_breath = 0
+	pcs_mood += 100
+	if pcs_hydra >= 100:
+		pcs_hydra -= 5
+	else
+		pcs_hydra -= 10
+	end
+	if pcs_energy > 20: 
+		pcs_energy -= 20
+	else
+		pcs_energy = 0
+	end
+	gs '$menu_obnovit'
+elseif $ARGS[0] = 'heroin':
+	if NarkImmune = 0: SNarkTimes += 1
+	StrongNarkota += 25
+	pcs_mood = 100
+	pcs_health -= 10
+	gs '$menu_obnovit'
+elseif $ARGS[0] = 'cocaine':
+	dur -= 1
+	pcs_health = pcs_vital * 10 + pcs_stren * 5
+	pcs_willpwr = pcs_intel * 5 + pcs_sprt * 5
+	pcs_mood = 100
+	pcs_horny = 100
+	nark += 10
+elseif $ARGS[0] = 'alcohol':
+	if ARGS[2] <= 1: 
+		alc_count = 1
+	else
+		alc_count = ARGS[2]
+	end
+	:alcohol_jump
+	alc_count -= 1
+	frost = 0
+	pcs_health -= 5
+	pcs_energy -= 5
+	cumspclnt = 2
+	gs 'cum_cleanup'
+	pcs_breath = 0
+	if $ARGS[1] = 'beer':
+		alko += 1
+		fat += 3
+		pcs_mood += 10
+		if pcs_hydra >= 100:
+			pcs_hydra += 5
+		else
+			pcs_hydra += 10
+		end
+	elseif $ARGS[1] = 'wine' or $ARGS[1] = 'champagne':
+		alko += 2
+		fat += 4
+		pcs_mood += 20
+		if pcs_hydra >= 100:
+			pcs_hydra += 5
+		else
+			pcs_hydra += 10
+		end
+	elseif $ARGS[1] = 'vodka' or $ARGS[1] = 'whiskey' or $ARGS[1] = 'scotch' or $ARGS[1] = 'rum':
+		alko += 3
+		fat += 6
+		if pcs_hydra >= 100:
+			pcs_hydra -= 5
+		else
+			pcs_hydra -= 10
+		end
+	elseif $ARGS[1] = 'moonshine':
+		alko += 5
+		fat += 6
+		if pcs_hydra >= 100:
+			pcs_hydra -= 5
+		else
+			pcs_hydra -= 10
+		end
+	else
+		'<br><font color = red>Developer note: The type of alcohol is missing in this scene. Please report this and the following variable: $curloc = <<$curloc>> as a bug.</font>'
+	end
+	if alc_count > 0: jump 'alcohol_jump'
+	killvar 'alc_count'
+else
+	'<br><font color = red>Developer note: The type of drug is wrong or missing in this scene. Please report this and the following variable: $curloc = <<$curloc>> as a bug.</font>'
+end
+
+--- drugs ---------------------------------
+

+ 1 - 2
locations/events.qsrc

@@ -277,8 +277,7 @@ if $ARGS[0] = 'snarkozaka':
 	if money >= 1500:
 		act 'Buy heroin (1500 <b>₽</b>)':
 			money -= 1500
-			StrongNarkota += 25
-			SNarkTimes += 1
+			gs 'drugs', 'heroin'
 			narkozakday = day
 			gs'stat'
 			'You buy the drugs and without thinking twice you shoot up.'

+ 4 - 25
locations/fbDormD.qsrc

@@ -245,28 +245,15 @@ $d_fbd_drunk = {
 		*clr & cla
 		menu_off = 1
 		minut += 60
-		alko += 6
-		cumspclnt = 2
-		gs 'cum_cleanup'
-		pcs_breath = 0
-		if pcs_hydra >= 100:
-			pcs_hydra -= 5
-		else
-			pcs_hydra -= 10
-		end
+		gs 'drugs', 'alcohol', 'vodka', 2
 		gs 'stat'
 		'While you take sips of the vodka, you chat with the guys. They''re quite interesting, having many stories to share about where they''re from. While you drink and chat, more and more of <<$boydesc>>''s friends return from what they were doing in Pavlovsk, and the room fills up slowly but surely. It''s turning into quite a large group, and the room sounds like a disturbed bee hive while you continue to take sips of your drink, mostly chatting with <<$boydesc>>. When your glass is almost empty, <<$boydesc>> takes it from you and quickly refills it, offering it to you again.'
 
 		act 'Drink some more':
-			alko += 12
 			dormrape = 0
-			if pcs_hydra >= 100:
-				pcs_hydra -= 5
-			else
-				pcs_hydra -= 10
-			end
-			kol_man = rand(5, 16)
+			kol_man = rand(5,16)
 			$kol_man_text = 'guys'
+			gs 'drugs', 'alcohol', 'vodka', 4
 			gt 'placer_sex', 'meet'
 		end
 	end
@@ -287,15 +274,7 @@ $d_fbd_mass = {
 		minut += 5
 		pcs_horny += 10
 		minut += 60
-		alko += 6
-		cumspclnt = 2
-		if pcs_hydra >= 100:
-			pcs_hydra -= 5
-		else
-			pcs_hydra -= 10
-		end
-		gs 'cum_cleanup'
-		pcs_breath = 0
+		gs 'drugs', 'alcohol', 'vodka', 2
 		pcs_horny += 20
 		gs 'stat'
 

+ 8 - 24
locations/gdksex.qsrc

@@ -5,8 +5,11 @@ if $ARGS[0] = 'outside':
 	music_loop = 0
 	close all
 	
-	if $ARGS[1] = 'aggressiv': gdk_nice_guy = 0
-	if $ARGS[1] = 'nice': gdk_nice_guy = 1
+	if $ARGS[1] = 'aggressiv': 
+		gdk_nice_guy = 0
+	elseif $ARGS[1] = 'nice': 
+		gdk_nice_guy = 1
+	end
 	
 	$metka = 'outside'
 	$loc = 'gdksex'
@@ -66,20 +69,7 @@ if $ARGS[0] = 'outside':
 		end
 		act 'Have a beer':
 			*clr & cla
-			frost = 0
-			alko += 1
-			fat += 3
-			pcs_health -= 5
-			pcs_energy -= 4
-			if pcs_hydra >= 100:
-				pcs_hydra += 5
-			else
-				pcs_hydra += 10
-			end
-			cumspclnt = 2
-			gs 'cum_cleanup'
-			pcs_breath = 0
-			pcs_mood += 30
+			gs 'drugs', 'alcohol', 'beer'
 			minut += 10
 			gs 'stat'
 			'You accept the beer and have a lot of fun chatting with the guy, while you drink the beer and have some chips. He''s very funny, and tells you some hilarious stories.'
@@ -398,10 +388,7 @@ if $ARGS[0] = 'outside':
 			end
 		end
 	elseif (gdk_nice_guy = 1 and pav_slut >= 35 and pav_slut < 65) or (gdk_nice_guy = 0 and pav_slut >= 15 and pav_slut < 35):
-			alko += rand(1,2)
-			cumspclnt = 2
-			gs 'cum_cleanup'
-			pcs_breath = 0
+			gs 'drugs', 'alcohol', 'beer'
 			minut += 15
 			gs 'stat'
 			'He pulls out a six pack and crisps and offers you a beer, while you sit down on a fallen tree.'
@@ -842,10 +829,7 @@ if $ARGS[0] = 'hotel':
 			
 			act 'Have a drink with him':
 				*clr & cla
-				alko += rand(3,4)
-				cumspclnt = 2
-				gs 'cum_cleanup'
-				pcs_breath = 0
+				gs 'drugs', 'alcohol', 'whiskey'
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/shared/sex/kiss/kiss.jpg"></center>'
 				'You can tell he didn''t cheap out on the whiskey at all, this is good stuff!'

+ 2 - 8
locations/gevent.qsrc

@@ -131,10 +131,7 @@ end
 if $ARGS[0] = '3':
 	*clr & cla
 	menu_off = 1
-	alko += 10
-	cumspclnt = 2
-	gs 'cum_cleanup'
-	pcs_breath = 0
+	gs 'drugs', 'alcohol', 'vodka', 3
 	minut += 120
 	stat['bj'] += 3
 	stat['anal'] += 3
@@ -173,10 +170,7 @@ if $ARGS[0] = '4':
 	*clr & cla
 	menu_off = 1
 	guy += 1
-	alko += 2
-	cumspclnt = 2
-	gs 'cum_cleanup'
-	pcs_breath = 0
+	gs 'drugs', 'alcohol', 'vodka'
 	stat['vaginal'] += 1
 	pcs_vag += 1
 	cumprecheck = 1

+ 2 - 8
locations/gopnew.qsrc

@@ -343,10 +343,7 @@ if $ARGS[0] = 'pivas':
 	end
 
 	if gnewQW > 0:
-		alko += 1
-		cumspclnt = 2
-		gs 'cum_cleanup'
-		pcs_breath = 0
+		gs 'drugs', 'alcohol', 'beer'
 		'You sit down next to the guys on the bench and have a beer with them.'
 		'A burly man named Udmurt and a bald man named Grey enter the playground a few minutes later, walking towards your group.'
 
@@ -481,10 +478,7 @@ if $ARGS[0] = 'pivas':
 	end
 
 	gopota += 1
-	alko += 2
-	cumspclnt = 2
-	gs 'cum_cleanup'
-	pcs_breath = 0
+	gs 'drugs', 'alcohol', 'beer'
 	'You sit down next to Vasan and share a beer with him.'
 	'<<$gopnik>>'
 

+ 2 - 13
locations/gopskver.qsrc

@@ -40,10 +40,7 @@ if kotovLoveQW > 0:
 		act 'Drink beer with Vitek and the guys':
 			*clr & cla
 			minut += 15
-			alko += 1
-			cumspclnt = 2
-			gs 'cum_cleanup'
-			pcs_breath = 0
+			gs 'drugs', 'alcohol', 'beer'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/bigroom/drunk_ev/beer3.jpg"></center>'
 			'The guys pour out a beer for you, and you enjoy a nice cold beer in their company.'
@@ -221,15 +218,7 @@ else
 				act 'Drink beer with the guys':
 					*clr & cla
 					minut += 15
-					alko += 1
-					cumspclnt = 2
-					gs 'cum_cleanup'
-					pcs_breath = 0
-					if pcs_hydra >= 100:
-						pcs_hydra += 5
-					else
-						pcs_hydra += 10
-					end
+					gs 'drugs', 'alcohol', 'beer'
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/bigroom/drunk_ev/beer3.jpg"></center>'
 					'The guys cheer and pour out a beer for you. Vasily gives you ' + iif($prevloc = 'gkafe','a glass','the cup') +' while the others propose a toast, already having beers in their hands. You happily join them in their toast, and spend the next 15 minutes chatting with them and having sips of your cold beer.'

+ 2 - 2
locations/katalkin.qsrc

@@ -152,7 +152,7 @@ elseif hour >= 22:
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/katalkin/katalkin.jpg"></center>'
 				'You join the officers at the table, who have clearly been drinking for a while already. They immediately pour you a glass of vodka. Katalkin says: "This is Pasha, and the other guy is Sergei. They''re good officers, the best Pavlovsk has to offer. Let''s have a toast, to meeting new friends!"'
 
-				act 'Raise your glass with them and drink':alko += 2 & minut += 5 & gt 'katalkinAlko'
+				act 'Raise your glass with them and drink': gs 'drugs', 'alcohol', 'vodka' & minut += 5 & gt 'katalkinAlko'
 			end
 		else
 			'When Katalkin sees you walk by, he waves you over and drunkenly says: <<$pcs_nickname>>! Come here, have a drink with me and my boys!"'
@@ -165,7 +165,7 @@ elseif hour >= 22:
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/katalkin/katalkin.jpg"></center>'
 				'You join the officers at the table, who clearly have been drinking for a while already. They immediately pour you a glass of vodka and have a swig from their own.'
 
-				act 'Drink the vodka':pcs_hydra -= 10 & alko += 2 & minut += 5 & gt 'katalkinAlko'
+				act 'Drink the vodka':pcs_hydra -= 10 & gs 'drugs', 'alcohol', 'vodka' & minut += 5 & gt 'katalkinAlko'
 			end
 		end
 	elseif katalkinSexOnce = 0:

+ 1 - 9
locations/katalkinAlko.qsrc

@@ -13,16 +13,8 @@ if alko < 6:
 	'You join them and take sips of your vodka, feeling it slide down your throat and warm up your stomach. As soon as your glass is empty, they refill it with a generous grin and cheer you on to keep going.'
 
 	act 'Have another drink':
-		alko += 2
-		cumspclnt = 2
-		gs 'cum_cleanup'
-		if pcs_hydra >= 100:
-			pcs_hydra -= 10
-		else
-			pcs_hydra -= 20
-		end
-		pcs_breath = 0
 		minut += 30
+		gs 'drugs', 'alcohol', 'vodka'
 		gt $curloc
 	end
 elseif alko >= 6:

+ 1 - 4
locations/kotovEv.qsrc

@@ -85,10 +85,7 @@ elseif $loc = 'gskver':
 		act 'Drink beer with him':
 			cls
 			minut += 15
-			alko += 2
-			cumspclnt = 2
-			gs 'cum_cleanup'
-			pcs_breath = 0
+			gs 'drugs', 'alcohol', 'beer'
 			gs 'stat'
 			'You smile and sit down with him, drinking the beer while he tells you stories of his youth. He says: "You know, when I first moved here, some kids tried to bully me. I bet they wish they could undo that with a time machine... they still run off whenever they see me, haha!"'
 

+ 2 - 8
locations/kotovtalker.qsrc

@@ -13,10 +13,7 @@ if numnpc = 9 and pav_slut < 100 and kotovLoveQW >= 0 and (npc_rel[$static_num]
 				cls
 				minut += 5
 				npc_rel[$static_num] += 5
-				alko += rand(1,2)
-				cumspclnt = 2
-				gs 'cum_cleanup'
-				pcs_breath = 0
+				gs 'drugs', 'alcohol', 'beer'
 				gs 'stat'
 				'Vitek poured you a beer and you began drinking with him. Vitek stared into your eyes and tells you. "You''re a cool girl, you know that."'
 
@@ -127,10 +124,7 @@ elseif $loc = 'gdkin':
 			cls
 			minut += 5
 			npc_rel[$static_num] += 5
-			alko += rand(1,2)
-			cumspclnt = 2
-			gs 'cum_cleanup'
-			pcs_breath = 0
+			gs 'drugs', 'alcohol', 'beer'
 			gs 'stat'
 			'You drink the beer with his group of friends.'
 

+ 55 - 63
locations/lesbidomhouse.qsrc

@@ -8,28 +8,40 @@ if $ARGS[0] = 'start':
 	$menu_arg = 'start'
 	menu_off = 0
 	gs'stat'
-	temp = RAND(0,2)
+	temp = rand(0,2)
 
 	if temp = 0:
 		'You ring the doorbell several times, but no one comes to answer the door. When you try to look inside through the windows, you don''t see any movement either.'
-
 		act 'Leave':gt'street'
-	elseif temp > 0:
+	else
 		$location_type = 'indoors'
 		'You ring the doorbell several times, and eventually you hear an electronic *click*. The door slowly swings open, even though no one came to answer it.'
-		if lesbiQW = 1:act 'Enter the house': gt 'lesbidomhouse','QW1'
-		if lesbiQW = 2:gt'lesbidomhouse','QW2'
-		if lesbiQW = 3:gt'lesbidomhouse','QW3'
-		if lesbiQW = 4:gt'lesbidomhouse','QW4'
-		if lesbiQW = 5:gt'lesbidomhouse','QW5'
-		if lesbiQW = 6:gt'lesbidomhouse','QW6'
-		if lesbiQW = 7:gt'lesbidomhouse','QW7'
-		if lesbiQW = 8:gt'lesbidomhouse','QW8'
-		if lesbiQW = 9:gt'lesbidomhouse','QW9'
-		if lesbiQW = 10:gt'lesbidomhouse','QW10'
-		if lesbiQW = 11:gt'lesbidomhouse','QW11'
-		if lesbiQW = 12:gt'lesbidomhouse','QW12'
 		act 'Leave':gt'street'
+		if lesbiQW = 1:
+			act 'Enter the house': gt 'lesbidomhouse','QW1'
+		elseif lesbiQW = 2:
+			gt'lesbidomhouse','QW2'
+		elseif lesbiQW = 3:
+			gt'lesbidomhouse','QW3'
+		elseif lesbiQW = 4:
+			gt'lesbidomhouse','QW4'
+		elseif lesbiQW = 5:
+			gt'lesbidomhouse','QW5'
+		elseif lesbiQW = 6:
+			gt'lesbidomhouse','QW6'
+		elseif lesbiQW = 7:
+			gt'lesbidomhouse','QW7'
+		elseif lesbiQW = 8:
+			gt'lesbidomhouse','QW8'
+		elseif lesbiQW = 9:
+			gt'lesbidomhouse','QW9'
+		elseif lesbiQW = 10:
+			gt'lesbidomhouse','QW10'
+		elseif lesbiQW = 11:
+			gt'lesbidomhouse','QW11'
+		elseif lesbiQW = 12:
+			gt'lesbidomhouse','QW12'
+		end		
 	end
 end
 
@@ -83,19 +95,9 @@ if $ARGS[0] = 'QW1':
 			'She leads you to another room when she sees you nod. She had already prepared a bottle of wine, two glasses and some snacks, and invites you to take a seat. "Have a seat, <<$pcs_nickname>>. I''ll be with you soon."'
 
 			act 'Have a chat with her':
-				cla
-				*clr
+				*clr & cla
 				minut += 35
-				pcs_horny += 20
-				alko += 6
-				cumspclnt = 2
-				gs 'cum_cleanup'
-				pcs_breath = 0
-				if pcs_hydra >= 100:
-					pcs_hydra -= 5
-				else
-					pcs_hydra -= 10
-				end
+				gs 'drugs', 'alcohol', 'wine'
 				gs'stat'
 					
 				'<center><img <<$set_imgh>> src="images/characters/city/natalya/wine.jpg"></center>'
@@ -136,19 +138,9 @@ if $ARGS[0] = 'QW1':
 				'Then she looks as if an idea just crossed her mind, and continues: "Actually, why don''t we sit down? I can see you''re interested in learning, but there are some things I have to explain to you first."'
 				'She leads you to another room when she sees you nod. She had already prepared a bottle of wine, two glasses and some snacks, and invites you to take a seat. "Have a seat, <<$pcs_nickname>>, I''ll be with you soon."'
 				act 'Enjoy some drinks with her':
-					cla
-					*clr
+					*clr & cla
 					minut += 35
-					pcs_horny += 20
-					alko += 6
-					cumspclnt = 2
-					gs 'cum_cleanup'
-					pcs_breath = 0
-					if pcs_hydra >= 100:
-						pcs_hydra -= 5
-					else
-						pcs_hydra -= 10
-					end
+					gs 'drugs', 'alcohol', 'wine'
 					gs'stat'
 				
 					'<center><img <<$set_imgh>> src="images/characters/city/natalya/wine.jpg"></center>'
@@ -698,9 +690,9 @@ if $ARGS[0] = 'QW5':
 		girl += 1
 		pcs_sweat += 20
 		MistressAdoration += 1
-		if pcs_vag >= 30:pcs_horny += RAND(40,80)
-		if pcs_vag < 30 and pcs_vag >= 20:pcs_vag += 1 & vgape = 1 & pcs_horny += RAND(20,50)
-		if pcs_vag < 20 and pcs_vag >= 10:pcs_vag += 1 & vgape = 2 & pcs_horny -= RAND(10,30)
+		if pcs_vag >= 30:pcs_horny += rand(40,80)
+		if pcs_vag < 30 and pcs_vag >= 20:pcs_vag += 1 & vgape = 1 & pcs_horny += rand(20,50)
+		if pcs_vag < 20 and pcs_vag >= 10:pcs_vag += 1 & vgape = 2 & pcs_horny -= rand(10,30)
 		if pcs_vag < 10:pcs_vag += 2 & vgape = 3 & pcs_horny = 0
 		if pcs_horny >= 100:orgasm += 1 & vaginalOrgasm += 1 & pcs_horny = 0
 		gs'stat'
@@ -871,7 +863,7 @@ if $ARGS[0] = 'QW6':
 		cla
 		*clr
 		gs'stat'
-		temp = RAND(0,2)
+		temp = rand(0,2)
 		if temp = 0:
 			'<center><img <<$set_imgh>> src="images/characters/city/natalya/sex/sub7.jpg"></center>'
 			'You quickly take your clothes off and stand for her in a proper submissive pose like she taught you. Too impatient for proper protocol, Mistress merely grabs you by the wrist and drags you over to a small table in the hallway. On the table you see a few books, a lamp and a ball gag.'
@@ -887,7 +879,7 @@ if $ARGS[0] = 'QW6':
 				cla
 				*clr
 				gs'stat'
-				temp = RAND(0,2)
+				temp = rand(0,2)
 
 				if temp = 1:
 					'<center><img <<$set_imgh>> src="images/characters/city/natalya/sex/brokenlamp.jpg"></center>'
@@ -1129,7 +1121,7 @@ if $ARGS[0] = 'QW8':
 		lesbiQW = 10
 		gs 'exhibitionism', 2
 		gs'stat'
-		temp = RAND(0,2)
+		temp = rand(0,2)
 
 		if temp = 0:
 			'<center><img <<$set_imgh>> src="images/characters/city/natalya/sex/sub12.jpg"></center>'
@@ -1310,7 +1302,7 @@ if $ARGS[0] = 'QW9':
 	sub += 10
 	minut += 10
 	lesbiday = daystart
-	temp = RAND(0,2)
+	temp = rand(0,2)
 	gs'stat'
 
 	'<center><img <<$set_imgh>> src="images/characters/city/natalya/sex/sub37.jpg"></center>'
@@ -1413,7 +1405,7 @@ if $ARGS[0] = 'QW10':
 	if sub < 75:sub += 1
 	if sub >= 75:lesbiQW = 11 & mistressqwest = 0
 	gs'stat'
-	temp = RAND(0,2)
+	temp = rand(0,2)
 
 	'<center><img <<$set_imgh>> src="images/characters/city/natalya/mistress.jpg"></center>'
 	'Mistress is already waiting for you by the door, and tells you to undress immediately. You flash her an obedient smile, you were already getting started on that the moment you stepped through the door.'
@@ -1431,7 +1423,7 @@ if $ARGS[0] = 'QW10a':
 	cla
 	*clr
 	gs'stat'
-	temp = RAND(0,2)
+	temp = rand(0,2)
 
 	if temp = 0:
 		MistressAdoration += 1
@@ -1447,7 +1439,7 @@ if $ARGS[0] = 'QW10a':
 		act 'Leave her apartment':gt'street'
 	elseif temp = 1:
 		gs'stat'
-		temp = RAND(0,1)
+		temp = rand(0,1)
 
 		'<center><img <<$set_imgh>> src="images/characters/city/natalya/sex/sub19.jpg"></center>'
 		'Once you are naked, Mistress eyes your body up and down again like she always does. You remember your position lectures, and present yourself while you can see her mull over what to do with you today.'
@@ -1484,7 +1476,7 @@ if $ARGS[0] = 'QW10a':
 	else
 		if analplugin = 1:sub += 1
 		gs'stat'
-		temp = RAND(0,2)
+		temp = rand(0,2)
 
 		if analplugin = 1:
 			'<center><img <<$set_imgh>> src="images/characters/city/natalya/sex/sub21.jpg"></center>'
@@ -1532,7 +1524,7 @@ end
 
 if $ARGS[0] = 'QW10b':
 	cls
-	temp = RAND(0,2)
+	temp = rand(0,2)
 
 	if temp = 0:
 		gt 'lesbidomhouse', 'QW10b1'
@@ -1546,7 +1538,7 @@ end
 if $ARGS[0] = 'QW10b1':
 	cls
 	gs'stat'
-	temp = RAND(0,2)				
+	temp = rand(0,2)				
 	'<center><img <<$set_imgh>> src="images/characters/city/natalya/sex/sub22.jpg"></center>'
 	'When you follow Mistress into the room, you see that she laid out a staggering amount of rope for today. Nevertheless, you trust her and offer your wrists readily when she demands you stick them out.'
 	'Once Mistress is finally done binding you, she gags you thoroughly and whispers in your ear: "I have to step out for a little while. You will entertain me when I come back."'
@@ -1617,7 +1609,7 @@ end
 if $ARGS[0] = 'QW10b2':
 	cls
 	gs'stat'
-	temp = RAND(0,2)
+	temp = rand(0,2)
 
 	'<center><img <<$set_imgh>> src="images/characters/city/natalya/sex/sub25.jpg"></center>'
 	'When you follow Mistress into the room, you see that she laid out a staggering amount of rope for today. Nevertheless, you trust her and offer your wrists readily when she demands you stick them out.'
@@ -1635,7 +1627,7 @@ if $ARGS[0] = 'QW10b2':
 			cla
 			*clr
 			gs'stat'
-			temp = RAND(0,1)
+			temp = rand(0,1)
 
 			'<center><img <<$set_imgh>> src="images/characters/city/natalya/sex/sub26.jpg"></center>'
 			'About thirty minutes later, Mistress comes back. She has a weird gag device in her hand, it has dildos on both sides!'
@@ -1686,7 +1678,7 @@ if $ARGS[0] = 'QW10b2':
 		act 'Continue':
 			cla
 			*clr
-			temp = RAND(0,1)
+			temp = rand(0,1)
 			gs'stat'
 
 			'<center><img <<$set_imgh>> src="images/characters/city/natalya/sex/sub27.jpg"></center>'
@@ -1732,7 +1724,7 @@ if $ARGS[0] = 'QW10b2':
 			if pcs_ass < 20 and pcs_ass >= 10:pcs_ass += 2 & agape = 2 
 			if pcs_ass < 10:pcs_ass += 3 & agape = 3
 			gs'stat'
-			temp = RAND(0,1)
+			temp = rand(0,1)
 
 			'<center><img <<$set_imgh>> src="images/characters/city/natalya/sex/sub28.jpg"></center>'
 			'Mistress comes back 30 minutes later. She stands in the door frame and snaps her fingers: "This way, slave."'
@@ -1783,7 +1775,7 @@ end
 if $ARGS[0] = 'QW10b3':
 	cls
 	gs'stat'
-	temp = RAND(0,2)
+	temp = rand(0,2)
 
 	'<center><img <<$set_imgh>> src="images/characters/city/natalya/sex/sub25.jpg"></center>'
 	'When you follow Mistress into the room, you see that she laid out a staggering amount of rope for today. Nevertheless, you trust her and offer your wrists readily when she demands you stick them out.'
@@ -1828,7 +1820,7 @@ if $ARGS[0] = 'QW10b3':
 			minut += 30
 			pcs_horny += 50
 			gs'stat'
-			temp = RAND(0,2)
+			temp = rand(0,2)
 			
 			'<center><img <<$set_imgh>> src="images/characters/city/natalya/sex/sub30.jpg"></center>'
 			'When Mistress comes back after 30 minutes, she''s practically skipping across the apartment despite wearing heels. She''s in a fantastic mood!'
@@ -1871,7 +1863,7 @@ if $ARGS[0] = 'QW10c':
 	minut += 10
 	pcs_horny += 30
 	gs'stat'
-	temp = RAND(0,2)
+	temp = rand(0,2)
 		
 	if temp = 0:
 	
@@ -1891,7 +1883,7 @@ if $ARGS[0] = 'QW10c':
 			spankedtime = totminut
 			pcs_sweat += 10
 			gs'stat'
-			temp = RAND(0,2)
+			temp = rand(0,2)
 
 			'<center><img <<$set_imgh>> src="images/characters/city/natalya/sex/sub31.jpg"></center>'
 			'You dutifully lean over and put your hands on the nearest chair, exposing your ass for Mistress while she walks off to find something to spank you with. She returns with a wooden board, skilfully spanking your ass for the next half hour. You try to remain firm and stand up straight, taking your punishment in stride... but towards the end you''re reduced to a crying, blubbering mess.'
@@ -1927,7 +1919,7 @@ if $ARGS[0] = 'QW10c':
 			pcs_horny = 0
 			spank += 1
 			gs'stat'
-			temp = RAND(0,1)
+			temp = rand(0,1)
 		
 			'<center><img <<$set_imgh>> src="images/characters/city/natalya/sex/sub32.jpg"></center>'
 			'Without hesitation, you drop to your knees and beg her not to spank you: "Please Mistress, no spanking today! Please, I''ll do anything!"'
@@ -1982,7 +1974,7 @@ if $ARGS[0] = 'QW10c':
 		minut += 120
 		pcs_mood = 5
 		gs'stat'
-		temp = RAND(0,2)
+		temp = rand(0,2)
 		
 		'<center><img <<$set_imgh>> src="images/characters/city/natalya/sex/sub35.jpg"></center>'
 		'"Good that you''re here, very good. Undress quickly please, today is a big day!" Mistress says.'
@@ -2024,7 +2016,7 @@ if $ARGS[0] = 'QW10c':
 	else
 		minut += 40
 		gs'stat'
-		temp = RAND(0,2)
+		temp = rand(0,2)
 		
 		'<center><img <<$set_imgh>> src="images/characters/city/natalya/sex/sub36.jpg"></center>'
 		'You quickly take off your clothes, while Mistress stands in the hallway ogling at your body with a satisfied smile on her face. When you enter the living room with her, Mistress nods at a small paper bag: "I got you something... go ahead, open it."'

+ 28 - 37
locations/lesbimistress.qsrc

@@ -12,16 +12,14 @@ if $ARGS[0] = 'start':
 	if mistresscontract <= daystart:
 		gt 'lesbimistress', 'renewal'
 	else
-		cla
-		*clr
+		*clr & cla
 		minut += 5
 		gs'stat'
 		'<center><img <<$set_imgh>> src="images/characters/city/natalya/mistress.jpg"></center>'
 		'Mistress looks at you expectantly and you look at her, you feel like its a personal thing, you are her inanimate sex-plaything, with which she is entitled to do whatever she pleases.'
 	
 		act 'Undress':
-			cla
-			*clr
+			*clr & cla
 			gs'stat'
 			'<center><img <<$set_imgh>> src="images/characters/city/natalya/sex/sub45.jpg"></center>'
 			'You quickly take off your clothes and, as befits a well-bred slave, pose completely still in front of your mistress.'
@@ -30,8 +28,7 @@ if $ARGS[0] = 'start':
 			gs 'stat'
 			
 			act 'Wait':
-				cla
-				*clr
+				*clr & cla
 				pcs_horny += RAND(10,20)
 				gs'stat'
 				if daystart > lesbiday + 7:
@@ -1701,6 +1698,7 @@ if $ARGS[0] = 'amazing_1':
 end
 
 if $ARGS[0] = 'amazing_2':
+	*clr & cla
 	mistamazing[2] = 1
 	minut += 5
 	pcs_horny += 50
@@ -1713,16 +1711,29 @@ if $ARGS[0] = 'amazing_2':
 	'Mistress grins greedily: "Of course, I''d want people to know you''re mine. Because I''m in such a good today, I will only make you wear a collar. I bought one especially for this occasion."'
 	'Of course. There''s always a catch.'
 
+	act 'Refuse to go out wearing a collar':
+		*clr & cla
+		minut += 75
+		MistressAdoration -= 5
+		MistressObedience -= 3
+		gs'stat'
+		'<center><img <<$set_imgh>> src="images/characters/city/natalya/sex/sub212.jpg"></center>'
+		'"In public, Mistress? I don''t know..." you hesitantly say.'
+		'Mistress sighs when she sees your doubt. She slaps you in the face hard, and hisses: "Stay here. No talking with the other slave."'
+		'She returns with a delicate piece of jewelry, and holds it in front of your face. "This is the collar I got for today", she sighs, with a disappointed look in her eyes. She tries to be firm, but fails to really keep her posture afloat.'
+		'You bite your lip, feeling bad about disappointing her. You can tell she really went out of her way to get you a collar that is acceptable to wear in public too. Most people wouldn''t even recognize it as such!'
+		'She locks it around your neck anyway, and cuffs your hands together. She lazily attaches a chain from your beautiful collar to the cuffs, but is too distraught to even worry about locking you down further.'
+		'"Just... sit like this for a while and think", she mutters dejectedly. After an hour she comes back, and unlocks the handcuffs. Then she unlocks your collar and carefully puts it back into its box. "That''s it for today. Just go."'
+
+		act 'Get dressed and leave':gt'street'
+	end
+	
 	act 'Agree to wear a collar in public':
-		cla
-		*clr
+		*clr & cla
 		minut += 90
 		MistressAdoration += 1
 		MistressObedience = 3
-		alko += 6
-		cumspclnt = 2
-		gs 'cum_cleanup'
-		pcs_breath = 0
+		gs 'drugs', 'alcohol', 'champagne'
 		gs'stat'
 		'<center><img <<$set_imgh>> src="images/characters/city/natalya/sex/sub211.jpg"></center>'
 		'When you agree to wear a collar in public, Mistress smiles happily. She really didn''t want to have to punish you too today. "Excellent, let me go get it", she sighs tiredly, and leaves to get dressed. She comes back with a very thin silver collar, and locks it on your neck. It looks more like jewelry than a restraining device.'
@@ -1735,26 +1746,10 @@ if $ARGS[0] = 'amazing_2':
 
 		act 'Leave her apartment':gt'street'
 	end
-	act 'Refuse to go out wearing a collar':
-		cla
-		*clr
-		minut += 75
-		MistressAdoration -= 5
-		MistressObedience -= 3
-		gs'stat'
-		'<center><img <<$set_imgh>> src="images/characters/city/natalya/sex/sub212.jpg"></center>'
-		'"In public, Mistress? I don''t know..." you hesitantly say.'
-		'Mistress sighs when she sees your doubt. She slaps you in the face hard, and hisses: "Stay here. No talking with the other slave."'
-		'She returns with a delicate piece of jewelry, and holds it in front of your face. "This is the collar I got for today", she sighs, with a disappointed look in her eyes. She tries to be firm, but fails to really keep her posture afloat.'
-		'You bite your lip, feeling bad about disappointing her. You can tell she really went out of her way to get you a collar that is acceptable to wear in public too. Most people wouldn''t even recognize it as such!'
-		'She locks it around your neck anyway, and cuffs your hands together. She lazily attaches a chain from your beautiful collar to the cuffs, but is too distraught to even worry about locking you down further.'
-		'"Just... sit like this for a while and think", she mutters dejectedly. After an hour she comes back, and unlocks the handcuffs. Then she unlocks your collar and carefully puts it back into its box. "That''s it for today. Just go."'
-
-		act 'Get dressed and leave':gt'street'
-	end
 end
 
 if $ARGS[0] = 'amazing_3':
+	*clr & cla
 	mistamazing[3] = 1
 	minut += 5
 	gs'stat'
@@ -1766,8 +1761,7 @@ if $ARGS[0] = 'amazing_3':
 	'"Actually no, change here. You can wear it under your clothes while we go there", she changes her mind again, laughing. She runs off, coming back with a bag in her hand."'
 
 	act 'Put on the bathing suit':
-		cla
-		*clr
+		*clr & cla
 		minut += 5
 		pcs_horny += 5
 		MistressObedience += 1
@@ -1778,8 +1772,7 @@ if $ARGS[0] = 'amazing_3':
 		'"Go on, stick it in", she grins. "There''s no reason we can''t combine fun with a bit of training, as well!"'
 		
 		act 'Wear the suit properly':
-			cla
-			*clr
+			*clr & cla
 			gs'stat'
 			'<center><img <<$set_imgh>> src="images/characters/city/natalya/sex/sub222.jpg"></center>'
 			'You silently nod and slide the dildo inside your snatch. It''s fairly girthy, and your pussy feels fairly full with it lodged inside of you.'
@@ -1791,8 +1784,7 @@ if $ARGS[0] = 'amazing_3':
 			gs 'stat'
 			
 			act 'Go swimming':
-				cla
-				*clr
+				*clr & cla
 				cumspclnt = 4
 				gs 'cum_cleanup'
 				pcs_sweat = 10 + rand(0,4)
@@ -1813,8 +1805,7 @@ if $ARGS[0] = 'amazing_3':
 				gs 'stat'
 			
 				act 'Orgasm loudly':
-					cla
-					*clr
+					*clr & cla
 					minut += 15
 					if pcs_horny >= 100:orgasm += 1 & pcs_horny = 0 & vaginalOrgasm += 1 & pcs_mood = 100
 					MistressObedience += 1

+ 1 - 6
locations/mey_home.qsrc

@@ -247,12 +247,7 @@ if $ARGS[0] = '3':
 			*clr
 			minut += 5
 			narkday = daystart
-			pcs_health = pcs_vital * 10 + pcs_stren * 5
-			pcs_willpwr = pcs_intel * 5 + pcs_sprt * 5
-			pcs_mood = 100
-			pcs_horny = 100
-			nark += 10
-			dur -= 1
+			gs 'drugs', 'cocaine'
 			'<center><img <<$set_imgh>> src="images/shared/drugs/dur.jpg"></center>'
 			'You snort some White Lady, feeling dizzy for a moment. After that you feel fantastic, and incredibly horny.'
 

+ 3 - 3
locations/mey_tamara_events.qsrc

@@ -525,8 +525,8 @@ if $args[0] = 'party1':
 
 			act 'Have a drink':
 				*clr & cla
-				alko += 1
 				minut += 10
+				gs 'drugs', 'alcohol', 'champagne'
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/vicky/event/party8.jpg"></center>'
 				'You walk down the hall with your glass, observing the people around you. You notice that you''re the only youth there. Mainly, the guests are respectable middle-aged men and women. Most of the women are pretending to be younger than they really are. You would think that these "middle-aged" women should be classy, but they''re all dressed tackily, showing more skin than you would expect them to. You also notice the expensive jewelry being worn by the women. There''s enough jewelry to fill three stores!'
@@ -540,7 +540,7 @@ if $args[0] = 'party1':
 					act 'Enter the banquet hall':
 						*clr & cla
 						minut += 20
-						alko += 2
+						gs 'drugs', 'alcohol', 'champagne'
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/vicky/event/party10.jpg"></center>'
 						'Some men look in your direction. But most of them are occupied with some boring business conversation. You spend about twenty minutes aimlessly wandering around, not being able to find anyone interesting.'
@@ -583,8 +583,8 @@ if $args[0] = 'party2':
 	end
 	act 'Have a glass of champagne':
 		*clr & cla
-		alko += 1
 		minut += 10
+		gs 'drugs', 'alcohol', 'champagne'
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/vicky/event/party7.jpg"></center>'
 		'You take a sip of the expensive champagne, it has a delicate aroma and a wonderful aftertaste, making it easy to drink.'

+ 4 - 36
locations/mitkabuh.qsrc

@@ -75,15 +75,7 @@ if $ARGS[0] = 'partyalone':
 			npc_rel['A63'] += rand(0,1)
 			npc_rel['A62'] += rand(0,1)
 			npc_rel['A61'] += rand(0,1)
-			alko += rand(3,5)
-			cumspclnt = 2
-			gs 'cum_cleanup'
-			pcs_breath = 0
-			if pcs_hydra >= 100:
-				pcs_hydra -= 5
-			else
-				pcs_hydra -= 10
-			end
+			gs 'drugs', 'alcohol', 'vodka', 2
 			gs 'stat'
 			
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/drinking.jpg"></center>'
@@ -216,15 +208,7 @@ if $ARGS[0] = 'partywithMira':
 					npc_rel['A62'] += rand(0,1)
 					npc_rel['A61'] += rand(0,1)
 					npc_rel['A60'] += rand(0,1)
-					alko += rand(3,5)
-					cumspclnt = 2
-					gs 'cum_cleanup'
-					pcs_breath = 0
-					if pcs_hydra >= 100:
-						pcs_hydra -= 5
-					else
-						pcs_hydra -= 10
-					end
+					gs 'drugs', 'alcohol', 'vodka', 2
 					gs 'stat'
 					
 					act 'Continue drinking':gt 'mitkabuh','partywithMira'
@@ -312,15 +296,7 @@ if $ARGS[0] = 'partywithMira':
 					else
 						'"Just as good as the last batch you made!" you reply.'
 					end
-					alko += rand(3,5)
-					cumspclnt = 2
-					gs 'cum_cleanup'
-					pcs_breath = 0
-					if pcs_hydra >= 100:
-						pcs_hydra -= 5
-					else
-						pcs_hydra -= 10
-					end
+					gs 'drugs', 'alcohol', 'vodka', 2
 					gs 'stat'
 				else
 					'Mitka pours some of the brew into a clear plastic shot glass and hands it over to Mira.'
@@ -342,15 +318,7 @@ if $ARGS[0] = 'partywithMira':
 				npc_rel['A62'] += rand(0,1)
 				npc_rel['A61'] += rand(0,1)
 				npc_rel['A60'] += rand(0,1)
-				alko += rand(3,5)
-				cumspclnt = 2
-				gs 'cum_cleanup'
-				pcs_breath = 0
-				if pcs_hydra >= 100:
-					pcs_hydra -= 5
-				else
-					pcs_hydra -= 10
-				end
+				gs 'drugs', 'alcohol', 'vodka', 2
 				gs 'stat'
 				
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/drinking.jpg"></center>'

+ 1 - 9
locations/mitkabuh_group.qsrc

@@ -116,15 +116,7 @@ if $ARGS[0] = 'partywithMira':
 			'"Just as good as the last batch you made!" you reply.'
 
 			npc_drunk['A60'] += 5
-			alko += 5
-			cumspclnt = 2
-			gs 'cum_cleanup'
-			pcs_breath = 0
-			if pcs_hydra >= 100:
-				pcs_hydra -= 5
-			else
-				pcs_hydra -= 10
-			end
+			gs 'drugs', 'alcohol', 'moonshine'
 			gs 'stat'
 			
 			act 'Continue drinking':gt 'mitkabuh_group','partywithMira'

+ 10 - 26
locations/narkopriton.qsrc

@@ -23,7 +23,7 @@ if $ARGS[0] = 'start':
 		act 'Ask for heroin': gt 'narkopriton', 'heroin'
 		act 'Ask for amphetamine': gt 'narkopriton', 'amphetamine'
 		act 'Ask for weed': gt 'narkopriton', 'joint'
-	 if StoryLine = 1 and snarkozak = 0:
+		if StoryLine = 1 and snarkozak = 0:
 			act 'Ask for a drop-off point in Pavlovsk':
 				minut +=5
 				gs 'events', 'narkozakladka'
@@ -41,12 +41,7 @@ if $ARGS[0] = 'start':
 	end
 end
 
-if $ARGS[0] = 'kiteHigh':
-	act 'Leave the drug den':
-		minut += 15
-		gs 'events', 'snkayf1'
-	end
-end
+if $ARGS[0] = 'kiteHigh': act 'Leave the drug den': minut += 15 & gs 'events', 'snkayf1'
 
 if $ARGS[0] = 'amphetamine':
 	*clr & cla
@@ -93,7 +88,7 @@ if $ARGS[0] = 'amphetamine':
 		end
 	end
 	act 'Buy some heroin instead': gt 'narkopriton', 'heroin'
-	!!act 'Buy some joints instead': gt 'narkopriton', 'joint'
+	act 'Buy some joints instead': gt 'narkopriton', 'joint'
 end
 
 if $ARGS[0] = 'joints':
@@ -165,14 +160,13 @@ if $ARGS[0] = 'heroin':
 				'Finding a couch, you sit down and look at the needle apprehensively, you question yourself...'
 				act 'You remember the look of bliss on the junkies faces in the park and use the drugs':
 					*clr & cla
+					minut += 5
 					'<center><b>Local drug den</b></center>'
 					'<center><img <<$set_imgh>> src="images/locations/city/residential/den/usingheroin.jpg"></center>'
 					'You inject the needle into your arm unable to stop yourself from trembling a little.'
 					'The rush is instantaneous, you close your eyes as it rolls over you.'
-					StrongNarkota += 25
-					pcs_mood += 40
-					SNarkTimes += 1
 					drugUser = 1
+					gs 'drugs', 'heroin'
 					gs 'stat'
 					act 'You lay there briefly rolling, before leaving': gs 'events', 'snkayf1'
 				end
@@ -187,10 +181,8 @@ if $ARGS[0] = 'heroin':
 			elseif SNarkTimes >= 1:
 				*clr & cla
 				minut += 5
-				StrongNarkota += 25
-				pcs_mood += 40
-				SNarkTimes += 1
 				drugUser = 1
+				gs 'drugs', 'heroin'
 				gs 'stat'
 				'<center><b>Local drug den</b></center>'
 				'<center><img <<$set_imgh>> src="images/locations/city/residential/den/usingheroin.jpg"></center>'
@@ -203,7 +195,7 @@ if $ARGS[0] = 'heroin':
 		act 'Beg him to give you some':	gs 'narkopriton', 'drugslut'
 	end
 	act 'Buy some amphetamine instead':	gt 'narkopriton', 'amphetamine'
-	!!act 'Buy some joints instead': gt 'narkopriton', 'joint'
+	act 'Buy some joints instead': gt 'narkopriton', 'joint'
 end
 
 if $ARGS[0] = 'drugslut':
@@ -246,15 +238,9 @@ if $ARGS[0] = 'drugslut':
 				'<center><img <<$set_imgh>> src="images/locations/city/residential/den/narkopriton.jpg"></center>'
 				'You keep begging Bobka to give you some heroin, while you follow him to an empty room. He just laughs at you and says: <<$bobtalk>>'
 
-				act '<<$bobtext>>':
-					NarkShmaraTimes += 1
-					gt 'bobka', bobrand
-				end
+				act '<<$bobtext>>':	NarkShmaraTimes += 1 & gt 'bobka', bobrand
 
-				act 'Change your mind and leave':
-					minut += 5
-					gt 'street'
-				end
+				act 'Change your mind and leave': minut += 5 & gt 'street'
 			end
 		end
 
@@ -345,9 +331,7 @@ if $ARGS[0] = 'drugslut':
 					act 'Take the hit right in front of him':
 						*clr & cla
 						minut += 5
-						StrongNarkota += 25
-						SNarkTimes += 1
-						pcs_mood += 40
+						gs 'drugs', 'heroin'
 						'<center><b>Local drug den</b></center>'
 						'<center><img <<$set_imgh>> src="images/locations/city/residential/den/usingheroin.jpg"></center>'
 						'You grab the syringe off the ground nervously and use it without a second thought, injecting it into your arm with a shaky hand. He shakes his head, almost as if he is disappointed in you, but says with a pitiful smile: "I reckon I''m going to see you around more often! My name is Bobka. Who are you?"'

+ 3 - 8
locations/nastja.qsrc

@@ -523,11 +523,8 @@ if $ARGS[0] = 'pos24':
 	pcs_energy = 10
 	pcs_hydra = 20
 	pcs_mood += 10
-	pcs_willpwr = pcs_willpwr + 10
-	alko += 2
-	cumspclnt = 2
-	gs 'cum_cleanup'
-	pcs_breath = 0
+	pcs_willpwr += 10
+	gs 'drugs', 'alcohol', 'wine'
 	pcs_horny += rand(10,30)
 	gs 'stat'
 
@@ -539,10 +536,8 @@ if $ARGS[0] = 'pos24':
 	''
 	'As you hang up, you see that twinkle in Nastya''s eyes again and already half-know what she''s thinking about.'
 	'Nastya: "<<$pcs_nickname>>, I just had a fun idea. I ''ve seen this on the internet: A girl orders a pizza and then wraps up her naked body in a towel, like she just came out of the shower, and answers the door. And when she''s paid and is about to close the door, she ''accidentally'' drops the towel. I''ve been fantasizing about this for such a long time but if I did that at my place, I could get into really big trouble because of my father. But... you aren''t scared like me, are you?"'
-	if pcs_inhib >= 50:
-		act 'That sounds exciting - Agree':gt 'nastja', 'pos26'
-	end
 	act 'Chicken out':gt 'nastja', 'pos25'
+	if pcs_inhib >= 50:	act 'That sounds exciting - Agree':gt 'nastja', 'pos26'
 end
 
 if $ARGS[0] = 'pos25':

+ 2 - 10
locations/nichBedroomServant.qsrc

@@ -17,9 +17,7 @@ tanhouse1 = 1
 
 !! Has to happen before there is any output
 if nichWork = 2:
-	if nichLastWorkDay ! daystart:
-		gs 'nichUtil', 'startWorkday'
-	end
+	if nichLastWorkDay ! daystart: gs 'nichUtil', 'startWorkday'
 	!! this code has to be include everywhere where PC can change clothes or enter the apartment
 	gs 'nichUtil', 'checkOutfit'
 end
@@ -133,13 +131,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'start' or $ARGS[0] = 'return':
 			menu_off = 1
 			minut += 5
 			narkday = daystart
-			pcs_health = pcs_vital * 10 + pcs_stren * 5
-			pcs_willpwr = pcs_intel * 5 + pcs_sprt * 5
-			pcs_manna = (pcs_intel * pcs_magik) + pcs_magik * 100 + pcs_vital * 10 + rikudo
-			pcs_mood = 100
-			pcs_horny = 100
-			nark += 10
-			dur -= 1
+			gs 'drugs', 'cocaine'
 			'<center><img <<$set_imgh>> src="images/shared/drugs/dur.jpg"></center>'
 			'You take a small dose of coke and not long after, you start to feel great, as if you could do anything, <b>be</b> anything - but you''re also starting to feel incredibly horny.'
 

+ 3 - 6
locations/parkivent.qsrc

@@ -370,8 +370,8 @@ if $ARGS[0] = '4':
 
 		act 'Agree and join them':
 			cla
-			alko += 6
 			minut += 30
+			gs 'drugs', 'alcohol', 'vodka'
 			gs 'stat'
 			'You had fun drinking with the guys and girls. One of the guys comes up behind you while you''re at the table and puts his arms around your waist, then presses himself against your ass. <i>...God, he''s HUGE. It feels like a big sausage against your lower back... damn, why do I suddenly feel so hot.</i> You begin to wonder if you''ve been drinking too fast.'
 			'Shortly after, one of the guy gropes your breast and pushes you against the closest tree. You softly moan as he massages your breasts. You can feel his stiff cock poking your belly. Then he asks you in a rather harsh tone, "You like this slut, don''t you?"'
@@ -687,12 +687,9 @@ if $ARGS[0] = '7':
 		act 'Yes':
 			cla
 			pusher = 1
-			pcs_health = pcs_vital * 10 + pcs_stren * 5
-			pcs_willpwr = pcs_intel * 5 + pcs_sprt * 5
-			pcs_mood = 100
-			pcs_horny = 100
-			nark += 10
 			narkday = daystart
+			dur += 1
+			gs 'drugs', 'cocaine'
 			'You''ve never been interested and you''ve never tried it before, but you''re tempted as it''s being free. The opportunity is too good to pass on, you nod your head and the dealer takes out a little bag filled with white powder. He spreads it on your hand and tells you to snort it.'
 			'You nod and snort the white powder. It instantly hits you and you''re feeling on top of the world.'
 			'The guy looks at you and says, "Good shit, right? If you like it, come see me again, it only costs 2,000 <b>₽</b>."'

+ 3 - 12
locations/party_boys.qsrc

@@ -3,10 +3,7 @@
 if $ARGS[0] = 'drink':
 	cls
 	minut += 5
-	alko += 1
-	cumspclnt = 2
-	gs 'cum_cleanup'
-	pcs_breath = 0
+	gs 'drugs', 'alcohol', 'beer'
 	party_boys_drink += 1
 	$menu_loc = 'party_boys'
 	$menu_arg = 'drink'
@@ -531,10 +528,7 @@ end
 if $ARGS[0] = 'gost_drink':
 	cls
 	minut += 5
-	alko += 1
-	cumspclnt = 2
-	gs 'cum_cleanup'
-	pcs_breath = 0
+	gs 'drugs', 'alcohol', 'beer'
 	party_boys_in += 1
 	menu_off = 1
 	gs'stat'
@@ -646,10 +640,7 @@ if $ARGS[0] = 'gost_drink_else':
 	cls
 	menu_off = 1
 	minut += 5
-	alko +1
-	cumspclnt = 2
-	gs 'cum_cleanup'
-	pcs_breath = 0
+	gs 'drugs', 'alcohol', 'beer'
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/party_boys_party_gost_9_4.jpg"></center>'
 	'Despite feeling very drunk you decide that it is time for another drink. But this time it seems to have been too much as you feel very dizzy and your legs begin to buckle, sending you to the floor. You are suddenly surrounded by a bunch of guys who drag you off.'

+ 1 - 4
locations/party_girls.qsrc

@@ -388,10 +388,7 @@ end
 if $ARGS[0] = 'drink':
 	cls
 	minut += 5
-	alko += 1
-	cumspclnt = 2
-	gs 'cum_cleanup'
-	pcs_breath = 0
+	gs 'drugs', 'alcohol', 'beer'
 	drunk_sveta +=1
 	gs'stat'
 	i = rand(1,2)

+ 1 - 6
locations/pavSharedApt.qsrc

@@ -749,12 +749,7 @@ if $ARGS[0] = 'pcsRoom':
 			*clr
 			minut += 5
 			narkday = daystart
-			pcs_health = pcs_vital * 10 + pcs_stren * 5
-			pcs_willpwr = pcs_intel * 5 + pcs_sprt * 5
-			pcs_mood = 100
-			pcs_horny = 100
-			nark += 10
-			dur -= 1
+			gs 'drugs', 'cocaine'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/shared/drugs/dur.jpg"></center>'
 			'You snort some Pale Lady, feeling dizzy for just a moment. After that you feel fantastic, and incredibly horny.'

+ 22 - 22
locations/pavaptcourtev.qsrc

@@ -90,7 +90,7 @@ if $ARGS[0] = 'smoke':
 	*clr & cla
 	menu_off = 1
 	minut += 5
-	gs 'shortgs','smoker'
+	gs 'drugs','smoke'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/benchsmoke.jpg"></center>'
 	'You take out a pack of smokes and light up one of your cigarettes. You take a long slow drag off it as you relax on the bench.'
@@ -102,7 +102,7 @@ if $ARGS[0] = 'smoke_joint':
 	*clr & cla
 	menu_off = 1
 	minut += 10
-	gs 'shortgs','smoke_joint'
+	gs 'drugs', 'joint'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/benchsmoke.jpg"></center>'
 	'You pull a joint of your purse and light it up. Trying to act like you are just smoking a cigarette. You take a long slow drag off it as you relax on the bench, before long you are feeling the effects.'
@@ -322,7 +322,7 @@ if $ARGS[0] = 'events1':
 					*clr & cla
 					minut += 10
 					siga += 1
-					gs 'shortgs','smoker'
+					gs 'drugs', 'smoke'
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/boysmoke2.jpg"></center>'
 					'You take the cigarette and the other one pulls out a lighter and lites it for you. You take a long slow draw off it. "Thanks I needed that."'
@@ -605,7 +605,7 @@ if $ARGS[0] = 'events2':
 					*clr & cla
 					minut += 10
 					siga += 1
-					gs 'shortgs','smoker'
+					gs 'drugs', 'smoke'
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/boysmoke2.jpg"></center>'
 					'You take the cigarette and the other one pulls out a lighter and lites it for you. You take a long slow draw off it. "Thanks I needed that."'
@@ -624,7 +624,7 @@ if $ARGS[0] = 'male_gopnik_beer':
 	npc_rel['A11'] += 1
 	grupvalue[4] += 1
 	minut += 5
-	alko += 1
+	gs 'drugs', 'alcohol', 'beer'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/drinkbeer.jpg"></center>'
 	'You take the offered beer, taking a swig of it. You listen to the boys talking about their latest ventures, which range from vandalizing, beating some guy up, to gang banging some slut. Occasionally you comment and as well, but you mostly just listen to them.'
@@ -641,7 +641,7 @@ if $ARGS[0] = 'male_gopnik_beer':
 	act 'Drink more':
 		*clr & cla
 		minut += 5
-		alko += 1
+		gs 'drugs', 'alcohol', 'beer'
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/beer' + rand(1,2) + '.jpg"></center>'
 		'You grab another beer from the collection the boys have, they don''t seem to mind. You keep drinking as you continue to listen to them.'
@@ -657,7 +657,7 @@ if $ARGS[0] = 'male_gopnik_beer':
 		act 'Drink even more':
 			*clr & cla
 			minut += 5
-			alko += 1
+			gs 'drugs', 'alcohol', 'beer'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/beer' + rand(1,2) + '.jpg"></center>'
 			if pav_slut < 50 and grupTipe ! 4:
@@ -681,7 +681,7 @@ if $ARGS[0] = 'male_gopnik_beer':
 				act 'Grab another beer':
 					*clr & cla
 					minut += 5
-					alko += 1
+					gs 'drugs', 'alcohol', 'beer'
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/beer' + rand(1,2) + '.jpg"></center>'
 					'Now you are feeling pretty drunk, the guys seem to be amused by just how drunk you are. They exchange a few words that you can''t quite make out. Then Vasily speaks up. "Hey <<$pcs_nickname>> you really know how to drink." You nod at the compliment because it is coming from these three. "Yeah I do okay."'
@@ -715,7 +715,7 @@ if $ARGS[0] = 'male_gopnik_beer':
 									*clr & cla
 									npc_rel['A10'] -= 2
 									grupvalue[4] += 1
-									alko += 1
+									gs 'drugs', 'alcohol', 'beer'
 									gs 'willpower', 'force'
 									gs 'stat'
 									'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/dandick.jpg"></center>'
@@ -792,7 +792,7 @@ if $ARGS[0] = 'female_gopnik_beer_1':
 	npc_rel['A144'] += 1
 	grupvalue[4] += 1
 	minut += 5
-	alko += 1
+	gs 'drugs', 'alcohol', 'beer'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/drinkbeerg' + rand(1,2) + '.jpg"></center>'
 	'You take the offered beer, taking a swig of it. You listen to the girls talking about their latest ventures, which range from vandalizing, beating some girl up, bulling some of the nerds and outcasts, or what boys they find cute. Occasionally you comment and as well, but you mostly just listen to them.'
@@ -807,8 +807,8 @@ if $ARGS[0] = 'female_gopnik_beer_1':
 	end
 	act 'Drink more':
 		*clr & cla
-		alko += 1
 		minut += 5
+		gs 'drugs', 'alcohol', 'beer'
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/beer' + rand(1,2) + '.jpg"></center>'
 		'You grab another beer from the collection the girls have, they don''t seem to mind. You keep drinking as you continue to listen to them.'
@@ -823,8 +823,8 @@ if $ARGS[0] = 'female_gopnik_beer_1':
 		end
 		act 'Drink even more':
 			*clr & cla
-			alko += 1
 			minut += 5
+			gs 'drugs', 'alcohol', 'beer'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/beer' + rand(1,2) + '.jpg"></center>'
 			'You are starting to feel the effects of the beers but you are having to much fun. So you grab another beer from the collection the girls have, they don''t seem to mind. You keep drinking as you continue to listen to them.'
@@ -839,8 +839,8 @@ if $ARGS[0] = 'female_gopnik_beer_1':
 			end
 			act 'Grab another beer':
 				*clr & cla
-				alko += 1
 				minut += 5
+				gs 'drugs', 'alcohol', 'beer'
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/beer' + rand(1,2) + '.jpg"></center>'
 				'Now you are feeling pretty drunk, the girls seem to be amused by just how drunk you are. They exchange a few words that you can''t quite make out. Then Lena speaks up. "Hey <<$pcs_nickname>> you really know how to drink." You nod at the compliment because it is coming from them. "Yeah I do ok"'
@@ -926,8 +926,8 @@ if $ARGS[0] = 'female_gopnik_beer_1':
 								*clr & cla
 								npc_rel['A21'] -= 2
 								grupvalue[4] += 1
-								alko += 1
 								minut += 5
+								gs 'drugs', 'alcohol', 'beer'
 								gs 'willpower', 'force'
 								gs 'stat'
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/eatmelera.jpg"></center>'
@@ -955,7 +955,7 @@ if $ARGS[0] = 'female_gopnik_beer_2':
 	npc_rel['A24'] += 1
 	grupvalue[4] += 1										
 	minut += 5
-	alko += 1
+	gs 'drugs', 'alcohol', 'beer'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/drinkbeerg' + rand(1,2) + '.jpg"></center>'
 	'You take the offered beer, taking a swig of it. You listen to the girls talking about their latest ventures, which range from vandalizing, beating some girl up, bulling some of the nerds and outcasts, gossip about other girls, which ones are sluts and the like, or what boys they find cute. Occasionally you comment and as well, but you mostly just listen to them.'
@@ -971,7 +971,7 @@ if $ARGS[0] = 'female_gopnik_beer_2':
 	act 'Drink more':
 		*clr & cla
 		minut += 5
-		alko += 1
+		gs 'drugs', 'alcohol', 'beer'
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/beer' + rand(1,2) + '.jpg"></center>'
 		'You grab another beer from the collection the girls have, they don''t seem to mind. You keep drinking as you continue to listen to them.'
@@ -987,7 +987,7 @@ if $ARGS[0] = 'female_gopnik_beer_2':
 		act 'Drink even more':
 			*clr & cla
 			minut += 5
-			alko += 1
+			gs 'drugs', 'alcohol', 'beer'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/beer' + rand(1,2) + '.jpg"></center>'
 			'You are starting to feel the effects of the beers but you are having to much fun. So you grab another beer from the collection the girls have, they don''t seem to mind. You keep drinking as you continue to listen to them.'
@@ -1003,7 +1003,7 @@ if $ARGS[0] = 'female_gopnik_beer_2':
 			act 'Grab another beer':
 				*clr & cla
 				minut += 5
-				alko += 1
+				gs 'drugs', 'alcohol', 'beer'
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/beer' + rand(1,2) + '.jpg"></center>'
 				'Now you are feeling pretty drunk, the girls seem to be amused by just how drunk you are. They exchange a few words that you can''t quite make out. Then Lena speaks up. "Hey <<$pcs_nickname>> have another." She says as she hands you another beer.'
@@ -1019,7 +1019,7 @@ if $ARGS[0] = 'female_gopnik_beer_2':
 				act 'Keep drinking':
 					*clr & cla
 					minut += 5
-					alko += 1
+					gs 'drugs', 'alcohol', 'beer'
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/beer' + rand(1,2) + '.jpg"></center>'
 					'They keep passing you beers now before you even finish the previous one and encouraging you to drink faster.'
@@ -1047,7 +1047,7 @@ if $ARGS[0] = 'female_gopnik_beer_2':
 						npc_rel['A21'] += 1
 						npc_rel['A24'] += 1
 						grupvalue[4] += 1
-						alko += 3
+						gs 'drugs', 'alcohol', 'beer', 3
 						minut += 5
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/beer' + rand(1,2) + '.jpg"></center>'
@@ -1076,7 +1076,7 @@ if $ARGS[0] = 'female_gopnik_beer_2':
 							npc_rel['A21'] += 1
 							npc_rel['A24'] += 1
 							grupvalue[4] += 1
-							alko += 3
+							gs 'drugs', 'alcohol', 'beer', 3
 							pav_sex += 1
 							minut += 120
 							gs 'stat'
@@ -1262,7 +1262,7 @@ if $ARGS[0] = 'suck3stooges':
 						act 'Drink with them':
 							*clr & cla 
 							minut += 5
-							alko += 1
+							gs 'drugs', 'alcohol', 'beer'
 							pav_sex +=1
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/sex/beercum.jpg"></center>'

+ 7 - 43
locations/placer_act.qsrc

@@ -78,11 +78,8 @@ end
 !!!!!!!!!!!!!!!
 if plact = 1:
 	menu_off = 1
-	alko += rand(1, 3)
-	cumspclnt = 2
-	gs 'cum_cleanup'
-	pcs_breath = 0
 	minut += 5
+	gs 'drugs', 'alcohol', 'beer'
 	gs 'stat'
 
 	if Frend_num > 0:$textsub = ' and your friend'
@@ -114,10 +111,7 @@ if plact = 1:
 					act 'Go with the guys':
 						*clr & cla
 						minut += 5
-						alko += 3
-						cumspclnt = 2
-						gs 'cum_cleanup'
-						pcs_breath = 0
+						gs 'drugs', 'alcohol', 'vodka'
 						gs 'stat'
 						'The guys holler when they hear you agree... you guess they''re just happy for their friend?'
 						'<<$boydesc>> takes you by the hand, and you walk down the street with the group of Gopniks. They lead you to a shabby house, and let you in.'
@@ -142,15 +136,7 @@ if plact = 1:
 						act 'Drink':
 							*clr & cla
 							minut += 5
-							alko += 3
-							cumspclnt = 2
-							gs 'cum_cleanup'
-							pcs_breath = 0
-							if pcs_hydra >= 100:
-								pcs_hydra -= 5
-							else
-								pcs_hydra -= 10
-							end
+							gs 'drugs', 'alcohol', 'vodka'
 							gs 'stat'
 							'You smile at the guys and propose a toast: "To meeting new friends!"'
 							'They happily toast with you. You eat some anchovies from a jar that someone brought, while you take sips of your vodka. It''s the cheap kind, and it doesn''t taste very good.'
@@ -162,15 +148,7 @@ if plact = 1:
 							act 'Keep drinking':
 								*clr & cla
 								minut += 5
-								alko += 3
-								cumspclnt = 2
-								gs 'cum_cleanup'
-								pcs_breath = 0
-								if pcs_hydra >= 100:
-									pcs_hydra -= 5
-								else
-									pcs_hydra -= 10
-								end
+								gs 'drugs', 'alcohol', 'vodka'
 								gs 'stat'
 								'You smile at them and bring the cup to your lips, slowly sipping it down. It still doesn''t taste very good, but you''re starting to care less as you become more and more drunk.'
 
@@ -194,10 +172,7 @@ if plact = 1:
 						act 'Go with the guys':
 							*clr & cla
 							minut += 5
-							alko += 3
-							cumspclnt = 2
-							gs 'cum_cleanup'
-							pcs_breath = 0
+							gs 'drugs', 'alcohol', 'vodka'
 							gs 'stat'
 							'You''re having a good time with them... why not? You nod at the guys and smile as you say: "Sounds like fun, guys! Let''s go!"'
 							'The guys leave the park with you in the middle of their group, happily chatting about everyday things while they guide you to a shabby old house. One of them produces a key, and you follow them inside.'
@@ -228,15 +203,7 @@ if plact = 1:
 								act 'Drink the vodka':
 									*clr & cla
 									minut += 5
-									alko += 3
-									cumspclnt = 2
-									gs 'cum_cleanup'
-									pcs_breath = 0
-									if pcs_hydra >= 100:
-										pcs_hydra -= 5
-									else
-										pcs_hydra -= 10
-									end
+									gs 'drugs', 'alcohol', 'vodka'
 									gs 'stat'
 									'As soon as you gulp down the vodka, the guys laugh and you feel several hands firmly grasping your shoulders, guiding you towards the dirty mattress. Several of the boys instantly reach for their pants, and you see their erect cocks clearly despite the dim light in the room.'
 
@@ -582,11 +549,8 @@ if plact = 1:
 
 					act 'Go with the guys':
 						*clr & cla
-						alko += 10
-						cumspclnt = 2
-						gs 'cum_cleanup'
-						pcs_breath = 0
 						minut += 30
+						gs 'drugs', 'alcohol', 'vodka', 3
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/shared/sex/sleep/drunk.jpg"></center>'
 						'The guys cheer when you say you''ll come with them, and <<$boydesc>> takes your hand while he guides you out of the park. The group makes a quick stop at a liquor store, so one of the guys can buy some booze for the party.'

+ 1 - 4
locations/placer_gop_orgy.qsrc

@@ -3,10 +3,7 @@
 
 menu_off = 1
 
-alko += 5
-cumspclnt = 2
-gs 'cum_cleanup'
-pcs_breath = 0
+gs 'drugs', 'alcohol', 'vodka', 2
 gs 'stat'
 'You, <<$ev_name>> and the guys enter what seems to be an otherwise abandoned apartment. The place barely has any furniture, and there is rubbish and dirt everywhere. Are you even allowed to be in here?'
 'The boys don''t pay any attention to their surroundings, and pour out some vodka from a bottle into several cups they brought while they actively flirt with you and your friend. You soon forget about your surroundings as you''re having fun with the guys, and undress alongside <<$ev_name>>. The boys quickly clear an area of bottles and other debris, so you can lie down.'

+ 1 - 4
locations/placer_house.qsrc

@@ -2,10 +2,7 @@
 
 menu_off = 1
 
-alko += 10
-cumspclnt = 2
-gs 'cum_cleanup'
-pcs_breath = 0
+gs 'drugs', 'alcohol', 'vodka', 3
 gs 'stat'
 'You exit the park with your friend, and follow <<$boydesc>> to an apartment nearby. You all go inside, and continue to drink and have fun there.'
 

+ 1 - 4
locations/placer_house_one.qsrc

@@ -2,10 +2,7 @@
 
 menu_off = 1
 
-alko += 10
-cumspclnt = 2
-gs 'cum_cleanup'
-pcs_breath = 0
+gs 'drugs', 'alcohol', 'vodka', 3
 gs 'stat'
 '<<$boydesc>> takes your hand and guides you away from the park, towards his apartment.'
 !!tipsexrand = rand(0, 1)

+ 3 - 14
locations/placer_sex.qsrc

@@ -46,11 +46,8 @@ if $args[0] = 'meet':
 		Act 'Decline the drink':gt 'placer_sex', 'game'
 	else
 		cls
-		alko += 10
-		cumspclnt = 2
-		gs 'cum_cleanup'
-		pcs_breath = 0
 		minut += 30
+		gs 'drugs', 'alcohol', 'vodka', 3
 		gs'stat'
 		'<center><img <<$set_imgh>> src="images/shared/sex/sleep/drunk.jpg"></center>'
 		'They can stomach their alcohol a lot better than you, and before you know it you''re absolutely hammered. The guys look like they''re still feeling fine.'
@@ -123,24 +120,16 @@ if $args[0] = 'meet':
 end
 
 if $args[0] = 'vodka':
-	alko += rand(0,5)
-	cumspclnt = 2
-	gs 'cum_cleanup'
-	pcs_breath = 0
-	if pcs_hydra >= 100:
-		pcs_hydra -= 5
-	else
-		pcs_hydra -= 10
-	end
 	*clr & cla
+	gs 'drugs', 'alcohol', 'vodka'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/sex/placer_sex2.jpg"></center>'
 	'You accept the drink happily: "Sure, a drink would be nice! Thanks!"'
 	'The boys pour the vodka into some shot glasses, and you enjoy their company while you drink. They have lots of interesting stories and anecdotes to tell, and you never feel bored around them.'
 	'When your glasses are empty, <<$boydesc2>> looks at you and asks, with the bottle in his hand: "Ready for another round?"'
 	if $pantyworntype = 'none':gs 'underwear', 'wear' & 'You quickly excuse yourself: "Give me a minute!" and head for the bathroom. These guys are great! They''re actually treating you like a lady, unlike most guys in Pavlovsk... you don''t want to give them the wrong idea about you by accidentally flashing them your naked pussy! You quickly put on some <a href="exec: VIEW ''images/locations/pavlovsk/park/sex/placer_sex129.jpg''">panties</a> and return to the living room.'
 	act 'Have another drink':
-		alko += rand(0,5)
 		*clr & cla
+		gs 'drugs', 'alcohol', 'vodka'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/sex/placer_sex3.jpg"></center>'
 		'You nod: "Absolutely!" and <<$boydesc2>> fills your glass as well as theirs.'
 		'The guys put out some snacks to go with the booze, and playfully give you compliments while they sip their vodka. You feel very much at ease around them, and just smile.'

+ 3 - 3
locations/pod_ezd.qsrc

@@ -712,7 +712,7 @@ if $ARGS[0] = 'etaj2_smoke':
 		*clr & cla
 		minut += 5
 		siga += 1
-		gs 'shortgs','smoker'
+		gs 'drugs', 'smoke'
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/smoke'+rand(1,3)+'.jpg"></center>'
 		'You gladly accept and spend the next 5 minutes smoking a cigarette with them, talking about trivial things.'
@@ -947,7 +947,7 @@ if $ARGS[0] = 'etaj3_smoke_shulga':
 	menu_off = 1
 	*clr & cla
 	siga += 1
-	gs 'shortgs','smoker'
+	gs 'drugs', 'smoke'
 	minut +=5
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/smoke5.jpg"></center>'
@@ -1010,7 +1010,7 @@ if $ARGS[0] = 'etaj3_smoke_shulga_den':
 	menu_off = 1
 	*clr & cla
 	siga += 1
-	gs 'shortgs','smoker'
+	gs 'drugs', 'smoke'
 	minut +=5
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/smoke4.jpg"></center>'

+ 4 - 32
locations/podezdM.qsrc

@@ -53,10 +53,7 @@ if $ARGS[0] = 'kiosk':
 
 	act 'Drink a little':
 		cla
-		alko += 1
-		cumspclnt = 2
-		gs 'cum_cleanup'
-		pcs_breath = 0
+		gs 'drugs', 'alcohol', 'beer'
 		gs 'stat'
 
 		if podrand < 9:
@@ -68,13 +65,7 @@ if $ARGS[0] = 'kiosk':
 
 	act 'Drink a bottle':
 		cla
-		alko += 2
-		cumspclnt = 2
-		gs 'cum_cleanup'
-		pcs_breath = 0
-		fat += 1
-		pcs_mood += 10
-		pcs_willpwr += 10
+		gs 'drugs', 'alcohol', 'beer'
 		gs 'stat'
 
 		if podrand < 9:
@@ -203,15 +194,7 @@ if $ARGS[0] = 'grup':
 
 	act 'Drink a little':
 		cla
-		alko += 1
-		cumspclnt = 2
-		gs 'cum_cleanup'
-		pcs_breath = 0
-		if pcs_hydra >= 100:
-			pcs_hydra -= 5
-		else
-			pcs_hydra -= 10
-		end
+		gs 'drugs', 'alcohol', 'beer'
 		gs 'stat'
 
 		if haraklover[lover_number] = 0:loverrelation[lover_number] += 1
@@ -223,18 +206,7 @@ if $ARGS[0] = 'grup':
 
 	act 'Drink with the guys':
 		cla
-		alko += 2
-		cumspclnt = 2
-		gs 'cum_cleanup'
-		pcs_breath = 0
-		fat += 1
-		pcs_mood += 10
-		if pcs_hydra >= 100:
-			pcs_hydra -= 5
-		else
-			pcs_hydra -= 10
-		end
-		pcs_willpwr += 10
+		gs 'drugs', 'alcohol', 'beer'
 		gs 'stat'
 
 		if harakBoy = 0:loverrelation[lover_number] -= 1

+ 41 - 58
locations/postevents.qsrc

@@ -3,7 +3,7 @@
 menu_off = 1
 
 if $ARGS[0] = '1':
-	cls
+	*clr & cla
 	minut += 10
 	posteventQW1 = 3
 	gs 'stat'
@@ -12,7 +12,7 @@ if $ARGS[0] = '1':
 	'"I only need to make sure it fits your body well. So, you know, she doesn''t hate me!" he laughs nervously. "Anyway, right this way!"'
 	'He ushers you into the bathroom, giving you the gown after taking it out of the package carefully. He tells you to take as long as you need, and closes the door so you have some privacy.'
 	act 'Model the gown for him':
-		cls
+		*clr & cla
 		minut += 5
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/events/postevent1-2.jpg"></center>'
@@ -30,7 +30,7 @@ if $ARGS[0] = '1':
 			'"You look... very sexy," the man confesses. He''s actually fairly attractive, despite his age.'
 			''
 			act 'Press on and seduce him':
-				cls
+				*clr & cla
 				minut += 5
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/events/postevent1-3.jpg"></center>'
@@ -43,7 +43,7 @@ if $ARGS[0] = '1':
 				''
 				act 'Give him a blowjob he''ll never forget':gt 'postevents', '1-1'
 				act 'Don''t do it, but tell him he deserves better':
-					cls
+					*clr & cla
 					minut += 5
 					gs 'stat'
 					postmarriedQW = 1
@@ -59,7 +59,7 @@ if $ARGS[0] = '1':
 				end
 			end
 			act 'Ease up and ask if that was all':
-				cls
+				*clr & cla
 				minut += 5
 				money += 300
 				gs 'stat'
@@ -72,7 +72,7 @@ if $ARGS[0] = '1':
 			end
 		end
 		act 'Ask if that was all':
-			cls
+			*clr & cla
 			minut += 5
 			money += 300
 			gs 'stat'
@@ -86,7 +86,7 @@ if $ARGS[0] = '1':
 end
 
 if $ARGS[0] = '1-1':
-	cls
+	*clr & cla
 	gs 'boyStat', 'A109'
 	'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/sex/postevent1-4.jpg"></center>'
 	'"Really, just a blowjob? You could literally ask me to do anything you can think of, and all you ask for is a blowjob?" you grin at him. "That''s... kinda sweet, actually. I''ll make it a good one!"'
@@ -100,7 +100,7 @@ if $ARGS[0] = '1-1':
 	gs 'arousal', 'bj', 10
 	gs 'stat'
 	act 'Take his load on your body':
-		cls
+		*clr & cla
 		gs 'cum_call', 'breasts', $boy
 		'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/sex/postevent1-5.jpg"></center>'
 		'When he''s about to burst, you release his cock from your mouth and jerk him off, aiming the head at your boobs. Thick wads of his sperm cover your boobs, while you sit there grinning.'
@@ -113,7 +113,7 @@ if $ARGS[0] = '1-1':
 		'He looks at you desperately, expecting you to say something.'
 		''
 		act 'Reassure him he did nothing wrong':
-			cls
+			*clr & cla
 			minut += 15
 			dynamic $showerdin
 			gs 'stat'
@@ -134,7 +134,7 @@ if $ARGS[0] = '1-1':
 end
 
 if $ARGS[0] = '2':
-	cls
+	*clr & cla
 	posteventQW2 = 3
 	minut += 5
 	'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/events/postevent2-2.jpg"></center>'
@@ -148,7 +148,7 @@ if $ARGS[0] = '2':
 	'"He loves it when I do that!" she whispers in your ear, while she keeps undressing you. "And... I do too! Shhh!"'
 	'She gives you a conspiratory wink and undresses too.'
 	act 'Follow her to the bedroom':
-		cls
+		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/sex/postevent2-3.jpg"></center>'
 		'"You know where we''ll be, boys!" she shouts to the guys, and ushers you into a bedroom without waiting for an answer. She guides you to a bed and lies down next to you.'
 		'Her hands explore your body eagerly, while she aggressively slips her tongue into your mouth and kisses you dominantly.'
@@ -157,13 +157,8 @@ if $ARGS[0] = '2':
 		'"Are you okay, dear? Want some vodka for your nerves?" she asks, when she feels you''re a bit overwhelmed by her raw sexuality.'
 		''
 		act 'Drink the vodka':
-			cls
-			alko += 5
-			if pcs_hydra >= 100:
-				pcs_hydra -= 5
-			else
-				pcs_hydra -= 10
-			end
+			*clr & cla
+			gs 'drugs', 'alcohol', 'vodka'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/sex/postevent2-4.jpg"></center>'
 			'"Maybe a few sips to take the edge off," you mutter, but she pours a mug full and hands it to you. "Cheers!" she grins, and takes a swig straight from the bottle before putting it away.'
@@ -179,15 +174,9 @@ if $ARGS[0] = '2':
 			'"You never asked him?" you ask her. "Aren''t you afraid someone will recognize you?"'
 			'Jenya laughs: "And then what? They would see I''m hot, that I love sex, and that I''m good at it! That''s nothing to be ashamed of! Besides, it hasn''t happened yet. I think he only publishes abroad..."'
 			'When she sees your face, she kisses your neck and says: "You''re not getting cold feet, are you? Here, have some vodka to ease your nerves! You''ll be fine, trust me!"'
-			''
 			act 'Drink the vodka':
-				cls
-				alko += 5
-				if pcs_hydra >= 100:
-					pcs_hydra -= 5
-				else
-					pcs_hydra -= 10
-				end
+				*clr & cla
+				gs 'drugs', 'alcohol', 'vodka'
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/sex/postevent2-4.jpg"></center>'
 				'"Maybe a few sips to take the edge off," you mutter, but she completely fills the mug and hands it to you. "Cheers!" she grins, and takes a swig straight from the bottle before putting it away.'
@@ -216,15 +205,9 @@ if $ARGS[0] = '2':
 			'"Come on, please?" you ask her. "I really like you, but..."'
 			'She sighs and thinks for a second. Then she offers: "Okay, look. I will try to keep him happy and do most of the work, but you can''t ignore him. At least suck him off a little, you know? Does that sound okay?"'
 			'Before you answer, she clarifies: "I''ll offer myself when the time is there." She takes a deep breath, and continues: "I''ll tell him he can fuck my ass, if it really comes to that. He loves my ass, but I never let him have it. He just doesn''t know how to pace himself and make it feel good for me too! Anyway, I don''t think he''ll say no... but if he goes for you, I won''t stop him. I can''t stop him. Not after everything he does for me. I already promised him he''d get to fuck a young cutie today, so..."'
-			''
 			act 'Ask for the vodka':
-				cls
-				alko += 5
-				if pcs_hydra >= 100:
-					pcs_hydra -= 5
-				else
-					pcs_hydra -= 10
-				end
+				*clr & cla
+				gs 'drugs', 'alcohol', 'vodka'
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/sex/postevent2-4.jpg"></center>'
 				'"Maybe some vodka to take the edge off isn''t such a bad idea after all," you mutter, and she pours a mug full and hands it to you. "Cheers!" she grins, and takes a swig straight from the bottle before putting it away.'
@@ -260,7 +243,7 @@ if $ARGS[0] = '2':
 end
 
 if $ARGS[0] = '2-1':
-	cls
+	*clr & cla
 	gs 'boyStat', 'A163'
 	'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/sex/postevent2-6.jpg"></center>'
 	'Suddenly you feel movement on the bed. When you open your eyes, your vision is a bit blurry but you can distinctly see Arsen''s cock. In the distance you hear the clicking of a camera.'
@@ -277,7 +260,7 @@ if $ARGS[0] = '2-1':
 		'Then Jenya slides down and takes the mug from your hand, putting it on the nightstand. She brings her mouth to Arsen''s dick, and also begins to lick his shaft while you suck on the head. For the next few minutes, you take turns sucking him off while the other licks on his balls.'
 		'"Do you want to fuck her now, babe?" you vaguely hear Jenya whispers in Arsen''s ear. "You can do whatever you want... she''s hammered, she''ll do whatever you want!"'
 		act 'Continue':
-			cls
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/sex/postevent2-8.jpg"></center>'
 !!!!precum check for Arsen fucking you
 			cumprecheck = 1
@@ -290,7 +273,7 @@ if $ARGS[0] = '2-1':
 			gs 'arousal', 'vaginal', 5, 'sub'
 			gs 'stat'
 			act 'Continue':
-				cls
+				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/sex/postevent2-9.jpg"></center>'
 				'The next thing you remember is being on your knees next to the bed, getting fucked from behind by Arsen. Jenya eagerly grinds her crotch against your face, guiding your mouth to where she wants it.'
 				'Maksim taking photos of you getting fucked didn''t even cross your mind any more, and you moan eagerly while Arsen drills his cock inside you over and over.'
@@ -300,7 +283,7 @@ if $ARGS[0] = '2-1':
 				gs 'stat'
 				'"Remember, don''t cum inside her!" Jenya reminds Arsen. "If you''re cumming inside anyone, it should be me..."'
 				act 'Continue':
-					cls
+					*clr & cla
 !!!!both cum on your face, but Jenya licks it off before you leave. No cum deposit needs to be tracked, if anything a ''clean face'' trigger
 					'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/sex/postevent2-10.jpg"></center>'
 					'Arsen pulls out of you, and tells you to get on your knees.'
@@ -316,7 +299,7 @@ if $ARGS[0] = '2-1':
 					'Arsen laughs: "Drunk sluts are the best! You''ve really outdone yourself this time, Jenya..."'
 					'Seconds later, he groans loudly and adds his load to Maksim''s, completely covering your face. Jenya takes photos of it all, grinning at you like a proud mother hen.'
 					act 'Continue':
-						cls
+						*clr & cla
 						minut += 15
 						pcs_makeup = 1
 						cumspclnt = 9
@@ -344,7 +327,7 @@ if $ARGS[0] = '2-1':
 end
 
 if $ARGS[0] = '2-2':
-	cls
+	*clr & cla
 	gs 'boyStat', 'A163'
 	'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/sex/postevent2-12.jpg"></center>'
 	'You get down on your back again and gently stroke his cock until it is completely erect, occasionally kissing the head.'
@@ -357,7 +340,7 @@ if $ARGS[0] = '2-2':
 	gs 'stat'
 	act 'Continue':
 		'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/sex/postevent2-13.jpg"></center>'
-		cls
+		*clr & cla
 		'When Arsen looks like he wants more, Jenya quickly intervenes shooting you a wink: "I''m so horny right now! I need you to fuck me, babe! Please?"'
 		'Arsen grins and guides his dick into Jenya''s welcoming snatch, making her moan with delight. You watch her tits bounce back and forth over your head for a while, occasionally pinching her nipples while you play with yourself.'
 		'Then you sit up straight and kiss Jenya on her mouth, stifling her moans while Arsen fucks her harder and harder to try and coax a reaction out of her.'
@@ -395,7 +378,7 @@ if $ARGS[0] = '2-2':
 				gs 'arousal', 'end'
 				gs 'stat'				
 				act 'Let Arsen cum in your mouth':
-					cls
+					*clr & cla
 					minut += 5
 					gs 'cum_call', 'mouth', $boy
 					gs 'boyStat', 'A164'
@@ -409,7 +392,7 @@ if $ARGS[0] = '2-2':
 					'Then you swallow the sperm, and Maksim takes several more photos of your empty mouth. When he has the shots he wants, him and Arsen leave for the living room. You relax on the bed for a moment with Jenya.'
 					'"I''m exhausted!" Jenya says tiredly. "I''m going to take a nap. You can stay if you want? We can nap together?"'
 					act 'Stay and nap with Jenya':
-						cls
+						*clr & cla
 						minut += 65
 						pcs_sleep += 15
 						pcs_health += 60
@@ -443,7 +426,7 @@ if $ARGS[0] = '2-2':
 			end
 		end
 		act 'Agree to ride Arsen':
-			cls
+			*clr & cla
 			minut += 5
 !!!!precum check for Arsen fucking you
 			cumprecheck = 1
@@ -457,7 +440,7 @@ if $ARGS[0] = '2-2':
 			gs 'arousal', 'vaginal', 5, 'sub'
 			gs 'stat'
 			act 'Continue':
-				cls
+				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/sex/postevent2-9.jpg"></center>'
 				'The next thing you remember is being on your knees next to the bed, getting fucked from behind by Arsen. Jenya eagerly grinds her crotch against your face, guiding your mouth to where she wants it.'
 				'Maksim taking photos of you getting fucked didn''t even cross your mind any more, and you moan eagerly into Jenya''s snatch while Arsen drills his cock inside you over and over.'
@@ -468,7 +451,7 @@ if $ARGS[0] = '2-2':
 				minut -= 15
 				gs 'stat'
 				act 'Let Arsen cum in your mouth':
-					cls
+					*clr & cla
 !!!!cum management: you have the loads of both Maksim and Arsen in your mouth and swallow them
 					'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/sex/postevent2-16.jpg"></center>'
 					'"I''m going to cum!" Arsen groans, mere seconds after you take his cock in your mouth. You feel the first jets of his sperm landing on your tongue. Jenya immediately gets down next to you, and eagerly watches how her boyfriend shoots his load in your mouth. Arsen''s load isn''t very big, but that''s no surprise - how many times did Jenya make him cum already today?'
@@ -483,7 +466,7 @@ if $ARGS[0] = '2-2':
 					'Then you swallow the sperm, and Maksim takes several more photos of your empty mouth. When he has the shots he wants, him and Arsen leave for the living room. You relax on the bed for a moment with Jenya.'
 					'"I''m exhausted!" Jenya says tiredly. "I''m going to take a nap. You can stay if you want? We can nap together?"'
 					act 'Stay and nap with Jenya':
-						cls
+						*clr & cla
 						minut += 65
 						pcs_sleep += 15
 						pcs_health += 60
@@ -519,7 +502,7 @@ if $ARGS[0] = '2-2':
 end
 
 if $ARGS[0] = '3':
-	cls
+	*clr & cla
 	posteventQW3 = 3
 	minut += 5
 	gs 'boyStat', 'A108'
@@ -563,7 +546,7 @@ if $ARGS[0] = '3':
 end
 
 if $ARGS[0] = '3-1':
-	cls
+	*clr & cla
 	if postcuffs = 1:
 		'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/sex/postevent3-4.jpg"></center>'
 	else
@@ -600,7 +583,7 @@ if $ARGS[0] = '3-1':
 		'He walks off, and returns showing you a ring gag. He says: "Since you can''t give a decent blowjob, you''re going to wear this. Open your mouth."'
 		
 		act 'Open your mouth obediently':
-			cls
+			*clr & cla
 !!!!you swallow his load
 			'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/sex/postevent3-5.jpg"></center>'
 			'You let the man put the ring into your mouth, and wait obediently while he fastens it behind your head.'
@@ -614,7 +597,7 @@ if $ARGS[0] = '3-1':
 			act 'Continue': gt 'postevents', '3-2'
 		end
 		act 'Beg him to let you try again':
-			cls
+			*clr & cla
 !!!!you swallow his load
 			'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/sex/postevent3-6.jpg"></center>'
 			'You shake your head no and beg him: "No, I can do it! Please let me try again! No need for that thing."'
@@ -633,7 +616,7 @@ end
 
 
 if $ARGS[0] = '3-2':
-	cls
+	*clr & cla
 	minut += 15
 	gs 'stat'
 	gs 'arousal', 'end'
@@ -662,7 +645,7 @@ if $ARGS[0] = '3-2':
 end
 
 if $ARGS[0] = '4':
-	cls
+	*clr & cla
 	posteventQW4 = 3
 	minut += 5
 	gs 'npcgeneratec', 0, 'Sleazy man', 38
@@ -676,7 +659,7 @@ if $ARGS[0] = '4':
 	'Surprised by his stamina, you give him a questioning look. He grins at you and says: "I never said it''d be easy! Maybe you have to try a little harder..."'
 	
 	act 'Show some skin to get him off faster':
-		cls
+		*clr & cla
 		if pcs_dom > 25:
 			'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/sex/postevent4-4.jpg"></center>'
 		else
@@ -709,7 +692,7 @@ if $ARGS[0] = '4':
 	end
 	if lubri > 0:
 		act 'Use some lubricant to get him off faster':
-			cls
+			*clr & cla
 			lubri -= 1
 			'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/sex/postevent4-6.jpg"></center>'
 			'Making his dick nice and slick with some lubricant will surely help! You stop jerking him off for a moment and reach for your things, quickly squirting some lube into the palm of your hand.'
@@ -723,7 +706,7 @@ if $ARGS[0] = '4':
 		end
 	end
 	act 'Use your mouth to get him off faster':
-		cls
+		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/sex/postevent4-7.jpg"></center>'
 		'Surely you would get him off faster if you used your mouth?'
 		'You don''t want to seem too eager, so you restrict yourself to just licking the tip or sucking on the head of his cock from time to time, while you keep stroking his shaft. His cock has a faint chemical scent to it at first, but you can''t quite tell why.'
@@ -733,7 +716,7 @@ if $ARGS[0] = '4':
 		gs 'arousal', 'bj', 5
 		gs 'stat'
 		act 'Don''t let him cum in your mouth':
-			cls
+			*clr & cla
 !!!!cum on face
 			'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/sex/postevent4-8.jpg"></center>'
 			'You quickly take his cock out of your mouth when you realize he''s about to burst, but can''t prevent him from shooting his warm load all over your face. Luckily you managed to close your eyes on time!'
@@ -743,7 +726,7 @@ if $ARGS[0] = '4':
 			act 'Continue your round':gs 'arousal', 'end' & gt 'postdeliveries', 'resume'
 		end
 		act 'Make him cum in your mouth':
-			cls
+			*clr & cla
 !!!!cum in mouth
 			gs 'cum_call', 'mouth', $boy
 			'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/sex/postevent4-9.jpg"></center>'

+ 5 - 1
locations/qwBarEncounters.qsrc

@@ -131,21 +131,25 @@ if $ARGS[0] = '':
 				money -= 140
 				agil_exp += rand(0,1)
 				react_exp += rand(0,1)
+				gs 'drugs', 'alcohol', 'beer'
 			elseif $boozeVar = 'vodka':
 				money -= 150
 				stren_exp += rand(0,1)
 				vital_exp += rand(0,1)
+				gs 'drugs', 'alcohol', 'vodka'
 			elseif $boozeVar = 'wine':
 				money -= 180
 				chrsm_exp += rand(0,1)
 				prcptn_exp += rand(0,1)
+				gs 'drugs', 'alcohol', 'wine'
 			elseif $boozeVar = 'spirit':
 				money -= 200
 				intel_exp += rand(0,1)
 				sprt_exp += rand(0,1)
+				gs 'drugs', 'alcohol', 'vodka'
 			end
 			minut += 15
-			alko += 2
+			
 			*nl
 			PBB_Met = 1
 			'You smile at him and accept his offer. He buys you another <<$boozeVar>> and as you nurse on it, the two of you chat some more about everything and nothing.'

+ 64 - 67
locations/reks.qsrc

@@ -24,7 +24,7 @@ if $ARGS[0] = 'rexGdkTalk':
 	if rex>=60:
 		rexTalk = rand(1,10)
 		if rexTalk = 10 and rex>=80:
-			cls
+			*clr & cla
 			pcs_horny += 10
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/reks/event/rexhistory1.jpg"></center>'
@@ -114,7 +114,7 @@ if $ARGS[0] = 'rexGdkTalk':
 end
 
 if $ARGS[0] = 'skver':
-	cls
+	*clr & cla
 	rexPark = 2
 	rexSisTalk += 1
 	minut += 5
@@ -125,19 +125,19 @@ if $ARGS[0] = 'skver':
 	'Rex is standing at the bench with his hands behind his back. Just as you walk up to him you see him smiling and then he pulls out from behind his back a little, but very beautiful, bouquet of flowers and hands it to you.'
 	'You don''t know what to say – "Wow..." - you take the bouquet, inhaling the aroma, and on the exhale, keeping the smile hidden from your face, say: "Thank you, Rex..!"'
 	act 'Walk':
-		cls
+		*clr & cla
 		minut += 30
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/reks/event/progulpark.jpg"></center>'
 		'You wander through the Park together, talking about different topics. Rex periodically takes photos of the landscape with his new camera and you must admit, the pictures are very nice.'
 		act 'Further':
-			cls
+			*clr & cla
 			minut += 30
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/reks/event/rexozero.jpg"></center>'
 			'When you reach the lake, Rex takes a picture with you.'
 			act 'Further':
-				cls
+				*clr & cla
 				minut += 30
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/pc/clothing/3expensive/8.jpg"></center>'
@@ -183,7 +183,7 @@ if $ARGS[0] = 'skver':
 						rex += 1
 						'Rex wants to see you in the dress, so you go home and change into it.'
 						act 'Further':
-							cls
+							*clr & cla
 							gs 'clothing', 'wear', 'expensive', 8
 							minut += 5
 							gs 'stat'
@@ -193,77 +193,77 @@ if $ARGS[0] = 'skver':
 							'Rex, practically devouring you with his eyes, mumbles:'
 							'- Gorgeous!!!'
 							act 'Go to the park':
-								cls
+								*clr & cla
 								minut += 10
 								gs 'stat'
 								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/reks/event/newclothes/fpr1.jpg"></center>'
 								'You''ve come to the square:'
 								'- <<$pcs_nickname>>, let''s take a photo of you with your bouquet.'
 								act 'Further':
-									cls
+									*clr & cla
 									minut += 5
 									pcs_horny += 5
 									gs 'stat'
 									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/reks/event/newclothes/fpr2.jpg"></center>'
 									'- This would be a great place to frame the shot, Rex says. You sit on a huge rock and strike a pose. From the corner of your eye you notice how Rex''s crotch is bulging.'
 									act 'Further':
-										cls
+										*clr & cla
 										minut += 5
 										gs 'stat'
 										'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/reks/event/newclothes/fpr3.jpg"></center>'
 										'You pose for another shot on the stone with your legs crossed and then go wandering the Park in search of new places for photos. After taking a few more photos, you go to sit on a bench.'
 										'Rex pulls out his smartphone and shows you some pictures of his sister.'
 										act 'Watch':
-											cls
+											*clr & cla
 											minut += 5
 											gs 'stat'
 											'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/reks/event/rekssister/fsr1.jpg"></center>'
 											'- Look what she got me! True beauty, right?'
 											act 'View more':
-												cls
+												*clr & cla
 												minut += 5
 												gs 'stat'
 												'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/reks/event/rekssister/fsr2.jpg"></center>'
 												'- This is her at my uncle''s wedding.'
 												act 'View more':
-													cls
+													*clr & cla
 													minut += 5
 													gs 'stat'
 													'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/reks/event/rekssister/fsr3.jpg"></center>'
 													'- She loves all sorts of beautiful clothes. But I guess that''s true for all women. No offense <<$pcs_nickname>>, - he smiled.'
 													act 'View more':
-														cls
+														*clr & cla
 														minut += 5
 														gs 'stat'
 														'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/reks/event/rekssister/fsr4.jpg"></center>'
 														'- This is us in the square'
 														act 'View more':
-															cls
+															*clr & cla
 															minut += 5
 															gs 'stat'
 															'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/reks/event/rekssister/fsr5.jpg"></center>'
 															'- This is at our bathhouse'
 															act 'View more':
-																cls
+																*clr & cla
 																minut += 5
 																gs 'stat'
 																'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/reks/event/rekssister/fsr6.jpg"></center>'
 																'- That''s father''s car she is sitting in. I took this one when I only had my phone for pictures. She asked me to take a shot to capture her legs. Beautiful, no?'
 																act 'View more':
-																	cls
+																	*clr & cla
 																	minut += 5
 																	gs 'stat'
 																	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/reks/event/rekssister/fsr7.jpg"></center>'
 																	'- And this is at our house.'
 																	act 'View more':
-																		cls
+																		*clr & cla
 																		minut += 5
 																		pcs_horny += 10
 																		gs 'stat'
 																		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/reks/event/rekssister/fsr8.jpg"></center>'
 																		'- Oh...! Fuck!!! Uhhh... - mumbled Rex. You go wide-eyed looking at this one, wondering why Rex kept a photo of his sister like this. You can''t help but blurt out, "Whose cock is that in her mouth!?" Rex blushes deeply and quickly turns off his phone. You begin to suspect that it might have been his cock; otherwise he probably wouldn''t be so embarrassed. Rex immediately begins to make excuses, first supposedly not knowing how this picture ended up in his phone, and then he tries to say it''s not even his sister, thinking that you couldn''t see her well enough with that much dick in her face.'
 																		act 'Further':
-																			cls
+																			*clr & cla
 																			minut += 5
 																			gs 'stat'
 																			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/reks/rex.jpg"></center>'
@@ -292,7 +292,7 @@ if $ARGS[0] = 'skver':
 end
 
 if $ARGS[0] = 'avto':
-	cls
+	*clr & cla
 	rexCar = 0
 	rexSisTalk += 1
 	minut += 5
@@ -304,7 +304,7 @@ if $ARGS[0] = 'avto':
 
 	if pcs_dom > 5:
 		act 'No':
-			cls
+			*clr & cla
 			minut += 20
 			rex -= 2
 			gs 'stat'
@@ -314,12 +314,9 @@ if $ARGS[0] = 'avto':
 		end
 	end
 	act 'Agree':
-		cls
+		*clr & cla
 		minut += 15
-		alko += 2
-		cumspclnt = 2
-		gs 'cum_cleanup'
-		pcs_breath = 0
+		gs 'drugs', 'alcohol', 'beer'
 		rex += 2
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/reks/rex.jpg"></center>'
@@ -335,21 +332,21 @@ if $ARGS[0] = 'rex_story':
 	'Forgive me for the bluntness. So we had a good time! Moreover, this has happened more than once. It actually happened several times. One day I asked her if I could take a picture while she was blowing me. Diana was a little surprised by my request but she eventually agreed and continued to suck This really turned me on. A few days later she asked me to remove the pictures. I told her I removed them all and she believed me.'
 	'You have to understand, <<$pcs_nickname>>... I have a weakness for women''s legs. They..., they really turn me on! And she gets really turned on at the sight of the male penis . And we both adore oral sex! I guess it runs in the family ... -it just happened, we understood each other. You shouldn''t think I actually had sex with my sister! We only had oral sex!'
 	act 'Further':
-		cls
+		*clr & cla
 		minut += 10
 		pcs_horny += 5
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/reks/event/rekssister/utrmin.jpg"></center>'
 		'- One night Diana came home very drunk. Actually it was already almost morning. At that time my bedroom was being repaired so I was sleeping on a folding chair in the hall. I had dropped my blanket. So that night I thought I was having a wet dream. It felt great but then I sensed something was wrong... I Opened my eyes, and there I saw... Diana sucking on my dick! I quickly closed my eyes, lay very still and tried to figure out whether it was a dream or reality? Of course she already knew I woke up, but she did not stop She continued to suck slowly.'
 		act 'Keep listening':
-			cls
+			*clr & cla
 			minut += 10
 			pcs_horny += 5
 			gs 'stat'
 			'<center><video autoplay loop src="images/characters/pavlovsk/resident/reks/event/rekssister/minrex.mp4"></video></center>'
 			'- Soon after I finally opened my eyes but I did not move or say anything. I just lay there and fully enjoyed the feeling as my elder sister was blowing me! This was the first time I had an experience like this. This was the first blowjob I ever received in my life'
 			act 'Further':
-				cls
+				*clr & cla
 				minut += 10
 				pcs_horny += 5
 				gs 'stat'
@@ -357,14 +354,14 @@ if $ARGS[0] = 'rex_story':
 				'- I couldn''t take it very long. She was sucking very slowly, it was like she wanted me to last a little longer. It didn''t help much and soon my cock was spurting streams of cum and her mouth was completely filled with my sperm! She didn''t even flinch and swallowed every last drop. Then she carefully removed my, still rock-hard, cock from her mouth. She went to lie down on her own bed and it didn''t take her long to fall asleep.'
 				'For the next hour I was just twisting and turning in my chair and could not sleep. I kept thinking about what happened...'
 				act 'Further':
-					cls
+					*clr & cla
 					minut += 10
 					pcs_horny += 5
 					gs 'stat'
 					'- The next day she just avoided me the whole day. In the evening, she acted like nothing happened and she sat down with me on the sofa. Together we watched TV, from time to time commenting on what was happening on the screen.'
 					'A few days later it happened again, only this time it was different, she was much more forceful and I also helped her to relax. We had such a great time. After this second time we found the courage to discuss what was happening between us. That''s when I learned about her weaknesses and I spoke about mine. I justified it by the fact, that it would be better to release some steam with me then to go running or something.'
 					act 'Further':
-						cls
+						*clr & cla
 						minut += 30
 						if pcs_horny < 95: pcs_horny = 95
 						gs 'stat'
@@ -391,7 +388,7 @@ if $ARGS[0] = 'rex_story':
 end
 
 if $ARGS[0] = 'avto2':
-	cls
+	*clr & cla
 	rexCar = 0
 	rexCarCount += 1
 	minut += 30
@@ -411,7 +408,7 @@ if $ARGS[0] = 'avto2':
 	elseif rexCarCount > 3 and rexCarCount <= 6:
 		'You ride with Rex. During the conversation, he takes your hand.'
 		act 'Let him':
-			cls
+			*clr & cla
 			pcs_horny += 10
 			minut += 30
 			rex += 1
@@ -422,7 +419,7 @@ if $ARGS[0] = 'avto2':
 		end
 		if pcs_dom >= 5:
 			act 'Remove the arm':
-				cls
+				*clr & cla
 				minut += 30
 				rexCarCount -= 1
 				gs 'stat'
@@ -435,7 +432,7 @@ if $ARGS[0] = 'avto2':
 		'You ride with Rex, during the ride, he puts his hand on your knee.'
 		if pcs_dom >= 5:
 			act 'Remove the arm':
-				cls
+				*clr & cla
 				minut += 30
 				rexCarCount -= 1
 				gs 'stat'
@@ -445,7 +442,7 @@ if $ARGS[0] = 'avto2':
 			end
 		end
 		act 'Let him':
-			cls
+			*clr & cla
 			pcs_horny += 10
 			minut += 10
 			rex += 1
@@ -454,7 +451,7 @@ if $ARGS[0] = 'avto2':
 			'Rex keeps his hand on your leg just above the knee, you continued to talk.'
 			if pcs_dom >= 5:
 				act 'Remove the arm':
-					cls
+					*clr & cla
 					minut += 20
 					rexCarCount -= 1
 					gs 'stat'
@@ -464,7 +461,7 @@ if $ARGS[0] = 'avto2':
 				end
 			end
 			act 'Further':
-				cls
+				*clr & cla
 				pcs_horny += 10
 				minut += 10
 				rex += 1
@@ -473,7 +470,7 @@ if $ARGS[0] = 'avto2':
 				'During the conversation, Rex ''accidentally'' raises his hand a little higher up your leg.'
 				if pcs_dom >= 5:
 					act 'Remove the arm':
-						cls
+						*clr & cla
 						minut += 10
 						rexCarCount -= 1
 						gs 'stat'
@@ -483,7 +480,7 @@ if $ARGS[0] = 'avto2':
 					end
 				end
 				act 'Further':
-					cls
+					*clr & cla
 					rex += 1
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/reks/event/car/carrex8.jpg"></center>'
@@ -494,7 +491,7 @@ if $ARGS[0] = 'avto2':
 					gs 'stat'
 					
 					act 'Stop':
-						cls
+						*clr & cla
 						pcs_horny += 10
 						minut += 10
 						rex -= 5
@@ -524,7 +521,7 @@ if $ARGS[0] = 'rex_car_end':
 end
 
 if $ARGS[0] = 'sms':
-	cls
+	*clr & cla
 	minut += 10
 	rex += 1
 	rexSmsDay = daystart
@@ -540,7 +537,7 @@ if $ARGS[0] = 'sms':
 		if smsForRex = 1:
 		    photoskl_exp += 1
 			act 'Photo':
-				cls
+				*clr & cla
 				minut += 5
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/reks/event/phone/smsrex1.jpg"></center>'
@@ -549,7 +546,7 @@ if $ARGS[0] = 'sms':
 			end
 		elseif smsForRex = 2:
 			act 'Photos in stockings':
-				cls
+				*clr & cla
 				minut += 5
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/reks/event/phone/smsrex2.jpg"></center>'
@@ -558,7 +555,7 @@ if $ARGS[0] = 'sms':
 			end
 		elseif smsForRex = 3:
 			act 'Photo with inscription':
-				cls
+				*clr & cla
 				minut += 5
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/reks/event/phone/smsrex3.jpg"></center>'
@@ -567,7 +564,7 @@ if $ARGS[0] = 'sms':
 			end
 		elseif smsForRex = 4:
 			act 'Photos in stockings':
-				cls
+				*clr & cla
 				minut += 5
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/reks/event/phone/smsrex4.jpg"></center>'
@@ -582,7 +579,7 @@ if $ARGS[0] = 'sms':
 		photoskl_exp += 1
 		if smsForRex = 5:
 			act 'Photo':
-				cls
+				*clr & cla
 				minut += 5
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/reks/event/phone/smsrex5.jpg"></center>'
@@ -591,7 +588,7 @@ if $ARGS[0] = 'sms':
 			end
 		elseif smsForRex = 6:
 			act 'Photo_ 2':
-				cls
+				*clr & cla
 				minut += 5
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/reks/event/phone/smsrex6.jpg"></center>'
@@ -600,7 +597,7 @@ if $ARGS[0] = 'sms':
 			end
 		elseif smsForRex = 7:
 			act 'Photo_ 3':
-				cls
+				*clr & cla
 				minut += 5
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/reks/event/phone/smsrex7.jpg"></center>'
@@ -609,7 +606,7 @@ if $ARGS[0] = 'sms':
 			end
 		elseif smsForRex = 8:
 			act 'Photo_ 4':
-				cls
+				*clr & cla
 				minut += 5
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/reks/event/phone/smsrex8.jpg"></center>'
@@ -618,7 +615,7 @@ if $ARGS[0] = 'sms':
 			end
 		elseif smsForRex = 9:
 			act 'Photo_ 5':
-				cls
+				*clr & cla
 				minut += 5
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/reks/event/phone/smsrex9.jpg"></center>'
@@ -627,7 +624,7 @@ if $ARGS[0] = 'sms':
 			end
 		elseif smsForRex = 10:
 			act 'Photo_ 6':
-				cls
+				*clr & cla
 				minut += 5
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/reks/event/phone/smsrex10.jpg"></center>'
@@ -636,7 +633,7 @@ if $ARGS[0] = 'sms':
 			end
 		elseif smsForRex = 11:
 			act 'Photo_ 7':
-				cls
+				*clr & cla
 				minut += 5
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/reks/event/phone/smsrex11.jpg"></center>'
@@ -645,7 +642,7 @@ if $ARGS[0] = 'sms':
 			end
 		elseif smsForRex = 12:
 			act 'Photo_ 8':
-				cls
+				*clr & cla
 				minut += 5
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/reks/event/phone/smsrex12.jpg"></center>'
@@ -654,13 +651,13 @@ if $ARGS[0] = 'sms':
 			end
 		elseif smsForRex = 13:
 			act 'Photo_ 9':
-				cls
+				*clr & cla
 				minut += 5
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/reks/event/phone/smsrex13.jpg"></center>'
 				'You take off your clothes, only leaving your underwear and stockings. You then take a seductive pose and take the picture.'
 				act 'Send':
-					cls
+					*clr & cla
 					rex += 1
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/reks/event/phone/smsrex14.jpg"></center>'
@@ -672,7 +669,7 @@ if $ARGS[0] = 'sms':
 					gs 'stat'
 					
 					act 'Answer':
-						cls
+						*clr & cla
 						rex += 1
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/reks/event/phone/smsrex17.jpg"></center>'
@@ -682,7 +679,7 @@ if $ARGS[0] = 'sms':
 						gs 'stat'
 					
 						act 'Wait':
-							cls
+							*clr & cla
 							rex += 1
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/reks/event/phone/smsrex18.jpg"></center>'
@@ -693,7 +690,7 @@ if $ARGS[0] = 'sms':
 					
 							if pcs_horny >= 100:
 								act 'Masturbate':
-									cls
+									*clr & cla
 									rex += 1
 									pcs_mood = 100
 									gs 'stat'
@@ -704,7 +701,7 @@ if $ARGS[0] = 'sms':
 									gs 'stat'
 									
 									act 'Answer':
-										cls
+										*clr & cla
 										minut += 10
 										rex += 10
 										gs 'stat'
@@ -743,7 +740,7 @@ if $ARGS[0] = 'sms':
 end
 
 if $ARGS[0] = 'sms_end1':
-	cls
+	*clr & cla
 	minut += 5
 	rex += 1
 	gs 'stat'
@@ -760,7 +757,7 @@ end
 
 if $ARGS[0] = 'sms_end2':
 	act 'Send':
-		cls
+		*clr & cla
 		minut += 5
 		rex += 1
 		gs 'stat'
@@ -772,7 +769,7 @@ if $ARGS[0] = 'sms_end2':
 end
 
 if $ARGS[0] = 'Party_rex_sex_cum':
-	cls
+	*clr & cla
 	sexstart = 0
 	minut = 7
 	spafinloc = 7
@@ -801,7 +798,7 @@ if $ARGS[0] = 'Party_rex_sex_cum':
 end
 
 if $ARGS[0] = 'Party_rex_sex_cow':
-	cls
+	*clr & cla
 	sexvar -= 1
 	gs 'dinsex2', 'stamina_npc'
 	pcs_vag += 1
@@ -822,7 +819,7 @@ if $ARGS[0] = 'Party_rex_sex_cow':
 end
 
 if $ARGS[0] = 'Party_rex_sex_dog':
-	cls
+	*clr & cla
 	sexvar -= 1
 	gs 'dinsex2', 'stamina_npc'
 	pcs_vag += 1
@@ -845,7 +842,7 @@ if $ARGS[0] = 'Party_rex_sex_dog':
 end
 
 if $ARGS[0] = 'Party_rex_sex_missionary':
-	cls
+	*clr & cla
 	sexvar -= 1
 	gs 'dinsex2', 'stamina_npc'
 	pcs_vag += 1
@@ -865,7 +862,7 @@ if $ARGS[0] = 'Party_rex_sex_missionary':
 end
 
 if $ARGS[0] = 'Party_rex_sex':
-	cls
+	*clr & cla
 	sexstart = 1
 	sexvar = 3
 	gs 'dinsex2', 'stamina_npc'
@@ -891,7 +888,7 @@ if $ARGS[0] = 'Party_rex_sex':
 end
 
 if $ARGS[0] = 'party':
-	cls
+	*clr & cla
 	minut += 5
 	gs'stat'
 	'<center><b><font color = maroon>Rex</font></b></center>'

+ 3 - 16
locations/restoranM.qsrc

@@ -36,18 +36,10 @@ end
 
 if $ARGS[0] = 'a':
 	minut += 30
-	alko += 2
-	if pcs_hydra >= 100:
-		pcs_hydra -= 5
-	else
-		pcs_hydra -= 10
-	end
+	gs 'drugs', 'alcohol', 'wine'
 	'When your food arrives, <<$loverdesc[lover_number]>> pours you a glass of wine and proposes a toast to love.'
 
-	act 'Eat':
-		cla
-		xgt 'restoranM', 'b'
-	end
+	act 'Eat': xgt 'restoranM', 'b'
 end
 
 if $ARGS[0] = 'b':
@@ -56,12 +48,7 @@ if $ARGS[0] = 'b':
 
 
 	gs 'food', 'm_meal'
-	alko += 2
-	if pcs_hydra >= 100:
-		pcs_hydra -= 5
-	else
-		pcs_hydra -= 10
-	end
+	gs 'drugs', 'alcohol', 'wine'
 	gs 'stat'
 	'After you finish your meal and empty the wine, <<$loverdesc[lover_number]>> offers to take you to his home.'
 

+ 17 - 37
locations/rolanapt.qsrc

@@ -351,7 +351,6 @@ if $ARGS[0] = 'holodil':
 		act 'Drink some kvass':
 			*clr & cla
 			minut += 1
-			alko += 1
 			cumspclnt = 2
 			gs 'cum_cleanup'
 			pcs_breath = 0
@@ -1821,8 +1820,7 @@ end
 
 if $ARGS[0] = 'worker':
 	if rolanworker = 1:
-		cla
-		*clr
+		*clr & cla
 		minut += 5
 		rolanworker += 1
 		workertool = 0
@@ -1831,22 +1829,19 @@ if $ARGS[0] = 'worker':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/bathchat/builder/prelude1.jpg"></center>'
 		'"I was wondering, why don''t you do some work around your home to fix it up?"'
 		act 'Continue':
-		    cla
-			*clr
+		    *clr & cla
 			minut += 2
 			'<center><b><font color = maroon>Chat</font></b></center>'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/rolanwelcome.jpg"></center>'
 			'"Miss <<$pcs_lastname>>, I have thought about it. But I don''t have the money to pay anyone to work on my home and I also don''t have all the know-how to do it myself."'
 			act 'Continue':
-				cla
-				*clr
+				*clr & cla
 				minut += 2
 				'<center><b><font color = maroon>Chat</font></b></center>'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/bathchat/builder/prelude2.jpg"></center>'
 				'"What if I helped you?"'
 				act 'Continue':
-					cla
-					*clr
+					*clr & cla
 					minut += 2
 					'<center><b><font color = maroon>Chat</font></b></center>'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/rolanwelcome.jpg"></center>'
@@ -1856,8 +1851,7 @@ if $ARGS[0] = 'worker':
 			end
 		end
 	elseif rolanworker = 2:
-		cla
-		*clr
+		*clr & cla
 		minut += 5
 		rolanworker += 1
 		gs 'stat'
@@ -1865,71 +1859,61 @@ if $ARGS[0] = 'worker':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/bathchat/builder/worker6.jpg"></center>'
 		'<i>First I''ll prepare the concrete, I don''t need a whole lot, the crack''s not that big after all...</i>'
 		act 'Continue':
-		    cla
-			*clr
+		    *clr & cla
 			minut += 5
 			'<center><b><font color = maroon>Worker</font></b></center>'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/bathchat/builder/worker7.jpg"></center>'
 			'<i>Next, I''ll search for the pipes and mark their path. Definitely don''t wanna break those...</i>'
 			act 'Continue':
-				cla
-				*clr
+				*clr & cla
 				minut += 5
 				'<center><b><font color = maroon>Worker</font></b></center>'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/bathchat/builder/worker8.jpg"></center>'
 				'<i>...I hope his neighbors aren''t home...</i>'
 				act 'Continue':
-					cla
-					*clr
+					*clr & cla
 					minut += 10
 					'<center><b><font color = maroon>Worker</font></b></center>'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/bathchat/builder/worker9.jpg"></center>'
 					'<i>...whew, that''s done. Good thing too, I''m really starting to sweat...</i>'
 					act 'Continue':
-						cla
-						*clr
+						*clr & cla
 						minut += 5
 						'<center><b><font color = maroon>Worker</font></b></center>'
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/bathchat/builder/worker10.jpg"></center>'
 						'<i>...now to patch the holes with the concrete...</i>'
 						act 'Continue':
-							cla
-							*clr
+							*clr & cla
 							minut += 5
 							'<center><b><font color = maroon>Worker</font></b></center>'
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/bathchat/builder/worker11.jpg"></center>'
 							'<i>...this is more work than I thought it''d be. I''m absolutely soaked in sweat...</i>'
 							act 'Continue':
-								cla
-								*clr
+								*clr & cla
 								minut += 10
 								'<center><b><font color = maroon>Worker</font></b></center>'
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/bathchat/builder/worker12.jpg"></center>'
 								'<i>That feels</i> <b>sooo</b> <i>much better! Good thing Rolan isn''t around, he''d have a heart attack!</i>'
 								act 'Continue':
-									cla
-									*clr
+									*clr & cla
 									minut += 5
 									'<center><b><font color = maroon>Worker</font></b></center>'
 									'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/bathchat/builder/worker13.jpg"></center>'
 									'You begin painting the walls.'
 									act 'Continue':
-										cla
-										*clr
+										*clr & cla
 										minut += 10
 										'<center><b><font color = maroon>Worker</font></b></center>'
 										'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/bathchat/builder/worker14.jpg"></center>'
 										'<i>I sure hope Rolan is happy with my work.</i>'
 										act 'Continue':
-											cla
-											*clr
+											*clr & cla
 											minut += 5
 											'<center><b><font color = maroon>Worker</font></b></center>'
 											'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/bathchat/builder/worker15.jpg"></center>'
 											'<i>...the upper walls are done, finally. Now time for the lower walls...</i>'
 											act 'Continue':
-												cla
-												*clr
+												*clr & cla
 												minut += 10
 												'<center><b><font color = maroon>Worker</font></b></center>'
 												'<center><video src="images/locations/pavlovsk/resident/apartment/aptrolan/bathchat/builder/workpaint.mp4"></center>'
@@ -1937,14 +1921,10 @@ if $ARGS[0] = 'worker':
 !! LURK MORRISON Idea: Check if PC has showered with Kolka (washing each other), if true then display next line instead
 												!! '<i>...I wonder if Kolka wouldn''t mind washing this paint off me in the shower later...</i>'
 												act 'Continue':
-													cla
-													*clr
+													*clr & cla
 													minut += 5
 													newbath = 1
-													alko += 1
-													cumspclnt = 2
-													gs 'cum_cleanup'
-													pcs_breath = 0
+													gs 'drugs', 'alcohol', 'beer'
 													gs'stat'
 													'<center><b><font color = maroon>Worker</font></b></center>'
 													'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/bathchat/builder/worker16.jpg"></center>'

+ 2 - 18
locations/sbReksHome.qsrc

@@ -54,16 +54,8 @@ if $ARGS[0] = 'party':
 	act 'Drink':
 		cls
 		minut += 5
-		alko += 1
-		if pcs_hydra >= 100:
-			pcs_hydra -= 5
-		else
-			pcs_hydra -= 10
-		end
-		cumspclnt = 2
-		gs 'cum_cleanup'
-		pcs_breath = 0
 		alkoParty += 1
+		gs 'drugs', 'alcohol', 'vodka'
 		gs'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/reksparty_2_' + rand(1,4) + '.jpg"></center>'
 		'In all this mess you are unable to find a clean cup and are handed a full bottle of booze. Clinking glasses with the bottle, you put your lips to the mouth of the bottle and turn it up, gulping down several swigs of strong drink, noticing the effects almost at once.'
@@ -104,16 +96,8 @@ end
 if $ARGS[0] = 'party_drink':
 	cls
 	minut += 5
-	alko += 1
-	if pcs_hydra >= 100:
-		pcs_hydra -= 5
-	else
-		pcs_hydra -= 10
-	end
-	cumspclnt = 2
-	gs 'cum_cleanup'
-	pcs_breath = 0
 	alkoParty += 1
+	gs 'drugs', 'alcohol', 'vodka'
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/reksparty_2_' + rand(1,4) + '.jpg"></center>'
 	'Someone hands you a half full bottle of booze, putting your lips to the mouth of the bottle, you turn it up and gulp down several swigs of strong drink, noticing the effects almost at once.'

+ 0 - 53
locations/shortgs.qsrc

@@ -1,58 +1,5 @@
 # shortgs
 
-!! smoker - handles all changes which happen when PC smokes one cigarette
-!! use : gs 'shortgs','smoker'
-if $ARGS[0] = 'smoker':
-	siga -= 1
-	if NarkImmune = 0: smoker += 1
-	smokeHour = hour
-	smokeDay = daystart
-	smokeminut = minut + 5
-	smokerNeed = 0
-	cumspclnt = 2
-	gs 'cum_cleanup'
-	pcs_breath = 0
-	pcs_mood += 100
-	wipo += 100
-	if pcs_hydra >= 100:
-		pcs_hydra -= 5
-	else
-		pcs_hydra -= 10
-	end
-	if pcs_energy < 80: pcs_energy += 4
-	gs '$menu_obnovit'
-end
-
-!! smoke_joint - handles all changes which happen when PC smokes a joint
-!! use : gs 'shortgs', 'smoke_joint'
-if $ARGS[0] = 'smoke_joint':
-	joint -= 1
-	joint_smoked += 1
-	jointday = daystart
-	jointhour = hour
-	jointminut = minut + 1
-	if minut > 30:
-		jointhigh = 2
-	else
-		jointhigh = 1
-	end	
-	cumspclnt = 2
-	gs 'cum_cleanup'
-	pcs_breath = 0
-	pcs_mood += 100
-	if pcs_hydra >= 100:
-		pcs_hydra -= 5
-	else
-		pcs_hydra -= 10
-	end
-	if pcs_energy > 20: 
-		pcs_energy -= 20
-	else
-		pcs_energy = 0
-	end
-	gs 'stat'
-end
-
 !! following function counts the number of guys which PC slept with. 
 !! use func('shortgs','guy') or func('shortgs','guy',X) for subset (X can be 'A','B','C','AB','AC','BC')
 if $ARGS[0] = 'guy':

+ 2 - 23
locations/shulga_room.qsrc

@@ -508,15 +508,7 @@ if $ARGS[0] = 'gang_sex_room_ev1_2':
 							*clr & cla
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/bigroom/sex/1_11.jpg"></center>'
 							minut += 10
-							alko += 2
-							if pcs_hydra >= 100:
-								pcs_hydra -= 5
-							else
-								pcs_hydra -= 10
-							end
-							cumspclnt = 2
-							gs 'cum_cleanup'
-							pcs_breath = 0
+							gs 'drugs', 'alcohol', 'wine'
 							gs 'stat'
 							'The boys look on with anticipation, as you drink deeply from the bottle.'
 							'"Come on <<$pcs_nickname>>, we didn''t expect you to sit there and down the entire bottle", Vasily complains.'
@@ -778,20 +770,7 @@ if $ARGS[0] = 'shulga_beer':
 	if alko < 6:
 		minut += 5
 		*clr & cla
-		frost = 0
-		alko += 1
-		fat += 3
-		pcs_health -= 5
-		pcs_mood += 5
-		pcs_energy -= 4
-		if pcs_hydra >= 100:
-			pcs_hydra += 5
-		else
-			pcs_hydra += 10
-		end
-		cumspclnt = 2
-		gs 'cum_cleanup'
-		pcs_breath = 0
+		gs 'drugs', 'alcohol', 'beer'
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/bigroom/drunk_ev/beer'+rand(1,8)+'.jpg"></center>'
 		func('gopsex','hide','gop_text_beer2')

+ 2 - 15
locations/sister.qsrc

@@ -40,23 +40,10 @@ if $ARGS[0] = 'gdk':
 		'Anya sits with some girls and boys, drinking beer. "Hey <<$pcs_nickname>>!" Anya smiles, "Want some beer?"'
 
 		act 'Drink beer':
+			*clr & cla
 			minut += 60
 			npc_rel['A33'] += 5
-			alko += 3
-			*clr & cla
-			frost = 0
-			fat += 3
-			pcs_health -= 5
-			pcs_mood += 5
-			pcs_energy -= 4
-			if pcs_hydra >= 100:
-				pcs_hydra += 5
-			else
-				pcs_hydra += 10
-			end
-			cumspclnt = 2
-			gs 'cum_cleanup'
-			pcs_breath = 0
+			gs 'drugs', 'alcohol', 'beer', 3
 			gs'stat'
 
 			if AniaFrends >= 1:

+ 13 - 45
locations/sisterQW.qsrc

@@ -710,46 +710,29 @@ if $ARGS[0] = 'sisboyQW_party':
 	'Everyone started to thump in unison, dealing, laughing, telling funny stories.'
 	'You cheerfully ask Anya. "You won''t leave me alone at the party will you?"'
 	'Anya smiles and hands you a bottle of vodka. "Of course not <<$pcs_nickname>>."'
-	act 'Drink':
+	act 'Decline the drink':
 		*clr & cla
 		minut += 15
-		alko += 3
-		cumspclnt = 2
-		gs 'cum_cleanup'
-		pcs_breath = 0
-		if pcs_hydra >= 100:
-			pcs_hydra -= 10
-		else
-			pcs_hydra -= 20
-		end
 		gs'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/sisboyqwparty_9.jpg"></center>'
 		*nl
-		'You took the bottle from her hands'
-		'"Well, let''s party." You say and gulp down a huge amount of vodka.'
-		' Roma looks at Anya and smirks. "Look, <<$pcs_nickname>> is drinking more than you." with these words, everyone began to drink heavily.'
+		'You politely try and refuse the drink.'
+		'But seeing everyone watching gathered around began to chant: "Drink, drink, drink, drink, drink, drink."'
+		'Giving into peer pressure you take the bottle from Anya''s hand, and gulp down a huge amount of vodka.'
 		act 'Go dance': gt 'sisterQW', 'dance'
 		act 'Drink': gt 'sisterQW', 'drink'
 		act 'Sit': gt 'sisterQW', 'sit'
 	end
-	act 'Decline the drink':
+	act 'Accept the drink':
 		*clr & cla
 		minut += 15
-		alko += 3
-		cumspclnt = 2
-		gs 'cum_cleanup'
-		pcs_breath = 0
-		if pcs_hydra >= 100:
-			pcs_hydra -= 10
-		else
-			pcs_hydra -= 20
-		end
+		gs 'drugs', 'alcohol', 'vodka'
 		gs'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/sisboyqwparty_9.jpg"></center>'
 		*nl
-		'You politely try and refuse the drink.'
-		'But seeing everyone watching gathered around began to chant: "Drink, drink, drink, drink, drink, drink."'
-		'Giving into peer pressure you take the bottle from Anya''s hand, and gulp down a huge amount of vodka.'
+		'You took the bottle from her hands'
+		'"Well, let''s party." You say and gulp down a huge amount of vodka.'
+		' Roma looks at Anya and smirks. "Look, <<$pcs_nickname>> is drinking more than you." with these words, everyone began to drink heavily.'
 		act 'Go dance': gt 'sisterQW', 'dance'
 		act 'Drink': gt 'sisterQW', 'drink'
 		act 'Sit': gt 'sisterQW', 'sit'
@@ -757,10 +740,7 @@ if $ARGS[0] = 'sisboyQW_party':
 	act 'To get up to dance':
 		*clr & cla
 		minut += 15
-		alko += 3
-		cumspclnt = 2
-		gs 'cum_cleanup'
-		pcs_breath = 0
+		gs 'drugs', 'alcohol', 'vodka'
 		gs'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/sisboyqwparty_9.jpg"></center>'
 		*nl
@@ -789,11 +769,7 @@ if $ARGS[0] = 'dance':
 	act 'Drink':
 		*clr & cla
 		minut += 10
-		alko += 3
-		cumspclnt = 2
-		gs 'cum_cleanup'
-		pcs_breath = 0
-		pcs_horny += 10
+		gs 'drugs', 'alcohol', 'whiskey'
 		gs'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/sisboyqwparty_13.jpg"></center>'
 		*nl
@@ -937,15 +913,10 @@ end
 if $ARGS[0] = 'reks':
 	*clr & cla
 	minut += 5
-	alko += 2
-	cumspclnt = 2
-	gs 'cum_cleanup'
-	pcs_breath = 0
+	gs 'drugs', 'alcohol', 'champagne'
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/sisboyqwparty_19.jpg"></center>'
 	*nl
-	!!'You''ve clearly been having fun this evening and to his surprise you are still covered in semen.'
-	!! 'Not sure how Sveta is supposed to be covered in semen at this point, as there is no application or check on this that I could see - 3xpurt'
 	'"Hey girly, damn you''ve been having fun. Oh yeah, you''re Anya''s sister, I know, she''s... that''s odd, I haven''t seen her. Although I have been drinking bubbly all day, here, drink up."'
 	'With this he starts pouring the sweet Champagne down your throat, he''s so drunk he pours it much to fast and as much as you try to keep up, alot of it spills on the floor.
 	 Then, without a word, Rex just staggers off.'
@@ -1046,10 +1017,7 @@ end
 if $ARGS[0] = 'drink':
 	*clr & cla
 	minut += 10
-	alko += 2
-	cumspclnt = 2
-	gs 'cum_cleanup'
-	pcs_breath = 0
+	gs 'drugs', 'alcohol', 'vodka'
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/sisboyqwparty_11.jpg"></center>'
 	*nl

+ 1 - 14
locations/sister_party.qsrc

@@ -87,20 +87,7 @@ end
 if $ARGS[0] = 'drink':
 	minut += 5
 	*clr & cla
-	frost = 0
-	alko += 1
-	fat += 3
-	pcs_health -= 5
-	pcs_mood += 5
-	pcs_energy -= 4
-	if pcs_hydra >= 100:
-		pcs_hydra += 5
-	else
-		pcs_hydra += 10
-	end
-	cumspclnt = 2
-	gs 'cum_cleanup'
-	pcs_breath = 0
+	gs 'drugs', 'alcohol', 'beer'
 	drunk_sveta += 1
 	gs'stat'
 	'<center><b><font color = maroon>Anya</font></b></center>'

+ 1 - 9
locations/soniaDisco.qsrc

@@ -10,16 +10,8 @@ if $ARGS[0] = '':
 
 	act 'Have a drink with them':
 		*clr & cla
-		alko += 2
-		cumspclnt = 2
-		gs 'cum_cleanup'
-		pcs_breath = 0
-		if pcs_hydra >= 100:
-			pcs_hydra -= 5
-		else
-			pcs_hydra -= 10
-		end
 		minut += 15
+		gs 'drugs', 'alcohol', 'vodka'
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/0.jpg"></center>'
 		'You''re not sure whether he invited you along because he wants you to come, or just because he''s afraid you would rat them out. Either way, it could be fun?'

+ 3 - 3
locations/stat_display.qsrc

@@ -634,19 +634,19 @@ end
 if smoker >= 20 and NarkImmune = 0:
 	if smokerNeed > 0:
 		if siga > 0:
-			$stat_msg += '<BR><a href="exec:gs ''shortgs'',''smoker''"><font color="red"><b>You want to smoke. You have <<siga>> cigarettes left.</b></font></a><BR>'
+			$stat_msg += '<BR><a href="exec:gs ''drugs'',''smoke''"><font color="red"><b>You want to smoke. You have <<siga>> cigarettes left.</b></font></a><BR>'
 		else
 			$stat_msg += '<BR><font color="red"><b>You want to smoke, but you have no cigarettes left.</b></font><BR>'
 		end
 	else
 		if siga > 0:
-			$stat_msg += '<BR><a href="exec:gs ''shortgs'',''smoker''"><font color=#0064FF><b>You have <<siga>> cigarettes left.</b></font></a><BR>'
+			$stat_msg += '<BR><a href="exec:gs ''drugs'',''smoke''"><font color=#0064FF><b>You have <<siga>> cigarettes left.</b></font></a><BR>'
 		else
 			$stat_msg += '<BR><font color=#0064FF><b>You feel like you should get some cigarettes.</b></font><BR>'
 		end
 	end
 elseif siga > 0:
-	$stat_msg += '<BR><a href="exec:gs ''shortgs'',''smoker''"><font color=#0064FF><b>You have <<siga>> cigarettes.</b></font></a><BR>'
+	$stat_msg += '<BR><a href="exec:gs ''drugs'',''smoke''"><font color=#0064FF><b>You have <<siga>> cigarettes.</b></font></a><BR>'
 end
 
 if smokeHour = hour and smokeday = daystart and smokeminut >= minut: $stat_msg += '<BR><font color="green">You are smoking a cigarette.</font><BR>'

+ 3 - 10
locations/street_event.qsrc

@@ -191,14 +191,11 @@ if $ARGS[1] = 'extras':
 				'"Oh, I know..." Your hand cups her cheek gently and you guide her head back, her gaze now meeting yours. "I''m <<$pcs_nickname>>," you say before leaning in to kiss her. As soon as your lips meet, any resistance she had before melts away. Her lips part and your tongues intertwine. You can taste the sweet alcohol she had been drinking as she eagerly presses against you with a soft moan. When you finally pull away, Eva is breathless with a dazed yet satisfied look.'
 				'"Holy shit that was <i>amazing</i>!" Marta laughs as Eva collapses back into the car seat. Marta is back at the window with a wide grin, "Look, I even caught it on camera!" She holds up her phone and you see a shaky but still rather clear video of the two of you making out. "Hey, you know what, why don''t you come out with us? I know Eva would love to have you come!" Marta winks again, obviously hinting at the double meaning there.'
 						
-				act 'Refuse and leave':
-					gs 'arousal', 'end'
-					gt $loc, $metka
-				end
+				act 'Refuse and leave': gs 'arousal', 'end' & gt $loc, $metka
 						
 				act 'Join them':
 					*clr & cla
-					alko += 3
+					gs 'drugs', 'alcohol', 'vodka'
 					pcs_horny += 5
 					minut += 15
 					gs 'stat'
@@ -1473,11 +1470,7 @@ if $ARGS[1] = 'main':
 				act 'Join them':
 					*clr & cla
 					minut += 30
-					pcs_mood += 20
-					alko += 1
-					cumspclnt = 2
-					gs 'cum_cleanup'
-					pcs_breath = 0
+					gs 'drugs', 'alcohol', 'beer'
 					gs'stat'
 					'<<$streetev_title>>'
 					'<center><img <<$set_imgh>> src="images/locations/shared/street/teens.jpg"></center>'

+ 1 - 7
locations/tanspalnya.qsrc

@@ -106,13 +106,7 @@ if dur > 0 and narkday ! daystart:
 		menu_off = 1
 		minut += 5
 		narkday = daystart
-		pcs_health = pcs_vital * 10 + pcs_stren * 5
-		pcs_willpwr = pcs_intel * 5 + pcs_sprt * 5
-		pcs_manna = (pcs_intel * pcs_magik) + pcs_magik * 100 + pcs_vital * 10 + rikudo
-		pcs_mood = 100
-		pcs_horny = 100
-		nark += 10
-		dur -= 1
+		gs 'drugs', 'cocaine'
 		'<center><img <<$set_imgh>> src="images/shared/drugs/dur.jpg"></center>'
 		'You take a small dose of coke and not long after, you start to feel great, as if you could do anything, <b>be</b> anything - but you''re also starting to feel incredibly horny.'
 

+ 3 - 4
locations/vecher.qsrc

@@ -15,10 +15,9 @@ if $ARGS[0] = 'start':
 	act 'Dance':
 		cla
 		hour = 23
-		alko += 6
-		cumspclnt = 2
-		gs 'cum_cleanup'
-		pcs_breath = 0
+		gs 'drugs', 'alcohol', 'wine'
+		gs 'drugs', 'alcohol', 'vodka'
+		gs 'drugs', 'alcohol', 'beer'
 		'You have fun, drinking and dancing.'
 		itrand = rand(1, 12)
 		gt 'vecher', 'end<<itrand>>'

+ 1 - 5
locations/vipclub.qsrc

@@ -18,11 +18,7 @@ if $ARGS[0] = 'start':
 			cla
 			menu_off = 1
 			minut += 15
-			alko += 4
-			cumspclnt = 2
-			gs 'cum_cleanup'
-			pcs_breath = 0
-			frost = 0
+			gs 'drugs', 'alcohol', 'rum'
 			pcs_horny += rand(10, 20)
 			*nl
 			'You enjoy a tasty cocktail, for some reason you also feel like it''s gotten hot in here.'

+ 2 - 2
locations/youry.qsrc

@@ -32,7 +32,7 @@ if $ARGS[0] = 'start':
 				act 'Have a drink with Yuri':
 					cls
 					minut += 15
-					alko += 1
+					gs 'drugs', 'alcohol', 'champagne'
 					gs 'stat'				
 					gs 'boyStat', 'A38'
 					harakBoy = 1
@@ -70,7 +70,7 @@ if $ARGS[0] = 'quest':
 		cla
 		*clr
 		minut += 30
-		alko += 1
+		gs 'drugs', 'alcohol', 'champagne'
 		gs 'stat'
 		'You enter a small cozy, one-bedroom apartment. It is surprisingly neat for a bachelor pad.'
 		'Yuri leads you into the hall and has you sit on a chair. He goes into the kitchen and brings back champagne with some cheese and puts it on the table between the two of you. He takes a seat in a nearby chair and turns on some music.'

+ 1 - 5
locations/zsoft_gopskverGorSlut.qsrc

@@ -119,11 +119,7 @@ if $ARGS[0] = '2':
 	*clr & cla
 	if alko < 6:
 		minut += 5
-		alko += 1
-		cumspclnt = 2
-		gs 'cum_cleanup'
-		pcs_breath = 0
-		pcs_health -= 5
+		gs 'drugs', 'alcohol', 'beer'
 	end
 	gs'stat'