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

Tile map fixes sprite travel

8 files changed, 342 insertions, 4 deletions

diff --git a/world/map/npc/027-3/_import.txt b/world/map/npc/027-3/_import.txt
index 7b7505f9..d8f11879 100644
--- a/world/map/npc/027-3/_import.txt
+++ b/world/map/npc/027-3/_import.txt
@@ -1,5 +1,10 @@
-// Map 027-3: Crypt
+// Map 027-3: Crypt Basement
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 map: 027-3.gat
 npc: npc/027-3/_mobs.txt
 npc: npc/027-3/_warps.txt
+npc: npc/027-3/casket_traps.txt
+npc: npc/027-3/general_krukan_door.txt
+npc: npc/027-3/locked_doors.txt
+npc: npc/027-3/mapflags.txt
+npc: npc/027-3/monsters.txt
diff --git a/world/map/npc/027-3/_mobs.txt b/world/map/npc/027-3/_mobs.txt
index 35f136e0..6256db5e 100644
--- a/world/map/npc/027-3/_mobs.txt
+++ b/world/map/npc/027-3/_mobs.txt
@@ -1,9 +1,42 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Crypt mobs
+// Crypt Basement mobs
 
+027-3.gat,34,63,29,69|monster|Skeleton|1043,6,60000,8000,Mob027-3::On1043
+027-3.gat,97,43,59,30|monster|Skeleton|1043,6,60000,8000,Mob027-3::On1043
+027-3.gat,34,63,29,69|monster|LadySkeleton|1044,4,60000,8000,Mob027-3::On1044
+027-3.gat,113,78,28,26|monster|LadySkeleton|1044,4,60000,8000,Mob027-3::On1044
+027-3.gat,113,78,27,27|monster|Skeleton|1043,4,60000,8000,Mob027-3::On1043
+027-3.gat,81,87,29,22|monster|VampireBat|1066,15,100000,30000,Mob027-3::On1066
+027-3.gat,74,45,106,33|monster|PoisonSkull|1024,1,60000,20000,Mob027-3::On1024
+027-3.gat,98,84,60,14|monster|FireSkull|1023,2,60000,20000,Mob027-3::On1023
 
 
 027-3.gat,0,0,0|script|Mob027-3|-1,
 {
     end;
+
+On1023:
+    set @mobID, 1023;
+    callfunc "MobPoints";
+    end;
+
+On1024:
+    set @mobID, 1024;
+    callfunc "MobPoints";
+    end;
+
+On1043:
+    set @mobID, 1043;
+    callfunc "MobPoints";
+    end;
+
+On1044:
+    set @mobID, 1044;
+    callfunc "MobPoints";
+    end;
+
+On1066:
+    set @mobID, 1066;
+    callfunc "MobPoints";
+    end;
 }
diff --git a/world/map/npc/027-3/_warps.txt b/world/map/npc/027-3/_warps.txt
index 51e3727d..9bf5d437 100644
--- a/world/map/npc/027-3/_warps.txt
+++ b/world/map/npc/027-3/_warps.txt
@@ -1,4 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Crypt warps
+// Crypt Basement warps
 
-027-3.gat,127,44|warp|To Crypt Level 2|1,-1,027-4.gat,37,20
+027-3.gat,26,67|warp|To Crypts Entrance|2,-1,027-2.gat,112,77
+027-3.gat,126,98|warp|To Crypts Sub-Basement One|1,-1,027-4.gat,125,18
diff --git a/world/map/npc/027-3/casket_traps.txt b/world/map/npc/027-3/casket_traps.txt
new file mode 100644
index 00000000..7b8a1e70
--- /dev/null
+++ b/world/map/npc/027-3/casket_traps.txt
@@ -0,0 +1,80 @@
+027-3.gat,32,96,0|script|#casket1|35,1,1
+{
+    end;
+
+OnTouch:
+    percentheal -10, 0;
+    specialeffect 301;
+    specialeffect 302;
+    end;
+}
+027-3.gat,38,86,0|script|#casket2|35,1,1
+{
+    end;
+
+OnTouch:
+    percentheal -10, 0;
+    specialeffect 301;
+    specialeffect 302;
+    end;
+}
+027-3.gat,46,76,0|script|#casket3|35,1,1
+{
+    end;
+
+OnTouch:
+    percentheal -10, 0;
+    specialeffect 301;
+    specialeffect 302;
+    end;
+}
+027-3.gat,38,57,0|script|#casket4|35,1,1
+{
+    end;
+
+OnTouch:
+    percentheal -10, 0;
+    specialeffect 301;
+    specialeffect 302;
+    end;
+}
+027-3.gat,22,44,0|script|#casket5|35,1,1
+{
+    end;
+
+OnTouch:
+    percentheal -10, 0;
+    specialeffect 301;
+    specialeffect 302;
+    end;
+}
+027-3.gat,48,43,0|script|#casket6|35,1,1
+{
+    end;
+
+OnTouch:
+    percentheal -10, 0;
+    specialeffect 301;
+    specialeffect 302;
+    end;
+}
+027-3.gat,86,30,0|script|#casket7|35,1,1
+{
+    end;
+
+OnTouch:
+    percentheal -10, 0;
+    specialeffect 301;
+    specialeffect 302;
+    end;
+}
+027-3.gat,108,45,0|script|#casket8|35,1,1
+{
+    end;
+
+OnTouch:
+    percentheal -10, 0;
+    specialeffect 301;
+    specialeffect 302;
+    end;
+}
diff --git a/world/map/npc/027-3/general_krukan_door.txt b/world/map/npc/027-3/general_krukan_door.txt
new file mode 100644
index 00000000..86a6342f
--- /dev/null
+++ b/world/map/npc/027-3/general_krukan_door.txt
@@ -0,0 +1,19 @@
+// Mini-Boss
+// General Krukun
+
+027-3.gat,82,88,0|script|#GeneralDoor1|35,1,0
+{
+    if ( (countitem("CryptKey") < 10) && ($@CRYPT_FIGHT1 != 0) )
+        goto L_NoKeys;
+
+    delitem "CryptKey", 10;
+    warp "027-6.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-3/locked_doors.txt b/world/map/npc/027-3/locked_doors.txt
new file mode 100644
index 00000000..b2ec8779
--- /dev/null
+++ b/world/map/npc/027-3/locked_doors.txt
@@ -0,0 +1,128 @@
+// Locked Doors
+
+027-3.gat,22,29,0|script|#CLockDoor1|35,0,0
+{
+    if (countitem("CryptKey") < 5)
+        goto L_NoKeys;
+    mes "Open the Locked Door?";
+    menu
+        "Yes.", L_Open,
+        "No.", L_Close;
+
+L_Open:
+    delitem "CryptKey", 5;
+    warp "027-3.gat",22,26;
+    goto L_Close;
+
+L_NoKeys:
+    message strcharinfo(0), "This door is locked.";
+    end;
+
+L_Close:
+    close;
+}
+
+027-3.gat,22,27,0|script|#CInsideDoor1|35,0,0
+{
+    mes "Open the Door?";
+    menu
+        "Yes.", L_Open,
+        "No.", L_Close;
+
+L_Open:
+    warp "027-3.gat",22,30;
+    message strcharinfo(0), "This door slams shut and locks itself behind you.";
+    goto L_Close;
+
+L_Close:
+    close;
+}
+
+027-3.gat,37,29,0|script|#CLockDoor2|35,0,0
+{
+    if (countitem("CryptKey") < 5)
+        goto L_NoKeys;
+    mes "Open the Locked Door?";
+    menu
+        "Yes.", L_Open,
+        "No.", L_Close;
+
+L_Open:
+    delitem "CryptKey", 5;
+    warp "027-3.gat",37,26;
+    goto L_Close;
+
+L_NoKeys:
+    message strcharinfo(0), "This door is locked.";
+    end;
+
+L_Close:
+    close;
+}
+
+027-3.gat,37,27,0|script|#CInsideDoor2|35,0,0
+{
+    mes "Open the Door?";
+    menu
+        "Yes.", L_Open,
+        "No.", L_Close;
+
+L_Open:
+    warp "027-3.gat",37,30;
+    message strcharinfo(0), "This door slams shut and locks itself behind you.";
+    goto L_Close;
+
+L_Close:
+    close;
+}
+
+027-3.gat,128,29,0|script|#CLockDoor3|35,0,0
+{
+    if (countitem("CryptKey") < 5)
+        goto L_NoKeys;
+    mes "Open the Locked Door?";
+    menu
+        "Yes.", L_Open,
+        "No.", L_Close;
+
+L_Open:
+    delitem "CryptKey", 5;
+    warp "027-3.gat",128,26;
+    goto L_Close;
+
+L_NoKeys:
+    message strcharinfo(0), "This door is locked.";
+    end;
+
+L_Close:
+    close;
+}
+
+027-3.gat,128,27,0|script|#CInsideDoor3|35,0,0
+{
+    mes "Open the Door?";
+    menu
+        "Yes.", L_Open,
+        "No.", L_Close;
+
+L_Open:
+    warp "027-3.gat",128,30;
+    message strcharinfo(0), "This door slams shut and locks itself behind you.";
+    goto L_Close;
+
+L_Close:
+    close;
+}
+
+027-3.gat,22,22,0|script|Crypt#1|35,0,0
+{
+    // Coords X: 117,104,110,118;
+    // Coords Y:  53, 87, 53,87;
+    end;
+}
+027-3.gat,35,22,0|script|Crypt#2|35,0,0
+{
+    // Coords X: 105,118,118,122;
+    // Coords Y:  58, 77, 72, 58
+    end;
+}
diff --git a/world/map/npc/027-3/mapflags.txt b/world/map/npc/027-3/mapflags.txt
new file mode 100644
index 00000000..f035c3e7
--- /dev/null
+++ b/world/map/npc/027-3/mapflags.txt
@@ -0,0 +1 @@
+027-3.gat|mapflag|resave|027-2,105,94
diff --git a/world/map/npc/027-3/monsters.txt b/world/map/npc/027-3/monsters.txt
new file mode 100644
index 00000000..7aaa7fd5
--- /dev/null
+++ b/world/map/npc/027-3/monsters.txt
@@ -0,0 +1,71 @@
+// 027-3 Graveyard zombies and fallens
+// they need to be in an extra file because of the crying child quest
+
+027-3.gat,21,76,51,100|monster|Zombie|1036,2,300000,120000,specialMob027-3::On1036
+027-3.gat,21,30,51,63|monster|Zombie|1036,2,200000,10000,specialMob027-3::On1036
+027-3.gat,67,29,129,64|monster|Zombie|1036,3,140000,30000,specialMob027-3::On1036
+027-3.gat,101,65,128,93|monster|Fallen|1045,3,120000,30000,specialMob027-3::On1045
+
+027-3.gat,0,0,0|script|specialMob027-3|-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;
+}