From a26b62359f9c37899eae509576493c25e047ba1f Mon Sep 17 00:00:00 2001
From: Jessica Tölke <jtoelke@mail.upb.de>
Date: Tue, 15 Feb 2011 16:59:03 +0100
Subject: gyinn: changing golbanez to golbenez in the outside file too headless
 man: small changes, proposal for needed amount of items

---
 npc/027-1_Graveyard/_import.txt             |  2 +-
 npc/027-1_Graveyard/golbanez.txt            | 29 -----------------------------
 npc/027-1_Graveyard/golbenez.txt            | 29 +++++++++++++++++++++++++++++
 npc/027-2_Caretakers_House/_import.txt      |  2 +-
 npc/027-2_Caretakers_House/headless_man.txt | 27 +++++++++++++++------------
 5 files changed, 46 insertions(+), 43 deletions(-)
 delete mode 100644 npc/027-1_Graveyard/golbanez.txt
 create mode 100644 npc/027-1_Graveyard/golbenez.txt

(limited to 'npc')

diff --git a/npc/027-1_Graveyard/_import.txt b/npc/027-1_Graveyard/_import.txt
index f88b7b45..130fd751 100644
--- a/npc/027-1_Graveyard/_import.txt
+++ b/npc/027-1_Graveyard/_import.txt
@@ -1,5 +1,5 @@
 map: 027-1.gat
 npc: npc/027-1_Graveyard/_mobs.txt
 npc: npc/027-1_Graveyard/_warps.txt
-//npc: npc/027-1_Graveyard/golbanez.txt
+//npc: npc/027-1_Graveyard/golbenez.txt
 npc: npc/027-1_Graveyard/graves.txt
diff --git a/npc/027-1_Graveyard/golbanez.txt b/npc/027-1_Graveyard/golbanez.txt
deleted file mode 100644
index 4e503d69..00000000
--- a/npc/027-1_Graveyard/golbanez.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-027-1.gat,68,89,0	script	#Golbenez#_M	204,{
-
-	set @fee, 666;
-
-	mes "[Golbanez]";
-	mes "\"Welcome mortal. I finished the creation of the place of leisure.\"";
-	next;
-	mes "\"I will bring you there for a small fee of " + @fee + "GP.\"";
-	menu
-		"What? You already got so much money!",-,
-		"Ok, bring me there.",L_Warp;
-
-	mes "[Golbanez]";
-	mes "\"Come back when you changed your mind. It's a wonderful place.\"";
-	close;
-
-L_Warp:
-	if (zeny < @fee) goto L_No_Money;
-	set zeny, zeny - @fee;
-	warp "027-2.gat", 105, 44;
-	close;
-
-L_No_Money:
-	mes "[Golbanez]";
-	mes "\"Don't try to betray me, pitiful human.\"";
-	next;
-	mes "\"Come back when you can pay my service.\"";
-	close;
-}
diff --git a/npc/027-1_Graveyard/golbenez.txt b/npc/027-1_Graveyard/golbenez.txt
new file mode 100644
index 00000000..f9a4e99f
--- /dev/null
+++ b/npc/027-1_Graveyard/golbenez.txt
@@ -0,0 +1,29 @@
+027-1.gat,68,89,0	script	#Golbenez#_M	204,{
+
+	set @fee, 666;
+
+	mes "[Golbenez]";
+	mes "\"Welcome mortal. I finished the creation of the place of leisure.\"";
+	next;
+	mes "\"I will bring you there for a small fee of " + @fee + "GP.\"";
+	menu
+		"What? You already got so much money!",-,
+		"Ok, bring me there.",L_Warp;
+
+	mes "[Golbenez]";
+	mes "\"Come back when you changed your mind. It's a wonderful place.\"";
+	close;
+
+L_Warp:
+	if (zeny < @fee) goto L_No_Money;
+	set zeny, zeny - @fee;
+	warp "027-2.gat", 105, 44;
+	close;
+
+L_No_Money:
+	mes "[Golbenez]";
+	mes "\"Don't try to betray me, pitiful human.\"";
+	next;
+	mes "\"Come back when you can pay my service.\"";
+	close;
+}
diff --git a/npc/027-2_Caretakers_House/_import.txt b/npc/027-2_Caretakers_House/_import.txt
index 2c6a658b..4dbb7fcb 100644
--- a/npc/027-2_Caretakers_House/_import.txt
+++ b/npc/027-2_Caretakers_House/_import.txt
@@ -10,7 +10,7 @@ npc: npc/027-2_Caretakers_House/diary.txt
 npc: npc/027-2_Caretakers_House/door.txt
 npc: npc/027-2_Caretakers_House/golbenez.txt
 npc: npc/027-2_Caretakers_House/gy_inn_shops.txt
-//npc: npc/027-2_Caretakers_House/headless_man.txt
+npc: npc/027-2_Caretakers_House/headless_man.txt
 npc: npc/027-2_Caretakers_House/husband.txt
 npc: npc/027-2_Caretakers_House/innkeeper.txt
 npc: npc/027-2_Caretakers_House/crying_child.txt
diff --git a/npc/027-2_Caretakers_House/headless_man.txt b/npc/027-2_Caretakers_House/headless_man.txt
index 21e49f72..bc0581bd 100644
--- a/npc/027-2_Caretakers_House/headless_man.txt
+++ b/npc/027-2_Caretakers_House/headless_man.txt
@@ -15,18 +15,20 @@
 
 	set @state, ((QUEST_Graveyard_Inn & @Graveyard_Inn_MASK) >> @Graveyard_Inn_SHIFT);
 
-	set @Wisp_Powder, 10; // TODO: set proper values for powders and dyes
-	set @Polt_Powder, 10;
-	set @Spec_Powder, 10;
-	set @Iron_Pot, 10;
-	set @Conc_Pot, 10;
-	set @Red_Dye, 2;
-	set @Yellow_Dye, 2;
-	set @LB_Dye, 2;
-
-	if (@state == 1) goto L_Quest_progress;
+	set @Wisp_Powder, 100;
+	set @Polt_Powder, 100;
+	set @Spec_Powder, 100;
+	set @Iron_Pot, 50;
+	set @Conc_Pot, 30;
+	set @Red_Dye, 50;
+	set @Yellow_Dye, 50;
+	set @LB_Dye, 50;
+
+	set @Glue_Exp, 50000;
+
+	if (@state >= 3) goto L_Final;
 	if (@state == 2) goto L_Quest_finished;
-	if (@state == 3) goto L_Final;
+	if (@state == 1) goto L_Quest_progress;
 
 	mes "You see a man, propped up against the foot of the bed.";
 	mes "In his hand, he is holding what you assume to be his own head.";
@@ -121,6 +123,7 @@ L_Quest_check:
 	delitem "YellowDye", @Yellow_Dye;
 	delitem "LightBlueDye", @LB_Dye;
 	delitem "InfantryHelmet", 1;
+	getexp @Glue_Exp, 0;
 	mes "[Thurstan]";
 	mes "\"Excellent, excellent!\"";
 	mes "";
@@ -180,7 +183,7 @@ L_Quest_finished:
 	mes "\"Please take this for your efforts.\"";
 	//TODO: Set appropriate reward
 	close;
-	
+
 L_Final:
 
 	mes "[Thurstan]";
-- 
cgit v1.2.3-70-g09d2