summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAli-G <gauvain.dauchy@free.fr>2011-06-15 22:52:53 +0200
committerJessica Tölke <jtoelke@mail.upb.de>2011-06-18 11:20:19 +0200
commit154255ebb63cdaf57fb50752c04be753891f98f1 (patch)
tree83250289ca50b8b202efa4062a8762589ebc71b9
parentc05f662f2e2576eaed8bbf459e579d447b6b99c8 (diff)
downloadserverdata-154255ebb63cdaf57fb50752c04be753891f98f1.tar.gz
serverdata-154255ebb63cdaf57fb50752c04be753891f98f1.tar.bz2
serverdata-154255ebb63cdaf57fb50752c04be753891f98f1.tar.xz
serverdata-154255ebb63cdaf57fb50752c04be753891f98f1.zip
Made the hurnscald inn interior and exterior fit together.
-rw-r--r--data/009-1.wlkbin8779 -> 8779 bytes
-rw-r--r--data/009-2.wlkbin24004 -> 24004 bytes
-rw-r--r--npc/009-1/_warps.txt2
-rw-r--r--npc/009-2/_warps.txt10
-rw-r--r--npc/009-2/kfahr.txt2
-rw-r--r--npc/009-2/shops.txt2
-rw-r--r--npc/009-2/waitress.txt2
7 files changed, 9 insertions, 9 deletions
diff --git a/data/009-1.wlk b/data/009-1.wlk
index 0ec51666..fe2f044b 100644
--- a/data/009-1.wlk
+++ b/data/009-1.wlk
Binary files differ
diff --git a/data/009-2.wlk b/data/009-2.wlk
index 8db718f3..28d0f540 100644
--- a/data/009-2.wlk
+++ b/data/009-2.wlk
Binary files differ
diff --git a/npc/009-1/_warps.txt b/npc/009-1/_warps.txt
index c8a7fad7..6da46c89 100644
--- a/npc/009-1/_warps.txt
+++ b/npc/009-1/_warps.txt
@@ -3,7 +3,7 @@
009-1.gat,49,55 warp HurnscaldSouthGate 2,-1,008-1.gat,78,82
009-1.gat,97,36 warp HurnscaldEastGate -1,0,008-1.gat,129,60
-009-1.gat,35,30 warp ToInn -1,-1,009-2.gat,50,55
+009-1.gat,30,33 warp ToInn -1,-1,009-2.gat,49,63
009-1.gat,58,46 warp ToGeneralStore -1,-1,009-2.gat,27,105
009-1.gat,59,33 warp ToArcherShop -1,-1,009-2.gat,95,29
009-1.gat,71,30 warp ToPotionShop -1,-1,009-2.gat,130,25
diff --git a/npc/009-2/_warps.txt b/npc/009-2/_warps.txt
index 647db1a4..e5ca7a70 100644
--- a/npc/009-2/_warps.txt
+++ b/npc/009-2/_warps.txt
@@ -1,20 +1,20 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// Hurnscald warps
-009-2.gat,75,23 warp To1stFloor 0,-1,009-2.gat,73,46
+009-2.gat,75,24 warp To1stFloor 0,-1,009-2.gat,82,47
009-2.gat,95,30 warp ToOutdoor -1,-1,009-1.gat,59,34
009-2.gat,130,26 warp ToOutdoor -1,-1,009-1.gat,71,31
009-2.gat,144,26 warp To2ndFloor 0,-1,009-2.gat,143,44
009-2.gat,144,42 warp To3rdFloor 0,-1,009-2.gat,143,24
009-2.gat,155,47 warp To1stFloor 0,-1,009-2.gat,154,63
009-2.gat,114,46 warp To1stFloor 0,-1,009-2.gat,113,69
-009-2.gat,50,55 warp ToOutdoor -1,-1,009-1.gat,35,31
-009-2.gat,74,53 warp ToCellar -1,-1,009-2.gat,143,81
-009-2.gat,74,45 warp To2ndFloor 0,-1,009-2.gat,74,23
+009-2.gat,49,64 warp ToOutdoor -1,-1,009-1.gat,30,34
+009-2.gat,83,58 warp ToCellar -1,-1,009-2.gat,143,79
+009-2.gat,83,46 warp To2ndFloor 0,-1,009-2.gat,74,23
009-2.gat,114,78 warp ToOutdoor -1,-1,009-1.gat,72,45
009-2.gat,114,68 warp To2ndFloor 0,-1,009-2.gat,113,46
009-2.gat,149,67 warp ToOutdoor -1,-1,009-1.gat,80,32
-009-2.gat,143,79 warp To1stFloor -1,-1,009-2.gat,74,52
+009-2.gat,143,78 warp To1stFloor -1,-1,009-2.gat,83,57
009-2.gat,155,62 warp To2ndFloor 0,-1,009-2.gat,154,46
009-2.gat,182,67 warp ToOutdoor 0,-1,009-1.gat,91,47
009-2.gat,147,89 warp ToCaveBeneathHurnscald -1,-1,009-3.gat,173,22
diff --git a/npc/009-2/kfahr.txt b/npc/009-2/kfahr.txt
index 88438b40..a8e140f1 100644
--- a/npc/009-2/kfahr.txt
+++ b/npc/009-2/kfahr.txt
@@ -13,7 +13,7 @@
//#
//#################################################################################
-009-2.gat,67,57,0 script Kfahr 125,{
+009-2.gat,75,56,0 script Kfahr 125,{
set @QS_NEWBIE, 0;
set @QS_MET_KFAHR, 1;
diff --git a/npc/009-2/shops.txt b/npc/009-2/shops.txt
index 733fa54f..d70939c2 100644
--- a/npc/009-2/shops.txt
+++ b/npc/009-2/shops.txt
@@ -10,7 +10,7 @@
// Receptionist
// Offers the player to rest at the inn for 100gp
-009-2.gat,50,48,0 script Receptionist 108,{
+009-2.gat,51,57,0 script Receptionist 108,{
set @npcname$, "Receptionist";
set @cost, 100;
callfunc "Inn";
diff --git a/npc/009-2/waitress.txt b/npc/009-2/waitress.txt
index 265cd234..80ab5a4a 100644
--- a/npc/009-2/waitress.txt
+++ b/npc/009-2/waitress.txt
@@ -1,6 +1,6 @@
// Waitress
-009-2.gat,60,52,0 script Melinda 140,{
+009-2.gat,47,51,0 script Melinda 140,{
mes "[Melinda]";
mes "\"Hi, sweetie! Want a fresh beer for 170 GP?\"";