From 50f774a4bd3108b58a003fd4904bbbb574dfbbca Mon Sep 17 00:00:00 2001 From: Jessica Tölke Date: Sat, 31 Mar 2012 20:26:20 +0200 Subject: Adding several snow maps. Converter ran, submodule pointer updated. --- client-data | 2 +- world/map/data/034-1.wlk | Bin 22788 -> 22788 bytes world/map/data/046-1.wlk | Bin 0 -> 22788 bytes world/map/data/046-3.wlk | Bin 0 -> 22788 bytes world/map/data/047-1.wlk | Bin 0 -> 22788 bytes world/map/data/048-1.wlk | Bin 0 -> 22788 bytes world/map/data/resnametable.txt | 4 +++ world/map/npc/046-1/_import.txt | 5 ++++ world/map/npc/046-1/_mobs.txt | 54 ++++++++++++++++++++++++++++++++++++++++ world/map/npc/046-1/_warps.txt | 12 +++++++++ world/map/npc/046-3/_import.txt | 5 ++++ world/map/npc/046-3/_mobs.txt | 53 +++++++++++++++++++++++++++++++++++++++ world/map/npc/046-3/_warps.txt | 9 +++++++ world/map/npc/047-1/_import.txt | 5 ++++ world/map/npc/047-1/_mobs.txt | 47 ++++++++++++++++++++++++++++++++++ world/map/npc/047-1/_warps.txt | 7 ++++++ world/map/npc/048-1/_import.txt | 5 ++++ world/map/npc/048-1/_mobs.txt | 49 ++++++++++++++++++++++++++++++++++++ world/map/npc/048-1/_warps.txt | 6 +++++ world/map/npc/048-2/_warps.txt | 1 + world/map/npc/_import.txt | 4 +++ 21 files changed, 267 insertions(+), 1 deletion(-) create mode 100644 world/map/data/046-1.wlk create mode 100644 world/map/data/046-3.wlk create mode 100644 world/map/data/047-1.wlk create mode 100644 world/map/data/048-1.wlk create mode 100644 world/map/npc/046-1/_import.txt create mode 100644 world/map/npc/046-1/_mobs.txt create mode 100644 world/map/npc/046-1/_warps.txt create mode 100644 world/map/npc/046-3/_import.txt create mode 100644 world/map/npc/046-3/_mobs.txt create mode 100644 world/map/npc/046-3/_warps.txt create mode 100644 world/map/npc/047-1/_import.txt create mode 100644 world/map/npc/047-1/_mobs.txt create mode 100644 world/map/npc/047-1/_warps.txt create mode 100644 world/map/npc/048-1/_import.txt create mode 100644 world/map/npc/048-1/_mobs.txt create mode 100644 world/map/npc/048-1/_warps.txt diff --git a/client-data b/client-data index 05990bbc..6cd505f2 160000 --- a/client-data +++ b/client-data @@ -1 +1 @@ -Subproject commit 05990bbc1c3e19b12552b29cb9c977238768ed4c +Subproject commit 6cd505f2b41e78e53c19ec2a34a7a454afd55b3d diff --git a/world/map/data/034-1.wlk b/world/map/data/034-1.wlk index 355b2185..9afe2acc 100644 Binary files a/world/map/data/034-1.wlk and b/world/map/data/034-1.wlk differ diff --git a/world/map/data/046-1.wlk b/world/map/data/046-1.wlk new file mode 100644 index 00000000..423c576d Binary files /dev/null and b/world/map/data/046-1.wlk differ diff --git a/world/map/data/046-3.wlk b/world/map/data/046-3.wlk new file mode 100644 index 00000000..e48f7e89 Binary files /dev/null and b/world/map/data/046-3.wlk differ diff --git a/world/map/data/047-1.wlk b/world/map/data/047-1.wlk new file mode 100644 index 00000000..29ac2917 Binary files /dev/null and b/world/map/data/047-1.wlk differ diff --git a/world/map/data/048-1.wlk b/world/map/data/048-1.wlk new file mode 100644 index 00000000..142aceff Binary files /dev/null and b/world/map/data/048-1.wlk differ diff --git a/world/map/data/resnametable.txt b/world/map/data/resnametable.txt index 5cbbfaad..d1d34e9e 100644 --- a/world/map/data/resnametable.txt +++ b/world/map/data/resnametable.txt @@ -84,5 +84,9 @@ 044-1.gat#044-1.wlk# 044-3.gat#044-3.wlk# 045-1.gat#045-1.wlk# +046-1.gat#046-1.wlk# +046-3.gat#046-3.wlk# +047-1.gat#047-1.wlk# +048-1.gat#048-1.wlk# 048-2.gat#048-2.wlk# botcheck.gat#botcheck.wlk# diff --git a/world/map/npc/046-1/_import.txt b/world/map/npc/046-1/_import.txt new file mode 100644 index 00000000..9775de82 --- /dev/null +++ b/world/map/npc/046-1/_import.txt @@ -0,0 +1,5 @@ +// Map 046-1: Rock Plateau +// This file is generated automatically. All manually changes will be removed when running the Converter. +map: 046-1.gat +npc: npc/046-1/_mobs.txt +npc: npc/046-1/_warps.txt diff --git a/world/map/npc/046-1/_mobs.txt b/world/map/npc/046-1/_mobs.txt new file mode 100644 index 00000000..205ac676 --- /dev/null +++ b/world/map/npc/046-1/_mobs.txt @@ -0,0 +1,54 @@ +// This file is generated automatically. All manually changes will be removed when running the Converter. +// Rock Plateau mobs + +046-1.gat,0,0,0,0|monster|Reinboo|1094,40,0,0,Mob046-1::On1094 +046-1.gat,0,0,0,0|monster|Fluffy|1020,50,0,0,Mob046-1::On1020 +046-1.gat,0,0,0,0|monster|Squirrel|1038,50,0,0,Mob046-1::On1038 +046-1.gat,44,28,52,20|monster|Moggun|1061,12,100000,30000,Mob046-1::On1061 +046-1.gat,0,0,0,0|monster|Yeti|1072,2,100000,30000,Mob046-1::On1072 +046-1.gat,87,94,23,13|monster|Wolvern|1090,5,100000,30000,Mob046-1::On1090 +046-1.gat,0,0,0,0|monster|White Bell|1095,9,100000,30000,Mob046-1::On1095 +046-1.gat,72,52,15,12|monster|Wolvern|1090,2,100000,30000,Mob046-1::On1090 +046-1.gat,36,105,10,9|monster|Wolvern|1090,2,100000,30000,Mob046-1::On1090 +046-1.gat,115,33,45,33|monster|Wolvern|1090,7,100000,30000,Mob046-1::On1090 +046-1.gat,145,60,10,9|monster|Wolvern|1090,2,100000,30000,Mob046-1::On1090 + + +046-1.gat,0,0,0|script|Mob046-1|-1,{ +On1020: + set @mobID, 1020; + callfunc "MobPoints"; + end; + +On1038: + set @mobID, 1038; + callfunc "MobPoints"; + end; + +On1061: + set @mobID, 1061; + callfunc "MobPoints"; + end; + +On1072: + set @mobID, 1072; + callfunc "MobPoints"; + end; + +On1090: + set @mobID, 1090; + callfunc "MobPoints"; + end; + +On1094: + set @mobID, 1094; + callfunc "MobPoints"; + end; + +On1095: + set @mobID, 1095; + callfunc "MobPoints"; + end; + + end; +} diff --git a/world/map/npc/046-1/_warps.txt b/world/map/npc/046-1/_warps.txt new file mode 100644 index 00000000..3624ae0b --- /dev/null +++ b/world/map/npc/046-1/_warps.txt @@ -0,0 +1,12 @@ +// This file is generated automatically. All manually changes will be removed when running the Converter. +// Rock Plateau warps + +046-1.gat,95,117|warp|ToSnowForest|0,-1,034-1.gat,94,19 +046-1.gat,29,13|warp|ToHighlands1|-1,-1,047-1.gat,29,112 +046-1.gat,31,13|warp|ToHighlands1|-1,-1,047-1.gat,31,112 +046-1.gat,78,30|warp|ToFrostyUnderground|-1,-1,046-3.gat,78,29 +046-1.gat,131,48|warp|ToFrostyUnderground|-1,-1,046-3.gat,131,47 +046-1.gat,131,55|warp|ToFrostyUnderground|-1,-1,046-3.gat,131,54 +046-1.gat,139,19|warp|ToFrostyUnderground|-1,-1,046-3.gat,139,18 +046-1.gat,83,43|warp|ToFrostyUnderground|-1,-1,046-3.gat,83,42 +046-1.gat,124,109|warp|ToFrostyUnderground|-1,-1,046-3.gat,124,108 diff --git a/world/map/npc/046-3/_import.txt b/world/map/npc/046-3/_import.txt new file mode 100644 index 00000000..6031a3a0 --- /dev/null +++ b/world/map/npc/046-3/_import.txt @@ -0,0 +1,5 @@ +// Map 046-3: Frosty Underground +// This file is generated automatically. All manually changes will be removed when running the Converter. +map: 046-3.gat +npc: npc/046-3/_mobs.txt +npc: npc/046-3/_warps.txt diff --git a/world/map/npc/046-3/_mobs.txt b/world/map/npc/046-3/_mobs.txt new file mode 100644 index 00000000..7e61d36e --- /dev/null +++ b/world/map/npc/046-3/_mobs.txt @@ -0,0 +1,53 @@ +// This file is generated automatically. All manually changes will be removed when running the Converter. +// Frosty Underground mobs + +046-3.gat,68,101,12,8|monster|Yeti|1072,2,100000,30000,Mob046-3::On1072 +046-3.gat,0,0,0,0|monster|Ice Goblin|1058,20,100000,30000,Mob046-3::On1058 +046-3.gat,55,61,25,26|monster|Moggun|1061,14,100000,30000,Mob046-3::On1061 +046-3.gat,119,104,5,4|monster|Ice Element|1071,1,100000,30000,Mob046-3::On1071 +046-3.gat,132,71,9,7|monster|White Slime|1093,4,100000,30000,Mob046-3::On1093 +046-3.gat,107,85,14,9|monster|Blue Slime|1091,2,100000,30000,Mob046-3::On1091 +046-3.gat,98,77,6,4|monster|White Slime|1093,4,100000,30000,Mob046-3::On1093 +046-3.gat,70,82,6,4|monster|White Slime|1093,6,100000,30000,Mob046-3::On1093 +046-3.gat,106,34,6,4|monster|White Slime|1093,4,100000,30000,Mob046-3::On1093 +046-3.gat,33,37,6,4|monster|White Slime|1093,4,100000,30000,Mob046-3::On1093 +046-3.gat,144,105,14,9|monster|Blue Slime|1091,2,100000,30000,Mob046-3::On1091 +046-3.gat,152,55,14,9|monster|Blue Slime|1091,2,100000,30000,Mob046-3::On1091 +046-3.gat,84,53,14,9|monster|Blue Slime|1091,2,100000,30000,Mob046-3::On1091 +046-3.gat,47,23,15,10|monster|Ice Element|1071,2,100000,30000,Mob046-3::On1071 +046-3.gat,113,48,12,8|monster|Yeti|1072,2,100000,30000,Mob046-3::On1072 + + +046-3.gat,0,0,0|script|Mob046-3|-1,{ +On1058: + set @mobID, 1058; + callfunc "MobPoints"; + end; + +On1061: + set @mobID, 1061; + callfunc "MobPoints"; + end; + +On1071: + set @mobID, 1071; + callfunc "MobPoints"; + end; + +On1072: + set @mobID, 1072; + callfunc "MobPoints"; + end; + +On1091: + set @mobID, 1091; + callfunc "MobPoints"; + end; + +On1093: + set @mobID, 1093; + callfunc "MobPoints"; + end; + + end; +} diff --git a/world/map/npc/046-3/_warps.txt b/world/map/npc/046-3/_warps.txt new file mode 100644 index 00000000..b77c1a54 --- /dev/null +++ b/world/map/npc/046-3/_warps.txt @@ -0,0 +1,9 @@ +// This file is generated automatically. All manually changes will be removed when running the Converter. +// Frosty Underground warps + +046-3.gat,139,19|warp|ToOutside|-1,-1,046-1.gat,139,20 +046-3.gat,78,30|warp|ToOutside|-1,-1,046-1.gat,78,31 +046-3.gat,83,43|warp|ToOutside|-1,-1,046-1.gat,83,44 +046-3.gat,131,48|warp|ToOutside|-1,-1,046-1.gat,131,49 +046-3.gat,131,55|warp|ToOutside|-1,-1,046-1.gat,131,56 +046-3.gat,124,109|warp|ToOutside|-1,-1,046-1.gat,124,110 diff --git a/world/map/npc/047-1/_import.txt b/world/map/npc/047-1/_import.txt new file mode 100644 index 00000000..5da48aa6 --- /dev/null +++ b/world/map/npc/047-1/_import.txt @@ -0,0 +1,5 @@ +// Map 047-1: Highlands +// This file is generated automatically. All manually changes will be removed when running the Converter. +map: 047-1.gat +npc: npc/047-1/_mobs.txt +npc: npc/047-1/_warps.txt diff --git a/world/map/npc/047-1/_mobs.txt b/world/map/npc/047-1/_mobs.txt new file mode 100644 index 00000000..2b7a9c3e --- /dev/null +++ b/world/map/npc/047-1/_mobs.txt @@ -0,0 +1,47 @@ +// This file is generated automatically. All manually changes will be removed when running the Converter. +// Highlands mobs + +047-1.gat,0,0,0,0|monster|Reinboo|1094,20,0,0,Mob047-1::On1094 +047-1.gat,0,0,0,0|monster|Fluffy|1020,25,0,0,Mob047-1::On1020 +047-1.gat,0,0,0,0|monster|White Bell|1095,4,100000,30000,Mob047-1::On1095 +047-1.gat,0,0,0,0|monster|Squirrel|1038,25,0,0,Mob047-1::On1038 +047-1.gat,19,57,1,1|monster|Yeti|1072,1,100000,30000,Mob047-1::On1072 +047-1.gat,106,26,23,13|monster|Wolvern|1090,4,100000,30000,Mob047-1::On1090 +047-1.gat,30,79,22,27|monster|Wolvern|1090,4,100000,30000,Mob047-1::On1090 +047-1.gat,122,65,23,13|monster|Wolvern|1090,4,100000,30000,Mob047-1::On1090 +047-1.gat,56,29,23,13|monster|Wolvern|1090,4,100000,30000,Mob047-1::On1090 + + +047-1.gat,0,0,0|script|Mob047-1|-1,{ +On1020: + set @mobID, 1020; + callfunc "MobPoints"; + end; + +On1038: + set @mobID, 1038; + callfunc "MobPoints"; + end; + +On1072: + set @mobID, 1072; + callfunc "MobPoints"; + end; + +On1090: + set @mobID, 1090; + callfunc "MobPoints"; + end; + +On1094: + set @mobID, 1094; + callfunc "MobPoints"; + end; + +On1095: + set @mobID, 1095; + callfunc "MobPoints"; + end; + + end; +} diff --git a/world/map/npc/047-1/_warps.txt b/world/map/npc/047-1/_warps.txt new file mode 100644 index 00000000..96ad19ed --- /dev/null +++ b/world/map/npc/047-1/_warps.txt @@ -0,0 +1,7 @@ +// This file is generated automatically. All manually changes will be removed when running the Converter. +// Highlands warps + +047-1.gat,29,113|warp|ToRockPlateau|-1,-1,046-1.gat,29,14 +047-1.gat,31,113|warp|ToRockPlateau|-1,-1,046-1.gat,31,14 +047-1.gat,20,76|warp|ToSage|-1,0,048-1.gat,155,75 +047-1.gat,19,63|warp|ToSage|-1,0,048-1.gat,154,62 diff --git a/world/map/npc/048-1/_import.txt b/world/map/npc/048-1/_import.txt new file mode 100644 index 00000000..7a5740f1 --- /dev/null +++ b/world/map/npc/048-1/_import.txt @@ -0,0 +1,5 @@ +// Map 048-1: Snow Forest +// This file is generated automatically. All manually changes will be removed when running the Converter. +map: 048-1.gat +npc: npc/048-1/_mobs.txt +npc: npc/048-1/_warps.txt diff --git a/world/map/npc/048-1/_mobs.txt b/world/map/npc/048-1/_mobs.txt new file mode 100644 index 00000000..b8e5e3bd --- /dev/null +++ b/world/map/npc/048-1/_mobs.txt @@ -0,0 +1,49 @@ +// This file is generated automatically. All manually changes will be removed when running the Converter. +// Snow Forest mobs + +048-1.gat,0,0,0,0|monster|Reinboo|1094,20,0,0,Mob048-1::On1094 +048-1.gat,0,0,0,0|monster|Fluffy|1020,25,0,0,Mob048-1::On1020 +048-1.gat,0,0,0,0|monster|Squirrel|1038,25,0,0,Mob048-1::On1038 +048-1.gat,0,0,0,0|monster|White Bell|1095,5,100000,30000,Mob048-1::On1095 +048-1.gat,68,40,2,2|monster|White Slime|1093,4,100000,30000,Mob048-1::On1093 +048-1.gat,72,61,4,5|monster|Blue Slime|1091,2,100000,30000,Mob048-1::On1091 +048-1.gat,48,37,2,2|monster|White Slime|1093,4,100000,30000,Mob048-1::On1093 +048-1.gat,72,30,2,2|monster|White Slime|1093,4,100000,30000,Mob048-1::On1093 +048-1.gat,61,50,4,5|monster|Blue Slime|1091,2,100000,30000,Mob048-1::On1091 +048-1.gat,61,35,4,5|monster|Blue Slime|1091,2,100000,30000,Mob048-1::On1091 +048-1.gat,42,25,2,2|monster|White Slime|1093,4,100000,30000,Mob048-1::On1093 + + +048-1.gat,0,0,0|script|Mob048-1|-1,{ +On1020: + set @mobID, 1020; + callfunc "MobPoints"; + end; + +On1038: + set @mobID, 1038; + callfunc "MobPoints"; + end; + +On1091: + set @mobID, 1091; + callfunc "MobPoints"; + end; + +On1093: + set @mobID, 1093; + callfunc "MobPoints"; + end; + +On1094: + set @mobID, 1094; + callfunc "MobPoints"; + end; + +On1095: + set @mobID, 1095; + callfunc "MobPoints"; + end; + + end; +} diff --git a/world/map/npc/048-1/_warps.txt b/world/map/npc/048-1/_warps.txt new file mode 100644 index 00000000..be0d52fb --- /dev/null +++ b/world/map/npc/048-1/_warps.txt @@ -0,0 +1,6 @@ +// This file is generated automatically. All manually changes will be removed when running the Converter. +// Snow Forest warps + +048-1.gat,155,63|warp|ToHighlands1|-1,0,047-1.gat,20,62 +048-1.gat,156,76|warp|ToHighlands1|-1,0,047-1.gat,21,76 +048-1.gat,64,41|warp|ToSage|-1,-1,048-2.gat,40,48 diff --git a/world/map/npc/048-2/_warps.txt b/world/map/npc/048-2/_warps.txt index d183eacc..c064278f 100644 --- a/world/map/npc/048-2/_warps.txt +++ b/world/map/npc/048-2/_warps.txt @@ -3,6 +3,7 @@ 048-2.gat,22,78|warp|To Second Floor|0,-1,048-2.gat,84,23 048-2.gat,60,21|warp|To Second Floor|0,-1,048-2.gat,121,26 +048-2.gat,40,50|warp|To Outside|-1,-1,048-1.gat,64,42 048-2.gat,84,21|warp|To Third Floor|0,-1,048-2.gat,22,76 048-2.gat,113,23|warp|To Office|-1,-1,048-2.gat,147,35 048-2.gat,122,28|warp|To First Floor|0,-1,048-2.gat,59,22 diff --git a/world/map/npc/_import.txt b/world/map/npc/_import.txt index 6803bb6f..30be69b3 100644 --- a/world/map/npc/_import.txt +++ b/world/map/npc/_import.txt @@ -84,5 +84,9 @@ import: npc/042-2/_import.txt import: npc/044-1/_import.txt import: npc/044-3/_import.txt import: npc/045-1/_import.txt +import: npc/046-1/_import.txt +import: npc/046-3/_import.txt +import: npc/047-1/_import.txt +import: npc/048-1/_import.txt import: npc/048-2/_import.txt import: npc/botcheck/_import.txt -- cgit v1.2.3-60-g2f50