Alcohol related fixes from spectre1viper

locations/VolleyTrenerSpeak

@@ -16,10 +16,10 @@ if volleysostav > 0:
 		'You go upto Mikhail Nikolaevich, and politely say hello.'
 		'"<<$pcs_lastname>>, I was told you were here, are you really that stupid? There''s a game tomorrow!"'
 		'"I...err...was...erm...dropping off a book for a friend." you mumble.'
-		if alko > 0:
+		if alko > 1:
 			'"You''ve been drinking! If you can''t even take the team seriously, then you''re not playing tomorrow."'
 			npc_rel['A69'] -= 1
-! The flag is not admission to the game on Saturday
+! The flag is for no admission to the game on Saturday
 			seealko = 1 
 		end
 		'"Come on I''d better take you home." The coach says. Looks like you are done with the dance for tonight.'

locations/father

@@ -316,7 +316,7 @@ if (hour > 10 and week < 6) or week >= 6:
 		exit
 	end
 
-	if alko > 0 and alkoday ! daystart:
+	if alko > 1 and alkoday ! daystart:
 		alkoday = daystart
 		npc_rel['A28'] -= 1
 		'Your stepfather notices the sharp smell of booze on you and looks disappointed. "<<$pcs_nickname>>, you smell like alcohol, what are you getting yourself into? You''re too young to drink that!"'

locations/gdkin

@@ -83,15 +83,25 @@ if $ARGS[0] = '':
 				if alko >= 4:
 					'You''re too drunk to try and dance, you are barely able to stay on your feet and mostly just drunkenly bump into other people as you try and dance.'
 					if rand (0,1) = 0:gt 'gdkin', 'too_drunk_dance'
-				elseif alko > 0:
+				elseif alko = 1:
 					if $pantyworntype = 'none' and PCloSkirt > 2:
 						*clr
 						'<center><video autoplay loop src="images/locations/pavlovsk/community/disco/club_dance2.mp4"></video></center>'
-						'You''re drunk and you forget you don''t have any panties on. As you dance around moving your body, your skirt rides up, exposing your pussy to the observant people on the dance floor with you.'
+						'You''re a bit tipsy and you forget that you don''t have any panties on. As you dance around moving your body, your skirt rides up, exposing your pussy to the observant people on the dance floor.'
 					else
 						*clr
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club_dance7.jpg"></center>'
-						'You''re drunk, but you''re having a lot of fun out on the dance floor anyways, you''re not even paying attention to others or even the music.'
+						'You''re a bit tipsy, but you''re having a lot of fun out on the dance floor anyways, you''re not paying much attention to anyone else or even the music.'
+					end
+				elseif alko > 1:
+					if $pantyworntype = 'none' and PCloSkirt > 2:
+						*clr
+						'<center><video autoplay loop src="images/locations/pavlovsk/community/disco/club_dance2.mp4"></video></center>'
+						'You''re drunk and you forget that you don''t have any panties on. As you dance around moving your body, your skirt rides up, exposing your pussy to the observant people on the dance floor with you.'
+					else
+						*clr
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club_dance7.jpg"></center>'
+						'You''re drunk, but you''re having a lot of fun out on the dance floor anyways, you''re not even paying attention to anyone else or even the music.'
 					end
 				else
 					'The music is quite old, but catchy. You have fun dancing, not paying attention to anyone.'
@@ -105,7 +115,7 @@ if $ARGS[0] = '':
 						gs 'stat'
 						'<<$din_disc_dance2>>'
 
-						act 'Dance with a guy':gt 'gdkin', 'dance_vrp'
+						act 'Dance with the guy':gt 'gdkin', 'dance_vrp'
 
 						act 'Move away':
 							cls
@@ -147,13 +157,14 @@ if $ARGS[0] = '':
 			end
 
 			if alko >= 4:
-				'You''re drunk to dance and you lean against the wall for support to keep from falling down.'
+				'You''re too drunk to dance and you lean against the wall for support to keep from falling down.'
 				if rand (0,1) = 0:gt 'gdkin', 'too_drunk_dance'
-
-			elseif alko > 0:
+			elseif alko = 1:
+				'You''re tipsy, and standing against the wall watching the others dance.'
+			elseif alko > 1:
 				'You''re drunk, and standing against the wall watching the others dance.'
 			else
-				'You are standing watching the others dancing.'
+				'You are standing next to the wall while watching the others dance.'
 			end
 
 			if alko < 4:
@@ -341,7 +352,8 @@ if $ARGS[0] = 'dance_vrp':
 			'The guy is dancing with you holding your waist with his hands.'
 			gs 'gdkin', 'reverse_reakt_dance'
 		elseif DPtipe = 2:
-			*clr &'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club_dance6.jpg"></center>'
+			*clr
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club_dance6.jpg"></center>'
 			'The drunk guy pushes into you, grinding his body up against yours. You feel your soft breasts literally flatten against the man''s chest.'
 			gs 'arousal', 'foreplay', 5
 			gs 'stat'
@@ -354,7 +366,8 @@ if $ARGS[0] = 'dance_vrp':
 			gs 'stat'
 			gs 'gdkin', 'reakt_dance'
 		elseif DPtipe = 2:
-			*clr &'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club_dance8.jpg"></center>'
+			*clr
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club_dance8.jpg"></center>'
 			'A guy grabs your ass and squeezes it, he pulls you into a hug and kisses you passionately.'
 			gs 'arousal', 'foreplay', 5
 			gs 'stat'
@@ -377,9 +390,13 @@ if $ARGS[0] = 'dance_vrp':
 		if pcs_danc >= 50 and alko > 0 and pcs_horny >= 50:
 		act 'Sexy dance':
 			cls
-			'You are taking advantage of your ability to dance, sexy moves cause your partner to stare at you. But he seems stunned by how great you look or maybe by how well you move, either way he suddenly moves away and disappears into the crowd.'
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club_dance3.jpg"></center>'
-			if $pantyworntype = 'none' and PCloSkirt > 2: *clr & '<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club_dance4.jpg"></center>' & 'Trying to move your body as erotically as possible, you lean forward while doing a complex dance move, completely forgetting that you''re not wearing panties. Now your dance partner knows as well and it seems he will likely never forget.'
+			if $pantyworntype = 'none' and PCloSkirt > 2:
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club_dance4.jpg"></center>'
+				'Trying to move your body as erotically as possible, you lean forward while doing a complex dance move, completely forgetting that you''re not wearing panties. Now your dance partner knows as well and it seems he will likely never forget.'
+			else
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club_dance3.jpg"></center>'
+				'You are taking advantage of your ability to dance, sexy moves cause your partner to stare at you. But he seems stunned by how great you look or maybe by how well you move, either way he suddenly moves away and disappears into the crowd.'
+			end
 			danc_exp += 1
 			gs 'arousal', 'flash_pussy', 5
 			gs 'stat'
@@ -391,9 +408,13 @@ if $ARGS[0] = 'dance_vrp':
 	act 'Further':
 		cls
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club_dance.jpg"></center>'
-		if $pantyworntype = 'none' and alko > 0 and PCloSkirt > 2: *clr &'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club_dance9.jpg"></center>'
-		if alko > 0: *clr &'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club_dance10.jpg"></center>'
+		if $pantyworntype = 'none' and alko > 0 and PCloSkirt > 2:
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club_dance9.jpg"></center>'
+		elseif alko > 0:
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club_dance10.jpg"></center>'
+		else
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club_dance.jpg"></center>'
+		end
 
 		if DPgrup = 1:
 			$npc_usedname[$npclastcalled] = $npc_nickname[$npclastcalled]
@@ -421,7 +442,7 @@ if $ARGS[0] = 'dance_vrp':
 			if DPtipe = 1:
 				'The man danced with confidence and elegance, finally the song was over and the man offers to go out for some fresh air and talk.'
 
-				act 'Go with a man':
+				act 'Go with the man':
 					cls
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/dk_night.jpg"></center>'
@@ -431,7 +452,7 @@ if $ARGS[0] = 'dance_vrp':
 
 					act 'Go to the hotel':gt 'EvOtelMan'
 
-					if alko <= 2 and pcs_horny <= 75:
+					if alko <= 2 or pcs_horny <= 75 or pav_slut <= 25:
 						act 'Refuse':
 							if pcs_sprt <= 30: sprt_exp += rand(0, 1)
 							gt 'gdkin'
@@ -448,8 +469,7 @@ if $ARGS[0] = 'dance_vrp':
 			end
 		end
 
-		gs 'stat'
-		if alko <= 2 and pcs_horny <= 75:
+		if alko <= 2 or pcs_horny <= 75 or pav_slut <= 25:
 			act 'Refuse':
 				if pcs_sprt <= 30: sprt_exp += rand(0, 1)
 				gt 'gdkin'

locations/gdksport

@@ -612,7 +612,7 @@ if $ARGS[0] = 'vball2':
 	cla
 	*clr
 	gsAboVolley -= 1
-	if alko = 0:
+	if alko < 2:
 		npc_rel['A69'] += rand(0,2)
 		timemult = 8
 		loopcount = 1
@@ -632,8 +632,12 @@ if $ARGS[0] = 'vball2':
 	end
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/gdksport.jpg"></center>'
-	if alko = 0:'At the beginning of the workout you ran a few laps around the gym. After some sprints, you did abdominal exercises. Afterwards, you practiced volleying and serving the ball.'
-	if alko > 0: npc_rel['A69'] -= rand(0,2) & 'You tried to train, but your level of intoxication doesn''t let you focus. The coach sent you to spend the lesson doing laps.'
+	if alko < 2:
+		'At the beginning of the workout you ran a few laps around the gym. After some sprints, you did abdominal exercises. Afterwards, you practiced volleying and serving the ball.'
+	else
+		npc_rel['A69'] -= rand(0,2)
+		'You tried to train, but your level of intoxication doesn''t let you focus. The coach sent you to spend the lesson doing laps.'
+	end
 
 	act 'Leave':gt 'gdksport', 'start'
 	act 'Speak to coach':gt 'Voltrener', 'start'
@@ -647,7 +651,7 @@ if $ARGS[0] = 'vball3':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/gdksport.jpg"></center>'
 	'On Fridays they hold intramural competitions. Scouts for professional teams sometime come to see who the stronger and more talented players are.'
 
-	if alko = 0:
+	if alko < 2:
 		timemult = 8
 		loopcount = 1
 		:vballtimeloop3

locations/mother

@@ -595,7 +595,7 @@ if $ARGS[0] = '':
 		end
 	end
 
-	if alko > 0 and alkomday ! daystart:
+	if alko > 1 and alkomday ! daystart:
 		alkomday = daystart
 		npc_rel['A29'] -= 1
 		delin_beh += 1 &!counter for getting sent to Gadyukino for the summer

locations/sny

@@ -222,7 +222,7 @@ if $ARGS[0] = '3':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/drunk.jpg"></center>'
 		'You drink down the shot of vodka.'
 
-		act 'tusit': minut += 5 & gt 'sny', '4'
+		act 'Nostrovia!': minut += 5 & gt 'sny', '4'
 	end
 
 	act 'Refuse drink':
@@ -232,7 +232,7 @@ if $ARGS[0] = '3':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/tusa3.jpg"></center>'
 		'You just hold the vodka and pretend to drink before setting it back down.'
 
-		act 'tusit': minut += 5 & gt 'sny', '4'
+		act 'Continue': minut += 5 & gt 'sny', '4'
 	end
 end
 
@@ -253,7 +253,7 @@ if $ARGS[0] = '4':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/drunk.jpg"></center>'
 		'You down the glass of vodka'
 
-		act 'tusit': minut += 5 & gt 'sny', '5'
+		act 'Nostrovia!': minut += 5 & gt 'sny', '5'
 	end
 
 	act 'Refuse drink':
@@ -263,7 +263,7 @@ if $ARGS[0] = '4':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/tusa4.jpg"></center>'
 		'You turn down the offered glass.'
 
-		act 'tusit': minut += 5 & gt 'sny', '5'
+		act 'Continue': minut += 5 & gt 'sny', '5'
 	end
 end
 
@@ -284,7 +284,7 @@ if $ARGS[0] = '5':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/drunk.jpg"></center>'
 		'You drink down the shoot of vodka and feel it burn all the way down.'
 
-		act 'tusit': minut += 5 & gt 'sny', '6'
+		act 'Nostrovia!': minut += 5 & gt 'sny', '6'
 	end
 
 	act 'Refuse drink':
@@ -294,7 +294,7 @@ if $ARGS[0] = '5':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/tusa5.jpg"></center>'
 		'You turn down the offered glass.'
 		
-		act 'tusit': minut += 5 & gt 'sny', '6'
+		act 'Continue': minut += 5 & gt 'sny', '6'
 	end
 end
 
@@ -315,7 +315,7 @@ if $ARGS[0] = '6':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/drunk.jpg"></center>'
 		'You drink down the shoot of vodka and feel it burn all the way down.'
 
-		act 'tusit': minut += 5 & gt 'sny', '7'
+		act 'Nostrovia!': minut += 5 & gt 'sny', '7'
 	end
 
 	act 'Refuse drink':
@@ -325,7 +325,7 @@ if $ARGS[0] = '6':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/tusa6.jpg"></center>'
 		'You turn down the offered glass.'
 
-		act 'tusit': minut += 5 & gt 'sny', '7'
+		act 'Continue': minut += 5 & gt 'sny', '7'
 	end
 end
 
@@ -371,7 +371,7 @@ if $ARGS[0] = '7':
 		'You are quite tipsy and has not thinking straight. Someone''s hand pulls you into the center of the room with the dancing boys and girls. Nosov suddenly pulls your top down, exposing your breasts to everyone in the room. You sluggish pull your top back up. Dimka takes you by the hand and drags you out of the room.'
 
 		act 'Hey! Where are you dragging me?': minut += 5 & gt 'sny', '10'
-	elseif alko > 0 and alko < 6:
+	elseif alko > 1 and alko < 6:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/alb.jpg"></center>'
 		'You are a little drunk, but having fun. When you notice, Albina sitting on the couch and kissing Vanka, while Fedka paws at her breasts. Looking around you some more you notice that Katja nowhere to be seen.'
 
@@ -388,7 +388,26 @@ if $ARGS[0] = '7':
 			gs 'stat'
 			act 'Go into the room': minut += 5 & gt 'sny', '8'
 		end
-	elseif alko = 0:
+	elseif alko = 1:
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/idi.jpg"></center>'
+		'You are a bit tipsy and feel fairly relaxed at the party. There''s some vodka shots lined up so you could have another drink or maybe it''s time to head home?'
+
+		act 'drink':
+			cls
+			minut += 15
+			alko += 3
+			cumspclnt = 2
+			gs 'cum_cleanup'
+			pcs_breath = 0
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/drunk.jpg"></center>'
+			'You down the shoot of vodka and feel its warmth in your chest.'
+
+			act 'Nostrovia!': minut += 5 & gt 'sny', '7'
+		end
+
+		act 'Leave':gt 'pavResidential'
+	else
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/idi.jpg"></center>'
 		'You are quite sober looking at these raging idiots that surround you.'