diff options
author | tux9th <mr.x@aon.at> | 2012-11-07 16:34:00 +0100 |
---|---|---|
committer | tux9th <mr.x@aon.at> | 2012-11-07 16:34:00 +0100 |
commit | dafe3ad044287c833a11532144b3147f935b83ba (patch) | |
tree | 1ecd0623a03fce828bab2e2b51d35c54f236e106 | |
parent | ed9b67e60ae0e3b4d067db8a0f5409cbc16a3895 (diff) | |
download | serverdata-dafe3ad044287c833a11532144b3147f935b83ba.tar.gz serverdata-dafe3ad044287c833a11532144b3147f935b83ba.tar.bz2 serverdata-dafe3ad044287c833a11532144b3147f935b83ba.tar.xz serverdata-dafe3ad044287c833a11532144b3147f935b83ba.zip |
Run 'make maps' for client-data changes regarding connection of 044-1.
Submodule pointer to lient-data updated.
m--------- | client-data | 0 | ||||
-rw-r--r-- | world/map/data/019-4.wlk | bin | 0 -> 15004 bytes | |||
-rw-r--r-- | world/map/data/resnametable.txt | 1 | ||||
-rw-r--r-- | world/map/npc/019-3/_warps.txt | 1 | ||||
-rw-r--r-- | world/map/npc/019-4/_import.txt | 5 | ||||
-rw-r--r-- | world/map/npc/019-4/_mobs.txt | 32 | ||||
-rw-r--r-- | world/map/npc/019-4/_warps.txt | 5 | ||||
-rw-r--r-- | world/map/npc/031-3/_warps.txt | 1 | ||||
-rw-r--r-- | world/map/npc/044-1/_warps.txt | 2 | ||||
-rw-r--r-- | world/map/npc/_import.txt | 1 |
10 files changed, 46 insertions, 2 deletions
diff --git a/client-data b/client-data -Subproject 505c6517fa9c084b32d74149b459e129bae3c6a +Subproject 5f2d5bd909aa746daf1e6ff4e37f761d0614cea diff --git a/world/map/data/019-4.wlk b/world/map/data/019-4.wlk Binary files differnew file mode 100644 index 00000000..ffc7afbb --- /dev/null +++ b/world/map/data/019-4.wlk diff --git a/world/map/data/resnametable.txt b/world/map/data/resnametable.txt index dbe9f311..5888e51e 100644 --- a/world/map/data/resnametable.txt +++ b/world/map/data/resnametable.txt @@ -49,6 +49,7 @@ 018-3.gat#018-3.wlk# 019-1.gat#019-1.wlk# 019-3.gat#019-3.wlk# +019-4.gat#019-4.wlk# 020-1.gat#020-1.wlk# 020-2.gat#020-2.wlk# 020-3.gat#020-3.wlk# diff --git a/world/map/npc/019-3/_warps.txt b/world/map/npc/019-3/_warps.txt index 7f3eea50..cc5b1d59 100644 --- a/world/map/npc/019-3/_warps.txt +++ b/world/map/npc/019-3/_warps.txt @@ -3,3 +3,4 @@ 019-3.gat,40,98|warp|To Snow Field|-1,-1,019-1.gat,37,74 019-3.gat,98,25|warp|To Snow Field|-1,-1,019-1.gat,96,39 +019-3.gat,57,45|warp|To Deeper Snow Cave|0,-1,019-4.gat,70,25 diff --git a/world/map/npc/019-4/_import.txt b/world/map/npc/019-4/_import.txt new file mode 100644 index 00000000..7566eb15 --- /dev/null +++ b/world/map/npc/019-4/_import.txt @@ -0,0 +1,5 @@ +// Map 019-4: Deeper Snow Cave +// This file is generated automatically. All manually changes will be removed when running the Converter. +map: 019-4.gat +npc: npc/019-4/_mobs.txt +npc: npc/019-4/_warps.txt diff --git a/world/map/npc/019-4/_mobs.txt b/world/map/npc/019-4/_mobs.txt new file mode 100644 index 00000000..fb606bd6 --- /dev/null +++ b/world/map/npc/019-4/_mobs.txt @@ -0,0 +1,32 @@ +// This file is generated automatically. All manually changes will be removed when running the Converter. +// Deeper Snow Cave mobs + +019-4.gat,0,0,0,0|monster|Spawn Mogguns|1061,12,45000,30000,Mob019-4::On1061 +019-4.gat,47,67,15,9|monster|Spawn White Slime|1093,5,45000,45000,Mob019-4::On1093 +019-4.gat,0,0,0,0|monster|Spawn Bat|1017,15,45000,25000,Mob019-4::On1017 +019-4.gat,0,0,0,0|monster|Spawn Blue Slimes|1091,7,45000,30000,Mob019-4::On1091 + + +019-4.gat,0,0,0|script|Mob019-4|-1,{ +On1017: + set @mobID, 1017; + callfunc "MobPoints"; + end; + +On1061: + set @mobID, 1061; + callfunc "MobPoints"; + end; + +On1091: + set @mobID, 1091; + callfunc "MobPoints"; + end; + +On1093: + set @mobID, 1093; + callfunc "MobPoints"; + end; + + end; +} diff --git a/world/map/npc/019-4/_warps.txt b/world/map/npc/019-4/_warps.txt new file mode 100644 index 00000000..6bd7eab7 --- /dev/null +++ b/world/map/npc/019-4/_warps.txt @@ -0,0 +1,5 @@ +// This file is generated automatically. All manually changes will be removed when running the Converter. +// Deeper Snow Cave warps + +019-4.gat,70,24|warp|To Snow Cave|-1,-1,019-3.gat,57,44 +019-4.gat,25,124|warp|To Snow Hills|0,-1,044-1.gat,154,93 diff --git a/world/map/npc/031-3/_warps.txt b/world/map/npc/031-3/_warps.txt index 10ca9c26..826f6a2b 100644 --- a/world/map/npc/031-3/_warps.txt +++ b/world/map/npc/031-3/_warps.txt @@ -50,4 +50,3 @@ 031-3.gat,234,25|warp|To Ice Labyrinth|-1,-1,031-3.gat,232,92 031-3.gat,200,50|warp|To Ice Labyrinth|-1,-1,031-3.gat,136,30 031-3.gat,136,29|warp|To Ice Labyrinth|-1,-1,031-3.gat,200,49 -031-3.gat,115,77|warp|To Snow Hills|-1,-1,044-1.gat,154,94 diff --git a/world/map/npc/044-1/_warps.txt b/world/map/npc/044-1/_warps.txt index 5bc84dba..0abcc222 100644 --- a/world/map/npc/044-1/_warps.txt +++ b/world/map/npc/044-1/_warps.txt @@ -5,7 +5,7 @@ 044-1.gat,108,156|warp|To Small Cave|-1,-1,044-3.gat,119,94 044-1.gat,102,111|warp|To Small Cave|-1,-1,044-3.gat,119,58 044-1.gat,102,107|warp|To Small Cave|-1,-1,044-3.gat,128,45 -044-1.gat,154,92|warp|To Ice Labyrinth|-1,-1,031-3.gat,115,76 +044-1.gat,154,92|warp|To Deeper Snow Cave|-1,-1,019-4.gat,25,123 044-1.gat,101,143|warp|To Snow Hills Cave|-1,-1,044-3.gat,126,180 044-1.gat,37,173|warp|To Snow Hills Cave|-1,-1,044-3.gat,33,175 044-1.gat,45,73|warp|To Snow Hills Cave|-1,-1,044-3.gat,46,76 diff --git a/world/map/npc/_import.txt b/world/map/npc/_import.txt index f0facf6d..f16c4739 100644 --- a/world/map/npc/_import.txt +++ b/world/map/npc/_import.txt @@ -50,6 +50,7 @@ import: npc/018-2/_import.txt import: npc/018-3/_import.txt import: npc/019-1/_import.txt import: npc/019-3/_import.txt +import: npc/019-4/_import.txt import: npc/020-1/_import.txt import: npc/020-2/_import.txt import: npc/020-3/_import.txt |