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/043-1 | |
| 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/043-1')
| -rw-r--r-- | world/map/npc/043-1/_import.txt | 5 | ||||
| -rw-r--r-- | world/map/npc/043-1/_mobs.txt | 27 | ||||
| -rw-r--r-- | world/map/npc/043-1/_warps.txt | 6 |
3 files changed, 38 insertions, 0 deletions
diff --git a/world/map/npc/043-1/_import.txt b/world/map/npc/043-1/_import.txt new file mode 100644 index 00000000..0ed2ee41 --- /dev/null +++ b/world/map/npc/043-1/_import.txt @@ -0,0 +1,5 @@ +// Map 043-1: Beach +// This file is generated automatically. All manually changes will be removed when running the Converter. +map: 043-1.gat +npc: npc/043-1/_mobs.txt +npc: npc/043-1/_warps.txt diff --git a/world/map/npc/043-1/_mobs.txt b/world/map/npc/043-1/_mobs.txt new file mode 100644 index 00000000..7d8c46b9 --- /dev/null +++ b/world/map/npc/043-1/_mobs.txt @@ -0,0 +1,27 @@ +// This file is generated automatically. All manually changes will be removed when running the Converter. +// Beach mobs + +043-1.gat,0,0,0,0|monster|SeaSlime|1033,17,40000,30000,Mob043-1::On1033 +043-1.gat,0,0,0,0|monster|YellowSlime|1007,15,60000,60000,Mob043-1::On1007 +043-1.gat,0,0,0,0|monster|GreenSlime|1005,20,60000,60000,Mob043-1::On1005 + + +043-1.gat,0,0,0|script|Mob043-1|-1, +{ +On1005: + set @mobID, 1005; + callfunc "MobPoints"; + end; + +On1007: + set @mobID, 1007; + callfunc "MobPoints"; + end; + +On1033: + set @mobID, 1033; + callfunc "MobPoints"; + end; + + end; +} diff --git a/world/map/npc/043-1/_warps.txt b/world/map/npc/043-1/_warps.txt new file mode 100644 index 00000000..bbc9c47d --- /dev/null +++ b/world/map/npc/043-1/_warps.txt @@ -0,0 +1,6 @@ +// This file is generated automatically. All manually changes will be removed when running the Converter. +// Beach warps + +043-1.gat,44,19|warp|To Beach|1,-1,003-1.gat,114,116 +043-1.gat,85,54|warp|To Mining Camp|-1,-1,002-3.gat,22,85 +043-1.gat,52,38|warp|To Slime Hive|-1,-1,043-3.gat,31,34 |