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

Tile map fixes sprite travel

7 files changed, 76 insertions, 0 deletions

diff --git a/world/map/npc/036-2/_import.txt b/world/map/npc/036-2/_import.txt
new file mode 100644
index 00000000..b151f381
--- /dev/null
+++ b/world/map/npc/036-2/_import.txt
@@ -0,0 +1,9 @@
+// Map 036-2: Koga - Candor
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+map: 036-2.gat
+npc: npc/036-2/_mobs.txt
+npc: npc/036-2/_warps.txt
+npc: npc/036-2/casino.txt
+npc: npc/036-2/koga-candor.txt
+npc: npc/036-2/mapflags.txt
+npc: npc/036-2/shops.txt
diff --git a/world/map/npc/036-2/_mobs.txt b/world/map/npc/036-2/_mobs.txt
new file mode 100644
index 00000000..38c33e56
--- /dev/null
+++ b/world/map/npc/036-2/_mobs.txt
@@ -0,0 +1,9 @@
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+// Koga - Candor mobs
+
+
+
+036-2.gat,0,0,0|script|Mob036-2|-1,
+{
+    end;
+}
diff --git a/world/map/npc/036-2/_warps.txt b/world/map/npc/036-2/_warps.txt
new file mode 100644
index 00000000..c1a79f9e
--- /dev/null
+++ b/world/map/npc/036-2/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+// Koga - Candor warps
+
diff --git a/world/map/npc/036-2/casino.txt b/world/map/npc/036-2/casino.txt
new file mode 100644
index 00000000..e7120f5d
--- /dev/null
+++ b/world/map/npc/036-2/casino.txt
@@ -0,0 +1,12 @@
+// Casino
+036-2.gat,34,37,0|script|Slots#6|400,
+{
+    callfunc "SlotMachine";
+    close;
+}
+
+036-2.gat,36,37,0|script|Slots#7|400,
+{
+    callfunc "SlotMachine";
+    close;
+}
diff --git a/world/map/npc/036-2/koga-candor.txt b/world/map/npc/036-2/koga-candor.txt
new file mode 100644
index 00000000..3aa24417
--- /dev/null
+++ b/world/map/npc/036-2/koga-candor.txt
@@ -0,0 +1,27 @@
+// Dock
+
+036-2.gat,39,29,0|script|#KogaCandorExit|45,0,1,
+{
+    mes "Disembark the ferry for "+$@CandorDocks$[$@CandorCurrentDock]+"?";
+    menu
+        "Yes.", L_Leave,
+        "Nevermind", L_Close;
+
+L_Leave:
+    if ($@CandorCurrentDock == 0)
+        goto L_Candor;
+    if ($@CandorCurrentDock == 1)
+        goto L_Tulimshar;
+    goto L_Close;
+
+L_Tulimshar:
+    warp "022-1.gat", 60, 33;
+    goto L_Close;
+
+L_Candor:
+    warp "029-1.gat", 25, 37;
+    goto L_Close;
+
+L_Close:
+    close;
+}
diff --git a/world/map/npc/036-2/mapflags.txt b/world/map/npc/036-2/mapflags.txt
new file mode 100644
index 00000000..da3ae23a
--- /dev/null
+++ b/world/map/npc/036-2/mapflags.txt
@@ -0,0 +1,2 @@
+036-2.gat|mapflag|town
+036-2.gat|mapflag|resave|036-2,20,21
diff --git a/world/map/npc/036-2/shops.txt b/world/map/npc/036-2/shops.txt
new file mode 100644
index 00000000..b25d0a46
--- /dev/null
+++ b/world/map/npc/036-2/shops.txt
@@ -0,0 +1,14 @@
+//
+
+036-2.gat,23,38,0|shop|Chef Armand|211,Beer :-1,Steak :-2,CasinoCoins :-1
+036-2.gat,35,22,0|shop|Gunney|138,Arrow :-2,IronArrow :-2
+
+036-2.gat,23,35,0|script|Bunkmaster Daban|212,
+{
+    set @npcname$, "Bunkmaster Daban";
+    set @cost, 100;
+    callfunc "Inn";
+    set @npcname$, "";
+    set @cost, 0;
+    close;
+}