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/009-7/battlemaster.txt | 22 +++++++++++----------- world/map/npc/009-7/core.txt | 8 ++++---- world/map/npc/009-7/debug.txt | 2 +- world/map/npc/009-7/eventHandler.txt | 22 +++++++++++----------- world/map/npc/009-7/mapflags.txt | 4 ++-- world/map/npc/009-7/rouge.txt | 2 +- world/map/npc/009-7/shops.txt | 4 ++-- world/map/npc/009-7/trapdoor.txt | 4 ++-- 8 files changed, 34 insertions(+), 34 deletions(-) (limited to 'world/map/npc/009-7') diff --git a/world/map/npc/009-7/battlemaster.txt b/world/map/npc/009-7/battlemaster.txt index a946c5f9..bbac54e9 100644 --- a/world/map/npc/009-7/battlemaster.txt +++ b/world/map/npc/009-7/battlemaster.txt @@ -1,4 +1,4 @@ -009-7.gat,40,35,0|script|Battle Master#Duels|322 +009-7,40,35,0|script|Battle Master#Duels|322 { if($SANGUINE & $@SV_BMDBit != 0) goto L_Disabled; mes "[Battle Master]"; @@ -26,8 +26,8 @@ L_Brodomir: mes "\"Get ready!\""; close2; set DUELS, DUELS | $@DuelPvpBit; // tell the arena to send the player back here when he exits - warp "009-6.gat", 33, 37; - savepoint "009-7.gat", 39, 37; + warp "009-6", 33, 37; + savepoint "009-7", 39, 37; end; L_PVP: @@ -37,8 +37,8 @@ L_PVP: mes "\"Get ready!\""; close2; set DUELS, DUELS | $@DuelPvpBit; // tell the arena to send the player back here when he dies - warp "001-3.gat", 0, 0; - savepoint "009-7.gat", 39, 37; + warp "001-3", 0, 0; + savepoint "009-7", 39, 37; end; L_NoMoney: @@ -57,34 +57,34 @@ function|script|fightclub_GoBack L_GoBack: set DUELS, DUELS &~ $@DuelPvpBit; - warp "009-7.gat", 39, 37; + warp "009-7", 39, 37; gmcommand "@alive"; message strcharinfo(0), "Thank you for participating!"; return; } -009-6.gat,36,48,0|script|#GoBack2Duels|127,0,1 +009-6,36,48,0|script|#GoBack2Duels|127,0,1 { callfunc "fightclub_GoBack"; end; } -009-5.gat,53,74,0|script|#GoBack3Duels|127,3,1 +009-5,53,74,0|script|#GoBack3Duels|127,3,1 { callfunc "fightclub_GoBack"; end; } -009-3.gat,158,83,0|script|#GoBack5Duels|127,7,0 +009-3,158,83,0|script|#GoBack5Duels|127,7,0 { callfunc "fightclub_GoBack"; end; } -001-2.gat,130,22,0|script|#GoBack4Duels|127,1,1 +001-2,130,22,0|script|#GoBack4Duels|127,1,1 { callfunc "fightclub_GoBack"; end; } -001-3.gat,73,28,0|script|#GoBack1Duels|127,0,1 +001-3,73,28,0|script|#GoBack1Duels|127,0,1 { callfunc "fightclub_GoBack"; end; diff --git a/world/map/npc/009-7/core.txt b/world/map/npc/009-7/core.txt index cd30e359..03eb2095 100644 --- a/world/map/npc/009-7/core.txt +++ b/world/map/npc/009-7/core.txt @@ -238,7 +238,7 @@ function|script|fightclub_DestroyMe sc_end 132; sc_end 14; sc_end 37; sc_end 185; sc_end 194; sc_end 195; sc_end 196; sc_end 197; sc_end 198; sc_end 199; // remove effects percentheal -100, 0; // doing @killer is unreliable gmcommand "@alive"; // refill hp/mana - if(getmap() == "009-7") warp "009-7.gat", rand($@fightclub_x1, $@fightclub_x2), rand(($@fightclub_y1 - 2), ($@fightclub_y1 - 3)); + if(getmap() == "009-7") warp "009-7", rand($@fightclub_x1, $@fightclub_x2), rand(($@fightclub_y1 - 2), ($@fightclub_y1 - 3)); return; } @@ -316,7 +316,7 @@ function|script|fightclub_StartUp // ** called before and after each duel to wipe the vars function|script|fightclub_CleanStage { - if($@Duel_NoWarp != 1) areawarp "009-7.gat", $@fightclub_x1, $@fightclub_y1, $@fightclub_x2, $@fightclub_y2, "009-7.gat", 31, 40; // kick all players from stage + if($@Duel_NoWarp != 1) areawarp "009-7", $@fightclub_x1, $@fightclub_y1, $@fightclub_x2, $@fightclub_y2, "009-7", 31, 40; // kick all players from stage set $@Duel_NoWarp, 0; set $@Duel_NoMagic, 0; // clean the Duel parameters set $@Duel_CurrentDuel, 0; // no duel atm @@ -327,7 +327,7 @@ function|script|fightclub_CleanStage set $@Duel_TotalTime, 0; npcwarp 32, 45, "Rouge#Duels"; donpcevent "#FightClubTimeLimit::OnStopTimer"; - killmonster "009-7.gat", "All"; + killmonster "009-7", "All"; return; } @@ -434,7 +434,7 @@ L_Reset: // the player has duel_fighter but no duel is ongoing (happens if the p function|script|fightclub_enter { set @Duel_Fighter, 1; - warp "009-7.gat", rand($@fightclub_x1,$@fightclub_x2), rand($@fightclub_y1,$@fightclub_y2); + warp "009-7", rand($@fightclub_x1,$@fightclub_x2), rand($@fightclub_y1,$@fightclub_y2); gmcommand "@alive"; // ensure that you can't duel wih a corpse sc_end 132; sc_end 14; sc_end 37; sc_end 185; sc_end 194; sc_end 195; sc_end 196; sc_end 197; sc_end 198; sc_end 199; // remove effects message strcharinfo(0), "Get Ready."; diff --git a/world/map/npc/009-7/debug.txt b/world/map/npc/009-7/debug.txt index 27f16009..f5283898 100644 --- a/world/map/npc/009-7/debug.txt +++ b/world/map/npc/009-7/debug.txt @@ -141,7 +141,7 @@ L_End: return; } -009-7.gat,41,45,0|script|Debug#Duels|181 +009-7,41,45,0|script|Debug#Duels|181 { mes "The debug menu can also be accessed by wearing a dev cap while talking to Rouge."; mes "For the documentation, @@https://wiki.themanaworld.org/index.php/User:Meko/FightClub/debug|click here@@##0"; diff --git a/world/map/npc/009-7/eventHandler.txt b/world/map/npc/009-7/eventHandler.txt index a310ff4c..7104d0a7 100644 --- a/world/map/npc/009-7/eventHandler.txt +++ b/world/map/npc/009-7/eventHandler.txt @@ -1,21 +1,21 @@ // this file handles every events related to the fight club and calls the appropriate functions from core -009-7.gat,45,33,0|script|#trapdoor2FightClub|327,0,0 +009-7,45,33,0|script|#trapdoor2FightClub|327,0,0 { if(countitem(647)||countitem(725)||countitem(1178)||countitem(5131)||countitem(5132)||countitem(5133)||countitem(5134)||countitem(5135)||countitem(5136)||countitem(5137)||countitem(5138)||countitem(5139)||countitem(5140)||(getgmlevel()>=20)) goto L_Enter; end; L_Enter: - warp "009-7.gat",34,22; // this warp is a special thanks for contributors + warp "009-7",34,22; // this warp is a special thanks for contributors end; } -009-7.gat,33,21,0|script|#trapdoor3FightClub|327,0,0 +009-7,33,21,0|script|#trapdoor3FightClub|327,0,0 { - warp "009-7.gat",44,32; + warp "009-7",44,32; end; } -009-7.gat,22,38,0|script|#FightClubUtils|127 +009-7,22,38,0|script|#FightClubUtils|127 { end; @@ -40,11 +40,11 @@ OnBecomeKiller: end; OnCommandIntrusion: - areatimer "009-7.gat", $@fightclub_x1, $@fightclub_y1, $@fightclub_x2, $@fightclub_y2, 0, "#FightClubUtils::OnIntrusion"; // we can not do this directly on #handler because it already have a timer + areatimer "009-7", $@fightclub_x1, $@fightclub_y1, $@fightclub_x2, $@fightclub_y2, 0, "#FightClubUtils::OnIntrusion"; // we can not do this directly on #handler because it already have a timer end; } -009-7.gat,20,45,0|script|#FightClubTimeLimit|127,0,0 +009-7,20,45,0|script|#FightClubTimeLimit|127,0,0 { end; @@ -76,7 +76,7 @@ OnInit: end; } -009-7.gat,20,44,0|script|#FightClubHandler|127,0,0 +009-7,20,44,0|script|#FightClubHandler|127,0,0 { end; @@ -99,15 +99,15 @@ L_StartTimer: OnTimer2000: // this events checks who is on stage every 2 seconds - set $@areausers, getareausers("009-7.gat", $@fightclub_x1, $@fightclub_y1, $@fightclub_x2, $@fightclub_y2); // get the number of players on stage + set $@areausers, getareausers("009-7", $@fightclub_x1, $@fightclub_y1, $@fightclub_x2, $@fightclub_y2); // get the number of players on stage if (($@areausers > 2) || (($@Duel_CurrentDuel < 1) && ($@areausers >= 1))) goto L_Intrusion; // too many players on the stage if (($@Duel_CurrentDuel < 1) && ($@Duel_Started != 1)) goto L_Request; // start the next duel if ($@Duel_Started != 1) goto L_StartTimer; // no intrusion and no duel ongoing so loop again if (attachrid($@Duel_BluePlayer) == 0) goto L_BlueMissing; - if (isin("009-7.gat", $@fightclub_x1, $@fightclub_y1, $@fightclub_x2, $@fightclub_y2) == 0) goto L_BlueMissing; + if (isin("009-7", $@fightclub_x1, $@fightclub_y1, $@fightclub_x2, $@fightclub_y2) == 0) goto L_BlueMissing; if (isdead() == 1) goto L_IAmACorpse; if (attachrid($@Duel_RedPlayer) == 0) goto L_RedMissing; - if (isin("009-7.gat", $@fightclub_x1, $@fightclub_y1, $@fightclub_x2, $@fightclub_y2) == 0) goto L_RedMissing; + if (isin("009-7", $@fightclub_x1, $@fightclub_y1, $@fightclub_x2, $@fightclub_y2) == 0) goto L_RedMissing; if (isdead() == 1) goto L_IAmACorpse; detachrid; goto L_StartTimer; diff --git a/world/map/npc/009-7/mapflags.txt b/world/map/npc/009-7/mapflags.txt index 6a40d04d..9fdd3a99 100644 --- a/world/map/npc/009-7/mapflags.txt +++ b/world/map/npc/009-7/mapflags.txt @@ -1,2 +1,2 @@ -009-7.gat|mapflag|noteleport -009-7.gat|mapflag|monster_noteleport +009-7|mapflag|noteleport +009-7|mapflag|monster_noteleport diff --git a/world/map/npc/009-7/rouge.txt b/world/map/npc/009-7/rouge.txt index dd86679c..4ce3be8e 100644 --- a/world/map/npc/009-7/rouge.txt +++ b/world/map/npc/009-7/rouge.txt @@ -1,4 +1,4 @@ -009-7.gat,32,45,0|script|Rouge#Duels|181 +009-7,32,45,0|script|Rouge#Duels|181 { if (getgmlevel() >= 40 && (getequipid(equip_head) == 647 || getequipid(equip_head) == 725)) goto L_CallDebug; goto L_Main; diff --git a/world/map/npc/009-7/shops.txt b/world/map/npc/009-7/shops.txt index 13dd0a4c..aca61234 100644 --- a/world/map/npc/009-7/shops.txt +++ b/world/map/npc/009-7/shops.txt @@ -1,3 +1,3 @@ -009-7.gat,34,23,0|shop|Bartender#Duels|177,Beer:*1,IronPotion:*1,ConcentrationPotion:*1,SmallManaElixir:*9,BottleOfWater:*1,Milk:*1 +009-7,34,23,0|shop|Bartender#Duels|177,Beer:*1,IronPotion:*1,ConcentrationPotion:*1,SmallManaElixir:*9,BottleOfWater:*1,Milk:*1 -009-7.gat,27,26,0|shop|Garçon#Duels|180,RoastedMaggot:*1,PickledBeets:*30,ChickenLeg:*1,Steak:*1,Beer:*1 +009-7,27,26,0|shop|Garçon#Duels|180,RoastedMaggot:*1,PickledBeets:*30,ChickenLeg:*1,Steak:*1,Beer:*1 diff --git a/world/map/npc/009-7/trapdoor.txt b/world/map/npc/009-7/trapdoor.txt index aff98cbd..b2709eef 100644 --- a/world/map/npc/009-7/trapdoor.txt +++ b/world/map/npc/009-7/trapdoor.txt @@ -1,4 +1,4 @@ -009-2.gat,38,105,0|script|#trapdoor#FightClub|327,0,0 +009-2,38,105,0|script|#trapdoor#FightClub|327,0,0 { set @index, rand(0,(getarraysize($@fightclub_randompasswords$) - 1)); set @password$, $@fightclub_definitions$[@index]; @@ -48,7 +48,7 @@ L_Enter: if(@menu != (@good + 1)) goto L_Close; mes "Correct. You may enter."; close2; - warp "009-7.gat", 22, 21; + warp "009-7", 22, 21; end; L_Close: -- cgit v1.2.3-70-g09d2