summaryrefslogtreecommitdiff
path: root/npc/031-3_Cave
diff options
context:
space:
mode:
authorJessica Tölke <jtoelke@mail.upb.de>2010-12-30 20:57:23 +0100
committerJessica Tölke <jtoelke@mail.upb.de>2010-12-30 20:57:23 +0100
commit83071e29cdcc5c292d6ea8e9782f9b94135f3dae (patch)
tree1ec1d99251279a7c8a7d93fd32aad39a4f20c931 /npc/031-3_Cave
parentb05725073e101b2e18224407d4d5624971471724 (diff)
parentb7dc8b21680e24675c61c868608f33ac596f2554 (diff)
downloadserverdata-83071e29cdcc5c292d6ea8e9782f9b94135f3dae.tar.gz
serverdata-83071e29cdcc5c292d6ea8e9782f9b94135f3dae.tar.bz2
serverdata-83071e29cdcc5c292d6ea8e9782f9b94135f3dae.tar.xz
serverdata-83071e29cdcc5c292d6ea8e9782f9b94135f3dae.zip
Merge branch 'master' of gitorious.org:~wombat/tmw-eathena-data/cache-serverdata
Conflicts: npc/031-3_Cave/_mobs.txt
Diffstat (limited to 'npc/031-3_Cave')
-rw-r--r--npc/031-3_Cave/_import.txt2
-rw-r--r--npc/031-3_Cave/_mobs.txt9
2 files changed, 7 insertions, 4 deletions
diff --git a/npc/031-3_Cave/_import.txt b/npc/031-3_Cave/_import.txt
index 1f56c50d..44ec9310 100644
--- a/npc/031-3_Cave/_import.txt
+++ b/npc/031-3_Cave/_import.txt
@@ -1,5 +1,5 @@
map: 031-3.gat
npc: npc/031-3_Cave/_mobs.txt
npc: npc/031-3_Cave/_warps.txt
-npc: npc/031-3_Cave/labyrinth.txt
npc: npc/031-3_Cave/cindyCave.txt
+npc: npc/031-3_Cave/labyrinth.txt
diff --git a/npc/031-3_Cave/_mobs.txt b/npc/031-3_Cave/_mobs.txt
index 670c2857..8060e451 100644
--- a/npc/031-3_Cave/_mobs.txt
+++ b/npc/031-3_Cave/_mobs.txt
@@ -8,8 +8,6 @@
031-3.gat,284,222,52,75 monster Moggun 1061,5,100000,30000,Mob031-3::On1061
031-3.gat,99,271,52,75 monster Moggun 1061,5,100000,30000,Mob031-3::On1061
031-3.gat,281,58,52,75 monster Moggun 1061,5,100000,30000,Mob031-3::On1061
-031-3.gat,48,48,83,61 monster Ice Goblin 1058,5,100000,30000,Mob031-3::On1058
-031-3.gat,122,50,83,61 monster Ice Goblin 1058,5,100000,30000,Mob031-3::On1058
031-3.gat,117,140,83,61 monster Ice Goblin 1058,5,100000,30000,Mob031-3::On1058
031-3.gat,212,142,83,61 monster Ice Goblin 1058,5,100000,30000,Mob031-3::On1058
031-3.gat,211,276,83,61 monster Ice Goblin 1058,5,100000,30000,Mob031-3::On1058
@@ -17,7 +15,6 @@
031-3.gat,231,213,83,61 monster Ice Goblin 1058,5,100000,30000,Mob031-3::On1058
031-3.gat,261,265,83,61 monster Ice Goblin 1058,5,100000,30000,Mob031-3::On1058
031-3.gat,280,56,66,59 monster Santa Slime 1015,5,100000,30000,Mob031-3::On1015
-031-3.gat,121,57,66,59 monster Santa Slime 1015,5,100000,30000,Mob031-3::On1015
031-3.gat,120,143,66,59 monster Santa Slime 1015,5,100000,30000,Mob031-3::On1015
031-3.gat,218,215,66,59 monster Santa Slime 1015,5,100000,30000,Mob031-3::On1015
031-3.gat,285,216,66,59 monster Santa Slime 1015,5,100000,30000,Mob031-3::On1015
@@ -29,6 +26,12 @@
031-3.gat,132,160,10,13 monster yeti 1072,3,100000,30000,Mob031-3::On1072
031-3.gat,228,37,10,13 monster yeti 1072,3,100000,30000,Mob031-3::On1072
031-3.gat,44,73,33,11 monster yeti 1072,1,100000,30000,Mob031-3::On1072
+031-3.gat,37,277,66,59 monster Bat 1017,10,100000,30000,Mob031-3::On1017
+031-3.gat,85,176,154,95 monster Bat 1017,10,100000,30000,Mob031-3::On1017
+031-3.gat,121,279,66,59 monster Bat 1017,10,100000,30000,Mob031-3::On1017
+031-3.gat,242,245,144,131 monster Bat 1017,10,100000,30000,Mob031-3::On1017
+031-3.gat,242,87,144,131 monster Bat 1017,10,100000,30000,Mob031-3::On1017
+031-3.gat,40,50,66,59 monster Bat 1017,10,100000,30000,Mob031-3::On1017
031-3.gat,0,0,0 script Mob031-3 -1,{