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

Tile map fixes sprite travel

6 files changed, 15 insertions, 16 deletions

diff --git a/world/map/npc/009-1/_import.txt b/world/map/npc/009-1/_import.txt
index cfd187fb..1901a872 100644
--- a/world/map/npc/009-1/_import.txt
+++ b/world/map/npc/009-1/_import.txt
@@ -3,6 +3,7 @@
 map: 009-1.gat
 npc: npc/009-1/_mobs.txt
 npc: npc/009-1/_warps.txt
+npc: npc/009-1/dock.txt
 npc: npc/009-1/jack.txt
 npc: npc/009-1/mapflags.txt
 npc: npc/009-1/milly.txt
diff --git a/world/map/npc/009-1/_warps.txt b/world/map/npc/009-1/_warps.txt
index d800fda7..7808445d 100644
--- a/world/map/npc/009-1/_warps.txt
+++ b/world/map/npc/009-1/_warps.txt
@@ -1,8 +1,8 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 // Hurnscald warps
 
-009-1.gat,49,55|warp|Hurnscald South Exit|2,-1,008-1.gat,78,81
-009-1.gat,97,36|warp|Hurnscald East Exit|-1,0,008-1.gat,128,61
+009-1.gat,49,55|warp|To Hurnscald South Exit|2,-1,008-1.gat,78,81
+009-1.gat,97,36|warp|To Hurnscald East Exit|-1,0,008-1.gat,128,61
 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
@@ -10,5 +10,5 @@
 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
-009-1.gat,24,36|warp|Hurnscald West Exit|-1,1,008-1.gat,53,61
-009-1.gat,49,24|warp|Hurnscald North Exit|2,-1,008-1.gat,78,48
+009-1.gat,24,36|warp|To Hurnscald West Exit|-1,1,008-1.gat,53,61
+009-1.gat,49,24|warp|To Hurnscald North Exit|2,-1,008-1.gat,78,48
diff --git a/world/map/npc/009-1/dock.txt b/world/map/npc/009-1/dock.txt
new file mode 100644
index 00000000..a6fa2553
--- /dev/null
+++ b/world/map/npc/009-1/dock.txt
@@ -0,0 +1,8 @@
+// Ferry Sign
+
+009-1.gat,46,34,0|script|FerrySchedule#4|397,
+{
+    callfunc "FerryManifest";
+    end;
+}
+
diff --git a/world/map/npc/009-1/mapflags.txt b/world/map/npc/009-1/mapflags.txt
index 044229ea..f22e4be4 100644
--- a/world/map/npc/009-1/mapflags.txt
+++ b/world/map/npc/009-1/mapflags.txt
@@ -1 +1,2 @@
 009-1.gat|mapflag|town
+009-1.gat|mapflag|resave|009-2,149,43
diff --git a/world/map/npc/009-1/old_woman.txt b/world/map/npc/009-1/old_woman.txt
index 2d70cc6d..d8c063dc 100644
--- a/world/map/npc/009-1/old_woman.txt
+++ b/world/map/npc/009-1/old_woman.txt
@@ -86,15 +86,4 @@ L_Close:
 S_Update_Mask:
     set QUEST_Hurnscald, (QUEST_Hurnscald & ~(NIBBLE_3_MASK)) | (@inspector << NIBBLE_3_SHIFT);
     return;
-
-OnPCDieEvent:
-    if (countitem(E10_TOKEN_ID) < 1) end;
-    delitem E10_TOKEN_ID, 1;
-    getitem "DarkPetal", 1;
-    message strcharinfo(0), "As you fall, the dark rose crumbles...";
-    if ((Easter_2010_QuestState >> E10_STATE_ROSE_SHIFT) & E10_STATE_ROSE_MASK >= E10_STATE_ROSE_ROSE_USED) end;
-    message strcharinfo(0), "There is a strange feeling pulling at you. A place... unfamiliar, yet unavoidable.";
-    message strcharinfo(0), "But you do not move... the force is too distant, too weak, a shadow of the power that it might have once been.";
-    set Easter_2010_QuestState, (Easter_2010_QuestState & ~(E10_STATE_ROSE_MASK << E10_STATE_ROSE_SHIFT)) | (E10_STATE_ROSE_ROSE_USED << E10_STATE_ROSE_SHIFT);
-    end;
 }
diff --git a/world/map/npc/009-1/water_pump.txt b/world/map/npc/009-1/water_pump.txt
index 8d7d5c8d..9f15355f 100644
--- a/world/map/npc/009-1/water_pump.txt
+++ b/world/map/npc/009-1/water_pump.txt
@@ -1,6 +1,6 @@
 // Water pump. You can fill empty bottles here
 
-009-1.gat,76,33,0|script|Water Pump|203,
+009-1.gat,76,33,0|script|Water Pump|400,
 {
     callfunc "WaterBottle";
     end;