From e404455027c4d2a0461da19143fb67864768ed90 Mon Sep 17 00:00:00 2001 From: Jessica Tölke Date: Sun, 25 Sep 2011 11:44:48 +0200 Subject: Adding new maps 044-1 and 044-3. Some changes on other maps related to the new maps. Warp to new maps disabled until release. Converter ran. Submodule pointer updated. --- client-data | 2 +- world/map/data/031-3.wlk | Bin 102404 -> 102404 bytes world/map/data/044-1.wlk | Bin 0 -> 45004 bytes world/map/data/044-3.wlk | Bin 0 -> 32004 bytes world/map/data/resnametable.txt | 2 ++ world/map/npc/044-1/_import.txt | 5 +++++ world/map/npc/044-1/_mobs.txt | 8 ++++++++ world/map/npc/044-1/_warps.txt | 13 +++++++++++++ world/map/npc/044-3/_import.txt | 5 +++++ world/map/npc/044-3/_mobs.txt | 8 ++++++++ world/map/npc/044-3/_warps.txt | 12 ++++++++++++ world/map/npc/_import.txt | 2 ++ 12 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 world/map/data/044-1.wlk create mode 100644 world/map/data/044-3.wlk create mode 100644 world/map/npc/044-1/_import.txt create mode 100644 world/map/npc/044-1/_mobs.txt create mode 100644 world/map/npc/044-1/_warps.txt create mode 100644 world/map/npc/044-3/_import.txt create mode 100644 world/map/npc/044-3/_mobs.txt create mode 100644 world/map/npc/044-3/_warps.txt diff --git a/client-data b/client-data index be28cc46..493ffd42 160000 --- a/client-data +++ b/client-data @@ -1 +1 @@ -Subproject commit be28cc4642abe5139bd3cf58a4d7e49dd2020af1 +Subproject commit 493ffd423dd8e88709da6cfa8e9a738a22063b41 diff --git a/world/map/data/031-3.wlk b/world/map/data/031-3.wlk index 47f4bf64..24df9251 100644 Binary files a/world/map/data/031-3.wlk and b/world/map/data/031-3.wlk differ diff --git a/world/map/data/044-1.wlk b/world/map/data/044-1.wlk new file mode 100644 index 00000000..6e38faac Binary files /dev/null and b/world/map/data/044-1.wlk differ diff --git a/world/map/data/044-3.wlk b/world/map/data/044-3.wlk new file mode 100644 index 00000000..0d063360 Binary files /dev/null and b/world/map/data/044-3.wlk differ diff --git a/world/map/data/resnametable.txt b/world/map/data/resnametable.txt index a86a624d..33dc179d 100644 --- a/world/map/data/resnametable.txt +++ b/world/map/data/resnametable.txt @@ -82,4 +82,6 @@ 041-1.gat#041-1.wlk# 042-1.gat#042-1.wlk# 042-2.gat#042-2.wlk# +044-1.gat#044-1.wlk# +044-3.gat#044-3.wlk# botcheck.gat#botcheck.wlk# diff --git a/world/map/npc/044-1/_import.txt b/world/map/npc/044-1/_import.txt new file mode 100644 index 00000000..85578d2d --- /dev/null +++ b/world/map/npc/044-1/_import.txt @@ -0,0 +1,5 @@ +// Map 044-1: Snow Hills +// This file is generated automatically. All manually changes will be removed when running the Converter. +map: 044-1.gat +npc: npc/044-1/_mobs.txt +npc: npc/044-1/_warps.txt diff --git a/world/map/npc/044-1/_mobs.txt b/world/map/npc/044-1/_mobs.txt new file mode 100644 index 00000000..af6fcffe --- /dev/null +++ b/world/map/npc/044-1/_mobs.txt @@ -0,0 +1,8 @@ +// This file is generated automatically. All manually changes will be removed when running the Converter. +// Snow Hills mobs + + + +044-1.gat,0,0,0|script|Mob044-1|-1,{ + end; +} diff --git a/world/map/npc/044-1/_warps.txt b/world/map/npc/044-1/_warps.txt new file mode 100644 index 00000000..5bc84dba --- /dev/null +++ b/world/map/npc/044-1/_warps.txt @@ -0,0 +1,13 @@ +// This file is generated automatically. All manually changes will be removed when running the Converter. +// Snow Hills warps + +044-1.gat,108,165|warp|To Small Cave|-1,-1,044-3.gat,110,102 +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,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 +044-1.gat,78,109|warp|To Snow Hills Cave|-1,-1,044-3.gat,35,41 +044-1.gat,83,123|warp|To Snow Hills Cave|-1,-1,044-3.gat,108,165 diff --git a/world/map/npc/044-3/_import.txt b/world/map/npc/044-3/_import.txt new file mode 100644 index 00000000..3242ba6c --- /dev/null +++ b/world/map/npc/044-3/_import.txt @@ -0,0 +1,5 @@ +// Map 044-3: Snow Hills Cave +// This file is generated automatically. All manually changes will be removed when running the Converter. +map: 044-3.gat +npc: npc/044-3/_mobs.txt +npc: npc/044-3/_warps.txt diff --git a/world/map/npc/044-3/_mobs.txt b/world/map/npc/044-3/_mobs.txt new file mode 100644 index 00000000..cc8b2b9f --- /dev/null +++ b/world/map/npc/044-3/_mobs.txt @@ -0,0 +1,8 @@ +// This file is generated automatically. All manually changes will be removed when running the Converter. +// Snow Hills Cave mobs + + + +044-3.gat,0,0,0|script|Mob044-3|-1,{ + end; +} diff --git a/world/map/npc/044-3/_warps.txt b/world/map/npc/044-3/_warps.txt new file mode 100644 index 00000000..763feb7d --- /dev/null +++ b/world/map/npc/044-3/_warps.txt @@ -0,0 +1,12 @@ +// This file is generated automatically. All manually changes will be removed when running the Converter. +// Snow Hills Cave warps + +044-3.gat,46,74|warp|To Snow Hills|-1,-1,044-1.gat,45,75 +044-3.gat,33,176|warp|To Snow Hills|-1,-1,044-1.gat,37,174 +044-3.gat,126,181|warp|To Snow Hills|-1,-1,044-1.gat,101,144 +044-3.gat,35,42|warp|To Snow Hills|-1,-1,044-1.gat,78,110 +044-3.gat,108,163|warp|To Snow Hills|-1,-1,044-1.gat,83,125 +044-3.gat,110,103|warp|To Snow Hills|-1,-1,044-1.gat,108,166 +044-3.gat,119,95|warp|To Snow Hills|-1,-1,044-1.gat,108,157 +044-3.gat,119,59|warp|To Snow Hills|-1,-1,044-1.gat,102,112 +044-3.gat,128,46|warp|To Snow Hills|-1,-1,044-1.gat,102,108 diff --git a/world/map/npc/_import.txt b/world/map/npc/_import.txt index 0ca266d1..ee2f07c8 100644 --- a/world/map/npc/_import.txt +++ b/world/map/npc/_import.txt @@ -81,4 +81,6 @@ import: npc/034-1/_import.txt import: npc/041-1/_import.txt import: npc/042-1/_import.txt import: npc/042-2/_import.txt +import: npc/044-1/_import.txt +import: npc/044-3/_import.txt import: npc/botcheck/_import.txt -- cgit v1.2.3-70-g09d2