From 677802b3b6094ea7e15ed475373765523308ceb9 Mon Sep 17 00:00:00 2001 From: tux9th Date: Sat, 20 Oct 2012 23:32:52 +0200 Subject: 'make maps' for client-data changes regarding the introduction of 056-2 and 057-1 Amended by Jenalya with entries in resnametable.txt and submodule pointer. --- client-data | 2 +- world/map/data/056-1.wlk | Bin 11256 -> 11256 bytes world/map/data/056-2.wlk | Bin 0 -> 7204 bytes world/map/data/057-1.wlk | Bin 0 -> 21084 bytes world/map/data/resnametable.txt | 2 + world/map/npc/055-1/_warps.txt | 1 + world/map/npc/056-1/_warps.txt | 1 + world/map/npc/056-2/_import.txt | 5 +++ world/map/npc/056-2/_mobs.txt | 8 ++++ world/map/npc/056-2/_warps.txt | 5 +++ world/map/npc/057-1/_import.txt | 5 +++ world/map/npc/057-1/_mobs.txt | 81 ++++++++++++++++++++++++++++++++++++++++ world/map/npc/057-1/_warps.txt | 4 ++ world/map/npc/_import.txt | 2 + 14 files changed, 115 insertions(+), 1 deletion(-) create mode 100644 world/map/data/056-2.wlk create mode 100644 world/map/data/057-1.wlk create mode 100644 world/map/npc/056-2/_import.txt create mode 100644 world/map/npc/056-2/_mobs.txt create mode 100644 world/map/npc/056-2/_warps.txt create mode 100644 world/map/npc/057-1/_import.txt create mode 100644 world/map/npc/057-1/_mobs.txt create mode 100644 world/map/npc/057-1/_warps.txt diff --git a/client-data b/client-data index ff5d1a5f..7c619ff4 160000 --- a/client-data +++ b/client-data @@ -1 +1 @@ -Subproject commit ff5d1a5fefc5920ee7f32608cb2d78b86aadf25b +Subproject commit 7c619ff469c8d9b415f3783203daf3ce93fdb64d diff --git a/world/map/data/056-1.wlk b/world/map/data/056-1.wlk index 6b70c0dc..e95f1baa 100644 Binary files a/world/map/data/056-1.wlk and b/world/map/data/056-1.wlk differ diff --git a/world/map/data/056-2.wlk b/world/map/data/056-2.wlk new file mode 100644 index 00000000..3088183c Binary files /dev/null and b/world/map/data/056-2.wlk differ diff --git a/world/map/data/057-1.wlk b/world/map/data/057-1.wlk new file mode 100644 index 00000000..b3c89549 Binary files /dev/null and b/world/map/data/057-1.wlk differ diff --git a/world/map/data/resnametable.txt b/world/map/data/resnametable.txt index 2c6e2f2f..dbe9f311 100644 --- a/world/map/data/resnametable.txt +++ b/world/map/data/resnametable.txt @@ -96,4 +96,6 @@ 055-1.gat#055-1.wlk# 055-3.gat#055-3.wlk# 056-1.gat#056-1.wlk# +056-2.gat#056-2.wlk# +057-1.gat#057-1.wlk# botcheck.gat#botcheck.wlk# diff --git a/world/map/npc/055-1/_warps.txt b/world/map/npc/055-1/_warps.txt index 942743e2..e9d4d2af 100644 --- a/world/map/npc/055-1/_warps.txt +++ b/world/map/npc/055-1/_warps.txt @@ -7,3 +7,4 @@ 055-1.gat,137,96|warp|To Cave|-1,-1,055-3.gat,76,39 055-1.gat,60,93|warp|To Cave|-1,-1,055-3.gat,96,70 055-1.gat,75,20|warp|To Woods|0,-1,056-1.gat,74,75 +055-1.gat,149,63|warp|To Woodland|-1,1,057-1.gat,20,63 diff --git a/world/map/npc/056-1/_warps.txt b/world/map/npc/056-1/_warps.txt index 35cb572e..8895f37e 100644 --- a/world/map/npc/056-1/_warps.txt +++ b/world/map/npc/056-1/_warps.txt @@ -3,3 +3,4 @@ 056-1.gat,74,76|warp|To Woodland Hills|-1,-1,055-1.gat,74,21 056-1.gat,23,29|warp|To Woodland Hills|-1,3,017-1.gat,134,56 +056-1.gat,54,62|warp|To Mirak's House|-1,-1,056-2.gat,34,30 diff --git a/world/map/npc/056-2/_import.txt b/world/map/npc/056-2/_import.txt new file mode 100644 index 00000000..c7fdde56 --- /dev/null +++ b/world/map/npc/056-2/_import.txt @@ -0,0 +1,5 @@ +// Map 056-2: Mirak's House +// This file is generated automatically. All manually changes will be removed when running the Converter. +map: 056-2.gat +npc: npc/056-2/_mobs.txt +npc: npc/056-2/_warps.txt diff --git a/world/map/npc/056-2/_mobs.txt b/world/map/npc/056-2/_mobs.txt new file mode 100644 index 00000000..75c4d9f3 --- /dev/null +++ b/world/map/npc/056-2/_mobs.txt @@ -0,0 +1,8 @@ +// This file is generated automatically. All manually changes will be removed when running the Converter. +// Mirak's House mobs + + + +056-2.gat,0,0,0|script|Mob056-2|-1,{ + end; +} diff --git a/world/map/npc/056-2/_warps.txt b/world/map/npc/056-2/_warps.txt new file mode 100644 index 00000000..202e86d3 --- /dev/null +++ b/world/map/npc/056-2/_warps.txt @@ -0,0 +1,5 @@ +// This file is generated automatically. All manually changes will be removed when running the Converter. +// Mirak's House warps + +056-2.gat,63,34|warp|To First Floor|-1,-1,056-2.gat,23,32 +056-2.gat,35,30|warp|To Woods|-1,-1,056-1.gat,55,62 diff --git a/world/map/npc/057-1/_import.txt b/world/map/npc/057-1/_import.txt new file mode 100644 index 00000000..033dca01 --- /dev/null +++ b/world/map/npc/057-1/_import.txt @@ -0,0 +1,5 @@ +// Map 057-1: Woodland +// This file is generated automatically. All manually changes will be removed when running the Converter. +map: 057-1.gat +npc: npc/057-1/_mobs.txt +npc: npc/057-1/_warps.txt diff --git a/world/map/npc/057-1/_mobs.txt b/world/map/npc/057-1/_mobs.txt new file mode 100644 index 00000000..9d60df26 --- /dev/null +++ b/world/map/npc/057-1/_mobs.txt @@ -0,0 +1,81 @@ +// This file is generated automatically. All manually changes will be removed when running the Converter. +// Woodland mobs + +057-1.gat,0,0,0,0|monster|Spawn Mauve Plant|1029,5,45000,45000,Mob057-1::On1029 +057-1.gat,0,0,0,0|monster|Spawn Cobalt|1030,3,10000,65000,Mob057-1::On1030 +057-1.gat,0,0,0,0|monster|Spawn Gamboge|1031,5,10000,45000,Mob057-1::On1031 +057-1.gat,0,0,0,0|monster|Spawn Alizarin|1032,7,10000,70000,Mob057-1::On1032 +057-1.gat,0,0,0,0|monster|Spawn Mouboo|1028,14,10000,45000,Mob057-1::On1028 +057-1.gat,95,42,29,9|monster|Spawn Butterfly|1055,3,10000,40000,Mob057-1::On1055 +057-1.gat,25,48,11,46|monster|Spawn Silkworm|1035,7,10000,15000,Mob057-1::On1035 +057-1.gat,99,40,22,16|monster|Spawn Pink Flower|1014,2,10000,45000,Mob057-1::On1014 +057-1.gat,100,30,19,11|monster|Spawn Butterfly|1055,2,10000,40000,Mob057-1::On1055 +057-1.gat,83,64,12,12|monster|Spawn Butterfly|1055,2,10000,40000,Mob057-1::On1055 +057-1.gat,59,34,8,11|monster|Spawn Butterfly|1055,2,10000,40000,Mob057-1::On1055 +057-1.gat,32,45,8,11|monster|Spawn Butterfly|1055,2,10000,40000,Mob057-1::On1055 +057-1.gat,144,35,12,12|monster|Spawn Butterfly|1055,2,10000,40000,Mob057-1::On1055 +057-1.gat,104,67,12,11|monster|Spawn Pink Flower|1014,2,10000,45000,Mob057-1::On1014 +057-1.gat,135,53,12,11|monster|Spawn Pink Flower|1014,2,10000,45000,Mob057-1::On1014 +057-1.gat,0,0,0,0|monster|Spawn Spiky Mushroom|1019,10,10000,45000,Mob057-1::On1019 +057-1.gat,0,0,0,0|monster|Spawn Clover Patch|1037,3,10000,180000,Mob057-1::On1037 +057-1.gat,27,46,14,52|monster|Spawn Squirrel|1038,6,10000,50000,Mob057-1::On1038 + + +057-1.gat,0,0,0|script|Mob057-1|-1,{ +On1014: + set @mobID, 1014; + callfunc "MobPoints"; + end; + +On1019: + set @mobID, 1019; + callfunc "MobPoints"; + end; + +On1028: + set @mobID, 1028; + callfunc "MobPoints"; + end; + +On1029: + set @mobID, 1029; + callfunc "MobPoints"; + end; + +On1030: + set @mobID, 1030; + callfunc "MobPoints"; + end; + +On1031: + set @mobID, 1031; + callfunc "MobPoints"; + end; + +On1032: + set @mobID, 1032; + callfunc "MobPoints"; + end; + +On1035: + set @mobID, 1035; + callfunc "MobPoints"; + end; + +On1037: + set @mobID, 1037; + callfunc "MobPoints"; + end; + +On1038: + set @mobID, 1038; + callfunc "MobPoints"; + end; + +On1055: + set @mobID, 1055; + callfunc "MobPoints"; + end; + + end; +} diff --git a/world/map/npc/057-1/_warps.txt b/world/map/npc/057-1/_warps.txt new file mode 100644 index 00000000..b6c2057f --- /dev/null +++ b/world/map/npc/057-1/_warps.txt @@ -0,0 +1,4 @@ +// This file is generated automatically. All manually changes will be removed when running the Converter. +// Woodland warps + +057-1.gat,19,63|warp|To Woodland Hills|-1,1,055-1.gat,148,63 diff --git a/world/map/npc/_import.txt b/world/map/npc/_import.txt index f64a79c0..f0facf6d 100644 --- a/world/map/npc/_import.txt +++ b/world/map/npc/_import.txt @@ -96,4 +96,6 @@ import: npc/048-2/_import.txt import: npc/055-1/_import.txt import: npc/055-3/_import.txt import: npc/056-1/_import.txt +import: npc/056-2/_import.txt +import: npc/057-1/_import.txt import: npc/botcheck/_import.txt -- cgit v1.2.3-60-g2f50