Browse Source

Merge remote-tracking branch 'sovietmercader/master'

KevinSmarts 4 years ago
parent
commit
acdd6ba25d
1 changed files with 10 additions and 10 deletions
  1. 10 10
      locations/nerd_game_night.qsrc

+ 10 - 10
locations/nerd_game_night.qsrc

@@ -19,7 +19,7 @@ end
 
 !! Foefan approaches during break
 if $ARGS[0] = 'invite':
-	if $ARGS[0] = 'exit':
+	if $ARGS[1] = 'exit':
 		act 'Continue down the hall':
 			if $temp_loc = 'morning':
 				killvar '$temp_loc' & gt 'gschool_lessons', 'morning'
@@ -40,7 +40,7 @@ if $ARGS[0] = 'invite':
 		nerd_game['invite_day'] = daystart
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big152.jpg"></center>'
-		'As you stop by your locker to drop off your books before next class. Feofan walks over to you and smiles. "Hey <<$pcs_nickname>>, I was talking to the others and we have a couple of nights free this week and was wondering which night works best for you. We can do it either on <<$week[mid(temp,1,1)]>> or on <<$week[mid(temp,2,2)]>>."'
+		'As you stop by your locker to drop off your books before next class. Feofan walks over to you and smiles. "Hey <<$pcs_nickname>>, I was talking to the others and we have a couple of nights free this week and was wondering which night works best for you. We can do it either on <<$week[val(mid(temp,1,1))]>> or on <<$week[val(mid(temp,2,1))]>>."'
 		act 'Have to study':
 			*clr & cla
 			minut += 2
@@ -61,24 +61,24 @@ if $ARGS[0] = 'invite':
 			'He laughs a little obviously not that upset you turned them down "Anyways I will go let the rest know. We can try for next week, talk to you later." With that he walks off.'
 			gs 'nerd_game_night', 'invite', 'exit'
 		end
-		act '<<$week[mid(temp,1,1)]>>':
+		act '<<$week[val(mid(temp,1,1))]>>':
 			*clr & cla
 			minut += 2
-			nerd_game['game_day'] = daystart - week + mid(temp,1,1)
+			nerd_game['game_day'] = daystart - week + val(mid(temp,1,1))
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big152.jpg"></center>'
-			'You think a moment. "Sure I can make it on <<$week[mid(temp,1,1)]>>."'
-			'He looks excited. "Great! Then I will see you on <<$week[mid(temp,1,1)]>> at 20:00 in the library, as usual. Be ready to get your nerd on, cause we are going to rock it so hard." He says will doing a cheesy wink and double finger point at you, as he walks off.'
+			'You think a moment. "Sure I can make it on <<$week[val(mid(temp,1,1))]>>."'
+			'He looks excited. "Great! Then I will see you on <<$week[val(mid(temp,1,1))]>> at 20:00 in the library, as usual. Be ready to get your nerd on, cause we are going to rock it so hard." He says will doing a cheesy wink and double finger point at you, as he walks off.'
 			gs 'nerd_game_night', 'invite', 'exit'
 		end
-		act '<<$week[mid(temp,2,2)]>>':
+		act '<<$week[val(mid(temp,2,1))]>>':
 			*clr & cla
 			minut += 2
-			nerd_game['game_day'] = daystart - week + mid(temp,2,2)
+			nerd_game['game_day'] = daystart - week + val(mid(temp,2,1))
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big152.jpg"></center>'
-			'You think a moment. "Sure I can make it on <<$week[mid(temp,2,2)]>>."'
-			'He looks excited. "Great! Then I will see you on <<$week[mid(temp,2,2)]>> at 20:00 in the library, as usual. Be ready to get your nerd on, cause we are going to rock it so hard." He says will doing a cheesy wink and double finger point at you, as he walks off.'
+			'You think a moment. "Sure I can make it on <<$week[val(mid(temp,2,1))]>>."'
+			'He looks excited. "Great! Then I will see you on <<$week[val(mid(temp,2,1))]>> at 20:00 in the library, as usual. Be ready to get your nerd on, cause we are going to rock it so hard." He says will doing a cheesy wink and double finger point at you, as he walks off.'
 			gs 'nerd_game_night', 'invite', 'exit'
 		end
 	end