summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJessica Tölke <jtoelke@mail.upb.de>2013-04-01 17:41:28 +0200
committerJessica Tölke <jtoelke@mail.upb.de>2013-04-01 17:41:28 +0200
commitfd01609d0f8e4aec4f480cd90dce4fcbf23d3674 (patch)
treec4da88f95cebc9f4352ef4ecab8ca11bacf8fa92
parent7e4c1a9633f41077da1cb1374fb8a356a3857ae8 (diff)
downloadserverdata-fd01609d0f8e4aec4f480cd90dce4fcbf23d3674.tar.gz
serverdata-fd01609d0f8e4aec4f480cd90dce4fcbf23d3674.tar.bz2
serverdata-fd01609d0f8e4aec4f480cd90dce4fcbf23d3674.tar.xz
serverdata-fd01609d0f8e4aec4f480cd90dce4fcbf23d3674.zip
Running 'make maps' to update monster spawns on 017-1.
This also changed the _import.txt of 008-1 to order the entries alphabetically. Update submodule pointer.
m---------client-data0
-rw-r--r--world/map/npc/008-1/_import.txt2
-rw-r--r--world/map/npc/017-1/_mobs.txt3
3 files changed, 2 insertions, 3 deletions
diff --git a/client-data b/client-data
-Subproject e18fd05cf80aef3cf52cb8cb1cb19c3974a9f5c
+Subproject f3c37e7cc98157a57a70071dd1447170c413a82
diff --git a/world/map/npc/008-1/_import.txt b/world/map/npc/008-1/_import.txt
index 7361a1bf..19468e6b 100644
--- a/world/map/npc/008-1/_import.txt
+++ b/world/map/npc/008-1/_import.txt
@@ -4,8 +4,8 @@ map: 008-1.gat
npc: npc/008-1/_mobs.txt
npc: npc/008-1/_warps.txt
npc: npc/008-1/andra.txt
+npc: npc/008-1/annualeaster.txt
npc: npc/008-1/diryn.txt
npc: npc/008-1/dock.txt
npc: npc/008-1/george.txt
npc: npc/008-1/hinnak.txt
-npc: npc/008-1/annualeaster.txt
diff --git a/world/map/npc/017-1/_mobs.txt b/world/map/npc/017-1/_mobs.txt
index 36eeaaf4..15f7575d 100644
--- a/world/map/npc/017-1/_mobs.txt
+++ b/world/map/npc/017-1/_mobs.txt
@@ -2,8 +2,7 @@
// Woodland Hills mobs
017-1.gat,0,0,0,0|monster|Clover Patch|1037,2,0,1000,Mob017-1::On1037
-017-1.gat,99,30,2,1|monster|Clover Patch|1037,1,0,15000,Mob017-1::On1037
-017-1.gat,98,30,3,1|monster|Clover Patch|1037,1,0,15000,Mob017-1::On1037
+017-1.gat,99,30,2,1|monster|Clover Patch|1037,1,150000,50000,Mob017-1::On1037
017-1.gat,29,29,19,12|monster|Gamboge Herb|1031,1,0,25000,Mob017-1::On1031
017-1.gat,91,25,76,8|monster|Log Head|1025,3,5000,60000,Mob017-1::On1025
017-1.gat,31,48,19,12|monster|Log Head|1025,3,5000,60000,Mob017-1::On1025