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/055-1/flowerpentagram4.txt | 36 ++++++++++++++++---------------- world/map/npc/055-1/mapflags.txt | 2 +- world/map/npc/055-1/pumpkins.txt | 8 +++---- world/map/npc/055-1/traveler.txt | 2 +- 4 files changed, 24 insertions(+), 24 deletions(-) (limited to 'world/map/npc/055-1') diff --git a/world/map/npc/055-1/flowerpentagram4.txt b/world/map/npc/055-1/flowerpentagram4.txt index b0996bb3..1fdd64cf 100644 --- a/world/map/npc/055-1/flowerpentagram4.txt +++ b/world/map/npc/055-1/flowerpentagram4.txt @@ -1,6 +1,6 @@ // Author: Jenalya -055-1.gat,141,89,0|script|#FlowerPentagram4|400 +055-1,141,89,0|script|#FlowerPentagram4|400 { if (OrumQuest >= 31) goto L_PlacedFifthFlower; @@ -17,7 +17,7 @@ L_FourthFlower: "Leave.", L_Close; L_PlaceTheFlower: - if (isin("055-1.gat", 140, 88, 142, 90)) + if (isin("055-1", 140, 88, 142, 90)) goto L_Place; mes "This isn't working, you're too far away."; @@ -25,14 +25,14 @@ L_PlaceTheFlower: L_Place: set @localMonsterCount, - mobcount("055-1.gat", "#FlowerPentagram4::OnSquirrelDeath") + - mobcount("055-1.gat", "#FlowerPentagram4::OnMushroomDeath") + - mobcount("055-1.gat", "#FlowerPentagram4::OnBlueparDeath") + - mobcount("055-1.gat", "#FlowerPentagram4::OnMoubooDeath") + - mobcount("055-1.gat", "#FlowerPentagram4::OnScorpionDeath") + - mobcount("055-1.gat", "#FlowerPentagram4::OnRScorpionDeath") + - mobcount("055-1.gat", "#FlowerPentagram4::OnAScorpionDeath") + - mobcount("055-1.gat", "#FlowerPentagram4::OnBScorpionDeath") + + mobcount("055-1", "#FlowerPentagram4::OnSquirrelDeath") + + mobcount("055-1", "#FlowerPentagram4::OnMushroomDeath") + + mobcount("055-1", "#FlowerPentagram4::OnBlueparDeath") + + mobcount("055-1", "#FlowerPentagram4::OnMoubooDeath") + + mobcount("055-1", "#FlowerPentagram4::OnScorpionDeath") + + mobcount("055-1", "#FlowerPentagram4::OnRScorpionDeath") + + mobcount("055-1", "#FlowerPentagram4::OnAScorpionDeath") + + mobcount("055-1", "#FlowerPentagram4::OnBScorpionDeath") + 8; // the mobcount function has an offset of -1, so we add 8 to have the actual amount of monsters if (@localMonsterCount > 4) goto L_MonstersAlive; @@ -44,14 +44,14 @@ L_Place: mes "As expected, you feel the magical tension building up. They're coming."; set OrumQuest, 27; close2; - areamonster "055-1.gat", 133, 87, 144, 99, "", 1105, 1, "#FlowerPentagram4::OnSquirrelDeath"; - areamonster "055-1.gat", 133, 87, 144, 99, "", 1106, 1, "#FlowerPentagram4::OnMushroomDeath"; - areamonster "055-1.gat", 133, 87, 144, 99, "", 1107, 2, "#FlowerPentagram4::OnBlueparDeath"; - areamonster "055-1.gat", 133, 87, 144, 99, "", 1104, 2, "#FlowerPentagram4::OnMoubooDeath"; - areamonster "055-1.gat", 133, 87, 144, 99, "", 1003, 2, "#FlowerPentagram4::OnScorpionDeath"; - areamonster "055-1.gat", 133, 87, 144, 99, "", 1004, 2, "#FlowerPentagram4::OnRScorpionDeath"; - areamonster "055-1.gat", 133, 87, 144, 99, "", 1057, 2, "#FlowerPentagram4::OnAScorpionDeath"; - areamonster "055-1.gat", 133, 87, 144, 99, "", 1009, 1, "#FlowerPentagram4::OnBScorpionDeath"; + areamonster "055-1", 133, 87, 144, 99, "", 1105, 1, "#FlowerPentagram4::OnSquirrelDeath"; + areamonster "055-1", 133, 87, 144, 99, "", 1106, 1, "#FlowerPentagram4::OnMushroomDeath"; + areamonster "055-1", 133, 87, 144, 99, "", 1107, 2, "#FlowerPentagram4::OnBlueparDeath"; + areamonster "055-1", 133, 87, 144, 99, "", 1104, 2, "#FlowerPentagram4::OnMoubooDeath"; + areamonster "055-1", 133, 87, 144, 99, "", 1003, 2, "#FlowerPentagram4::OnScorpionDeath"; + areamonster "055-1", 133, 87, 144, 99, "", 1004, 2, "#FlowerPentagram4::OnRScorpionDeath"; + areamonster "055-1", 133, 87, 144, 99, "", 1057, 2, "#FlowerPentagram4::OnAScorpionDeath"; + areamonster "055-1", 133, 87, 144, 99, "", 1009, 1, "#FlowerPentagram4::OnBScorpionDeath"; set @value, 15; callfunc "QuestSagathaAnnoy"; set @value, 0; diff --git a/world/map/npc/055-1/mapflags.txt b/world/map/npc/055-1/mapflags.txt index f2f6b2ec..31c2f835 100644 --- a/world/map/npc/055-1/mapflags.txt +++ b/world/map/npc/055-1/mapflags.txt @@ -1 +1 @@ -055-1.gat|mapflag|resave|055-1,133,61 +055-1|mapflag|resave|055-1,133,61 diff --git a/world/map/npc/055-1/pumpkins.txt b/world/map/npc/055-1/pumpkins.txt index 391cf96f..f0b9741c 100644 --- a/world/map/npc/055-1/pumpkins.txt +++ b/world/map/npc/055-1/pumpkins.txt @@ -1,10 +1,10 @@ // Pumpkin mobs for the seasonal halloween event with Oscar -055-1.gat,48,25,16,8|monster|Pumpkin|1063,12,10000ms,5000ms,PumpkinMob055-1::On1063 -055-1.gat,139,29,5,7|monster|Pumpkin|1063,7,10000ms,5000ms,PumpkinMob055-1::On1063 -055-1.gat,132,24,6,4|monster|Pumpkin|1063,4,10000ms,5000ms,PumpkinMob055-1::On1063 +055-1,48,25,16,8|monster|Pumpkin|1063,12,10000ms,5000ms,PumpkinMob055-1::On1063 +055-1,139,29,5,7|monster|Pumpkin|1063,7,10000ms,5000ms,PumpkinMob055-1::On1063 +055-1,132,24,6,4|monster|Pumpkin|1063,4,10000ms,5000ms,PumpkinMob055-1::On1063 -055-1.gat,0,0,0|script|PumpkinMob055-1|-1 +055-1,0,0,0|script|PumpkinMob055-1|-1 { end; diff --git a/world/map/npc/055-1/traveler.txt b/world/map/npc/055-1/traveler.txt index cc5db3c3..0277fbd4 100644 --- a/world/map/npc/055-1/traveler.txt +++ b/world/map/npc/055-1/traveler.txt @@ -2,7 +2,7 @@ // Author: Wombat, wushin // cost depending on level and adapted to new scripting guidelines: Jenalya -055-1.gat,135,60,0|script|Sherman the Traveler|103 +055-1,135,60,0|script|Sherman the Traveler|103 { set @NpcName$, "Sherman"; set @NpcTravelBit, $@hurns_farms_bit; -- cgit v1.2.3-70-g09d2