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

Tile map fixes sprite travel

6 files changed, 138 insertions, 0 deletions

diff --git a/world/map/npc/068-1/_import.txt b/world/map/npc/068-1/_import.txt
new file mode 100644
index 00000000..5f518fae
--- /dev/null
+++ b/world/map/npc/068-1/_import.txt
@@ -0,0 +1,8 @@
+// Map 068-1: Tulimshar Noble
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+map: 068-1.gat
+npc: npc/068-1/_mobs.txt
+npc: npc/068-1/_warps.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/_mobs.txt b/world/map/npc/068-1/_mobs.txt
new file mode 100644
index 00000000..147625f7
--- /dev/null
+++ b/world/map/npc/068-1/_mobs.txt
@@ -0,0 +1,24 @@
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+// Tulimshar Noble mobs
+
+068-1.gat,60,67,52,1|monster|SeaSlime|1033,3,100000,30000,Mob068-1::On1033
+068-1.gat,93,49,4,3|monster|Maggot|1002,5,100000,30000,Mob068-1::On1002
+068-1.gat,89,71,5,8|monster|Maggot|1002,5,100000,30000,Mob068-1::On1002
+068-1.gat,78,38,7,6|monster|Maggot|1002,5,100000,30000,Mob068-1::On1002
+068-1.gat,59,83,52,1|monster|SeaSlime|1033,3,100000,30000,Mob068-1::On1033
+
+
+068-1.gat,0,0,0|script|Mob068-1|-1,
+{
+    end;
+
+On1002:
+    set @mobID, 1002;
+    callfunc "MobPoints";
+    end;
+
+On1033:
+    set @mobID, 1033;
+    callfunc "MobPoints";
+    end;
+}
diff --git a/world/map/npc/068-1/_warps.txt b/world/map/npc/068-1/_warps.txt
new file mode 100644
index 00000000..7e11bce2
--- /dev/null
+++ b/world/map/npc/068-1/_warps.txt
@@ -0,0 +1,15 @@
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+// Tulimshar Noble warps
+
+068-1.gat,34,108|warp|To North Tulimshar|3,-1,021-1.gat,144,23
+068-1.gat,84,108|warp|To Tulimshar Castle|3,-1,069-1.gat,55,23
+068-1.gat,42,96|warp|To Silk Shop|-1,-1,068-2.gat,94,60
+068-1.gat,40,79|warp|To Coconut Farm|-1,-1,068-2.gat,76,29
+068-1.gat,52,48|warp|To Barracks|-1,-1,068-2.gat,36,29
+068-1.gat,47,38|warp|To Watch Tower|-1,-1,068-2.gat,62,60
+068-1.gat,50,96|warp|To Weavers Shop|-1,-1,068-2.gat,61,91
+068-1.gat,56,96|warp|To Weavers Shop|-1,-1,068-2.gat,89,91
+068-1.gat,38,90|warp|To Silk Shop|-1,-1,068-2.gat,84,51
+068-1.gat,30,96|warp|To Bank|-1,-1,068-2.gat,31,91
+068-1.gat,29,84|warp|To Jeweler|-1,-1,068-2.gat,31,60
+068-1.gat,48,29|warp|To Watch Tower|-1,-1,068-2.gat,59,52
diff --git a/world/map/npc/068-1/stat_reset.txt b/world/map/npc/068-1/stat_reset.txt
new file mode 100644
index 00000000..fe54f379
--- /dev/null
+++ b/world/map/npc/068-1/stat_reset.txt
@@ -0,0 +1,55 @@
+//
+
+068-1.gat,79,94,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/068-1/tombstones.txt b/world/map/npc/068-1/tombstones.txt
new file mode 100644
index 00000000..424e0317
--- /dev/null
+++ b/world/map/npc/068-1/tombstones.txt
@@ -0,0 +1,36 @@
+// Tombstones in Noble memorial
+
+068-1.gat,91,48,0|script|Tombstone#1|400,{
+
+    mes "~ wushin ~";
+    mes "Tonori swallowed him whole.";
+    close;
+}
+
+068-1.gat,92,48,0|script|Tombstone#2|400,{
+
+    mes "~ Nard ~";
+    mes "Crushed by a loom.";
+    close;
+}
+
+068-1.gat,93,48,0|script|Tombstone#3|400,{
+
+    mes "~ tux9th ~";
+    mes "Eaten by bugs.";
+    close;
+}
+
+068-1.gat,94,48,0|script|Tombstone#4|400,{
+
+    mes "~ o11c ~";
+    mes "He asked for it. So they gave it to him.";
+    close;
+}
+
+068-1.gat,95,48,0|script|Tombstone#5|400,{
+
+    mes "~ " + strcharinfo(0) + " ~";
+    mes "The tombstone is blank and the grave freshly dug.";
+    close;
+}
diff --git a/world/map/npc/068-1/vendors.txt b/world/map/npc/068-1/vendors.txt
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/world/map/npc/068-1/vendors.txt