Browse Source

Added Albina taking you home from disco when drunk, along with fix to school characters.

Vengeance11 2 years ago
parent
commit
dcf5c0960b
2 changed files with 68 additions and 20 deletions
  1. 40 17
      locations/pav_disco.qsrc
  2. 28 3
      locations/pav_disco_jocks.qsrc

+ 40 - 17
locations/pav_disco.qsrc

@@ -201,10 +201,12 @@ if $ARGS[0] = '':
 					end
 					if mid($start_type,1,2) = 'sg' and katjaQW['QWstage']  > 1 and rand(1,10) = 1: 
 						gt 'pav_disco', 'katja_too_drunk'
-					elseif npc_rel['A25'] >= 50 and rand(1,10) = 1:
+					elseif mid($start_type,1,2) = 'sg' and npc_rel['A25'] >= 50 and rand(1,10) = 1:
 						gt 'pav_disco', 'sonia_too_drunk' 
-					elseif npc_rel['A144'] >= 50 and rand(1,10) = 1: 
+					elseif mid($start_type,1,2) = 'sg' and npc_rel['A144'] >= 50 and rand(1,10) = 1: 
 						gt 'pav_disco', 'anushka_too_drunk'
+					elseif mid($start_type,1,2) = 'sg' and (AlbinaQW['Friends'] = 2 or (npc_rel['A23'] >= 70) and (grupTipe = 1 or grupTipe = 2 or grupTipe = 3))) and rand (1,10) = 1:
+						gt 'pav_disco', 'albina_too_drunk'
 					end
 				elseif alko < 10:
 					if $pantyworntype = 'none' and PCloSkirt > 2:
@@ -235,10 +237,12 @@ if $ARGS[0] = '':
 						end
 						if mid($start_type,1,2) = 'sg' and katjaQW['QWstage']  > 1 and rand(1,5) = 1: 
 							gt 'pav_disco', 'katja_too_drunk'
-						elseif npc_rel['A25'] >= 50 and rand(1,7) = 1:
+						elseif mid($start_type,1,2) = 'sg' and npc_rel['A25'] >= 50 and rand(1,7) = 1:
 							gt 'pav_disco', 'sonia_too_drunk' 
-						elseif npc_rel['A144'] >= 50 and rand(1,7) = 1: 
+						elseif mid($start_type,1,2) = 'sg' and npc_rel['A144'] >= 50 and rand(1,7) = 1: 
 							gt 'pav_disco', 'anushka_too_drunk'
+						elseif mid($start_type,1,2) = 'sg' and (AlbinaQW['Friends'] = 2 or (npc_rel['A23'] >= 70 and (grupTipe = 1 or grupTipe = 2 or grupTipe = 3))) and rand (1,7) = 1:
+							gt 'pav_disco', 'albina_too_drunk'
 						end
 					else
 						*clr & cla
@@ -264,10 +268,12 @@ if $ARGS[0] = '':
 						end
 						if mid($start_type,1,2) = 'sg' and katjaQW['QWstage']  > 1 and rand(1,5) = 1: 
 							gt 'pav_disco', 'katja_too_drunk'
-						elseif npc_rel['A25'] >= 50 and rand(1,7) = 1:
+						elseif mid($start_type,1,2) = 'sg' and npc_rel['A25'] >= 50 and rand(1,7) = 1:
 							gt 'pav_disco', 'sonia_too_drunk' 
-						elseif npc_rel['A144'] >= 50 and rand(1,7) = 1: 
+						elseif mid($start_type,1,2) = 'sg' and npc_rel['A144'] >= 50 and rand(1,7) = 1: 
 							gt 'pav_disco', 'anushka_too_drunk'
+						elseif mid($start_type,1,2) = 'sg' and (AlbinaQW['Friends'] = 2 or (npc_rel['A23'] >= 70 and (grupTipe = 1 or grupTipe = 2 or grupTipe = 3))) and rand (1,7) = 1:
+							gt 'pav_disco', 'albina_too_drunk'
 						end
 					end
 				else
@@ -278,10 +284,12 @@ if $ARGS[0] = '':
 					'You''re far too drunk and are barely able to stay on your feet. You''re mostly just drunkenly bumping into other people as you try and dance.'
 					if mid($start_type,1,2) = 'sg' and katjaQW['QWstage']  > 1 and rand(1,3) = 1: 
 						gt 'pav_disco', 'katja_too_drunk'
-					elseif npc_rel['A25'] >= 50 and rand(1,5) = 1:
+					elseif mid($start_type,1,2) = 'sg' and npc_rel['A25'] >= 50 and rand(1,5) = 1:
 						gt 'pav_disco', 'sonia_too_drunk' 
-					elseif npc_rel['A144'] >= 50 and rand(1,5) = 1: 
+					elseif mid($start_type,1,2) = 'sg' and npc_rel['A144'] >= 50 and rand(1,5) = 1: 
 						gt 'pav_disco', 'anushka_too_drunk'
+					elseif mid($start_type,1,2) = 'sg' and (AlbinaQW['Friends'] = 2 or (npc_rel['A23'] >= 70 and (grupTipe = 1 or grupTipe = 2 or grupTipe = 3))) and rand (1,10) = 1:
+						gt 'pav_disco', 'albina_too_drunk'
 					end
 				end
 				if alko < 6:
@@ -321,32 +329,36 @@ if $ARGS[0] = '':
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/wallflower.jpg"></center>'
 			if alko > 0:
 				if alko = 1:
-					'You''re buzzed and stand against the wall, watching the others dance.'
+					'You''re buzzed and stand against the wall while watching the others dance.'
 				elseif alko < 4:
-					'You''re tipsy and stand against the wall, watching the others dance.'
+					'You''re tipsy and stand against the wall while watching the others dance.'
 				elseif alko < 6:
 					if mid($start_type,1,2) = 'sg' and katjaQW['QWstage']  > 1 and rand(1,10) = 1: 
 						gt 'pav_disco', 'katja_too_drunk'
-					elseif npc_rel['A25'] >= 50 and rand(1,10) = 1:
+					elseif mid($start_type,1,2) = 'sg' and npc_rel['A25'] >= 50 and rand(1,10) = 1:
 						gt 'pav_disco', 'sonia_too_drunk' 
-					elseif npc_rel['A144'] >= 50 and rand(1,10) = 1: 
+					elseif mid($start_type,1,2) = 'sg' and npc_rel['A144'] >= 50 and rand(1,10) = 1: 
 						gt 'pav_disco', 'anushka_too_drunk'
+					elseif mid($start_type,1,2) = 'sg' and (AlbinaQW['Friends'] = 2 or (npc_rel['A23'] >= 70 and (grupTipe = 1 or grupTipe = 2 or grupTipe = 3))) and rand (1,10) = 1:
+						gt 'pav_disco', 'albina_too_drunk'
 					else
-						'You''re pretty drunk and stand against the wall, for support, as you watch the others dance.'
+						'You''re pretty drunk and stand against the wall for support as you watch the others dance.'
 					end	
 				else
 					if mid($start_type,1,2) = 'sg' and katjaQW['QWstage']  > 1 and rand(1,5) = 1: 
 						gt 'pav_disco', 'katja_too_drunk'
-					elseif npc_rel['A25'] >= 50 and rand(1,7) = 1:
+					elseif mid($start_type,1,2) = 'sg' and npc_rel['A25'] >= 50 and rand(1,7) = 1:
 						gt 'pav_disco', 'sonia_too_drunk' 
-					elseif npc_rel['A144'] >= 50 and rand(1,7) = 1: 
+					elseif mid($start_type,1,2) = 'sg' and npc_rel['A144'] >= 50 and rand(1,7) = 1: 
 						gt 'pav_disco', 'anushka_too_drunk'
+					elseif mid($start_type,1,2) = 'sg' and (AlbinaQW['Friends'] = 2 or (npc_rel['A23'] >= 70 and (grupTipe = 1 or grupTipe = 2 or grupTipe = 3))) and rand (1,7) = 1:
+						gt 'pav_disco', 'albina_too_drunk'
 					else
-						'You''re too drunk to dance and you lean against the wall for support to stop yourself from falling.'
+						'You''re too drunk to dance and lean against the wall for support to stop yourself from falling.'
 					end
 				end
 			else
-				'You are standing next to the wall while watching the others dance.'
+				'You stand next to the wall while watching the others dance.'
 			end
 			if alko < 6:
 				verodance = 0
@@ -749,6 +761,17 @@ if $ARGS[0] = 'anushka_too_drunk':
 	'Anushka approaches and pokes you, which causes you to jerk away. This causes you to stumble and nearly fall, but Anushka catches you by the arm to help steady you. "Someone''s partied pretty hard tonight, haven''t they? Maybe a little too hard. Let''s get you home before someone tries to take advantage of you."'
 	act 'Go with Anushka': gt 'pav_disco_gopniks', 'anushka_walkhome'
 end
+	
+if $ARGS[0] = 'albina_too_drunk':
+	*clr & cla
+	menu_off = 1
+	gs 'stat'
+	'<center><b><font color="maroon">Disco</font></b></center>'
+	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big23.jpg"></center>'
+	'You''re barely able to stand upright and stumble right into a nearby girl. It takes you a few seconds to realize that your face is firmly buried in her cleavage and you quickly jerk away, much to the disappointment of the boys around you.'
+	'"Someone''s had a little too much fun it seems." You look up and notice that it''s Albina. "Let''s get you home before you do something you regret."'
+	act 'Go with Albina': gt 'pav_disco_jocks', 'albina_walkhome'
+end
 
 if $ARGS[0] = 'hookup_aggressive':
 	cla & *clr

+ 28 - 3
locations/pav_disco_jocks.qsrc

@@ -551,7 +551,7 @@ if $ARGS[0] = 'albina_dance':
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club.jpg"></center>'
 			if npc_sex['A23'] >= 1:
-				'You continue to dance with Albina, who smiles at you and pulls you in closer into a seductive dance. Her tight fitting dress is accenting her curves rather well, and you find your hands roaming over her hips and thighs as she erotically dances in front of you, her ass slowly grinding against your crotch. She seemingly doesn''t care about you feeling her up and encourages you to continue.'
+				'You continue to dance with Albina, who smiles at you and pulls you into a seductive dance. Her tight fitting dress is accenting her curves rather well, and you find your hands roaming over her hips and thighs as she erotically dances in front of you, her ass slowly grinding against your crotch. She seemingly doesn''t care about you feeling her up and encourages you to continue.'
 			else
 				'You continue to dance with Albina, who smiles at you and moves in to dance a little closer to you.'
 			end
@@ -567,14 +567,39 @@ if $ARGS[0] = 'albina_dance':
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club.jpg"></center>'
 				if npc_sex['A23'] >= 1:
-					'When the song ends, Albina looks back at you and winks. "That was hot <<$pcs_nickname>>, but I need to go and sit down for a bit and have a drink." She excuses herself and walks away with a seductive sway in her hips directed at you, leaving you standing in the middle of the dance floor feeling a little flustered.'
+					'When the song ends, Albina looks back at you and winks. "That was hot <<$pcs_nickname>>. I need to go and cool off for a while." She excuses herself and walks away with a seductive sway in her hips directed at you, leaving you standing in the middle of the dance floor feeling a little flustered.'
 				else
-					'When the song ends, Albina steps off to the side. "That was fun <<$pcs_nickname>>, but I need to sit down for a bit and have a drink." She excuses herself and leaves you standing in the middle of the dance floor.'
+					'When the song ends, Albina steps off to the side. "That was fun <<$pcs_nickname>>, but I need to sit down for a bit." She excuses herself and leaves you standing in the middle of the dance floor.'
 				end
 				act 'Do something else': gt 'pav_disco_classmates', 'classmates'
 			end
 		end
 	end
+
+if $ARGS[0] = 'albina_walkhome':
+*clr & cla
+minut += 15
+gs 'stat'
+'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/walkhome_katja.jpg"></center>'
+	if AlbinaQW['Friends'] = 2:
+		'Albina takes you by the hand and leads you outside.'
+		'"Motorboating me in public, <<$pcs_nickname>>? You really have had one or three too many. Let''s get you home before you do something you really regret."'
+		'You spend the walk home admiring the scent of her perfume, her hand slapping you away every time you try to paw at her ass before you reach the apartment complex.'
+		'Before she''s able to speak a word, you suddenly lean and kiss her. She pulls away and looks around before she leans back in and starts passionately making out with you, no longer caring about your roaming hands as you drunkenly caress her body.'
+		'She eventually breaks the kiss and wipes the saliva from her mouth. "You should get home and get to bed before I drag you back to mine."'
+		act 'Go home': gt 'pav_complex', 'start'
+	elseif grupTipe = 3:
+		'Albina grabs you firmly by the arm and drags you outside.'
+		'"Why...Why are you helping me?" you drunkenly ask.'
+		'Albina looks at you with what you think is pity. "We might not run in the same social circle <<$pcs_nickname>>, but I''m not going to let you humiliate yourself or be taken advantage of trying to impress a group of people who honestly couldn''t give a shit about you. You should really learn your limits when it comes to alcohol."'
+		'You spend the rest of your walk home silently thinking about what she said. "Go home and go to bed," she tells you as you reach the apartment complex.'
+		act 'Go home': gt 'pav_complex', 'start'
+	else
+		'Albina takes you by the hand and leads you outside.'
+		'"Well that was fucking embarrassing. Let''s get you home before you throw up on me or something."'
+		'You spend the walk home admiring the scent of her perfume before you reach the apartment complex. "Go home and go to bed," she tells you as she unravels herself from you and points to the building.'
+		act 'Go home': gt 'pav_complex', 'start'
+	end
 end
 
 if $ARGS[0] = 'christina':