diff options
Diffstat (limited to 'world/map/npc/033-1/kimarr.txt')
| -rw-r--r-- | world/map/npc/033-1/kimarr.txt | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/world/map/npc/033-1/kimarr.txt b/world/map/npc/033-1/kimarr.txt index e1c26251..6650198f 100644 --- a/world/map/npc/033-1/kimarr.txt +++ b/world/map/npc/033-1/kimarr.txt @@ -36,7 +36,7 @@ { set @halloween_npc_id, $@halloween_npc_kimarr; callfunc "TrickOrTreat"; - + if ($@Fluffy_FighterID == getcharid(3)) goto L_Attention; @@ -101,7 +101,7 @@ L_Ask: "Maybe later.",L_Close; L_AlreadyGotReward: - npctalk strcharinfo(0) + " killed " + $@Fluffy_Kills + " Fluffies and has once again proven to be a good hunter."; + npctalk strnpcinfo(0), strcharinfo(0) + " killed " + $@Fluffy_Kills + " Fluffies and has once again proven to be a good hunter."; message strcharinfo(0), "Kimarr: Once again you prove your worth as a hunter! You killed " + $@Fluffy_Kills + " Fluffies."; callsub S_Clean; goto L_Close; @@ -112,7 +112,7 @@ L_Reward1: if (@state >= 2) goto L_AlreadyGotReward; - npctalk "Hooray! " + strcharinfo(0) + " killed " + $@Fluffy_Kills + " Fluffies and is now a worthy hunter."; + npctalk strnpcinfo(0), "Hooray! " + strcharinfo(0) + " killed " + $@Fluffy_Kills + " Fluffies and is now a worthy hunter."; // as far as I can tell, this fails because it won't resume from the "next" // when the script is executed via the "OnFluffyDeath" callback @@ -199,19 +199,19 @@ L_Action: areatimer "033-1", 79, 28, 88, 42, 10, "Kimarr::OnTooMany"; if ($@Fluffy_Time == 180) - npctalk strcharinfo(0) + ", you have 3 minutes."; + npctalk strnpcinfo(0), strcharinfo(0) + ", you have 3 minutes."; if ($@Fluffy_Time == 120) - npctalk "You have 2 minutes left."; + npctalk strnpcinfo(0), "You have 2 minutes left."; if ($@Fluffy_Time == 60) - npctalk "You have 1 minute left."; + npctalk strnpcinfo(0), "You have 1 minute left."; if ($@Fluffy_Time == 30) - npctalk "You have 30 seconds left."; + npctalk strnpcinfo(0), "You have 30 seconds left."; if ($@Fluffy_Time == 15) - npctalk "You have 15 seconds left."; + npctalk strnpcinfo(0), "You have 15 seconds left."; if ($@Fluffy_Time == 10) - npctalk "You have 10 seconds left."; + npctalk strnpcinfo(0), "You have 10 seconds left."; if ($@Fluffy_Time == 5) - npctalk "You have 5 seconds left."; + npctalk strnpcinfo(0), "You have 5 seconds left."; set $@Fluffy_Time, $@Fluffy_Time - 1; if ($@Fluffy_Time < 0) goto L_TimeOver; @@ -222,21 +222,21 @@ L_ContinueTimer: end; L_GotOut: - npctalk "What a strange thing... " + $@Fluffy_Fighter$ + " just disappeared!"; + npctalk strnpcinfo(0), "What a strange thing... " + $@Fluffy_Fighter$ + " just disappeared!"; callsub S_Clean; end; OnTooMany: if (getcharid(3) == $@Fluffy_FighterID) end; - npctalk "Hey " + strcharinfo(0) + "! What are you doing there? This hunt is for " + $@Fluffy_Fighter$ + " alone!"; + npctalk strnpcinfo(0), "Hey " + strcharinfo(0) + "! What are you doing there? This hunt is for " + $@Fluffy_Fighter$ + " alone!"; warp "033-1", 77, 34; end; L_Died: warp "033-1", 77, 34; message strcharinfo(0), "You are dead."; - npctalk "Oh no! " + $@Fluffy_Fighter$ + " got overwhelmed!"; + npctalk strnpcinfo(0), "Oh no! " + $@Fluffy_Fighter$ + " got overwhelmed!"; callsub S_Clean; end; @@ -329,7 +329,7 @@ L_Punish: if (@MobID == 1072) areamonster "033-1", 79, 29, 88, 42, "", 1072, 1, "Kimarr::OnYetiDeath"; - npctalk strcharinfo(0) + "! This hunt is for " + $@Fluffy_Fighter$ + " alone!"; + npctalk strnpcinfo(0), strcharinfo(0) + "! This hunt is for " + $@Fluffy_Fighter$ + " alone!"; heal -Hp, 0; set @MobID, 0; end; @@ -407,7 +407,7 @@ L_FinallyInsertMe: goto L_Reward1; L_NotGoodEnough: - npctalk "What a disappointment, " + strcharinfo(0) + " hunted only " + $@Fluffy_Kills + " Fluffies."; + npctalk strnpcinfo(0), "What a disappointment, " + strcharinfo(0) + " hunted only " + $@Fluffy_Kills + " Fluffies."; message strcharinfo(0), "Kimarr: What a disappointment, you hunted only " + $@Fluffy_Kills + " Fluffies."; callsub S_Clean; end; |