[fixed] merge conflict in Snpc.qsrc around removing Aleksandra

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"/>

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

locations/Cheatmenu_din.qsrc

@@ -521,7 +521,7 @@ $cheatmenu['state'] = {
 	'<a href="exec:pcs_horny = 0 & dynamic $cheatmenu[''state''] & gs ''stat''">Min arousal</a>'
 	'<a href="exec:dynamic $cheatmenu[''bodyMod'']">Body Modification</a>'
 	*nl
-	'<a href="exec:pcs_health = pcs_vital*10 + pcs_stren*5+1000 & pcs_willpwr = pcs_intel*5 + will*5+1000 & pcs_manna = (pcs_intel*pcs_magik) + pcs_magik*100 + pcs_vital*10 + rikudo & vgape = 0 & agape = 0 & nippain = 0 & dynamic $cheatmenu[''state''] & gs ''stat''">Full restoration of Health, Manna, Reason.</a>'
+	'<a href="exec:pcs_health = pcs_vital*10 + pcs_stren*5+1000 & pcs_willpwr = pcs_intel*5 + will*5+1000 & pcs_mana = (pcs_intel*pcs_magik) + pcs_magik*100 + pcs_vital*10 + rikudo & vgape = 0 & agape = 0 & nippain = 0 & dynamic $cheatmenu[''state''] & gs ''stat''">Full restoration of Health, Mana, Reason.</a>'
 	'<a href="exec:pcs_sleep = 100 & pcs_stam = stammax & pcs_mood = 100 & dynamic $cheatmenu[''state''] & gs ''stat''">Full restoration of Sleep, Stamina, Mood.</a>'
 	'<a href="exec:pcs_energy = 200 & pcs_hydra = 200 & dynamic $cheatmenu[''state''] & gs ''stat''">Full restoration of Hunger and Water.</a>'
 	'<a href="exec:dynamic $cheatmenu[''money''] & gs ''stat''">Change money</a>'

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

locations/Gadhouse.qsrc

@@ -239,8 +239,11 @@ if $ARGS[0] = 'Main':
 	gs 'subkid'
 
 	if gobelen>0:'You have <<gobelen>> completed tapestries.'
-	if pcs_sewng >= 40 and tkan > 0:'You have enough fabric for <<tkan>> lessons.'
-	if pcs_sewng >= 40 and tkan <= 0:'You do not have any fabric.'
+	if pcs_sewng >= 40 and tkan > 0:
+		'You have enough fabric for <<tkan>> lessons.'
+	elseif pcs_sewng >= 40 and tkan <= 0:
+		'You do not have any fabric.'
+	end
 	if pcs_sewng >= 80:
 		if newgobelen = 0 and tkan > 0:
 			act'Start a new tapestry':
@@ -425,13 +428,18 @@ if $ARGS[0]='grandpa':
 
 		act 'Maybe you should get dressed before talking to him':gt 'Gadhouse', 'Start'
 	else
-
 		if grigory_flower > 0 and grigory_flower < 10: act 'Talk to him about the flowers': gt 'grigory', 'flower3'
 		
-		if go_in_boletus = 1:'You promise to bring grandpa <<grandpa_boletus>> kg of mushrooms.'
-		if go_in_bilberry = 1:'You promise to bring grandpa <<grandpa_bilberry>> kg of berries.'
-		if go_in_boletus_bilberry = 1:'You promise to bring grandpa <<grandpa_boletus>> kg mushrooms and <<grandpa_bilberry>> kg of berries.'
+		if go_in_boletus = 1:
+			'You promise to bring grandpa <<grandpa_boletus>> kg of mushrooms.'
+		elseif go_in_bilberry = 1:
+			'You promise to bring grandpa <<grandpa_bilberry>> kg of berries.'
+		elseif go_in_boletus_bilberry = 1:
+			'You promise to bring grandpa <<grandpa_boletus>> kg mushrooms and <<grandpa_bilberry>> kg of berries.'
+		end
 
+		act 'Leave him alone':gt 'Gadhouse', 'Start'
+		
 		if grandpahelpday ! daystart:act 'Offer to help':grandpahelpday = daystart & gt'grandpahelp'
 		if grandpatalkforest = 0:
 			act 'Ask about the forest (0:10)':
@@ -451,7 +459,7 @@ if $ARGS[0]='grandpa':
 				act 'Finish':gt 'Gadhouse', 'Start'
 			end
 		end
-		!125e
+		
 		if hour >= grandpatalk + 3:
 			act 'Chat with your grandfather (0:10)':
 				*clr & cla
@@ -467,8 +475,6 @@ if $ARGS[0]='grandpa':
 				act 'Continue':gt 'Gadhouse', 'Start'
 			end
 		end
-
-		act 'Leave him alone':gt 'Gadhouse', 'Start'
 	end
 end
 

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'
 

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'

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'

locations/KGOLboss.qsrc

@@ -6,7 +6,7 @@ if $ARGS[0] = '1':
 	KGOLvitalV = 100
 	KGOLintelV = 10
 	KGHPV = KGOLvitalV * 10
-	KGMannaV = KGOLintelV * 10
+	KGManaV = KGOLintelV * 10
 	KGOLPrizeExp = rand(25, 50)
 	KGOLPrizeM = rand(150, 350)
 	KGOLennumBoss = 1

locations/KGOLenemy.qsrc

@@ -6,7 +6,7 @@ if $ARGS[0] = '0':
 	KGOLvitalV = 10
 	KGOLintelV = 10
 	KGHPV = KGOLvitalV * 10
-	KGMannaV = KGOLintelV * 10
+	KGManaV = KGOLintelV * 10
 	KGOLPrizeExp = rand(1, 3)
 	KGOLPrizeM = rand(10, 30)
 	KGOLennum = 0
@@ -22,7 +22,7 @@ if $ARGS[0] = '1':
 	KGOLvitalV = 10
 	KGOLintelV = 10
 	KGHPV = KGOLvitalV * 10
-	KGMannaV = KGOLintelV * 10
+	KGManaV = KGOLintelV * 10
 	KGOLPrizeExp = rand(2, 5)
 	KGOLPrizeM = rand(15, 35)
 	KGOLennum = 1
@@ -38,7 +38,7 @@ if $ARGS[0] = '2':
 	KGOLvitalV = 10
 	KGOLintelV = 10
 	KGHPV = KGOLvitalV * 10
-	KGMannaV = KGOLintelV * 10
+	KGManaV = KGOLintelV * 10
 	KGOLPrizeExp = rand(3, 7)
 	KGOLPrizeM = rand(20, 40)
 	KGOLennum = 2
@@ -54,7 +54,7 @@ if $ARGS[0] = '3':
 	KGOLvitalV = 20
 	KGOLintelV = 10
 	KGHPV = KGOLvitalV * 10
-	KGMannaV = KGOLintelV * 10
+	KGManaV = KGOLintelV * 10
 	KGOLPrizeExp = rand(5, 10)
 	KGOLPrizeM = rand(30, 50)
 	KGOLennum = 3
@@ -70,7 +70,7 @@ if $ARGS[0] = '4':
 	KGOLvitalV = 20
 	KGOLintelV = 10
 	KGHPV = KGOLvitalV * 10
-	KGMannaV = KGOLintelV * 10
+	KGManaV = KGOLintelV * 10
 	KGOLPrizeExp = rand(7, 14)
 	KGOLPrizeM = rand(35, 60)
 	KGOLennum = 4
@@ -86,7 +86,7 @@ if $ARGS[0] = '5':
 	KGOLvitalV = 25
 	KGOLintelV = 10
 	KGHPV = KGOLvitalV * 10
-	KGMannaV = KGOLintelV * 10
+	KGManaV = KGOLintelV * 10
 	KGOLPrizeExp = rand(10, 18)
 	KGOLPrizeM = rand(40, 65)
 	KGOLennum = 5
@@ -102,7 +102,7 @@ if $ARGS[0] = '6':
 	KGOLvitalV = 35
 	KGOLintelV = 10
 	KGHPV = KGOLvitalV * 10
-	KGMannaV = KGOLintelV * 10
+	KGManaV = KGOLintelV * 10
 	KGOLPrizeExp = rand(12, 20)
 	KGOLPrizeM = rand(45, 65)
 	KGOLennum = 6
@@ -118,7 +118,7 @@ if $ARGS[0] = '7':
 	KGOLvitalV = 35
 	KGOLintelV = 10
 	KGHPV = KGOLvitalV * 10
-	KGMannaV = KGOLintelV * 10
+	KGManaV = KGOLintelV * 10
 	KGOLPrizeExp = rand(14, 22)
 	KGOLPrizeM = rand(50, 70)
 	KGOLennum = 7
@@ -134,7 +134,7 @@ if $ARGS[0] = '8':
 	KGOLvitalV = 40
 	KGOLintelV = 10
 	KGHPV = KGOLvitalV * 10
-	KGMannaV = KGOLintelV * 10
+	KGManaV = KGOLintelV * 10
 	KGOLPrizeExp = rand(16, 24)
 	KGOLPrizeM = rand(55, 75)
 	KGOLennum = 8
@@ -150,7 +150,7 @@ if $ARGS[0] = '9':
 	KGOLvitalV = 40
 	KGOLintelV = 10
 	KGHPV = KGOLvitalV * 10
-	KGMannaV = KGOLintelV * 10
+	KGManaV = KGOLintelV * 10
 	KGOLPrizeExp = rand(18, 20)
 	KGOLPrizeM = rand(60, 85)
 	KGOLennum = 9

locations/KGOLfight.qsrc

@@ -42,8 +42,8 @@ if unvis > 0:'You are invisible'
 if poison > 0:poison -= 1 & KGHPV -= KGOLspell4 * 10 & 'The poison causes damage to the enemy <<KGOLspell4 * 10>>'
 if firecircle > 0:firecircle -= 1 & KGHPV -= KGOLspell9 * 50 & 'Circle of fire causes damage to the enemy <<KGOLspell9 * 50>>'
 
-'Life <<KGHP>>, the manna <<KGManna>>'
-'<<$KGname>> Life <<KGHPV>>manna <<KGMannaV>>'
+'Life <<KGHP>>, the mana <<KGMana>>'
+'<<$KGname>> Life <<KGHPV>>mana <<KGManaV>>'
 
 if KGOLhirka > 0:'Hirka can restore automatically <<KGOLhirka>> health units'
 if otkathirki > 0:'Hirka retrace through <<otkathirki>> moves.'
@@ -58,7 +58,7 @@ if KGHP <= 0:
 	KGOLloss += 1
 	poison = 0
 	firecircle = 0
-	pcs_manna -= 100
+	pcs_mana -= 100
 	'You lost the fight'
 
 	act 'Go to Rep.':gt 'KGOLgame'
@@ -72,7 +72,7 @@ if KGHPV <= 0:
 	KGOLWin += 1
 	KGOLmoney += KGOLPrizeM
 	KGOLexp += KGOLPrizeExp
-	pcs_manna += 100
+	pcs_mana += 100
 	'<<$KGname>> fell. You win the fight.'
 	'You got <<KGOLPrizeM>> coins and <<KGOLPrizeExp>> experience'
 
@@ -121,10 +121,10 @@ KGOLini = rand(KGOLspeed / 2, KGOLspeed * 2)
 					act 'Further':gt $curloc
 				end
 
-				if KGOLspell > 0 and KGManna >= KGOLspell * 10:
-					act 'Powerful blow (<<KGOLspell * 10>> manna)':
+				if KGOLspell > 0 and KGMana >= KGOLspell * 10:
+					act 'Powerful blow (<<KGOLspell * 10>> mana)':
 						cla
-						KGManna -= KGOLspell
+						KGMana -= KGOLspell
 						KGOLpower = KGOLstren + KGOLwpower+(KGOLspell * 100)
 						dynamic $KGOLatk
 
@@ -132,10 +132,10 @@ KGOLini = rand(KGOLspeed / 2, KGOLspeed * 2)
 					end
 				end
 
-				if KGOLspell2 > 0 and KGManna >= KGOLspell2 * 10:
-					act 'Multiple shot (<<KGOLspell2 * 10>> manna)':
+				if KGOLspell2 > 0 and KGMana >= KGOLspell2 * 10:
+					act 'Multiple shot (<<KGOLspell2 * 10>> mana)':
 						cla
-						KGManna -= KGOLspell2
+						KGMana -= KGOLspell2
 						KGOLpower = KGOLstren + KGOLwpower
 						KGLOloop = KGOLspell2 + 1
 						dynamic $KGOLatkKGOLspell2
@@ -144,10 +144,10 @@ KGOLini = rand(KGOLspeed / 2, KGOLspeed * 2)
 					end
 				end
 
-				if KGOLspell3 > 0 and KGManna >= KGOLspell3 * 10 and KGOLcooldown <= 0:
-					act 'Increase armor (<<KGOLspell3 * 10>> manna)':
+				if KGOLspell3 > 0 and KGMana >= KGOLspell3 * 10 and KGOLcooldown <= 0:
+					act 'Increase armor (<<KGOLspell3 * 10>> mana)':
 						cla
-						KGManna -= KGOLspell3
+						KGMana -= KGOLspell3
 						KGOLbronaMod += KGOLspell3 * 5
 						KGOLtimer += KGOLspell3 + 1
 						KGOLcooldown += KGOLspell3 + 3
@@ -168,10 +168,10 @@ KGOLini = rand(KGOLspeed / 2, KGOLspeed * 2)
 					act 'Further':gt $curloc
 				end
 
-				if KGOLspell4 > 0 and KGManna >= KGOLspell4 * 10:
-					act 'Sneaky shot (<<KGOLspell4 * 10>> manna)':
+				if KGOLspell4 > 0 and KGMana >= KGOLspell4 * 10:
+					act 'Sneaky shot (<<KGOLspell4 * 10>> mana)':
 						cla
-						KGManna -= KGOLspell4
+						KGMana -= KGOLspell4
 						KGOLpower = KGOLstren + KGOLwpower+(KGOLspell5 * 100)
 						dynamic $KGOLatk
 
@@ -179,10 +179,10 @@ KGOLini = rand(KGOLspeed / 2, KGOLspeed * 2)
 					end
 				end
 
-				if KGOLspell5 > 0 and KGManna >= KGOLspell5 * 10:
-					act 'Poison Blade (<<KGOLspell5 * 10>>manna)':
+				if KGOLspell5 > 0 and KGMana >= KGOLspell5 * 10:
+					act 'Poison Blade (<<KGOLspell5 * 10>>mana)':
 						cla
-						KGManna -= KGOLspell5
+						KGMana -= KGOLspell5
 						KGOLpower = KGOLstren + KGOLwpower
 						dynamic $KGOLatkPoison
 
@@ -190,10 +190,10 @@ KGOLini = rand(KGOLspeed / 2, KGOLspeed * 2)
 					end
 				end
 
-				if KGOLspell6 > 0 and KGManna >= KGOLspell6 * 10 and KGOLcooldown <= 0:
-					act 'Invisibility (<<KGOLspell6 * 10>> manna)':
+				if KGOLspell6 > 0 and KGMana >= KGOLspell6 * 10 and KGOLcooldown <= 0:
+					act 'Invisibility (<<KGOLspell6 * 10>> mana)':
 						cla
-						KGManna -= KGOLspell6
+						KGMana -= KGOLspell6
 						unvis += KGOLspell6 + 1
 						KGOLcooldown += KGOLspell6 + 3
 
@@ -211,10 +211,10 @@ KGOLini = rand(KGOLspeed / 2, KGOLspeed * 2)
 				act 'Further':gt $curloc
 			end
 
-			if KGOLspell7 > 0 and KGManna >= KGOLspell7 * 10:
-				act 'Faerboll (<<KGOLspell7 * 10>> manna)':
+			if KGOLspell7 > 0 and KGMana >= KGOLspell7 * 10:
+				act 'Faerboll (<<KGOLspell7 * 10>> mana)':
 					cla
-					KGManna -= KGOLspell7
+					KGMana -= KGOLspell7
 					KGOLpower = rand(KGOLspell7 * 100, KGOLspell7 * 200)
 					dynamic $KGOLatkFB
 
@@ -222,10 +222,10 @@ KGOLini = rand(KGOLspeed / 2, KGOLspeed * 2)
 				end
 			end
 
-			if KGOLspell8 > 0 and KGManna >= KGOLspell8 * 10:
-				act 'Dropping (<<KGOLspell5 * 10>> manna)':
+			if KGOLspell8 > 0 and KGMana >= KGOLspell8 * 10:
+				act 'Dropping (<<KGOLspell5 * 10>> mana)':
 					cla
-					KGManna -= KGOLspell5
+					KGMana -= KGOLspell5
 					KGOLdist += rand(KGOLspell5 * 10, KGOLspell5 * 50)
 					'You flung the enemy and now the distance between you <<KGOLdist>> meter'
 
@@ -233,10 +233,10 @@ KGOLini = rand(KGOLspeed / 2, KGOLspeed * 2)
 				end
 			end
 
-			if KGOLspell9 > 0 and KGManna >= KGOLspell9 * 10 and KGOLcooldown <= 0:
-				act 'Circle of fire (<<KGOLspell9 * 10>> manna)':
+			if KGOLspell9 > 0 and KGMana >= KGOLspell9 * 10 and KGOLcooldown <= 0:
+				act 'Circle of fire (<<KGOLspell9 * 10>> mana)':
 					cla
-					KGManna -= KGOLspell9
+					KGMana -= KGOLspell9
 					firecircle += KGOLspell9 + 1
 					KGOLcooldown += KGOLspell9 + 3
 					'Everything around you is burning hellfire'
@@ -296,9 +296,9 @@ KGOLini = rand(KGOLspeed / 2, KGOLspeed * 2)
 	end
 
 	if KGOLpotionM > 0:
-		act 'Drink the potion manna':
+		act 'Drink the potion mana':
 			KGOLpotionM -= 1
-			KGManna += 100
+			KGMana += 100
 			gt $curloc
 		end
 	end

locations/KGOLgame.qsrc

@@ -19,7 +19,7 @@ $KGOLstat = {
 	'<center>Equipment</center>'
 
 	if KGOLpotionH > 0:pl 'Health potions <<KGOLpotionH>> pieces. <a href="exec:KGOLpotionH -= 1 & KGHP += 100 & gs ''stat'' & gt $curloc"><font color="red">Drink.</font></a>'
-	if KGOLpotionM > 0:pl 'Mana potions <<KGOLpotionM>> pieces. <a href="exec:KGOLpotionM -= 1 & KGManna += 100 & gs ''stat'' & gt $curloc"><font color="red">Drink.</font></a>'
+	if KGOLpotionM > 0:pl 'Mana potions <<KGOLpotionM>> pieces. <a href="exec:KGOLpotionM -= 1 & KGMana += 100 & gs ''stat'' & gt $curloc"><font color="red">Drink.</font></a>'
 
 	'<center>PVE</center>'
 	'Ratio <<KGOLWin>>, losses <<KGOLLoss>>'
@@ -40,10 +40,10 @@ if KGOLset3 = 0:$KGOLset3 = 'Simple shoes on his feet'
 if KGOLset4 = 0:$KGOLset4 = 'No gloves on hands'
 if KGOLset5 = 0:$KGOLset5 = 'No weapon'
 KGHPMAX = KGOLvital * 10
-KGMannaMax = KGOLintel * 10
+KGManaMax = KGOLintel * 10
 
 if KGHP > KGHPMAX:KGHP = KGHPMAX
-if KGManna > KGMannaMax:KGManna = KGMannaMax
+if KGMana > KGManaMax:KGMana = KGManaMax
 
 KGOLbrona -= KGOLbronaMod
 KGOLbronaMod = 0
@@ -77,10 +77,10 @@ gs 'KGOLexpa'
 '<a href="exec:gt ''KGstart''">Get out of the game</a>'
 '<a href="exec:dynamic $KGOLstat">View Statistics</a>'
 '<<$KGOLname>> <<$KGOLrace>> <<$KGOLklass>> <<KGOLlvl>> level'
-'Life <<KGHP>>, the manna <<KGManna>>'
+'Life <<KGHP>>, the mana <<KGMana>>'
 
 if KGHP < KGHPMAX:'You''ve got <<KGHP*100/KGHPMAX>>% of life'
-if KGManna < KGMannaMax:'You''ve got <<KGManna*100/KGMannaMax>>% of manna'
+if KGMana < KGManaMax:'You''ve got <<KGMana*100/KGManaMax>>% of mana'
 if KGOLhirka > 0:'Hirka can restore automatically <<KGOLhirka>> health units'
 if KGOLPrizeM > 0:'You have <<KGOLmoney>> coins'
 if KGOLneedExp <= 0:'<a href="exec:dynamic $KGOLrise"><font color="red">You need to increase the level.</font></a>'
@@ -204,12 +204,12 @@ act 'Go to the store':
 	act 'Leave':gt $curloc
 end
 
-if KGHP < KGHPMAX or KGManna < KGMannaMax:
+if KGHP < KGHPMAX or KGMana < KGManaMax:
 	act 'Regenerate (1:00)':
 		cls
 		minut += 60
 		KGHP = KGHPMAX
-		KGManna = KGMannaMax
+		KGMana = KGManaMax
 		'It was very sad. You''ve been sitting for an hour to regenerate your character. But free.'
 
 		act 'Leave':gt $curloc

locations/KGstart.qsrc

@@ -1,4 +1,4 @@
-# KGstart
+# KGstart
 $KGOLklassvibor = {
 	cls
 	'You must select a character class.'
@@ -61,7 +61,7 @@ $KGOLklassvibor2 = {
 	end
 
 	KGHP = KGOLvital * 10
-	KGManna = KGOLintel * 10
+	KGMana = KGOLintel * 10
 
 	act 'Play':KGOLpers = 1 & gt 'KGOLgame'
 

locations/MagEncounterFairy.qsrc

@@ -8,8 +8,8 @@ if $ARGS[0] = '':
 			act 'Look for the fairy to chat': gt 'MagEncounterFairy', 'fairy_chat'
 			act 'Just be on your way': gt $loc, $metka
 		else
-			if pcs_manna >= ((pcs_intel * pcs_magik + pcs_magik * 100 + pcs_vital * 10 + rikudo) / 2): act 'Be nice and chat with the fairy': gt 'MagEncounterFairy', 'fairy_chat'
-			if pcs_manna >= ((pcs_intel * pcs_magik + pcs_magik * 100 + pcs_vital * 10 + rikudo) / 4): act 'Just ignore the fairy': gt $loc, $metka
+			if pcs_mana >= ((pcs_intel * pcs_magik + pcs_magik * 100 + pcs_vital * 10 + rikudo) / 2): act 'Be nice and chat with the fairy': gt 'MagEncounterFairy', 'fairy_chat'
+			if pcs_mana >= ((pcs_intel * pcs_magik + pcs_magik * 100 + pcs_vital * 10 + rikudo) / 4): act 'Just ignore the fairy': gt $loc, $metka
 			act 'Shoo the pesky fairy away': gt 'MagEncounterFairy', 'fairy_shoo'
 		end
 	elseif pcs_magik + rand (1,10) >= 8:
@@ -34,7 +34,7 @@ if $ARGS[0] = 'fairy_chat_no1':
 		cla
 		minut += 30
 		fairychat = 1
-		pcs_manna += 25 * pcs_magik
+		pcs_mana += 25 * pcs_magik
 		pcs_mood += 15
 		gs 'stat'
 		'You chat with the fairy. At first it feels strange to talk with a creature, you thought was a myth from children''s books. More so, since the small beautiful woman flutters in front of your face the whole time. But the fairy is so amicable that half hour has passed before you even notice.'
@@ -92,7 +92,7 @@ if $ARGS[0] = 'fairy_chat':
 			fairyshoo -= 1
 		end
 		fairychat += 1
-		pcs_manna += 25 * pcs_magik
+		pcs_mana += 25 * pcs_magik
 		pcs_mood += 15
 		gs 'MagEncounterFairy', 'fairychattopic'
 		if pcs_skin < 80 and fairyday ! daystart and fairyshoo = 0:

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

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

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

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

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
 

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

locations/Prostitute.qsrc

@@ -1,4 +1,4 @@
-# Prostitute
+# Prostitute
 $location_type = 'public_outdoors'
 
 if $ARGS[0] = 'start':
@@ -51,7 +51,7 @@ if $ARGS[0] = 'start':
 				shootV = 10
 				!!parameters
 				healthV = vitalV * 10 + strenV * 5
-				mannaV = intelV * 10 + magikV * 10
+				manaV = intelV * 10 + magikV * 10
 				willpowerV = willV * 10
 				BonusAtakV = 0
 				BonusDefV = 0
@@ -143,7 +143,7 @@ if $ARGS[0] = 'start':
 								shootV = 10
 								!!parameters
 								healthV = vitalV * 10 + strenV * 5
-								mannaV = intelV * 10 + magikV * 10
+								manaV = intelV * 10 + magikV * 10
 								willpowerV = willV * 10
 								BonusAtakV = 0
 								BonusDefV = 0
@@ -198,7 +198,7 @@ if $ARGS[0] = 'start':
 								shootV = 10
 								!!parameters
 								healthV = vitalV * 10 + strenV * 5
-								mannaV = intelV * 10 + magikV * 10
+								manaV = intelV * 10 + magikV * 10
 								willpowerV = willV * 10
 								BonusAtakV = 0
 								BonusDefV = 0

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'

locations/Snpc.qsrc

@@ -7,17 +7,17 @@ $static_num = $school_static_num[numnpc]
 '<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/<<numnpc>>.jpg"></center>'
 '<<$npc_notes[$static_num]>>'
 
-if grupTipe[numnpc] = 5:'<<$npc_firstname[$static_num]>> is an outcast in school, and often gets picked on at school.'
-if grupTipe[numnpc] = 6:''
-if grupTipe[numnpc] = 3:'<<$npc_firstname[$static_num]>> is a nerd, and is often found around the rest of the nerds doing homework or a their game night.'
-if grupTipe[numnpc] = 2:'<<$npc_firstname[$static_num]>> is part of the athletic clique in your school.'
-if grupTipe[numnpc] = 1:'<<$npc_firstname[$static_num]>> is popular, and spends time with the other popular kids usually.'
-if grupTipe[numnpc] = 4:'<<$npc_firstname[$static_num]>> is a Gopnik, and spends a lot of time doing what Gopniks usually do: be loud, and drink beer.'
-if npc_rel[$static_num] < 20:'They really don''t like you.'
-if npc_rel[$static_num] >= 20 and npc_rel[$static_num] < 40:'They are fairly indifferent to you.'
-if npc_rel[$static_num] >= 40 and npc_rel[$static_num] < 60:'The two of you get along together fairly well together, more of casual friends.'
-if npc_rel[$static_num] >= 60 and npc_rel[$static_num] < 80:'You get along great with them, they are one of your friends.'
-if npc_rel[$static_num] >= 80:'They are one of your best friends.'
+if npc_grupTipe['A<<numnpc>>'] = 5:'<<$npc_firstname[$static_num]>> is an outcast in school, and often gets picked on at school.'
+if npc_grupTipe['A<<numnpc>>'] = 6:''
+if npc_grupTipe['A<<numnpc>>'] = 3:'<<$npc_firstname[$static_num]>> is a nerd, and is often found around the rest of the nerds doing homework or a their game night.'
+if npc_grupTipe['A<<numnpc>>'] = 2:'<<$npc_firstname[$static_num]>> is part of the athletic clique in your school.'
+if npc_grupTipe['A<<numnpc>>'] = 1:'<<$npc_firstname[$static_num]>> is popular, and spends time with the other popular kids usually.'
+if npc_grupTipe['A<<numnpc>>'] = 4:'<<$npc_firstname[$static_num]>> is a Gopnik, and spends a lot of time doing what Gopniks usually do: be loud, and drink beer.'
+if npc_rel['A<<numnpc>>'] < 20:'They really don''t like you.'
+if npc_rel['A<<numnpc>>'] >= 20 and npc_rel['A<<numnpc>>'] < 40:'They are fairly indifferent to you.'
+if npc_rel['A<<numnpc>>'] >= 40 and npc_rel['A<<numnpc>>'] < 60:'The two of you get along together fairly well together, more of casual friends.'
+if npc_rel['A<<numnpc>>'] >= 60 and npc_rel['A<<numnpc>>'] < 80:'You get along great with them, they are one of your friends.'
+if npc_rel['A<<numnpc>>'] >= 80:'They are one of your best friends.'
 
 if numnpc = 14 and KatjaOTN > 0:
 	if KatjaHorny < 20:'Katja looks calm and stoic.'
@@ -41,41 +41,41 @@ if numnpc = 9:gs 'kotovtalker'
 !!!Niko Volkov!!!!
 !!!!!!!!!!!!!!!!!!
 
-	if numnpc = 61 and $loc ! 'gdkin' and NikoBreakup = 1:
+	if numnpc = 189 and $loc ! 'gdkin' and NikoBreakup = 1:
 		gt 'NikoEv', 'Lunch Breakup'
-	elseif numnpc = 61 and $loc = 'gdkin' and NikoBreakup = 1:
+	elseif numnpc = 189 and $loc = 'gdkin' and NikoBreakup = 1:
 		gt 'NikoEv', 'Disco Breakup'
-	elseif numnpc = 61 and $loc = 'gdkin' and NikoBreakupDay = daystart:
+	elseif numnpc = 189 and $loc = 'gdkin' and NikoBreakupDay = daystart:
 		gt 'NikoEv', 'Disco Breakup 2'
-	elseif numnpc = 61 and $loc ! 'gdkin' and NikoIntro = 0:
+	elseif numnpc = 189 and $loc ! 'gdkin' and NikoIntro = 0:
 		gt 'NikoEv', 'Lunch Intro'
-	elseif numnpc = 61 and $loc ! 'gdkin' and NikoIntro = 1:
+	elseif numnpc = 189 and $loc ! 'gdkin' and NikoIntro = 1:
 		gt 'NikoEv', 'Lunch Chat'
-	elseif numnpc = 61 and $loc = 'gdkin' and NikoIntro = 0:
+	elseif numnpc = 189 and $loc = 'gdkin' and NikoIntro = 0:
 		gt 'NikoEv', 'Disco Intro'
-	elseif numnpc = 61 and $loc = 'gdkin' and NikoIntro = 1:
+	elseif numnpc = 189 and $loc = 'gdkin' and NikoIntro = 1:
 		gt 'NikoEv', 'Disco Chat'
 	end
 
 !!!!!!!!!!!!!
 !!!gopniks!!!
 !!!!!!!!!!!!!
-if grupTipe[numnpc] = 4:
+if npc_grupTipe['A<<numnpc>>'] = 4:
 	if $loc = 'gdkin':
 		if pav_slut < 125:
 			if numnpc ! 9:
-				if npcPol[numnpc] = 0:
+				if npc_gender['A<<numnpc>>'] = 0:
 					'<<$npc_firstname[$static_num]>> offers you a beer and says: "Hey <<$pcs_nickname>>! Let''s drink some beer and have some fun!"'
 				else
 					'<<$npc_firstname[$static_num]>> offers you a beer and says: "Hey <<$pcs_nickname>>! Let''s drink some beer and have some fun!"'
 				end
 
-				act 'Decline':npc_rel[$static_num] -= 5 & gt $loc, $metka
+				act 'Decline':npc_rel['A<<numnpc>>'] -= 5 & gt $loc, $metka
 				
 				act 'Drink the beer':
 					*clr & cla
 					minut += 5
-					npc_rel[$static_num] += 5
+					npc_rel['A<<numnpc>>'] += 5
 					alko += rand(1,2)
 					if pcs_hydra >= 100:
 						pcs_hydra += 5
@@ -92,26 +92,26 @@ if grupTipe[numnpc] = 4:
 				end
 			end
 		elseif pav_slut >= 125:
-			if npcPol[numnpc] = 0:
+			if npc_gender['A<<numnpc>>'] = 0:
 				'<<$npc_firstname[$static_num]>> looks at you wearily: "What do you want? Looking for a dick to suck on or something?"'
 			else
 				'<<$npc_firstname[$static_num]>> wrinkles her nose as she looks at you: "Hey cocksucker, get away from me! I don''t want to be seen talking to you."'
 			end
 
-			act 'Move away':npc_rel[$static_num] -= 5 & gt $loc, $metka
+			act 'Move away':npc_rel['A<<numnpc>>'] -= 5 & gt $loc, $metka
 		end
 
 		exit
 	end
 end
 
-if numnpc = 45:
+if numnpc = 144:
 !!I would like to change this so even if all the requirements are meet it only fires one in 5 times. 
-	if $loc ! 'gdkin' and npc_rel[$static_num] > 50 and (Anush_sex > 0 or hotcat >= 7) and rand(0,4) = 0:
+	if $loc ! 'gdkin' and npc_rel['A<<numnpc>>'] > 50 and (Anush_sex > 0 or hotcat >= 7) and rand(0,4) = 0:
 		act 'You''re looking flushed':
 			*clr & cla
 			if Anush_lunch = 0:
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/45.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/pc/npc_headshots/144.jpg"></center>'
 				'"Hey Anush you feeling ok? You kinda look flush, is something wrong? Would you like to talk about it?"'
 				'She leans in close and tries to kiss you, while one hand reaches down and squeezes your butt. You turn your head and pull away. "What are you doing? I was only seeing if you was ok."'
 				'She crowds you a bit and leans in close. "You talk to much, I can think of better things you can do with that tongue of yours."'
@@ -238,11 +238,11 @@ act 'Chat':
 
 	gs 'stat'
 	'<center><b><font color="maroon"><<$npc_firstname[$static_num]>> <<$npc_lastname[$static_num]>></font></b></center>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/<<numnpc>>.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/<<numnpc>>.jpg"></center>'
 
-	if numnpc = 1 and npc_rel[$static_num] = 0:
+	if numnpc = 1 and npc_rel['A<<numnpc>>'] = 0:
 		cla
-		'Dimka does no efforts to hide his disdain for you: "Get away from me, you pimply pig."'
+		'Dimka doesn''t try to hide his disdain for you: "Get away from me, you pimply pig."'
 
 		if $loc ! 'gdkin':
 			act 'Leave': gt 'gschool_lessons', 'short_break'
@@ -289,14 +289,14 @@ if numnpc = 2:
 
 			if $loc = 'gdkin':minut += 5
 
-			npc_rel[$static_num] += 5
+			npc_rel['A<<numnpc>>'] += 5
 			sub += 1
 
 			if pav_slut < 125: artemLernQW = 1
 
 			gs 'stat'
 			'<center><b><font color="maroon"><<$npc_firstname[$static_num]>> <<$npc_lastname[$static_num]>></font></b></center>'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/<<numnpc>>.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/<<numnpc>>.jpg"></center>'
 
 			if pav_slut < 125:'You approach Artem and explain how you''re struggling in school and could really use his help studying. Artem is a bit surprised: "What... you want my help? Well, okay I guess. Come meet me at my place if you want to do homework together."'
 			if pav_slut >= 125:'You approach Artem and explain how you''re struggling in school and could really use his help studying. Artem is outraged: "Bah... the school whore needs my help? I don''t think so."'
@@ -336,18 +336,18 @@ end
 !!!JULIA milova!!!
 !!!!!!!!!!!!!!!!!!
 if numnpc = 12:
-	if (pcs_dom > 0 or grupTipe = 3) and JuliaMilLernQW = 0 and npc_rel[$static_num] >= 80:
+	if (pcs_dom > 0 or grupTipe = 3) and JuliaMilLernQW = 0 and npc_rel['A<<numnpc>>'] >= 80:
 		act '"Could you help me out a bit in school?"':
 			*clr & cla
 
 			if $loc = 'gdkin':minut += 5
 
-			npc_rel[$static_num] += 5
+			npc_rel['A<<numnpc>>'] += 5
 			sub += 1
 			JuliaMilLernQW = 1
 			gs 'stat'
 			'<center><b><font color="maroon"><<$npc_firstname[$static_num]>> <<$npc_lastname[$static_num]>></font></b></center>'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/<<numnpc>>.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/<<numnpc>>.jpg"></center>'
 
 			if pav_slut < 125:'You approach Julia and explain how you''re struggling in school and could really use his help studying. She thinks it over for a second, but happily agrees: "Sure <<$pcs_nickname>>, that could be fun!"'
 			if pav_slut >= 125:'You approach Julia and explain how you''re struggling in school and could really use his help studying. She makes some comments about your lousy reputation in school, but at the same time doesn''t seem to care too much about it and agrees to help you anyway. As long as you don''t tell anyone.'
@@ -372,11 +372,11 @@ if numnpc = 14:
 
 			if $loc = 'gdkin':minut += 5
 
-			npc_rel[$static_num] += 5
+			npc_rel['A<<numnpc>>'] += 5
 			meynoldQW = 2
 			gs 'stat'
 			'<center><b><font color="maroon"><<$npc_firstname[$static_num]>> <<$npc_lastname[$static_num]>></font></b></center>'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/<<numnpc>>.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/<<numnpc>>.jpg"></center>'
 			'You approach Katja and thank her for taking you home from the disco when you were drunk, the other night. Katja gives you a knowing smile and says: "Don''t mention it, <<$pcs_nickname>>! You really shouldn''t get that drunk at the disco though, that could end badly. Some of the guys there are real pigs..."'
 
 			if $loc ! 'gdkin':
@@ -390,14 +390,13 @@ if numnpc = 14:
 	if rand(1,2) = 1 and katschoolsex = 1 and pcs_horny > 40:
 		*clr
 		if $loc = 'gdkin':
-			minut += 1
-			gs'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/tanga_kiss1.jpg"></center>'
 		else
-			minut += 1
-			gs'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/tanga_kiss.jpg"></center>'
 		end
+		
+		minut += 1
+		gs'stat'
 
 		'Katja slowly leans in towards you, almost closing her eyes and slowly opening her mouth. Unable to resist, you lean in and meet her with a kiss.'
 		gs 'katjaEv', 'kiss_events'
@@ -412,7 +411,7 @@ if numnpc = 14:
 
 			gs 'stat'
 			'<center><b><font color="maroon"><<$npc_firstname[$static_num]>> <<$npc_lastname[$static_num]>></font></b></center>'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/<<numnpc>>.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/<<numnpc>>.jpg"></center>'
 			'Katja happily grins as she quickly straightens your hair: "What do you want? A light touch-up, some normal make-up or shall I just shovel it on?"'
 
 			act 'Light touch-up':
@@ -456,19 +455,17 @@ if numnpc = 14:
 		end
 	end
 
-	if (npc_rel[$static_num] > 60) and (KatjaOTN > 0) and (KatjaLust > 15) :
+	if (npc_rel['A<<numnpc>>'] > 60) and (KatjaOTN > 0) and (KatjaLust > 15) :
 		!!new Katja stuff not sure where you want to put it. It should be an option when you talk to her at school or the dance where it says Chat, but add this as an option.
 		act 'Kiss Katja':
 			*clr & cla
 			if $loc = 'gdkin':
-				minut += 1
-				gs'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/tanga_kiss1.jpg"></center>'
 			elseif $loc ! 'gdkin':
-				minut += 1
-				gs'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/tanga_kiss.jpg"></center>'
 			end
+			minut += 1
+			gs'stat'
 			'You lean in to kiss Katja'
 			if Katjahorny < 30:
 				'She pulls away from you as you try and kiss her, she looks around to see if anyone seen. "Not here and not now."'
@@ -481,7 +478,7 @@ if numnpc = 14:
 				*clr & cla
 				gs 'stat'
 				'<center><b><font color="maroon"><<$npc_firstname[$static_num]>> <<$npc_lastname[$static_num]>></font></b></center>'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/<<numnpc>>.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/pc/npc_headshots/<<numnpc>>.jpg"></center>'
 				'You slowly lean in towards Katja to kiss her. Unable to resist, Katja almost closing her eyes, slowly opening her mouth, leans in and meets your kiss.'
 				gs 'katjaEv', 'kiss_events'
 			end
@@ -496,7 +493,7 @@ if numnpc = 14:
 			gs 'stat'
 
 			'<center><b><font color = maroon><<$npc_firstname[$static_num]>> <<$npc_lastname[$static_num]>></font></b></center>'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/<<numnpc>>.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/<<numnpc>>.jpg"></center>'
 			'You make sure no one else is paying attention, and tell Katja about what Artem and Peter are doing to you on Mondays. At first she doesn''t believe you. After a while, all of the nasty details you''re sharing convince her that there is no way you''re making this up. Katja is shocked!'
 			'You tell her that the only way you have thought of to get rid of their blackmailing, is to get blackmailing material of your own. Katja nods and says: "That makes sense, actually... if you could somehow make it look violent, I bet it would work even better! I don''t know where you would be able to find a tiny camera though... maybe Albina can help you?"'
 
@@ -528,18 +525,18 @@ end
 !!!!!!!!!!!!!!!!!!!!!!!!!
 
 if numnpc = 16:
-	if pcs_dom > 0 and NatBelLernQW = 0 and npc_rel[$static_num] >= 80:
+	if pcs_dom > 0 and NatBelLernQW = 0 and npc_rel['A<<numnpc>>'] >= 80:
 		act '"Could you help me out a bit in school?"':
 			*clr & cla
 
 			if $loc = 'gdkin':minut += 5
 
-			npc_rel[$static_num] += 5
+			npc_rel['A<<numnpc>>'] += 5
 			sub += 1
 			NatBelLernQW = 1
 			gs 'stat'
 			'<center><b><font color="maroon"><<$npc_firstname[$static_num]>> <<$npc_lastname[$static_num]>></font></b></center>'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/<<numnpc>>.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/<<numnpc>>.jpg"></center>'
 
 			if pav_slut < 125:'You approach Natasha and explain how you''re struggling in school and could really use her help studying. She thinks it over for a second, but happily agrees: "Sure <<$pcs_nickname>>, that could be fun!"'
 			if pav_slut >= 125:'You approach Natasha and explain how you''re struggling in school and could really use her help studying. She makes some comments about your lousy reputation in school, but at the same time doesn''t seem to care too much about it and agrees to help you anyway. As long as you don''t tell anyone.'
@@ -596,7 +593,7 @@ if numnpc = 31:
 		*clr & cla
 		minut += 5
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/31.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/<<numnpc>>.jpg"></center>'
 		'"So Lizaveta hear any good gossip of late?"'
 		'As you ask that her face lights up and she leans in close like she has the best secret in the world to share with you. "Oh my god yes! I was... well it doesn''t matter what I was doing but I overheard some others talking and they said..."'
 		if rand(0,2) = 0:

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

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

locations/annafrends.qsrc

@@ -7,15 +7,15 @@ if $ARGS[0] = 'scene1':
 	gs 'stat'
 	gs 'reks'
 
-	'Your sister Anja and her friends Lena, Ira, Rex, and Roman are sitting outside the community center drinking beer.'
+	'Your sister Anya and her friends Lena, Ira, Rex, and Roman are sitting outside the community center drinking beer.'
 	temprand = rand(0, 4)
 
 	if temprand = 0:
-		!!Anja
-		'Impatiently, Anja picks up a bottle of beer and shouts, "Come on guys! Will you pour me some beer today or not?"'
+		!!Anya
+		'Impatiently, Anya picks up a bottle of beer and shouts, "Come on guys! Will you pour me some beer today or not?"'
 
 		if rand(0, 1) = 0:
-			'Rex takes the bottle out of Anja''s hands.'
+			'Rex takes the bottle out of Anya''s hands.'
 			temprand = rand(0, 4)
 
 			if temprand = 0:
@@ -23,20 +23,20 @@ if $ARGS[0] = 'scene1':
 				temprand = rand(0, 2)
 
 				if temprand = 0:
-					'Between fits of giggles, Anja says "I haven''t even started to yell. If I do, you''ll know!"'
+					'Between fits of giggles, Anya says "I haven''t even started to yell. If I do, you''ll know!"'
 				elseif temprand = 1:
 					'With a resounding slap on Rex'' shoulder, Lena says "Hurry up, you piece of dog shit!"'
 				else
 					'With a smile, Ira says "Don''t get angry, Rex."'
 
-					if rand(0, 10) = 0:'Anja quickly interjects, "We might need to chain him to a post until he calms down."'
+					if rand(0, 10) = 0:'Anya quickly interjects, "We might need to chain him to a post until he calms down."'
 				end
 			elseif temprand = 1:
 				'"Well, you always like to be late for the fun. Relax your ass, I''m sorting it all out."'
 				temprand = rand(0, 2)
 
 				if temprand = 0:
-					'Between fits of giggles, Anja says "I haven''t even started to yell. If I do, you''ll know!"'
+					'Between fits of giggles, Anya says "I haven''t even started to yell. If I do, you''ll know!"'
 				elseif temprand = 1:
 					'With a resounding slap on Rex'' shoulder, Lena says "Hurry, you piece of dog shit!"'
 				else
@@ -44,25 +44,25 @@ if $ARGS[0] = 'scene1':
 					temprand = rand(0, 2)
 
 					if temprand = 0:
-						'Anja quips, "You''ll forever remain a virgin, Roma."'
+						'Anya quips, "You''ll forever remain a virgin, Roma."'
 						if rand(0, 10) = 0:
 							'Roma grins "Is that an offer?"'
 							temprand = rand(0, 2)
 
 							if temprand = 0:
-								'Anja laughs "Dream on, punk."'
+								'Anya laughs "Dream on, punk."'
 							elseif temprand = 1:
-								'Anja laughs "Only in your dreams, punk."'
+								'Anya laughs "Only in your dreams, punk."'
 							else
-								'Anja laughs "Yeah, right. Can you hear that? It''s a whore coming to help you."'
+								'Anya laughs "Yeah, right. Can you hear that? It''s a whore coming to help you."'
 							end
 						end
 					elseif temprand = 1:
-						'Anja quips "And you''re just sad because you can''t get any girls Roma."'
+						'Anya quips "And you''re just sad because you can''t get any girls Roma."'
 
 						if rand(0, 10) = 0:'Rex grins "Yeah, our eternal virgin Roma is truly able to enliven the conversation with the topic of anal gases."'
 					else
-						'Anja quips "The smell comes from you."'
+						'Anya quips "The smell comes from you."'
 
 						if rand(0, 10) = 0:'Roma grins "Yes, no, it sobachatiny bears."'
 					end
@@ -72,7 +72,7 @@ if $ARGS[0] = 'scene1':
 				temprand = rand(0, 2)
 
 				if temprand = 0:
-					'Anja giggles "Yeah, what else do you need them for?"'
+					'Anya giggles "Yeah, what else do you need them for?"'
 
 					if rand(0, 10) = 0:'With mock indignation, Rex answers "Really just one other thing."'
 				elseif temprand = 1:
@@ -82,27 +82,27 @@ if $ARGS[0] = 'scene1':
 				else
 					'Ira smiles, saying "Don''t get so upset, Rex."'
 
-					if rand(0, 10) = 0:'Anja quickly interjects, "We might need to chain him up to a tree to keep him calm."'
+					if rand(0, 10) = 0:'Anya quickly interjects, "We might need to chain him up to a tree to keep him calm."'
 				end
 			elseif temprand = 3:
 				'"Allow me, madame."'
 				temprand = rand(0, 2)
 
 				if temprand = 0:
-					'Anja giggles "Of course, monsieur."'
+					'Anya giggles "Of course, monsieur."'
 				elseif temprand = 1:
-					'With mock indignation, Anja says "Don''t you Madame me!"'
+					'With mock indignation, Anya says "Don''t you Madame me!"'
 
 					if rand(0, 10) = 0:'Rex bowes gallantly and answers "I''m truly sorry, mademoiselle."'
 				else
-					'Impatiently, Anja says "Pour it already, you clown."'
+					'Impatiently, Anya says "Pour it already, you clown."'
 				end
 			else
 				'"Shit! Where''re the cups? Did we not buy any?"'
 				temprand = rand(0, 2)
 
 				if temprand = 0:
-					'Anja picks up the cups, "Here they are, you blind monster."'
+					'Anya picks up the cups, "Here they are, you blind monster."'
 				elseif temprand = 1:
 					'Roma says "Rex, you''re the one who bought them, is your memory really that bad?"'
 				else
@@ -110,7 +110,7 @@ if $ARGS[0] = 'scene1':
 				end
 			end
 		else
-			'Roma takes the bottle from Anja and opens it. "Somebody hold the cups."'
+			'Roma takes the bottle from Anya and opens it. "Somebody hold the cups."'
 			temprand = rand(0, 2)
 
 			if temprand = 0:
@@ -130,7 +130,7 @@ if $ARGS[0] = 'scene1':
 				elseif temprand = 1:
 					'Outraged, Rex says "How the fuck could you spill that?"'
 				else
-					'Indignantly, Anja says "Always the same; never let somebody else pour if you can do it yourself instead."'
+					'Indignantly, Anya says "Always the same; never let somebody else pour if you can do it yourself instead."'
 				end
 			end
 		end
@@ -150,7 +150,7 @@ if $ARGS[0] = 'scene1':
 				temprand = rand(0, 2)
 
 				if temprand = 0:
-					'Anja picks up the cups, "Here they are, you blind monster."'
+					'Anya picks up the cups, "Here they are, you blind monster."'
 				elseif temprand = 1:
 					'Roma says "Rex, you''re the one who bought them, is your memory really that bad?"'
 				else
@@ -181,7 +181,7 @@ if $ARGS[0] = 'scene1':
 				elseif temprand3 = 1:
 					'Outraged, Rex says "How the fuck could you spill that?"'
 				elseif temprand3 = 2:
-					'Indignantly, Anja says "Always the same; never let somebody else pour if you can do it yourself instead."'
+					'Indignantly, Anya says "Always the same; never let somebody else pour if you can do it yourself instead."'
 				end
 			end
 		end
@@ -207,7 +207,7 @@ if $ARGS[0] = 'scene1':
 			elseif temprand = 1:
 				'Outraged, Rex says "How the fuck could you spill that?"'
 			else
-				'Indignantly, Anja says "Always the same; never let somebody else pour if you can do it yourself instead."'
+				'Indignantly, Anya says "Always the same; never let somebody else pour if you can do it yourself instead."'
 			end
 		end
 	end
@@ -337,7 +337,7 @@ if $ARGS[0] = 'scene1':
 
 !sisboyparty
 !-1 - don''t go to the party
-!0 - don''t know about Vecherinka
+!0 - don''t know about the parties
 !1 - knows about the parties
 !2 - agreed to go to the party
 
@@ -425,7 +425,7 @@ if $ARGS[0] = 'scene2':
 		gennpc = rand(0, 2)
 
 		if gennpc = 0:
-			'Anja walks up to you and asks "<<$pcs_nickname>>, let''s go to the toilet."'
+			'Anya walks up to you and asks "<<$pcs_nickname>>, let''s go to the toilet."'
 		elseif gennpc = 1:
 			'Lena walks up to you and asks "<<$pcs_nickname>>, do you want to go to the toilet?"'
 		elseif gennpc = 2:
@@ -446,7 +446,7 @@ if $ARGS[0] = 'scene3':
 	minut += 5
 	gs 'stat'
 
-	if gennpc = 0:$annafrendname = 'Anja' & $annafrendname2 = 'Anja'
+	if gennpc = 0:$annafrendname = 'Anya' & $annafrendname2 = 'Anya'
 	if gennpc = 1:$annafrendname = 'Lena' & $annafrendname2 = 'Lena'
 	if gennpc = 2:$annafrendname = 'Ira' & $annafrendname2 = 'Ira'
 

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

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

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

locations/atakA.qsrc

@@ -68,13 +68,13 @@ if $ARGS[0] = 'damage':
 		healthV = healthV - damage
 
 		if damTipM > 0:
-			mannaV = mannaV - damageM
-			pcs_manna = pcs_manna + damageM
+			manaV = manaV - damageM
+			pcs_mana = pcs_mana + damageM
 
-			'<b><font color = green>You swallowed <<damageM>> manna enemy units.</font></b>'
+			'<b><font color = green>You swallowed <<damageM>> mana enemy units.</font></b>'
 		end
 
-		!pcs_manna = pcs_manna - damageM
+		!pcs_mana = pcs_mana - damageM
 
 		if eleSh > 0:
 			stunV = RAND(eleSh,eleSh*3)
@@ -83,7 +83,7 @@ if $ARGS[0] = 'damage':
 		end
 
 		'<b><font color = green>You have caused damage <<damage>> units</font></b>'
-		!'<b><font color = red>Your manna harmed <<damageM>> units</font></b>'
+		!'<b><font color = red>Your mana harmed <<damageM>> units</font></b>'
 
 		if zerkaloV > 0:
 			zerkaloV = zerkaloV - 1
@@ -128,15 +128,15 @@ if $ARGS[0] = 'damage':
 
 			xgt'fight','sta'
 		elseif barierV < damage:
-			!pcs_manna = pcs_manna - damageM
+			!pcs_mana = pcs_mana - damageM
 			!pcs_health = pcs_health - damage
 			damage = damage - barierV
 			healthV = healthV - damage
 
 			if damTipM > 0:
-				mannaV = mannaV - damageM
-				pcs_manna = pcs_manna + damageM
-				'<b><font color = green>You swallowed <<damageM>> manna enemy units.</font></b>'
+				manaV = manaV - damageM
+				pcs_mana = pcs_mana + damageM
+				'<b><font color = green>You swallowed <<damageM>> mana enemy units.</font></b>'
 			end
 
 			if eleSh > 0:
@@ -145,7 +145,7 @@ if $ARGS[0] = 'damage':
 			end
 
 			'<b><font color = green>You have caused damage <<damage>> units</font></b>'
-			!'<b><font color = red>Your manna harmed <<damageM>> units</font></b>'
+			!'<b><font color = red>Your mana harmed <<damageM>> units</font></b>'
 
 			if zerkaloV > 0:
 				zerkaloV = zerkaloV - 1
@@ -213,10 +213,10 @@ if $ARGS[0] = 'damageW':
 		if dospehV > 0:damageV = damageV - dospehDefV & dospehEn = dospehEn - 1
 		if damage < 0:damage = 0
 		healthV = healthV - damage
-		mannaV = mannaV - damageM
+		manaV = manaV - damageM
 
 		'<b><font color = green>You harmed <<damage>> units</font></b>'
-		'<b><font color = green>You have caused damage to the enemy manna <<damageM>> units</font></b>'
+		'<b><font color = green>You have caused damage to the enemy mana <<damageM>> units</font></b>'
 
 		if zerkaloV > 0:
 			zerkaloV = zerkaloV - 1
@@ -261,12 +261,12 @@ if $ARGS[0] = 'damageW':
 
 			xgt'fight','sta'
 		elseif barierV < damage:
-			mannaV = mannaV - damageM
+			manaV = manaV - damageM
 			healthV = healthV - damage
 			!healthV = healthV - damage
 
 			'<b><font color = green>You have caused damage <<damage>> units</font></b>'
-			'<b><font color = green>You have caused damage to the enemy manna <<damageM>> units</font></b>'
+			'<b><font color = green>You have caused damage to the enemy mana <<damageM>> units</font></b>'
 
 			if zerkaloV > 0:
 				zerkaloV = zerkaloV - 1

locations/atakA1.qsrc

@@ -76,10 +76,10 @@ if $ARGS[0] = 'damage':
 		end
 
 		if damTipMV > 0:
-			pcs_manna = pcs_manna - damageM
-			pcs_manna = pcs_manna + damageM
+			pcs_mana = pcs_mana - damageM
+			pcs_mana = pcs_mana + damageM
 
-			'<b><font color = red><<$boydesc>> swallowed <<damageM>> Units manna you.</font></b>'
+			'<b><font color = red><<$boydesc>> swallowed <<damageM>> Units mana you.</font></b>'
 		end
 
 		if poisonAV = 1:
@@ -88,7 +88,7 @@ if $ARGS[0] = 'damage':
 			'<b><font color = red><<$boydesc>> hit the needle poisoned you.</font></b>'
 		end
 
-		!pcs_manna = pcs_manna - damageM
+		!pcs_mana = pcs_mana - damageM
 
 		if eleShV > 0:
 			stun = RAND(eleShV,eleShV*3)
@@ -97,7 +97,7 @@ if $ARGS[0] = 'damage':
 		end
 
 		'<b><font color = red><<$boydesc>> Damage caused to you <<damage>> units</font></b>'
-		!'<b><font color = red>Your manna harmed <<damageM>> units</font></b>'
+		!'<b><font color = red>Your mana harmed <<damageM>> units</font></b>'
 
 		if zerkalo > 0:
 			zerkalo = zerkalo - 1
@@ -142,15 +142,15 @@ if $ARGS[0] = 'damage':
 
 			xgt'fight','sta'
 		elseif barier < damage:
-			!pcs_manna = pcs_manna - damageM
+			!pcs_mana = pcs_mana - damageM
 			!pcs_health = pcs_health - damage
 			pcs_health = pcs_health - damage
 
 			if damTipM > 0:
-				pcs_manna = pcs_manna - damageM
-				mannaV = mannaV + damageM
+				pcs_mana = pcs_mana - damageM
+				manaV = manaV + damageM
 
-				'<b><font color = green>You swallowed <<damageM>> manna enemy units.</font></b>'
+				'<b><font color = green>You swallowed <<damageM>> mana enemy units.</font></b>'
 			end
 
 			if eleShV > 0:
@@ -166,7 +166,7 @@ if $ARGS[0] = 'damage':
 			end
 
 			'<b><font color = red>You have caused damage <<damage>> units</font></b>'
-			!'<b><font color = red>Your manna harmed <<damageM>> units</font></b>'
+			!'<b><font color = red>Your mana harmed <<damageM>> units</font></b>'
 
 			if zerkalo > 0:
 				zerkalo = zerkalo - 1
@@ -235,10 +235,10 @@ if $ARGS[0] = 'damageW':
 		if dospeh > 0:damage = damage - dospehDef & dospehEn = dospehEn - 1
 		if damage < 0:damage = 0
 		pcs_health = pcs_health - damage
-		pcs_manna = pcs_manna - damageM
+		pcs_mana = pcs_mana - damageM
 
 		'<b><font color = green>You harmed <<damage>> units</font></b>'
-		'<b><font color = green>You have caused damage to the enemy manna <<damageM>> units</font></b>'
+		'<b><font color = green>You have caused damage to the enemy mana <<damageM>> units</font></b>'
 
 		if zerkalo > 0:
 			zerkalo = zerkalo - 1
@@ -282,12 +282,12 @@ if $ARGS[0] = 'damageW':
 
 			xgt'fight','sta'
 		elseif barier < damage:
-			pcs_manna = pcs_manna - damageM
+			pcs_mana = pcs_mana - damageM
 			pcs_health = pcs_health - damage
 			!healthV = healthV - damage
 
 			'<b><font color = green>You have caused damage <<damage>> units</font></b>'
-			'<b><font color = green>You have caused damage to the enemy manna <<damageM>> units</font></b>'
+			'<b><font color = green>You have caused damage to the enemy mana <<damageM>> units</font></b>'
 
 			if zerkalo > 0:
 				zerkalo = zerkalo - 1

locations/atakB.qsrc

@@ -54,7 +54,7 @@ if $ARGS[0] = 'damage':
 		if dospehV > 0:damageV = damageV - dospehDefV & dospehEn = dospehEn - 1
 		if damage < 0:damage = 0
 		healthV = healthV - damage
-		!pcs_manna = pcs_manna - damageM
+		!pcs_mana = pcs_mana - damageM
 
 		if eleSh > 0:
 			stunV = RAND(eleSh,eleSh*3)
@@ -63,7 +63,7 @@ if $ARGS[0] = 'damage':
 		end
 
 		'<b><font color = green>You have caused damage <<damage>> units</font></b>'
-		!'<b><font color = red>Your manna harmed <<damageM>> units</font></b>'
+		!'<b><font color = red>Your mana harmed <<damageM>> units</font></b>'
 
 		if zerkaloV > 0:
 			zerkaloV = zerkaloV - 1
@@ -108,7 +108,7 @@ if $ARGS[0] = 'damage':
 
 			!xgt'fight','sta'
 		elseif barierV < damage:
-			!pcs_manna = pcs_manna - damageM
+			!pcs_mana = pcs_mana - damageM
 			!pcs_health = pcs_health - damage
 			healthV = healthV - damage
 
@@ -119,7 +119,7 @@ if $ARGS[0] = 'damage':
 			end
 
 			'<b><font color = green>Your defense caused damage <<damage>> units</font></b>'
-			!'<b><font color = red>Your manna harmed <<damageM>> units</font></b>'
+			!'<b><font color = red>Your mana harmed <<damageM>> units</font></b>'
 
 			if zerkaloV > 0:
 				zerkaloV = zerkaloV - 1

locations/atakB1.qsrc

@@ -54,7 +54,7 @@ if $ARGS[0] = 'damage':
 		if dospeh > 0:damage = damage - dospehDefV & dospehEn = dospehEn - 1
 		if damage < 0:damage = 0
 		pcs_health = pcs_health - damage
-		!pcs_manna = pcs_manna - damageM
+		!pcs_mana = pcs_mana - damageM
 
 		if eleShV > 0:
 			stun = RAND(eleShV,eleShV*3)
@@ -63,7 +63,7 @@ if $ARGS[0] = 'damage':
 		end
 
 		'<b><font color = red>Defense caused you damage <<damage>> units</font></b>'
-		!'<b><font color = red>Your manna harmed <<damageM>> units</font></b>'
+		!'<b><font color = red>Your mana harmed <<damageM>> units</font></b>'
 
 		if zerkalo > 0:
 			zerkalo = zerkalo - 1
@@ -108,7 +108,7 @@ if $ARGS[0] = 'damage':
 
 			!xgt'fight','sta'
 		elseif barier < damage:
-			!pcs_manna = pcs_manna - damageM
+			!pcs_mana = pcs_mana - damageM
 			!pcs_health = pcs_health - damage
 			pcs_health = pcs_health - damage
 
@@ -119,7 +119,7 @@ if $ARGS[0] = 'damage':
 			end
 
 			'<b><font color = red>You harmed <<damage>> units of the defense</font></b>'
-			!'<b><font color = red>Your manna harmed <<damageM>> units</font></b>'
+			!'<b><font color = red>Your mana harmed <<damageM>> units</font></b>'
 
 			if zerkalo > 0:
 				zerkalo = zerkalo - 1

locations/atakM.qsrc

@@ -2,7 +2,7 @@
 
 menu_off = 1
 
-if $ARGS[0] = 'atakVmanna':
+if $ARGS[0] = 'atakVmana':
 	cla
 	!payment hit dodge
 	poSp = speedV*20/100
@@ -43,10 +43,10 @@ if $ARGS[0] = 'uronKritV':
 		if dospeh > 0:damage = damage - dospehDef & dospehEn = dospehEn - 1
 		if damage < 0:damage = 0
 		pcs_health = pcs_health - damage
-		pcs_manna = pcs_manna - damageM
+		pcs_mana = pcs_mana - damageM
 
 		'<b><font color = red>Your health harmed <<damage>> units</font></b>'
-		'<b><font color = red>Your manna harmed <<damageM>> units</font></b>'
+		'<b><font color = red>Your mana harmed <<damageM>> units</font></b>'
 
 		if zerkalo > 0:
 			zerkalo = zerkalo - 1
@@ -90,11 +90,11 @@ if $ARGS[0] = 'uronKritV':
 
 			xgt'fight','sta'
 		elseif barier < damage:
-			pcs_manna = pcs_manna - damageM
+			pcs_mana = pcs_mana - damageM
 			pcs_health = pcs_health - damage
 
 			'<b><font color = red>You harmed <<damage>> units</font></b>'
-			'<b><font color = red>Your manna harmed <<damageM>> units</font></b>'
+			'<b><font color = red>Your mana harmed <<damageM>> units</font></b>'
 
 			if zerkalo > 0:
 				zerkalo = zerkalo - 1
@@ -117,10 +117,10 @@ if $ARGS[0] = 'uronV':
 		if dospeh > 0:damage = damage - dospehDef & dospehEn = dospehEn - 1
 		if damage < 0:damage = 0
 		pcs_health = pcs_health - damage
-		pcs_manna = pcs_manna - damageM
+		pcs_mana = pcs_mana - damageM
 
 		'<b><font color = red>Your health harmed <<damage>> units</font></b>'
-		'<b><font color = red>Your manna harmed <<damageM>> units</font></b>'
+		'<b><font color = red>Your mana harmed <<damageM>> units</font></b>'
 
 		if zerkalo > 0:
 			zerkalo = zerkalo - 1
@@ -164,11 +164,11 @@ if $ARGS[0] = 'uronV':
 
 			xgt'fight','sta'
 		elseif barier < damage:
-			pcs_manna = pcs_manna - damageM
+			pcs_mana = pcs_mana - damageM
 			pcs_health = pcs_health - damage
 
 			'<b><font color = red>You harmed <<damage>> units</font></b>'
-			'<b><font color = red>Your manna harmed <<damageM>> units</font></b>'
+			'<b><font color = red>Your mana harmed <<damageM>> units</font></b>'
 
 			if zerkalo > 0:
 				zerkalo = zerkalo - 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>'

locations/bass.qsrc

@@ -92,7 +92,7 @@ if $ARGS[0] = 'a':
 			shootV = 100
 			!!parameters
 			healthV = vitalV * 10 + strenV * 5
-			mannaV = intelV * magikV + magikV * 100 + vitalV * 10
+			manaV = intelV * magikV + magikV * 100 + vitalV * 10
 			willpowerV = willV * 10
 			BonusAtakV = 0
 			BonusDefV = 0

locations/before.qsrc

@@ -19,12 +19,12 @@ if stunV > 0:'<font color = green><<$boydesc>> is still stunned and unable to mo
 
 if unmaterialV > 0:
 	unmaterialV = unmaterialV - 1
-	mannaV = mannaV - 20
+	manaV = manaV - 20
 end
 
 if unmaterial > 0:
 	unmaterial = unmaterial - 1
-	pcs_manna = pcs_manna - 20
+	pcs_mana = pcs_mana - 20
 
 	'<font color = green>You''re unable to withstand the most <<unmaterial>> moves.</font>'
 end

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'

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:

locations/body_shape.qsrc

@@ -144,14 +144,14 @@ if $ARGS[0] = '':
 		jump 'salocatloop'
 	end
 
-	if salobustdo = 0 and magf2bdo = 1 and salocatnow > salocatlast and pcs_manna >= mannamax / 2:
+	if salobustdo = 0 and magf2bdo = 1 and salocatnow > salocatlast and pcs_mana >= manamax / 2:
 		if sftrstflag = 0:'<b>Your breasts seem fuller.</b>'
 		magicf2b += 1
 		salo -= 3
 		salobustdo = 1
 		if magicf2b >= 2 + magtarcup * 5: magf2bdo = 0
 		if pcs_magik < 20:
-			pcs_manna -= 2000 / pcs_magik
+			pcs_mana -= 2000 / pcs_magik
 		else
 			mana -= 100
 		end

locations/castSpell.qsrc

@@ -54,7 +54,7 @@ if spellKnown[$SpellID] = 1:
 	else
 		manaCost = spellMana[$SpellID]
 	end
-	pcs_manna -= manaCost
+	pcs_mana -= manaCost
 	!pcs_willpwr -= spellWill[$SpellID]
 	arouseVal = manaCost / 50
 	gs 'arousal', 'voyeur', arouseVal

locations/chessplay.qsrc

@@ -3,69 +3,158 @@
 menu_off = 1
 
 if $ARGS[0] = '':
-	if $chess_name='':$chess_name='girl'
+	if $chess_name='':$chess_name='Boy'
 	gs'stat'
 	chess_GG = 20
 	chess_com = 20
-	
-	chess_ind = (chessV - pcs_chess) / 100
-	chess_exp += rand(pcs_intel/20,pcs_intel/10)
-	intel_exp += 1
-	minut += 60
 
+	! chess_ind is used to show the integer difference between Sveta and her opponent
+	! if it is 0 then Sveta is equally skilled as her opponent
+	! the opponent will play more neutrally if the skill gap is within 5 points
+	! if it is > 0 then Sveta is less skilled then her opponent
+	! the opponent will play more aggressively if Sveta is less skilled by at least 5 points
+	! if it is < 0 then Sveta is more skilled then her opponent
+	! the opponent will play more conservatively if Sveta is more skilled by at least 5 points
+	chess_ind = chessV - pcs_chess
+	! chess_diff is used to show how that difference affects the swing in momentum with each move
+	if chess_ind < 0:
+		chess_diff = (chess_ind/2)*-1
+	else
+		chess_diff = (chess_ind/2)
+	end
+	! move_limit and time_limit keeps games from going forever
+	chess_move_limit = 60
+	chess_time_limit = 120
+	! chess_move and total_chess_time keep track of total moves and time until it hits the limits
+	chess_move = 0
+	total_chess_time = 0
 	gt 'chessplay', 'game'
 end
 
 if $ARGS[0] = 'game':
+	chess_exp += rand(0,1)
+	intel_exp += rand(0,1)
+	chess_move += 1
+	chess_time = rand(1,3)
+	minut += chess_time
+	total_chess_time += chess_time
+	gs 'stat'
 
-	if chess_GG <= 0:
-		gt 'chessplay', 'lose'
+	if chess_move = 1:
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/chess/board' + rand(1,1) + '.jpg"></center>'
+		*nl
+		if chess_ind > 5:
+			'You are less skilled at chess than '+$chess_name+'. They will play more aggressively to try and defeat you.'
+			'You might want to play more conservatively and wear down their attacks.'
+		elseif chess_ind < -5:
+			'You are more skilled at chess than '+$chess_name+'. They will play more conservatively to try and defeat you.'
+			'You might want to play more aggressively and wear down their defenses.'
+		else
+			'You are about equally skilled at chess as '+$chess_name+'. They will use a wide range of moves to try and defeat you.'
+			'You might want to try different types of moves to keep your opponent off balance.'
+		end
+	end
+
+	if chess_GG <= 0 and chess_com <= 0:
+		*clr & cla
+
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/chess/stalemate' + rand(1,1) + '.jpg"></center>'
+		*nl
+		'Stalemate! You have drawn the match against '+$chess_name+'!'
+		'You and '+$chess_name+' could not find a way to win the match.'
+		
+		act 'Return': gt 'kruchess'
+	elseif chess_GG <= 0:
+		*clr & cla
+
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/chess/lose' + rand(1,1) + '.jpg"></center>'
+		*nl
+		'Checkmate! You have lost the match against '+$chess_name+'!'
+		
+		act 'Return': gt 'kruchess'
 	elseif chess_com <= 0:
-		gt 'chessplay', 'win'
+		*clr & cla
+
+		chess_win += 1
+
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/chess/win' + rand(1,1) + '.jpg"></center>'
+		*nl
+		'Checkmate! You have won the match against '+$chess_name+'!'
+
+		act 'Return': gt 'kruchess'
+	elseif chess_moves >= chess_move_limit:
+		*clr & cla
+
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/chess/stalemate' + rand(1,1) + '.jpg"></center>'
+		*nl
+		'Draw! You agree to end the match with '+$chess_name+'.'
+		'You and '+$chess_name+' have both used too many moves and neither could find a way to win the match.'
+
+		act 'Return': gt 'kruchess'
+	elseif total_chess_time >= chess_time_limit:
+		*clr & cla
+
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/chess/stalemate' + rand(1,1) + '.jpg"></center>'
+		*nl
+		'Draw! You agree to end the match with '+$chess_name+'.'
+		'You and '+$chess_name+' have both used too much time and neither could find a way to win the match.'
+
+		act 'Return': gt 'kruchess'
 	else
 		gs 'chessplay', 'moves'
 	end
 end
 
 if $ARGS[0] = 'moves':
-	cla
-	act 'Go defensive':
-		chessM = rand (0,5)
-		if chessM = 0:
-			'Your opponent tries to trap you, but you avoid it and gain some advantage.'
-			if chess_ind > 2:
-				chess_GG += 2 - chess_ind
-				chess_com -= 2 + chess_ind
-			else
-				'However their superior skill negates that advantage.'
-			end
-		elseif chessM = 1:
-			'Your opponent goes offensive much to their advantage.'
-			if chess_ind < -4:
-				chess_GG -= 4 + chess_ind
-				chess_com += 4 - chess_ind
-			else
-				'However your superior skill negates that advantage.'
-			end
-		elseif chessM = 2:
-			'Your opponent goes aggressive you absorb some of it, but still lose some advantage.'
-			if chess_ind < -2:
-			chess_GG -= 2 + chess_ind
-				chess_com += 2 - chess_ind
-			else
-				'However your superior skill negates that advantage.'
-			end
-		elseif chessM = 3:
-			'Your opponent tries to manoeuvre the game pieces, but your defensive actions expose all their efforts, much to your advantage.'
-			if chess_ind > 4:
-				chess_GG += 4 - chess_ind
-				chess_com -= 4 + chess_ind
-			else
-				'However their superior skill negates that advantage.'
-			end
-		else
-			'Your opponent also goes defensive and neither of you gain any advantage.'
+	if chess_ind > 5:
+		chessM = rand(4,11)
+	elseif chess_ind < -5:
+		chessM = rand(0,7)
+	else
+		chessM = rand(2,9)
+	end
+
+	act 'Play conservatively':
+		! this works as the opposite of aggressive play
+		! conservative wins against offense and trap
+		! conservative loses to defense and tactical
+		! conservative ties with conservative and aggressive
+		*clr & cla
+
+		if chessM <= 1:
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/chess/conservative' + rand(1,1) + '.jpg"></center>'
+			*nl
+			$chess_name+' also plays conservatively.'
+			'Neither of you gain an advantage from this move.'
+		elseif chessM <= 3:
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/chess/defensive' + rand(1,1) + '.jpg"></center>'
+			*nl
+			$chess_name+' plays defensively and is now in a better position than you.'
+			gs 'chessplay', 'advantage', 'conservative', 'bad'
+		elseif chessM <= 5:
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/chess/tactical' + rand(1,1) + '.jpg"></center>'
+			*nl
+			$chess_name+' plays tactically and is able to deftly pick apart your conservative defenses.'
+			gs 'chessplay', 'advantage', 'conservative', 'bad'
+		elseif chessM <= 7:
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/chess/trap' + rand(1,1) + '.jpg"></center>'
+			*nl
+			$chess_name+' tries to trap you, but you encircle it with your defenses.'
+			gs 'chessplay', 'advantage', 'conservative', 'good'
+		elseif chessM <= 9:
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/chess/offensive' + rand(1,1) + '.jpg"></center>'
+			*nl
+			$chess_name+' plays offensively, but your defense repulses his attacks.'
+			gs 'chessplay', 'advantage', 'conservative', 'good'
+		elseif chessM <= 11:
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/chess/aggressive' + rand(1,1) + '.jpg"></center>'
+			*nl
+			$chess_name+' plays aggressively, but your defense manages to hold them off.'
+			'Neither of you gain an advantage from this move.'
 		end
+		*nl
+		'You are on move '+str(chess_move)+' out of '+str(chess_move_limit)
+		'You are on minute '+str(total_chess_time)+' out of '+str(chess_time_limit)
 
 		chess_GG -= 1
 		chess_com -= 1
@@ -73,87 +162,95 @@ if $ARGS[0] = 'moves':
 		gs 'chessplay', 'game'
 	end
 
-	act 'Heavy defense':
-		chessM = rand (0,5)
-		if chessM = 0:
-			'Your opponent tries to trap you, but you easily avoid it and gain a good advantage.'
-			if chess_ind > 4:
-				chess_GG += 4 - chess_ind
-				chess_com -= 4 + chess_ind
-			else
-				'However their superior skill negates that advantage.'
-			end
-		elseif chessM = 1:
-			'Your opponent goes offensive you absorb some of it, but still lose some advantage.'
-			if chess_ind < -2:
-			chess_GG -= 2 + chess_ind
-				chess_com += 2 - chess_ind
-			else
-				'However your superior skill negates that advantage.'
-			end
-		elseif chessM = 2:
-			'Your opponent goes aggressive much to their advantage.'
-			if chess_ind < -4:
-				chess_GG -= 4 + chess_ind
-				chess_com += 4 - chess_ind
-			else
-				'However your superior skill negates that advantage.'
-			end
-		elseif chessM = 3:
-			'Your opponent tries to manoeuvre the game pieces, but your defensive actions expose some of their efforts, to your advantage.'
-			if chess_ind > 2:
-				chess_GG += 2 - chess_ind
-				chess_com -= 2 + chess_ind
-			else
-				'However their superior skill negates that advantage.'
-			end
-		else
-			'Your opponent also goes defensive and neither of you gain any advantage.'
-		end
+	act 'Play defensively':
+		! this works as the opposite of offensive play
+		! defense wins against trap and conservative
+		! defense loses to aggressive and tactical
+		! defense ties with offense and defense
+		*clr & cla
 
+		if chessM <= 1:
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/chess/conservative' + rand(1,1) + '.jpg"></center>'
+			*nl
+			$chess_name+' plays very conservatively and does not threaten your defenses at all.'
+			gs 'chessplay', 'advantage', 'defense', 'good'
+		elseif chessM <= 3:
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/chess/defensive' + rand(1,1) + '.jpg"></center>'
+			*nl
+			$chess_name+' also plays defensively.'
+			'Neither of you gain an advantage from this move.'
+		elseif chessM <= 5:
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/chess/tactical' + rand(1,1) + '.jpg"></center>'
+			*nl
+			$chess_name+' plays tactically and is able to deftly pick apart your defenses.'
+			gs 'chessplay', 'advantage', 'defense', 'bad'
+		elseif chessM <= 7:
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/chess/trap' + rand(1,1) + '.jpg"></center>'
+			*nl
+			$chess_name+' tries to trap you, but you avoid it with your defenses.'
+			gs 'chessplay', 'advantage', 'defense', 'good'
+		elseif chessM <= 9:
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/chess/offensive' + rand(1,1) + '.jpg"></center>'
+			*nl
+			$chess_name+' plays offensively, but your defense absorbs his attacks.'
+			'Neither of you gain an advantage from this move.'
+		elseif chessM <= 11:
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/chess/aggressive' + rand(1,1) + '.jpg"></center>'
+			*nl
+			$chess_name+' plays aggressively and overwhelms your defenses.'
+			gs 'chessplay', 'advantage', 'defense', 'bad'
+		end
+		*nl
+		'You are on move '+str(chess_move)+' out of '+str(chess_move_limit)
+		'You are on minute '+str(total_chess_time)+' out of '+str(chess_time_limit)
+		
 		chess_GG -= 1
 		chess_com -= 1
 
 		gs 'chessplay', 'game'
 	end
 
-	act 'Go offensive':
-		chessM = rand (0,5)
-		if chessM = 0:
-			'Your opponent tries to trap you, gaining some advantage.'
-			if chess_ind < -2:
-			chess_GG -= 2 + chess_ind
-				chess_com += 2 - chess_ind
-			else
-				'However your superior skill negates that advantage.'
-			end
-		elseif chessM = 1:
-			'Your opponent goes offensive much to your advantage.'
-			if chess_ind > 4:
-				chess_GG += 4 - chess_ind
-				chess_com -= 4 + chess_ind
-			else
-				'However their superior skill negates that advantage.'
-			end
-		elseif chessM = 2:
-			'Your opponent goes aggressive you easily absorb it, and gain some advantage.'
-			if chess_ind > 2:
-				chess_GG += 2 - chess_ind
-				chess_com -= 2 + chess_ind
-			else
-				'However their superior skill negates that advantage.'
-			end
-		elseif chessM = 3:
-			'Your opponent tries to manoeuvre the game pieces, your offensive actions leave you exposed, and they take advantage.'
-			if chess_ind < -4:
-				chess_GG -= 4 + chess_ind
-				chess_com += 4 - chess_ind
-			else
-				'However your superior skill negates that advantage.'
-			end
-		else
-			'Your opponent also goes on the attack and neither of you gain any advantage.'
+	act 'Play tactically':
+		! this works as the opposite of trap play
+		! tactical wins against defense and conservative
+		! tactical loses to aggressive and offense
+		! tactical ties with tactical and trap
+		*clr & cla
+
+		if chessM <= 1:
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/chess/conservative' + rand(1,1) + '.jpg"></center>'
+			*nl
+			$chess_name+' plays very conservatively and your tactical moves leave you in a better position.'
+			gs 'chessplay', 'advantage', 'tactical', 'good'
+		elseif chessM <= 3:
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/chess/defensive' + rand(1,1) + '.jpg"></center>'
+			*nl
+			$chess_name+' plays defensively allowing you to pick apart their defenses.'
+			gs 'chessplay', 'advantage', 'tactical', 'good'
+		elseif chessM <= 5:
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/chess/tactical' + rand(1,1) + '.jpg"></center>'
+			*nl
+			$chess_name+' also plays tactically.'
+			'Neither of you gain an advantage from this move.'
+		elseif chessM <= 7:
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/chess/trap' + rand(1,1) + '.jpg"></center>'
+			*nl
+			$chess_name+' tries to trap you, but you avoid it with your tactical movements.'
+			'Neither of you gain an advantage from this move.'
+		elseif chessM <= 9:
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/chess/offensive' + rand(1,1) + '.jpg"></center>'
+			*nl
+			$chess_name+' plays offensively, and some of your pieces are caught out of position.'
+			gs 'chessplay', 'advantage', 'tactical', 'bad'
+		elseif chessM <= 11:
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/chess/aggressive' + rand(1,1) + '.jpg"></center>'
+			*nl
+			$chess_name+' plays aggressively and rushes past your unprepared defenses.'
+			gs 'chessplay', 'advantage', 'tactical', 'bad'
 		end
+		*nl
+		'You are on move '+str(chess_move)+' out of '+str(chess_move_limit)
+		'You are on minute '+str(total_chess_time)+' out of '+str(chess_time_limit)
 
 		chess_GG -= 1
 		chess_com -= 1
@@ -161,43 +258,47 @@ if $ARGS[0] = 'moves':
 		gs 'chessplay', 'game'
 	end
 
-	act 'Be aggressive':
-		chessM = rand (0,5)
-		if chessM = 0:
-			'Your opponent tries to trap you, and you are playing right into their hands.'
-			if chess_ind < -4:
-				chess_GG -= 4 + chess_ind
-				chess_com += 4 - chess_ind
-			else
-				'However your superior skill negates that advantage.'
-			end
-		elseif chessM = 1:
-			'Your opponent goes defensive to your advantage.'
-			if chess_ind > 2:
-				chess_GG += 2 - chess_ind
-				chess_com -= 2 + chess_ind
-			else
-				'However their superior skill negates that advantage.'
-			end
-		elseif chessM = 2:
-			'Your opponent goes heavily defensive very much to your advantage.'
-			if chess_ind > 4:
-				chess_GG += 4 - chess_ind
-				chess_com -= 4 + chess_ind
-			else
-				'However their superior skill negates that advantage.'
-			end
-		elseif chessM = 3:
-			'Your opponent tries to manoeuvre the game pieces, gaining some advantage.'
-			if chess_ind < -2:
-			chess_GG -= 2 + chess_ind
-				chess_com += 2 - chess_ind
-			else
-				'However your superior skill negates that advantage.'
-			end
-		else
-			'Your opponent also goes on the attack and neither of you gain any advantage.'
+	act 'Bait a trap for your opponent':
+		! this works as the opposite of tactical play
+		! trap wins against offense and aggressive
+		! trap loses to conservative and defense
+		! trap ties with tactical and trap
+		*clr & cla
+
+		if chessM <= 1:
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/chess/conservative' + rand(1,1) + '.jpg"></center>'
+			*nl
+			$chess_name+' plays very conservatively and their defenses are now very well prepared.'
+			gs 'chessplay', 'advantage', 'trap', 'bad'
+		elseif chessM <= 3:
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/chess/defensive' + rand(1,1) + '.jpg"></center>'
+			*nl
+			$chess_name+' plays defensively and your bait is now out of position.'
+			gs 'chessplay', 'advantage', 'trap', 'bad'
+		elseif chessM <= 5:
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/chess/tactical' + rand(1,1) + '.jpg"></center>'
+			*nl
+			$chess_name+' plays tactically and avoids your trap.'
+			'Neither of you gain an advantage from this move.'
+		elseif chessM <= 7:
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/chess/trap' + rand(1,1) + '.jpg"></center>'
+			*nl
+			$chess_name+' also tries to trap you.'
+			'Neither of you gain an advantage from this move.'
+		elseif chessM <= 9:
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/chess/offensive' + rand(1,1) + '.jpg"></center>'
+			*nl
+			$chess_name+' plays offensively, and a couple of their pieces are caught out of position.'
+			gs 'chessplay', 'advantage', 'trap', 'good'
+		elseif chessM <= 11:
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/chess/aggressive' + rand(1,1) + '.jpg"></center>'
+			*nl
+			$chess_name+' plays aggressively and many of their pieces fall into your trap.'
+			gs 'chessplay', 'advantage', 'trap', 'good'
 		end
+		*nl
+		'You are on move '+str(chess_move)+' out of '+str(chess_move_limit)
+		'You are on minute '+str(total_chess_time)+' out of '+str(chess_time_limit)
 
 		chess_GG -= 1
 		chess_com -= 1
@@ -205,43 +306,47 @@ if $ARGS[0] = 'moves':
 		gs 'chessplay', 'game'
 	end
 
-	act 'Bait trap':
-		chessM = rand (0,5)
-		if chessM = 0:
-			'Your opponent goes offensive to your advantage.'
-			if chess_ind > 2:
-				chess_GG += 2 - chess_ind
-				chess_com -= 2 + chess_ind
-			else
-				'However their superior skill negates that advantage.'
-			end
-		elseif chessM = 1:
-			'Your opponent goes defensive to their advantage.'
-			if chess_ind < -2:
-				chess_GG -= 2 + chess_ind
-				chess_com += 2 - chess_ind
-			else
-				'However your superior skill negates that advantage.'
-			end
-		elseif chessM = 2:
-			'Your opponent goes heavily defensive exposing your tactics much to their advantage.'
-			if chess_ind < -4:
-				chess_GG -= 4 + chess_ind
-				chess_com += 4 - chess_ind
-			else
-				'However your superior skill negates that advantage.'
-			end
-		elseif chessM = 3:
-			'Your opponent goes aggressive much to your advantage.'
-			if chess_ind > 4:
-				chess_GG += 4 - chess_ind
-				chess_com -= 4 + chess_ind
-			else
-				'However their superior skill negates that advantage.'
-			end
-		else
-			'Your opponent also goes tactical and neither of you gain any advantage.'
+	act 'Play offensively':
+		! this works as the opposite of defensive play
+		! offense wins against tactical and aggressive
+		! offense loses to conservative and trap
+		! offense ties with offense and defense
+		*clr & cla
+
+		if chessM <= 1:
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/chess/conservative' + rand(1,1) + '.jpg"></center>'
+			*nl
+			$chess_name+' plays very conservatively and repulses all your attacks.'
+			gs 'chessplay', 'advantage', 'offense', 'bad'
+		elseif chessM <= 3:
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/chess/defensive' + rand(1,1) + '.jpg"></center>'
+			*nl
+			$chess_name+' plays defensively and manages to absorb all your attacks.'
+			'Neither of you gain an advantage from this move.'
+		elseif chessM <= 5:
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/chess/tactical' + rand(1,1) + '.jpg"></center>'
+			*nl
+			$chess_name+' plays tactically, but your offense is able to outmaneuver them.'
+			gs 'chessplay', 'advantage', 'offense', 'good'
+		elseif chessM <= 7:
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/chess/trap' + rand(1,1) + '.jpg"></center>'
+			*nl
+			$chess_name+' traps some of your pieces. You should think more carefully next time.'
+			gs 'chessplay', 'advantage', 'offense', 'bad'
+		elseif chessM <= 9:
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/chess/offensive' + rand(1,1) + '.jpg"></center>'
+			*nl
+			$chess_name+' also plays offensively.'
+			'Neither of you gain an advantage from this move.'
+		elseif chessM <= 11:
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/chess/aggressive' + rand(1,1) + '.jpg"></center>'
+			*nl
+			$chess_name+' plays aggressively and overextends themselves.'
+			gs 'chessplay', 'advantage', 'offense', 'good'
 		end
+		*nl
+		'You are on move '+str(chess_move)+' out of '+str(chess_move_limit)
+		'You are on minute '+str(total_chess_time)+' out of '+str(chess_time_limit)
 
 		chess_GG -= 1
 		chess_com -= 1
@@ -249,43 +354,47 @@ if $ARGS[0] = 'moves':
 		gs 'chessplay', 'game'
 	end
 
-	act 'Manoeuvre the game pieces':
-		chessM = rand (0,5)
-		if chessM = 0:
-			'Your opponent goes offensive, much to your advantage.'
-			if chess_ind > 4:
-				chess_GG += 4 - chess_ind
-				chess_com -= 4 + chess_ind
-			else
-				'However their superior skill negates that advantage.'
-			end
-		elseif chessM = 1:
-			'Your opponent goes defensive much to their advantage.'
-			if chess_ind < -4:
-				chess_GG -= 4 + chess_ind
-				chess_com += 4 - chess_ind
-			else
-				'However your superior skill negates that advantage.'
-			end
-		elseif chessM = 2:
-			'Your opponent goes heavily defensive exposing your tactics to their advantage.'
-			if chess_ind < -2:
-			chess_GG -= 2 + chess_ind
-				chess_com += 2 - chess_ind
-			else
-				'However your superior skill negates that advantage.'
-			end
-		elseif chessM = 3:
-			'Your opponent goes aggressive to your advantage.'
-			if chess_ind > 2:
-				chess_GG += 2 - chess_ind
-				chess_com -= 2 + chess_ind
-			else
-				'However their superior skill negates that advantage.'
-			end
-		else
-			'Your opponent also goes tactical and neither of you gain any advantage.'
+	act 'Play aggressively':
+		! this works as the opposite of conservative play
+		! aggressive wins against defense and tactical
+		! aggressive loses to offense and trap
+		! aggressive ties with conservative and aggressive
+		*clr & cla
+
+		if chessM <= 1:
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/chess/conservative' + rand(1,1) + '.jpg"></center>'
+			*nl
+			$chess_name+' plays conservatively and their defenses manage to hold you off.'
+			'Neither of you gain an advantage from this move.'
+		elseif chessM <= 3:
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/chess/defensive' + rand(1,1) + '.jpg"></center>'
+			*nl
+			$chess_name+' plays defensively and you overwhelm a few of their pieces.'
+			gs 'chessplay', 'advantage', 'aggressive', 'good'
+		elseif chessM <= 5:
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/chess/tactical' + rand(1,1) + '.jpg"></center>'
+			*nl
+			$chess_name+' plays tactically and cannot cope with your aggressive moves.'
+			gs 'chessplay', 'advantage', 'aggressive', 'good'
+		elseif chessM <= 7:
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/chess/trap' + rand(1,1) + '.jpg"></center>'
+			*nl
+			$chess_name+' tries to trap you, but some of your pieces fall for it.'
+			gs 'chessplay', 'advantage', 'aggressive', 'bad'
+		elseif chessM <= 9:
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/chess/offensive' + rand(1,1) + '.jpg"></center>'
+			*nl
+			$chess_name+' plays offensively, leaving some of your pieces exposed.'
+			gs 'chessplay', 'advantage', 'aggressive', 'bad'
+		elseif chessM <= 11:
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/chess/aggressive' + rand(1,1) + '.jpg"></center>'
+			*nl
+			$chess_name+' also plays aggressively.'
+			'Neither of you gain an advantage from this move.'
 		end
+		*nl
+		'You are on move '+str(chess_move)+' out of '+str(chess_move_limit)
+		'You are on minute '+str(total_chess_time)+' out of '+str(chess_time_limit)
 
 		chess_GG -= 1
 		chess_com -= 1
@@ -294,22 +403,57 @@ if $ARGS[0] = 'moves':
 	end
 end
 
+! $ARGS[1] = move chosen by player - used to set base skill difference and advantage change
+! $ARGS[2] = whether this move was a good choice - whether Sveta should gain or lose advantage
+if $ARGS[0] = 'advantage':
+	! conservative and aggressive are the most extreme and therefore have the biggest reward and risk
+	! but also requires the greatest difference in skill to pull off successfully or prevent your opponent from using successfully
+	if $ARGS[1] = 'conservative' or $ARGS[1] = 'aggressive':
+		chess_pos = 4
+		chess_neg = -4
+		chess_adv = 4
+	! defense and offense are a middle ground and have medium reward and risk
+	! requires a medium skill gap to pull off successfully or prevent your opponent from using successfully
+	elseif $ARGS[1] = 'defense' or $ARGS[1] = 'offense':
+		chess_pos = 2
+		chess_neg = -2
+		chess_adv = 2
+	! tactical and trap are the least extreme and therefore have the least reward and risk
+	! they require the least difference in skill to pull off successfully or prevent your opponent from using successfully
+	elseif $ARGS[1] = 'tactical' or $ARGS[1] = 'trap':
+		chess_pos = 1
+		chess_neg = -1
+		chess_adv = 1	
+	end
 
-if $ARGS[0] = 'win':
-	*clr & cla
-	gs 'stat'
-	chess_win += 1
-	'You have won this game.'
-	act 'Return': gt $loc
-end
-
-if $ARGS[0] = 'lose':
-	*clr & cla
-	gs 'stat'
-	'You have lost this game.'
-	act 'Return': gt $loc
+	if $ARGS[2] = 'good':
+		if chess_ind > chess_pos:
+			'You are less skilled than your opponent and cannot capitalize on your advantage.'
+			'Try to gain more skill at chess to use this move successfully against this opponent.'
+		elseif chess_ind < chess_neg:
+			'You are more skilled than your opponent and gain a major advantage.'
+			chess_GG = chess_GG + chess_adv + chess_diff
+			chess_com = chess_com - chess_adv - chess_diff
+		else
+			'You are about equally skilled as your opponent and gain some advantage.'
+			chess_GG = chess_GG + chess_adv/2 + chess_diff/2
+			chess_com = chess_com - chess_adv/2 - chess_diff/2
+		end
+	elseif $ARGS[2] = 'bad':
+		if chess_ind > chess_pos:
+			'You are less skilled than your opponent and you lose a major advantage.'
+			'Try to gain more skill at chess to prevent your opponent from using this move successfully.'
+			chess_GG = chess_GG - chess_adv - chess_diff
+			chess_com = chess_com + chess_adv + chess_diff
+		elseif chess_ind < chess_neg:
+			'You are more skilled than your opponent and prevent them from capitalizing on their advantage.'			
+		else
+			'You are about equally skilled as your opponent and you lose some advantage.'
+			chess_GG = chess_GG - chess_adv/2 - chess_diff/2
+			chess_com = chess_com + chess_adv/2 + chess_diff/2
+		end
+	end
 end
 
-
 --- chessplay ---------------------------------
 

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:

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

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

locations/defence.qsrc

@@ -27,7 +27,7 @@ if defenceAct > 0:
 	defence += defenceActPar
 	defenceAct -= 1
 	defActParK = defenceActPar/100
-	pcs_manna -= defActParK
+	pcs_mana -= defActParK
 	'<b><font color="green">Regeneration consumes <<defActParK>> units of mana.</font></b>'
 end
 
@@ -35,20 +35,20 @@ if defenceActM > 0:
 	defenceM += defenceActParM
 	defenceActM -= 1
 	defActParKM = defenceActParM/100
-	pcs_manna -= defActParKM
+	pcs_mana -= defActParKM
 	'<b><font color="green">Regeneration consumes <<defActParKM>> units of mana.</font></b>'
 end
 
 if defenceActV > 0:
 	defenceV += defenceActParV
 	defenceActV -= 1
-	mannaV -= (defenceActParV / 100)
+	manaV -= (defenceActParV / 100)
 end
 
 if defenceActMV > 0:
 	defenceMV += defenceActParMV
 	defenceActMV -= 1
-	mannaV -= (defenceActParMV / 100)
+	manaV -= (defenceActParMV / 100)
 end
 
 if defAtk > 0:
@@ -68,7 +68,7 @@ if defAtkM > 0:
 
 	if defenceMV <= 0 and unmaterialV = 0:
 		defDamM = rand(defenceActParM/2, defenceActParM)
-		mannaV -= defDamM
+		manaV -= defDamM
 		defence += defDamM
 		'<b><font color="green">Your protection shield absorbed <<defDamM>> mana from an enemy, this mana converts into strengthening your defenses.</font></b>'
 	end
@@ -85,7 +85,7 @@ if defAtkMV > 0:
 
 	if defenceM <= 0 and unmaterial = 0:
 		defDamMV = rand(defenceActParMV/2, defenceActParMV)
-		pcs_manna -= defDamMV
+		pcs_mana -= defDamMV
 		defenceV += defDamMV
 		'<b><font color="red">You enemy takes <<defDamMV>> mana from you strengthening their defense.</font></b>'
 	end

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'

locations/dimaRevenge.qsrc

@@ -305,7 +305,7 @@ if ARGS[0] = 3:
 									shootV = 100
 									!!parameters
 									healthV = vitalV * 10 + strenV * 5
-									mannaV = intelV * 10 + magikV * 10
+									manaV = intelV * 10 + magikV * 10
 									willpowerV = willV * 10
 									BonusAtakV = 0
 									BonusDefV = 0

locations/dinSex2.qsrc

@@ -1,4 +1,4 @@
-# dinSex2
+# dinSex2
 
 if $ARGS[0] = 'stamina_npc':
 	if sexstart <= 0:sexstart = 1 & sexvar = rand(2,5)
@@ -259,8 +259,8 @@ if $ARGS[0] = 'doublepenetration':
 
 	if totPAIN = 0:
 		'Feelings merge together when you move inside two members in contact with each other through a thin opening sharing your vagina filled <<dick1>> centimeter and a member of your <<$anustipe>> anus filled <<dick2>> centimeter member. Your abdomen burns as if pleasant sunlight was spreading heat throughout your body.'
-		bonusManna = pcs_mood
-		DPplus = (vaginalOrgasm * 10) + pcs_horny + bonusManna
+		bonusMana = pcs_mood
+		DPplus = (vaginalOrgasm * 10) + pcs_horny + bonusMana
 		DPminus = rand(250, 350)
 
 		if DPplus > DPminus:

locations/din_bad.qsrc

@@ -151,7 +151,7 @@ if $ARGS[0] = 'd_bag':
 	else
 		'You are out of condoms.'
 	end
-	if amphetamine > 0:	'You have <b><<amphetamine>></b> tablets of amphetamine left in your purse. <a href="exec:dynamic $use_amphetamines & gs ''din_bad'', ''d_bag''">Take One</a>'
+	if amphetamine > 0:	'You have <b><<amphetamine>></b> tablets of amphetamine left in your purse. <a href="exec: gs ''drugs'', ''amphetamine'' & gs ''din_bad'', ''d_bag''">Take One</a>'
 	if tabletki > 0 and pillsleft[ptype] > 0:
 		'You have <b><<tabletki>></b> unopened packages of <a href="exec:dynamic $d_tabletkied">birth control pills</a> and <b><<pillsleft[ptype]>></b> pills left in your opened package.'
 	elseif tabletki	= 0 and pillsleft[ptype] > 0:
@@ -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
@@ -831,17 +815,6 @@ $use_steroids = {
 	end
 }
 
-$use_amphetamines = {
-	if amphIntake < 2:
-		'<font color= blue>You swallow the white pill.</font>'
-		amphIntake += 1
-		amphetamine -=1
-		amphHigh = 12
-	else
-		'Your heart is already beating uncontrollably in your chest, you should avoid taking anymore pills.'
-	end
-}
-
 $use_bcream = {
 	if bcream_used < 1:
 		'<font color = #DB7093>You smear the cream onto your breasts and rub it in.</font>'

locations/din_pav.qsrc

@@ -1,4 +1,4 @@
-# din_pav
+# din_pav
 
 $pavserjil = {
 	menu_off = 1
@@ -93,13 +93,13 @@ $pavser1 = {
 	*clr & cla
 	menu_off = 1
     psiho = 1
-    pcs_manna -= 30
+    pcs_mana -= 30
     gs'stat'
     '<center><img <<$set_imgh>> src="images/characters/oldtown/pavser/pavserjil.jpg" ></center>'
     'Before you appeared no longer a young man. From him it emanated a savage force and evidence were the dimensions of the body, barely distinguishable from-a beige raincoat and crumpled.'
     act 'Who you are?':
         *clr & cla        
-        pcs_manna -= 30
+        pcs_mana -= 30
         gs'stat'
 		'<center><img <<$set_imgh>> src="'+FUNC('$face_image')+'"></center>'
         '<center><img <<$set_imgh>> src="images/characters/oldtown/pavser/pavserjil.jpg" ></center>'
@@ -153,7 +153,7 @@ $pavser3 = {
     act '- The chair would look good in a hall, - You dropped it withheld.':
         *clr & cla
         sub += 15
-        pcs_manna -= 50
+        pcs_mana -= 50
         pcs_horny += 20
         gs'stat'
 		'<center><img <<$set_imgh>> src="'+FUNC('$face_image')+'"></center>'
@@ -184,7 +184,7 @@ $pavser3 = {
 $pavser4 = {
     *clr & cla
 	menu_off = 1
-    pcs_manna = pcs_manna + 60
+    pcs_mana = pcs_mana + 60
     piss = piss + 1
     
     gs'stat'
@@ -294,7 +294,7 @@ $pavser8 = {
 	menu_off = 1
 	'<center><img <<$set_imgh>> src="'+FUNC('$face_image')+'"></center>'
     pcs_horny +=10
-    pcs_manna = pcs_manna - 50
+    pcs_mana = pcs_mana - 50
     SUB = SUB + 5
     gs'stat'
     '<center><img <<$set_imgh>> src="images/characters/oldtown/pavser/pavserjil.jpg" ></center>'
@@ -310,7 +310,7 @@ $pavser8 = {
     'As well? But you do not know, Suddenly he began maniac and you now cut, and you are under hypnosis smotrelib him as a benefactor.'
     act 'The Hall':
 		*clr & cla
-        pcs_manna = mannamax
+        pcs_mana = manamax
         pcs_horny += 20
         gs'stat'
 		'<center><img <<$set_imgh>> src="'+FUNC('$face_image')+'"></center>'
@@ -373,7 +373,7 @@ $pavser9 = {
 		
                 act 'Further':
                     *clr & cla
-			        pcs_manna = mannamax
+			        pcs_mana = manamax
                     gs'stat'
                     '<center><img <<$set_imgh>> src="images/locations/oldtown/vacanthouse/sex/05.jpg" ></center>'
                     'And while your brain is trying to digest what is happening, and you understand in general how do you take...'
@@ -395,7 +395,7 @@ $pavser9 = {
 						
                         act '...':
                             *clr & cla
-			                pcs_manna = mannamax
+			                pcs_mana = manamax
 			                gs 'underwear', 'remove'
                             gs'stat'
                             '<center><img <<$set_imgh>> src="images/locations/oldtown/vacanthouse/sex/06.jpg" ></center>'
@@ -422,7 +422,7 @@ $pavser9 = {
 								
                                 act '...':
                                     *clr & cla
-			                        pcs_manna = mannamax
+			                        pcs_mana = manamax
                                     gs'stat'
                                     '<center><img <<$set_imgh>> src="images/locations/oldtown/vacanthouse/sex/08.jpg" ></center>'
                                     '...'

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

locations/dinsister.qsrc

@@ -100,12 +100,12 @@ $sischecks = {
 
 	if pirsC > 0 and pirsC < 10000 and pirsCsister = 0:
 		pirsCsister = 1
-		'You sister looks at your earrings and reaching up to hold and inspect one closely says, "Well, finally! I thought you would never get your ears pierced."'
+		'Your sister looks at your earrings and reaching up to hold and inspect one closely says, "Well, finally! I thought you would never get your ears pierced."'
 	end
 
 	if pirsD > 0 and pirsD < 10000 and pirsDsister = 0:
 		pirsDsister = 1
-		'Anja is clearly shocked by your nose ring: "Damn, <<$pcs_nickname>>, tell me who did this to you and I''ll get them for you."'
+		'Anya is clearly shocked by your nose ring: "Damn, <<$pcs_nickname>>, tell me who did this to you and I''ll get them for you."'
 		'She dances around you shadow boxing and you both end up laughing loudly.'
 	end
 

locations/drugs.qsrc

@@ -0,0 +1,141 @@
+# 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)
+!! Amphetamine: gs 'drugs', 'amphetamine' (if it isn''t svetas amphetamine, you have to add amphetamine += 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] = 'amphetamine':
+	if amphIntake < 2:
+		'<font color= blue>You swallow the white pill.</font>'
+		amphIntake += 1
+		amphetamine -=1
+		amphHigh = 12
+	else
+		'Your heart is already beating uncontrollably in your chest, you should avoid taking anymore pills.'
+	end
+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 ---------------------------------
+

locations/enemy.qsrc

@@ -50,10 +50,10 @@ if $ARGS[0] = 'hidan':
 
 	if zerkaloV > 0:
 		healthV = vitalV*10 + strenV*5
-		mannaV = intelV*magikV + magikV*100 + vitalV*10
+		manaV = intelV*magikV + magikV*100 + vitalV*10
 		willpowerV = willV*10
 		pcs_health = pcs_health - 400
-		pcs_manna -= 500
+		pcs_mana -= 500
 
 		'<b><font color = red><<$boydesc>> shouts "RITUAL BEGINS!" and stands in a circle inscribed in blood on the ground.</font></b>'
 		'<b><font color = red>He stabs himself and you feel, pain pierces the body.</font></b>'
@@ -89,7 +89,7 @@ end
 if $ARGS[0] = 'konan':
 	cla
 	if round < 6:
-		mannaV = mannaV - 10
+		manaV = manaV - 10
 		damTipV = 500
 
 		'<b><font color = red><<$boydesc>> fold marks in his hands and you are flying sheets of paper.</font></b>'
@@ -100,7 +100,7 @@ if $ARGS[0] = 'konan':
 		exit
 	elseif round >= 6:
 		if unmaterialV > 5 and defence > 0:
-			mannaV = mannaV - 250
+			manaV = manaV - 250
 			damTipV = 15000
 			bonusShV = 100
 
@@ -111,7 +111,7 @@ if $ARGS[0] = 'konan':
 			xgt'atakA1','atak'
 			exit
 		elseif unmaterialV > 5 and defence <= 0:
-			mannaV = mannaV - 20
+			manaV = manaV - 20
 			damTipV = 450
 
 			'<b><font color = red><<$boydesc>> creates paper boomerangs that fly in your direction.</font></b>'
@@ -119,7 +119,7 @@ if $ARGS[0] = 'konan':
 			xgt'atakA1','atak'
 			exit
 		elseif defenceV <= 0 and unmaterialV <= 5:
-			mannaV = mannaV - 250
+			manaV = manaV - 250
 			defenceV = defenceV + 3000
 			defenceMV = defenceMV + 3000
 			defenceWV = defenceWV + 3000
@@ -129,7 +129,7 @@ if $ARGS[0] = 'konan':
 			xgt'fight','sta'
 			exit
 		elseif unmaterialV <= 2 and konanD < 3:
-			mannaV = mannaV - 150
+			manaV = manaV - 150
 			konanD = konanD + 1
 
 			'<b><font color = red>Conan stops meditating in the air.</font></b>'
@@ -137,7 +137,7 @@ if $ARGS[0] = 'konan':
 			xgt'fight','sta'
 			exit
 		elseif konanD >= 3:
-			mannaV = mannaV - 250
+			manaV = manaV - 250
 			konanD = 0
 			unmaterialV = 20
 
@@ -157,7 +157,7 @@ if $ARGS[0] = 'sasori':
 	defenceV = defenceV + 10
 	defenceMV = defenceMV + 20
 	defenceWV = defenceWV + 50
-	mannaV = mannaV - 10
+	manaV = manaV - 10
 
 	if SasoriBody = 1 and defence > 0:
 		defSasori = defence*20/100
@@ -184,7 +184,7 @@ if $ARGS[0] = 'gedomazo':
 	elseif klon > 0 or tuman > 0:
 		klon = 0
 		tuman = 0
-		mannaV = mannaV - 500
+		manaV = manaV - 500
 
 		'<b><font color = red><<$boydesc>> issue a terrible roar and shock wave sweeps the air over the battlefield.</font></b>'
 
@@ -217,7 +217,7 @@ if $ARGS[0] = 'tobi':
 		shootV = 100
 		!Parameters
 		healthV = vitalV*10 + strenV*5
-		mannaV = intelV*magikV + magikV*100 + vitalV*10
+		manaV = intelV*magikV + magikV*100 + vitalV*10
 		willpowerV = willV*10
 		BonusAtakV = 0
 		BonusDefV = 0
@@ -227,7 +227,7 @@ if $ARGS[0] = 'tobi':
 		xgt'fight','start'
 		exit
 	elseif unmaterialV <= 2 and IzanagiV = 0 and GedoMazo > 0 and TobiStena = 0:
-		mannaV = mannaV - 500
+		manaV = manaV - 500
 		TobiStena = 1
 		defenceV = defenceV + 25000
 
@@ -238,7 +238,7 @@ if $ARGS[0] = 'tobi':
 		xgt'fight','sta'
 		exit
 	elseif unmaterialV <= 2 and IzanagiV = 0 and GedoMazo > 0 and TobiStena = 1:
-		mannaV = mannaV + 6000
+		manaV = manaV + 6000
 		TobiStena = 2
 
 		'<b><font color = red><<$boydesc>> Arcanum and makes you feel like its magical energy increases sharply.</font></b>'
@@ -262,7 +262,7 @@ if $ARGS[0] = 'tobi':
 		defenceAct = 0
 		defenceActM = 0
 		defAtk = 0
-		mannaV = mannaV - 100
+		manaV = manaV - 100
 		stunV = 1
 
 		'<b><font color = red><<$boydesc>> Close your eyes and you will see, of it as a tear ran down a drop of blood.</font></b>'
@@ -282,10 +282,10 @@ if $ARGS[0] = 'tobi':
 		exit
 	elseif unmaterialV > 0 and klon <= 0:
 		stunnerV = 1
-		mannaV = mannaV - 20
+		manaV = manaV - 20
 		magweapbonusV = 800
 
-		'<b><font color = red><<$boydesc>> attacks have gathered manna in the arm.</font></b>'
+		'<b><font color = red><<$boydesc>> attacks have gathered mana in the arm.</font></b>'
 
 		xgt'atak','enemy'
 		exit
@@ -298,7 +298,7 @@ if $ARGS[0] = 'tobi':
 		xgt'atak','enemy'
 		exit
 	elseif unmaterialV <= 0 and tobizanagi < 2:
-		mannaV = mannaV - 250
+		manaV = manaV - 250
 		tobizanagi = tobizanagi + 1
 		!unmaterialV = 10
 
@@ -307,7 +307,7 @@ if $ARGS[0] = 'tobi':
 		xgt'fight','sta'
 		exit
 	elseif unmaterialV <= 0 and tobizanagi = 2:
-		mannaV = mannaV - 250
+		manaV = manaV - 250
 		tobizanagi = 0
 		unmaterialV = 20
 		stunV = 1
@@ -324,7 +324,7 @@ if $ARGS[0] = 'kisame':
 	!software attacks Kisame
 	if defenceV <= 0 and kisamePro = 0:
 		kisamePro = 1
-		mannaV = mannaV - 150
+		manaV = manaV - 150
 		defenceV = defenceV + 1500
 		defenceMV = defenceMV + 1500
 		defenceWV = defenceWV + 1500
@@ -338,7 +338,7 @@ if $ARGS[0] = 'kisame':
 		xgt'fight','sta'
 		exit
 	elseif defenceV <= 1000 and kisamePro > 0:
-		mannaV = mannaV - 500
+		manaV = manaV - 500
 		defenceV = defenceV + 5000
 		defenceMV = defenceMV + 5000
 		defenceWV = defenceWV + 5000
@@ -364,7 +364,7 @@ if $ARGS[0] = 'kisame':
 			xgt'fight','sta'
 			exit
 		elseif kisameRAND > 0:
-			mannaV = mannaV - 250
+			manaV = manaV - 250
 			damTipV = 1500
 			damTipMV = 2500
 			bonusShV = 50
@@ -419,8 +419,8 @@ end
 if $ARGS[0] = 'fighter3':
 	cla
 	!program directly attacks
-	if tuman = 0 and tumanV < 5 and mannaV > 10:
-		mannaV = mannaV - 10
+	if tuman = 0 and tumanV < 5 and manaV > 10:
+		manaV = manaV - 10
 		tumanV = tumanV + 10
 
 		'<b><font color = red><<$boydesc>> produces a fog on the battlefield.</font></b>'
@@ -444,16 +444,16 @@ end
 if $ARGS[0] = 'fighter4':
 	cla
 	!program directly attacks
-	if tuman = 0 and tumanV < 5 and mannaV > 10:
-		mannaV = mannaV - 10
+	if tuman = 0 and tumanV < 5 and manaV > 10:
+		manaV = manaV - 10
 		tumanV = tumanV + 10
 
 		'<b><font color = red><<$boydesc>> produces a fog on the battlefield.</font></b>'
 
 		xgt'fight','sta'
 		exit
-	elseif klonV < 1 and mannaV > 15:
-		mannaV = mannaV - 15
+	elseif klonV < 1 and manaV > 15:
+		manaV = manaV - 15
 		klonV = klonV + 1
 
 		'<b><font color = green>LOST</font></b>'
@@ -477,25 +477,25 @@ end
 if $ARGS[0] = 'fighter5':
 	cla
 	!program directly attacks
-	if tuman = 0 and tumanV < 5 and mannaV > 10:
-		mannaV = mannaV - 10
+	if tuman = 0 and tumanV < 5 and manaV > 10:
+		manaV = manaV - 10
 		tumanV = tumanV + 10
 
 		'<b><font color = red><<$boydesc>> produces a fog on the battlefield.</font></b>'
 
 		xgt'fight','sta'
 		exit
-	elseif klonV < 1 and mannaV > 15:
-		mannaV = mannaV - 15
+	elseif klonV < 1 and manaV > 15:
+		manaV = manaV - 15
 		klonV = klonV + 1
 
 		'<b><font color = green>LOST</font></b>'
 
 		xgt'fight','sta'
 		exit
-	elseif stun < 1 and pcs_manna > 20:
+	elseif stun < 1 and pcs_mana > 20:
 		stunnerV = 1
-		mannaV = mannaV - 20
+		manaV = manaV - 20
 
 		'<b><font color = red><<$boydesc>> attacks you Gouge.</font></b>'
 

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

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'
 

locations/fight.qsrc

@@ -13,13 +13,13 @@ if $ARGS[0] = 'start':
 	gs'defence'
 	gs'statBat'
 
-	if SasoriBody > 2 and healthV <= 0 or SasoriBody > 2 and mannaV <= 0 or SasoriBody > 2 and willpowerV <= 0:
+	if SasoriBody > 2 and healthV <= 0 or SasoriBody > 2 and manaV <= 0 or SasoriBody > 2 and willpowerV <= 0:
 		SasoriBody = SasoriBody - 1
 		gs'priziv','sasori'
 
 		'<b><font color = red>The doll parts scatter all over and immediately head into battle mode.</font></b>'
 		'<b><font color = red>You hear the sonorous voice of Sasori, "I have a lots of dolls, you can''t beat me."</font></b>'
-	elseif SasoriBody = 2 and healthV <= 0 or SasoriBody = 2 and mannaV <= 0 or SasoriBody = 2 and willpowerV <= 0:
+	elseif SasoriBody = 2 and healthV <= 0 or SasoriBody = 2 and manaV <= 0 or SasoriBody = 2 and willpowerV <= 0:
 		SasoriBody = SasoriBody - 1
 		gs'priziv','sasori1'
 
@@ -38,7 +38,7 @@ if $ARGS[0] = 'start':
 		'<b><font color = red>Sasori moves again.</font></b>'
 	end
 
-	if GedoMazo = 1 and healthV <= 0 or GedoMazo = 1 and mannaV <= 0 or GedoMazo = 1 and willpowerV <= 0:
+	if GedoMazo = 1 and healthV <= 0 or GedoMazo = 1 and manaV <= 0 or GedoMazo = 1 and willpowerV <= 0:
 		GedoMazo = 2
 		barierV = 0
 
@@ -59,12 +59,12 @@ if $ARGS[0] = 'start':
 
 		xgt'ender','win'
 		exit
-	elseif pcs_manna <= 0 and heart = 0 and izanagi = 0:
+	elseif pcs_mana <= 0 and heart = 0 and izanagi = 0:
 		'<b><font color = red> You won!</font></b>'
 
 		xgt'ender','loss'
 		exit
-	elseif mannaV <= 0 and heartV = 0 and izanagiV = 0:
+	elseif manaV <= 0 and heartV = 0 and izanagiV = 0:
 		'<b><font color = green><<$boydesc>> lost!</font></b>'
 
 		xgt'ender','win'
@@ -81,45 +81,45 @@ if $ARGS[0] = 'start':
 		exit
 	end
 
-	if izanagiV > 0 and healthV <= 0 or izanagiV > 0 and mannaV <= 0 or izanagiV > 0 and willpowerV <= 0:
+	if izanagiV > 0 and healthV <= 0 or izanagiV > 0 and manaV <= 0 or izanagiV > 0 and willpowerV <= 0:
 		izanagiV = izanagiV - 1
 
 		'<b><font color = red><<$boydesc>> disappeared.</font></b>'
 
 		healthV = vitalV*10 + strenV*5
-		mannaV = intelV*magikV + magikV*100 + vitalV*10
+		manaV = intelV*magikV + magikV*100 + vitalV*10
 		willpowerV = willV*10
 		stunV = 0
 		if program = 6 and izanagiOnce = 0:izanagiOnce = 1 & unmaterialV = 40 & tobizanagi = 0
 
 		'<b><font color = red><<$boydesc>> appeared in front of you, completely healthy. He folded his arms and made the magic sign for Izanagi, the perfect illusion.</font></b>'
 		'<b><font color = red>The price for this spell was to sacrifice one of my eyes.</font></b>'
-	elseif heartV > 0 and healthV <= 0 or heartV > 0 and mannaV <= 0 or heartV > 0 and willpowerV <= 0:
+	elseif heartV > 0 and healthV <= 0 or heartV > 0 and manaV <= 0 or heartV > 0 and willpowerV <= 0:
 		heartV = heartV - 1
 
 		'<b><font color = red><<$boydesc>> staggered, as his heart burst.</font></b>'
 
 		healthV = vitalV*10 + strenV*5
-		mannaV = intelV*magikV + magikV*100 + vitalV*10
+		manaV = intelV*magikV + magikV*100 + vitalV*10
 		willpowerV = willV*10
 		stunV = 0
 
 		'<b><font color = red><<$boydesc>> stood up and got in a frenzy. He must have another heart.</font></b>'
-	elseif izanagi > 0 and pcs_health <= 0 or izanagi > 0 and pcs_manna <= 0 or izanagi > 0 and pcs_willpwr <= 0:
+	elseif izanagi > 0 and pcs_health <= 0 or izanagi > 0 and pcs_mana <= 0 or izanagi > 0 and pcs_willpwr <= 0:
 		izanagi = izanagi - 1
 
 		'<b><font color = green>He vanishes.</font></b>'
 
 		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_mana = (pcs_intel*pcs_magik) + pcs_magik*100 + pcs_vital*10 + rikudo
 		stun = 0
 		zerkaloV = 0
 		poisonV = 0
 		bloodV = 0
 
 		'<b><font color = green>All of a sudden he appears in front of you completely healthy.</font></b>'
-	elseif heart > 0 and pcs_health <= 0 or heart > 0 and pcs_manna <= 0 or heart > 0 and pcs_willpwr <= 0:
+	elseif heart > 0 and pcs_health <= 0 or heart > 0 and pcs_mana <= 0 or heart > 0 and pcs_willpwr <= 0:
 		heart = heart - 1
 		zerkaloV = 0
 		poisonV = 0
@@ -129,7 +129,7 @@ if $ARGS[0] = 'start':
 
 		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_mana = (pcs_intel*pcs_magik) + pcs_magik*100 + pcs_vital*10 + rikudo
 		stun = 0
 
 		'<b><font color = green>You open your eyes as you''re not dead...</font></b>'
@@ -137,11 +137,11 @@ if $ARGS[0] = 'start':
 
 	gs'before'
 	'<b>= = = = = = = = = = = = = (ROUND <<round>>) = = = = = = = = = = = = =</b>'
-	'<b><<$boydesc>></b> life <b><font color = red><<healthV>></font></b>, manna <b><font color = blue><<mannaV>></font></b>, willpower <b><font color = green><<willpowerV>></font></b>'
+	'<b><<$boydesc>></b> life <b><font color = red><<healthV>></font></b>, mana <b><font color = blue><<manaV>></font></b>, willpower <b><font color = green><<willpowerV>></font></b>'
 	if defenceV > 0:'<b><font color = red>Protection <<defenceV>> units</font></b>'
 	if defenceMV > 0:'<b><font color = red>Mana protection <<defenceMV>> units</font></b>'
 	if defenceWV > 0:'<b><font color = red>Will protection <<defenceWV>> units</font></b>'
-	'Your life <b><font color = red><<pcs_health>></font></b>, manna <b><font color = blue><<pcs_manna>></font></b>, willpower <b><font color = green><<pcs_willpwr>></font></b>'
+	'Your life <b><font color = red><<pcs_health>></font></b>, mana <b><font color = blue><<pcs_mana>></font></b>, willpower <b><font color = green><<pcs_willpwr>></font></b>'
 	if defence > 0:'<b><font color = green>Protection <<defence>> units</font></b>'
 	if defenceM > 0:'<b><font color = green>Mana impact protection <<defenceM>> units</font></b>'
 	if defenceW > 0:'<b><font color = green>Will impact protection <<defenceW>> units</font></b>'
@@ -327,11 +327,11 @@ if $ARGS[0] = 'sta':
 	hidanAtk = 0
 
 	'<b>= = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =</b>'
-	'<b><<$boydesc>></b> life <b><font color = red><<healthV>></font></b>, manna <b><font color = blue><<mannaV>></font></b>, willpower <b><font color = green><<willpowerV>></font></b>'
+	'<b><<$boydesc>></b> life <b><font color = red><<healthV>></font></b>, mana <b><font color = blue><<manaV>></font></b>, willpower <b><font color = green><<willpowerV>></font></b>'
 	if defenceV > 0:'<b><font color = red>Protection <<defenceV>> units</font></b>'
 	if defenceMV > 0:'<b><font color = red>Mana protection <<defenceMV>> units</font></b>'
 	if defenceWV > 0:'<b><font color = red>Will protection <<defenceWV>> units</font></b>'
-	'Your life <b><font color = red><<pcs_health>></font></b>, manna <b><font color = blue><<pcs_manna>></font></b>, willpower <b><font color = green><<pcs_willpwr>></font></b>'
+	'Your life <b><font color = red><<pcs_health>></font></b>, mana <b><font color = blue><<pcs_mana>></font></b>, willpower <b><font color = green><<pcs_willpwr>></font></b>'
 	if defence > 0:'<b><font color = green>Protection <<defence>> units</font></b>'
 	if defenceM > 0:'<b><font color = green>Mana impact protection <<defenceM>> units</font></b>'
 	if defenceW > 0:'<b><font color = green>Will impact protection <<defenceW>> units</font></b>'

locations/flash.qsrc

@@ -12,25 +12,68 @@
 !!There is no continue action so you must add this as required
 !!You should add checks for underwear before allowing the player to flash them but a non-event contingency is included
 
+if $ARGS[0] = 'flashtotals':
+	dress_ind_bra = 3
+	dress_ind_tits = 12
+	dress_ind_panties = 4
+	dress_ind_pussy = 8
+	dress_ind_pussy_hairy = 9
+	dress_ind_pantyrear = 12
+	dress_ind_butt = 7
+	dress_ind_full = 5
+	dress_ind_full_hairy = 7
+	
+	dress_out_bra = 4
+	dress_out_tits = 20
+	dress_out_panties = 18
+	dress_out_pussy = 19
+	dress_out_pussy_hairy = 9
+	dress_out_pantyrear = 8
+	dress_out_butt = 9
+	dress_out_full = 13
+	dress_out_full_hairy = 11
+	
+	pants_ind_bra = 6
+	pants_ind_tits = 19
+	pants_ind_panties = 1
+	pants_ind_pussy = 4
+	pants_ind_pussy_hairy = 3
+	pants_ind_pantyrear = 1
+	pants_ind_butt = 6
+	pants_ind_full = 1
+	pants_ind_full_hairy = 1
+	
+	pants_out_bra = 5
+	pants_out_tits = 19
+	pants_out_panties = 6
+	pants_out_pussy = 11
+	pants_out_pussy_hairy = 8
+	pants_out_pantyrear = 10
+	pants_out_butt = 19
+	pants_out_full = 9
+	pants_out_full_hairy = 6
+end
+
 if $ARGS[0] = 'bra':
 	*clr
 	if Exhibitionist_lvl < 1 or pcs_inhib < 40: gs 'exhibitionism', 1
 	gs 'arousal', 'flashlite', ARGS[2]
 	gs 'arousal', 'end'
+	gs 'flashtotals'
 	if PCloSkirt > 0:
 		if $ARGS[1] = 'inside':
-			'<center><img <<$set_imgh>> src="images/pc/flashing/dress/inside/bra/' + rand(1,3) + '.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/flashing/dress/inside/bra/' + rand(1,dress_ind_bra) + '.jpg"></center>'
 			'You glance around to see who all is in the area, then you pull up your top and expose your bra clad breasts to the world. Most people don''t notice but a few do, some smile, others frown or shake their head in disgust. You pull your top back down, feeling the thrill of excitement running down your spine.'
 		else
-			'<center><img <<$set_imgh>> src="images/pc/flashing/dress/outside/bra/' + rand(1,3) + '.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/flashing/dress/outside/bra/' + rand(1,dress_out_bra) + '.jpg"></center>'
 			'You glance around to see who all is in the area, then you pull up your top and expose your bra clad breasts to the world. Most people don''t notice but a few do, some smile, others frown or shake their head in disgust. You pull your top back down, feeling the thrill of excitement running down your spine.'
 		end
 	else
 		if $ARGS[1] = 'inside':
-			'<center><img <<$set_imgh>> src="images/pc/flashing/pants/inside/bra/' + rand(1,6) + '.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/flashing/pants/inside/bra/' + rand(1,pants_ind_bra) + '.jpg"></center>'
 			'You glance around to see who all is in the area, then you pull up your top and expose your bra clad breasts to the world. Most people don''t notice but a few do, some smile, others frown or shake their head in disgust. You pull your top back down, feeling the thrill of excitement running down your spine.'
 		else
-			'<center><img <<$set_imgh>> src="images/pc/flashing/pants/outside/bra/' + rand(1,4) + '.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/flashing/pants/outside/bra/' + rand(1,pants_out_bra) + '.jpg"></center>'
 			'You glance around to see who all is in the area, then you pull up your top and expose your bra clad breasts to the world. Most people don''t notice but a few do, some smile, others frown or shake their head in disgust. You pull your top back down, feeling the thrill of excitement running down your spine.'
 		end
 	end
@@ -41,20 +84,21 @@ if $ARGS[0] = 'tits':
 	gs 'exhibitionism', 1
 	gs 'arousal', 'flashlite', ARGS[2]
 	gs 'arousal', 'end'
+	gs 'flashtotals'
 	if PCloSkirt > 0:
 		if $ARGS[1] = 'inside':
-			'<center><img <<$set_imgh>> src="images/pc/flashing/dress/inside/tits/' + rand(1,8) + '.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/flashing/dress/inside/tits/' + rand(1,dress_ind_tits) + '.jpg"></center>'
 			'You glance around to see who all is in the area, then you pull up your top and expose your bare breasts to the world. Most people don''t notice but a few do, some smile, others frown or shake their head in disgust. You pull your top back down, feeling the thrill of excitement running down your spine.'
 		else
-			'<center><img <<$set_imgh>> src="images/pc/flashing/dress/outside/tits/' + rand(1,12) + '.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/flashing/dress/outside/tits/' + rand(1,dress_out_tits) + '.jpg"></center>'
 			'You glance around to see who all is in the area, then you pull up your top and expose your bare breasts to the world. Most people don''t notice but a few do, some smile, others frown or shake their head in disgust. You pull your top back down, feeling the thrill of excitement running down your spine.'
 		end
 	else
 		if $ARGS[1] = 'inside':
-			'<center><img <<$set_imgh>> src="images/pc/flashing/pants/inside/tits/' + rand(1,8) + '.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/flashing/pants/inside/tits/' + rand(1,pants_ind_tits) + '.jpg"></center>'
 			'You glance around to see who all is in the area, then you pull up your top and expose your bare breasts to the world. Most people don''t notice but a few do, some smile, others frown or shake their head in disgust. You pull your top back down, feeling the thrill of excitement running down your spine.'
 		else
-			'<center><img <<$set_imgh>> src="images/pc/flashing/pants/outside/tits/' + rand(1,14) + '.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/flashing/pants/outside/tits/' + rand(1,pants_out_tits) + '.jpg"></center>'
 			'You glance around to see who all is in the area, then you pull up your top and expose your bare breasts to the world. Most people don''t notice but a few do, some smile, others frown or shake their head in disgust. You pull your top back down, feeling the thrill of excitement running down your spine.'
 		end
 	end
@@ -65,20 +109,21 @@ if $ARGS[0] = 'panties':
 	gs 'exhibitionism', 2
 	gs 'arousal', 'flash', ARGS[2]
 	gs 'arousal', 'end'
+	gs 'flashtotals'
 	if PCloSkirt > 0:
 		if $ARGS[1] = 'inside':
-			'<center><img <<$set_imgh>> src="images/pc/flashing/dress/inside/panty/' + rand(1,4) + '.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/flashing/dress/inside/panty/' + rand(1,dress_ind_panties) + '.jpg"></center>'
 			'You glance around to see who all is in the area, then you lift the front of your skirt to show off your panties. Most people don''t notice but a few do, some smile, others frown or shake their head in disgust. You lower the skirt back and place, feeling the thrill of excitement running down your spine.'
 		else
-			'<center><img <<$set_imgh>> src="images/pc/flashing/dress/outside/panty/' + rand(1,16) + '.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/flashing/dress/outside/panty/' + rand(1,dress_out_panties) + '.jpg"></center>'
 			'You glance around to see who all is in the area, then you lift the front of your skirt to show off your panties. Most people don''t notice but a few do, some smile, others frown or shake their head in disgust. You lower the skirt back and place, feeling the thrill of excitement running down your spine.'
 		end
 	else
 		if $ARGS[1] = 'inside':
-			'<center><img <<$set_imgh>> src="images/pc/flashing/pants/inside/panty/1.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/flashing/pants/inside/panty/' + rand(1,pants_ind_panties) + '.jpg"></center>'
 			'You glance around to see who all is in the area, then you pull down the front of your pants to show off your panties. Most people don''t notice but a few do, some smile, others frown or shake their head in disgust. You pull your pants back up, feeling the thrill of excitement running down your spine.'
 		else
-			'<center><img <<$set_imgh>> src="images/pc/flashing/pants/outside/panty/' + rand(1,6) + '.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/flashing/pants/outside/panty/' + rand(1,pants_out_panties) + '.jpg"></center>'
 			'You glance around to see who all is in the area, then you pull down the front of your pants to show off your panties. Most people don''t notice but a few do, some smile, others frown or shake their head in disgust. You pull your pants back up, feeling the thrill of excitement running down your spine.'
 		end
 	end
@@ -89,35 +134,36 @@ if $ARGS[0] = 'pussy':
 	gs 'exhibitionism', 3
 	gs 'arousal', 'flash', ARGS[2]
 	gs 'arousal', 'end'
+	gs 'flashtotals'
 	if PCloSkirt > 0:
 		if $ARGS[1] = 'inside':
 			if pcs_pubes <= 20:
-				'<center><img <<$set_imgh>> src="images/pc/flashing/dress/inside/pussy/' + rand(1,7) + '.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/pc/flashing/dress/inside/pussy/' + rand(1,dress_ind_pussy) + '.jpg"></center>'
 			else
-				'<center><img <<$set_imgh>> src="images/pc/flashing/dress/inside/pussy/hairy' + rand(1,7) + '.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/pc/flashing/dress/inside/pussy/hairy' + rand(1,dress_ind_pussy_hairy) + '.jpg"></center>'
 			end
 			'You glance around to see who all is in the area, then you pull up the front of your skirt to show off your pussy. Most people don''t notice but a few do, some smile, others frown or shake their head in disgust. You lower the skirt back and place, feeling the thrill of excitement running down your spine.'
 		else
 			if pcs_pubes <= 20:
-				'<center><img <<$set_imgh>> src="images/pc/flashing/dress/outside/pussy/' + rand(1,13) + '.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/pc/flashing/dress/outside/pussy/' + rand(1,dress_out_pussy) + '.jpg"></center>'
 			else
-				'<center><img <<$set_imgh>> src="images/pc/flashing/dress/outside/pussy/hairy' + rand(1,6) + '.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/pc/flashing/dress/outside/pussy/hairy' + rand(1,dress_out_pussy_hairy) + '.jpg"></center>'
 			end
 			'You glance around to see who all is in the area, then you pull up the front of your skirt to show off your pussy. Most people don''t notice but a few do, some smile, others frown or shake their head in disgust. You lower the skirt back and place, feeling the thrill of excitement running down your spine.'
 		end
 	else
 		if $ARGS[1] = 'inside':
 			if pcs_pubes <= 20:
-				'<center><img <<$set_imgh>> src="images/pc/flashing/pants/inside/pussy/' + rand(1,4) + '.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/pc/flashing/pants/inside/pussy/' + rand(1,pants_ind_pussy) + '.jpg"></center>'
 			else
-				'<center><img <<$set_imgh>> src="images/pc/flashing/pants/inside/pussy/hairy' + rand(1,3) + '.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/pc/flashing/pants/inside/pussy/hairy' + rand(1,pants_ind_pussy_hairy) + '.jpg"></center>'
 			end
 			'You glance around to see who all is in the area, then you pull down the front of your pants to show off your pussy. Most people don''t notice but a few do, some smile, others frown or shake their head in disgust. You pull your pants back up, feeling the thrill of excitement running down your spine.'
 		else
 			if pcs_pubes <= 20:
-				'<center><img <<$set_imgh>> src="images/pc/flashing/pants/outside/pussy/' + rand(1,9) + '.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/pc/flashing/pants/outside/pussy/' + rand(1,pants_out_pussy) + '.jpg"></center>'
 			else
-				'<center><img <<$set_imgh>> src="images/pc/flashing/pants/outside/pussy/hairy' + rand(1,7) + '.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/pc/flashing/pants/outside/pussy/hairy' + rand(1,pants_out_pussy_hairy) + '.jpg"></center>'
 			end
 			'You glance around to see who all is in the area, then you pull down the front of your pants to show off your pussy. Most people don''t notice but a few do, some smile, others frown or shake their head in disgust. You pull your pants back up, feeling the thrill of excitement running down your spine.'
 		end
@@ -129,20 +175,21 @@ if $ARGS[0] = 'panties_rear':
 	gs 'exhibitionism', 2
 	gs 'arousal', 'flash', ARGS[2]
 	gs 'arousal', 'end'
+	gs 'flashtotals'
 	if PCloSkirt > 0:
 		if $ARGS[1] = 'inside':
-			'<center><img <<$set_imgh>> src="images/pc/flashing/dress/inside/pantyrear/' + rand(1,4) + '.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/flashing/dress/inside/pantyrear/' + rand(1,dress_ind_pantyrear) + '.jpg"></center>'
 			'You glance around to see who all is in the area, then you pull up your skirt to show off your pantied butt. Most people don''t notice but a few do, some smile, others frown or shake their head in disgust. You lower the skirt back and place, feeling the thrill of excitement running down your spine.'
 		else
-			'<center><img <<$set_imgh>> src="images/pc/flashing/dress/outside/pantyrear/' + rand(1,6) + '.jpg"></center>'
-			'You glance around to see who all is in the area, then you pull up your skirt to show off your pantied. Most people don''t notice but a few do, some smile, others frown or shake their head in disgust. You lower the skirt back and place, feeling the thrill of excitement running down your spine.'
+			'<center><img <<$set_imgh>> src="images/pc/flashing/dress/outside/pantyrear/' + rand(1,dress_out_pantyrear) + '.jpg"></center>'
+			'You glance around to see who all is in the area, then you pull up your skirt to show off your panties. Most people don''t notice but a few do, some smile, others frown or shake their head in disgust. You lower the skirt back and place, feeling the thrill of excitement running down your spine.'
 		end
 	else
 		if $ARGS[1] = 'inside':
-			'<center><img <<$set_imgh>> src="images/pc/flashing/pants/inside/pantyrear/1.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/flashing/pants/inside/pantyrear/' + rand(1,pants_ind_pantyrear) + '.jpg"></center>'
 			'You glance around to see who all is in the area, then you pull down the back of your pants to show off your panty clad butt. Most people don''t notice but a few do, some smile, others frown or shake their head in disgust. You pull your pants back up, feeling the thrill of excitement running down your spine.'
 		else
-			'<center><img <<$set_imgh>> src="images/pc/flashing/pants/outside/pantyrear/' + rand(1,6) + '.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/flashing/pants/outside/pantyrear/' + rand(1,pants_out_pantyrear) + '.jpg"></center>'
 			'You glance around to see who all is in the area, then you pull down the back of your pants to show off your panty clad butt. Most people don''t notice but a few do, some smile, others frown or shake their head in disgust. You pull your pants back up, feeling the thrill of excitement running down your spine.'
 		end
 	end
@@ -153,20 +200,21 @@ if $ARGS[0] = 'butt':
 	gs 'exhibitionism', 2
 	gs 'arousal', 'flash', ARGS[2]
 	gs 'arousal', 'end'
+	gs 'flashtotals'
 	if PCloSkirt > 0:
 		if $ARGS[1] = 'inside':
-			'<center><img <<$set_imgh>> src="images/pc/flashing/dress/inside/butt/' + rand(1,7) + '.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/flashing/dress/inside/butt/' + rand(1,dress_ind_butt) + '.jpg"></center>'
 			'You glance around to see who all is in the area, then you pull up the back of your skirt to show off your butt. Most people don''t notice but a few do, some smile, others frown or shake their head in disgust. You lower the skirt back in place, feeling the thrill of excitement running down your spine.'
 		else
-			'<center><img <<$set_imgh>> src="images/pc/flashing/dress/outside/butt/' + rand(1,9) + '.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/flashing/dress/outside/butt/' + rand(1,dress_out_butt) + '.jpg"></center>'
 			'You glance around to see who all is in the area, then you pull up the back of your skirt to show off your butt. Most people don''t notice but a few do, some smile, others frown or shake their head in disgust. You lower the skirt back in place, feeling the thrill of excitement running down your spine.'
 		end
 	else
 		if $ARGS[1] = 'inside':
-			'<center><img <<$set_imgh>> src="images/pc/flashing/pants/inside/butt/' + rand(1,6) + '.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/flashing/pants/inside/butt/' + rand(1,pants_ind_butt) + '.jpg"></center>'
 			'You glance around to see who all is in the area, then you pull down the back of your pants to show off your butt. Most people don''t notice but a few do, some smile, others frown or shake their head in disgust. You pull your pants back up, feeling the thrill of excitement running down your spine.'
 		else
-			'<center><img <<$set_imgh>> src="images/pc/flashing/pants/outside/butt/' + rand(1,16) + '.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/flashing/pants/outside/butt/' + rand(1,pants_out_butt) + '.jpg"></center>'
 			'You glance around to see who all is in the area, then you pull down the back of your pants to show off your butt. Most people don''t notice but a few do, some smile, others frown or shake their head in disgust. You pull your pants back up, feeling the thrill of excitement running down your spine.'
 		end
 	end
@@ -177,35 +225,36 @@ if $ARGS[0] = 'full':
 	gs 'exhibitionism', 3
 	gs 'arousal', 'flash', ARGS[2]
 	gs 'arousal', 'end'
+	gs 'flashtotals'
 	if PCloSkirt > 0:
 		if $ARGS[1] = 'inside':
 			if pcs_pubes <= 20:
-				'<center><img <<$set_imgh>> src="images/pc/flashing/dress/inside/full/' + rand(1,5) + '.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/pc/flashing/dress/inside/full/' + rand(1,dress_ind_full) + '.jpg"></center>'
 			else
-				'<center><img <<$set_imgh>> src="images/pc/flashing/dress/inside/full/hairy' + rand(1,6) + '.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/pc/flashing/dress/inside/full/hairy' + rand(1,dress_ind_full_hairy) + '.jpg"></center>'
 			end
 			'Making sure there are no children around and its not too busy you lift your skirt and top to expose both your pussy and breasts. Most people who see you are shocked but some look at you admiringly. You quickly cover up again enjoying a buzz of excitement.'
 		else
 			if pcs_pubes <= 20:
-				'<center><img <<$set_imgh>> src="images/pc/flashing/dress/outside/full/' + rand(1,11) + '.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/pc/flashing/dress/outside/full/' + rand(1,dress_out_full) + '.jpg"></center>'
 			else
-				'<center><img <<$set_imgh>> src="images/pc/flashing/dress/outside/full/hairy' + rand(1,10) + '.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/pc/flashing/dress/outside/full/hairy' + rand(1,dress_out_full_hairy) + '.jpg"></center>'
 			end
 			'Making sure there are no children around and its not too busy you lift your skirt and top to expose both your pussy and breasts. Most people who see you are shocked but some look at you admiringly. You quickly cover up again enjoying a buzz of excitement.'
 		end
 	else
 		if $ARGS[1] = 'inside':
 			if pcs_pubes <= 20:
-				'<center><img <<$set_imgh>> src="images/pc/flashing/pants/inside/full/1.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/pc/flashing/pants/inside/full/' + rand(1,pants_ind_full) + '.jpg"></center>'
 			else
-				'<center><img <<$set_imgh>> src="images/pc/flashing/pants/inside/full/hairy1.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/pc/flashing/pants/inside/full/hairy' + rand(1,pants_ind_full_hairy) + '.jpg"></center>'
 			end
 			'Making sure there are no children around and its not too busy you lower your pants and lift your top to expose both your pussy and breasts. Most people who see you are shocked but some look at you admiringly. You quickly cover up again enjoying a buzz of excitement.'
 		else
 			if pcs_pubes <= 20:
-				'<center><img <<$set_imgh>> src="images/pc/flashing/pants/outside/full/' + rand(1,7) + '.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/pc/flashing/pants/outside/full/' + rand(1,pants_out_full) + '.jpg"></center>'
 			else
-				'<center><img <<$set_imgh>> src="images/pc/flashing/pants/outside/full/hairy' + rand(1,6) + '.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/pc/flashing/pants/outside/full/hairy' + rand(1,pants_out_full_hairy) + '.jpg"></center>'
 			end
 			'Making sure there are no children around and its not too busy you lower your pants and lift your top to expose both your pussy and breasts. Most people who see you are shocked but some look at you admiringly. You quickly cover up again enjoying a buzz of excitement.'
 		end

locations/gLakeNude.qsrc

@@ -1,6 +1,5 @@
 # gLakeNude
 
-
 $location_type = 'secluded'
 $loc = 'gLakeNude'
 $metka = ''
@@ -10,64 +9,71 @@ $locclass = 'beach'
 menu_off = 0
 *clr & cla
 gs'stat'
-
+!!check to make sure I did the sound call correct
+if sound = 0:PLAY 'sound/lakeshore2.mp3',20
 '<center><H4>Secluded beach</H4></center>'
-if month>=3 and month<=5:
-	if hour>=6 and hour<=17:
+if month >= 3 and month <= 5:
+	if hour >= 6 and hour <= 17:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/lake.spring.jpg"></center>'
 	else
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/lake.spring.night.jpg"></center>'
 	end
-	'<center>A small lake, located not far from Pavlovsk. You''re not sure whether Pavlovsk was built near the lake on purpose or not.</center>'
+	'<center>This small natural beach is hidden away from the general public on a inlet of the lake. To reach it you had to travel around the lake along a forest trail. Not many people use this area of the beach, other than some those seeking privacy, or some of the local kids. Except in winter, so they can use the sauna at the edge of the forest.</center>'
 	*nl
-end
-if month>=6 and month<=8:
-	if hour>=6 and hour<=19:
+elseif month >= 6 and month <= 8:
+	if hour >= 6 and hour <= 19:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/lake.summer.jpg"></center>'
 	else
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/lake.summer.night.jpg"></center>'
 	end
-	'<center>A small lake, located not far from Pavlovsk. You''re not sure whether Pavlovsk was built near the lake on purpose or not.</center>'
+	'<center>This small natural beach is hidden away from the general public on a inlet of the lake. To reach it you had to travel around the lake along a forest trail. Not many people use this area of the beach, other than some those seeking privacy, or some of the local kids. Except in winter, so they can use the sauna at the edge of the forest.</center>'
 	*nl
-end
-if month>=9 and month<=11:
-	if hour>=6 and hour<=18:
+elseif month >= 9 and month <= 11:
+	if hour >= 6 and hour <= 18:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/lake.autumn.jpg"></center>'
 	else
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/lake.autumn.night.jpg"></center>'
 	end
-	'<center>A small lake, located not far from Pavlovsk. You''re not sure whether Pavlovsk was built near the lake on purpose or not.</center>'
+	'<center>This small natural beach is hidden away from the general public on a inlet of the lake. To reach it you had to travel around the lake along a forest trail. Not many people use this area of the beach, other than some those seeking privacy, or some of the local kids. Except in winter, so they can use the sauna at the edge of the forest.</center>'
 	*nl
-end
-if month=1 or month=2 or month=12:
-	if hour>=7 and hour<=16:
+elseif month < 3 or month = 12:
+	if hour >= 7 and hour <= 16:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/lake.winter.jpg"></center>'
 	else
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/lake.winter.night.jpg"></center>'
 	end
-	'<center>A small lake, located not far from Pavlovsk. You''re not sure whether Pavlovsk was built near the lake on purpose or not.</center>'
-	'<center>Ever since winter arrived, the lake in Pavlovsk has been frozen over. The lake is being used as a skating rink and lots of people go to skate there every day; if you have skates you could join them.</center>'
+	'<center>This small natural beach is hidden away from the general public on a inlet of the lake. To reach it you had to travel around the lake along a forest trail. Not many people use this area of the beach, other than some those seeking privacy, or some of the local kids. Except in winter, so they can use the sauna at the edge of the forest.</center>'
+	'<center>Ever since winter arrived, the lake in Pavlovsk has been frozen over. A small part of the inlet has the ice broken, so those that wish to take a refershing dip in the icy cold water can, after using the sauna.</center>'
 	*nl
 end
 
-'This small natural beach is hidden away from the general public. To reach it you had to travel around the lake along a forest trail. On this secluded beach you can often find sunbathers and people skinny dipping, including people from other towns and even some from the city.'
-
-if month >= 3 and month <= 8:
+if storyline = 1 and month >= 3 and month <= 8:
 	if week >= 6 and hour >= 8 and hour <= 10:
 		'You''re walking down the secluded beach, enjoying the tranquility when all of a sudden you hear some heavy running steps coming up behind you followed by heavy panting. Expecting the worse, you turn around only to see a sweaty <a href="exec:gt ''gschool_socialchg1'', ''tIvan''">Ivan</a>, closely followed by <a href="exec:gt ''gschool_socialchg1'', ''tFedor''">Feodor</a>.'
 	end
 end
 
-if $clothingworntype = 'swimwear' or $clothingworntype = 'nude':
-	act'Get dressed':
+if $clothingworntype = 'nude':
+	act'Put your clothes back on':
 		*clr & cla
 		menu_off = 1
 		minut+=5
 		gs 'clothing', 'wear_last_worn'
 		gs 'underwear', 'wear'
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/dress/dress_nudebeach.jpg"></center>'
-		'You put your clothes back on.'
-		act'Continue':gt'gLakeNude'
+		nudelake = rand(1,10)
+		if nudelake <= 2:
+			minut += 5
+			pcs_mood -= 5
+			pcs_willpwr -= 5
+			gs 'exhibitionism', 4
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/noclothes.jpg"></center>'
+			'You return to the place where you thought you put your clothes to get dressed... except you can''t find them. Oh crap, you can''t find them! You desperately search the beach for a while, while a few passers-by look amused at the naked girl running around the beach. When you can''t find them, you panic and run all the way home... hopefully they''ll turn up.'
+			act 'Run home naked': gt 'glake', 'nude_home'
+		else
+			'You return to the place where you left your clothes, and put them back on.'
+			act'Continue':gt'glake'
+		end
 	end
 end
 
@@ -76,30 +82,57 @@ if temper >= 15 and month >= 5 and month <= 9:
 		act'Change into your swimwear':
 			*clr & cla
 			menu_off = 1
-			minut+=5
+			minut += 5
+			gs 'stat'
 			if pcs_horny >= 90:
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/self/wetpussypants1.jpg"></center>'
 				'You want to change into a swimsuit, but with no changing room here and your pussy oozing juices down your leg coupled with the thought that people will see, horrifies you. You abandon the idea.'
 				'"I should sort out my arousal first." You think to yourself.'
-
 				act'Continue':gt'gLakeNude'
 			else
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/dress/swimsuit_nudebeach.jpg"></center>'
 				'You wrap a towel around yourself and you''re ready to change into your swimsuit.'
-
 				act'Choose outfit':gt'changingroom', 'view_swim_list'
 			end
 		end
 	end
 end
 
-if temper >= 15 and month >= 5 and month <= 9:
+act 'Go to sauna': gt 'gLakeNude', 'sauna'
+
+if temper >= 15 and month>=5 and month<=9 and hour>=6 and hour<=20:
+	act 'Take a walk along the beach (30 minutes)':
+		*clr & cla
+		menu_off = 1
+		minut += 30
+		pcs_willpwr += 5
+		pcs_mood += 5
+		gs'stat'
+
+		if $clothingworntype = 'swimwear' and pcs_hips<=90:
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/lake.walk.bikini0,'+rand(0,3)+'.jpg"></center>'
+		elseif $clothingworntype = 'swimwear' and pcs_hips >= 90 and pcs_hips<=110:
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/lake.walk.bikini.fat0,0.jpg"></center>'
+		elseif $clothingworntype = 'swimwear' and pcs_hips>=110:
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/lake.walk.bikini.fat0,1.jpg"></center>'
+			if pcs_inhib < 50:inhib_exp += rand(1,2)
+		elseif $clothingworntype = 'nude':
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/walknude.jpg"></center>'
+			inhib_exp += rand(1,3)
+		else
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/lake.walk0,'+rand(0,2)+'.jpg"></center>'
+		end
+
+		'You walk along the beach, enjoying the feeling of the sun on your body.'
+		act 'Continue':gt'glake'
+	end
 	if $clothingworntype ! 'nude':
 		act'Take off your clothes':
 			menu_off = 1
 			if pcs_inhib > 30:
 				*clr & cla
 				minut+=5
+				inhib_exp += rand(1,3)
 				gs 'clothing', 'strip'
 				gs 'underwear', 'remove'
 				if pcs_horny >= 80 and exhibitionist_lvl > 1:
@@ -113,8 +146,7 @@ if temper >= 15 and month >= 5 and month <= 9:
 					'You quickly check to see if anyone is watching, and when you''re satisfied no one is paying you undue attention, you take off your clothes. You''re naked now.'
 				end
 			else
-				cla
-				*clr
+				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/self/shyness.jpg"></center>'
 				'Even though no one is around, you don''t feel confident enough to actually take your clothes off. What if someone would see you nude?'
 			end
@@ -122,14 +154,13 @@ if temper >= 15 and month >= 5 and month <= 9:
 		end
 	end
 	if hour >= 6 and hour <= 20:
-		act'Go swimming (1:00)':
+		act'Go swimming (30 minutes)':
 			menu_off = 1
 			if $clothingworntype = 'swimwear' or $clothingworntype = 'nude':
 				*clr & cla
 				cumspclnt = 4
 				gs 'cum_cleanup'
-				minut = minut + 60
-				pcs_sweat = 10 + rand(0,4)
+				minut = minut + 30
 				pcs_mood += 5
 				pcs_willpwr = pcs_willpwr + 5
 				if $clothingworntype = 'swimwear':
@@ -138,11 +169,13 @@ if temper >= 15 and month >= 5 and month <= 9:
 					inhib_exp += rand(1,3)
 				end
 				if pcs_stren < 30: stren_exp += 1
-
+				fat -= 1
 				if $clothingworntype = 'nude':
-					'<center><img <<$set_imgh>> src="images/locations/shared/lake/nudeswim.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/swimnude.jpg"></center>'
+					inhib_exp += rand(1,2)
 				else
-					'<center><img <<$set_imgh>> src="images/locations/shared/lake/swim.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/swim.jpg"></center>'
+					if pcs_inhib < 50:inhib_exp += rand(1,2)
 				end
 				'You play around and have fun in the lake, enjoying the feel of the warm water on your naked body. The clean lake water refreshes and invigorates you.'
 
@@ -155,31 +188,29 @@ if temper >= 15 and month >= 5 and month <= 9:
 		end
 	end
 	if sunWeather = 1 and hour >= 6 and hour <= 20:
-		act'Go sunbathing (1:00)':
+		act'Go sunbathing (30 minutes)':
 			menu_off = 1
 			if $clothingworntype = 'swimwear' or $clothingworntype = 'nude':
 				*clr & cla
-				minut = minut + 60
+				minut = minut + 30
 				if pcs_sweat < 35 : pcs_sweat += 5
 				pcs_mood += 5
 				if $clothingworntype = 'swimwear':
-					'<center><img <<$set_imgh>> src="images/locations/shared/lake/zagar.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/sunbath.jpg"></center>'
 					if pcs_inhib < 50:inhib_exp += rand(1,2)
 				else
-					'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/nudezagarat.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/sunbathnude.jpg"></center>'
 					inhib_exp += rand(1,3)
 				end
 				if krem = 0:
 					pcs_tan = pcs_tan + 1
-					'You lie down on your towel for some sunbathing and hopefully a nicer tan, and enjoy the warm rays of the sun for an hour.'
+					'You lie down on your towel for some sunbathing and hopefully a nicer tan, and enjoy the warm rays of the sun on your body.'
 				else:
 					krem = krem - 1
 					pcs_tan = pcs_tan + 3
-					'You smear your body with sunscreen and lie down on your towel for some sunbathing, hoping to work on your tan. You enjoy the warm rays of the sun for an hour.'
+					'You smear your body with sunscreen and lie down on your towel for some sunbathing, hoping to work on your tan. You enjoy the warm rays of the sun on your body.'
 				end
 				act 'Continue':gt'gLakeNude'
-			!end
-			!if bikini ! 1 and $clothingworntype ! 'nude':
 			else
 				cla
 				'You have to take off your clothes before you can lay down to sunbath.'
@@ -189,16 +220,177 @@ if temper >= 15 and month >= 5 and month <= 9:
 	end
 end
 
-! Imported from Province 03/17/2017 by Finn_Macha
-! Global variable "voyeurism_start" responsible for the start of Events peeping on the beach and allows the player to peek at the nudists.
-! It Is used only here, but between the first and second tick may take a lot of playing time, and therefore defined globally.
+if $ARGS[0] = 'sauna':
+	*clr & cla
+	$menu_loc = 'gLakeNude'
+	$menu_arg = 'sauna'
+	menu_off = 0
+	minut += 3
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/secluded_beach/sauna/sauna.jpg"></center>'
+	'You walk up the small trail from the beach to the sauna, it is newly built. They say it was built for the tourist, but if that is true, you wonder why they put it on the secluded beach and even then a little ways back from the beach. Surely no tourist would ever find it, either way you and many others are glad they built it. It is well built and nice inside and out, there is three areas to the sauna. The mens section, womens section, and a co-ed section, to use the sauna you need a bikini or some people use it naked.'
+	
+	act 'Go back to the beach': gt 'gLakeNude'
+	
+	if ARRSIZE('swimwear') > 0: act 'Use changing room':gt 'changingroom', 'view_swim_list'
+		
+	if $clothingworntype ! 'nude':
+		act'Take off your clothes':
+			*clr & cla
+			menu_off = 1
+			minut+=5
+			gs 'clothing', 'strip'
+			gs 'underwear', 'remove'
+			gs 'stat'
+			'You strip out of your clothes, folding them neatly and placing them in one of the open shelves.'
+			act 'Continue': gt 'gLakeNude', 'sauna'
+		end
+	end
+
+	if $clothingworntype = 'nude' or $clothingworntype = 'swimwear':	
+		act 'Go to the womens section':
+			*clr & cla
+			menu_off = 1
+			minut += 2
+			gs 'stat'
+			if hour < 8 or hour > 22:
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/secluded_beach/sauna/saunaempty.jpg"></center>'
+				'It appears to be empty at the moment.'
+			else
+				saunarand = rand(1,5)
+				if saunarand = 1:
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/secluded_beach/sauna/womennude.jpg"></center>'
+					'You find several other girls inside completely naked using the sauna.'
+				elseif saunarand > 4:
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/secluded_beach/sauna/womenbikini.jpg"></center>'
+					'You find several other girls inside using the sauna while wearing their bikinis.'
+				else
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/secluded_beach/sauna/saunaempty.jpg"></center>'
+					'It appears to be empty at the moment.'
+				end
+			end
+			act 'Leave': gt 'gLakeNude', 'sauna'
+			act 'Use the sauna':
+				*clr & cla
+				minut +=30
+				pcs_mood += 5
+				pcs_willpwr += 5
+				if $clothingworntype = 'swimwear':
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/saunabikini.jpg"></center>'
+					if pcs_inhib < 50:inhib_exp += rand(0,1)
+				else
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/saunanude.jpg"></center>'
+					inhib_exp += rand(1,2)
+				end
+				gs 'stat'
+				'You spend 30 minutes relaxing in the sauna.'
+				
+				act 'Leave': gt 'gLakeNude', 'sauna'
+				if month = 12 or month < 3: gs 'gLakeNude', 'ice_plunge'
+			end
+		end
+		act 'Go to the mens section':
+			*clr & cla
+			menu_off = 1
+			minut += 2
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/secluded_beach/sauna/saunaempty.jpg"></center>'
+			'It appears to be empty at the moment.'
+			act 'Leave': gt 'gLakeNude', 'sauna' 
+			act 'Use the sauna':
+				*clr & cla
+				minut += 30
+				pcs_mood += 5
+				pcs_willpwr += 5
+				if $clothingworntype = 'swimwear':
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/saunabikini.jpg"></center>'
+					if pcs_inhib < 50:inhib_exp += rand(0,1)
+				else
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/saunanude.jpg"></center>'
+					inhib_exp += rand(1,2)
+				end
+				'You spend 30 minutes relaxing in the sauna.'
+				
+				act 'Leave': gt 'gLakeNude', 'sauna'
+				if month = 12 or month < 3: gs 'gLakeNude', 'ice_plunge'
+			end
+		end
+		act 'Go to the co-ed section':
+			*clr & cla
+			menu_off = 1
+			minut += 2
+			gs 'stat'			
+			if hour < 8 or hour > 22:
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/secluded_beach/sauna/saunaempty.jpg"></center>'
+				'It appears to be empty at the moment.'
+			else
+				saunarand = rand(1,5)
+				if saunarand = 1:
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/secluded_beach/sauna/coednude.jpg"></center>'
+					'You find several other people in here, men and women. All of them completely naked.'
+				elseif saunarand > 4:
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/secluded_beach/sauna/coedtowel.jpg"></center>'
+					'You find several other people in here, men and women. Some are wearing swim wear and others towels.'
+				else
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/secluded_beach/sauna/saunaempty.jpg"></center>'
+					'It appears to be empty at the moment.'
+				end
+			end
+
+			act 'Leave': gt 'gLakeNude', 'sauna'
+			act 'Use the sauna':
+				*clr & cla
+				minut +=30
+				pcs_mood += 5
+				pcs_willpwr += 5
+				if $clothingworntype = 'swimwear':
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/saunabikini.jpg"></center>'
+					if pcs_inhib < 50:inhib_exp += rand(0,1)
+				else
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/saunanude.jpg"></center>'
+					inhib_exp += rand(1,3)
+				end
+				gs 'stat'
+				'You spend 30 minutes relaxing in the sauna.'
+
+				act 'Leave': gt 'gLakeNude', 'sauna'
+
+				if month = 12 or month < 3: gs 'gLakeNude', 'ice_plunge'
+			end
+		end
+	else
+		*nl
+		'You need to undress or wear a swimsuit to enter the sauna.'
+	end
+end
+
+if $ARGS[0] = 'ice_plunge':
+	act 'Take a ice plunge':
+		*clr & cla
+		minut +=10
+		pcs_mood += 5
+		pcs_willpwr += 5
+		if $clothingworntype = 'swimwear':
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/icedipbikini.jpg"></center>'
+			if pcs_inhib < 50:inhib_exp += rand(0,1)
+		else
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/icedipnude.jpg"></center>'
+			inhib_exp += rand(1,2)
+		end
+		gs 'stat'
+		'You leave the sauna and as soon as you do the cold air nips at your body, you rush down to the edge of the lake where the ice is broken and a ladder as been put in place and you take the plunge into the ice cold water. It is refreshing the sudden change from the hot sauna to the freezing waters of the lake. After a couple of minutes you climb out of the water.'
+		act 'Go back to the sauna': gt 'gLakeNude', 'sauna'
+	end
+end
+
 if temper >= 15 and month >= 5 and month <= 9:
 	if voyeurism_start = 0:
 		act'Look around the beach':
 			*clr & cla
 			menu_off = 1
 			minut += 5
-			voyeurism_start_view = RAND(1,3)
+			voyeurism_start_view = rand(1,3)
+			gs 'stat'
 			if voyeurism_start_view <= 2:
 				'<center><img <<$set_imgh>> src="images/locations/shared/lake/lake_beach1.jpg"></center>'
 				'You look around, but see nothing interesting. Just a few others in swimwear or relaxing on the beach.'
@@ -217,6 +409,7 @@ if temper >= 15 and month >= 5 and month <= 9:
 			if voyeurism = 0:
 				minut += 5
 				voyeurism += 1
+				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/self/lake_legs.jpg"></center>'
 				'From the corner of your eye you see several naked people. You think they look right at you. You blush and you freeze in terror, tears well up in the corner of your eyes. After a few moments you find yourself looking at your own feet.<br><dh>"Wha....What am I doing?! Why do I feel like watching... Am I a voyeur? Yes, I am! I`m a girl who likes to watch nude people!"</dh> you think.<br> You can''t remember a single instance in your life when you were watching someone. So is it worth to start doing it now? YES!'
 				act'Stop Watching!': gt'gLakeNude'
@@ -225,16 +418,16 @@ if temper >= 15 and month >= 5 and month <= 9:
 				minut += 50
 				pcs_horny += 75
 				voyeurism += 1
+				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/voyeurism/voyeurism_start_event.jpg"></center>'
 				'From the corner of your eye you see several naked people. You think they look right at you. You blush and you freeze in terror, tears well up in the corner of your eyes. After a few moments you find yourself looking at your own feet.<br><dh>"Wha....What am I doing?! Why do I feel like watching... Am I a voyeur? Yes, I am! I`m a girl who likes to watch nude people!"</dh> you think.<br> But then you remember how you recently were watching others on the beach and think: <dh>"That was scary, cool, and hot. I need to keep at least one eye always watching."</dh>'
-				act'Watch the couple':
-					gs'gLakeNudeEvent','gLakeNude_sex'
-				end
+				act'Watch the couple': 	gs'gLakeNudeEvent','gLakeNude_sex'
 			end
 		end
 	elseif voyeurism_start = 2 and (pcs_horny < 90 or pav_slut < 50):
 		act 'Spy on other nudists on the beach':
 			menu_off = 1
+			gs 'stat'
 			if voyeurism_nudist <= 14 or pav_slut > 50:
 				voyeurism_nudist += 1
 				gs'gLakeNudeEvent','gLakeNude_nudist'
@@ -265,7 +458,7 @@ if temper >= 15 and month >= 5 and month <= 9:
 			gt'gLakeNude'
 		end
 	end
-	KILLVAR '$tmp_lakenude_leave'
+	killvar '$tmp_lakenude_leave'
 else
 	act'Leave the now abandoned beach':
 		cla

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

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

locations/glake.qsrc

@@ -1,6 +1,7 @@
 # gLake
 
 CLOSE ALL
+if sound = 0:PLAY 'sound/lakeshore1.mp3', 30
 $loc = 'gLake'
 $metka = ''
 $menu_loc = 'glake'
@@ -16,72 +17,66 @@ if $clothingworntype ! 'swimwear' and $clothingworntype ! 'nude' and temper >= 5
 '<center><H4>Lake</H4></center>'
 
 ! to memorize were cowards or not
-if month>=3 and month<=5:
-	if hour>=6 and hour<=17:
+if month >= 3 and month <= 5:
+	if hour >= 6 and hour <= 17:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/lake.spring.jpg"></center>'
 	else
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/lake.spring.night.jpg"></center>'
 	end
-	'<center>A small lake, located not far from Pavlovsk. You''re not sure whether Pavlovsk was built near the lake on purpose or not.</center>'
+	'<center>A small lake, located not far from Pavlovsk. You''re not sure whether Pavlovsk was built near the lake on purpose or not. When it is warm enough people often come to sunbath or go swimming.</center>'
 	*nl
-end
-if month>=6 and month<=8:
-	if hour>=6 and hour<=19:
+elseif month >= 6 and month <= 8:
+	if hour >= 6 and hour <= 19:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/lake.summer.jpg"></center>'
 	else
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/lake.summer.night.jpg"></center>'
 	end
-	'<center>A small lake, located not far from Pavlovsk. You''re not sure whether Pavlovsk was built near the lake on purpose or not.</center>'
+	'<center>A small lake, located not far from Pavlovsk. You''re not sure whether Pavlovsk was built near the lake on purpose or not. During summer people often come to sunbath or go swimming.</center>'
 	*nl
-end
-if month>=9 and month<=11:
-	if hour>=6 and hour<=18:
+elseif month >= 9 and month <= 11:
+	if hour >= 6 and hour <= 18:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/lake.autumn.jpg"></center>'
 	else
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/lake.autumn.night.jpg"></center>'
 	end
-	'<center>A small lake, located not far from Pavlovsk. You''re not sure whether Pavlovsk was built near the lake on purpose or not.</center>'
+	'<center>A small lake, located not far from Pavlovsk. You''re not sure whether Pavlovsk was built near the lake on purpose or not. When it is warm enough people often come to sunbath or go swimming.</center>'
 	*nl
-end
-if month=1 or month=2 or month=12:
-	if hour>=7 and hour<=16:
+elseif month < 3 or month = 12:
+	if hour >= 7 and hour <= 16:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/lake.winter.jpg"></center>'
 	'<center>A small lake, located not far from Pavlovsk. You''re not sure whether Pavlovsk was built near the lake on purpose or not.</center>'
 	else
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/lake.winter.night.jpg"></center>'
-	'<center>A small lake, located not far from Pavlovsk. You''re not sure whether Pavlovsk was built near the lake on purpose or not.</center>'
 	end
-	'<center>Ever since winter arrived, the lake in Pavlovsk has been frozen over. The lake is being used as a skating rink and lots of people go to skate there every day; if you have skates you could join them.</center>'
+	'<center>A small lake, located not far from Pavlovsk. You''re not sure whether Pavlovsk was built near the lake on purpose or not. Ever since winter arrived, the lake in Pavlovsk has been frozen over. The lake is being used as a skating rink and lots of people go to skate there every day; if you have skates you could join them.</center>'
 	*nl
 	if pcs_icesktng>0: 'Your ice-skating skill is <<pcs_icesktng>>.'
 end
 
-if month <= 2 or month = 12:
+if storyline = 1 and (month <= 2 or month = 12):
 	if week >= 6 and hour >= 8 and hour <= 11:
 		'Looking over the frozen lake, you see a figure in the distance. The figure is figure skating and is doing all types of crazy moves. Stepping out on the ice and take a few steps out you finally notice who it is, <a href="exec:gt ''gschool_socialchg1'', ''tVeronika''">Veronika</a>.'
 	end
 end
 
-if (month >= 3 and month <= 5) or (month >= 9 and month <= 11):
-	if week >= 1 and week <= 5 and hour >= 18 and hour <= 20:
+if storyline = 1 and ((month >= 3 and month <= 5) or (month >= 9 and month <= 11)):
+	if week <= 5 and hour >= 18 and hour <= 20:
 		'<a href="exec:gt ''gschool_socialchg1'', ''tChristina''">Christina</a> is standing by the beach looking out over the lake. You also notice <a href="exec:gt ''gschool_socialchg1'', ''tLina''">Lina</a> in the background standing next to her, breathing heavily.'
 	end
 end
 
 act'Return to Pavlovsk':
+	*clr & cla
 	if konki_cloth = 1:
-		cla
 		'You need to remove your skates. How are you going to walk on the streets in those?'
 		act'Back':gt'glake'
 	elseif $clothingworntype = 'swimwear':
-		cla
 		'You need to get dressed in regular clothing first.'
 		act'Return':gt'glake'
 	elseif $clothingworntype ! 'nude':
 		minut += 5
 		gt'pavResidential'
 	else
-		cla
 		'You need to wear some clothes. It''s not decent to walk the streets naked.'
 		act'Return':gt'glake'
 	end
@@ -97,72 +92,88 @@ end
 
 if $clothingworntype = 'nude':
 	act'Put your clothes back on':
-		cla
+		*clr & cla
 		menu_off = 1
 		minut+=5
 		gs 'clothing', 'wear_last_worn'
-		if $clothingworntype = 'nude':
-			if storyline = 1:
-				minut += 30
-				pcs_mood -= 5
-				pcs_willpwr -= 5
-				'You return to the place where you thought you put your clothes to get dressed... except you can''t find them. Oh crap, you can''t find them! You desperately search the beach for a while, while a few passers-by look amused at the naked girl running around the beach. When you can''t find them, you panic and run all the way home... hopefully they''ll turn up.'
-				gt 'korrPar'
+		gs 'underwear', 'wear'
+		nudelake = rand(1,20)
+		if nudelake <= 3:
+			minut += 5
+			pcs_mood -= 5
+			pcs_willpwr -= 5
+			inhib_exp += rand(1,3)
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/noclothes.jpg"></center>'
+			'You return to the place where you thought you put your clothes to get dressed... except you can''t find them. Oh crap, you can''t find them! You desperately search the beach for a while, while a few passers-by look amused at the naked girl running around the beach. When you can''t find them, you panic and run all the way home... hopefully they''ll turn up.'
+			act 'Run home naked': gt 'glake', 'nude_home'
+		elseif nudelake = 4:
+			minut += 5
+			pcs_mood -= 5
+			pcs_willpwr -= 5
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/nakedcar.jpg"></center>'
+			'You return to the place where you thought you put your clothes to get dressed... except you can''t find them. Oh crap, you can''t find them! You desperately search the beach for a while, while a few passers-by look amused at the naked girl running around the beach. Eventually a man approaches you. You can tell his eyes are darting over your body as he asks: "Is there a problem, sweetheart? You seem upset..."'
+			if bag = 1:
+				'Luckily, your bag is sitting right where you left it.'
 			else
-				'You return to the place where you thought you put your clothes to get dressed... except you can''t find them. Oh crap, you can''t find them! You desperately search the beach for a while, while a few passers-by look amused at the naked girl running around the beach. Eventually a man approaches you. You can tell his eyes are darting over your body as he asks: "Is there a problem, sweetheart? You seem upset..."'
-				if bag = 1:
-					'Luckily, your bag is sitting right where you left it.'
-				else
-					money = 0
+				money = 0
+			end
+			'You''re seriously panicking now, and you blurt out: "I can''t find my clothes! I left them right here and now they''re gone! I don''t know what to do!"'
+			'He tries to put you at ease: "Don''t worry girl, you''re going to be fine. Come on, I happen to have some sportswear in my car."'
+			'You profusely thank him while he guides you to his car. He was not lying, he pulls out a set of sportswear that looks brand new, they even look like they would fit you. He doesn''t hand them over though, and says with a serious look: "Of course I can''t just give these away... they''re brand new. These cost me 3000 <b>₽</b>, if you can give me that they''re all yours."'
+			if money >= 3000:
+				act 'Pay 3,000 <b>₽</b>':
+					*clr & cla
+					money -= 3000
+					exercise[1] = 1
+					if exerciseH[1] > 40:exerciseH[1] = 40
+					gs 'underwear', 'wear'
+					gs 'clothing', 'wear', 'exercise', 1
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/nakedcar.jpg"></center>'
+					'So... there''s the catch. The guy looks at your naked body while you mull over his proposition, and you come to the conclusion that you really don''t have any other choice. You can''t walk home through town naked! You silently nod and give him the money, quickly putting the clothes on when he hands them over. You feel relieved in the knowledge that at least you won''t have to go home naked... hopefully your clothes will turn up later.'
+					act 'Run home naked': gt 'glake', 'nude_home'
+				end
+			else
+				act 'Tell him you don''t have enough money':
+					*clr & cla
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/nakedcar.jpg"></center>'
+					'So... there''s the catch. The guy looks over your naked body while you mull over your predicament. "Well I don''t have that kind of money, do you have a towel or anything I can have?"'
+					'He shakes his head and you can see a slight bulge forming in his pants the more he looks at your naked body. "No sorry, but I might be willing to trade the clothes..." He trails off suggestively and with the way he is looking at you, you have no doubt what he has in mind.'
+					'But it never hurts to see. "What did you have in mind?"'
+					'He grins a bit. "Well how about we get in my car and you let me fuck you and then you can have the clothes."'
+					gs 'willpower', 'sex'
+					if will_cost <= pcs_willpwr:
+						act 'Refuse and run home naked: (<<will_cost>> Willpower)':
+							gs 'willpower', 'resist'
+							gt 'glake', 'nude_home'
+						end
+					else
+						'You don''t have enough willpower to refuse.'
+					end
+					act 'Agree to have sex': gt 'glake', 'car_sex'
 				end
-				'You''re seriously panicking now, and with tears in your eyes you blurt out: "I can''t find my clothes! I left them right here and now they''re gone! I don''t know what to do!"'
-				'He tries to put you at ease: "Don''t worry girl, you''re going to be fine. Come on, I happen to have some sportswear in my car."'
-				'You dry your tears, profusely thanking him while he guides you to his car. He was not lying, he pulls out a set of sportswear that looks brand new. He doesn''t hand them over though, and says with a serious look: "Of course I can''t just give these away... they''re brand new. These cost me 3000 <b>₽</b>, if you can give me that they''re all yours."'
+			end
+			act 'Suggest alternative payment':
+				*clr & cla
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/nakedcar.jpg"></center>'
+				'3000 <b>₽</b>... you know it''s a fair price for him to ask, but you don''t want to pay 3000 <b>₽</b> right now! This is not how you planned for your day to go. Too afraid to look him in the eye when you ask, you suggest: "Is there... is there some other way I can pay you? 3000 <b>₽</b> is a lot of money."'
+				'He''s been gawking at your naked body the whole time you''ve been talking, and your suggestion seems to be exactly what he wanted to hear. He grins: "I can think of one way..."'
+				'The growing bulge in his pants does an excellent job of telling exactly what he''s thinking.'
+				act 'Agree to have sex': gt 'glake', 'car_sex'
 				if money >= 3000:
 					act 'Pay 3,000 <b>₽</b>':
+						*clr & cla
 						money -= 3000
 						exercise[1] = 1
 						if exerciseH[1] > 40:exerciseH[1] = 40
 						gs 'underwear', 'wear'
 						gs 'clothing', 'wear', 'exercise', 1
-						'So... there''s the catch. The guy looks at your naked body while you mull over his proposition, and you come to the conclusion that you really don''t have any other choice. You can''t walk home through town naked! You silently nod and give him the money, quickly putting the clothes on when he hands them over. You feel relieved in the knowledge that at least you won''t have to go home naked... hopefully your clothes will turn up later.'
-						gt 'glake'
-					end
-				end
-				act 'Suggest alternative payment':
-					'3000 <b>₽</b>... you know it''s a fair price for him to ask, but you don''t want to pay 3000 <b>₽</b> right now! This is not how you planned for your day to go. Too afraid to look him in the eye when you ask, you suggest: "Is there... is there some other way I can pay you? 3000 <b>₽</b> is a lot of money."'
-					'He''s been gawking at your naked body the whole time you''ve been talking, and your suggestion seems to be exactly what he wanted to hear. He grins: "I can think of one way..."'
-					'The growing bulge in his pants does an excellent job of telling exactly what he''s thinking.'
-					act 'Agree to have sex':
-						cla
-						cls
-						exercise[1] = 1
-						if exerciseH[1] > 40:exerciseH[1] = 40
-						gs 'underwear', 'wear'
-						gs 'clothing', 'wear', 'exercise', 1
-						'<center><img <<$set_imgh>> src="images/locations/shared/sex/car/sexcar1.jpg"></center>'
-						'He wastes no time for you to second guess yourself, and immediately throws you down on the back seat of his car when you agree. He quickly pulls down his pants and, after quickly putting a condom on, quickly guides his cock to your pussy lips. He obviously doesn''t plan on spending a lot of time with you and sinks it in one firm thrust, fucking you with rapid, short strokes. Soon he shoots his load in the condom, ties a knot in it and throws it away. Seconds after he hands you the clothes as promised, he drives off.'
-						'It was not the most pleasurable sex for you, but you convince yourself it was for a good cause when you put your well-earned clothes on. He used a condom too, without you even having to ask. You don''t have to go home naked now! With a sigh of relief you straighten the clothes and feel ready to take the day on again, hoping your own clothes will turn up at some point.'
-						gs 'arousal', 'vaginal', 5, 'sub', 'unknown'
-						gs 'arousal', 'end'
-						gs 'stat'
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/nakedcar.jpg"></center>'
+						'You don''t want to have sex with him... but you also don''t want to go home naked! Not seeing any other option, you decide to pay him the 3,000 <b>₽</b> after all. You quickly put on the clothes as he hands them over, feeling relieved in the knowledge that at least you don''t have to walk through town in the nude. Now that you''re clothed, you feel more confident in searching the beach a bit more; hopefully your clothes will turn up after all.'
 						act 'Continue': gt 'glake'
 					end
-					if money >= 3000:
-						act 'Pay 3,000 <b>₽</b>':
-							money -= 3000
-							exercise[1] = 1
-							if exerciseH[1] > 40:exerciseH[1] = 40
-							gs 'underwear', 'wear'
-							gs 'clothing', 'wear', 'exercise', 1
-							'You don''t want to have sex with him... but you also don''t want to go home naked! Not seeing any other option, you decide to pay him the 3,000 <b>₽</b> after all. You quickly put on the clothes as he hands them over, feeling relieved in the knowledge that at least you don''t have to walk through town in the nude. Now that you''re clothed, you feel more confident in searching the beach a bit more; hopefully your clothes will turn up after all.'
-							act 'Continue': gt 'glake'
-						end
-					end
 				end
 			end
 		else
-			gs 'underwear', 'wear'
 			'You return to the place where you left your clothes, and put them back on.'
 			act'Continue':gt'glake'
 		end
@@ -170,10 +181,10 @@ if $clothingworntype = 'nude':
 end
 
 if temper >= 15 and month>=5 and month<=9 and hour>=6 and hour<=20:
-	act 'Take a walk along the beach (1:00)':
-		cls
+	act 'Take a walk along the beach (30 minutes)':
+		*clr & cla
 		menu_off = 1
-		minut += 60
+		minut += 30
 		pcs_willpwr += 5
 		pcs_mood += 5
 		gs'stat'
@@ -192,71 +203,67 @@ if temper >= 15 and month>=5 and month<=9 and hour>=6 and hour<=20:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/lake.walk0,'+rand(0,2)+'.jpg"></center>'
 		end
 
-		'You walk along the beach for an hour, enjoying the feeling of the sun on your body.'
+		'You walk along the beach, enjoying the feeling of the sun on your body.'
 		act 'Continue':gt'glake'
 	end
 
 	if $clothingworntype ! 'nude' and (pcs_inhib >= 60 or (exhibitionist_lvl > 1 and pcs_horny >= 60)):
 		act'Strip naked':
-			cla
+			*clr & cla
 			menu_off = 1
 			minut += 5
 			inhib_exp += rand(1,2)
 			gs 'underwear', 'remove'
 			gs 'clothing', 'strip'
-			'Without hesitation, you take off all your clothes and neatly fold them before putting them down on a pile. Without your clothes holding you back, you can go for a nice swim in the lake or just lie down in the sand and do some sunbathing.'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/strip.jpg"></center>'
+			'Without hesitation, despite the fact other people are around, you take off all your clothes and neatly fold them before putting them down on a pile. Without your clothes holding you back, you can go for a nice swim in the lake or just lie down in the sand and do some sunbathing.'
 
 			act'Continue':gt'glake'
 		end
-	end
-
-	if $clothingworntype = 'swimwear' or $clothingworntype = 'nude':
-		act 'Go swim in the lake (1:00)':
+	elseif $clothingworntype = 'swimwear' or $clothingworntype = 'nude':
+		act 'Go swim in the lake (30 minutes)':
 			*clr & cla
 			menu_off = 1
 			pcs_makeup = 1
 			cumspclnt = 4
 			gs 'cum_cleanup'
-			minut += 60
-			pcs_sweat = 10 + rand(0,4)
+			minut += 30
 			pcs_mood += 5
 			pcs_willpwr = pcs_willpwr + 5
 			if pcs_stren < 30: stren_exp += 1
-
+			fat -= 1
 			if $clothingworntype = 'nude':
-				'<center><img <<$set_imgh>> src="images/locations/shared/lake/nudeswim<<rand(0,9)>>.jpg"></center>'
-				inhib_exp += rand(1,3)
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/swimnude.jpg"></center>'
+				inhib_exp += rand(1,2)
 			else
-				'<center><img <<$set_imgh>> src="images/locations/shared/lake/swim.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/swim.jpg"></center>'
 				if pcs_inhib < 50:inhib_exp += rand(1,2)
 			end
 			'You swim and play in the lake, feeling refreshed and invigorated by the clean lake water.'
-			if $clothingworntype = 'nude':pcs_willpwr -= 5 & pcs_mood -= 5 & 'After a few minutes, you feel the piercing gaze of several nearby women on you. They''re making an effort of whispering to one another, yet loud enough so you can hear them: "Look at that'+iif(StoryLine = 1, ' <<$pcs_lastname>> ', ' ')+'slut! She has no decency whatsoever, shamelessly flaunting her naked body like that!" The men at the lake are much more appreciative, and openly stare at your attractive body. You can see bulges forming in the shorts of some of them.'
-
+			if $clothingworntype = 'nude':pcs_willpwr -= 5 & pcs_mood -= 5 & 'After a few minutes, you feel the piercing gaze of several nearby women on you. They''re making an effort of whispering to one another, yet loud enough so you can hear them: "Look at that <<$pcs_lastname>> slut! She has no decency whatsoever, shamelessly flaunting her naked body like that!" The men at the lake are much more appreciative, and openly stare at your attractive body. You can see bulges forming in the shorts of some of them.'
 			act 'Get out of the water':gt'glake'
 		end
 		if sunWeather = 1:
-			act 'Go sunbathing (1:00)':
-
-				menu_off = 1
+			act 'Go sunbathing (30 minutes)':
 				*clr & cla
-				minut += 60
-				if pcs_inhib < 50:inhib_exp += rand(1,2)
+				minut += 30
 				if pcs_sweat < 35 : pcs_sweat += 5
 				pcs_mood += 5
 				gs'stat'
 				if $clothingworntype = 'swimwear':
-					'<center><img <<$set_imgh>> src="images/locations/shared/lake/zagar.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/sunbath.jpg"></center>'
+					if pcs_inhib < 50:inhib_exp += rand(1,2)
 				else
-					'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/nudezagarat.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/sunbathnude.jpg"></center>'
+					inhib_exp += rand(1,3)
 				end
 
 				if krem = 0:
-					'You lie down on your towel for some sunbathing and hopefully a nicer tan, and enjoy the warm rays of the sun for an hour.'
+					'You lie down on your towel for some sunbathing and hopefully a nicer tan, and enjoy the warm rays of the sun on your body.'
 					pcs_tan = pcs_tan + 1
 				else
 					krem = krem - 1
-					'You smear your body with sunscreen and lie down on your towel for some sunbathing, hoping to work on your tan. You enjoy the warm rays of the sun for an hour.'
+					'You smear your body with sunscreen and lie down on your towel for some sunbathing, hoping to work on your tan. You enjoy the warm rays of the sun on your body.'
 					pcs_tan = pcs_tan + 3
 				end
 
@@ -281,13 +288,13 @@ if temper >= 15 and month>=5 and month<=9 and hour>=6 and hour<=20:
 							end
 							exit
 						elseif $clothingworntype ! 'nude' and npc_QW['A113'] < 1:
-							cls
+							*clr & cla
 							gs'stat'
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/strela/vadimbely.jpg"></center>'
 							'While you are sunbathing you can''t help but notice a man walking towards you. He looks truly intimidating, his entire body covered in criminal gang tattoos. A bit further down the beach you see a younger man with similar tattoos, keeping an eye on the man approaching you.'
 							'His head is mostly bald, and a large golden cross dangles on a thick chain from his neck. He sits his fat body down next to you before you can protest, idly scratching his belly as he begins to chat: "Hello! I''m not interrupting anything, am I?"'
 							act'Be outraged':
-								cls
+								*clr & cla
 								minut += 5
 								gs'stat'
 								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/strela/vadimbely.jpg"></center>'
@@ -295,29 +302,30 @@ if temper >= 15 and month>=5 and month<=9 and hour>=6 and hour<=20:
 								'The man is not impressed in the slightest, obviously having played this game before. He immediately challenges your claim: "Oh, excuse me princess! Is this your spot? Do you own it?"'
 
 								act'Yes you do!':
-									cls
+									*clr & cla
 									minut += 5
 									gs'stat'
 									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/strela/vadimbely.jpg"></center>'
 									'You respond indignantly: "Yes, this is my spot! I was here first, that''s how it works!"'
 									'Suddenly you hear a deep voice behind you: "This beach is only used by prostitutes and bus drivers, and I don''t see a fucking bus."'
 									'Damn, that voice startled you. You look behind you and you see the tattooed younger man behind you. He has tattoos over his whole body as well, most notably several tombs and skulls on his chest. He stares you down with a stone cold look on his face.'
-									'The bald man smiles and puts his hand on your chest as if he owns it, roughly squeezing you tit through your swimsuit.'
+									'The bald man smiles and puts his hand on your chest as if he owns it, roughly squeezing your tit through your swimsuit.'
 									'"So... how much?"'
 									act 'Resist':gt 'LakeBoyDy', 'slap'
 									act 'Move away':gt 'LakeBoyDy', 'go'
+
 								end
 							end
 
 							act'Ignore them':
-								cls
+								*clr & cla
 								minut+=5
 								gs'stat'
 								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/strela/vadimbely.jpg"></center>'
 								'Those guys look intimidating. You don''t want any trouble and just pretend they''re not there, laying on the beach with your eyes closed. However, a few moments later you feel a strange tickling on your stomach. You open your eyes to see what''s causing it, and you see the fat man running a blade of grass over your stomach with a smug grin on his face. Looks like you can''t ignore them any longer.'
 
 								act'Keep ignoring them':
-									cls
+									*clr & cla
 									minut+=5
 									gs'stat'
 									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/strela/vadimbely.jpg"></center>'
@@ -330,7 +338,7 @@ if temper >= 15 and month>=5 and month<=9 and hour>=6 and hour<=20:
 							act 'Walk away':gt 'glake'
 							exit
 						else
-							cla
+							*clr & cla
 							'While you are sunbathing, three guys sit down near you. While you notice them looking at you and talking about your body, they don''t come over.'
 							act'Stop sunbathing':gt'glake'
 						end
@@ -368,7 +376,7 @@ if temper >= 15 and month>=5 and month<=9 and hour>=6 and hour<=20:
 						exit
 					end
 				else
-					cla
+					*clr & cla
 					act'Stop sunbathing':gt'glake'
 				end
 			end
@@ -378,32 +386,84 @@ end
 
 act'Go to the secluded beach':minut += 10 & gt'gLakeNude'
 
-!winter
-if month = 12 or month = 1 or month = 2:
+if month = 12 or month < 3:
 	if konki_cloth = 1:
 		act'Take off your skates':
 			*clr & cla
 			menu_off = 1
-			minut+=10
+			minut += 5
 			konki_cloth=0
+			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/konki0,1.jpg"></center>'
 			'You take off your skates and put your shoes back on. For a while it feels kinda weird to walk, after you got used to skating.'
 			act'Continue':gt'glake'
 		end
+	elseif konki_cloth ! 1 and konki > 0 and hour >= 8 and hour <= 17:
+		act'Put your skates on':
+			*clr & cla
+			menu_off = 1
+			minut += 5
+			konki_cloth = 1
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/konki0,0.jpg"></center>'
+			'You take off your shoes, and put your skates on. Now you''re ready to go ice skating.'
+			act 'Continue': gt'glake'
+		end
 	end
-	if hour >= 8 and hour <= 17:
-		if konki > 0 and konki_cloth ! 1:
-			act'Put your skates on':
-				*clr & cla
-				menu_off = 1
-				minut += 5
-				konki_cloth = 1
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/konki0,0.jpg"></center>'
-				'You take off your shoes, and put your skates on. Now you''re ready to go ice skating.'
-				act 'Continue': gt'glake'
-			end
+	if konki_cloth = 1: act'Skate on the ice rink': gt 'glake', 'skating_start'
+end
+
+if $ARGS[0] = 'car_sex': 
+	*clr & cla
+	exercise[1] = 1
+	if exerciseH[1] > 40:exerciseH[1] = 40
+	gs 'underwear', 'wear'
+	gs 'clothing', 'wear', 'exercise', 1
+	'<center><img <<$set_imgh>> src="images/locations/shared/sex/car/sexcar1.jpg"></center>'
+	'He wastes no time for you to second guess yourself, and immediately throws you down on the back seat of his car when you agree. He quickly pulls down his pants and, after quickly putting a condom on, quickly guides his cock to your pussy lips. He obviously doesn''t plan on spending a lot of time with you and sinks it in one firm thrust, fucking you with rapid, short strokes. Soon he shoots his load in the condom, ties a knot in it and throws it away. Seconds after he hands you the clothes as promised, he drives off.'
+	*nl
+	'It was not the most pleasurable sex for you, but you convince yourself it was for a good cause when you put your well-earned clothes on. He used a condom too, without you even having to ask. You don''t have to go home naked now! With a sigh of relief you straighten the clothes and feel ready to take the day on again, hoping your own clothes will turn up at some point.'
+	gs 'arousal', 'vaginal', 10, 'sub'
+	gs 'arousal', 'end'
+	gs 'stat'
+	act 'Continue': gt 'glake'
+end
+
+if $ARGS[0] = 'nude_home':
+	*clr & cla
+	minut += 10
+	menu_off = 1
+	inhib_exp += rand(1,3)
+	gs'stat'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/homenude.jpg"></center>'
+	'You cover yourself up as best you can and go through the woods, you use the woods to get as close as you can to your apartment. Luckily no one else seems to be wandering the woods right now and no one spots you. Now though you are at the edge of the woods, so you have decided if you want to sneak the rest of the way and hope no one see''s you are just make a run for it and hope no one recognizes you.'
+	
+	act 'Run home':
+		*clr & cla
+		minut += 7
+		gs 'fame', 'pav', 'sex', 5
+		inhib_exp += rand(2,4)
+		if month < 3 or month = 12:
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/naked/runhomenakedw.jpg"></center>'
+		else
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/naked/runhomenaked.jpg"></center>'
 		end
-		if konki_cloth = 1: act'Skate on the ice rink': gt 'glake', 'skating_start'
+		'You decided to just get this over with and make a run for it. You use you hands to cover yourself as best you can, looking away from people. Sometimes you have to use your hands to cover you face in the hopes no one recognizes you. Several people gasp, more than a few people, mostly older women chastise you for being such a whore. Some of the men whistle and more than a few people take your picture, you really hope none of those pictures show your face. Finally after what seems forever you make it to the apartment complex.'
+		gs 'arousal', 'foreplay', 3, 'exhibitionism'
+		gs 'stat'
+		act 'Continue to complex': gt 'pavaptcourtev', 'naked_aptcomplex'
+	end
+	
+	act 'Sneak home':
+		*clr & cla
+		minut += 20
+		gs 'fame', 'pav', 'sex', 2
+		inhib_exp += rand(1,3)
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/naked/sneakhomenaked.jpg"></center>'
+		'You decided it would be better to take your time and sneak home, doing your best to not be seen. You use you hands to cover yourself as best you can, using cover as often as you, can. Hiding behind trees, parked cars, ducking down alleyways and when that doesn''t work you wait till you don''t see anyone and dart across open stretches of ground. Once or twice you think someone might have seen you, but you hope you wasn''t recognized, if you was seen. Finally after what seems forever you make it to the apartment complex.'
+		gs 'arousal', 'foreplay', 10, 'exhibitionism'
+		gs 'stat'
+		act 'Continue to complex': gt 'pavaptcourtev', 'naked_aptcomplex'
 	end
 end
 
@@ -474,5 +534,6 @@ if $ARGS[0] = 'skating':
 	end
 end
 
+
 --- gLake ---------------------------------
 

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

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

locations/grandpahelp.qsrc

@@ -7,18 +7,17 @@ gs'stat'
 'You walk up to your grandfather and ask if he needs any help. Grandpa thinks for a moment and says:'
 
 if month <= 4 or month >= 10:
-	grandpahelping = RAND(0,5)
+	grandpahelping = rand(0,5)
 elseif month = 5:
-	grandpahelping = RAND(3,8)
+	grandpahelping = rand(3,8)
 elseif month = 6 or month = 9:
-	grandpahelping = RAND(3,12)
+	grandpahelping = rand(3,12)
 else
-	grandpahelping = RAND(3,13)
+	grandpahelping = rand(3,13)
 end
 
-!month >= 1 and month < 5 and month > 9
 if grandpahelping = 0:
-	'"- <<$pcs_nickname>>, could you bring firewood for the stove?"'
+	'"<<$pcs_nickname>>, could you bring firewood for the stove?"'
 
 	act 'Fetch firewood (0:15)':
 		*clr & cla
@@ -28,8 +27,8 @@ if grandpahelping = 0:
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/firewood_winter.jpg"></center>'
 		end
 		'You put on some warm clothes and run over to the barn to collect some firewood. '
-		'"- I''ve brought some firewood grandfather," you said to your grandfather.'
-		'"- You are very quick <<$pcs_nickname>>." he replies with a smile. "- That''s today''s youth for ya. There is no more work today."'
+		'"I''ve brought some firewood grandfather," you said to your grandfather.'
+		'"You are very quick <<$pcs_nickname>>." he replies with a smile. "That''s today''s youth for ya. There is no more work today."'
 		minut += 15
 		grandmahelp += 1
 		gs'stat'
@@ -37,24 +36,24 @@ if grandpahelping = 0:
 		act 'Go':gt'Gadhouse'
 	end
 elseif grandpahelping = 1:
-	'"- <<$pcs_nickname>>, I need you to go to the barn and feed Desperado."'
+	'"<<$pcs_nickname>>, I need you to go to the barn and feed Desperado."'
 
 	act 'Go to the barn (0:15)':
+		*clr & cla
 		if month >= 4 and month <= 10:
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
 		else
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard_winter.jpg"></center>'
 		end
 		'You went to the barn and fed the horse.'
-		*clr & cla
 		feed_horse = 1
 		minut += 15
 		gs'stat'
 
-		act 'Further':gt'Gadsarai'
+		act 'Continue':gt'Gadsarai'
 	end
 elseif grandpahelping = 2:
-	'"- <<$pcs_nickname>>, go to the barn to feed the cows."'
+	'"<<$pcs_nickname>>, go to the barn to feed the cows."'
 
 	act 'Go to the barn (0:15)':
 		*clr & cla
@@ -68,7 +67,7 @@ elseif grandpahelping = 2:
 		feed_cow = 1
 		gs'stat'
 
-		act 'Further':gt'Gadsarai'
+		act 'Continue':gt'Gadsarai'
 	end
 elseif grandpahelping = 3:
 	gt 'grandpahelp', 'cleanyard'
@@ -76,26 +75,19 @@ elseif grandpahelping = 4:
 	gt 'grandpahelp', 'groomhorse'
 elseif grandpahelping = 5:
 	gt 'grandpahelp', 'feedhogs'
-!month = 5
 elseif grandpahelping = 6 and hour >= 6 and hour < 9:
 	gt 'grandpahelp', 'grazehorse'
 elseif grandpahelping = 7 and hour >= 6 and hour < 9:
 	gt 'grandpahelp', 'leadcows'
 elseif grandpahelping = 8 and hour >= 6 and hour < 9:
 	gt 'grandpahelp', 'grazecows'
-!month = 6 or month = 9
 elseif grandpahelping = 9 and temper >= 15 and sunWeather = 1 and week > 5:
 	gt 'grandpahelp', 'washhorse'
-elseif grandpahelping = 10 and go_in_boletus = 0 and go_in_bilberry = 0 and go_in_boletus_bilberry = 0:
-	gt 'grandpahelp', 'pickforest'
-elseif grandpahelping = 11 and go_in_boletus = 0 and go_in_bilberry = 0 and go_in_boletus_bilberry = 0:
-	gt 'grandpahelp', 'pickforest'
-elseif grandpahelping = 12 and go_in_boletus = 0 and go_in_bilberry = 0 and go_in_boletus_bilberry = 0:
+elseif grandpahelping >= 10 and grandpahelping < 13 and go_in_boletus = 0 and go_in_bilberry = 0 and go_in_boletus_bilberry = 0:
 	gt 'grandpahelp', 'pickforest'
-!month = 7 or month = 8
 elseif grandpahelping = 13 and temper >= 15 and sunWeather = 1 and hour >= 6 and hour < 9:
-	'"- <<$pcs_nickname>>, we need to help out with hay gathering today. We have to go to the field and help out."'
-	'"- Okay, grandfather," you replied. You grab a rake, and start walking towards the field.'
+	'"<<$pcs_nickname>>, we need to help out with hay gathering today. We have to go to the field and help out."'
+	'"Okay, grandfather," you replied. You grab a rake, and start walking towards the field.'
 
 	act 'Go to the field (0:40)':
 		*clr & cla
@@ -105,37 +97,37 @@ elseif grandpahelping = 13 and temper >= 15 and sunWeather = 1 and hour >= 6 and
 		minut += 40
 		gs'stat'
 
-		act 'Further':gt'gadfield','field'
+		act 'Continue':gt'gadfield','field'
 	end
 else
 	if hour >= 9:
 		randmsg = rand(0,5)
 		if randmsg = 0:
-			'"- You can rest today <<$pcs_nickname>>, you don''t need to help me today."'
+			'"You can rest today <<$pcs_nickname>>, you don''t need to help me today."'
 		elseif randmsg = 1:
-			'"- You can rest today child, there is nothing to do."'
+			'"You can rest today child, there is nothing to do."'
 		elseif randmsg = 2:
-			'"- You can rest today <<$pcs_nickname>>, there is nothing to do."'
+			'"You can rest today <<$pcs_nickname>>, there is nothing to do."'
 		elseif randmsg = 3:
-			'"- There''s no work today <<$pcs_nickname>>, go and rest up."'
+			'"There''s no work today <<$pcs_nickname>>, go and rest up."'
 		elseif randmsg = 4:
-			'"- You can rest today my dear granddaughter."'
+			'"You can rest today my dear granddaughter."'
 		else
-			'"- You can take the day off to rest up."'
+			'"You can take the day off to rest up."'
 		end
 	else
 		randmsg = rand(0,1)
 		if randmsg = 0:
-			'"- You don''t need to help out today <<$pcs_nickname>>."'
+			'"You don''t need to help out today <<$pcs_nickname>>."'
 		else
-			'"- You can take the day off."'
+			'"You can take the day off."'
 		end
 	end
-	act 'Go':gt'Gadhouse'
+	act 'Leave':gt'Gadhouse'
 end
 
 if $ARGS[0] = 'cleanyard':
-	'"- Of course <<$pcs_nickname>>, I need your help in the yard. Bring a garden tool with you."'
+	'"Of course <<$pcs_nickname>>, I need your help in the yard. Bring a garden tool with you."'
 
 	act 'Clean up the yard (1:00)':
 		*clr & cla
@@ -149,10 +141,10 @@ if $ARGS[0] = 'cleanyard':
 		minut += 60
 		grandmahelp += 1
 		if month >= 4 and month <= 10:
-			fat -= RAND(1,3)
+			fat -= rand(1,3)
 		else
 			stren_exp += 1
-			fat -= RAND(1,5)
+			fat -= rand(1,5)
 		end
 		gs'stat'
 
@@ -161,7 +153,7 @@ if $ARGS[0] = 'cleanyard':
 end
 
 if $ARGS[0] = 'feedhogs':
-	'"- <<$pcs_nickname>>, could you go to the barn and feed the hogs."'
+	'"<<$pcs_nickname>>, could you go to the barn and feed the hogs."'
 
 	act 'Go to the barn (0:15)':
 		*clr & cla
@@ -175,12 +167,12 @@ if $ARGS[0] = 'feedhogs':
 		minut += 15
 		gs'stat'
 
-		act 'Further':gt'Gadsarai'
+		act 'Continue':gt'Gadsarai'
 	end
 end
 
 if $ARGS[0] = 'washhorse':
-	'"- It''s good weather today. Take Desperado to the river and give him a bath."'
+	'"It''s good weather today. Take Desperado to the river and give him a bath."'
 
 	act 'Go to the barn (0:10)':
 		*clr & cla
@@ -190,12 +182,12 @@ if $ARGS[0] = 'washhorse':
 		minut += 10
 		gs'stat'
 
-		act 'Further':gt'Gadsarai'
+		act 'Continue':gt'Gadsarai'
 	end
 end
 
 if $ARGS[0] = 'groomhorse':
-	'"- Of course <<$pcs_nickname>>, I need your help to groom Desperado."'
+	'"Of course <<$pcs_nickname>>, I need your help to groom Desperado."'
 
 	act 'Go to the barn (0:15)':
 		*clr & cla
@@ -209,12 +201,12 @@ if $ARGS[0] = 'groomhorse':
 		minut += 15
 		gs'stat'
 
-		act 'Further':gt'Gadsarai'
+		act 'Continue':gt'Gadsarai'
 	end
 end
 
 if $ARGS[0] = 'grazehorse':
-	'"- <<$pcs_nickname>>, take the horse to the field, my legs hurt so I need to rest for a bit. I`ll retrieve the horse up in the evening."'
+	'"<<$pcs_nickname>>, take the horse to the field, my legs hurt so I need to rest for a bit. I`ll retrieve the horse up in the evening."'
 
 	act 'Go to the barn (0:15)':
 		*clr & cla
@@ -224,54 +216,40 @@ if $ARGS[0] = 'grazehorse':
 		minut += 15
 		gs'stat'
 
-		act 'Further':& gt'Gadsarai'
+		act 'Continue':& gt'Gadsarai'
 	end
 end
 
 if $ARGS[0] = 'grazecows':
 	if graze_cow_exp = 0: 
-		'"- <<$pcs_nickname>>, we need to let the cows graze on the field today. Grab something to eat and lead the herd to the field. I''ll meet you there."'
+		'"<<$pcs_nickname>>, we need to let the cows graze on the field today. Grab something to eat and lead the herd to the field. I''ll meet you there."'
 	else
-		'"- <<$pcs_nickname>>, it''s our turn to look out for the cows grazing on the field today. So grab something to eat quickly, and stop by the field where the herd is. I''ll bring them back home."'
+		'"<<$pcs_nickname>>, it''s our turn to look out for the cows grazing on the field today. So grab something to eat quickly, and stop by the field where the herd is. I''ll bring them back home."'
 	end
 
-	if graze_cow_exp = 0:
-		act 'Go to the barn (0:20)':
-			gs 'food', 'm_meal' &! use current one, *clr & cla will clear messages
-			*clr & cla
+	act 'Go to the field (0:20)':
+		*clr & cla
+		if graze_cow_exp = 0:
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
 			'You take a little nibble of a sandwich and go to the shed where the herd is. Your grandmother put a sandwich and a bottle of water in the bag for lunch.'
-			graze_cow = 1
-			pcs_mood += 20
-			pcs_health += 10
-			minut += 20
-			bottle += 1
-			buterbrod += 1
-			gs'stat'
-
-			act 'Further':gt'Gadsarai'
-		end
-	else
-		act 'Go to the field (0:20)':
-			gs 'food', 'm_meal' &! use current one, *clr & cla will clear messages
-			*clr & cla
+		else
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/cow_go_field.jpg"></center>'
 			'You have a quick bite and go to the field where the village herd is. Your grandmother put a sandwich and a bottle of water in the bag for lunch.'
-			graze_cow = 1
-			pcs_mood += 20
-			pcs_health += 10
-			minut += 20
-			bottle += 1
-			buterbrod += 1
-			gs'stat'
-
-			act 'Further':gt'gadfield','cow'
 		end
+		graze_cow = 1
+		pcs_mood += 20
+		pcs_health += 10
+		minut += 20
+		if bottle = 0: bottle = 1
+		if buterbrod = 0: buterbrod = 1
+		gs'stat'
+
+		act 'Continue':gt'gadfield','cow'
 	end
 end
 
 if $ARGS[0] = 'leadcows':
-	'"- I have sore feet today, <<$pcs_nickname>>. My dear granddaughter could you lead the cows on the field and tell the herders to drive them home at the end of the day."'
+	'"I have sore feet today, <<$pcs_nickname>>. My dear granddaughter could you lead the cows on the field and tell the herders to drive them home at the end of the day."'
 
 	act 'Go to the barn (0:15)':
 		*clr & cla
@@ -281,32 +259,33 @@ if $ARGS[0] = 'leadcows':
 		minut += 15
 		gs'stat'
 
-		act 'Further':gt'Gadsarai'
+		act 'Continue':gt'Gadsarai'
 	end
 end
 
 if $ARGS[0] = 'pickforest':
-	grandpa_boletus = rand(2,3)
-	grandpa_bilberry = rand(3,5)
 	if grandpahelping = 10:
 		go_in_boletus = 1
-		'"- <<$pcs_nickname>>, could you go to the forest and pick mushrooms? I''m craving fried mushrooms."'
-		'"- How much should I pick, grandpa?", you ask.'
-		'"- <<grandpa_boletus>> kg will be enough," grandfather replies. "- Be careful so you don''t get lost."'
+		grandpa_boletus = rand(2,3)
+		'"<<$pcs_nickname>>, could you go to the forest and pick mushrooms? I''m craving fried mushrooms."'
+		'"How much should I pick, grandpa?", you ask.'
+		'"<<grandpa_boletus>> kg will be enough," grandfather replies. "Be careful so you don''t get lost."'
 	elseif grandpahelping = 11:
 		go_in_bilberry = 1
-		'"- <<$pcs_nickname>>, could you go to the forest to pick some berries? Grandma wants to make homemade fruit jam."'
-		'"- How much should I pick, grandpa?" you ask.'
-		'"- <<grandpa_bilberry>> kg will be enough," grandfather replies. "- Just be careful so you don''t get lost."'
+		grandpa_bilberry = rand(3,5)
+		'"<<$pcs_nickname>>, could you go to the forest to pick some berries? Grandma wants to make homemade fruit jam."'
+		'"How much should I pick, grandpa?" you ask.'
+		'"<<grandpa_bilberry>> kg will be enough," grandfather replies. "Just be careful so you don''t get lost."'
 	elseif grandpahelping = 12:
-		grandpa_bilberry = rand(2,3)
 		go_in_boletus_bilberry = 1
-		'"- <<$pcs_nickname>>, can you go to the forest and pick some berries and mushrooms? Your grandmother wants to make a mushroom soup, and has a craving for some fresh berries."'
-		'"- How much should I pick, grandpa?"'
-		'"- <<grandpa_boletus>> kg mushrooms and <<grandpa_bilberry>> kg of berries will be enough," grandfather replies. "- Just don`t get lost."'
+		grandpa_boletus = rand(1,2)
+		grandpa_bilberry = rand(2,3)
+		'"<<$pcs_nickname>>, can you go to the forest and pick some berries and mushrooms? Your grandmother wants to make a mushroom soup, and has a craving for some fresh berries."'
+		'"How much should I pick, grandpa?"'
+		'"<<grandpa_boletus>> kg mushrooms and <<grandpa_bilberry>> kg of berries will be enough," grandfather replies. "Just don`t get lost."'
 	end
 	act 'Go':gt'Gadhouse'
 end
 
---- grandpahelp ---------------------------------
+--grandpahelp ---------------------------------
 

locations/gschool_grounds.qsrc

@@ -1,4 +1,4 @@
-# gschool_grounds
+# gschool_grounds
 
 !Outside school building
 if $ARGS[0] = 'main':
@@ -480,7 +480,7 @@ if $ARGS[0] = 'KristinaFight':
 	shootV = 95
 	!Parameters
 	healthV = vitalV*10 + strenV*5
-	mannaV = intelV*10 + magikV*10
+	manaV = intelV*10 + magikV*10
 	willpowerV = willV*10
 	BonusAtakV = 0
 	BonusDefV = 0

locations/init.qsrc

@@ -5,7 +5,7 @@
 !hod = 0 player attacks hod = 1 enemy attacks
 !<font color = red><<$pcs_nickname>> </font>
 
-if GedoMazo = 1 and stunV > 0:stunV = 0 & mannaV = mannaV - 1000 & '<font color = red><<$boydesc>> lets out a deafening roar. It rejuvenates a large amount of energy which allows him to attack you again.</font>'
+if GedoMazo = 1 and stunV > 0:stunV = 0 & manaV = manaV - 1000 & '<font color = red><<$boydesc>> lets out a deafening roar. It rejuvenates a large amount of energy which allows him to attack you again.</font>'
 
 initi = pcs_react*20/100
 initi = initi - dospehVes

locations/kakuzu.qsrc

@@ -1,4 +1,4 @@
-# kakuzu
+# kakuzu
 if $ARGS[0] = 'start':
 	cla & *clr
 	minut += 5
@@ -56,7 +56,7 @@ if $ARGS[0] = 'mansion1':
 			'lightning - in this school each hit paralyzes the opponent, it has weaker than damage than the fire, but if you''re hooked by lightning, then quickly you will achieve any.'
 			'wind - weak damage, weak defense, but no fog or clones can save them from the wind and wind spells are almost impossible to dodge.'
 			'earth - defensive school, but the attacks are very dangerous. If the enemy attack misses, they will get stuck in the ground and unable to move. Earth protection is the most powerful of all protection, protection of land and regenerate itself absolute defense to attack the enemy.'
-			'Water - Damage of this school is weak, but all spells steal manna from the enemy, the same high level of water protection is very dangerous, it consumes manna from an enemy and regenerates, although it is weaker than earth protection.'
+			'Water - Damage of this school is weak, but all spells steal mana from the enemy, the same high level of water protection is very dangerous, it consumes mana from an enemy and regenerates, although it is weaker than earth protection.'
 			'Affinity with the elements means that you can learn this particular element. You can not explore another element after selecting affinity until izuchish element completely. I''ll give you 10 sheets of paper magic. Each sheet cost me 5, 000 <b>₽</b>. Concentrate the energy on a piece of paper until you succeed, then you can either start over and hope for another element, or proceed with the element that appeared to you.'
 
 			act 'Mark sheets':gt 'kakuzu', 'mansion1'
@@ -80,20 +80,20 @@ if $ARGS[0] = 'mansion1':
 			'lightning - in this school each hit paralyzes the opponent, it has weaker than damage than the fire, but if you''re hooked by lightning, then quickly you will achieve any.'
 			'wind - weak damage, weak defense, but no fog or clones can save them from the wind and wind spells are almost impossible to dodge.'
 			'earth - defensive school, but the attacks are very dangerous. If the enemy attack misses, they will get stuck in the ground and unable to move. Earth protection is the most powerful of all protection, protection of land and regenerate itself absolute defense to attack the enemy.'
-			'Water - Damage of this school is weak, but all spells steal manna from the enemy, the same high level of water protection is very dangerous, it consumes manna from an enemy and regenerates, although it is weaker than earth protection.'
+			'Water - Damage of this school is weak, but all spells steal mana from the enemy, the same high level of water protection is very dangerous, it consumes mana from an enemy and regenerates, although it is weaker than earth protection.'
 			'Affinity with the elements means that you can learn this particular element. You can not explore another element after selecting affinity until izuchish element completely. I''ll give you 10 sheets of paper magic. Each sheet cost me 5, 000 <b>₽</b>. Concentrate the energy on a piece of paper until you succeed, then you can either start over and hope for another element, or proceed with the element that appeared to you.'
 
 			act 'Move away':gt 'kakuzu', 'mansion1'
 		end
 	end
 
-	if tobiQW = 2 and srodpaper > 0 and pcs_manna < 2000:'You do not have enough mana to continue concentrating.'
+	if tobiQW = 2 and srodpaper > 0 and pcs_mana < 2000:'You do not have enough mana to continue concentrating.'
 
-	if tobiQW = 2 and srodpaper > 0 and pcs_manna >= 2000:
+	if tobiQW = 2 and srodpaper > 0 and pcs_mana >= 2000:
 		act 'Concentrating the energy in the sheet of paper (1:00)':
 			cla
 			minut += 60
-			pcs_manna -= 2000
+			pcs_mana -= 2000
 			pcs_sweat += 40
 
 			if srodstvo = 0:srodrand = rand(1, 5)
@@ -130,9 +130,9 @@ if $ARGS[0] = 'mansion1':
 		end
 	end
 
-	if tobiQW = 3 and pcs_manna < 1000:
+	if tobiQW = 3 and pcs_mana < 1000:
 		'Kakuzu tells you "You have almost no energy, you need to rest."'
-	elseif tobiQW = 3 and pcs_manna >= 1000:
+	elseif tobiQW = 3 and pcs_mana >= 1000:
 		if stihia = 1:
 			gs 'spellList', 'teacherActions', '$fireSpells', 'kakuzu', 'mansion1'
 		end

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:

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:

locations/kisameQW.qsrc

@@ -67,7 +67,7 @@ if $ARGS[0] = 'start':
 			shootV = 100
 			!!parameters
 			healthV = vitalV * 10 + strenV * 5
-			mannaV = intelV * magikV + magikV * 100 + vitalV * 10
+			manaV = intelV * magikV + magikV * 100 + vitalV * 10
 			willpowerV = willV * 10
 			BonusAtakV = 0
 			BonusDefV = 0

locations/korrPar.qsrc

@@ -183,7 +183,7 @@ if hour >= 16 and hour <= 20 and indorf = 0:
 		exit
 	end
 
-	if schoolprogul > 2 and SchoolAtestat = 0:
+	if schoolprogul > 2 and SchoolAtestat = 0 and schoolPredupr < 3:
 		*clr & cla
 		gs 'stat'
 		*pl $korrParMomHeader

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!"'
 

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

locations/kruchess.qsrc

@@ -11,90 +11,130 @@ gs 'themes', 'indoors'
 
 '<center><b><font color = maroon>Chess Club</font></b></center>'
 '<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/chess/kruchess.jpg"></center>'
+*nl
 
 if hour > 20:
 	'Chess club is closed. The coach and some players are tidying away the boards and pieces.'
+
 	act 'Leave':gt'gdkkru'
 else
 	if week ! 6:
-		'The kids are sitting around playing practice games, while being watched over and helped by coach Genrikh.'
+		'The kids are sitting around playing practice games, while being watched over and helped by Coach Genrikh.'
+
 		act 'Spend an hour practicing with assistance from the coach':
-			cla
-			*nl
-			chess_exp += rand(pcs_intel/20,pcs_intel/10)
-			intel_exp += 1
+			*clr & cla
+			chess_exp += rand(0,1)
+			intel_exp += rand(0,1)
 			minut += 60
+			gs 'stat'
+
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/chess/play' + rand(1,2) + '.jpg"></center>'
+			*nl
 			'You spend the next hour practicing against the other players with the coach walking around and stopping to help out or point things out. You learn a little every time. You also discuss the various chess openings and which ones are the best, which can often get lively.'
+
 			act 'Return': gt 'kruchess'
 		end
 		act 'Talk to the other players':
 			*clr & cla
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/chess/talk.jpg"></center>'
 			minut += 30
-			pcs_mood +=5
+			pcs_mood += 5
+			gs 'stat'
+
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/chess/talk.jpg"></center>'
+			*nl
 			'You take a break from playing and talk to a couple of your fellow chess enthusiasts. After first focusing on chess for a while, the conversation drifts off to other topics. You have a good time chatting and relaxing.'
+
 			act 'Return': gt 'kruchess'
 		end
 		act 'Talk to Evgeny Kuznetsov':
 			*clr & cla
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/chess/talk.jpg"></center>'
 			minut += 30
 			chess_exp += 2
 			npc_rel['A151'] += 5
+			gs 'stat'
+
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/35.jpg"></center>'
+			*nl
 			'You sit down next to Evgeny to talk. At first you try to catch his interest with ordinary things; he barely even responds to you, preoccupied playing against himself. Then you bring up a recent opening you have been trying and he perks up. Soon the two of you are talking about various openings and he shares with you some of his favorite ones and how he moves them to the mid game. You learn a bit about chess and feel like you are better friends with Evgeny.'
+
 			act 'Return': gt 'kruchess'
 		end
 	else
 		'On Saturdays, after a week''s training, club members spend the whole day playing against each other.'
+		*nl
+		if chess_win < 5:
+			'You have beaten Vitalik '+str(chess_win)+' times.'
+		elseif chess_win >= 5 and chess_win < 10:
+			'You have beaten Vitalik 5 times. You cannot play against him anymore.'
+			'You have beaten Kostya '+str(chess_win-5)+' times.'
+		elseif chess_win >= 10 and chess_win < 15:
+			'You have beaten Vitalik 5 times. You cannot play against him anymore.'
+			'You have beaten Kostya 5 times. You cannot play against him anymore.'
+			'You have beaten Sergei '+str(chess_win-10)+' times.'
+		elseif chess_win >= 15 and chess_win < 20:
+			'You have beaten Vitalik 5 times. You cannot play against him anymore.'
+			'You have beaten Kostya 5 times. You cannot play against him anymore.'
+			'You have beaten Sergei 5 times. You cannot play against him anymore.'
+			'You have beaten Coach Genrikh '+str(chess_win-15)+' times.'
+		elseif chess_win >= 20:
+			'You have beaten Vitalik 5 times. You cannot play against him anymore.'
+			'You have beaten Kostya 5 times. You cannot play against him anymore.'
+			'You have beaten Sergei 5 times. You cannot play against him anymore.'
+			'You have beaten Coach Genrikh 5 times. You cannot play against him anymore.'
+			'You have beaten Evgeny Kuznetsov '+str(chess_win-20)+' times. He is the only opponent left you can challenge.'
+		end
+		'You have won a total of '+str(chess_win)+' chess matches.'
+		*nl
+
 		if chess_win < 5:
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/chess/play' + rand(1,2) + '.jpg"></center>'
 			'You are paired against Vitalik, the youngest boy in the club. Despite his age he has already achieved rank 4, the lowest official chess rank corresponding to an ELO rating of 1000+.'
-			act'Play':
+
+			act 'Play chess with Vitalik':
 				*clr & cla
 				$chess_name='Vitalik'
-				chessV=40
-				gt'chessplay'
+				chessV=10
+				gt 'chessplay'
 			end
 		elseif chess_win < 10:
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/chess/play' + rand(1,2) + '.jpg"></center>'
 			'You get to play against Kostya, who recently advanced to rank 3 after passing 1400 ELO points.'
-			act'Play':
+
+			act 'Play chess with Kostya':
 				*clr & cla
 				$chess_name='Kostya'
-				chessV=100
-				gt'chessplay'
+				chessV=30
+				gt 'chessplay'
 			end
 		elseif chess_win < 15:
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/chess/play' + rand(1,2) + '.jpg"></center>'
 			'You sit down to play Sergei. You recall that he is a rank 2 player with an ELO rating of more than 1600.'
-			act'Play':
+
+			act 'Play chess with Sergei':
 				*clr & cla
 				$chess_name='Sergei'
-				chessV=300
-				gt'chessplay'
+				chessV=50
+				gt 'chessplay'
 			end
 		elseif chess_win < 20:
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/chess/play' + rand(1,2) + '.jpg"></center>'
-			'You are facing the chess coach. At his peak he achieved an ELO ranking of just over 2000, and despite his skills declining with age he still plays at the level of a rank 1 player.'
-			act'Play':
+			'You are facing Coach Genrikh. At his peak he achieved an ELO ranking of just over 2000, and despite his skills declining with age he still plays at the level of a rank 1 player.'
+
+			act 'Play chess with Coach Genrikh':
 				*clr & cla
-				$chess_name='Coach Genrikh G.'
-				chessV=800
-				gt'chessplay'
+				$chess_name='Coach Genrikh'
+				chessV=70
+				gt 'chessplay'
 			end
-		else
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/chess/play' + rand(1,2) + '.jpg"></center>'
-			'You are facing Evgeny Kuznetsov. He has already won the regional championship twice and placed well at the nationals each year he has attended. He is already rated above a 2200 in the ELO rankings.'
-			act'Play':
+		elseif chess_win >= 20:
+			'You are challenging Evgeny Kuznetsov. He has already won the regional championship twice and placed well at the nationals each year he has attended. He is already rated above a 2200 in the ELO rankings.'
+
+			act 'Play chess with Evgeny':
 				*clr & cla
 				$chess_name='Evgeny'
-				chessV=900
-				gt'chessplay'
+				chessV=90
+				gt 'chessplay'
 			end
 		end
 	end
 
-	act 'Leave':gt'gdkkru'
+	act 'Leave':gt 'gdkkru'
 end
 
 --- kruchess ---------------------------------

locations/lab.qsrc

@@ -1,4 +1,4 @@
-# lab
+# lab
 if $ARGS[0] = 'start':
 	cla & *clr
 	$menu_loc = 'lab'
@@ -61,7 +61,7 @@ if $ARGS[0] = 'start':
 			shootV = 100
 			!!parameters
 			healthV = vitalV * 10 + strenV * 5
-			mannaV = intelV * 10 + magikV * 10
+			manaV = intelV * 10 + magikV * 10
 			willpowerV = willV * 10
 			BonusAtakV = 0
 			BonusDefV = 0
@@ -91,7 +91,7 @@ if $ARGS[0] = 'start':
 			shootV = 100
 			!!parameters
 			healthV = vitalV * 10 + strenV * 5
-			mannaV = intelV * 6 + magikV * 10
+			manaV = intelV * 6 + magikV * 10
 			willpowerV = willV * 10
 			BonusAtakV = 0
 			BonusDefV = 0
@@ -257,7 +257,7 @@ if $ARGS[0] = 'ListBuilder':
 			bodymodValue = dyneval("result = <<$bodyModIndx>>[<<i>>]")
 		end
 		$bodyModDescX = dyneval('$result = <<$bodyModDesc>>[<<i>>]')
-		$ListStr = $ListStr + "<br><a href=""EXEC:<<$bodyModStat>> = <<bodymodValue>> & pcs_manna -= <<bodyModMana>> & gs 'arousal', 'voyeur', <<bodyModTime>> & gs 'stat' & gt 'lab', 'BodyModded', '<<$bodyModType>>', '<<$bodyModDescX>>'""><<$bodyModDescX>></a>"
+		$ListStr = $ListStr + "<br><a href=""EXEC:<<$bodyModStat>> = <<bodymodValue>> & pcs_mana -= <<bodyModMana>> & gs 'arousal', 'voyeur', <<bodyModTime>> & gs 'stat' & gt 'lab', 'BodyModded', '<<$bodyModType>>', '<<$bodyModDescX>>'""><<$bodyModDescX>></a>"
 		i += 1
 		jump 'BodyModLoop'
 	end
@@ -332,7 +332,7 @@ if $ARGS[0] = 'Tatiana':
 	act 'Ask for help with your appearance':
 		cla
 		'"Tatiana, I''m having problems with my body image, I''m not happy and was hoping that you might be able to help me."'
-		'"It''s possible but I will have to draw on your magical energy, it will cost some of your manna to perform a spell."'
+		'"It''s possible but I will have to draw on your magical energy, it will cost some of your mana to perform a spell."'
 
 		$HairColorTab =  func('lab', 'ListBuilder', 'Hair Color', '40', '30', '$hairColors','i',         'pcs_haircol')
 		$HairLengthTab = func('lab', 'ListBuilder', 'Hair Length','40', '30', '$hairTypes', 'hairTypes', 'pcs_hairlng')
@@ -341,9 +341,9 @@ if $ARGS[0] = 'Tatiana':
 		$LipTab =        func('lab', 'ListBuilder', 'Lip Size',   '40', '30', '$lipSize',   'i',         'pcs_lip')
 		$BreastTab =     func('lab', 'ListBuilder', 'Breast Size','40', '30', '$breastSize','breastSize','nbsize')
 
-		$SkinTab = "<a href=""EXEC:pcs_skin = 100 & pcs_manna -= 40 & gs 'arousal', 'voyeur', 30 & gs 'stat' & gt 'lab', 'BodyModded', 'Skin', 'clear'"">Clear Skin</a>"
-		$VirginTab = "<a href=""EXEC:pcs_vag = 0 & pcs_manna -= 40 & gs 'arousal', 'voyeur', 30 & gs 'stat' & gt 'lab', 'BodyModded', 'Virginity', 'renewed'"">Renew Virginity</a>"
-		$SiliconeTab = "<a href=""EXEC:brSurTemp = 0 & stringimplant = 0 & fillimplant = 0 & pcs_manna -= 40 & gs 'arousal', 'voyeur', 30 & gs 'stat' & gt 'lab', 'BodyModded', 'Boobs', 'natural again'"">Remove Silicone</a>"
+		$SkinTab = "<a href=""EXEC:pcs_skin = 100 & pcs_mana -= 40 & gs 'arousal', 'voyeur', 30 & gs 'stat' & gt 'lab', 'BodyModded', 'Skin', 'clear'"">Clear Skin</a>"
+		$VirginTab = "<a href=""EXEC:pcs_vag = 0 & pcs_mana -= 40 & gs 'arousal', 'voyeur', 30 & gs 'stat' & gt 'lab', 'BodyModded', 'Virginity', 'renewed'"">Renew Virginity</a>"
+		$SiliconeTab = "<a href=""EXEC:brSurTemp = 0 & stringimplant = 0 & fillimplant = 0 & pcs_mana -= 40 & gs 'arousal', 'voyeur', 30 & gs 'stat' & gt 'lab', 'BodyModded', 'Boobs', 'natural again'"">Remove Silicone</a>"
 
 		$SpellListStr = "<CENTER>
 	<TABLE CELLPADDING = '5'>
@@ -384,13 +384,13 @@ if $ARGS[0] = 'Tatiana':
 		act "Restore you body to it's original shape":
 			cla
 			'"Tatiana, I''m having problems with my body image, I''m not happy and was hoping that you might be able to help me."'
-			'"It''s possible but I will have to draw on your magical energy, it will cost 40 manna to perform a reset spell.'
+			'"It''s possible but I will have to draw on your magical energy, it will cost 40 mana to perform a reset spell.'
 			'This will reduce excess fat, growth of body parts and reduce high levels of silicone, moving you closer to your original body shape.'
 			'Do you wish to try this spell?'
 
 			act 'No, no, I''ve changed my mind. Thank you':gt 'lab', 'Tatiana'
 
-			if pcs_manna >= 40:
+			if pcs_mana >= 40:
 				act 'That sounds great, let''s do it!':
 					*clr
 					cla

locations/lact_lib.qsrc

@@ -266,6 +266,24 @@ if $ARGS[0] = 'breastrecalc':
 	lactation['breastfat'] = lactation['breastuseabletissue'] - lactation['breastglandtissue']
 end
 
+if $ARGS[0] = 'breastgrowthcalc':
+	!!	calculating the ccm all mammarygland tissue will use up in the breast, based on alveolicount and alveoliexpandlvl. With every level, cmm will rise by 20 per alveoli.
+	lactation['breastglandtissue']= (lactation['alveolicount'] * (218 + (lactation['alveoliexpandlvl'] * 20)))/100000
+	!!	Crazy Math going on here. When I was coding this, only god and I knew what I was doing. Now only god knows.
+	!!	Well actually, this one recalculates all the CCM stuff to normal nbsize, magicf2b and silicone. It works, no idea why, but it works.
+	lactation['breastccm'] = (lactation['breastglandtissue'] + lactation['breastfat'] + lactation['breastsiliconeccm'])
+	lactation['siliconepercent'] = ((lactation['breastsiliconeccm']*100)/lactation['breastccm'])
+	lactation['magicf2bccm'] = ((lactation['breastccm'] - ((lactation['breastccm']*lactation['siliconepercent'])/100))*lactation['magicf2bpercent_wos'])/100
+	lactation['nbsizebccm'] = lactation['breastccm'] - lactation['breastsiliconeccm'] - lactation['magicf2bccm']
+	lactation['nbsizepercent'] = ((lactation['nbsizebccm']*100)/lactation['breastccm'])
+	lactation['magicf2bpercent'] = ((lactation['magicf2bccm']*100)/lactation['nbsizebccm'])
+	nbsize = (func('lact_lib','bccmtosize',lactation['breastccm'])*lactation['nbsizepercent'])/100
+	magicf2b = (func('lact_lib','bccmtosize',lactation['breastccm'])*lactation['magicf2bpercent'])/100
+	lactation['nbsizechange'] = nbsize
+	lactation['magicf2bchange'] = magicf2b
+	lactation['siliconechange'] = silicone
+end
+
 !!	This function is used for breastgrowth. When nbsize, magicf2b, silicone, alveolicount or the alveoliexpandlvl are changed the breastccm changes. Everything will be written back to the specific variable
 if $ARGS[0] = 'BreastGrowth':
 	!!	usage func('lact_lib','BreastGrowth')
@@ -281,25 +299,13 @@ if $ARGS[0] = 'BreastGrowth':
 		!!	first - check for alveoligrowth: yes, do the crazy stuff
 		!!	second - check for nbsize, magicf2b and silicone change
 		!!	there is no else on purpose, because nothing should happen to svetas breasts if nothing else changes
-		if lactation['alveolicount_change'] <> lactation['alveolicount'] or lactation['alveoliexpandlvl_change'] <> lactation['alveoliexpandlvl']:
-			!!	calculating the ccm all mammarygland tissue will use up in the breast, based on alveolicount and alveoliexpandlvl. With every level, cmm will rise by 20 per alveoli.
-			lactation['breastglandtissue']= (lactation['alveolicount'] * (218 + (lactation['alveoliexpandlvl'] * 20)))/100000
-			!!	Crazy Math going on here. When I was coding this, only god and I knew what I was doing. Now only god knows.
-			!!	Well actually, this one recalculates all the CCM stuff to normal nbsize, magicf2b and silicone. It works, no idea why, but it works.
-			lactation['breastccm'] = (lactation['breastglandtissue'] + lactation['breastfat'] + lactation['breastsiliconeccm'])
-			lactation['siliconepercent'] = (lactation['breastsiliconeccm']/lactation['breastccm'])*100
-			lactation['magicf2bccm'] = ((lactation['breastccm'] - ((lactation['breastccm']*lactation['siliconepercent'])/100))*lactation['magicf2bpercent_wos'])/100
-			lactation['nbsizebccm'] = lactation['breastccm'] - lactation['breastsiliconeccm'] - lactation['magicf2bccm']
-			lactation['nbsizepercent'] = (lactation['nbsizebccm']/lactation['breastccm'])*100
-			lactation['magicf2bpercent'] = (lactation['magicf2bccm']/lactation['nbsizebccm'])*100
-			nbsize = (func('lact_lib','bccmtosize',lactation['breastccm'])*lactation['nbsizepercent'])/100
-			magicf2b = (func('lact_lib','bccmtosize',lactation['breastccm'])*lactation['magicf2bpercent'])/100
-			lactation['nbsizechange'] = nbsize
-			lactation['magicf2bchange'] = magicf2b
-			lactation['siliconechange'] = silicone
-		elseif (lactation['nbsizechange'] + lactation['siliconechange'] + lactation['magicf2bchange']) <> (nbsize + magicf2b + silicone):
-		!!	 and (lactation['alveolicount_change'] = lactation['alveolicount'] or lactation['alveoliexpandlvl_change'] = lactation['alveoliexpandlvl'])
-			func('lact_lib','breastrecalc')
+		if  (lactation['nbsizechange'] + lactation['siliconechange'] + lactation['magicf2bchange']) <> (nbsize + magicf2b + silicone):
+			func('lact_lib','breastrecalc')	
+			if lactation['alveolicount_change'] <> lactation['alveolicount'] or lactation['alveoliexpandlvl_change'] <> lactation['alveoliexpandlvl']
+				func('lact_lib','breastgrowthcalc')
+			end
+		elseif lactation['alveolicount_change'] <> lactation['alveolicount'] or lactation['alveoliexpandlvl_change'] <> lactation['alveoliexpandlvl']:
+			func('lact_lib','breastgrowthcalc')
 		end
 	end
 end
@@ -575,9 +581,9 @@ if $ARGS[0] = 'breastcycle':
 		if lactation['milkgrowday'] < daystart:
 			if (lactation['dailyoverdemand']/200) <= 0 and lactation['dailyoverdemand'] > 0:
 				lactation['prolactinlvl'] += 1
-			elseif (lactation['dailyoverdemand']/200) >= 10 and pregtimes <= 0:
+			elseif (lactation['dailyoverdemand']/200) >= 10 and lactation['maturebreast'] <= 0:
 				lactation['prolactinlvl'] += 10
-			elseif (lactation['dailyoverdemand']/200) >= 50 and pregtimes > 1:
+			elseif (lactation['dailyoverdemand']/200) >= 50 and lactation['maturebreast'] > 0:
 				lactation['prolactinlvl'] += 50
 			else
 				if lactation['prolactinlvl'] > 0 and pregchem < 2191:

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

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

locations/lover_pref.qsrc

@@ -402,7 +402,7 @@ elseif titBoy = 2:
 end
 
 
-!! manna , mannamax * 50 / 100:
+!! mana , manamax * 50 / 100:
 
 if pcs_hairbsh = 1 and curly > 0:
 	loverrelation[lover_number] += 2 &

locations/mainQW.qsrc

@@ -30,7 +30,7 @@ act 'Investigate':
 			cls
 			pcs_health = pcs_vital * 10
 			pcs_willpwr = pcs_intel * 5 + pcs_sprt * 5
-			pcs_manna = (pcs_intel * pcs_magik) + pcs_vital * 5 + rikudo
+			pcs_mana = (pcs_intel * pcs_magik) + pcs_vital * 5 + rikudo
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/lab/lab.jpg"></center>'
 			'Before you is a massive laboratory with a wide variety of stands and equipment racks with different flasks and bottles.'

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

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

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

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'

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?"'

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

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

locations/obj_din.qsrc

@@ -1,4 +1,4 @@
-# obj_din
+# obj_din
 
 if $ARGS[0] = 'chartabs':
 	cla
@@ -1484,7 +1484,7 @@ if $ARGS[0] = 'magic':
 	if pcs_magik = 0:
 		'You are unable to use magic.'
 	elseif pcs_magik > 0:
-		'You have <<pcs_manna>> units of manna available to you.'
+		'You have <<pcs_mana>> units of mana available to you.'
 		!!' Forces Rikudo available to you <<rikudo>> units'
 		*nl
 

locations/park.qsrc

@@ -1,4 +1,4 @@
-# park
+# park
 $location_type = 'public_outdoors'
 
 if $ARGS[0] = 'start':
@@ -154,7 +154,7 @@ if $ARGS[0] = 'start':
 						shootV = 100
 						!!parameters
 						healthV = vitalV * 10 + strenV * 5
-						mannaV = intelV * 10 + magikV * 10
+						manaV = intelV * 10 + magikV * 10
 						willpowerV = willV * 10
 						BonusAtakV = 0
 						BonusDefV = 0
@@ -561,7 +561,7 @@ if $ARGS[0] = 'prost':
 			shootV = 10
 			!!parameters
 			healthV = vitalV * 10 + strenV * 5
-			mannaV = intelV * 10 + magikV * 10
+			manaV = intelV * 10 + magikV * 10
 			willpowerV = willV * 10
 			BonusAtakV = 0
 			BonusDefV = 0
@@ -613,7 +613,7 @@ if $ARGS[0] = 'prost':
 					shootV = 10
 					!!parameters
 					healthV = vitalV * 10 + strenV * 5
-					mannaV = intelV * 10 + magikV * 10
+					manaV = intelV * 10 + magikV * 10
 					willpowerV = willV * 10
 					BonusAtakV = 0
 					BonusDefV = 0
@@ -690,7 +690,7 @@ if $ARGS[0] = 'prost':
 					shootV = 10
 					!!parameters
 					healthV = vitalV * 10 + strenV * 5
-					mannaV = intelV * 10 + magikV * 10
+					manaV = intelV * 10 + magikV * 10
 					willpowerV = willV * 10
 					BonusAtakV = 0
 					BonusDefV = 0

locations/parkivent.qsrc

@@ -1,4 +1,4 @@
-# parkivent
+# parkivent
 
 if $ARGS[0] = 'empty':
 	menu_off = 1
@@ -61,7 +61,7 @@ if $ARGS[0] = '1':
 			shootV = 100
 			!!parameters
 			healthV = vitalV * 10 + strenV * 5
-			mannaV = intelV * 10 + magikV * 10
+			manaV = intelV * 10 + magikV * 10
 			willpowerV = willV * 10
 			BonusAtakV = 0
 			BonusDefV = 0
@@ -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>."'

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

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)

locations/pavComplex.qsrc

@@ -52,17 +52,12 @@ if $ARGS[0] = 'start':
 
 	if week = 1 or week = 3 or week = 5 and hour >= 17 and hour <= 19 and Storyline > 0: 'Walking along the apartment complex you can hear a bouncing sound. Turning the corner you see <a href="exec:gt ''gschool_socialchg1'', ''tLariska''">Lariska</a> hitting a ball against the wall...'
 	
-	if car > 0 and cardrive = 20:
-		cardrive = 20
-		'Your <a href="exec:gs ''carF'', ''start''"><<$car>></a> is parked in the street.'
-	end
+	if car > 0 and cardrive = 20: 'Your <a href="exec:gs ''carF'', ''start''"><<$car>></a> is parked in the street.'
 	
 	if rexCar = 1 and rexCarDay = daystart and hour >= 21 and hour < 23 and rexSisTalk = 3:
 		'<br>Rex is in his car, waiting for you at the parking lot near the apartment building where your parents live.'
 		act 'Join Rex in his car':gt'reks','avto'
-	end
-
-	if rexCar = 1 and rexCarDay = daystart and hour = 21 and rexSisTalk >= 4:
+	elseif rexCar = 1 and rexCarDay = daystart and hour = 21 and rexSisTalk >= 4:
 		'<br>Rex is in his car, waiting for you at the parking lot near the apartment building where your parents live.'
 		act 'Join Rex in his car':gt'reks','avto2'
 	end
@@ -159,7 +154,7 @@ if $ARGS[0] = 'garages':
 	$menu_arg = 'garages'
 	menu_off = 0
 	*clr & cla
-	'<center>Garage array</center>'
+	'<center>Five Eight Estate - Garages</center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/garages.jpg"></center>'
 	'Along the back street is a row of garages for rent to the residents of the apartments. The weather in Pavlovsk can be brutal especially in the winter, so people who own a car often have a garage to put it away safely. Between the garages and the courtyard is a series of smaller storage buildings that can be rented as well as the complex maintenance building and laundry. The buildings layout leaves of a bit of a maze of walkways between them, which is a popular place for the kids to play or for teenagers to hang out.'
 	if StoryLine = 1:'Your <a href="exec:minut += 5 & gt ''gargazel''">stepfather''s garage</a> is around here somewhere.'

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

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:
@@ -677,11 +677,10 @@ if $ARGS[0] = 'male_gopnik_beer':
 				else
 					'You don''t have enough willpower to stop drinking and leave.'
 				end
-				end
 				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 +714,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 +791,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 +806,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 +822,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 +838,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 +925,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 +954,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 +970,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 +986,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 +1002,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 +1018,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 +1046,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 +1075,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 +1261,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>'

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

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

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