summaryrefslogtreecommitdiff
path: root/npc/027-2_Caretakers_House
diff options
context:
space:
mode:
Diffstat (limited to 'npc/027-2_Caretakers_House')
-rwxr-xr-xnpc/027-2_Caretakers_House/gy_inn_shops.txt12
-rw-r--r--npc/027-2_Caretakers_House/husband.txt3
-rw-r--r--npc/027-2_Caretakers_House/lover.txt2
3 files changed, 8 insertions, 9 deletions
diff --git a/npc/027-2_Caretakers_House/gy_inn_shops.txt b/npc/027-2_Caretakers_House/gy_inn_shops.txt
index 6d1ce909..1cf4eebf 100755
--- a/npc/027-2_Caretakers_House/gy_inn_shops.txt
+++ b/npc/027-2_Caretakers_House/gy_inn_shops.txt
@@ -1,4 +1,4 @@
-// chef: function,
+// chef: function,
// barmaid: function,
// shopkeeper: multiples and function,
// magic undead shop: function,
@@ -7,17 +7,17 @@
// banker: function
-027-2.gat,75,22,0 shop Chef 300,784:100,785:100,786:100,787:100
-027-2.gat,90,36,0 shop Barmaid 301,788:100,789:100,790:100
+027-2.gat,75,22,0 shop Chef 300,784:-1,785:-1,786:-1,787:-1
+027-2.gat,90,36,0 shop Barmaid 301,788:-1,789:-1,790:-1
027-2.gat,93,22,0 shop Shopkeeper 302,586:1000,524:1600,544:10000,632:10000,528:1000,735:1
-027-2.gat,56,99,0 shop Magic Undead Shop 304,501:50
-027-2.gat,106,22,0 shop Chief Barman 309,784:100,785:100,786:100,787:100
+027-2.gat,56,99,0 shop Magic Undead Shop 304,501:-1,502:-1,518:100,567:-1,568:-1,631:1000,772:-1,773:-1,774:-1
+027-2.gat,106,22,0 shop Chief Barman 309,784:-1,785:-1,786:-1,787:-1,788:-1,789:-1,790:-1
// Inn
027-2.gat,107,39,0 script Bloody Receptionist 320,{
set @npcName$, "Barbara Grey";
set @cost, 1000;
-
+
mes "[" + @npcName$ + "]";
mes "\"Don't be shy darling.";
mes "\"Come on in and have a nice long ... long slumber ...";
diff --git a/npc/027-2_Caretakers_House/husband.txt b/npc/027-2_Caretakers_House/husband.txt
index 6b7432b6..03ac84a0 100644
--- a/npc/027-2_Caretakers_House/husband.txt
+++ b/npc/027-2_Caretakers_House/husband.txt
@@ -283,8 +283,7 @@ L_Apologize:
mes "\"However, you are a great friend and did a lot for me. I want you to have this.\"";
getinventorylist;
if (@inventorylist_count == 100) goto L_Full_Inv;
- //TODO: change it to different kind of bowlerhat
- getitem "BowlerHat", 1;
+ getitem "BowlerHatBrown", 1;
set @state, 7;
callsub S_Update_Mask;
close;
diff --git a/npc/027-2_Caretakers_House/lover.txt b/npc/027-2_Caretakers_House/lover.txt
index be3a1abe..ee2f5833 100644
--- a/npc/027-2_Caretakers_House/lover.txt
+++ b/npc/027-2_Caretakers_House/lover.txt
@@ -171,7 +171,7 @@ L_Golb:
mes "\"Good to see you back my friend. What did you find out?\"";
if (@golbanez < 5)
menu
- "I'm still working on getting all the stuff he wants.",L_Close;
+ "I'm still working on doing all the stuff Golbanez wants me to do.",L_Close;
menu
"Now I know what happened. I'll tell you.",-,
"I'm sorry to tell you, but this was all your fault.",-;