summaryrefslogtreecommitdiff
path: root/world/map/npc/items
diff options
context:
space:
mode:
Diffstat (limited to 'world/map/npc/items')
-rw-r--r--world/map/npc/items/check_wand.txt2
-rw-r--r--world/map/npc/items/purification_potion.txt2
-rw-r--r--world/map/npc/items/unequipcb.txt2
-rw-r--r--world/map/npc/items/warpTowels.txt24
4 files changed, 15 insertions, 15 deletions
diff --git a/world/map/npc/items/check_wand.txt b/world/map/npc/items/check_wand.txt
index 8e0107b1..43190a85 100644
--- a/world/map/npc/items/check_wand.txt
+++ b/world/map/npc/items/check_wand.txt
@@ -2,7 +2,7 @@
// Author: Wushin
function|script|WandMana
{
- if(isin("009-7.gat", $@fightclub_x1, $@fightclub_y1, $@fightclub_x2, $@fightclub_y2) && ((@Duel_Fighter != 1) || ($@Duel_NoMagic == 1)))
+ if(isin("009-7", $@fightclub_x1, $@fightclub_y1, $@fightclub_x2, $@fightclub_y2) && ((@Duel_Fighter != 1) || ($@Duel_NoMagic == 1)))
goto L_Return;
callfunc "CheckWand";
set @WandCost, (@Wand * (BaseLevel / 15) + 2);
diff --git a/world/map/npc/items/purification_potion.txt b/world/map/npc/items/purification_potion.txt
index 9a7bdcc7..67e8321b 100644
--- a/world/map/npc/items/purification_potion.txt
+++ b/world/map/npc/items/purification_potion.txt
@@ -2,7 +2,7 @@
function|script|usePurificationPotion
{
- if (isat("011-1.gat", 88,67))
+ if (isat("011-1", 88,67))
goto L_Wyara_Pond;
goto L_NoUse;
diff --git a/world/map/npc/items/unequipcb.txt b/world/map/npc/items/unequipcb.txt
index c033c80f..1d269d3a 100644
--- a/world/map/npc/items/unequipcb.txt
+++ b/world/map/npc/items/unequipcb.txt
@@ -2,7 +2,7 @@
// 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
+017-9,0,0,0|script|UnequipCB|-1
{
end;
diff --git a/world/map/npc/items/warpTowels.txt b/world/map/npc/items/warpTowels.txt
index 585112ff..32a52aff 100644
--- a/world/map/npc/items/warpTowels.txt
+++ b/world/map/npc/items/warpTowels.txt
@@ -3,9 +3,9 @@ function|script|WarpTowel
{
if (TowelLastUsed > (gettimetick(2) - 1800))
goto L_DontPanic;
- if (isin("botcheck.gat",25,27,51,47))
+ if (isin("botcheck",25,27,51,47))
goto L_Prison;
- if (getmapflag(getmap(), MF_NOSAVE) || isin("009-7.gat",$@fightclub_x1,$@fightclub_y1,$@fightclub_x2,$@fightclub_y2))
+ if (getmapflag(getmap(), MF_NOSAVE) || isin("009-7",$@fightclub_x1,$@fightclub_y1,$@fightclub_x2,$@fightclub_y2))
goto L_Forbid;
callfunc "MultiWarpTowel";
@@ -36,70 +36,70 @@ function|script|WarpTowel
L_White:
// Koga
- set @NextLocationMap$, "035-2.gat";
+ set @NextLocationMap$, "035-2";
set @NextLocationX, 20;
set @NextLocationY, 21;
goto L_WarpPlayer;
L_Red:
// Barbarians
- set @NextLocationMap$, "033-1.gat";
+ set @NextLocationMap$, "033-1";
set @NextLocationX, 66;
set @NextLocationY, 33;
goto L_WarpPlayer;
L_Green:
// Candor
- set @NextLocationMap$, "029-1.gat";
+ set @NextLocationMap$, "029-1";
set @NextLocationX, 69;
set @NextLocationY, 69;
goto L_WarpPlayer;
L_Blue:
// Blue Sages
- set @NextLocationMap$, "048-2.gat";
+ set @NextLocationMap$, "048-2";
set @NextLocationX, 26;
set @NextLocationY, 47;
goto L_WarpPlayer;
L_Yellow:
// Tulimshar Mines
- set @NextLocationMap$, "002-2.gat";
+ set @NextLocationMap$, "002-2";
set @NextLocationX, 27;
set @NextLocationY, 28;
goto L_WarpPlayer;
L_Purple:
// Dimonds Inn
- set @NextLocationMap$, "010-1.gat";
+ set @NextLocationMap$, "010-1";
set @NextLocationX, 27;
set @NextLocationY, 97;
goto L_WarpPlayer;
L_Orange:
// Graveyard
- set @NextLocationMap$, "027-1.gat";
+ set @NextLocationMap$, "027-1";
set @NextLocationX, 70;
set @NextLocationY, 100;
goto L_WarpPlayer;
L_Pink:
// Terranite Cave
- set @NextLocationMap$, "012-3.gat";
+ set @NextLocationMap$, "012-3";
set @NextLocationX, 448;
set @NextLocationY, 66;
goto L_WarpPlayer;
L_Teal:
// Mana Seed
- set @NextLocationMap$, "012-3.gat";
+ set @NextLocationMap$, "012-3";
set @NextLocationX, 64;
set @NextLocationY, 130;
goto L_WarpPlayer;
L_Lime:
// Pachua
- set @NextLocationMap$, "006-1.gat";
+ set @NextLocationMap$, "006-1";
set @NextLocationX, 28;
set @NextLocationY, 97;
goto L_WarpPlayer;