From 931b03b28b15590cbde3a5ab1ab1bafba980d187 Mon Sep 17 00:00:00 2001 From: Jessica Tölke Date: Wed, 3 Oct 2012 13:07:55 +0200 Subject: Run 'make maps' for fixes on the snow maps. --- client-data | 2 +- world/map/data/030-1.wlk | Bin 17668 -> 17668 bytes world/map/data/031-1.wlk | Bin 18948 -> 18948 bytes world/map/data/034-1.wlk | Bin 22788 -> 22788 bytes world/map/data/044-1.wlk | Bin 45004 -> 45004 bytes world/map/data/045-1.wlk | Bin 40004 -> 40004 bytes world/map/data/046-1.wlk | Bin 22788 -> 22788 bytes world/map/data/047-1.wlk | Bin 22788 -> 24526 bytes world/map/data/048-1.wlk | Bin 22788 -> 22788 bytes world/map/npc/046-1/_warps.txt | 4 ++-- world/map/npc/047-1/_mobs.txt | 10 +++++----- world/map/npc/047-1/_warps.txt | 8 ++++---- world/map/npc/048-1/_warps.txt | 4 ++-- 13 files changed, 14 insertions(+), 14 deletions(-) diff --git a/client-data b/client-data index bbd0661a..da0e3f59 160000 --- a/client-data +++ b/client-data @@ -1 +1 @@ -Subproject commit bbd0661abca48c739302a1beb3c3511fa063f332 +Subproject commit da0e3f59830abce0e7e5df7986891cc3486873cd diff --git a/world/map/data/030-1.wlk b/world/map/data/030-1.wlk index 3491b6a7..3479c8df 100644 Binary files a/world/map/data/030-1.wlk and b/world/map/data/030-1.wlk differ diff --git a/world/map/data/031-1.wlk b/world/map/data/031-1.wlk index d5ec5606..8b5b0d7f 100644 Binary files a/world/map/data/031-1.wlk and b/world/map/data/031-1.wlk differ diff --git a/world/map/data/034-1.wlk b/world/map/data/034-1.wlk index 7f2d34b6..4b9ef324 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/044-1.wlk b/world/map/data/044-1.wlk index 57ce9290..4f3c3a34 100644 Binary files a/world/map/data/044-1.wlk and b/world/map/data/044-1.wlk differ diff --git a/world/map/data/045-1.wlk b/world/map/data/045-1.wlk index 2667d6e7..50cee52b 100644 Binary files a/world/map/data/045-1.wlk and b/world/map/data/045-1.wlk differ diff --git a/world/map/data/046-1.wlk b/world/map/data/046-1.wlk index dbefdfb9..344fef4a 100644 Binary files a/world/map/data/046-1.wlk and b/world/map/data/046-1.wlk differ diff --git a/world/map/data/047-1.wlk b/world/map/data/047-1.wlk index 90f93bcc..9b9f3805 100644 Binary files a/world/map/data/047-1.wlk 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 index fa270ad2..62fab749 100644 Binary files a/world/map/data/048-1.wlk and b/world/map/data/048-1.wlk differ diff --git a/world/map/npc/046-1/_warps.txt b/world/map/npc/046-1/_warps.txt index 3624ae0b..cbc07c7f 100644 --- a/world/map/npc/046-1/_warps.txt +++ b/world/map/npc/046-1/_warps.txt @@ -2,8 +2,8 @@ // 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,29,13|warp|ToHighlands1|-1,-1,047-1.gat,34,112 +046-1.gat,31,13|warp|ToHighlands1|-1,-1,047-1.gat,36,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 diff --git a/world/map/npc/047-1/_mobs.txt b/world/map/npc/047-1/_mobs.txt index d3caf06f..d3c3b4a8 100644 --- a/world/map/npc/047-1/_mobs.txt +++ b/world/map/npc/047-1/_mobs.txt @@ -5,11 +5,11 @@ 047-1.gat,0,0,0,0|monster|Fluffy|1020,25,100000,30000,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,100000,30000,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,24,57,1,1|monster|Yeti|1072,1,100000,30000,Mob047-1::On1072 +047-1.gat,111,26,23,13|monster|Wolvern|1090,4,100000,30000,Mob047-1::On1090 +047-1.gat,35,79,22,27|monster|Wolvern|1090,4,100000,30000,Mob047-1::On1090 +047-1.gat,127,65,23,13|monster|Wolvern|1090,4,100000,30000,Mob047-1::On1090 +047-1.gat,61,29,23,13|monster|Wolvern|1090,4,100000,30000,Mob047-1::On1090 047-1.gat,0,0,0|script|Mob047-1|-1,{ diff --git a/world/map/npc/047-1/_warps.txt b/world/map/npc/047-1/_warps.txt index 96ad19ed..0d166c8d 100644 --- a/world/map/npc/047-1/_warps.txt +++ b/world/map/npc/047-1/_warps.txt @@ -1,7 +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 +047-1.gat,34,113|warp|ToRockPlateau|-1,-1,046-1.gat,29,14 +047-1.gat,36,113|warp|ToRockPlateau|-1,-1,046-1.gat,31,14 +047-1.gat,25,76|warp|ToSage|-1,0,048-1.gat,155,75 +047-1.gat,24,63|warp|ToSage|-1,0,048-1.gat,154,62 diff --git a/world/map/npc/048-1/_warps.txt b/world/map/npc/048-1/_warps.txt index be0d52fb..c1dda5ea 100644 --- a/world/map/npc/048-1/_warps.txt +++ b/world/map/npc/048-1/_warps.txt @@ -1,6 +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,155,63|warp|ToHighlands1|-1,0,047-1.gat,25,62 +048-1.gat,156,76|warp|ToHighlands1|-1,0,047-1.gat,26,76 048-1.gat,64,41|warp|ToSage|-1,-1,048-2.gat,40,48 -- cgit v1.2.3-60-g2f50