diff options
| author | wushin <pasekei@gmail.com> | 2014-11-05 11:10:08 -0600 |
|---|---|---|
| committer | wushin <pasekei@gmail.com> | 2014-11-05 11:47:23 -0600 |
| commit | 2b70b048fe117b78fae79e4c942ff5a20b8fb97a (patch) | |
| tree | a22ab2857f7b37252c175bfab059d485acc0a319 /world/map/npc/013-1 | |
| parent | fc31b21732038e1dfeec9de851c23c71ef5b2863 (diff) | |
| download | serverdata-2b70b048fe117b78fae79e4c942ff5a20b8fb97a.tar.gz serverdata-2b70b048fe117b78fae79e4c942ff5a20b8fb97a.tar.bz2 serverdata-2b70b048fe117b78fae79e4c942ff5a20b8fb97a.tar.xz serverdata-2b70b048fe117b78fae79e4c942ff5a20b8fb97a.zip | |
NPCs on 013-* fixed
Diffstat (limited to 'world/map/npc/013-1')
| -rw-r--r-- | world/map/npc/013-1/flowerpentagram.txt | 6 | ||||
| -rw-r--r-- | world/map/npc/013-1/sagatha.txt | 8 | ||||
| -rw-r--r-- | world/map/npc/013-1/traveler.txt | 2 |
3 files changed, 8 insertions, 8 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; |