diff options
| author | Jessica Tölke <jtoelke@mail.upb.de> | 2013-07-07 12:51:32 +0200 |
|---|---|---|
| committer | Jessica Tölke <jtoelke@mail.upb.de> | 2013-07-07 12:51:32 +0200 |
| commit | 0dd134db3f6f67bb5e4401f1ba7bf3e97f201505 (patch) | |
| tree | 4a200c1eeb684039390959107a6f413e065384fd /world/map/npc/002-1/_mobs.txt | |
| parent | a89882b69d9f12499404ca9d471d5a735bc63988 (diff) | |
| parent | 135f0fe12564decad0d3e2ff8af8f798b0a7f4cf (diff) | |
| download | serverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.tar.gz serverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.tar.bz2 serverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.tar.xz serverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.zip | |
Merge remote-tracking branch 'origin/master' into waric
Conflicts:
world/map/db/mob_db.txt
Diffstat (limited to 'world/map/npc/002-1/_mobs.txt')
| -rw-r--r-- | world/map/npc/002-1/_mobs.txt | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/world/map/npc/002-1/_mobs.txt b/world/map/npc/002-1/_mobs.txt index feea41c1..3579851b 100644 --- a/world/map/npc/002-1/_mobs.txt +++ b/world/map/npc/002-1/_mobs.txt @@ -2,22 +2,23 @@ // 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 -002-1.gat,0,0,0|script|Mob002-1|-1,{ +002-1.gat,0,0,0|script|Mob002-1|-1, +{ On1002: set @mobID, 1002; callfunc "MobPoints"; |