diff options
| author | Jessica Tölke <jtoelke@mail.upb.de> | 2011-09-08 20:36:29 +0200 |
|---|---|---|
| committer | Jessica Tölke <jtoelke@mail.upb.de> | 2011-09-08 20:36:29 +0200 |
| commit | 5ea6c568c86d9c0f76983705258951e2db9974fa (patch) | |
| tree | 94a402b645140a7bb9fbfa467a73cfb30d880a56 /world/map/npc/020-3 | |
| parent | 2629fa14c6f7e6a5a7a71f5c784424cf80189f17 (diff) | |
| parent | cba4de9a5f7b9de412b9f458c80904cee9764a85 (diff) | |
| download | classic-serverdata-5ea6c568c86d9c0f76983705258951e2db9974fa.tar.gz classic-serverdata-5ea6c568c86d9c0f76983705258951e2db9974fa.tar.bz2 classic-serverdata-5ea6c568c86d9c0f76983705258951e2db9974fa.tar.xz classic-serverdata-5ea6c568c86d9c0f76983705258951e2db9974fa.zip | |
Merge remote-tracking branch 'testing/master'v2011.09.08
Diffstat (limited to 'world/map/npc/020-3')
| -rw-r--r-- | world/map/npc/020-3/_import.txt | 1 | ||||
| -rw-r--r-- | world/map/npc/020-3/_mobs.txt | 2 | ||||
| -rw-r--r-- | world/map/npc/020-3/monsters.txt | 18 |
3 files changed, 2 insertions, 19 deletions
diff --git a/world/map/npc/020-3/_import.txt b/world/map/npc/020-3/_import.txt index fe2ee10c..d82428bf 100644 --- a/world/map/npc/020-3/_import.txt +++ b/world/map/npc/020-3/_import.txt @@ -3,4 +3,3 @@ map: 020-3.gat npc: npc/020-3/_mobs.txt npc: npc/020-3/_warps.txt -npc: npc/020-3/monsters.txt diff --git a/world/map/npc/020-3/_mobs.txt b/world/map/npc/020-3/_mobs.txt index e886fbde..d28b5c88 100644 --- a/world/map/npc/020-3/_mobs.txt +++ b/world/map/npc/020-3/_mobs.txt @@ -3,6 +3,8 @@ 020-3.gat,40,36,29,4|monster|Bat|1017,1,100000,30000,Mob020-3::On1017 020-3.gat,40,49,34,7|monster|Violet|1018,1,100000,30000,Mob020-3::On1018 +020-3.gat,0,0,0,0|monster|Bat|1017,20,0,0,Mob020-3::On1017 +020-3.gat,0,0,0,0|monster|Pinkie|1018,10,0,0,Mob020-3::On1018 020-3.gat,0,0,0|script|Mob020-3|-1,{ diff --git a/world/map/npc/020-3/monsters.txt b/world/map/npc/020-3/monsters.txt deleted file mode 100644 index 062c6a9f..00000000 --- a/world/map/npc/020-3/monsters.txt +++ /dev/null @@ -1,18 +0,0 @@ -// Ice Cave level 1 - -020-3.gat,0,0,0,0 monster Bat 1017,20,0,0,Mob12::OnBat -020-3.gat,0,0,0,0 monster Pinkie 1018,10,0,0,Mob12::OnPinkie - -020-3.gat,0,0,0 script Mob12 -1,{ -OnBat: - set @mobID, 1017; - callfunc "MobPoints"; - break; - -OnPinkie: - set @mobID, 1018; - callfunc "MobPoints"; - break; - - end; -} |