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

Tile map fixes sprite travel

7 files changed, 196 insertions, 4 deletions

diff --git a/world/map/npc/027-4/_import.txt b/world/map/npc/027-4/_import.txt
index 7c55eb4b..eea82393 100644
--- a/world/map/npc/027-4/_import.txt
+++ b/world/map/npc/027-4/_import.txt
@@ -1,5 +1,9 @@
-// Map 027-4: Inner Chamber
+// Map 027-4: Crypt Sub-Basement One
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 map: 027-4.gat
 npc: npc/027-4/_mobs.txt
 npc: npc/027-4/_warps.txt
+npc: npc/027-4/casket_traps.txt
+npc: npc/027-4/general_razha_door.txt
+npc: npc/027-4/mapflags.txt
+npc: npc/027-4/monsters.txt
diff --git a/world/map/npc/027-4/_mobs.txt b/world/map/npc/027-4/_mobs.txt
index ae73e143..8feb1baa 100644
--- a/world/map/npc/027-4/_mobs.txt
+++ b/world/map/npc/027-4/_mobs.txt
@@ -1,9 +1,24 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Inner Chamber mobs
+// Crypt Sub-Basement One mobs
 
+027-4.gat,39,84,38,22|monster|Skeleton|1043,2,60000,8000,Mob027-4::On1043
+027-4.gat,27,57,15,22|monster|LadySkeleton|1044,2,60000,8000,Mob027-4::On1044
+027-4.gat,108,77,39,14|monster|Skeleton|1043,2,60000,8000,Mob027-4::On1043
+027-4.gat,61,37,38,30|monster|LadySkeleton|1044,2,60000,8000,Mob027-4::On1044
+027-4.gat,101,36,38,30|monster|LadySkeleton|1044,2,60000,8000,Mob027-4::On1044
 
 
 027-4.gat,0,0,0|script|Mob027-4|-1,
 {
     end;
+
+On1043:
+    set @mobID, 1043;
+    callfunc "MobPoints";
+    end;
+
+On1044:
+    set @mobID, 1044;
+    callfunc "MobPoints";
+    end;
 }
diff --git a/world/map/npc/027-4/_warps.txt b/world/map/npc/027-4/_warps.txt
index 8615d220..1532a964 100644
--- a/world/map/npc/027-4/_warps.txt
+++ b/world/map/npc/027-4/_warps.txt
@@ -1,4 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Inner Chamber warps
+// Crypt Sub-Basement One warps
 
-027-4.gat,37,19|warp|To Crypt Level 1|1,-1,027-3.gat,127,43
+027-4.gat,125,17|warp|To Crypts Basement|3,-1,027-3.gat,125,98
+027-4.gat,22,98|warp|To Crypts Sub-Basement Two|2,-1,027-5.gat,124,18
diff --git a/world/map/npc/027-4/casket_traps.txt b/world/map/npc/027-4/casket_traps.txt
new file mode 100644
index 00000000..350fe347
--- /dev/null
+++ b/world/map/npc/027-4/casket_traps.txt
@@ -0,0 +1,80 @@
+027-4.gat,60,23,0|script|#casket9|35,1,1
+{
+    end;
+
+OnTouch:
+    percentheal -10, 0;
+    specialeffect 301;
+    specialeffect 302;
+    end;
+}
+027-4.gat,42,23,0|script|#casket10|35,1,1
+{
+    end;
+
+OnTouch:
+    percentheal -10, 0;
+    specialeffect 301;
+    specialeffect 302;
+    end;
+}
+027-4.gat,42,47,0|script|#casket11|35,1,1
+{
+    end;
+
+OnTouch:
+    percentheal -10, 0;
+    specialeffect 301;
+    specialeffect 302;
+    end;
+}
+027-4.gat,90,47,0|script|#casket12|35,1,1
+{
+    end;
+
+OnTouch:
+    percentheal -10, 0;
+    specialeffect 301;
+    specialeffect 302;
+    end;
+}
+027-4.gat,101,48,0|script|#casket13|35,1,1
+{
+    end;
+
+OnTouch:
+    percentheal -10, 0;
+    specialeffect 301;
+    specialeffect 302;
+    end;
+}
+027-4.gat,115,17,0|script|#casket14|35,1,1
+{
+    end;
+
+OnTouch:
+    percentheal -10, 0;
+    specialeffect 301;
+    specialeffect 302;
+    end;
+}
+027-4.gat,99,76,0|script|#casket15|35,1,1
+{
+    end;
+
+OnTouch:
+    percentheal -10, 0;
+    specialeffect 301;
+    specialeffect 302;
+    end;
+}
+027-4.gat,22,23,0|script|#casket16|35,1,1
+{
+    end;
+
+OnTouch:
+    percentheal -10, 0;
+    specialeffect 301;
+    specialeffect 302;
+    end;
+}
diff --git a/world/map/npc/027-4/general_razha_door.txt b/world/map/npc/027-4/general_razha_door.txt
new file mode 100644
index 00000000..f1729837
--- /dev/null
+++ b/world/map/npc/027-4/general_razha_door.txt
@@ -0,0 +1,19 @@
+// Mini-Boss
+// General Razha
+
+027-4.gat,73,76,0|script|#GeneralDoor2|35,1,0
+{
+    if ( (countitem("CryptKey") < 10) && ($@CRYPT_FIGHT2 != 0) )
+        goto L_NoKeys;
+
+    delitem "CryptKey", 10;
+    warp "027-7.gat",39,60;
+    goto L_Close;
+
+L_NoKeys:
+    message strcharinfo(0), "This door is locked.";
+    end;
+
+L_Close:
+    close;
+}
diff --git a/world/map/npc/027-4/mapflags.txt b/world/map/npc/027-4/mapflags.txt
new file mode 100644
index 00000000..51154f40
--- /dev/null
+++ b/world/map/npc/027-4/mapflags.txt
@@ -0,0 +1 @@
+027-4.gat|mapflag|resave|027-2,105,94
diff --git a/world/map/npc/027-4/monsters.txt b/world/map/npc/027-4/monsters.txt
new file mode 100644
index 00000000..adc89a88
--- /dev/null
+++ b/world/map/npc/027-4/monsters.txt
@@ -0,0 +1,72 @@
+// 027-4 Graveyard zombies and fallens
+// they need to be in an extra file because of the crying child quest
+
+027-4.gat,39,84,38,22|monster|Fallen|1045,3,60000,8000,Mob027-4::On1045
+027-4.gat,27,57,15,22|monster|Zombie|1036,2,60000,8000,Mob027-4::On1036
+027-4.gat,108,77,39,14|monster|Fallen|1045,3,60000,8000,Mob027-4::On1045
+027-4.gat,61,37,38,30|monster|Zombie|1036,2,60000,8000,Mob027-4::On1036
+027-4.gat,101,36,38,30|monster|Zombie|1036,2,60000,8000,Mob027-4::On1036
+
+027-4.gat,0,0,0|script|specialMob027-4|-1,
+{
+    end;
+
+On1036:
+    set @mobID, 1036;
+    callsub S_MOBCOUNT_ZOMBIES;
+    callfunc "MobPoints";
+    end;
+
+On1045:
+    set @mobID, 1045;
+    callsub S_MOBCOUNT_FALLENS;
+    callfunc "MobPoints";
+    end;
+
+S_MOBCOUNT_ZOMBIES:
+
+    set @Graveyard_Inn_MASK, NIBBLE_2_MASK;
+    set @Graveyard_Inn_SHIFT, NIBBLE_2_SHIFT;
+
+    set @state, ((QUEST_Graveyard_Inn & @Graveyard_Inn_MASK) >> @Graveyard_Inn_SHIFT);
+
+    if (@state != 1)
+        goto L_Return;
+    set @ring, @ring + 1;
+    if (@ring < 10)
+        goto L_Return;
+    if (rand(8) != 0)
+        goto L_Return;
+    message strcharinfo(0), "You found a ring hidden in the zombie's rotten rags. Maybe this is what Aldred was looking for...";
+    set @state, 2;
+    callsub S_Update_Mask;
+    return;
+
+S_MOBCOUNT_FALLENS:
+
+    set @Graveyard_Inn_MASK, NIBBLE_2_MASK;
+    set @Graveyard_Inn_SHIFT, NIBBLE_2_SHIFT;
+
+    set @state, ((QUEST_Graveyard_Inn & @Graveyard_Inn_MASK) >> @Graveyard_Inn_SHIFT);
+
+    if (@state != 1)
+        goto L_Return;
+    set @ring, @ring + 1;
+    if (@ring < 10)
+        goto L_Return;
+    if (rand(8) != 0)
+        goto L_Return;
+    message strcharinfo(0), "You found a ring inside the fallen's broken helmet. Maybe this is what Aldred was looking for...";
+    set @state, 2;
+    callsub S_Update_Mask;
+    return;
+
+L_Return:
+    return;
+
+S_Update_Mask:
+    set QUEST_Graveyard_Inn,
+        (QUEST_Graveyard_Inn & ~(@Graveyard_Inn_MASK))
+            | (@state << @Graveyard_Inn_SHIFT);
+    return;
+}