From c2246a792b1354b39b537c1494e54a62aed52470 Mon Sep 17 00:00:00 2001 From: Jessica Tölke Date: Thu, 2 Aug 2012 17:24:35 +0200 Subject: Run 'make maps' for new maps 009-5 and 009-6. --- client-data | 2 +- world/map/data/009-3.wlk | Bin 30204 -> 30204 bytes world/map/data/009-5.wlk | Bin 0 -> 10004 bytes world/map/data/009-6.wlk | Bin 0 -> 4904 bytes world/map/data/resnametable.txt | 2 ++ world/map/npc/009-5/_import.txt | 5 +++++ world/map/npc/009-5/_mobs.txt | 8 ++++++++ world/map/npc/009-5/_warps.txt | 4 ++++ world/map/npc/009-6/_import.txt | 5 +++++ world/map/npc/009-6/_mobs.txt | 8 ++++++++ world/map/npc/009-6/_warps.txt | 4 ++++ world/map/npc/_import.txt | 2 ++ 12 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 world/map/data/009-5.wlk create mode 100644 world/map/data/009-6.wlk create mode 100644 world/map/npc/009-5/_import.txt create mode 100644 world/map/npc/009-5/_mobs.txt create mode 100644 world/map/npc/009-5/_warps.txt create mode 100644 world/map/npc/009-6/_import.txt create mode 100644 world/map/npc/009-6/_mobs.txt create mode 100644 world/map/npc/009-6/_warps.txt diff --git a/client-data b/client-data index 2900bbe3..714cc850 160000 --- a/client-data +++ b/client-data @@ -1 +1 @@ -Subproject commit 2900bbe3004fdf86a379a19d9fe1723fe0f0eada +Subproject commit 714cc850683ae8620cf08ce5361e0d8893b72615 diff --git a/world/map/data/009-3.wlk b/world/map/data/009-3.wlk index c5299b5d..a5c2b091 100644 Binary files a/world/map/data/009-3.wlk and b/world/map/data/009-3.wlk differ diff --git a/world/map/data/009-5.wlk b/world/map/data/009-5.wlk new file mode 100644 index 00000000..ce3fc759 Binary files /dev/null and b/world/map/data/009-5.wlk differ diff --git a/world/map/data/009-6.wlk b/world/map/data/009-6.wlk new file mode 100644 index 00000000..9f62a916 Binary files /dev/null and b/world/map/data/009-6.wlk differ diff --git a/world/map/data/resnametable.txt b/world/map/data/resnametable.txt index 6139d30b..d6ea6918 100644 --- a/world/map/data/resnametable.txt +++ b/world/map/data/resnametable.txt @@ -20,6 +20,8 @@ 009-2.gat#009-2.wlk# 009-3.gat#009-3.wlk# 009-4.gat#009-4.wlk# +009-5.gat#009-5.wlk# +009-6.gat#009-6.wlk# 010-1.gat#010-1.wlk# 010-2.gat#010-2.wlk# 011-1.gat#011-1.wlk# diff --git a/world/map/npc/009-5/_import.txt b/world/map/npc/009-5/_import.txt new file mode 100644 index 00000000..5d0ebce1 --- /dev/null +++ b/world/map/npc/009-5/_import.txt @@ -0,0 +1,5 @@ +// Map 009-5: Last man standing +// This file is generated automatically. All manually changes will be removed when running the Converter. +map: 009-5.gat +npc: npc/009-5/_mobs.txt +npc: npc/009-5/_warps.txt diff --git a/world/map/npc/009-5/_mobs.txt b/world/map/npc/009-5/_mobs.txt new file mode 100644 index 00000000..cce523f3 --- /dev/null +++ b/world/map/npc/009-5/_mobs.txt @@ -0,0 +1,8 @@ +// This file is generated automatically. All manually changes will be removed when running the Converter. +// Last man standing mobs + + + +009-5.gat,0,0,0|script|Mob009-5|-1,{ + end; +} diff --git a/world/map/npc/009-5/_warps.txt b/world/map/npc/009-5/_warps.txt new file mode 100644 index 00000000..5b5634a1 --- /dev/null +++ b/world/map/npc/009-5/_warps.txt @@ -0,0 +1,4 @@ +// This file is generated automatically. All manually changes will be removed when running the Converter. +// Last man standing warps + +009-5.gat,53,74|warp|to Hurnscald|1,-1,009-3.gat,162,81 diff --git a/world/map/npc/009-6/_import.txt b/world/map/npc/009-6/_import.txt new file mode 100644 index 00000000..aa9d3218 --- /dev/null +++ b/world/map/npc/009-6/_import.txt @@ -0,0 +1,5 @@ +// Map 009-6: Cave +// This file is generated automatically. All manually changes will be removed when running the Converter. +map: 009-6.gat +npc: npc/009-6/_mobs.txt +npc: npc/009-6/_warps.txt diff --git a/world/map/npc/009-6/_mobs.txt b/world/map/npc/009-6/_mobs.txt new file mode 100644 index 00000000..d97492a3 --- /dev/null +++ b/world/map/npc/009-6/_mobs.txt @@ -0,0 +1,8 @@ +// This file is generated automatically. All manually changes will be removed when running the Converter. +// Cave mobs + + + +009-6.gat,0,0,0|script|Mob009-6|-1,{ + end; +} diff --git a/world/map/npc/009-6/_warps.txt b/world/map/npc/009-6/_warps.txt new file mode 100644 index 00000000..a1f47265 --- /dev/null +++ b/world/map/npc/009-6/_warps.txt @@ -0,0 +1,4 @@ +// This file is generated automatically. All manually changes will be removed when running the Converter. +// Cave warps + +009-6.gat,36,48|warp|To Hurnscaldcave|-1,-1,009-3.gat,162,82 diff --git a/world/map/npc/_import.txt b/world/map/npc/_import.txt index 1d86a652..eebe2a40 100644 --- a/world/map/npc/_import.txt +++ b/world/map/npc/_import.txt @@ -21,6 +21,8 @@ import: npc/009-1/_import.txt import: npc/009-2/_import.txt import: npc/009-3/_import.txt import: npc/009-4/_import.txt +import: npc/009-5/_import.txt +import: npc/009-6/_import.txt import: npc/010-1/_import.txt import: npc/010-2/_import.txt import: npc/011-1/_import.txt -- cgit v1.2.3-60-g2f50