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

Tile map fixes sprite travel

7 files changed, 43 insertions, 112 deletions

diff --git a/world/map/npc/027-1/_import.txt b/world/map/npc/027-1/_import.txt
index 14fc594e..9c0eef23 100644
--- a/world/map/npc/027-1/_import.txt
+++ b/world/map/npc/027-1/_import.txt
@@ -3,6 +3,8 @@
 map: 027-1.gat
 npc: npc/027-1/_mobs.txt
 npc: npc/027-1/_warps.txt
+npc: npc/027-1/crypt.txt
 npc: npc/027-1/golbenez.txt
 npc: npc/027-1/graves.txt
-npc: npc/027-1/monsters.txt
+npc: npc/027-1/mapflags.txt
+npc: npc/027-1/traveler.txt
diff --git a/world/map/npc/027-1/_mobs.txt b/world/map/npc/027-1/_mobs.txt
index 28865313..9982b965 100644
--- a/world/map/npc/027-1/_mobs.txt
+++ b/world/map/npc/027-1/_mobs.txt
@@ -4,39 +4,28 @@
 027-1.gat,81,91,95,27|monster|Poltergeist|1047,4,900000,60000,Mob027-1::On1047
 027-1.gat,81,91,97,25|monster|Spectre|1042,4,900000,60000,Mob027-1::On1042
 027-1.gat,81,91,99,23|monster|Wisp|1040,4,900000,60000,Mob027-1::On1040
-027-1.gat,54,53,66,46|monster|FireSkull|1023,2,60000,20000,Mob027-1::On1023
-027-1.gat,54,53,66,46|monster|PoisonSkull|1024,1,60000,20000,Mob027-1::On1024
-027-1.gat,54,53,66,46|monster|Skeleton|1043,2,60000,8000,Mob027-1::On1043
-027-1.gat,54,53,66,46|monster|LadySkeleton|1044,2,60000,8000,Mob027-1::On1044
-027-1.gat,71,41,31,22|monster|Skeleton|1043,2,175000,20000,Mob027-1::On1043
-027-1.gat,71,41,31,22|monster|LadySkeleton|1044,2,175000,20000,Mob027-1::On1044
-027-1.gat,37,41,33,22|monster|FireSkull|1023,2,200000,10000,Mob027-1::On1023
-027-1.gat,37,41,33,22|monster|PoisonSkull|1024,2,200000,10000,Mob027-1::On1024
+027-1.gat,37,64,32,20|monster|Skeleton|1043,2,60000,8000,Mob027-1::On1043
+027-1.gat,37,64,32,20|monster|LadySkeleton|1044,2,60000,8000,Mob027-1::On1044
+027-1.gat,71,41,31,22|monster|Skeleton|1043,1,175000,20000,Mob027-1::On1043
+027-1.gat,71,41,31,22|monster|LadySkeleton|1044,1,175000,20000,Mob027-1::On1044
 027-1.gat,37,41,33,22|monster|Skeleton|1043,4,180000,20000,Mob027-1::On1043
 027-1.gat,37,41,33,22|monster|LadySkeleton|1044,4,180000,20000,Mob027-1::On1044
-027-1.gat,105,40,32,21|monster|FireSkull|1023,1,28000,25000,Mob027-1::On1023
-027-1.gat,105,40,32,21|monster|PoisonSkull|1024,1,30000,20000,Mob027-1::On1024
 027-1.gat,105,40,32,21|monster|Skeleton|1043,2,35000,20000,Mob027-1::On1043
 027-1.gat,105,40,32,21|monster|LadySkeleton|1044,3,33000,25000,Mob027-1::On1044
-027-1.gat,28,67,2,1|monster|JackO|1022,1,265000,200000,Mob027-1::On1022
+027-1.gat,70,64,31,20|monster|Skeleton|1043,1,60000,8000,Mob027-1::On1043
+027-1.gat,70,64,31,21|monster|LadySkeleton|1044,1,60000,8000,Mob027-1::On1044
+027-1.gat,104,64,31,20|monster|Skeleton|1043,2,60000,8000,Mob027-1::On1043
+027-1.gat,104,64,31,21|monster|LadySkeleton|1044,2,60000,8000,Mob027-1::On1044
+027-1.gat,70,40,100,20|monster|VampireBat|1066,15,100000,30000,Mob027-1::On1066
+027-1.gat,99,90,34,16|monster|GrassSnake|1034,3,100000,50000,Mob027-1::On1034
 
 
 027-1.gat,0,0,0|script|Mob027-1|-1,
 {
     end;
 
-On1022:
-    set @mobID, 1022;
-    callfunc "MobPoints";
-    end;
-
-On1023:
-    set @mobID, 1023;
-    callfunc "MobPoints";
-    end;
-
-On1024:
-    set @mobID, 1024;
+On1034:
+    set @mobID, 1034;
     callfunc "MobPoints";
     end;
 
@@ -64,4 +53,9 @@ On1047:
     set @mobID, 1047;
     callfunc "MobPoints";
     end;
+
+On1066:
+    set @mobID, 1066;
+    callfunc "MobPoints";
+    end;
 }
diff --git a/world/map/npc/027-1/crypt.txt b/world/map/npc/027-1/crypt.txt
new file mode 100644
index 00000000..37b1cecf
--- /dev/null
+++ b/world/map/npc/027-1/crypt.txt
@@ -0,0 +1,11 @@
+027-1.gat,28,67,0|script|#CryptEntrance|45,0,0
+{
+    if (BaseLevel < 60)
+        goto L_Weak;
+    warp "027-2.gat", 112, 110;
+    end;
+
+L_Weak:
+    message strcharinfo(0), "Come back when you're a bit more experienced.";
+    end;
+}
diff --git a/world/map/npc/027-1/golbenez.txt b/world/map/npc/027-1/golbenez.txt
index 35980b2f..b32b862c 100644
--- a/world/map/npc/027-1/golbenez.txt
+++ b/world/map/npc/027-1/golbenez.txt
@@ -36,21 +36,4 @@ L_Weak:
     next;
     mes "\"Come back when you're a bit more experienced.\"";
     close;
-
-// Golbenez resets the graveyard monsters when no players are present
-// He's such an evil guy!
-OnInit:
-    if (debug >= 2) end;
-    initnpctimer;
-    end;
-
-OnTimer10000:
-    if (getareausers("027-1.gat", 0, 0, 149, 119, 1) == 0)
-        killmonsterall "027-1.gat";
-
-    setnpctimer 0;
-    end;
 }
-
-
-
diff --git a/world/map/npc/027-1/mapflags.txt b/world/map/npc/027-1/mapflags.txt
new file mode 100644
index 00000000..695e576c
--- /dev/null
+++ b/world/map/npc/027-1/mapflags.txt
@@ -0,0 +1 @@
+027-1.gat|mapflag|resave|025-1,33,50
diff --git a/world/map/npc/027-1/monsters.txt b/world/map/npc/027-1/monsters.txt
deleted file mode 100644
index b4dedad4..00000000
--- a/world/map/npc/027-1/monsters.txt
+++ /dev/null
@@ -1,71 +0,0 @@
-// 027-1 Graveyard zombies and fallens
-// they need to be in an extra file because of the crying child quest
-
-027-1.gat,71,41,31,22|monster|Zombie|1036,2,300000,120000,specialMob027-1::On1036
-027-1.gat,37,41,33,22|monster|Zombie|1036,2,200000,10000,specialMob027-1::On1036
-027-1.gat,37,65,33,22|monster|Zombie|1036,3,140000,30000,specialMob027-1::On1036
-027-1.gat,37,65,33,22|monster|Fallen|1045,3,120000,30000,specialMob027-1::On1045
-
-027-1.gat,0,0,0|script|specialMob027-1|-1,
-{
-    end;
-
-On1036:
-    set @mobID, 1036;
-    callsub L_MOBCOUNT_ZOMBIES;
-    callfunc "MobPoints";
-    end;
-
-On1045:
-    set @mobID, 1045;
-    callsub L_MOBCOUNT_FALLENS;
-    callfunc "MobPoints";
-    end;
-
-L_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;
-
-L_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;
-}
diff --git a/world/map/npc/027-1/traveler.txt b/world/map/npc/027-1/traveler.txt
new file mode 100644
index 00000000..142b39dd
--- /dev/null
+++ b/world/map/npc/027-1/traveler.txt
@@ -0,0 +1,11 @@
+// This is a teleportation (warp) NPC.  Its purpose is to offer expensive, fast trips throughout the world.
+// Author: Wombat, wushin
+// cost depending on level and adapted to new scripting guidelines: Jenalya
+
+027-1.gat,83,84,0|script|Styx the Traveler|103,
+{
+    set @NpcName$, "Styx";
+    set @NpcTravelBit, $@graveyard_bit;
+    callfunc "Traveler";
+    end;
+}