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/005-3 | |
| parent | 2629fa14c6f7e6a5a7a71f5c784424cf80189f17 (diff) | |
| parent | cba4de9a5f7b9de412b9f458c80904cee9764a85 (diff) | |
| download | serverdata-5ea6c568c86d9c0f76983705258951e2db9974fa.tar.gz serverdata-5ea6c568c86d9c0f76983705258951e2db9974fa.tar.bz2 serverdata-5ea6c568c86d9c0f76983705258951e2db9974fa.tar.xz serverdata-5ea6c568c86d9c0f76983705258951e2db9974fa.zip | |
Merge remote-tracking branch 'testing/master'v2011.09.08
Diffstat (limited to 'world/map/npc/005-3')
| -rw-r--r-- | world/map/npc/005-3/_import.txt | 3 | ||||
| -rw-r--r-- | world/map/npc/005-3/_mobs.txt | 8 | ||||
| -rw-r--r-- | world/map/npc/005-3/_warps.txt | 2 | ||||
| -rw-r--r-- | world/map/npc/005-3/monsters.txt | 14 |
4 files changed, 9 insertions, 18 deletions
diff --git a/world/map/npc/005-3/_import.txt b/world/map/npc/005-3/_import.txt index 23982113..d3f95576 100644 --- a/world/map/npc/005-3/_import.txt +++ b/world/map/npc/005-3/_import.txt @@ -1,6 +1,5 @@ -// Map 005-3: Snake pit +// Map 005-3: Snake Pit // This file is generated automatically. All manually changes will be removed when running the Converter. map: 005-3.gat npc: npc/005-3/_mobs.txt npc: npc/005-3/_warps.txt -npc: npc/005-3/monsters.txt diff --git a/world/map/npc/005-3/_mobs.txt b/world/map/npc/005-3/_mobs.txt index bc9ee2dc..29e96579 100644 --- a/world/map/npc/005-3/_mobs.txt +++ b/world/map/npc/005-3/_mobs.txt @@ -1,8 +1,14 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. -// Snake pit mobs +// Snake Pit mobs +005-3.gat,0,0,0,0|monster|Snake|1010,175,0,0,Mob005-3::On1010 005-3.gat,0,0,0|script|Mob005-3|-1,{ +On1010: + set @mobID, 1010; + callfunc "MobPoints"; + end; + end; } diff --git a/world/map/npc/005-3/_warps.txt b/world/map/npc/005-3/_warps.txt index e3aeee5d..3d211a49 100644 --- a/world/map/npc/005-3/_warps.txt +++ b/world/map/npc/005-3/_warps.txt @@ -1,5 +1,5 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. -// Snake pit warps +// Snake Pit warps 005-3.gat,52,33|warp|CaveExit|-1,-1,005-1.gat,89,24 005-3.gat,33,82|warp|CaveExit|-1,-1,005-1.gat,71,75 diff --git a/world/map/npc/005-3/monsters.txt b/world/map/npc/005-3/monsters.txt deleted file mode 100644 index 439b6300..00000000 --- a/world/map/npc/005-3/monsters.txt +++ /dev/null @@ -1,14 +0,0 @@ -// Map: 05-3 -// This is the Snake Pit, a cave in the Snake Desert. -// - -005-3.gat,0,0,0,0 monster Snake 1010,175,0,0,Mob22::OnSnake - -005-3.gat,0,0,0 script Mob22 -1,{ -OnSnake: - set @mobID, 1010; - callfunc "MobPoints"; - break; - - end; -} |