Bladeren bron

[fixed] Else matched to $ARGS and not first clause so it always triggered

Kevin_Smarts 2 jaren geleden
bovenliggende
commit
f039ee6e4f
1 gewijzigde bestanden met toevoegingen van 45 en 45 verwijderingen
  1. 45 45
      locations/beg1.qsrc

+ 45 - 45
locations/beg1.qsrc

@@ -479,66 +479,66 @@ if $ARGS[0] = 'Family extension':
 				end
 			end
 		end
-	end
-else
-	if npc_rel['A33'] > 50:
-		'As you receive congratulations from your coach and fellow competitors, you look towards the crowd to acknowledge their support. You are surprised to see your sister frantically waving at you and trying to make her way down to the track-side.'
-		'Breaking out into a huge grin, you jog over to the barrier and reach over give each other a hug.'
-		'"You go girl! That was some race. I knew you were into your running, but I never thought you were at this level. Well done!"'
-		'"Thanks for coming sis. It means a lot."'
-		'"How come you never told me? It was lucky I found out because the coach mentioned it to me last week while I was hanging out with Roma and the crew outside the community center. I wasn''t going to miss the opportunity for a possible little celebration with my little sis, was I? Let''s go for a few beers! I know a cool bar just a short metro ride from here."'
-		'"Okay, cool. I''m up for that! Let me go and shower and change first."'
-		'"Okay, just don''t be too long or I may have to leave without you!"'
-		act 'Go for a shower':
-			*clr & cla
-			dynamic $showerdin
-			if deodorant_on = 1: gs 'sweat', 'remove_deo' & 'Your deodorant gets washed away in the shower.'
-			pcs_hairbsh = 1
-			'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></video></center>'
-			'You have a shower and get dressed.'
-			*nl
-			'After your shower, you meet Anya in the reception and head off to the metro.'
-			minut += 10
-			gs 'stat'	
-			act 'Go to the bar':
-				'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/metro"></center>'
+	else
+		if npc_rel['A33'] > 50:
+			'As you receive congratulations from your coach and fellow competitors, you look towards the crowd to acknowledge their support. You are surprised to see your sister frantically waving at you and trying to make her way down to the track-side.'
+			'Breaking out into a huge grin, you jog over to the barrier and reach over give each other a hug.'
+			'"You go girl! That was some race. I knew you were into your running, but I never thought you were at this level. Well done!"'
+			'"Thanks for coming sis. It means a lot."'
+			'"How come you never told me? It was lucky I found out because the coach mentioned it to me last week while I was hanging out with Roma and the crew outside the community center. I wasn''t going to miss the opportunity for a possible little celebration with my little sis, was I? Let''s go for a few beers! I know a cool bar just a short metro ride from here."'
+			'"Okay, cool. I''m up for that! Let me go and shower and change first."'
+			'"Okay, just don''t be too long or I may have to leave without you!"'
+			act 'Go for a shower':
 				*clr & cla
-				'You take the metro to the industrial area and head towards the Rabotnik bar.'
-				minut += 20
+				dynamic $showerdin
+				if deodorant_on = 1: gs 'sweat', 'remove_deo' & 'Your deodorant gets washed away in the shower.'
+				pcs_hairbsh = 1
+				'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></video></center>'
+				'You have a shower and get dressed.'
+				*nl
+				'After your shower, you meet Anya in the reception and head off to the metro.'
+				minut += 10
 				gs 'stat'	
-				act 'Hava a drink':
+				act 'Go to the bar':
+					'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/metro"></center>'
 					*clr & cla
-					'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar"></center>'
-					'You both make your way to the bar and order some beers, which you drink at the bar.'
-					'When you''ve both finished your beer, you order another and head towards the pool table.'
-					gs 'drugs', 'alcohol', 'beer', 1
-					minut += 15
+					'You take the metro to the industrial area and head towards the Rabotnik bar.'
+					minut += 20
 					gs 'stat'	
-					act 'Play pool':
+					act 'Hava a drink':
 						*clr & cla
-						'<center><img <<$set_imgh>> src="images/locations/city/industrial/sex/poolw"></center>'
-						'You both enjoy a game of pool and after the game, Anya heads off to the bar to get some more beers.'
-						'In the meantime, you set the table up for another game.'
+						'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar"></center>'
+						'You both make your way to the bar and order some beers, which you drink at the bar.'
+						'When you''ve both finished your beer, you order another and head towards the pool table.'
 						gs 'drugs', 'alcohol', 'beer', 1
 						minut += 15
 						gs 'stat'	
-						act 'Another game':
+						act 'Play pool':
 							*clr & cla
-							'<center><img <<$set_imgh>> src="images/locations/city/industrial/sex/pooll"></center>'
-							'You spend a few minutes playing another game before taking your final shot and winning the game.'
-							'"Okay <<$pcs_nickname>>, that''s one game each. Let''s have one more beer then I''ve got to go."'
-							'"Sounds good sis." After a final beer, you both leave the bar and Anya gives you a hug before hurrying off. "See you later, sis! And well done again!"'
-							gs 'drugs', 'alcohol', 'beer', 2
+							'<center><img <<$set_imgh>> src="images/locations/city/industrial/sex/poolw"></center>'
+							'You both enjoy a game of pool and after the game, Anya heads off to the bar to get some more beers.'
+							'In the meantime, you set the table up for another game.'
+							gs 'drugs', 'alcohol', 'beer', 1
 							minut += 15
-							gs 'stat'
-							act 'Leave the bar': gt 'city_industrial', 'start'
+							gs 'stat'	
+							act 'Another game':
+								*clr & cla
+								'<center><img <<$set_imgh>> src="images/locations/city/industrial/sex/pooll"></center>'
+								'You spend a few minutes playing another game before taking your final shot and winning the game.'
+								'"Okay <<$pcs_nickname>>, that''s one game each. Let''s have one more beer then I''ve got to go."'
+								'"Sounds good sis." After a final beer, you both leave the bar and Anya gives you a hug before hurrying off. "See you later, sis! And well done again!"'
+								gs 'drugs', 'alcohol', 'beer', 2
+								minut += 15
+								gs 'stat'
+								act 'Leave the bar': gt 'city_industrial', 'start'
+							end
 						end
 					end
 				end
 			end
+		else
+			gt 'fit', 'dressing room'
 		end
-	else
-		gt 'fit', 'dressing room'
 	end
 end