summaryrefslogtreecommitdiff
path: root/npc/000-1/_mobs.txt
diff options
context:
space:
mode:
Diffstat (limited to 'npc/000-1/_mobs.txt')
-rw-r--r--npc/000-1/_mobs.txt7
1 files changed, 7 insertions, 0 deletions
diff --git a/npc/000-1/_mobs.txt b/npc/000-1/_mobs.txt
index 78ee8f46..d857b684 100644
--- a/npc/000-1/_mobs.txt
+++ b/npc/000-1/_mobs.txt
@@ -1,5 +1,12 @@
// 000-1 mobs
+<<<<<<< HEAD
000-1.gat,0,0,0 script Mob000-1 -1,{
end;
}
+=======
+000-1.gat,0,0,0,0 monster Piou 1002,4,15000,10000
+000-1.gat,61,122,77,31 monster Tortuga 1004,4,35000,28000
+000-1.gat,28,46,13,24 monster Tortuga 1004,2,16000,12000
+000-1.gat,79,48,59,56 monster Tortuga 1004,5,16000,12000
+>>>>>>> Add mobs on 000-1 map.