summaryrefslogtreecommitdiff
path: root/world/map/npc/002-4
diff options
context:
space:
mode:
authorJessica Tölke <jtoelke@mail.upb.de>2013-06-21 22:43:54 +0200
committerJessica Tölke <jtoelke@mail.upb.de>2013-06-21 22:43:54 +0200
commitc440eb273ff4dfeaccf62949629d8a4a606e72bf (patch)
tree15d909c07e5b146da57247531fabc22034fd13b6 /world/map/npc/002-4
parentb136ae7862fe6e36ba7e957c7ef91f6e5f1eacc1 (diff)
downloadserverdata-c440eb273ff4dfeaccf62949629d8a4a606e72bf.tar.gz
serverdata-c440eb273ff4dfeaccf62949629d8a4a606e72bf.tar.bz2
serverdata-c440eb273ff4dfeaccf62949629d8a4a606e72bf.tar.xz
serverdata-c440eb273ff4dfeaccf62949629d8a4a606e72bf.zip
Run 'make maps' for map changes and additions in and around Tulimshar.
Updated submodule pointer.
Diffstat (limited to 'world/map/npc/002-4')
-rw-r--r--world/map/npc/002-4/_import.txt9
-rw-r--r--world/map/npc/002-4/_mobs.txt49
-rw-r--r--world/map/npc/002-4/_warps.txt4
3 files changed, 26 insertions, 36 deletions
diff --git a/world/map/npc/002-4/_import.txt b/world/map/npc/002-4/_import.txt
index 4758cedf..09530371 100644
--- a/world/map/npc/002-4/_import.txt
+++ b/world/map/npc/002-4/_import.txt
@@ -1,7 +1,10 @@
-// Map 002-4: Deep Desert Mines
+// Map 002-4: Desert Mines
// This file is generated automatically. All manually changes will be removed when running the Converter.
map: 002-4.gat
npc: npc/002-4/_mobs.txt
npc: npc/002-4/_warps.txt
-npc: npc/002-4/chest.txt
-npc: npc/002-4/miners.txt
+npc: npc/002-4/mine_triggerone.txt
+npc: npc/002-4/mine_triggerthree.txt
+npc: npc/002-4/mine_triggertwo.txt
+npc: npc/002-4/naem.txt
+npc: npc/002-4/underground_palace_barrier.txt
diff --git a/world/map/npc/002-4/_mobs.txt b/world/map/npc/002-4/_mobs.txt
index 0f275e9f..a159ad23 100644
--- a/world/map/npc/002-4/_mobs.txt
+++ b/world/map/npc/002-4/_mobs.txt
@@ -1,31 +1,23 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
-// Deep Desert Mines mobs
-
-002-4.gat,37,89,12,7|monster|IceGoblin|1058,3,100000,30000,Mob002-4::On1058
-002-4.gat,33,76,3,11|monster|CaveMaggot|1056,3,100000,30000,Mob002-4::On1056
-002-4.gat,40,68,7,5|monster|AngryScorpion|1057,3,100000,30000,Mob002-4::On1057
-002-4.gat,40,38,18,5|monster|Archant|1060,3,100000,30000,Mob002-4::On1060
-002-4.gat,62,71,3,7|monster|IceGoblin|1058,3,100000,30000,Mob002-4::On1058
-002-4.gat,56,97,2,5|monster|Archant|1060,1,100000,30000,Mob002-4::On1060
-002-4.gat,68,100,12,2|monster|YellowSlime|1007,4,100000,30000,Mob002-4::On1007
-002-4.gat,92,80,1,5|monster|Archant|1060,1,100000,30000,Mob002-4::On1060
-002-4.gat,89,94,1,5|monster|Archant|1060,1,100000,30000,Mob002-4::On1060
-002-4.gat,74,78,1,5|monster|Archant|1060,2,100000,30000,Mob002-4::On1060
-002-4.gat,94,71,2,6|monster|Archant|1060,1,100000,30000,Mob002-4::On1060
-002-4.gat,91,64,8,2|monster|YellowSlime|1007,1,100000,30000,Mob002-4::On1007
-002-4.gat,74,35,1,5|monster|Archant|1060,1,100000,30000,Mob002-4::On1060
-002-4.gat,84,33,1,5|monster|Archant|1060,1,100000,30000,Mob002-4::On1060
-002-4.gat,84,46,1,5|monster|Archant|1060,1,100000,30000,Mob002-4::On1060
-002-4.gat,99,38,1,5|monster|Archant|1060,1,100000,30000,Mob002-4::On1060
-002-4.gat,93,39,8,2|monster|YellowSlime|1007,2,100000,30000,Mob002-4::On1007
+// Desert Mines mobs
+
+002-4.gat,39,37,15,11|monster|CaveMaggot|1056,5,100000,30000,Mob002-4::On1056
+002-4.gat,91,41,17,20|monster|AngryFireGoblin|1108,3,100000,30000,Mob002-4::On1108
+002-4.gat,71,35,25,17|monster|CaveMaggot|1056,4,100000,30000,Mob002-4::On1056
+002-4.gat,69,100,8,5|monster|AngryFireGoblin|1108,2,100000,30000,Mob002-4::On1108
+002-4.gat,68,57,26,24|monster|AngryScorpion|1057,5,100000,30000,Mob002-4::On1057
+002-4.gat,49,58,4,15|monster|AngryScorpion|1057,5,100000,30000,Mob002-4::On1057
+002-4.gat,38,76,15,22|monster|AngryScorpion|1057,4,100000,30000,Mob002-4::On1057
+002-4.gat,58,78,6,17|monster|CaveMaggot|1056,4,100000,30000,Mob002-4::On1056
+002-4.gat,89,68,11,32|monster|AngryScorpion|1057,4,100000,30000,Mob002-4::On1057
+002-4.gat,84,93,19,17|monster|CaveMaggot|1056,4,100000,30000,Mob002-4::On1056
+002-4.gat,72,77,21,14|monster|AngryFireGoblin|1108,3,100000,30000,Mob002-4::On1108
+002-4.gat,67,91,11,12|monster|AngryScorpion|1057,4,100000,30000,Mob002-4::On1057
+002-4.gat,58,95,6,13|monster|CaveMaggot|1056,4,100000,30000,Mob002-4::On1056
+002-4.gat,63,100,2,5|monster|AngryScorpion|1057,3,100000,30000,Mob002-4::On1057
002-4.gat,0,0,0|script|Mob002-4|-1,{
-On1007:
- set @mobID, 1007;
- callfunc "MobPoints";
- end;
-
On1056:
set @mobID, 1056;
callfunc "MobPoints";
@@ -36,13 +28,8 @@ On1057:
callfunc "MobPoints";
end;
-On1058:
- set @mobID, 1058;
- callfunc "MobPoints";
- end;
-
-On1060:
- set @mobID, 1060;
+On1108:
+ set @mobID, 1108;
callfunc "MobPoints";
end;
diff --git a/world/map/npc/002-4/_warps.txt b/world/map/npc/002-4/_warps.txt
index 4d4af370..072d2ba2 100644
--- a/world/map/npc/002-4/_warps.txt
+++ b/world/map/npc/002-4/_warps.txt
@@ -1,4 +1,4 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
-// Deep Desert Mines warps
+// Desert Mines warps
-002-4.gat,34,99|warp|To First Level|-1,-1,002-3.gat,68,99
+002-4.gat,37,29|warp|To Mining camp|-1,-1,002-3.gat,82,30