From 22cfbc011ce19e96767861b60473fa3136177f10 Mon Sep 17 00:00:00 2001 From: mekolat Date: Sun, 1 Feb 2015 14:11:22 -0500 Subject: remove .gat from npcs --- world/map/npc/013-1/flowerpentagram.txt | 82 ++++++++++++++++----------------- world/map/npc/013-1/mapflags.txt | 2 +- world/map/npc/013-1/sagatha.txt | 2 +- world/map/npc/013-1/traveler.txt | 2 +- 4 files changed, 44 insertions(+), 44 deletions(-) (limited to 'world/map/npc/013-1') diff --git a/world/map/npc/013-1/flowerpentagram.txt b/world/map/npc/013-1/flowerpentagram.txt index 59c8e392..5be2c99a 100644 --- a/world/map/npc/013-1/flowerpentagram.txt +++ b/world/map/npc/013-1/flowerpentagram.txt @@ -1,4 +1,4 @@ -013-1.gat,1,1,0|script|#FlowerPentagram|127 +013-1,1,1,0|script|#FlowerPentagram|127 { end; @@ -8,32 +8,32 @@ OnSummon: callsub S_CleanUp; // area closely to sagatha - areamonster "013-1.gat", 119, 21, 134, 36, "", 1105, 3, "#FlowerPentagram::OnSquirrelDeath"; - areamonster "013-1.gat", 119, 21, 134, 36, "", 1106, 2, "#FlowerPentagram::OnMushroomDeath"; - areamonster "013-1.gat", 119, 21, 134, 36, "", 1107, 3, "#FlowerPentagram::OnBlueparDeath"; - areamonster "013-1.gat", 119, 21, 134, 36, "", 1104, 2, "#FlowerPentagram::OnMoubooDeath"; - areamonster "013-1.gat", 119, 21, 134, 36, "", 1003, 10, "#FlowerPentagram::OnScorpionDeath"; - areamonster "013-1.gat", 119, 21, 134, 36, "", 1004, 7, "#FlowerPentagram::OnRScorpionDeath"; - areamonster "013-1.gat", 119, 21, 134, 36, "", 1057, 5, "#FlowerPentagram::OnAScorpionDeath"; - areamonster "013-1.gat", 119, 21, 134, 36, "", 1009, 3, "#FlowerPentagram::OnBScorpionDeath"; + areamonster "013-1", 119, 21, 134, 36, "", 1105, 3, "#FlowerPentagram::OnSquirrelDeath"; + areamonster "013-1", 119, 21, 134, 36, "", 1106, 2, "#FlowerPentagram::OnMushroomDeath"; + areamonster "013-1", 119, 21, 134, 36, "", 1107, 3, "#FlowerPentagram::OnBlueparDeath"; + areamonster "013-1", 119, 21, 134, 36, "", 1104, 2, "#FlowerPentagram::OnMoubooDeath"; + areamonster "013-1", 119, 21, 134, 36, "", 1003, 10, "#FlowerPentagram::OnScorpionDeath"; + areamonster "013-1", 119, 21, 134, 36, "", 1004, 7, "#FlowerPentagram::OnRScorpionDeath"; + areamonster "013-1", 119, 21, 134, 36, "", 1057, 5, "#FlowerPentagram::OnAScorpionDeath"; + areamonster "013-1", 119, 21, 134, 36, "", 1009, 3, "#FlowerPentagram::OnBScorpionDeath"; // wider area around sagatha - areamonster "013-1.gat", 68, 25, 133, 73, "", 1105, 3, "#FlowerPentagram::OnSquirrelDeath"; - areamonster "013-1.gat", 68, 25, 133, 73, "", 1106, 3, "#FlowerPentagram::OnMushroomDeath"; - areamonster "013-1.gat", 68, 25, 133, 73, "", 1107, 5, "#FlowerPentagram::OnBlueparDeath"; - areamonster "013-1.gat", 68, 25, 133, 73, "", 1104, 2, "#FlowerPentagram::OnMoubooDeath"; - areamonster "013-1.gat", 68, 25, 133, 73, "", 1003, 6, "#FlowerPentagram::OnScorpionDeath"; - areamonster "013-1.gat", 68, 25, 133, 73, "", 1004, 5, "#FlowerPentagram::OnRScorpionDeath"; - areamonster "013-1.gat", 68, 25, 133, 73, "", 1057, 4, "#FlowerPentagram::OnAScorpionDeath"; - areamonster "013-1.gat", 68, 25, 133, 73, "", 1009, 2, "#FlowerPentagram::OnBScorpionDeath"; + areamonster "013-1", 68, 25, 133, 73, "", 1105, 3, "#FlowerPentagram::OnSquirrelDeath"; + areamonster "013-1", 68, 25, 133, 73, "", 1106, 3, "#FlowerPentagram::OnMushroomDeath"; + areamonster "013-1", 68, 25, 133, 73, "", 1107, 5, "#FlowerPentagram::OnBlueparDeath"; + areamonster "013-1", 68, 25, 133, 73, "", 1104, 2, "#FlowerPentagram::OnMoubooDeath"; + areamonster "013-1", 68, 25, 133, 73, "", 1003, 6, "#FlowerPentagram::OnScorpionDeath"; + areamonster "013-1", 68, 25, 133, 73, "", 1004, 5, "#FlowerPentagram::OnRScorpionDeath"; + areamonster "013-1", 68, 25, 133, 73, "", 1057, 4, "#FlowerPentagram::OnAScorpionDeath"; + areamonster "013-1", 68, 25, 133, 73, "", 1009, 2, "#FlowerPentagram::OnBScorpionDeath"; // almost the entire map - areamonster "013-1.gat", 24, 22, 136, 100, "", 1105, 4, "#FlowerPentagram::OnSquirrelDeath"; - areamonster "013-1.gat", 24, 22, 136, 100, "", 1106, 3, "#FlowerPentagram::OnMushroomDeath"; - areamonster "013-1.gat", 24, 22, 136, 100, "", 1107, 5, "#FlowerPentagram::OnBlueparDeath"; - areamonster "013-1.gat", 24, 22, 136, 100, "", 1104, 3, "#FlowerPentagram::OnMoubooDeath"; - areamonster "013-1.gat", 24, 22, 136, 100, "", 1003, 5, "#FlowerPentagram::OnScorpionDeath"; - areamonster "013-1.gat", 24, 22, 136, 100, "", 1004, 4, "#FlowerPentagram::OnRScorpionDeath"; - areamonster "013-1.gat", 24, 22, 136, 100, "", 1057, 3, "#FlowerPentagram::OnAScorpionDeath"; - areamonster "013-1.gat", 24, 22, 136, 100, "", 1009, 1, "#FlowerPentagram::OnBScorpionDeath"; + areamonster "013-1", 24, 22, 136, 100, "", 1105, 4, "#FlowerPentagram::OnSquirrelDeath"; + areamonster "013-1", 24, 22, 136, 100, "", 1106, 3, "#FlowerPentagram::OnMushroomDeath"; + areamonster "013-1", 24, 22, 136, 100, "", 1107, 5, "#FlowerPentagram::OnBlueparDeath"; + areamonster "013-1", 24, 22, 136, 100, "", 1104, 3, "#FlowerPentagram::OnMoubooDeath"; + areamonster "013-1", 24, 22, 136, 100, "", 1003, 5, "#FlowerPentagram::OnScorpionDeath"; + areamonster "013-1", 24, 22, 136, 100, "", 1004, 4, "#FlowerPentagram::OnRScorpionDeath"; + areamonster "013-1", 24, 22, 136, 100, "", 1057, 3, "#FlowerPentagram::OnAScorpionDeath"; + areamonster "013-1", 24, 22, 136, 100, "", 1009, 1, "#FlowerPentagram::OnBScorpionDeath"; end; OnSquirrelDeath: @@ -77,28 +77,28 @@ OnBScorpionDeath: end; S_CleanUp: - killmonster "013-1.gat", "#FlowerPentagram::OnSquirrelDeath"; - killmonster "013-1.gat", "#FlowerPentagram::OnMushroomDeath"; - killmonster "013-1.gat", "#FlowerPentagram::OnBlueparDeath"; - killmonster "013-1.gat", "#FlowerPentagram::OnMoubooDeath"; - killmonster "013-1.gat", "#FlowerPentagram::OnScorpionDeath"; - killmonster "013-1.gat", "#FlowerPentagram::OnRScorpionDeath"; - killmonster "013-1.gat", "#FlowerPentagram::OnAScorpionDeath"; - killmonster "013-1.gat", "#FlowerPentagram::OnBScorpionDeath"; + killmonster "013-1", "#FlowerPentagram::OnSquirrelDeath"; + killmonster "013-1", "#FlowerPentagram::OnMushroomDeath"; + killmonster "013-1", "#FlowerPentagram::OnBlueparDeath"; + killmonster "013-1", "#FlowerPentagram::OnMoubooDeath"; + killmonster "013-1", "#FlowerPentagram::OnScorpionDeath"; + killmonster "013-1", "#FlowerPentagram::OnRScorpionDeath"; + killmonster "013-1", "#FlowerPentagram::OnAScorpionDeath"; + killmonster "013-1", "#FlowerPentagram::OnBScorpionDeath"; return; } function|script|FlowerPentagramCount { set $@Flower_Pentagram_Mobcount, - mobcount("013-1.gat", "#FlowerPentagram::OnSquirrelDeath") + - mobcount("013-1.gat", "#FlowerPentagram::OnMushroomDeath") + - mobcount("013-1.gat", "#FlowerPentagram::OnBlueparDeath") + - mobcount("013-1.gat", "#FlowerPentagram::OnMoubooDeath") + - mobcount("013-1.gat", "#FlowerPentagram::OnScorpionDeath") + - mobcount("013-1.gat", "#FlowerPentagram::OnRScorpionDeath") + - mobcount("013-1.gat", "#FlowerPentagram::OnAScorpionDeath") + - mobcount("013-1.gat", "#FlowerPentagram::OnBScorpionDeath") + + mobcount("013-1", "#FlowerPentagram::OnSquirrelDeath") + + mobcount("013-1", "#FlowerPentagram::OnMushroomDeath") + + mobcount("013-1", "#FlowerPentagram::OnBlueparDeath") + + mobcount("013-1", "#FlowerPentagram::OnMoubooDeath") + + mobcount("013-1", "#FlowerPentagram::OnScorpionDeath") + + mobcount("013-1", "#FlowerPentagram::OnRScorpionDeath") + + mobcount("013-1", "#FlowerPentagram::OnAScorpionDeath") + + mobcount("013-1", "#FlowerPentagram::OnBScorpionDeath") + 8; // the mobcount function has an offset of -1, so we add 8 to have the actual amount of monsters return; } diff --git a/world/map/npc/013-1/mapflags.txt b/world/map/npc/013-1/mapflags.txt index 4c296e01..5c043bd9 100644 --- a/world/map/npc/013-1/mapflags.txt +++ b/world/map/npc/013-1/mapflags.txt @@ -1 +1 @@ -013-1.gat|mapflag|resave|013-1,126,99 +013-1|mapflag|resave|013-1,126,99 diff --git a/world/map/npc/013-1/sagatha.txt b/world/map/npc/013-1/sagatha.txt index cf99cd28..1251d025 100644 --- a/world/map/npc/013-1/sagatha.txt +++ b/world/map/npc/013-1/sagatha.txt @@ -72,7 +72,7 @@ L_next: } //---------------------------------------- -013-1.gat,131,24,0|script|Sagatha#_M|167 +013-1,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 ff36ded4..efa6c53a 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,120,90,0|script|Faris the Traveler|103 { set @NpcName$, "Faris"; set @NpcTravelBit, $@magic_house_bit; -- cgit v1.2.3-60-g2f50