summaryrefslogtreecommitdiff
path: root/world/map/npc/002-1
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-1
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-1')
-rw-r--r--world/map/npc/002-1/_import.txt3
-rw-r--r--world/map/npc/002-1/_mobs.txt8
-rw-r--r--world/map/npc/002-1/_warps.txt5
3 files changed, 8 insertions, 8 deletions
diff --git a/world/map/npc/002-1/_import.txt b/world/map/npc/002-1/_import.txt
index f1ebfb77..2738eb37 100644
--- a/world/map/npc/002-1/_import.txt
+++ b/world/map/npc/002-1/_import.txt
@@ -4,9 +4,6 @@ map: 002-1.gat
npc: npc/002-1/_mobs.txt
npc: npc/002-1/_warps.txt
npc: npc/002-1/lieutenant_dausen.txt
-npc: npc/002-1/merchant.txt
npc: npc/002-1/nickos.txt
npc: npc/002-1/nomads.txt
-npc: npc/002-1/rogue.txt
-npc: npc/002-1/sandstorm_mine_barrier.txt
npc: npc/002-1/stewen.txt
diff --git a/world/map/npc/002-1/_mobs.txt b/world/map/npc/002-1/_mobs.txt
index feea41c1..45e83293 100644
--- a/world/map/npc/002-1/_mobs.txt
+++ b/world/map/npc/002-1/_mobs.txt
@@ -2,18 +2,18 @@
// Sandstorm Desert mobs
002-1.gat,0,0,0,0|monster|Maggot|1002,20,1000,500,Mob002-1::On1002
-002-1.gat,96,98,19,13|monster|Maggot|1002,10,100000,30000,Mob002-1::On1002
+002-1.gat,95,97,16,9|monster|Maggot|1002,10,100000,30000,Mob002-1::On1002
002-1.gat,94,35,11,4|monster|Maggot|1002,3,100000,30000,Mob002-1::On1002
002-1.gat,68,59,7,6|monster|Maggot|1002,3,100000,30000,Mob002-1::On1002
002-1.gat,57,86,15,8|monster|Maggot|1002,3,100000,30000,Mob002-1::On1002
-002-1.gat,19,94,7,8|monster|Maggot|1002,3,100000,30000,Mob002-1::On1002
+002-1.gat,27,85,7,8|monster|Maggot|1002,3,100000,30000,Mob002-1::On1002
002-1.gat,44,35,3,2|monster|Maggot|1002,3,100000,30000,Mob002-1::On1002
002-1.gat,38,29,3,2|monster|Maggot|1002,3,100000,30000,Mob002-1::On1002
002-1.gat,62,91,24,6|monster|Maggot|1002,3,100000,30000,Mob002-1::On1002
-002-1.gat,61,74,41,43|monster|FireGoblin|1011,15,100000,30000,Mob002-1::On1011
+002-1.gat,60,73,38,40|monster|FireGoblin|1011,15,100000,30000,Mob002-1::On1011
002-1.gat,82,24,34,15|monster|Scorpion|1003,8,100000,30000,Mob002-1::On1003
002-1.gat,32,35,34,33|monster|Scorpion|1003,8,100000,30000,Mob002-1::On1003
-002-1.gat,27,82,22,43|monster|Scorpion|1003,8,100000,30000,Mob002-1::On1003
+002-1.gat,26,73,20,24|monster|Scorpion|1003,8,100000,30000,Mob002-1::On1003
002-1.gat,95,75,15,17|monster|BlackScorpion|1009,1,100000,1800000,Mob002-1::On1009
diff --git a/world/map/npc/002-1/_warps.txt b/world/map/npc/002-1/_warps.txt
index e238d32f..b86304b9 100644
--- a/world/map/npc/002-1/_warps.txt
+++ b/world/map/npc/002-1/_warps.txt
@@ -2,6 +2,9 @@
// Sandstorm Desert warps
002-1.gat,58,13|warp|To South Tulimshar|3,-1,001-1.gat,44,86
-002-1.gat,108,79|warp|To Snake Desert|-1,1,005-1.gat,20,40
002-1.gat,12,67|warp|To Beach|-1,3,003-1.gat,171,76
002-1.gat,28,13|warp|To Beach|1,-1,004-1.gat,84,114
+002-1.gat,79,99|warp|To Desert Mine Camp|-1,-1,002-3.gat,85,49
+002-1.gat,20,94|warp|To Desert Mine Camp|-1,-1,002-3.gat,51,33
+002-1.gat,104,92|warp|To Mystics House|-1,-1,002-2.gat,28,29
+002-1.gat,108,79|warp|To Snake Desert|-1,1,005-1.gat,20,40