Merge pull request #79 from wushin/Tile-Fixes-Map-Travelv2014.4.16

Tile map fixes sprite travel

4 files changed, 14 insertions, 56 deletions

diff --git a/world/map/npc/002-2/_import.txt b/world/map/npc/002-2/_import.txt
index 6108ea70..0cccabbf 100644
--- a/world/map/npc/002-2/_import.txt
+++ b/world/map/npc/002-2/_import.txt
@@ -3,4 +3,5 @@
 map: 002-2.gat
 npc: npc/002-2/_mobs.txt
 npc: npc/002-2/_warps.txt
-npc: npc/002-2/rogue.txt
+npc: npc/002-2/mapflags.txt
+npc: npc/002-2/traveler.txt
diff --git a/world/map/npc/002-2/mapflags.txt b/world/map/npc/002-2/mapflags.txt
new file mode 100644
index 00000000..c23a7f11
--- /dev/null
+++ b/world/map/npc/002-2/mapflags.txt
@@ -0,0 +1 @@
+002-2.gat|mapflag|resave|001-1,57,71
diff --git a/world/map/npc/002-2/rogue.txt b/world/map/npc/002-2/rogue.txt
deleted file mode 100644
index d7b8c5af..00000000
--- a/world/map/npc/002-2/rogue.txt
+++ /dev/null
@@ -1,55 +0,0 @@
-//
-
-002-2.gat,25,28,0|script|Malivox|103,
-{
-// if (ResetA_charstate == 1) goto L_Multiple;
-
-// set @cost, 10000000 / ($ResetA_uses + 1);
-
-    set @cost, BaseLevel * 100;
-
-    mes "[Rogue Mage]";
-    mes "\"I have come across a spell that will";
-    mes "reset your status points.";
-    mes "Normally this spell is expensive, but";
-    mes "due to an unusual constellation of the";
-    mes "stars I can cast it very cheaply!";
-    mes "For you it will cost only "+@cost+" gp.\"";
-    next;
-    menu
-        "Reset my stats",L_Next,
-        "Forget about it",L_Pass;
-
-L_Next:
-    if (Zeny<@cost) goto L_NoMoney;
-    goto L_Reset;
-
-// set $ResetA_uses, $ResetA_uses + 1;
-// set ResetA_charstate, 1;
-
-L_Reset:
-    set Zeny, Zeny-@cost;
-    resetstatus;
-
-    mes "[Rogue Mage]";
-    mes "\"There you are.";
-    mes "";
-    mes "Good as new!\"";
-    goto L_Close;
-
-L_Pass:
-    mes "[Rogue Mage]";
-    mes "\"Very well then, see you.\"";
-    goto L_Close;
-
-L_NoMoney:
-    mes "[Rogue Mage]";
-    mes "\"Oh dear, the price cannot be bargained.";
-    mes "";
-    mes "Perhaps you can borrow from a friend?\"";
-    goto L_Close;
-
-L_Close:
-    set @cost, 0;
-    close;
-}
diff --git a/world/map/npc/002-2/traveler.txt b/world/map/npc/002-2/traveler.txt
new file mode 100644
index 00000000..609d8cee
--- /dev/null
+++ b/world/map/npc/002-2/traveler.txt
@@ -0,0 +1,11 @@
+// This is a teleportation (warp) NPC.  Its purpose is to offer expensive, fast trips throughout the world.
+// Author: Wombat, wushin
+// cost depending on level and adapted to new scripting guidelines: Jenalya
+
+002-2.gat,25,28,0|script|Jena the Traveler|103,
+{
+    set @NpcName$, "Jena";
+    set @NpcTravelBit, $@tul_mine_bit;
+    callfunc "Traveler";
+    end;
+}