From 2b70b048fe117b78fae79e4c942ff5a20b8fb97a Mon Sep 17 00:00:00 2001 From: wushin Date: Wed, 5 Nov 2014 11:10:08 -0600 Subject: NPCs on 013-* fixed --- world/map/npc/013-1/flowerpentagram.txt | 6 +++--- world/map/npc/013-1/sagatha.txt | 8 ++++---- world/map/npc/013-1/traveler.txt | 2 +- world/map/npc/013-2/apprentice.txt | 2 +- world/map/npc/013-2/notes.txt | 22 +++++++++++----------- world/map/npc/013-2/wizard.txt | 2 +- world/map/npc/013-3/barrier.txt | 2 +- world/map/npc/013-3/mask_chest.txt | 2 +- world/map/npc/013-3/misc.txt | 2 +- world/map/npc/013-3/sword_chest.txt | 2 +- 10 files changed, 25 insertions(+), 25 deletions(-) diff --git a/world/map/npc/013-1/flowerpentagram.txt b/world/map/npc/013-1/flowerpentagram.txt index 2b834a03..59c8e392 100644 --- a/world/map/npc/013-1/flowerpentagram.txt +++ b/world/map/npc/013-1/flowerpentagram.txt @@ -1,10 +1,10 @@ -013-1.gat,1,1,0|script|#FlowerPentagram|127, +013-1.gat,1,1,0|script|#FlowerPentagram|127 { end; OnSummon: // This is just annoying - //announce "Sagatha : What kind of a foolish trick is this? Who dares to create such calamity in my forest?", 0; + //announce "Sagatha:* What kind of a foolish trick is this? Who dares to create such calamity in my forest?", 0; callsub S_CleanUp; // area closely to sagatha @@ -88,7 +88,7 @@ S_CleanUp: return; } -function|script|FlowerPentagramCount| +function|script|FlowerPentagramCount { set $@Flower_Pentagram_Mobcount, mobcount("013-1.gat", "#FlowerPentagram::OnSquirrelDeath") + diff --git a/world/map/npc/013-1/sagatha.txt b/world/map/npc/013-1/sagatha.txt index 914744d1..cf99cd28 100644 --- a/world/map/npc/013-1/sagatha.txt +++ b/world/map/npc/013-1/sagatha.txt @@ -1,7 +1,7 @@ // Sagatha the witch, expert for nature and astral magic //---------------------------------------- -function|script|QuestSagathaHappy|, +function|script|QuestSagathaHappy { set @unhappiness, (QUEST_MAGIC & NIBBLE_3_MASK) >> NIBBLE_3_SHIFT; if (@unhappiness < @value) @@ -20,7 +20,7 @@ L_write: } //---------------------------------------- -function|script|QuestSagathaAnnoy|, +function|script|QuestSagathaAnnoy { set @unhappiness, (QUEST_MAGIC & NIBBLE_3_MASK) >> NIBBLE_3_SHIFT; if ((@unhappiness + @value) > 15) @@ -39,7 +39,7 @@ L_write: } //---------------------------------------- -function|script|SagathaStatus|, +function|script|SagathaStatus { if (getequipid(equip_head) != 1216 && getequipid(equip_head) != 752) goto L_next; @@ -72,7 +72,7 @@ L_next: } //---------------------------------------- -013-1.gat,131,24,0|script|Sagatha#_M|167, +013-1.gat,131,24,0|script|Sagatha#_M|167 { callfunc "SagathaStatus"; diff --git a/world/map/npc/013-1/traveler.txt b/world/map/npc/013-1/traveler.txt index 405c82b1..ff36ded4 100644 --- a/world/map/npc/013-1/traveler.txt +++ b/world/map/npc/013-1/traveler.txt @@ -1,4 +1,4 @@ -013-1.gat,120,90,0|script|Faris the Traveler|103, +013-1.gat,120,90,0|script|Faris the Traveler|103 { set @NpcName$, "Faris"; set @NpcTravelBit, $@magic_house_bit; diff --git a/world/map/npc/013-2/apprentice.txt b/world/map/npc/013-2/apprentice.txt index 843c10fb..0b0e4ea2 100644 --- a/world/map/npc/013-2/apprentice.txt +++ b/world/map/npc/013-2/apprentice.txt @@ -1,4 +1,4 @@ -013-2.gat,25,37,0|script|Fabius|115, +013-2.gat,25,37,0|script|Fabius|115 { mes "[Fabius]"; mes "\"Hey! Wanna have a drink or something? High quality, low cost. A poor fella like me needs a bit of extra cash, ye know.\""; diff --git a/world/map/npc/013-2/notes.txt b/world/map/npc/013-2/notes.txt index c8b386bd..37014a76 100644 --- a/world/map/npc/013-2/notes.txt +++ b/world/map/npc/013-2/notes.txt @@ -1,25 +1,25 @@ // -013-2.gat,23,32,0|script|Motto#wiz|400, +013-2.gat,23,32,0|script|Motto#wiz|400 { mes "Mid pleasures and palaces though we may roam,"; mes "Be it ever so humble, there's no place like home."; close; } -013-2.gat,30,32,0|script|Note#wiz|400, +013-2.gat,30,32,0|script|Note#wiz|400 { mes "Please do not open."; close; } -013-2.gat,38,20,0|script|Saying#wiz|400, +013-2.gat,38,20,0|script|Saying#wiz|400 { mes "The early bird catcheth the worm."; close; } -013-2.gat,27,21,0|script|Mirror#wiz|400, +013-2.gat,27,21,0|script|Mirror#wiz|400 { mes "You say: \"Mirror mirror on the wall, who has the nicest haircut of them all?\""; next; @@ -33,7 +33,7 @@ } // Warp to wood clearings -013-2.gat,25,23,0|script|Spell#wiz1|400, +013-2.gat,25,23,0|script|Spell#wiz1|400 { mes "You read: \"I see trees of green, red roses too. I see them bloom for me and you. And I think to myself: \'What a wonderful world\'\""; next; @@ -66,7 +66,7 @@ L_Close: } // Warp to desert -013-2.gat,27,24,0|script|Spell#wiz2|400, +013-2.gat,27,24,0|script|Spell#wiz2|400 { mes "You read: \"You must not fear, for it is the mind-killer. That and sharp pointy things.\""; next; @@ -106,7 +106,7 @@ L_Close: } // Warp to snow area -013-2.gat,25,27,0|script|Spell#wiz3|400, +013-2.gat,25,27,0|script|Spell#wiz3|400 { mes "You read: \"Snow-white flakes and eminent frost - I'll go there, whatever the cost!\""; next; @@ -137,7 +137,7 @@ L_Close: } // Warp to Inns -013-2.gat,27,27,0|script|Spell#wiz4|400, +013-2.gat,27,27,0|script|Spell#wiz4|400 { mes "You read: \"People and cosiness, lively and fun - that's where I've gone!\""; next; @@ -168,7 +168,7 @@ L_Close: } // Warp to mines -013-2.gat,26,28,0|script|Spell#wiz5|400, +013-2.gat,26,28,0|script|Spell#wiz5|400 { mes "You read: \"Darkness and legs, eight of them each - I'd rather not go there, but now it's too late...\""; next; @@ -199,7 +199,7 @@ L_Close: } // Death -013-2.gat,21,29,0|script|Spell#wiz6|400, +013-2.gat,21,29,0|script|Spell#wiz6|400 { mes "You read: \"Heart stops pumping, breath begone - life is stopping, death has come!\""; next; @@ -210,7 +210,7 @@ L_Close: } // Naked -013-2.gat,28,29,0|script|Spell#wiz7|400, +013-2.gat,28,29,0|script|Spell#wiz7|400 { mes "You read: \"Cotton, steel, leather and wool - have I ever seen a greater fool?\""; next; diff --git a/world/map/npc/013-2/wizard.txt b/world/map/npc/013-2/wizard.txt index b6a60661..1cc47128 100644 --- a/world/map/npc/013-2/wizard.txt +++ b/world/map/npc/013-2/wizard.txt @@ -1,4 +1,4 @@ -013-2.gat,66,39,0|script|Old Wizard#_W|116, +013-2.gat,66,39,0|script|Old Wizard#_W|116 { set @has_magic, getskilllv(SKILL_MAGIC); set MAGIC_FLAGS, MAGIC_FLAGS | MFLAG_KNOWS_OLD_WIZARD; diff --git a/world/map/npc/013-3/barrier.txt b/world/map/npc/013-3/barrier.txt index 40c2600c..bf6621e1 100644 --- a/world/map/npc/013-3/barrier.txt +++ b/world/map/npc/013-3/barrier.txt @@ -1,6 +1,6 @@ // -013-3.gat,71,21,0|script|#DemonMineBarrier1#_M|45,1,1, +013-3.gat,71,21,0|script|#DemonMineBarrier1#_M|45,1,1 { callfunc "ClearVariables"; diff --git a/world/map/npc/013-3/mask_chest.txt b/world/map/npc/013-3/mask_chest.txt index 87b90878..44d7956b 100644 --- a/world/map/npc/013-3/mask_chest.txt +++ b/world/map/npc/013-3/mask_chest.txt @@ -1,6 +1,6 @@ // -013-3.gat,28,27,0|script|Chest#DemonMask|111, +013-3.gat,28,27,0|script|Chest#DemonMask|111 { callfunc "ClearVariables"; diff --git a/world/map/npc/013-3/misc.txt b/world/map/npc/013-3/misc.txt index 60324fff..5a23b850 100644 --- a/world/map/npc/013-3/misc.txt +++ b/world/map/npc/013-3/misc.txt @@ -1,6 +1,6 @@ // -013-3.gat,127,68,0|script|Chest#boring|111, +013-3.gat,127,68,0|script|Chest#boring|111 { mes "You can't see any way to open this chest."; close; diff --git a/world/map/npc/013-3/sword_chest.txt b/world/map/npc/013-3/sword_chest.txt index 14aaffec..bbcd4fb9 100644 --- a/world/map/npc/013-3/sword_chest.txt +++ b/world/map/npc/013-3/sword_chest.txt @@ -1,6 +1,6 @@ // -013-3.gat,177,22,0|script|Chest#sword|111, +013-3.gat,177,22,0|script|Chest#sword|111 { callfunc "ClearVariables"; if (FLAGS & FLAG_HURNSMINE_CHEST) goto L_Finished; -- cgit v1.2.3-60-g2f50