diff options
Diffstat (limited to 'world/map/npc/013-1')
| -rw-r--r-- | world/map/npc/013-1/_mobs.txt | 32 | ||||
| -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 |
4 files changed, 24 insertions, 24 deletions
diff --git a/world/map/npc/013-1/_mobs.txt b/world/map/npc/013-1/_mobs.txt index 5e34f374..2119ca73 100644 --- a/world/map/npc/013-1/_mobs.txt +++ b/world/map/npc/013-1/_mobs.txt @@ -1,24 +1,24 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Woodland Hills mobs -013-1.gat,0,0,0,0|monster|PinkFlower|1014,13,0,100,Mob013-1::On1014 -013-1.gat,0,0,0,0|monster|SpikyMushroom|1019,12,0,100,Mob013-1::On1019 -013-1.gat,0,0,0,0|monster|Mouboo|1028,5,0,100,Mob013-1::On1028 -013-1.gat,0,0,0,0|monster|MauvePlant|1029,1,270,180,Mob013-1::On1029 -013-1.gat,0,0,0,0|monster|MauvePlant|1029,4,2700000,1800000,Mob013-1::On1029 -013-1.gat,0,0,0,0|monster|CobaltPlant|1030,1,270,180,Mob013-1::On1030 -013-1.gat,0,0,0,0|monster|CobaltPlant|1030,2,2700000,1800000,Mob013-1::On1030 -013-1.gat,0,0,0,0|monster|GambogePlant|1031,1,270,180,Mob013-1::On1031 -013-1.gat,0,0,0,0|monster|GambogePlant|1031,2,2700000,1800000,Mob013-1::On1031 -013-1.gat,0,0,0,0|monster|AlizarinPlant|1032,1,270,180,Mob013-1::On1032 -013-1.gat,0,0,0,0|monster|AlizarinPlant|1032,2,2700000,1800000,Mob013-1::On1032 -013-1.gat,0,0,0,0|monster|Silkworm|1035,4,60000,30000,Mob013-1::On1035 -013-1.gat,0,0,0,0|monster|CloverPatch|1037,2,0,1000,Mob013-1::On1037 -013-1.gat,0,0,0,0|monster|Squirrel|1038,25,30,20,Mob013-1::On1038 -013-1.gat,0,0,0,0|monster|Butterfly|1055,10,30,20,Mob013-1::On1055 +013-1.gat,0,0,0,0|monster|PinkFlower|1014,13,0ms,100ms,Mob013-1::On1014 +013-1.gat,0,0,0,0|monster|SpikyMushroom|1019,12,0ms,100ms,Mob013-1::On1019 +013-1.gat,0,0,0,0|monster|Mouboo|1028,5,0ms,100ms,Mob013-1::On1028 +013-1.gat,0,0,0,0|monster|MauvePlant|1029,1,270ms,180ms,Mob013-1::On1029 +013-1.gat,0,0,0,0|monster|MauvePlant|1029,4,2700000ms,1800000ms,Mob013-1::On1029 +013-1.gat,0,0,0,0|monster|CobaltPlant|1030,1,270ms,180ms,Mob013-1::On1030 +013-1.gat,0,0,0,0|monster|CobaltPlant|1030,2,2700000ms,1800000ms,Mob013-1::On1030 +013-1.gat,0,0,0,0|monster|GambogePlant|1031,1,270ms,180ms,Mob013-1::On1031 +013-1.gat,0,0,0,0|monster|GambogePlant|1031,2,2700000ms,1800000ms,Mob013-1::On1031 +013-1.gat,0,0,0,0|monster|AlizarinPlant|1032,1,270ms,180ms,Mob013-1::On1032 +013-1.gat,0,0,0,0|monster|AlizarinPlant|1032,2,2700000ms,1800000ms,Mob013-1::On1032 +013-1.gat,0,0,0,0|monster|Silkworm|1035,4,60000ms,30000ms,Mob013-1::On1035 +013-1.gat,0,0,0,0|monster|CloverPatch|1037,2,0ms,1000ms,Mob013-1::On1037 +013-1.gat,0,0,0,0|monster|Squirrel|1038,25,30ms,20ms,Mob013-1::On1038 +013-1.gat,0,0,0,0|monster|Butterfly|1055,10,30ms,20ms,Mob013-1::On1055 -013-1.gat,0,0,0|script|Mob013-1|-1, +013-1.gat,0,0,0|script|Mob013-1|-1 { end; 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; |