From e72d67766020ec3cc177f0c80a404711146ef7c5 Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Tue, 4 Nov 2014 20:26:16 -0800 Subject: Update scripts for stricter checks --- world/map/npc/006-1/_warps.txt | 38 ++++++++++----------- world/map/npc/008-1/_warps.txt | 8 ++--- world/map/npc/009-1/_warps.txt | 2 +- world/map/npc/009-7/core.txt | 42 ++++++++++++++++-------- world/map/npc/009-7/mapflags.txt | 4 +-- world/map/npc/013-3/_warps.txt | 2 +- world/map/npc/017-1/_warps.txt | 6 ++-- world/map/npc/017-2/_warps.txt | 2 +- world/map/npc/017-3/_warps.txt | 2 +- world/map/npc/018-1/_warps.txt | 4 +-- world/map/npc/018-3/_warps.txt | 2 +- world/map/npc/024-1/_warps.txt | 4 +-- world/map/npc/027-3/_warps.txt | 2 +- world/map/npc/027-4/_warps.txt | 2 +- world/map/npc/027-5/_warps.txt | 2 +- world/map/npc/042-1/_warps.txt | 8 ++--- world/map/npc/042-3/_warps.txt | 2 +- world/map/npc/068-1/_import.txt | 1 - world/map/npc/068-1/vendors.txt | 0 world/map/npc/069-1/_warps.txt | 22 ++++++------- world/map/npc/069-2/_warps.txt | 28 ++++++++-------- world/map/npc/functions/global_event_handler.txt | 2 +- world/map/npc/items/unequipcb.txt | 4 +-- 23 files changed, 101 insertions(+), 88 deletions(-) delete mode 100644 world/map/npc/068-1/vendors.txt (limited to 'world/map/npc') diff --git a/world/map/npc/006-1/_warps.txt b/world/map/npc/006-1/_warps.txt index 2be20ab5..91459352 100644 --- a/world/map/npc/006-1/_warps.txt +++ b/world/map/npc/006-1/_warps.txt @@ -2,25 +2,25 @@ // Desert Mountains warps 006-1.gat,18,31|warp|To Snake Desert|-1,-1,005-1.gat,172,101 -006-1.gat,40,26|warp|To Desert Mountains Cave|-1,-1,006-3.gat,40,28 -006-1.gat,60,58|warp|To Desert Mountains Cave|-1,-1,006-3.gat,60,70 -006-1.gat,62,30|warp|To Desert Mountains Cave|-1,-1,006-3.gat,62,32 -006-1.gat,55,27|warp|To Desert Mountains Cave|-1,-1,006-3.gat,55,29 -006-1.gat,77,44|warp|To Desert Mountains Cave|-1,-1,006-3.gat,77,46 -006-1.gat,86,24|warp|To Desert Mountains Cave|-1,-1,006-3.gat,86,26 -006-1.gat,91,24|warp|To Desert Mountains Cave|-1,-1,006-3.gat,91,26 -006-1.gat,104,44|warp|To Desert Mountains Cave|-1,-1,006-3.gat,104,46 -006-1.gat,122,24|warp|To Desert Mountains Cave|-1,-1,006-3.gat,122,26 -006-1.gat,114,49|warp|To Desert Mountains Cave|-1,-1,006-3.gat,114,51 -006-1.gat,110,56|warp|To Desert Mountains Cave|-1,-1,006-3.gat,110,58 -006-1.gat,125,59|warp|To Desert Mountains Cave|-1,-1,006-3.gat,125,61 -006-1.gat,92,63|warp|To Desert Mountains Cave|-1,-1,006-3.gat,92,65 -006-1.gat,112,74|warp|To Desert Mountains Cave|-1,-1,006-3.gat,112,76 -006-1.gat,121,110|warp|To Desert Mountains Cave|-1,-1,006-3.gat,121,112 -006-1.gat,79,120|warp|To Desert Mountains Cave|-1,-1,006-3.gat,79,122 -006-1.gat,38,121|warp|To Desert Mountains Cave|-1,-1,006-3.gat,38,123 -006-1.gat,74,90|warp|To Desert Mountains Cave|-1,-1,006-3.gat,74,92 -006-1.gat,51,90|warp|To Desert Mountains Cave|-1,-1,006-3.gat,51,92 +006-1.gat,40,26|warp|To Desert Mountains Cav|-1,-1,006-3.gat,40,28 +006-1.gat,60,58|warp|To Desert Mountains Cav|-1,-1,006-3.gat,60,70 +006-1.gat,62,30|warp|To Desert Mountains Cav|-1,-1,006-3.gat,62,32 +006-1.gat,55,27|warp|To Desert Mountains Cav|-1,-1,006-3.gat,55,29 +006-1.gat,77,44|warp|To Desert Mountains Cav|-1,-1,006-3.gat,77,46 +006-1.gat,86,24|warp|To Desert Mountains Cav|-1,-1,006-3.gat,86,26 +006-1.gat,91,24|warp|To Desert Mountains Cav|-1,-1,006-3.gat,91,26 +006-1.gat,104,44|warp|To Desert Mountains Cav|-1,-1,006-3.gat,104,46 +006-1.gat,122,24|warp|To Desert Mountains Cav|-1,-1,006-3.gat,122,26 +006-1.gat,114,49|warp|To Desert Mountains Cav|-1,-1,006-3.gat,114,51 +006-1.gat,110,56|warp|To Desert Mountains Cav|-1,-1,006-3.gat,110,58 +006-1.gat,125,59|warp|To Desert Mountains Cav|-1,-1,006-3.gat,125,61 +006-1.gat,92,63|warp|To Desert Mountains Cav|-1,-1,006-3.gat,92,65 +006-1.gat,112,74|warp|To Desert Mountains Cav|-1,-1,006-3.gat,112,76 +006-1.gat,121,110|warp|To Desert Mountains Cav|-1,-1,006-3.gat,121,112 +006-1.gat,79,120|warp|To Desert Mountains Cav|-1,-1,006-3.gat,79,122 +006-1.gat,38,121|warp|To Desert Mountains Cav|-1,-1,006-3.gat,38,123 +006-1.gat,74,90|warp|To Desert Mountains Cav|-1,-1,006-3.gat,74,92 +006-1.gat,51,90|warp|To Desert Mountains Cav|-1,-1,006-3.gat,51,92 006-1.gat,30,123|warp|To Outback Cave|-1,-1,032-3.gat,128,33 006-1.gat,19,30|warp|To Snake Desert|-1,-1,005-1.gat,172,101 006-1.gat,20,29|warp|To Snake Desert|-1,-1,005-1.gat,172,101 diff --git a/world/map/npc/008-1/_warps.txt b/world/map/npc/008-1/_warps.txt index 60785011..d353249e 100644 --- a/world/map/npc/008-1/_warps.txt +++ b/world/map/npc/008-1/_warps.txt @@ -1,10 +1,10 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Hurnscald Outskirts warps -008-1.gat,54,61|warp|To Hurnscald West Entrance|-1,1,009-1.gat,25,36 -008-1.gat,79,80|warp|To Hurnscald South Entrance|2,-1,009-1.gat,48,54 -008-1.gat,127,61|warp|To Hurnscald East Entrance|-1,0,009-1.gat,96,36 -008-1.gat,79,49|warp|To Hurnscald North Entrance|2,-1,009-1.gat,48,25 +008-1.gat,54,61|warp|To Hurnscald West Entra|-1,1,009-1.gat,25,36 +008-1.gat,79,80|warp|To Hurnscald South Entr|2,-1,009-1.gat,48,54 +008-1.gat,127,61|warp|To Hurnscald East Entra|-1,0,009-1.gat,96,36 +008-1.gat,79,49|warp|To Hurnscald North Entr|2,-1,009-1.gat,48,25 008-1.gat,24,62|warp|To Woodland|-1,2,011-1.gat,123,61 008-1.gat,79,17|warp|To Woodland Mining Camp|2,-1,018-1.gat,78,97 008-1.gat,79,102|warp|To Woodland|2,-1,007-1.gat,68,22 diff --git a/world/map/npc/009-1/_warps.txt b/world/map/npc/009-1/_warps.txt index 0e867bd7..939b6f2e 100644 --- a/world/map/npc/009-1/_warps.txt +++ b/world/map/npc/009-1/_warps.txt @@ -6,7 +6,7 @@ 009-1.gat,35,30|warp|To Hurnscald Inn|-1,-1,009-2.gat,50,54 009-1.gat,58,46|warp|To Storage Room|-1,-1,009-2.gat,27,106 009-1.gat,59,33|warp|To Archer Shop|-1,-1,009-2.gat,95,29 -009-1.gat,71,30|warp|To Hurnscald Potion Shop|-1,-1,009-2.gat,130,25 +009-1.gat,71,30|warp|To Hurnscald Potion Sho|-1,-1,009-2.gat,130,25 009-1.gat,80,31|warp|To Hurnscald Hospital|-1,-1,009-2.gat,149,66 009-1.gat,72,44|warp|To Hurnscald House|-1,-1,009-2.gat,114,77 009-1.gat,91,46|warp|To Hurnscald Forge|0,-1,009-2.gat,182,66 diff --git a/world/map/npc/009-7/core.txt b/world/map/npc/009-7/core.txt index 3a92a928..167c4458 100644 --- a/world/map/npc/009-7/core.txt +++ b/world/map/npc/009-7/core.txt @@ -56,7 +56,8 @@ L_Proceed2: return; } -function|script|fightclub_AddToQueue|, // ** called when someone agree to duel +// ** called when someone agree to duel +function|script|fightclub_AddToQueue|, { set @Duel_Loop, 0; goto L_Loop; @@ -108,7 +109,8 @@ L_Request: return; } -function|script|fightclub_NextBattle|, // ** called when a duel is finished +// ** called when a duel is finished +function|script|fightclub_NextBattle|, { set $@Duel_Queue_Blue$[0], ""; // clean the 0 index set $@Duel_Queue_Red$[0], ""; @@ -152,7 +154,8 @@ L_Proceed2: return; } -function|script|fightclub_NextBattleProceed|, // ** called after the delay +// ** called after the delay +function|script|fightclub_NextBattleProceed|, { set $@Duel_NoMagic, (DUELS & $@NoMagicBit); // get the rules of the caster donpcevent "Rouge#Duels::OnAnnounceNext"; @@ -196,7 +199,8 @@ L_Missing: return; } -function|script|fightclub_Intrusion|, // ** called when someone uninvited is on stage +// ** called when someone uninvited is on stage +function|script|fightclub_Intrusion|, { // nothing to do here (yet) return; @@ -210,7 +214,8 @@ function|script|fightclub_EmergencyWipe|, return; } -function|script|fightclub_Victory|, // ** called whenever someone wins (to handle rewards and bids) +// ** called whenever someone wins (to handle rewards and bids) +function|script|fightclub_Victory|, { // TODO: give some sort of reward // TODO: increase score @@ -218,14 +223,16 @@ function|script|fightclub_Victory|, // ** called whenever someone wins (to handl return; } -function|script|fightclub_DestroyMe|, // ** called when the player needs to be reset +// ** called when the player needs to be reset +function|script|fightclub_DestroyMe|, { callfunc "fightclub_exit"; percentheal -100, 0; // dying removes @killable, @killer or any temp buff return; } -function|script|fightclub_Missing|, // ** called when the red or blue player disappears from stage +// ** called when the red or blue player disappears from stage +function|script|fightclub_Missing|, { // $@Duel_Missing 1 = red, 2 = blue if (attachrid($@Duel_BluePlayer) == 1) goto L_Proceed; // we need to attach to at least one player @@ -268,7 +275,8 @@ L_Resume: return; } -function|script|fightclub_StartUp|, // ** called after the server boots up +// ** called after the server boots up +function|script|fightclub_StartUp|, { if($fightclub_enabled < 1) set $fightclub_enabled, 1; // init the (permanent) enabled global (this will only be done once, when the duel system is merged with master) if($@Duel_TimeBeforeNext < 1) set $@Duel_TimeBeforeNext, 5; // init the (temporary) TimeBeforeNext global @@ -291,7 +299,8 @@ function|script|fightclub_StartUp|, // ** called after the server boots up return; } -function|script|fightclub_CleanStage|, // ** called before and after each duel to wipe the vars +// ** 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 set $@Duel_NoWarp, 0; @@ -308,7 +317,8 @@ function|script|fightclub_CleanStage|, // ** called before and after each duel t return; } -function|script|fightclub_setrules|, // ** called by npc; allows the player to change their custom rules +// ** called by npc; allows the player to change their custom rules +function|script|fightclub_setrules|, { goto L_Main; @@ -344,7 +354,8 @@ L_Return: return; } -function|script|fightclub_death|, // ** called by event handler whenever someone dies +// ** called by event handler whenever someone dies +function|script|fightclub_death|, { if(@Duel_Fighter != 1) goto L_NoDuel; if(($@Duel_CurrentDuel < 1) || ($@Duel_Started != 1)) goto L_Reset; @@ -409,7 +420,8 @@ L_Reset: // the player has duel_fighter but no duel is ongoing (happens if the p return; } -function|script|fightclub_enter|, // ** called every time a player enters the ring +// ** called every time a player enters the ring +function|script|fightclub_enter|, { set @Duel_Fighter, 1; warp "009-7.gat", rand($@fightclub_x1,$@fightclub_x2), rand($@fightclub_y1,$@fightclub_y2); @@ -419,7 +431,8 @@ function|script|fightclub_enter|, // ** called every time a player enters the ri return; } -function|script|fightclub_enter_killer|, // ** called 3 seconds after a player enters the ring +// ** called 3 seconds after a player enters the ring +function|script|fightclub_enter_killer|, { gmcommand "@killable"; gmcommand "@killer"; // add both killable and killer so if one doesn't kick in, the other (hopefully) will @@ -428,7 +441,8 @@ function|script|fightclub_enter_killer|, // ** called 3 seconds after a player e return; } -function|script|fightclub_exit|, // ** called every time a player exits the ring +// ** called every time a player exits the ring +function|script|fightclub_exit|, { set @Duel_Fighter, 0; if(getmap() == "009-7") warp "009-7.gat", 31, 40; // do not warp if player left the room diff --git a/world/map/npc/009-7/mapflags.txt b/world/map/npc/009-7/mapflags.txt index e293289e..d89aaf4f 100644 --- a/world/map/npc/009-7/mapflags.txt +++ b/world/map/npc/009-7/mapflags.txt @@ -1,4 +1,4 @@ -009-7.gat|mapflag|noteleport|1 -009-7.gat|mapflag|monster_noteleport|1 +009-7.gat|mapflag|noteleport +009-7.gat|mapflag|monster_noteleport 009-7.gat|mapflag|nosave|009-7,31,40 009-7.gat|mapflag|resave|009-7,31,40 diff --git a/world/map/npc/013-3/_warps.txt b/world/map/npc/013-3/_warps.txt index a02ed07a..874c636e 100644 --- a/world/map/npc/013-3/_warps.txt +++ b/world/map/npc/013-3/_warps.txt @@ -20,7 +20,7 @@ 013-3.gat,75,51|warp|To Woodland Hills Cave|-1,-1,013-3.gat,109,65 013-3.gat,109,64|warp|To Woodland Hills Cave|-1,-1,013-3.gat,75,50 013-3.gat,67,51|warp|To Northern Mine|-1,-1,018-3.gat,90,51 -013-3.gat,71,20|warp|To Demon Mask Chest Cave|-1,-1,013-3.gat,28,39 +013-3.gat,71,20|warp|To Demon Mask Chest Cav|-1,-1,013-3.gat,28,39 013-3.gat,28,41|warp|To Fight Cave|-1,-1,013-3.gat,71,21 013-3.gat,71,42|warp|To Black Scorpion Cave|-1,-1,013-3.gat,109,21 013-3.gat,109,20|warp|To Woodland Hills Cave|-1,-1,013-3.gat,71,41 diff --git a/world/map/npc/017-1/_warps.txt b/world/map/npc/017-1/_warps.txt index 8c53fba4..cace9218 100644 --- a/world/map/npc/017-1/_warps.txt +++ b/world/map/npc/017-1/_warps.txt @@ -3,7 +3,7 @@ 017-1.gat,46,105|warp|To Woodland Hills|2,-1,013-1.gat,45,21 017-1.gat,43,32|warp|To Theater|-1,-1,017-2.gat,26,30 -017-1.gat,76,31|warp|To Woodland Hills Labyrinth|-1,-1,017-3.gat,51,48 -017-1.gat,98,20|warp|To Woodland Hills Labyrinth|-1,-1,017-3.gat,83,33 -017-1.gat,97,31|warp|To Woodland Hills Labyrinth|-1,-1,017-3.gat,72,67 +017-1.gat,76,31|warp|To Woodland Hills Labyr|-1,-1,017-3.gat,51,48 +017-1.gat,98,20|warp|To Woodland Hills Labyr|-1,-1,017-3.gat,83,33 +017-1.gat,97,31|warp|To Woodland Hills Labyr|-1,-1,017-3.gat,72,67 017-1.gat,135,56|warp|to Woods|-1,1,056-1.gat,24,28 diff --git a/world/map/npc/017-2/_warps.txt b/world/map/npc/017-2/_warps.txt index 5dc712b5..37973fe8 100644 --- a/world/map/npc/017-2/_warps.txt +++ b/world/map/npc/017-2/_warps.txt @@ -2,4 +2,4 @@ // Theater warps 017-2.gat,26,31|warp|To Outside|-1,-1,017-1.gat,43,33 -017-2.gat,26,21|warp|To Center Trapdoor Backstage|-1,-1,017-9.gat,26,27 +017-2.gat,26,21|warp|To Center Trapdoor Back|-1,-1,017-9.gat,26,27 diff --git a/world/map/npc/017-3/_warps.txt b/world/map/npc/017-3/_warps.txt index 6089d269..c984f124 100644 --- a/world/map/npc/017-3/_warps.txt +++ b/world/map/npc/017-3/_warps.txt @@ -3,7 +3,7 @@ 017-3.gat,51,46|warp|To Woodland Hills|-1,-1,017-1.gat,76,33 017-3.gat,83,31|warp|To Theater Hill|-1,-1,017-1.gat,98,22 -017-3.gat,72,69|warp|To Woodland Hills Labyrinth|-1,-1,017-1.gat,98,30 +017-3.gat,72,69|warp|To Woodland Hills Labyr|-1,-1,017-1.gat,98,30 017-3.gat,63,26|warp|To Deeper Labyrinth|-1,-1,017-4.gat,52,24 017-3.gat,29,48|warp|To Deeper Labyrinth|-1,-1,017-4.gat,30,48 017-3.gat,69,52|warp|To Deeper Labyrinth|-1,-1,017-4.gat,91,27 diff --git a/world/map/npc/018-1/_warps.txt b/world/map/npc/018-1/_warps.txt index 7996cc23..6698d206 100644 --- a/world/map/npc/018-1/_warps.txt +++ b/world/map/npc/018-1/_warps.txt @@ -14,7 +14,7 @@ 018-1.gat,158,34|warp|To Northern Mine|-1,-1,018-3.gat,64,103 018-1.gat,162,44|warp|To Northern Mine|-1,-1,018-3.gat,29,166 018-1.gat,177,20|warp|To Jack O Cave|-1,-1,013-3.gat,177,90 -018-1.gat,65,73|warp|To Woodland Mining Camp Indoor|-1,-1,018-2.gat,50,28 +018-1.gat,65,73|warp|To Woodland Mining Camp|-1,-1,018-2.gat,50,28 018-1.gat,79,98|warp|To Hurnscald Outskirts|2,-1,008-1.gat,78,18 -018-1.gat,64,70|warp|To Woodland Mining Camp Indoor|-1,-1,018-2.gat,41,21 +018-1.gat,64,70|warp|To Woodland Mining Camp|-1,-1,018-2.gat,41,21 018-1.gat,78,34|warp|To Northern Mine|-1,-1,018-3.gat,107,147 diff --git a/world/map/npc/018-3/_warps.txt b/world/map/npc/018-3/_warps.txt index 8ac68827..17484e81 100644 --- a/world/map/npc/018-3/_warps.txt +++ b/world/map/npc/018-3/_warps.txt @@ -13,7 +13,7 @@ 018-3.gat,97,69|warp|To Fight Cave|-1,-1,013-3.gat,178,43 018-3.gat,27,54|warp|To Woodland Hills Cave|-1,-1,013-3.gat,169,44 018-3.gat,134,63|warp|To Fight Cave|-1,-1,013-3.gat,152,29 -018-3.gat,177,56|warp|To Woodland Mining Camp Indoor|-1,-1,018-2.gat,114,20 +018-3.gat,177,56|warp|To Woodland Mining Camp|-1,-1,018-2.gat,114,20 018-3.gat,172,21|warp|To Woodland Hills Cave|-1,-1,013-3.gat,123,103 018-3.gat,177,21|warp|To Jack O Cave|-1,-1,013-3.gat,147,103 018-3.gat,27,91|warp|To Jack O Cave|-1,-1,013-3.gat,158,67 diff --git a/world/map/npc/024-1/_warps.txt b/world/map/npc/024-1/_warps.txt index 7b7d0545..f579b33f 100644 --- a/world/map/npc/024-1/_warps.txt +++ b/world/map/npc/024-1/_warps.txt @@ -2,6 +2,6 @@ // Tulimshar Canyon warps 024-1.gat,86,74|warp|To North Tulimshar|3,-1,021-1.gat,49,65 -024-1.gat,80,48|warp|To Tulimshar Magic School|0,-1,024-2.gat,26,26 -024-1.gat,86,48|warp|To Tulimshar Magic School|-1,-1,024-2.gat,42,27 +024-1.gat,80,48|warp|To Tulimshar Magic Scho|0,-1,024-2.gat,26,26 +024-1.gat,86,48|warp|To Tulimshar Magic Scho|-1,-1,024-2.gat,42,27 024-1.gat,80,30|warp|To Magic Passage|-1,-1,042-3.gat,56,45 diff --git a/world/map/npc/027-3/_warps.txt b/world/map/npc/027-3/_warps.txt index 9bf5d437..dfe581ae 100644 --- a/world/map/npc/027-3/_warps.txt +++ b/world/map/npc/027-3/_warps.txt @@ -2,4 +2,4 @@ // Crypt Basement warps 027-3.gat,26,67|warp|To Crypts Entrance|2,-1,027-2.gat,112,77 -027-3.gat,126,98|warp|To Crypts Sub-Basement One|1,-1,027-4.gat,125,18 +027-3.gat,126,98|warp|To Crypts Sub-Basement |1,-1,027-4.gat,125,18 diff --git a/world/map/npc/027-4/_warps.txt b/world/map/npc/027-4/_warps.txt index 1532a964..9ac0150b 100644 --- a/world/map/npc/027-4/_warps.txt +++ b/world/map/npc/027-4/_warps.txt @@ -2,4 +2,4 @@ // Crypt Sub-Basement One warps 027-4.gat,125,17|warp|To Crypts Basement|3,-1,027-3.gat,125,98 -027-4.gat,22,98|warp|To Crypts Sub-Basement Two|2,-1,027-5.gat,124,18 +027-4.gat,22,98|warp|To Crypts Sub-Basement |2,-1,027-5.gat,124,18 diff --git a/world/map/npc/027-5/_warps.txt b/world/map/npc/027-5/_warps.txt index 00e48703..312970ff 100644 --- a/world/map/npc/027-5/_warps.txt +++ b/world/map/npc/027-5/_warps.txt @@ -1,4 +1,4 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Crypt Sub-Basement Two warps -027-5.gat,125,17|warp|To Crypts Sub-Basement Two|3,-1,027-4.gat,21,97 +027-5.gat,125,17|warp|To Crypts Sub-Basement |3,-1,027-4.gat,21,97 diff --git a/world/map/npc/042-1/_warps.txt b/world/map/npc/042-1/_warps.txt index 87690e5d..bf32dc06 100644 --- a/world/map/npc/042-1/_warps.txt +++ b/world/map/npc/042-1/_warps.txt @@ -5,11 +5,11 @@ 042-1.gat,65,20|warp|To Lighthouse Beach|0,-1,023-1.gat,64,143 042-1.gat,91,72|warp|To Store House|-1,-1,042-2.gat,22,92 042-1.gat,104,72|warp|To Store House|-1,-1,042-2.gat,44,92 -042-1.gat,65,74|warp|To Tulimshar Suburbs House|-1,-1,042-2.gat,29,61 +042-1.gat,65,74|warp|To Tulimshar Suburbs Ho|-1,-1,042-2.gat,29,61 042-1.gat,62,42|warp|To Sorfina's Dinner|-1,-1,042-2.gat,112,85 042-1.gat,51,43|warp|To Sorfina's House|-1,-1,042-2.gat,44,30 -042-1.gat,117,101|warp|To Magic School Research|-1,-1,042-2.gat,103,62 -042-1.gat,112,95|warp|To Magic School Research|-1,-1,042-2.gat,94,54 -042-1.gat,120,95|warp|To Magic School Research|-1,-1,042-2.gat,112,54 +042-1.gat,117,101|warp|To Magic School Researc|-1,-1,042-2.gat,103,62 +042-1.gat,112,95|warp|To Magic School Researc|-1,-1,042-2.gat,94,54 +042-1.gat,120,95|warp|To Magic School Researc|-1,-1,042-2.gat,112,54 042-1.gat,117,85|warp|To Tulismhar Docks|-1,-1,022-1.gat,41,82 042-1.gat,44,115|warp|To Tulismhar Outskirts|1,-1,041-1.gat,58,6 diff --git a/world/map/npc/042-3/_warps.txt b/world/map/npc/042-3/_warps.txt index 30b4e137..dffcb6da 100644 --- a/world/map/npc/042-3/_warps.txt +++ b/world/map/npc/042-3/_warps.txt @@ -2,4 +2,4 @@ // Mages Passage warps 042-3.gat,57,46|warp|To Tulimshar Canyon|2,-1,024-1.gat,80,31 -042-3.gat,24,20|warp|To Magic Insitute of Tulimshar|-1,-1,042-2.gat,103,55 +042-3.gat,24,20|warp|To Magic Insitute of Tu|-1,-1,042-2.gat,103,55 diff --git a/world/map/npc/068-1/_import.txt b/world/map/npc/068-1/_import.txt index f4e777a7..da872493 100644 --- a/world/map/npc/068-1/_import.txt +++ b/world/map/npc/068-1/_import.txt @@ -6,4 +6,3 @@ npc: npc/068-1/_warps.txt npc: npc/068-1/mapflags.txt npc: npc/068-1/stat_reset.txt npc: npc/068-1/tombstones.txt -npc: npc/068-1/vendors.txt diff --git a/world/map/npc/068-1/vendors.txt b/world/map/npc/068-1/vendors.txt deleted file mode 100644 index e69de29b..00000000 diff --git a/world/map/npc/069-1/_warps.txt b/world/map/npc/069-1/_warps.txt index cb2061d4..0a166c2c 100644 --- a/world/map/npc/069-1/_warps.txt +++ b/world/map/npc/069-1/_warps.txt @@ -4,17 +4,17 @@ 069-1.gat,55,21|warp|To Tulmishar Noble|3,-1,068-1.gat,84,107 069-1.gat,19,44|warp|To Tulmishar|-1,0,021-1.gat,155,44 069-1.gat,19,97|warp|To Tulmishar|-1,0,021-1.gat,155,97 -069-1.gat,67,56|warp|To Tulmishar Castle Indoor|0,-1,069-2.gat,44,126 -069-1.gat,90,100|warp|To Tulmishar Castle Indoor|-1,-1,069-2.gat,24,30 -069-1.gat,98,79|warp|To Tulmishar Castle Indoor|-1,-1,069-2.gat,55,30 -069-1.gat,98,57|warp|To Tulmishar Castle Indoor|-1,-1,069-2.gat,86,30 -069-1.gat,90,40|warp|To Tulmishar Castle Indoor|-1,-1,069-2.gat,117,30 -069-1.gat,44,40|warp|To Tulmishar Castle Indoor|-1,-1,069-2.gat,24,61 -069-1.gat,35,57|warp|To Tulmishar Castle Indoor|-1,-1,069-2.gat,55,61 -069-1.gat,35,79|warp|To Tulmishar Castle Indoor|-1,-1,069-2.gat,86,61 -069-1.gat,43,99|warp|To Tulmishar Castle Indoor|-1,-1,069-2.gat,117,61 -069-1.gat,64,41|warp|To Tulmishar Castle Indoor Second Floor|-1,-1,069-2.gat,97,126 -069-1.gat,69,41|warp|To Tulmishar Castle Indoor Second Floor|-1,-1,069-2.gat,116,126 +069-1.gat,67,56|warp|To Tulmishar Castle Ind|0,-1,069-2.gat,44,126 +069-1.gat,90,100|warp|To Tulmishar Castle Ind|-1,-1,069-2.gat,24,30 +069-1.gat,98,79|warp|To Tulmishar Castle Ind|-1,-1,069-2.gat,55,30 +069-1.gat,98,57|warp|To Tulmishar Castle Ind|-1,-1,069-2.gat,86,30 +069-1.gat,90,40|warp|To Tulmishar Castle Ind|-1,-1,069-2.gat,117,30 +069-1.gat,44,40|warp|To Tulmishar Castle Ind|-1,-1,069-2.gat,24,61 +069-1.gat,35,57|warp|To Tulmishar Castle Ind|-1,-1,069-2.gat,55,61 +069-1.gat,35,79|warp|To Tulmishar Castle Ind|-1,-1,069-2.gat,86,61 +069-1.gat,43,99|warp|To Tulmishar Castle Ind|-1,-1,069-2.gat,117,61 +069-1.gat,64,41|warp|To Tulmishar Castle Ind|-1,-1,069-2.gat,97,126 +069-1.gat,69,41|warp|To Tulmishar Castle Ind|-1,-1,069-2.gat,116,126 069-1.gat,65,129|warp|To Prison|-1,-1,069-2.gat,4960,3104 069-1.gat,71,122|warp|To Prison|0,-1,069-2.gat,4960,3104 069-1.gat,99,122|warp|To Prison Mine|-1,-1,069-3.gat,4960,3104 diff --git a/world/map/npc/069-2/_warps.txt b/world/map/npc/069-2/_warps.txt index dfe0fe78..c556dd8e 100644 --- a/world/map/npc/069-2/_warps.txt +++ b/world/map/npc/069-2/_warps.txt @@ -1,17 +1,17 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Tulimshar Castle Indoors warps -069-2.gat,24,31|warp|to Tulmishar Castle Outdoor|-1,-1,069-1.gat,90,101 -069-2.gat,55,31|warp|to Tulmishar Castle Outdoor|-1,-1,069-1.gat,98,80 -069-2.gat,86,31|warp|to Tulmishar Castle Outdoor|-1,-1,069-1.gat,98,58 -069-2.gat,117,31|warp|to Tulmishar Castle Outdoor|-1,-1,069-1.gat,90,41 -069-2.gat,24,62|warp|to Tulmishar Castle Outdoor|-1,-1,069-1.gat,44,41 -069-2.gat,55,62|warp|to Tulmishar Castle Outdoor|-1,-1,069-1.gat,35,58 -069-2.gat,86,62|warp|to Tulmishar Castle Outdoor|-1,-1,069-1.gat,35,80 -069-2.gat,117,62|warp|to Tulmishar Castle Outdoor|-1,-1,069-1.gat,43,100 -069-2.gat,45,127|warp|to Tulmishar Castle Outdoor|2,-1,069-1.gat,66,57 -069-2.gat,45,83|warp|to Tulmishar Castle Throne|2,-1,069-2.gat,106,116 -069-2.gat,107,117|warp|to Tulmishar Castle Main Floor|2,-1,069-2.gat,44,84 -069-2.gat,107,117|warp|to Tulmishar Castle Main Floor|2,-1,069-2.gat,44,84 -069-2.gat,116,127|warp|to Tulmishar Castle Parapet|1,-1,069-1.gat,69,42 -069-2.gat,97,127|warp|to Tulmishar Castle Parapet|1,-1,069-1.gat,64,42 +069-2.gat,24,31|warp|to Tulmishar Castle Out|-1,-1,069-1.gat,90,101 +069-2.gat,55,31|warp|to Tulmishar Castle Out|-1,-1,069-1.gat,98,80 +069-2.gat,86,31|warp|to Tulmishar Castle Out|-1,-1,069-1.gat,98,58 +069-2.gat,117,31|warp|to Tulmishar Castle Out|-1,-1,069-1.gat,90,41 +069-2.gat,24,62|warp|to Tulmishar Castle Out|-1,-1,069-1.gat,44,41 +069-2.gat,55,62|warp|to Tulmishar Castle Out|-1,-1,069-1.gat,35,58 +069-2.gat,86,62|warp|to Tulmishar Castle Out|-1,-1,069-1.gat,35,80 +069-2.gat,117,62|warp|to Tulmishar Castle Out|-1,-1,069-1.gat,43,100 +069-2.gat,45,127|warp|to Tulmishar Castle Out|2,-1,069-1.gat,66,57 +069-2.gat,45,83|warp|to Tulmishar Castle Thr|2,-1,069-2.gat,106,116 +069-2.gat,107,117|warp|to Tulmishar Castle Mai|2,-1,069-2.gat,44,84 +069-2.gat,107,117|warp|to Tulmishar Castle Mai|2,-1,069-2.gat,44,84 +069-2.gat,116,127|warp|to Tulmishar Castle Par|1,-1,069-1.gat,69,42 +069-2.gat,97,127|warp|to Tulmishar Castle Par|1,-1,069-1.gat,64,42 diff --git a/world/map/npc/functions/global_event_handler.txt b/world/map/npc/functions/global_event_handler.txt index acb328f4..5e923c7e 100644 --- a/world/map/npc/functions/global_event_handler.txt +++ b/world/map/npc/functions/global_event_handler.txt @@ -1,4 +1,4 @@ -017-9.gat,0,0,0|script|#GlobalHandler|-1,-1,-1, +017-9.gat,0,0,0|script|#GlobalHandler|-1, { end; diff --git a/world/map/npc/items/unequipcb.txt b/world/map/npc/items/unequipcb.txt index 5db24bd4..83a74f20 100644 --- a/world/map/npc/items/unequipcb.txt +++ b/world/map/npc/items/unequipcb.txt @@ -1,8 +1,8 @@ // For now this has to use a real map name, but the effect happens -// on any map because of the -1s at the end. +// on any map because of the -1 at the end. // Note: the client (I think) has a display bug if this is called // during the intial connection's equip hook -017-9.gat,0,0,0|script|UnequipCB|-1,-1,-1 +017-9.gat,0,0,0|script|UnequipCB|-1, { end; -- cgit v1.2.3-60-g2f50