Browse Source

[fixes] Fixed links for the school kids at disco to p`revent blank screens from Nutluck

Kevin_Smarts 2 years ago
parent
commit
be2cba29c4
3 changed files with 26 additions and 23 deletions
  1. 4 0
      locations/pav_disco_coolkids.qsrc
  2. 16 16
      locations/pav_disco_gopniks.qsrc
  3. 6 7
      locations/pav_disco_jocks.qsrc

+ 4 - 0
locations/pav_disco_coolkids.qsrc

@@ -285,6 +285,10 @@ if $ARGS[0] = 'dimka':
 	gs 'npc_relationship', 'modify', 'A1', 'like'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big1.jpg"></center>'
+	act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
+end
+
+if $ARGS[0] = 'dimka1':
 	if rand(1,4) = 1:
 		'text of him dancing'
 		act 'Do something else': gt 'pav_disco_coolkids', 'classmates'

+ 16 - 16
locations/pav_disco_gopniks.qsrc

@@ -721,7 +721,7 @@ if $ARGS[0] = 'valentin':
 			'The two of you talk about a few things. He gets a little hands on with you at times, but you are used to it. As you start to leave, he adds "Stop by the garage some time, I can always use a break and a quick fuck."'
 			'You sigh a little. "Maybe." You tell him.'
 			'He grins. "Well how about now?"'
-			!!act 'Agree to have sex now': gt 'pav_discoev1', 'valentin'
+			act 'Agree to have sex now': gt 'pav_discoev1', 'valentin'
 			act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 		elseif grupTipe = 5:
 			'When he sees you, he gives you a annoyed look. "Go bother someone else."'
@@ -992,7 +992,7 @@ if $ARGS[0] = 'lavrenti':
 					'You take the rolled up money and snort a line of cocaine off the table, you can feel the effects almost at once. It is top quality stuff, then you pass the rolled up money back to him and he does the other line. After that the two of you go back to chatting away.'
 					act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 				end
-			elseif npc_rel['A158'] <= 20 and fame['pav_slut'] < 300:
+			elseif npc_rel['A158'] <= 20 and pav_slut < 300:
 				'You approach Lavrenti. "So, what''s up with you Lavrenti?"'
 				'Lavrenti frowns at you. "Not a lot, just hanging out and admiring the view."'
 				'You look in the direction he is looking and see some cute girls in short skirts. "Nice view indeed." you comment with a bemused smile.'
@@ -1000,7 +1000,7 @@ if $ARGS[0] = 'lavrenti':
 				'"Come on, don''t be like that. I just wanted to talk." you tell him.'
 				'He snorts. "You are about the last person I would want to talk to." You keep talking to him, you ask about his parties, which slowly gets him talking a little.'
 				act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
-			elseif fame['pav_slut'] >= 300:
+			elseif pav_slut >= 300:
 				'"Get the fuck away from me you fucking slut!" he tells you.'
 				act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 			else 
@@ -1054,7 +1054,7 @@ if $ARGS[0] = 'pauline':
 		elseif grupTipe = 5:
 			'She shakes her head as soon as you start to get close. "Get the fuck away from me."'
 			act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
-		elseif npc_rel['A158'] >= 50 and fame['pav_slut'] < 300:		
+		elseif npc_rel['A158'] >= 50 and pav_slut < 300:		
 			if grupTipe = 4:
 				'You approach her. "Hi Pauline! What are you up to?"'
 				'She looks back at you and shrugs her shoulders. "Hey <<$pcs_nickname>>, nothing much. Just drinking and watching the idiots dance."'
@@ -1093,7 +1093,7 @@ if $ARGS[0] = 'pauline':
 				'The two of you continue talking for a while, mostly about how, if you want to hang with the gopniks, you should join them.'
 				act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 			end
-		elseif npc_rel['A158'] <= 20 and fame['pav_slut'] < 300:
+		elseif npc_rel['A158'] <= 20 and pav_slut < 300:
 			if grupTipe = 4:
 				'You approach her. "Hi Pauline! What are you up to?"'
 				'She glances at you and then looks around for a moment before replying "I should just kick your ass, right now."'
@@ -1106,7 +1106,7 @@ if $ARGS[0] = 'pauline':
 				'You try and talk to her, but she doesn''t really have much to say to you other than offer a few threats.'
 			end
 			act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
-		elseif fame['pav_slut'] >= 300:
+		elseif pav_slut >= 300:
 			'"Don''t even think about trying to talk to me, slut." She says with a disgusted look at you.'
 			act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 		else 
@@ -1158,14 +1158,14 @@ if $ARGS[0] = 'lena_lera':
 			elseif grupTipe = 5:
 				'As you approach them you get dirty looks and they turn slightly away from you and dance closer together, making it clear you are not welcome.'
 				act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
-			elseif npc_rel['A20'] >= 50 and npc_rel['A21'] >= 50 and fame['pav_slut'] < 300:		
+			elseif npc_rel['A20'] >= 50 and npc_rel['A21'] >= 50 and pav_slut < 300:		
 				'As you approach them, they smile to you and keep dancing, but make room for you to join them.'
 				act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 				act 'Keep dancing': gt 'pav_disco_gopniks', 'lena_lera_dance'
-			elseif npc_rel['A20'] <= 20 or npc_rel['A21'] <= 20 and fame['pav_slut'] < 300:
+			elseif npc_rel['A20'] <= 20 or npc_rel['A21'] <= 20 and pav_slut < 300:
 				'As you approach them you get dirty looks and they turn slightly away from you and dance closer together, making it clear you are not welcome.'
 				act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
-			elseif fame['pav_slut'] >= 300:
+			elseif pav_slut >= 300:
 				'As you approach them, you get dirty looks from both of them and flipped out. The turn and dance closer together and make it clear your not welcome.'
 				act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 			else 
@@ -1194,7 +1194,7 @@ if $ARGS[0] = 'lena_lera':
 			elseif grupTipe = 5:
 				'As you get near them, the intense dirty looks you get is enough for you to just keep moving.'
 				act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
-			elseif npc_rel['A20'] >= 50 and npc_rel['A21'] >= 50 and fame['pav_slut'] < 300:		
+			elseif npc_rel['A20'] >= 50 and npc_rel['A21'] >= 50 and pav_slut < 300:		
 				if grupTipe = 4:
 					'As you approach them. "Hi Lena! What are you up to?"'
 					'She looks back at you and shrugs her shoulders. "Hey <<$pcs_nickname>>, nothing much. Just hanging out and taking a break from dancing."'
@@ -1243,7 +1243,7 @@ if $ARGS[0] = 'lena_lera':
 						act 'Go dancing': gt 'pav_disco_gopniks', 'lena_lera_dance'
 					end
 				end
-			elseif npc_rel['A20'] <= 20 and npc_rel['A21'] <= 20 and fame['pav_slut'] < 300:
+			elseif npc_rel['A20'] <= 20 and npc_rel['A21'] <= 20 and pav_slut < 300:
 				if grupTipe = 4:
 					'As you approach them. "Hi Lena! What are you up to?"'
 					'She looks back at you with a frown. "What do you want <<$pcs_nickname>>?"'
@@ -1256,7 +1256,7 @@ if $ARGS[0] = 'lena_lera':
 					'"Yeah well, I don''t want to talk to you." You continue talking to her for a while, but it is obvious she has no interest in talking to you.'
 				end
 				act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
-			elseif fame['pav_slut'] >= 300:
+			elseif pav_slut >= 300:
 				'As you approach them. Lena says. "What do you want cunt? Shouldn''t you be sucking some cocks somewhere?" She turns away and ignores you.'
 				'Lera meanwhile adds. "Don''t even come near me with that disgusting cum breath of yours." Then the two of them start talking about you, right in front of you, like your not even there, talking about how disgusting you are.'
 				act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
@@ -1331,7 +1331,7 @@ if $ARGS[0] = 'nush':
 			*clr & cla
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/anushka_dance1.jpg"></center>'
-			if npc_rel['A144'] >= 50 and fame['pav_slut'] < 500:		
+			if npc_rel['A144'] >= 50 and pav_slut < 500:		
 				'You make your way over to her and start dancing next to her. "Hey bitch wassup?" She turns to dance next to you, so your facing each other.'
 				'You smile to her and shake your head slightly. "Just dancing with one of the hottest girls here."'
 				'She arches a brow. "One of?"'
@@ -1339,10 +1339,10 @@ if $ARGS[0] = 'nush':
 				'She giggles at that. "Fuck you and shake that money maker." Then the two of you dance for a bit surrounded by guys, trying to get in on the action.'
 				act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 				act 'Keep dancing with her': gt 'pav_disco_gopniks', 'anushka_dance'
-			elseif npc_rel['A144'] <= 20 and fame['pav_slut'] < 500:
+			elseif npc_rel['A144'] <= 20 and pav_slut < 500:
 				'You think she seen you as you headed out onto the dance floor, but you are not sure. She turns away from you and starts dancing with one of the cuter guys that is crowding her.'
 				act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
-			elseif fame['pav_slut'] >= 500:
+			elseif pav_slut >= 500:
 				'She smirks a bit as she see''s you. "Hey slut, want to borrow one of my boys?"'
 				'At those words a couple of the guys turn their attention towards you. "Just make sure you wear protection boys." She says with a giggle.'
 				'They guys now seem to think you are easy and considering your reputation, with good reason. You are not in the mood to be pawed at this moment so you move away from them. After you leave the guys turn their attention back to Anushka.'
@@ -1364,7 +1364,7 @@ if $ARGS[0] = 'nush':
 			minut += 15
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big144.jpg"></center>'
-			if npc_rel['A144'] >= 50 and fame['pav_slut'] < 500:		
+			if npc_rel['A144'] >= 50 and pav_slut < 500:		
 				'You approach her. "Hi Nush! What are you up to?"'
 				'She looks back at you, with a smile. "Hey bitch, just listening to these losers brag about all the pussy they''ve been banging. You?"'
 				'You give the boys a amused smile at her words as they act wounded by her words. "You know same old same old. Just looking to have a little fun."'

+ 6 - 7
locations/pav_disco_jocks.qsrc

@@ -192,8 +192,7 @@ if $ARGS[0] = 'fedor':
 		minut += 15
 		gs 'npc_relationship', 'modify', 'A5', 'like'
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big5.jpg"></center>'
-		if dance = 1
-		else
+		act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 	end}
 end
 
@@ -302,11 +301,11 @@ if $ARGS[0] = 'svyatoslav_dance':
 end
 
 if $ARGS[0] = 'vanya':
-!! if at disco random 1-3, 1 = dancing, rest hanging out
-!!	*clr & cla
-!!	minut += 15
-!!	gs 'npc_relationship', 'modify', 'A165', 'like'
-!!	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big165.jpg"></center>'
+	*clr & cla
+	minut += 15
+	gs 'npc_relationship', 'modify', 'A165', 'like'
+	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big165.jpg"></center>'
+	act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 !!	if dance = 1
 !!	else
 end