From 4984f5f96f2c2382dd9eb6ec5032c983040106bd Mon Sep 17 00:00:00 2001 From: Jared Adams Date: Fri, 2 Apr 2010 10:57:56 -0600 Subject: Add theater map and new cave by poison_ivy --- data/013-3.wlk | Bin 40004 -> 40004 bytes data/017-1.wlk | Bin 19100 -> 19100 bytes data/017-2.wlk | Bin 0 -> 2707 bytes data/017-9.wlk | Bin 0 -> 2707 bytes data/resnametable.txt | 2 ++ npc/013-3_Cave/_mobs.txt | 21 +++++++++++++++++++++ npc/013-3_Cave/_warps.txt | 9 +++++++++ npc/015-3_Cave/_mobs.txt | 2 +- npc/015-3_Cave/_warps.txt | 2 +- npc/017-1_Woodland_hills/_mobs.txt | 13 +++++++++++++ npc/017-1_Woodland_hills/_warps.txt | 4 ++++ npc/017-2_Theater/_import.txt | 3 +++ npc/017-2_Theater/_mobs.txt | 7 +++++++ npc/017-2_Theater/_warps.txt | 10 ++++++++++ npc/017-9_Backstage/_import.txt | 3 +++ npc/017-9_Backstage/_mobs.txt | 7 +++++++ npc/017-9_Backstage/_warps.txt | 8 ++++++++ npc/_import.txt | 4 ++-- 18 files changed, 91 insertions(+), 4 deletions(-) create mode 100644 data/017-2.wlk create mode 100644 data/017-9.wlk create mode 100644 npc/017-2_Theater/_import.txt create mode 100644 npc/017-2_Theater/_mobs.txt create mode 100644 npc/017-2_Theater/_warps.txt create mode 100644 npc/017-9_Backstage/_import.txt create mode 100644 npc/017-9_Backstage/_mobs.txt create mode 100644 npc/017-9_Backstage/_warps.txt diff --git a/data/013-3.wlk b/data/013-3.wlk index 6c56d0f5..d6047c07 100644 Binary files a/data/013-3.wlk and b/data/013-3.wlk differ diff --git a/data/017-1.wlk b/data/017-1.wlk index e1468b16..4416b31c 100644 Binary files a/data/017-1.wlk and b/data/017-1.wlk differ diff --git a/data/017-2.wlk b/data/017-2.wlk new file mode 100644 index 00000000..b0132be0 Binary files /dev/null and b/data/017-2.wlk differ diff --git a/data/017-9.wlk b/data/017-9.wlk new file mode 100644 index 00000000..478c9590 Binary files /dev/null and b/data/017-9.wlk differ diff --git a/data/resnametable.txt b/data/resnametable.txt index 2a144dc8..44083664 100644 --- a/data/resnametable.txt +++ b/data/resnametable.txt @@ -35,6 +35,8 @@ 015-3.gat#015-3.wlk# 016-1.gat#016-1.wlk# 017-1.gat#017-1.wlk# +017-2.gat#017-2.wlk# +017-9.gat#017-2.wlk# 018-1.gat#018-1.wlk# 018-2.gat#018-2.wlk# 018-3.gat#018-3.wlk# diff --git a/npc/013-3_Cave/_mobs.txt b/npc/013-3_Cave/_mobs.txt index da741c75..64ff1759 100644 --- a/npc/013-3_Cave/_mobs.txt +++ b/npc/013-3_Cave/_mobs.txt @@ -28,6 +28,12 @@ 013-3.gat,80,33,2,1 monster Fire Skull 1023,1,120000,60000,Mob013-3::On1023 013-3.gat,75,46,2,1 monster Poison Skull 1024,1,120000,60000,Mob013-3::On1024 013-3.gat,67,46,2,1 monster Fire Skull 1023,1,120000,60000,Mob013-3::On1023 +013-3.gat,148,144,7,24 monster Silkworm 2037,10,20000,5000,Mob013-3::On2037 +013-3.gat,117,157,6,14 monster CaveSnake 2023,3,30000,10000,Mob013-3::On2023 +013-3.gat,150,128,16,4 monster CaveSnake 2023,3,30000,10000,Mob013-3::On2023 +013-3.gat,162,138,5,5 monster CaveSnake 2023,3,30000,10000,Mob013-3::On2023 +013-3.gat,138,173,16,6 monster CaveSnake 2023,3,30000,10000,Mob013-3::On2023 +013-3.gat,145,150,62,53 monster Bat 2019,20,15000,5000,Mob013-3::On2019 013-3.gat,0,0,0 script Mob013-3 -1,{ @@ -76,5 +82,20 @@ On1024: callfunc "MobPoints"; break; +On2019: + set @mobID, 2019; + callfunc "MobPoints"; + break; + +On2023: + set @mobID, 2023; + callfunc "MobPoints"; + break; + +On2037: + set @mobID, 2037; + callfunc "MobPoints"; + break; + end; } diff --git a/npc/013-3_Cave/_warps.txt b/npc/013-3_Cave/_warps.txt index 45ca26d2..ff8430db 100644 --- a/npc/013-3_Cave/_warps.txt +++ b/npc/013-3_Cave/_warps.txt @@ -27,3 +27,12 @@ 013-3.gat,62,100 warp toCave -1,-1,018-3.gat,174,86 013-3.gat,68,97 warp toCave -1,-1,018-3.gat,102,70 013-3.gat,160,102 warp toCave -1,-1,009-3.gat,117,20 +013-3.gat,141,146 warp toLowerEntrance -1,-1,017-1.gat,76,32 +013-3.gat,173,127 warp toOutsideUpper -1,-1,017-1.gat,98,21 +013-3.gat,162,170 warp toOutsideClovers -1,-1,017-1.gat,97,30 +013-3.gat,153,126 warp toCave02 -1,-1,013-3.gat,119,147 +013-3.gat,119,149 warp toCave01 -1,-1,013-3.gat,153,127 +013-3.gat,159,152 warp toCave03 -1,-1,013-3.gat,148,161 +013-3.gat,148,160 warp toCave04 -1,-1,013-3.gat,159,151 +013-3.gat,122,170 warp toCave_05 0,-1,013-3.gat,171,175 +013-3.gat,172,177 warp toCave_06 1,-1,013-3.gat,121,168 diff --git a/npc/015-3_Cave/_mobs.txt b/npc/015-3_Cave/_mobs.txt index 331f1e25..c1f5cd38 100644 --- a/npc/015-3_Cave/_mobs.txt +++ b/npc/015-3_Cave/_mobs.txt @@ -1,4 +1,4 @@ -// 015-3 mobs +// 015-3 Cave mobs 015-3.gat,21,25,3,4 monster Bats 1017,2,100000,30000,Mob015-3::On1017 015-3.gat,29,31,2,2 monster Maggots 1002,2,100000,30000,Mob015-3::On1002 diff --git a/npc/015-3_Cave/_warps.txt b/npc/015-3_Cave/_warps.txt index 8b8a83d7..60562fd0 100644 --- a/npc/015-3_Cave/_warps.txt +++ b/npc/015-3_Cave/_warps.txt @@ -1,3 +1,3 @@ -// 015-3 warps +// 015-3 Cave warps 015-3.gat,31,43 warp to 015-1 -1,-1,015-1.gat,59,32 diff --git a/npc/017-1_Woodland_hills/_mobs.txt b/npc/017-1_Woodland_hills/_mobs.txt index e8b7f270..fe695470 100644 --- a/npc/017-1_Woodland_hills/_mobs.txt +++ b/npc/017-1_Woodland_hills/_mobs.txt @@ -1,6 +1,9 @@ // 017-1 Woodland hills mobs 017-1.gat,0,0,0,0 monster Clover 1037,2,0,1000,Mob017-1::On1037 +017-1.gat,28,27,19,11 monster GambogeHerb 2033,1,0,25000,Mob017-1::On2033 +017-1.gat,90,23,76,8 monster Loghead 2027,3,5000,60000,Mob017-1::On2027 +017-1.gat,31,47,18,11 monster Loghead 2027,3,5000,60000,Mob017-1::On2027 017-1.gat,0,0,0 script Mob017-1 -1,{ @@ -9,5 +12,15 @@ On1037: callfunc "MobPoints"; break; +On2027: + set @mobID, 2027; + callfunc "MobPoints"; + break; + +On2033: + set @mobID, 2033; + callfunc "MobPoints"; + break; + end; } diff --git a/npc/017-1_Woodland_hills/_warps.txt b/npc/017-1_Woodland_hills/_warps.txt index 26917709..e1b48f73 100644 --- a/npc/017-1_Woodland_hills/_warps.txt +++ b/npc/017-1_Woodland_hills/_warps.txt @@ -1,3 +1,7 @@ // 017-1 Woodland hills warps 017-1.gat,46,105 warp toWoodland 2,-1,013-1.gat,45,22 +017-1.gat,43,32 warp toTheatre -1,-1,017-2.gat,26,28 +017-1.gat,76,31 warp toCave -1,-1,013-3.gat,141,147 +017-1.gat,98,20 warp toCave -1,-1,013-3.gat,173,129 +017-1.gat,97,31 warp toCave -1,-1,013-3.gat,162,168 diff --git a/npc/017-2_Theater/_import.txt b/npc/017-2_Theater/_import.txt new file mode 100644 index 00000000..bfbe9f51 --- /dev/null +++ b/npc/017-2_Theater/_import.txt @@ -0,0 +1,3 @@ +map: 017-2.gat +npc: npc/017-2_Theater/_mobs.txt +npc: npc/017-2_Theater/_warps.txt diff --git a/npc/017-2_Theater/_mobs.txt b/npc/017-2_Theater/_mobs.txt new file mode 100644 index 00000000..ee716dda --- /dev/null +++ b/npc/017-2_Theater/_mobs.txt @@ -0,0 +1,7 @@ +// 017-2 Theater mobs + + + +017-2.gat,0,0,0 script Mob017-2 -1,{ + end; +} diff --git a/npc/017-2_Theater/_warps.txt b/npc/017-2_Theater/_warps.txt new file mode 100644 index 00000000..af28c67f --- /dev/null +++ b/npc/017-2_Theater/_warps.txt @@ -0,0 +1,10 @@ +// 017-2 Theater warps + +017-2.gat,30,20 warp toBackStage02 -1,-1,017-9.gat,30,23 +017-2.gat,26,30 warp toWoodlandHills -1,-1,017-1.gat,43,33 +017-2.gat,22,20 warp toBackStage01 -1,-1,017-9.gat,22,23 +017-2.gat,21,-3 warp toStage01 -2,-2,013-2.gat,24,58 +017-2.gat,26,-3 warp toStage01 -2,-2,013-2.gat,26,54 +017-2.gat,22,-13 warp toStage02 -2,-2,013-2.gat,22,54 +017-2.gat,30,-13 warp toStage01 -2,-2,013-2.gat,30,54 +017-2.gat,31,-3 warp toStage01 -2,-2,013-2.gat,28,58 diff --git a/npc/017-9_Backstage/_import.txt b/npc/017-9_Backstage/_import.txt new file mode 100644 index 00000000..50c87718 --- /dev/null +++ b/npc/017-9_Backstage/_import.txt @@ -0,0 +1,3 @@ +map: 017-9.gat +npc: npc/017-9_Backstage/_mobs.txt +npc: npc/017-9_Backstage/_warps.txt diff --git a/npc/017-9_Backstage/_mobs.txt b/npc/017-9_Backstage/_mobs.txt new file mode 100644 index 00000000..85e64f16 --- /dev/null +++ b/npc/017-9_Backstage/_mobs.txt @@ -0,0 +1,7 @@ +// 017-9 Backstage mobs + + + +017-9.gat,0,0,0 script Mob017-9 -1,{ + end; +} diff --git a/npc/017-9_Backstage/_warps.txt b/npc/017-9_Backstage/_warps.txt new file mode 100644 index 00000000..f2f8f0b5 --- /dev/null +++ b/npc/017-9_Backstage/_warps.txt @@ -0,0 +1,8 @@ +// 017-9 Backstage warps + +017-9.gat,22,21 warp toLeftDoor -1,-1,017-2.gat,22,21 +017-9.gat,26,22 warp toWoodlandHills -1,-1,017-1.gat,43,33 +017-9.gat,30,21 warp toRightDoor -1,-1,017-2.gat,30,21 +017-9.gat,21,28 warp toLeftTrapdoor -1,-1,017-2.gat,24,25 +017-9.gat,26,28 warp toCentreTrapdoor -1,-1,017-2.gat,26,21 +017-9.gat,31,28 warp toRightTrapdoor -1,-1,017-2.gat,28,25 diff --git a/npc/_import.txt b/npc/_import.txt index 7def4f05..0d4c90bf 100644 --- a/npc/_import.txt +++ b/npc/_import.txt @@ -34,6 +34,8 @@ import: npc/015-1_Woodland/_import.txt import: npc/015-3_Cave/_import.txt import: npc/016-1_Woodland/_import.txt import: npc/017-1_Woodland_hills/_import.txt +import: npc/017-2_Theater/_import.txt +import: npc/017-9_Backstage/_import.txt import: npc/018-1_Woodland_mining_camp/_import.txt import: npc/018-2_Woodland_mining_camp/_import.txt import: npc/018-3_Cave/_import.txt @@ -44,9 +46,7 @@ import: npc/020-3_Ice_cave/_import.txt import: npc/020-4_Ice_cave/_import.txt import: npc/021-1_Tulimshar/_import.txt import: npc/021-2_Tulimshar/_import.txt -import: npc/021-8_Meeting_Rooms/_import.txt import: npc/022-1_Tulimshar/_import.txt -import: npc/023-1_Beach_Cliffs/_import.txt import: npc/024-1_Tulimshar_Canyon/_import.txt import: npc/024-2_Tulimshar_Magic_School/_import.txt import: npc/025-1_Woodland_Swamp/_import.txt -- cgit v1.2.3-70-g09d2