Hurnscald Inn:

changing maps to what it was before,
adding private rooms in the left wing according to the intention of the original author,
placing Olana in the private rooms

8 files changed, 29 insertions, 25 deletions

diff --git a/data/009-1.wlk b/data/009-1.wlk
index fe2f044b..0ec51666 100644
--- a/data/009-1.wlk
+++ b/data/009-1.wlk
diff --git a/data/009-2.wlk b/data/009-2.wlk
index 28d0f540..10222aba 100644
--- a/data/009-2.wlk
+++ b/data/009-2.wlk
diff --git a/npc/009-1/_warps.txt b/npc/009-1/_warps.txt
index 6da46c89..c8a7fad7 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,30,33	warp	ToInn	-1,-1,009-2.gat,49,63
+009-1.gat,35,30	warp	ToInn	-1,-1,009-2.gat,50,55
 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 e5ca7a70..e6c791c5 100644
--- a/npc/009-2/_warps.txt
+++ b/npc/009-2/_warps.txt
@@ -1,21 +1,23 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 // Hurnscald warps
 
-009-2.gat,75,24	warp	To1stFloor	0,-1,009-2.gat,82,47
+009-2.gat,75,23	warp	To1stFloor	0,-1,009-2.gat,73,46
 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,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,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,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,78	warp	To1stFloor	-1,-1,009-2.gat,83,57
+009-2.gat,143,79	warp	To1stFloor	-1,-1,009-2.gat,74,52
 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
 009-2.gat,27,106	warp	ToOutdoor	-1,-1,009-1.gat,58,47
+009-2.gat,46,50	warp	ToPrivateRooms	-1,-1,009-2.gat,75,78
+009-2.gat,77,78	warp	ToPrivateRooms	-1,-1,009-2.gat,48,50
diff --git a/npc/009-2/kfahr.txt b/npc/009-2/kfahr.txt
index a8e140f1..b45a1f80 100644
--- a/npc/009-2/kfahr.txt
+++ b/npc/009-2/kfahr.txt
@@ -13,7 +13,7 @@
 //#
 //#################################################################################
 
-009-2.gat,75,56,0	script	Kfahr	125,{
+009-2.gat,67,57,0	script	Kfahr	125,{
 
 	set @QS_NEWBIE, 0;
 	set @QS_MET_KFAHR, 1;
@@ -146,7 +146,7 @@ L_real_main_menu:
 
 	close;
 
-L_long_main_menu:	
+L_long_main_menu:
 
 	menu	"What's a Desert Worm?", L_tale_desert_worm,
 		"Desert Temple?", L_tale_desert_temple,
@@ -1024,13 +1024,13 @@ L_golden_requires_knife_quest_done:
 	mes "He hesitates.";
 	mes "\"But no, this is too valuable.  Perhaps if you finish that other quest I gave you...?\".";
         next;
-	goto L_main_menu;	
+	goto L_main_menu;
 
 L_golden_requires_knife_quest:
 	mes "He hesitates.";
 	mes "\"But no, this is too valuable.  I think I should have you prove your worthiness with another quest first...\"";
         next;
-	goto L_boneknife_quest;	
+	goto L_boneknife_quest;
 
 L_wrestle_explain:
 	mes "[Kfahr the Warrior]";
@@ -1088,7 +1088,7 @@ L_golden_scorpion_wrestle:
 
 L_wrestle_loop:
 	mes "[Arm-wrestling with Kfahr]";
-	
+
         mes @positions$[@position];
 
         if ((@PC_STAMINA * 2 <= @PC_MAX_STAMINA) && (@PC_STAMINA * 4 > @PC_MAX_STAMINA))
diff --git a/npc/009-2/olana.txt b/npc/009-2/olana.txt
index a27fc519..fdc7098a 100644
--- a/npc/009-2/olana.txt
+++ b/npc/009-2/olana.txt
@@ -1,4 +1,4 @@
-009-2.gat,123,45,0	script	Olana	140,{ 
+009-2.gat,63,79,0	script	Olana	190,{
 
   if (FLAGS & FLAG_ROSSI_COMPLETED) goto L_FinalEnd;
   if (Rossy_Quest == 17 || Rossy_Quest == 18) goto L_End;
@@ -18,7 +18,9 @@
   if (Rossy_Quest == 1 || Rossy_Quest == 2) goto L_Daughter;
 
   mes "[Olana]";
-  mes "\"I came from Tulimshar to Hurnscald on vacation with my two young daughters, Rossy and Julia. I have already been to Hurnscald once and felt quite safe in this area.\"";
+  mes "\"Hello. Usually guests don't come here.\"";
+  next;
+  mes "\"My name is Olana, my father owns this inn. I'm living in Tulimshar, but came to Hurnscald on vacation with my two young daughters, Rossy and Julia.\"";
   if (baselevel < 50) close;
   next;
   mes "\"I let my two lovely girls play in the woods nearby but they didn't come back yet!\"";
@@ -83,24 +85,24 @@ L_Cont:
   menu
     "Of course I can. Hand me the letter, I'll give it to Rossy as soon as I see her.", L_Let,
     "No, sorry, I'm not interested in that sort of task. Hand it to her yourself.", L_No;
-    
+
 L_Let:
   mes "[Olana]";
   set Rossy_Quest, 5;
   set gotcherry, 0;
   mes "\"Thank you again. Please, bring it to her as fast as you can.\"";
   close;
-  
+
 L_Bring:
   mes "[Olana]";
   mes "\"Please, bring this letter to my daughter as fast as you can.\"";
   close;
-  
+
 L_BL:
   mes "[Olana]";
   mes "\"Good, now she won't forget her final exam.\"";
   close;
-  
+
 L_Rose:
   menu
     "Hi, Rossy did great in the exam. David told me her potion was flawless.", -;
@@ -114,7 +116,7 @@ L_Rose:
   menu
     "Ok, I will be back with the roses.", L_RG,
     "I'm allergic to roses, can't even touch them. Sorry.", L_No;
-    
+
 L_RG:
   if (Rossy_Quest == 8) set Rossy_Quest, 9;
   mes "[Olana]";
@@ -127,12 +129,12 @@ L_RC:
   set Rossy_Quest, 10;
   mes "\"Great job! Please hand them to my brilliant daughter, Rossy.\"";
   close;
-  
+
 L_BringRose:
   mes "[Olana]";
   mes "\"Now please hand them to my brilliant daughter, Rossy.\"";
   close;
-  
+
 L_Allergic:
   mes "[Olana]";
   mes "\"Did she like my present?\"";
@@ -150,12 +152,12 @@ L_Allergic:
   mes "[Olana]";
   mes "\"And don't forget to tell her that I'm really sorry.\"";
   close;
-  
+
 L_Give:
   mes "[Olana]";
   mes "\""+ strcharinfo(0) +", please, get 15 [Red Tulip]s and hand them to Rossy. Don't forget to tell her that I'm really sorry.\"";
   close;
-  
+
 L_Best:
   mes "[Olana]";
   mes "\"Thank you for your help "+ strcharinfo(0) +"!\"";
@@ -193,5 +195,5 @@ L_FinalEnd:
   mes "[Olana]";
   mes "*The mother is calmly waiting her daughters to come back for dinner.*";
   close;
-  
+
 }
diff --git a/npc/009-2/shops.txt b/npc/009-2/shops.txt
index d70939c2..733fa54f 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,51,57,0	script	Receptionist	108,{
+009-2.gat,50,48,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 80ab5a4a..265cd234 100644
--- a/npc/009-2/waitress.txt
+++ b/npc/009-2/waitress.txt
@@ -1,6 +1,6 @@
 // Waitress
 
-009-2.gat,47,51,0	script	Melinda	140,{
+009-2.gat,60,52,0	script	Melinda	140,{
 
 	mes "[Melinda]";
 	mes "\"Hi, sweetie! Want a fresh beer for 170 GP?\"";