summaryrefslogtreecommitdiff
path: root/npc/001-1_Tulimshar
diff options
context:
space:
mode:
authorJared Adams <jaxad0127@gmail.com>2009-01-22 19:16:10 +0000
committerJared Adams <jaxad0127@gmail.com>2009-01-22 19:16:10 +0000
commitad401e02f0602dd9f0905ce290441b10e46ff75a (patch)
tree6040b4f38e071999b9ef650b8abc0d082c768e45 /npc/001-1_Tulimshar
parentb33e9b4508101d7097ed684c7c3316cb48a4f995 (diff)
parent96352cdf87009db08ca68a3c3deee577a981adb8 (diff)
downloadserverdata-ad401e02f0602dd9f0905ce290441b10e46ff75a.tar.gz
serverdata-ad401e02f0602dd9f0905ce290441b10e46ff75a.tar.bz2
serverdata-ad401e02f0602dd9f0905ce290441b10e46ff75a.tar.xz
serverdata-ad401e02f0602dd9f0905ce290441b10e46ff75a.zip
Merge commit 'origin/master' into magic
Diffstat (limited to 'npc/001-1_Tulimshar')
-rw-r--r--npc/001-1_Tulimshar/_mobs.txt20
-rw-r--r--npc/001-1_Tulimshar/merchant.txt2
2 files changed, 21 insertions, 1 deletions
diff --git a/npc/001-1_Tulimshar/_mobs.txt b/npc/001-1_Tulimshar/_mobs.txt
index a24fe7c5..ef4c17be 100644
--- a/npc/001-1_Tulimshar/_mobs.txt
+++ b/npc/001-1_Tulimshar/_mobs.txt
@@ -10,6 +10,16 @@
001-1.gat,115,25,8,4 monster Maggot 1002,3,0,0,Mob001-1::On1002
001-1.gat,124,53,15,13 monster Maggot 1002,10,0,0,Mob001-1::On1002
001-1.gat,120,64,15,13 monster Maggot 1002,11,0,0,Mob001-1::On1002
+001-1.gat,63,24,3,2 monster Maggot 1002,2,0,0,Mob001-1::On1002
+001-1.gat,72,64,3,2 monster Maggots 1002,2,0,0,Mob001-1::On1002
+001-1.gat,97,80,3,2 monster Maggot 1002,2,0,0,Mob001-1::On1002
+001-1.gat,134,61,3,2 monster Maggots 1002,2,0,0,Mob001-1::On1002
+001-1.gat,112,47,3,2 monster Maggot 1002,2,0,0,Mob001-1::On1002
+001-1.gat,129,37,3,2 monster Maggot 1002,2,0,0,Mob001-1::On1002
+001-1.gat,89,31,3,2 monster Maggot 1002,2,0,0,Mob001-1::On1002
+001-1.gat,19,78,3,2 monster Maggot 1002,2,0,0,Mob001-1::On1002
+001-1.gat,122,59,17,22 monster Giant Maggot 1006,1,0,0,Mob001-1::On1006
+001-1.gat,130,22,1,1 monster Fire Goblin 1011,1,61000,60000,Mob001-1::On1011
001-1.gat,0,0,0 script Mob001-1 -1,{
@@ -23,5 +33,15 @@ On1003:
callfunc "MobPoints";
break;
+On1006:
+ set @mobID, 1006;
+ callfunc "MobPoints";
+ break;
+
+On1011:
+ set @mobID, 1011;
+ callfunc "MobPoints";
+ break;
+
end;
}
diff --git a/npc/001-1_Tulimshar/merchant.txt b/npc/001-1_Tulimshar/merchant.txt
index cd7ecd02..a664e74a 100644
--- a/npc/001-1_Tulimshar/merchant.txt
+++ b/npc/001-1_Tulimshar/merchant.txt
@@ -1,3 +1,3 @@
//
-001-1.gat,39,52,0 shop Neko 101,501:50,502:60,1201:100,522:300,521:1000,656:250,1202:1000,523:8000,603:-1,724:3000
+001-1.gat,39,52,0 shop Neko 101,501:50,502:60,1201:100,522:300,521:1000,656:250,1202:1000,523:8000,603:-1,724:3000,735:-1