From 3dfd41a6037c160f4d764f7f5aa7b1eec0ad3e68 Mon Sep 17 00:00:00 2001 From: wushin Date: Wed, 5 Nov 2014 11:15:19 -0600 Subject: NPCs on 024-* fixed --- world/map/npc/024-1/ched.txt | 2 +- world/map/npc/024-1/david.txt | 2 +- world/map/npc/024-1/eomie.txt | 2 +- world/map/npc/024-1/tinris.txt | 2 +- world/map/npc/024-1/tondar.txt | 2 +- world/map/npc/024-2/barrier.txt | 2 +- world/map/npc/024-2/tyer.txt | 2 +- world/map/npc/024-2/tyer_trigger.txt | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/world/map/npc/024-1/ched.txt b/world/map/npc/024-1/ched.txt index 6e82b58b..0137ed55 100644 --- a/world/map/npc/024-1/ched.txt +++ b/world/map/npc/024-1/ched.txt @@ -1,6 +1,6 @@ // Student at Tulimshar's magic academy -024-1.gat,69,56,0|script|Ched|113, +024-1.gat,69,56,0|script|Ched|113 { if (isin("024-1.gat", 62, 52, 65, 57)) goto L_Garden; if (isin("024-1.gat", 66, 43, 80, 54)) goto L_Canyon; diff --git a/world/map/npc/024-1/david.txt b/world/map/npc/024-1/david.txt index e4f78a38..b3a56dc4 100644 --- a/world/map/npc/024-1/david.txt +++ b/world/map/npc/024-1/david.txt @@ -1,4 +1,4 @@ -024-1.gat,70,70,0|script|David|120, +024-1.gat,70,70,0|script|David|120 { set @Potion_EXP, 2000; diff --git a/world/map/npc/024-1/eomie.txt b/world/map/npc/024-1/eomie.txt index e14a323c..35d9acae 100644 --- a/world/map/npc/024-1/eomie.txt +++ b/world/map/npc/024-1/eomie.txt @@ -18,7 +18,7 @@ // state 14: gave present to Eomie // state 15: reported back to Anwar and done -024-1.gat,72,94,0|script|Eomie|164, +024-1.gat,72,94,0|script|Eomie|164 { set @state, ((QUEST_NorthTulimshar & NIBBLE_3_MASK) >> NIBBLE_3_SHIFT); diff --git a/world/map/npc/024-1/tinris.txt b/world/map/npc/024-1/tinris.txt index c1d969fd..e4465cd3 100644 --- a/world/map/npc/024-1/tinris.txt +++ b/world/map/npc/024-1/tinris.txt @@ -17,7 +17,7 @@ // state 14: gave present to Eomie // state 15: reported back to Anwar and done -024-1.gat,82,64,0|script|Tinris|160, +024-1.gat,82,64,0|script|Tinris|160 { set @state, ((QUEST_NorthTulimshar & NIBBLE_3_MASK) >> NIBBLE_3_SHIFT); diff --git a/world/map/npc/024-1/tondar.txt b/world/map/npc/024-1/tondar.txt index 462ddc25..473c86e9 100644 --- a/world/map/npc/024-1/tondar.txt +++ b/world/map/npc/024-1/tondar.txt @@ -1,6 +1,6 @@ // A professor at Tulimshar's magic academy -024-1.gat,83,51,0|script|Tondar|168, +024-1.gat,83,51,0|script|Tondar|168 { mes "[Tondar]"; mes "\"We're not accepting any new students right now.\""; diff --git a/world/map/npc/024-2/barrier.txt b/world/map/npc/024-2/barrier.txt index aef0b938..84405447 100644 --- a/world/map/npc/024-2/barrier.txt +++ b/world/map/npc/024-2/barrier.txt @@ -1,6 +1,6 @@ // A barrier in the magic school to keep less experienced players out of the canyon -024-2.gat,31,24,0|script|#MagicSchoolBarrier1#M|127,1,1, +024-2.gat,31,24,0|script|#MagicSchoolBarrier1#M|127,1,1 { callfunc "MorganState"; if (@morgan >= 4) diff --git a/world/map/npc/024-2/tyer.txt b/world/map/npc/024-2/tyer.txt index 2b4f8674..21868e96 100644 --- a/world/map/npc/024-2/tyer.txt +++ b/world/map/npc/024-2/tyer.txt @@ -1,6 +1,6 @@ // A man in the magic school -024-2.gat,36,21,0|script|Tyer|157, +024-2.gat,36,21,0|script|Tyer|157 { mes "[Tyer]"; mes "\"Hello. Welcome to the Magic Insitute of Tulimshar.\""; diff --git a/world/map/npc/024-2/tyer_trigger.txt b/world/map/npc/024-2/tyer_trigger.txt index 0feafd99..6c532b62 100644 --- a/world/map/npc/024-2/tyer_trigger.txt +++ b/world/map/npc/024-2/tyer_trigger.txt @@ -1,6 +1,6 @@ // A man in the magic school -024-2.gat,33,24,0|script|#Tyer_Trigger|127,0,1, +024-2.gat,33,24,0|script|#Tyer_Trigger|127,0,1 { callfunc "MorganState"; if (@morgan >= 4) -- cgit v1.2.3-60-g2f50