Merge branch 'master' of gitorious.org:~wombat/tmw-eathena-data/cache-serverdata

35 files changed, 283 insertions, 270 deletions

diff --git a/db/item_db.txt b/db/item_db.txt
index e12b812f..51d601d5 100644
--- a/db/item_db.txt
+++ b/db/item_db.txt
@@ -296,6 +296,13 @@
 //781,		WitchDoctorsMask,		Witch Doctor's Mask,		,	,	,	,	,	,	,	,	,	,	,	,	,	,	{},					{}
 782,		ForestArmor,			Forest Armor,			5,	3000,	1500,	40,	,	10,	,	-20,	0,	2,	512,	,	0,	0,	{},					{bonus bDex,				3;}
 783,		ValentineDress,			Valentine Dress,		5,	100000,	50000,	35,	,	15,	,	3,	0,	2,	512,	,	0,	0,	{},					{}
+784,		ZombieNachos,			Zombie Nachos,			0,	10,	5,	5,	,	,	,	,	,	2,	,	,	0,	,	{itemheal 50,				0;},					{},
+785,		LadyFingers,			Lady Fingers,			0,	10,	5,	5,	,	,	,	,	,	2,	,	,	0,	,	{itemheal 50,				0;},					{},
+786,		JellAhh,			Jell-Ahh,			0,	10,	5,	5,	,	,	,	,	,	2,	,	,	0,	,	{itemheal 50,				0;},					{},
+787,		Snapple,			Snapple,			0,	10,	5,	5,	,	,	,	,	,	2,	,	,	0,	,	{itemheal 50,				0;},					{},
+788,		BeetleJuice,			Beetle Juice,			0,	10,	5,	5,	,	,	,	,	,	2,	,	,	0,	,	{itemheal 50,				0;},					{},
+789,		GutBuster,			Gut Buster Ale,			0,	10,	5,	5,	,	,	,	,	,	2,	,	,	0,	,	{itemheal 50,				0;},					{},
+790,		BloodWine,			Blood Wine,			0,	10,	5,	5,	,	,	,	,	,	2,	,	,	0,	,	{itemheal 50,				0;},					{},
 
 1198,		JackOSoul,			Jack O Soul,			3,	100000,	1,	1,	,	,	,	,	,	,	,	,	,	,	{},					{}
 1199,		Arrow,				Arrow,				10,	3,	1,	1,	25,	0,	0,	,	0,	2,	32768,	,	,	,	{},					{}
diff --git a/npc/001-1_Tulimshar/elanore.txt b/npc/001-1_Tulimshar/elanore.txt
index 22f3611e..2d96ae6c 100644
--- a/npc/001-1_Tulimshar/elanore.txt
+++ b/npc/001-1_Tulimshar/elanore.txt
@@ -275,7 +275,7 @@ L_Teach_Initial:
         mes "\"Then say, '" + getspellinvocation("lesser-heal") + "', followed by the name of the one you wish to heal.\"";
         next;
 	mes "[Elanore the Healer]";
-        mes "\"You might want to write that down, actually.  In fact, you might want to make sure to keep notes of all spells you hear, for you never now if you will hear them again!\"";
+        mes "\"You might want to write that down, actually.  In fact, you might want to make sure to keep notes of all spells you hear, for you never know if you will hear them again!\"";
         mes "\"The invocation was '" + getspellinvocation("lesser-heal") + "'.\"";
         next;
 	mes "[Elanore the Healer]";
@@ -422,7 +422,7 @@ L_3_what_to_do:
         next;
 
 	mes "[Elanore the Healer]";
-        mes "\"First, you will need a concentration potion and an iron potion-- toghether, they will give her her strength back.  You also need a lifestone, and a gamboge leaf against the toxins in her body.\"";
+        mes "\"First, you will need a concentration potion and an iron potion-- together, they will give her her strength back.  You also need a lifestone, and a gamboge leaf against the toxins in her body.\"";
         next;
 
 	mes "[Elanore the Healer]";
diff --git a/npc/001-1_Tulimshar/entertainer.txt b/npc/001-1_Tulimshar/entertainer.txt
index 798ba534..149f1e2f 100644
--- a/npc/001-1_Tulimshar/entertainer.txt
+++ b/npc/001-1_Tulimshar/entertainer.txt
@@ -25,7 +25,7 @@ L_Learn2:
 	mes "[Entertainer]";
 	mes "\"All you have to do is press alt and a number";
 	mes "The number determines what emotion will be showned";
-	mes "Some clients will also show a emote shortcut-bar with the F12 button\"";
+	mes "Some clients will also show an emote shortcut-bar with the F12 button\"";
 	close;
 
 L_Has:
diff --git a/npc/001-1_Tulimshar/luca.txt b/npc/001-1_Tulimshar/luca.txt
index 1f574288..43c112f3 100644
--- a/npc/001-1_Tulimshar/luca.txt
+++ b/npc/001-1_Tulimshar/luca.txt
@@ -108,7 +108,7 @@ L_teach0_follow:
 
 	mes "[Luca the Hunter]";
     mes "\"Now stand over there. This should only take a second...\"";
-    mes "He takes of a pendant he is wearing and holds it up.";
+    mes "He takes off a pendant he is wearing and holds it up.";
     next;
 
 	mes "[Luca the Hunter]";
@@ -177,7 +177,7 @@ S_explain_loop:
 
 L_explain_focus:
     mes "[Luca the Hunter]";
-    mes "\"Well, you can learn many, many skills. But you can't really use all of them at once, not even old Aulsbels' head is big enough for that! So you have to focus.\"";
+    mes "\"Well, you can learn many, many skills. But you can't really use all of them at once, not even old Auldsbels' head is big enough for that! So you have to focus.\"";
     next;
     mes "[Luca the Hunter]";
     mes "\"But you can change that focus whenever you want. It works like this: You come to me, you tell me what you want to focus on, and we do exercises until it's stuck in your head.\"";
@@ -196,7 +196,7 @@ L_explain_focus:
     mes "[Luca the Hunter]";
     mes "\"You can come back to me to focus or unfocus whenever you want, I'm here all day.\"";
     next;
-    mes "\"For unfocussing you need to bring a potion special potion. That potion is not the easiest to get, but I am sure you are able to.\"";
+    mes "\"For unfocusing you need to bring a potion; a special potion. That potion is not the easiest to get, but I am sure you are able to.\"";
     next;
     goto S_explain_loop;
 
@@ -217,7 +217,7 @@ L_explain_skills:
 
 L_explain_work:
     mes "[Luca the Hunter]";
-    mes "\"Well, skills allow you to be better in some things, or just to do what you couldn't do without them. When you've learned a skill and are focussing on it, then it affects what you do.\"";
+    mes "\"Well, skills allow you to be better in some things, or just to do what you couldn't do without them. When you've learned a skill and are focusing on it, then it affects what you do.\"";
     next;
     mes "[Luca the Hunter]";
     mes "\"Now, when you start out with a skill, you won't be very good at it yet. But if you keep practicing you'll learn how to get better.\"";
@@ -333,7 +333,7 @@ L_unfocus:
         goto L_nopotion;
 
     mes "[Luca the Hunter]";
-    mes "\"Unfocussing is one of the harder parts though, because it is sunk in. You see?\"";
+    mes "\"Unfocusing is one of the harder parts though, because it is sunk in. You see?\"";
     next;
     mes "\"So to remove that mental focus we will need a special potion.\"";
     next;
@@ -341,18 +341,18 @@ L_unfocus:
     next;
     mes "\"Ah yes, of course you will need a recipe. Although the alchemist usually knows it.\"";
     next;
-    mes "\"The potion is called grimace of dementia. So the alchemist will know for sure.\"";
+    mes "\"The potion is called Grimace of Dementia. So the alchemist will know for sure.\"";
     set MAGIC_FLAGS, MAGIC_FLAGS | MFLAG_KNOWS_UNFOCUS_RECIPE;
     menu
-        "Ok, I will get a grimace of dementia potion", -,
+        "Ok, I will get a Grimace of Dementia potion", -,
         "Alright, be right back!", -;
     close;
 
 L_nopotion:
     mes "[Luca the Hunter]";
-    mes "\"Hey, You really need that dementia potion for unfocussing.\"";
+    mes "\"Hey, You really need that dementia potion for unfocusing.\"";
     next;
-    mes "\"Come back, when you found a suitable alchemist, who can mix such a potion.\"";
+    mes "\"Come back when you've found a suitable alchemist who can mix such a potion.\"";
     next;
     goto L_teachmore2;
 
@@ -360,7 +360,7 @@ L_unfocus_menu:
     mes "[Luca the Hunter]";
     mes "\"Ahh, I see you have a dementia potion.\"";
     next;
-    mes "\"What focus would you like to unfocus?\"";
+    mes "\"What skill would you like to unfocus?\"";
 
     getactivatedpoolskilllist;
 
@@ -393,7 +393,7 @@ L_teach_brawling:
     mes "He is laughing.";
     mes "\"And is handy, if some sapling starts getting naughty.\"";
     next;
-    mes "He rises his hand in front of his face and clenches his fists.";
+    mes "He raises his hands in front of his face and clenches his fists.";
     mes "\"Ok, let's go! Hold your hands like this.\"";
     next;
     mes ".......";
@@ -412,7 +412,7 @@ L_teach_nothing:
     mes "[Luca the Hunter]";
     mes "\"I was able to teach you brawling. For other professions you should visit someone else.\"";
     next;
-    mes "\"You see, I am an adventurer. Everybody has his tricks. But you really should visit someone, who is a teacher, not an adventurer now.\"";
+    mes "\"You see, I am an adventurer. Everybody has his tricks. But you really should visit someone who is a teacher, not an adventurer, now.\"";
     next;
     goto L_teachmore2;
 }
diff --git a/npc/001-1_Tulimshar/monster_guide.txt b/npc/001-1_Tulimshar/monster_guide.txt
index 23392b2d..697dc38e 100644
--- a/npc/001-1_Tulimshar/monster_guide.txt
+++ b/npc/001-1_Tulimshar/monster_guide.txt
@@ -7,7 +7,7 @@
 	close;
 Register:
 	mes "[Aidan the Monster Guide]";
-	mes "Oh my, you dont seem to be registered as a Quest Participant, would you like to register?";
+	mes "Oh my, you don't seem to be registered as a Quest Participant. Would you like to register?";
 	next;
 Choice:
 	menu "Register",L_R,"Not at the moment",L_N,"Information",L_I;
@@ -22,16 +22,16 @@ L_R:
 	close;
 L_N:
 	mes "[Aidan the Monster Guide]";
-	mes "Very well, you dont know what your missing.";
+	mes "Very well, you don't know what you're missing.";
 	close;
 L_I:
 	mes "[Aidan the Monster Guide]";
 	mes "Here in The Mana World, there are certain rewards for your vanquishing of foes.";
-	mes "For example, there are Monster Points, every monster you kill has a certain amount of points that get added to your account.";
+	mes "For example, there are Monster Points; every monster you kill has a certain amount of points that get added to your account.";
 	mes "The more points you have, the more expensive things you can buy using them.";
 	next;
 	mes "[Monster Guide]";
-	mes "So whaddya say, sign up won't you?";
+	mes "So whaddaya say, sign up won't you?";
 	next;
 	goto Choice;
 }
diff --git a/npc/006-1_Desert_mountains/pachua.txt b/npc/006-1_Desert_mountains/pachua.txt
index 25e961d3..996705c0 100644
--- a/npc/006-1_Desert_mountains/pachua.txt
+++ b/npc/006-1_Desert_mountains/pachua.txt
@@ -157,7 +157,7 @@ L_DealDone:
 
 L_NoDeal:
 	mes "[Chief Pachua]";
-	mes "\"Alright, but you wont get a better deal anywhere else!\"";
+	mes "\"Alright, but you won't get a better deal anywhere else!\"";
 	close;
 
 L_NoMoney:
diff --git a/npc/007-1_Woodland/voltain.txt b/npc/007-1_Woodland/voltain.txt
index f66b107f..ff13d70b 100644
--- a/npc/007-1_Woodland/voltain.txt
+++ b/npc/007-1_Woodland/voltain.txt
@@ -114,7 +114,7 @@ next;
 
 menu
     "I've got the stingers!", -,
-    "I'll go search for the them.", L_CLOSE;
+    "I'll go search for them.", L_CLOSE;
 
 mes "[Voltain]";
     if (countitem("BlackScorpionStinger") < @BLACK_SC_ST_NEEDED) goto L_NOT_ENOUGH;
@@ -163,7 +163,7 @@ mes "[Voltain]";
 
 state4:
 mes "[Voltain]";
-mes "\"I need to thicken a veno.. Oh a potion actually. I want to try mauve herbs for that, so can you bring me " + @HERBS_NEEDED + ", please?\"";
+mes "\"I need to thicken a veno.. Oh, a potion actually. I want to try mauve herbs for that, so can you bring me " + @HERBS_NEEDED + ", please?\"";
 next;
 
 menu
@@ -182,7 +182,7 @@ mes "[Voltain]";
 
 state5:
 mes "[Voltain]";
-mes  "\"Hello I am looking for " + @RAWLOG_NEEDED + " raw logs, maybe you could help me, getting some? I want to try if i can build a mouboo trap.. Uhm actually no! I want to build a device to destroy these traps. So can you help me?\"";
+mes  "\"Hello I am looking for " + @RAWLOG_NEEDED + " raw logs, maybe you could help me getting some? I want to try to build a mouboo trap.. Uhm actually no! I want to build a device to destroy these traps. So can you help me?\"";
 next;
 
 menu
@@ -218,7 +218,7 @@ mes "[Voltain]";
     
 state7:
 mes "[Voltain]";
-mes  "\"I need to thicken a veno.. Oh a potion actually. Cobalt herbs might be good for that, so can you bring me " + @HERBS_NEEDED + ", please?\"";
+mes  "\"I need to thicken a veno.. Oh, a potion actually. Cobalt herbs might be good for that, so can you bring me " + @HERBS_NEEDED + ", please?\"";
 next;
 
 menu
@@ -249,12 +249,12 @@ mes "[Voltain]";
     getexp @SNAKETONGUE_REWARD_XP, 0;
     set zeny, zeny + @SNAKETONGUE_REWARD_GOLD;    
     set $state, 9;
-    mes "\"Excellent, now I can extract the venom to- uhm, nevermind, thanks for your help.\"";
+    mes "\"Excellent, now I can extract the venom to- uhm, nevermind. Thanks for your help.\"";
     close;
     
 state9:
 mes "[Voltain]";
-mes  "\"I need to thicken a veno.. Oh a potion actually. I want to try alizarin herbs for that, so can you bring me " + @HERBS_NEEDED + ", please?\"";
+mes  "\"I need to thicken a veno.. Oh, a potion actually. I want to try alizarin herbs for that, so can you bring me " + @HERBS_NEEDED + ", please?\"";
 next;
 
 menu
@@ -274,12 +274,12 @@ state10:
 mes "[Voltain]";
 mes   "\"Oh I am hungry. Maybe I can eat some steaks. Could you bring me a steak,  please?\"";
 next;
-mes   "\"Oh, I just wonder, if i can inject some ven... Forget about that! Bring me " + @STEAK_NEEDED + "steaks!\"";
+mes   "\"Oh, I just wonder if i can inject some ven... Forget about that! Bring me " + @STEAK_NEEDED + "steaks!\"";
 next;
 
 menu
     "Here you go.", -,
-    "Help yourself! In the Hurnscald Inn you get some meal for sure!", L_CLOSE;
+    "Help yourself! In the Hurnscald Inn you can get some meals for sure!", L_CLOSE;
 
 mes "[Voltain]";
     if (countitem("Steak") < @STEAK_NEEDED) goto L_NOT_ENOUGH;
@@ -306,12 +306,12 @@ mes "[Voltain]";
     getexp @ARROW_REWARD_XP, 0;
     set zeny, zeny + @ARROW_REWARD_GOLD;    
     set $state, 12;
-    mes "\"Thanks a lot. Now I feel more secure here in outdoors.\"";
+    mes "\"Thanks a lot. Now I feel more secure here in the outdoors.\"";
     close;
 
 state12:
 mes "[Voltain]";
-mes  "\"I need to thicken a veno.. Oh a potion actually. I want to try gamboge herbs for that, so can you bring me " + @HERBS_NEEDED + ", please?\"";
+mes  "\"I need to thicken a veno.. Oh, a potion actually. I want to try gamboge herbs for that, so can you bring me " + @HERBS_NEEDED + ", please?\"";
 next;
 
 menu
@@ -348,7 +348,7 @@ mes "[Voltain]";
 
 L_NOHELP:
 mes "\"If you don't want to help me, then away with you. Bothering me won't help me get my work done.\"";
-mes "Voltain than mumbles something under his breath that you cannot quite make out"; 
+mes "Voltain then mumbles something under his breath that you cannot quite make out"; 
 mes "\"... These damn kids. \"";
 close;
 
diff --git a/npc/008-1_Hurnscald_outskirts/diryn.txt b/npc/008-1_Hurnscald_outskirts/diryn.txt
index 64d75676..c5ab21a4 100644
--- a/npc/008-1_Hurnscald_outskirts/diryn.txt
+++ b/npc/008-1_Hurnscald_outskirts/diryn.txt
@@ -2,7 +2,7 @@
 
 008-1.gat,81,82,0	script	Diryn the Traveler	103,{
 	mes "[Diryn]";
-    	mes "\"Greetings.  I am Diryn the Traveler, Assistant Councilor of Tulimshar and teleportation extraordinaire.  Tulimshar is expanding our influence throughout the world, so I was sent here to aid all who are willing and able to take on the threats to our interests.\"";
+    	mes "\"Greetings.  I am Diryn the Traveler, Assistant Councilor of Tulimshar and teleporter extraordinaire.  Tulimshar is expanding our influence throughout the world, so I was sent here to aid all who are willing and able to take on the threats to our interests.\"";
 	next;
 	mes "\"The monsters of the world have grown out of control, harming people, trade and travel.  Needless to say, Tulimshar is not happy with this problem.  Our solution: Rally those powerful enough to combat the monster threat and send them to hot spots to challenge the monster threat head on.  However, teleportation to these areas is not only extremely dangerous, but also highly expensive.   Do you think you got what it takes?\"";
 	menu
diff --git a/npc/008-1_Hurnscald_outskirts/hinnak.txt b/npc/008-1_Hurnscald_outskirts/hinnak.txt
index e61bc10a..4d17310c 100644
--- a/npc/008-1_Hurnscald_outskirts/hinnak.txt
+++ b/npc/008-1_Hurnscald_outskirts/hinnak.txt
@@ -231,7 +231,7 @@ L_Sagatha_scary:
 
 L_Sagatha_word:
 	mes "[Farmer Hinnak]";
-        mes "\"Oh, I can be sure... but something like '" + getspellinvocation("summon-maggots") + "', I think.\"";
+        mes "\"Oh, I can't be sure... but something like '" + getspellinvocation("summon-maggots") + "', I think.\"";
         close;
 
 L_NoBeer:
@@ -258,6 +258,6 @@ L_NohMask_Mask:
 
 L_NohMask_Satchel:
 	mes "[Farmer Hinnak]";
-	mes "\"Yes, I saw someone with a large sack on their back go to the minning camp.\"";
+	mes "\"Yes, I saw someone with a large sack on their back go to the mining camp.\"";
 	close;
 }
diff --git a/npc/009-1_Hurnscald/jack.txt b/npc/009-1_Hurnscald/jack.txt
index de78e37a..a0ee0b43 100644
--- a/npc/009-1_Hurnscald/jack.txt
+++ b/npc/009-1_Hurnscald/jack.txt
@@ -40,7 +40,7 @@
 	if (@Q_Forestbow < 1) close;
 
 	menu
-		"I heard you aren't delivering any more living wood. Why that?", -;
+		"I heard you aren't delivering any more living wood. Why not?", -;
 
 	mes "[Jack Lumber]";
 	mes "\"Why not?! I value my life, that's why!.\"";
@@ -85,14 +85,14 @@
 		"Did you fight them, too? ", -;
 
 	mes "[Jack Lumber]";
-	mes "\"Are you crazy? I barely destroyed one of those beasts. I was in no shape to fight again. I ran away as fast as i could. Lucky for me the monsters aren't that fast on their tiny root legs. Ha!\"";
+	mes "\"Are you crazy? I barely destroyed one of those beasts. I was in no shape to fight again. I ran away as fast as I could. Lucky for me the monsters aren't that fast on their tiny root legs. Ha!\"";
 
 	next;
 	menu
 		"So you aren't chopping down trees anymore?", -;
 
 	mes "[Jack Lumber]";
-	mes "\"I still do. It's my job. But I no longer chop those twigleafs, I'll tell you that. I know the bowyer master wants some wood from them, but I don't care. I won't risk my life for a few gold pieces. If you want to, just go to the southwest. But i won't go there ever again.\"";
+	mes "\"I still do. It's my job. But I no longer chop those twigleafs, I'll tell you that. I know the bowyer master wants some wood from them, but I don't care. I won't risk my life for a few gold pieces. If you want to, just go to the southwest. But I won't go there ever again.\"";
 
 	next;
 	menu
diff --git a/npc/009-1_Hurnscald/old_woman.txt b/npc/009-1_Hurnscald/old_woman.txt
index b20df136..c48b3557 100644
--- a/npc/009-1_Hurnscald/old_woman.txt
+++ b/npc/009-1_Hurnscald/old_woman.txt
@@ -55,7 +55,7 @@ L_NohMask_Fake:
 
 L_NohMask_Filler:
 	mes "[Old Woman]";
-	mes "\"I hope you castch that naughty person!\"";
+	mes "\"I hope you catch that naughty person!\"";
 	close;
 
 L_NohMask_Fake_Satchel:
diff --git a/npc/009-2_Hurnscald/airlia.txt b/npc/009-2_Hurnscald/airlia.txt
index 09900238..3f65a955 100644
--- a/npc/009-2_Hurnscald/airlia.txt
+++ b/npc/009-2_Hurnscald/airlia.txt
@@ -226,7 +226,7 @@ L_Fetch_initial_reward:
 	mes "[Airlia]";
 	// TODO: Write the dialogue when I'm not tired...
 	mes "\"Oh, before you leave. We all must do what we can to stop this tragedy.";
-	mes "If you are willing to keep draining the undead of mana, I willl give you what gold I can afford as a token of my gratitude.\"";
+	mes "If you are willing to keep draining the undead of mana, I will give you what gold I can afford as a token of my gratitude.\"";
 	close;
 
 L_Fetch_later_rewards:
diff --git a/npc/009-2_Hurnscald/alan.txt b/npc/009-2_Hurnscald/alan.txt
index d124e9e0..28ca7d47 100644
--- a/npc/009-2_Hurnscald/alan.txt
+++ b/npc/009-2_Hurnscald/alan.txt
@@ -45,7 +45,7 @@ L_State_0_1:
 	next;
 	menu
 		"Oh, too bad.", -,
-		"What? Why that?", L_State_0_2;
+		"What? Why not?", L_State_0_2;
 	close;
 
 L_State_0_2:
@@ -152,7 +152,7 @@ L_State_3_success:
 	mes "Alan tries as hard as he can but the log won't bend.";
 	next;
 	mes "[Alan]";
-	mes "\"Aaah! Yes! That is a really fine piece of wood you bought me. It will make an excelent bow!\"";
+	mes "\"Aaah! Yes! That is a really fine piece of wood you brought me. It will make an excellent bow!\"";
 	next;
 	set @Q_status, 4;
         callsub S_Update_Var;
diff --git a/npc/009-2_Hurnscald/doctor.txt b/npc/009-2_Hurnscald/doctor.txt
index e2cd6f20..2fbfcbd1 100644
--- a/npc/009-2_Hurnscald/doctor.txt
+++ b/npc/009-2_Hurnscald/doctor.txt
@@ -61,7 +61,7 @@ L_Eyepatch:
 		"No thank you", -;
 
 	mes "[Doctor]";
-	mes "\"If you change you're mind, please come back and see me.\"";
+	mes "\"If you change your mind, please come back and see me.\"";
 	close;
 
 L_Eyepatch_GlassEye:
diff --git a/npc/009-2_Hurnscald/kfahr.txt b/npc/009-2_Hurnscald/kfahr.txt
index 3806c10e..88438b40 100644
--- a/npc/009-2_Hurnscald/kfahr.txt
+++ b/npc/009-2_Hurnscald/kfahr.txt
@@ -217,7 +217,7 @@ L_tale_desert_worm:
 
 	mes "[Kfahr the Warrior]";
 	mes "Kfahr leans forward.";
-	mes "\"So this humongous beast came roaring towards us, a big back hole where the mouth is, spiky fins sticking out to the side, all ready to swallow us all!  My sword felt like a toothpick against that monster!\"";
+	mes "\"So this humongous beast came roaring towards us, a big back hole where the mouth is, spikey fins sticking out to the side, all ready to swallow us all!  My sword felt like a toothpick against that monster!\"";
 	next;
 
 	mes "[Kfahr the Warrior]";
@@ -515,7 +515,7 @@ L_tale_desert_temple:
 L_tale_tablet:
 
 	mes "[Kfahr the Warrior]";
-	mes "\"Well, we couldn't read it.  We later sold it for a good price, to a young travelling archeologist, Doctor Nohlidge or something like that.  She said that the engravings described sacrifical practices of an ancient snake cult...\"";
+	mes "\"Well, we couldn't read it.  We later sold it for a good price, to a young travelling archeologist; Doctor Nohlidge or something like that.  She said that the engravings described sacrifical practices of an ancient snake cult...\"";
 	mes "He shrugs.";
 	next;
 	goto L_main_menu;
@@ -611,7 +611,7 @@ L_tale_hero_tulimshar:
 	next;
 
 	mes "[Kfahr the Warrior]";
-	mes "\"Then it took a deep breath-- and I realised that that was probably `it' for me;  Stinkewyrms can breathe fire like real dragons, and I didn't have the time to run back to the water.\"";
+	mes "\"Then it took a deep breath-- and I realised that that was probably 'it' for me;  Stinkewyrms can breathe fire like real dragons, and I didn't have the time to run back to the water.\"";
 	next;
 
 	mes "[Kfahr the Warrior]";
@@ -623,7 +623,7 @@ L_tale_hero_tulimshar:
 	next;
 
 	mes "[Kfahr the Warrior]";
-	mes "\"So it stared at me, wide agape-- the perfect opening!\"";
+	mes "\"So it stared at me, mouth wide agape-- the perfect opening!\"";
 	next;
 
 	mes "[Kfahr the Warrior]";
@@ -913,7 +913,7 @@ L_snakeskins_missing:
 
 L_SnakeSkins_TooMany:
 	mes "[Kfahr the Warrior]";
-	mes "\"YOu don't have room for this. Come back when you do.\"";
+	mes "\"You don't have room for this. Come back when you do.\"";
 	close;
 
 L_give_beer:
diff --git a/npc/009-2_Hurnscald/lena.txt b/npc/009-2_Hurnscald/lena.txt
index 52144a35..903a0d5a 100644
--- a/npc/009-2_Hurnscald/lena.txt
+++ b/npc/009-2_Hurnscald/lena.txt
@@ -45,10 +45,10 @@ L_Lena_Fairy_Hat:
 	mes "[Lena]";
 	mes "\"Ah, you've brought me the [Bandit Hood]s.  As promised, here is a hat like mine.\"";
 	next;
-	mes "\"Unfortunately, I feel this bandit threat may of grown.  Perhaps they are being lead?  I noticed many of them seem to hang around a cave just west of Hurnscald.  If you could defeat their leader I know they will become less of a threat to Hurnscald.  I'll reward you with armor like mine if you do.  Sound like something you could do?\"";
+	mes "\"Unfortunately, I feel this bandit threat may have grown.  Perhaps they are being lead?  I noticed many of them seem to hang around a cave just west of Hurnscald.  If you could defeat their leader I know they will become less of a threat to Hurnscald.  I'll reward you with armor like mine if you do.  Sound like something you could do?\"";
 	menu
 		"Consider it done!", L_Lena_Bandit_Leader_Yes,
-		"Woah there, that sounds a bit harder than what I can suceed at.", L_Lena_NoWay;
+		"Woah there, that sounds a bit harder than what I can succeed at.", L_Lena_NoWay;
 	close;
 
 L_Lena_NotEnough:
@@ -58,7 +58,7 @@ L_Lena_NotEnough:
 
 L_Lena_Bandit_Leader:
 	mes "[Lena]";
-	mes "\"I feel this bandit threat may of grown.  Perhaps they are being lead?  I noticed many of them seem to hang around a cave just west of Hurnscald.  If you could defeat their leader I know they will become less of a threat to Hurnscald.  I'll reward you with armor like mine if you do.  Sound like something you could do?\"";
+	mes "\"I feel this bandit threat may have grown.  Perhaps they are being lead?  I noticed many of them seem to hang around a cave just west of Hurnscald.  If you could defeat their leader I know they will become less of a threat to Hurnscald.  I'll reward you with armor like mine if you do.  Sound like something you could do?\"";
 	menu
 		"Consider it done!", L_Lena_Bandit_Leader_Yes,
 		"Woah there, that sounds a bit harder than what I can succeed at.", L_Lena_NoWay;
@@ -69,7 +69,7 @@ L_Lena_Bandit_Leader_Yes:
 	areamonster "008-1.gat",25,60,40,65,"Bandit",1064,3, "::";
 	areamonster "011-1.gat",35,40,65,60,"Bandit",1064,3, "::";
 	mes "[Lena]";
-	mes "\"You have a brave heart.  Though I know you can suceed on your own, I recommend finding others to help you defeat the bandit leader.  I believe he could pose a significant threat to solitary individuals seeking to challenge him.  Good luck!\"";
+	mes "\"You have a brave heart.  Though I know you can succeed on your own, I recommend finding others to help you defeat the bandit leader.  I believe he could pose a significant threat to solitary individuals seeking to challenge him.  Good luck!\"";
 	close;
 
 L_Lena_NoWay:
diff --git a/npc/009-2_Hurnscald/nicholas.txt b/npc/009-2_Hurnscald/nicholas.txt
index d3767a97..ac0b5e43 100644
--- a/npc/009-2_Hurnscald/nicholas.txt
+++ b/npc/009-2_Hurnscald/nicholas.txt
@@ -262,7 +262,7 @@ L_YesShield:
 
 L_ShieldNoZeny:
         mes "[Nicholas]";
-        mes "\"I am sorry, but I must ask that you pay 20,000 GP; this is qualty work.\"";
+        mes "\"I am sorry, but I must ask that you pay 20,000 GP; this is quality work.\"";
         close;
 
 L_ShieldNoInfantry:
diff --git a/npc/009-2_Hurnscald/nurse.txt b/npc/009-2_Hurnscald/nurse.txt
index 7212597f..a47fdf95 100644
--- a/npc/009-2_Hurnscald/nurse.txt
+++ b/npc/009-2_Hurnscald/nurse.txt
@@ -91,7 +91,7 @@ L_NoHeal:
 
 L_NohMask:
     mes "[Nurse]";
-    mes "\"I'm to busy here to observe the town.\"";
+    mes "\"I'm too busy here to observe the town.\"";
     close;
 
 state0:
@@ -106,7 +106,7 @@ state0:
     next;
     menu
         "I will do what I can. What do you need?", L_firstquest,
-        "I'm really sorry, but I don't think, I can help you.", -;
+        "I'm really sorry, but I don't think I can help you.", -;
 
     mes "\"That is disagreeable to hear. Maybe I can find another person to take this task.\"";
     next;
@@ -150,13 +150,13 @@ L_ExplainAgain2:
     close;
 
 state2:
-    mes "You look at the nurse, who seems to be really tired with shadows under her eyes. When she recognizes you, she smiles.";
+    mes "You look at the nurse, who seems to be really tired, with shadows under her eyes. When she recognizes you, she smiles.";
     mes "[Nurse]";
-    mes "\"I managed to extract the poisonous components. We should be able to create an antidote, if you have anything else we need.\"";
+    mes "\"I managed to extract the poisonous components. We should be able to create an antidote, if you have everything else we need.\"";
     next;
     menu
         "Actually, I have another question.", L_Usual,
-        "I have a bad memory. Can you tell me again, what we need?", L_ExplainAgain2,
+        "I have a bad memory. Can you tell me again what we need?", L_ExplainAgain2,
         "I managed to get everything we need.", -,
         "I will go and get it.", quit;
 
@@ -175,7 +175,7 @@ L_Chemistry:
     callsub L_Shuffle_Need;
     mes "The nurse takes the ingredients you brought and starts to squeeze the fruits and to crush the acorns. Then she put the fruit juices in some complicated looking chemical device.";
     next;
-    mes "After some minutes, it is blubbering and steaming and a liquid is dropping in a pot under the device.";
+    mes "After some minutes, it is blubbering and steaming and a liquid is dripping in a pot under the device.";
     next;
     mes "Then she takes the acorn flour and the liquid and goes to a place back in the room, where she does something you don't see.";
     next;
@@ -311,9 +311,9 @@ L_choosePut:
 m_hl_m_vn:
     //poison for 3 minutes
     sc_start sc_poison, 1, 20;
-    mes "You began to feel really dizzy. And you feel so light - you can't help yourself and burst out with laughter. What a strange feeling!";
+    mes "You begin to feel really dizzy. And you feel so light - you can't help yourself and burst out with laughter. What a strange feeling!";
     next;
-    mes "The nurse looks at you with a really worried look in her face. As you open your mouth to tell her that you feel allright, the content of your stomach finds its way out through your throat and on the floor.";
+    mes "The nurse looks at you with a really worried look on her face. As you open your mouth to tell her that you feel alright, the content of your stomach finds its way out through your throat and on the floor.";
     next;
     mes "The feeling of happiness disappears, but you seem to be still poisoned.";
     goto check_st;
@@ -327,9 +327,9 @@ m_hl_l_vn:
     next;
     mes "Anyway, what are you doing here? Actually, where are you?";
     next;
-    mes "You don't care, you feel so great. You start to giggle and laugh uncontrollable. What a wonderful feeling. ";
+    mes "You don't care, you feel so great. You start to giggle and laugh uncontrollably. What a wonderful feeling. ";
     next;
-    mes "Suddenly, the world has some really strange colors. As you watch this women in front of you changing her color from dark green to a light purple, you become really tired.";
+    mes "Suddenly, the world has some really strange colors. As you watch this woman in front of you changing her color from dark green to a light purple, you become really tired.";
     next;
     mes "You lay down on the floor and fall asleep.";
     next;
@@ -386,7 +386,7 @@ allcorrect:
     mes "You feel totally normal again.";
     next;
     mes "[Nurse]";
-    mes "\"Wonderfull! You made it! Now I will be able to help all the people who get poisoned in the mines!\"";
+    mes "\"Wonderful! You made it! Now I will be able to help all the people who get poisoned in the mines!\"";
     next;
     mes "\"Thank you so much! Oh, and it seems as if you have gained the skill to resist poison someway. This is great.\"";
     next;
@@ -432,7 +432,7 @@ state5:
      next;
      mes "\"But if we succeed we will be heroes! I will be able to help a lot of people.\"";
      next;
-     mes "\"Next time you might remember me to label the distillates correctly. I am sorry that it is screwed up again.\"";
+     mes "\"Next time you might remind me to label the distillates correctly. I am sorry that it is screwed up again.\"";
      next;
      mes "\"There is enough stuff left for one last try.\"";
      next;
diff --git a/npc/009-2_Hurnscald/wyara.txt b/npc/009-2_Hurnscald/wyara.txt
index fc80798c..145f09a5 100644
--- a/npc/009-2_Hurnscald/wyara.txt
+++ b/npc/009-2_Hurnscald/wyara.txt
@@ -83,7 +83,7 @@ L_Q_astralsoul:
         mes "[Wyara the Witch]";
         mes "\"The astral soul skill? Yes, I have heard about that. It can be taught by old and wise mages usually.\"";
         next;
-        mes "\"You need lots of practise until you can handle the ability, and even more practises until you have the powers to teach it to someone else.\"";
+        mes "\"You need lots of practise until you can handle the ability, and even more practise until you have the powers to teach it to someone else.\"";
         next;
         goto L_Main;
 
diff --git a/npc/009-4/orum.txt b/npc/009-4/orum.txt
index 927fc939..a2e56f49 100644
--- a/npc/009-4/orum.txt
+++ b/npc/009-4/orum.txt
@@ -53,7 +53,7 @@
 

 L_Explain:

 	mes "[Orum]";

-	mes "\"Recently a woman claiming to be a witch came to my village seeking help from my mentor Woric, who is a very powerful wizard, but he refused and she left. But..\"";

+	mes "\"Recently a woman claiming to be a witch came to my village seeking help from my mentor Waric, who is a very powerful wizard, but he refused and she left. But..\"";

 	next;

 

 	mes "[Orum]";

@@ -69,7 +69,7 @@ L_Explain:
 		"I'd like to help but I have to go..", -;

 

 	mes "[Orum]";

-	mes "\"Thats too bad.. well if you ever have some free time I probably won't figure this out any time soon.\"";

+	mes "\"Thats too bad.. well, if you ever have some free time, I probably won't figure this out any time soon.\"";

 	close;

 

 L_Explain_Barriers:

@@ -86,7 +86,7 @@ L_Explain_Barriers:
 		"I think its meant to keep us out.. bye.", -;

 

 	mes "[Orum]";

-	mes "\"You may be right.. but she kidnapped Woric. I know it! So I must do something! If you ever change your mind I could sure use the help.\"";

+	mes "\"You may be right.. but she kidnapped Waric. I know it! So I must do something! If you ever change your mind I could sure use the help.\"";

 	close;

 

 L_Explain_Note:

@@ -229,7 +229,7 @@ L_Check_Materials:
 	mes "Orum takes the hard spikes in his hand and begins chanting some words..";

 	next;

 

-	mes "You watch as they begin mold together glowing brightly. He sprinkles in the powder you gathered and presses his hands together.";

+	mes "You watch as they begin to mold together, glowing brightly. He sprinkles in the powder you gathered and presses his hands together.";

 

 	misceffect sfx_magic_transmute;

 	next;

@@ -326,7 +326,7 @@ L_Explore:
 

 L_Explain_Objective:

 	mes "[Orum]";

-	mes "\"I'm positive this is where that witch took Woric, so this cave must lead to somewhere. Try looking around for another exit. I've almost gained my energy back and then I can help.\"";

+	mes "\"I'm positive this is where that witch took Waric, so this cave must lead to somewhere. Try looking around for another exit. I've almost gained my energy back and then I can help.\"";

 	close;

 

 L_Found_Barriers:

@@ -366,7 +366,7 @@ L_Explain_Note_More:
 	next;

 

 	mes "[Orum]";

-	mes "\"It mentions some sort of security system to keep people from entering the actual lair but it doesn't explain in great detail. Try exploring more maybe we will find some answers.\"";

+	mes "\"It mentions some sort of security system to keep people from entering the actual lair but it doesn't explain in great detail. Try exploring more; maybe we will find some answers.\"";

 	next;

 

 	mes "Orum continues examining the note..";

@@ -455,7 +455,7 @@ L_Still_Gathering:
 		"I've almost got them all..", -;

 

 	mes "[Orum]";

-	mes "\"Don't make me remind you again! Waric's life is on the line here! Hurry up!\"";

+	mes "\"Don't make me remind you again! Warics life is on the line here! Hurry up!\"";

 	close;

 

 L_List_Materials_More:

@@ -490,11 +490,11 @@ L_Finished_Gathering_More:
 	mes "\"Excellent work! And once again you did not take as long as I was expecting. I guess I will get started..\"";

 	next;

 

-	mes "You watch as Orum takes the iron powder and ash and begins chanting some words.. The two start to glow and mold together turning into a light metalic looking powder..";

+	mes "You watch as Orum takes the iron powder and ash and begins chanting some words.. The two start to glow and mold together turning into a light, metallic looking powder..";

 	next;

 	misceffect sfx_magic_transmute;

 

-	mes "He then splits the powder into three piles and performs separate spells on each using the herbs. After he finishes you see 3 piles of colored metalic powder that appear to be red, yellow, and blue..";

+	mes "He then splits the powder into three piles and performs separate spells on each using the herbs. After he finishes you see 3 piles of colored metallic powder that appear to be red, yellow, and blue..";

 	next;

 	misceffect sfx_magic_transmute;

 

@@ -516,7 +516,7 @@ L_Missing_Materials_More:
 	next;

 

 	mes "[Orum]";

-	mes "\"You really enjoy playing games with Warics' life don't you! Come back when you have ALL of the items I told you.\"";

+	mes "\"You really enjoy playing games with Warics life, don't you! Come back when you have ALL of the items I told you.\"";

 	close;

 

 L_Finish_Up:

@@ -528,7 +528,7 @@ L_Finish_Up:
 	next;

 

 	menu

-		"No I'm still not sure how..", L_Explain_Torches_More,

+		"No, I'm still not sure how..", L_Explain_Torches_More,

 		"I need more of that powder.", L_More_Powder,

 		"I'm still trying..", -;

 

@@ -581,7 +581,7 @@ L_More_Powder_Make:
 	next;

 

 	mes "[Orum]";

-	mes "\"Here you are. And try to conserve this time! The more powder I have to make the more time and resources we use up that we could be using to save Waric!\"";

+	mes "\"Here you are. And try to conserve this time! The more powder I have to make, the more time and resources we use up that we could be using to save Waric!\"";

 

 	getitem "RedPowder", @BT_REWARDCOUNT;

 	getitem "YellowPowder", @BT_REWARDCOUNT;

@@ -589,7 +589,7 @@ L_More_Powder_Make:
 	close;

 

 L_Finished_Up:

-	mes "As you approch you think you see Orum rolling his eyes.. maybe your imagining it..";

+	mes "As you approch you think you see Orum rolling his eyes.. maybe you're imagining it..";

 	next;

 

 	mes "[Orum]";

@@ -611,7 +611,7 @@ L_Enter_Cavern:
 	mes "Orum heads to the barrier then gives you a look as if he does not believe you before walking forward..";

 	next;

 

-	mes "He is suddently thrown againt the wall behind him! Angered, he gets up, brushes himself off, and heads back to the entrance without speaking.";

+	mes "He is suddenly thrown against the wall behind him! Angered, he gets up, brushes himself off, and heads back to the entrance without speaking.";

 	close;

 

 L_Ready_Cavern:

diff --git a/npc/009-4/torches.txt b/npc/009-4/torches.txt
index d1ea73be..a00ab95c 100644
--- a/npc/009-4/torches.txt
+++ b/npc/009-4/torches.txt
@@ -84,21 +84,21 @@ function	script	InRangeTorch1	{
 	if (isin("009-4.gat",67,20,69,25))

 		return;

 

-	mes "Your too far away to do anything with that torch.";

+	mes "You're too far away to do anything with that torch.";

 	close;

 }

 function	script	InRangeTorch2	{

 	if (isin("009-4.gat",65,41,69,46))

 		return;

 

-	mes "Your too far away to do anything with that torch.";

+	mes "You're too far away to do anything with that torch.";

 	close;

 }

 function	script	InRangeTorch3	{

 	if (isin("009-4.gat",33,84,37,88))

 		return;

 

-	mes "Your too far away to do anything with that torch.";

+	mes "You're too far away to do anything with that torch.";

 	close;

 }

 

@@ -155,7 +155,7 @@ L_Use_Blue:
 	goto L_Show_Color;

 

 L_No_Powder:

-	mes "You notice your all out of that color of powder.. Perhaps Orum can make you some more.";

+	mes "You notice you're all out of that color of powder.. Perhaps Orum can make you some more.";

 	close;

 

 L_Show_Color:

@@ -164,7 +164,7 @@ L_Show_Color:
 	if (@TorchColor == @lastColor) goto L_Wrong_Color;

 	misceffect 5;

 	set @lastColor, @TorchColor;

-	mes "As your pour the powder into the flame you can see it's tint transform to a " + @intensities$[@TorchIntensity] + " " + @colors$[@TorchColor] + "..";

+	mes "As your pour the powder into the flame you can see its tint transform to a " + @intensities$[@TorchIntensity] + " " + @colors$[@TorchColor] + "..";

 	goto L_Color_Loop;

 

 L_Wrong_Color:

@@ -238,7 +238,7 @@ L_Use_Blue:
 	goto L_Show_Color;

 

 L_No_Powder:

-	mes "You notice your all out of that color powder.. Perhaps Orum can make you some more.";

+	mes "You notice you're all out of that color powder.. Perhaps Orum can make you some more.";

 	close;

 

 L_Show_Color:

@@ -247,7 +247,7 @@ L_Show_Color:
 	if (@TorchColor == @lastColor) goto L_Wrong_Color;

 	misceffect 5;

 	set @lastColor, @TorchColor;

-	mes "As your pour the powder into the flame you can see it's tint transform to a " + @intensities$[@TorchIntensity] + " " + @colors$[@TorchColor] + "..";

+	mes "As your pour the powder into the flame you can see its tint transform to a " + @intensities$[@TorchIntensity] + " " + @colors$[@TorchColor] + "..";

 	goto L_Color_Loop;

 

 L_Wrong_Color:

@@ -269,6 +269,7 @@ L_Failed:
 	close;

 }

 

+

 // Third Torch

 009-4.gat,33,86,0	script	Torch	127,{

 	callfunc "InRangeTorch3";

@@ -285,7 +286,7 @@ L_Failed:
 	goto L_Color_Loop;

 

 L_Too_Far:

-	mes "Your too far away to do anything with that torch.";

+	mes "You're too far away to do anything with that torch.";

 	close;

 

 L_Color_Loop:

@@ -326,7 +327,7 @@ L_Use_Blue:
 	goto L_Show_Color;

 

 L_No_Powder:

-	mes "You notice your all out of that color powder.. Perhaps Orum can make you some more.";

+	mes "You notice you're all out of that color powder.. Perhaps Orum can make you some more.";

 	close;

 

 L_Show_Color:

@@ -335,7 +336,7 @@ L_Show_Color:
 	if (@TorchColor == @lastColor) goto L_Wrong_Color;

 	misceffect 5;

 	set @lastColor, @TorchColor;

-	mes "As your pour the powder into the flame you can see it's tint transform to a " + @intensities$[@TorchIntensity] + " " + @colors$[@TorchColor] + "..";

+	mes "As your pour the powder into the flame you can see its tint transform to a " + @intensities$[@TorchIntensity] + " " + @colors$[@TorchColor] + "..";

 	goto L_Color_Loop;

 

 L_Wrong_Color:

diff --git a/npc/010-2_Dimonds_Cove/doug.txt b/npc/010-2_Dimonds_Cove/doug.txt
index 43b1df2d..0f35e02a 100644
--- a/npc/010-2_Dimonds_Cove/doug.txt
+++ b/npc/010-2_Dimonds_Cove/doug.txt
@@ -23,7 +23,7 @@ L_1:
 
 L_2:
 	mes "[Doug]";
-	mes "\"This is gonna be bright! A must have for anyone! All i need is a few parts...\"";
+	mes "\"This is gonna be bright! A must have for anyone! All I need is a few parts...\"";
 	next;
 	goto L_Question;
 
diff --git a/npc/010-2_Dimonds_Cove/loratay.txt b/npc/010-2_Dimonds_Cove/loratay.txt
index c336de32..cb784ebb 100644
--- a/npc/010-2_Dimonds_Cove/loratay.txt
+++ b/npc/010-2_Dimonds_Cove/loratay.txt
@@ -173,7 +173,7 @@ L_agostine_4:
 
 L_agostine_5:
         mes "[Lora Tay the Seamstress]";
-        mes "\"Good for you.  That arrogant good-for-nothing couldn't tell a piece of cotton from chain mail if wiped his nose with it!\"";
+        mes "\"Good for you.  That arrogant good-for-nothing couldn't tell a piece of cotton from chain mail if he wiped his nose with it!\"";
         close;
 
 L_no_water:
diff --git a/npc/011-1_Woodland/auldsbel.txt b/npc/011-1_Woodland/auldsbel.txt
index 1c6487c0..8982f699 100644
--- a/npc/011-1_Woodland/auldsbel.txt
+++ b/npc/011-1_Woodland/auldsbel.txt
@@ -329,10 +329,10 @@ L_about_astral:
 
 L_about_war:
         mes "[Auldsbel the Wizard]";
-        mes "\"War magic deals with the inevitable necessity of struggle against other creatures, and sometimes even against other humans.  War magic exclusively focusses on dealing damage and destruction.\"";
+        mes "\"War magic deals with the inevitable necessity of struggle against other creatures, and sometimes even against other humans.  War magic exclusively focuses on dealing damage and destruction.\"";
         next;
         mes "[Auldsbel the Wizard]";
-        mes "\"If you use War magic, You better have a Transmuter around for the aftermath, to clear up your collateral damage.\"";
+        mes "\"If you use War magic, you better have a Transmuter around for the aftermath, to clear up your collateral damage.\"";
         next;
         goto L_about_schools_minimenu;
 
@@ -419,7 +419,7 @@ L_about_astral_power:
         mes "\"A person's astral power is determined by several factors:  overall experience, intelligence, and any and all equipment the person may be wearing at a given time.\"";
         next;
         mes "[Auldsbel the Wizard]";
-        mes "\"Greater astral power mans more powerful spells.  Since equipment can greatly decrease astral power, most magic users tend to be careful about what they wear-- it takes a while to recover astral power even after armour is unequipped.\"";
+        mes "\"Greater astral power means more powerful spells.  Since equipment can greatly decrease astral power, most magic users tend to be careful about what they wear-- it takes a while to recover astral power even after armour is unequipped.\"";
         next;
         mes "[Auldsbel the Wizard]";
         mes "\"The worst offenders are metal items, particularly shields and body armour.  Helmets and gloves get in the way, too.  Still, a few special or enchanted items may even increase magical power.\"";
@@ -434,7 +434,7 @@ L_about_catalysts:
 
 L_about_components:
         mes "[Auldsbel the Wizard]";
-        mes "\"A material component is an item that is consumed as part of the spell's magic.  For example, when transmuting wood into arrows, you must consume a raw log to shape the arrows out of it.\"";
+        mes "\"A material component is an item that is consumed as part of the spells magic.  For example, when transmuting wood into arrows, you must consume a raw log to shape the arrows out of it.\"";
         next;
         goto L_about_spells_minimenu;
 
@@ -462,13 +462,13 @@ L_about_auldsbel:
         mes "It ensures that Transmuter conduct is according to its statutes and acts as representative and point of contact towards other entities.\"";
         next;
         mes "[Auldsbel the Wizard]";
-        mes "\"Of all the schools of magic, the School of Transmutation the most organised by far, and held in high esteem by rulers all across the world.  Of course this is not only due to the outstanding and rigid structure of the school, but also because of the exceptional services that its members provide.\"";
+        mes "\"Of all the schools of magic, the School of Transmutation is the most organised by far, and held in high esteem by rulers all across the world.  Of course this is not only due to the outstanding and rigid structure of the school, but also because of the exceptional services that its members provide.\"";
         next;
         mes "[Auldsbel the Wizard]";
         mes "\"The Council, presently overseen by Lord Transmogrifier Pontorias the Plaid (May His Shape Reflect His Soul Forever), consists of fourty-nine members and is situated in the citadel of Dorngard, in the northern mountains near the Crimson Cascade.\"";
         next;
         mes "[Auldsbel the Wizard]";
-        mes "\"The Council is souvereign over three hundred acres of land and nearby farming communities and has been ever since Yorick the Younger shaped Dorngard out of a mountain by sheer power of will, to build a home for the school his father had founded.\"";
+        mes "\"The Council is sovereign over three hundred acres of land and nearby farming communities and has been ever since Yorick the Younger shaped Dorngard out of a mountain by sheer power of will, to build a home for the school his father had founded.\"";
         next;
         mes "[Auldsbel the Wizard]";
         mes "\"The Council has held peaceful relations with nearby realms for almost two centruries now and is widely regarded as a reliable partner in shaping civilization to allow it to evolve towards its next stage.\"";
@@ -481,7 +481,7 @@ L_about_auldsbel:
 
 L_about_auldsbel_2:
         mes "[Auldsbel the Wizard]";
-        mes "\"Oh, myself?  I am just vacationing in the area.  Very relaxed and peaceful place, the Hurnscald area.  And plenty of splendid specimen for experimentation.\"";
+        mes "\"Oh, myself?  I am just vacationing in the area.  Very relaxed and peaceful place, the Hurnscald area.  And plenty of splendid specimens for experimentation.\"";
         next;
         goto L_main_menu;
 
@@ -535,7 +535,7 @@ L_Q_astralsoul_L:
         next;
         mes "\"But I will need some very expensive magical substances to focus your brain onto magic.\"";
         next;
-        mes "\"It is about... erm 11300 GP. Do you have so much money?\"";
+        mes "\"It is about... erm, 11300 GP. Do you have so much money?\"";
         menu "Here you are", L_Q_astralsoul_L1,
              "I will get it.", -;
         goto L_main_menu;
@@ -560,16 +560,16 @@ L_Q_astralsoul_L1:
         callfunc "SkillUp";
         next;
         mes "[Auldsbel the Wizard]";
-        mes "\"Now go and try to find someone, who can actually activate that focus.\"";
+        mes "\"Now go and try to find someone who can actually activate that focus.\"";
         next;
-        mes "\"You have the powers to focus on magic, but you need to get magic focussed now.\"";
+        mes "\"You have the powers to focus on magic, but you need to get magic focused now.\"";
         goto L_main_menu;
 
 L_Q_astralsoul_nz:
         mes "[Auldsbel the Wizard]";
-        mes "\"When learning powerful stuff, you should try to make not so many jokes.\"";
+        mes "\"When learning powerful stuff, you should try not to make so many jokes.\"";
         next;
-        mes "\"Come back, when you have the money.\"";
+        mes "\"Come back when you have the money.\"";
         goto L_main_menu;
 
 L_Q_old_wizard:
@@ -624,7 +624,7 @@ L_Q_manaseed:
 		goto L_Q_manaseed_prepared;
         if (MAGIC_FLAGS & MFLAG_TOUCHED_MANASEED)
 		goto L_Q_manaseed_touched;
-        mes "\"You have found an acual Mana Seed?  That's impossible!  Well, very unlikely...  Then again, some others have told me similar rumours.  I find it hard to believe that...\"";
+        mes "\"You have found an actual Mana Seed?  That's impossible!  Well, very unlikely...  Then again, some others have told me similar rumours.  I find it hard to believe that...\"";
         next;
         mes "[Auldsbel the Wizard]";
         mes "\"Well, if it's true, then try touching it.  That should do you no harm, but if you are very, very lucky, it just might grant you some minuscule amount of magical power.\"";
@@ -694,7 +694,7 @@ L_make_mana_potion:
         getitem "ManaPotion", 1;
 
         mes "[Auldsbel the Wizard]";
-        mes "Auldsbel pockets your GP and the pearl, then stuffs the leaves into the bottle.  Holding the bottle between his hands, he focusses briefly.  The water and leaves flash bright red, then the leaves dissolve.";
+        mes "Auldsbel pockets your GP and the pearl, then stuffs the leaves into the bottle.  Holding the bottle between his hands, he focuses briefly.  The water and leaves flash bright red, then the leaves dissolve.";
         next;
 
         mes "[Auldsbel the Wizard]";
@@ -715,7 +715,7 @@ L_make_mana_potion:
 
 L_mana_potion_toomuch:
         mes "[Auldsbel the Wizard]";
-        mes "\"Burndened as you are, I doubt you could carry it.  Get rid of some of your old things first, will you?\"";
+        mes "\"Burdened as you are, I doubt you could carry it.  Get rid of some of your old things first, will you?\"";
         next;
         goto L_main_menu;
 
@@ -726,7 +726,7 @@ L_make_mana_potion_missing:
         goto L_main_menu;
 
 L_Q_manaseed_prepared:
-        mes "\"So you found a Mana Seed and preprared yourself by drinking a mana potion?  I recommend that you visit the seed again and see if that actually works...\"";
+        mes "\"So you found a Mana Seed and prepared yourself by drinking a mana potion?  I recommend that you visit the seed again and see if that actually works...\"";
         next;
         goto L_main_menu;
 
@@ -888,7 +888,7 @@ L_component_quest_3:
 
 L_component_quest_4:
         mes "[Auldsbel the Wizard]";
-        mes "\"Hmmyes... See, the thing is that transmuting living beings is not normally something that transmutation magic can do.  It seems that the beings' life force must be overcome to transmute them, but that in turn kills them.\"";
+        mes "\"Hmm, yes... See, the thing is that transmuting living beings is not normally something that transmutation magic can do.  It seems that the beings' life force must be overcome to transmute them, but that in turn kills them.\"";
         next;
         mes "[Auldsbel the Wizard]";
         mes "\"But I was wondering whether creatures that already can auto-transmute-- or metamorphose, as some people call it-- might not allow themselves to be subjected to magical transmutation more easily... Still, all of my demetamorphosis attempts so far have failed.\"";
@@ -1271,7 +1271,7 @@ LL_student_3_repeat:
 
 LL_student_4:
         mes "[Auldsbel the Wizard]";
-        mes "\"Did you manage to transmute into a concentration potion?\"";
+        mes "\"Did you manage to transmute a concentration potion?\"";
         next;
 
         menu
diff --git a/npc/012-1_Woodland_Hills/injured-mouboo.txt b/npc/012-1_Woodland_Hills/injured-mouboo.txt
index 3b0bd240..1aa780f5 100644
--- a/npc/012-1_Woodland_Hills/injured-mouboo.txt
+++ b/npc/012-1_Woodland_Hills/injured-mouboo.txt
@@ -79,7 +79,7 @@ L_menu:
 
 L_examine:
 	mes "[Injured Mouboo]";
-        mes "Looking closer, you notice that the mouboo's left hind leg is bent in a very unnatural angle-- that seems to be the cause for its pain.";
+        mes "Looking closer, you notice that the mouboo's left hind leg is bent at a very unnatural angle-- that seems to be the cause for its pain.";
         next;
 	mes "[Injured Mouboo]";
         mes "You also notice that the mouboo is lying on top of what appears to be a black turtleneck sweater.";
diff --git a/npc/012-3_Cave/mana-seed.txt b/npc/012-3_Cave/mana-seed.txt
index 982e8eb6..6877ee2c 100644
--- a/npc/012-3_Cave/mana-seed.txt
+++ b/npc/012-3_Cave/mana-seed.txt
@@ -37,7 +37,7 @@
                  "You may only be children, but you recognize that it is this man only who can save the world.  As the walls rush towards you to crush your small group, you exchange a glance with your twin sister-- there is no doubt what you must do...",
                  "The sacred place is surrounded by nothingness; were it not for your magic, you would have no hope of returning.  The old and young man stands nearby; he has been waiting for you, for centuries.  He has all the time in the world, after all...",
                  "Nothing remains behind.  The underground castle is empty now, its chambers plundered, its throne destroyed.  Shivering, you climb down the stairs, towards the wailing of the underworld that is waiting beneath...",
-                 "You feel soft, fluffy fur brushing against your skin and are filled with happines.  Somehow, the word `" + getspellinvocation("happy-curse") + "' comes to mind...";
+                 "You feel soft, fluffy fur brushing against your skin and are filled with happiness.  Somehow, the word `" + getspellinvocation("happy-curse") + "' comes to mind...";
 
 	set @max_magic, 2;
 
@@ -214,7 +214,7 @@ L_magic_levelup:
         mes "The darkness is no longer complete.  You begin to make out stars in the distance, circling each other, dancing a cosmic dance.";
         next;
 
-        mes "Images rush past you, shadows of thoughts and dreams.  Some touch you, filling you with powerful emotions-- despair, extasy;  sometimes loss, sometimes hope; hate, love.";
+        mes "Images rush past you, shadows of thoughts and dreams.  Some touch you, filling you with powerful emotions-- despair, ecstasy;  sometimes loss, sometimes hope; hate, love.";
         next;
 
         mes "Someone else's thoughts pass through your mind...";
diff --git a/npc/012-3_Cave/warningsigns.txt b/npc/012-3_Cave/warningsigns.txt
index 6a71ad7e..2bd31346 100644
--- a/npc/012-3_Cave/warningsigns.txt
+++ b/npc/012-3_Cave/warningsigns.txt
@@ -2,7 +2,7 @@
 
 
 012-3.gat,445,61,0	script	sign	187,	{
-    mes "Your are about to enter a dangerous area!";
+    mes "You are about to enter a dangerous area!";
     next;
     mes "This area has a great distance to town. So the protection spell of the town is not active in that cave!";
     mes "That is why other players are able to attack you.";
@@ -10,7 +10,7 @@
 }
 
 012-3.gat,451,61,0	script	sign	186,	{
-    mes "Your are about to enter a dangerous area!";
+    mes "You are about to enter a dangerous area!";
     next;
     mes "This area has a great distance to town. So the protection spell of the town is not active in that cave!";
     mes "That is why other players are able to attack you.";
diff --git a/npc/013-2_Magic_house/notes.txt b/npc/013-2_Magic_house/notes.txt
index 7b65ce2d..f45b2554 100644
--- a/npc/013-2_Magic_house/notes.txt
+++ b/npc/013-2_Magic_house/notes.txt
@@ -50,6 +50,7 @@
 	next;
 	warp "006-1.gat",33,93;
 	if (QUEST_MIRIAM_start != 0) goto L_cheat;
+	close;
 
 // If you try to use the notes to warp to pachua the quest will fail.
 
@@ -63,7 +64,7 @@ L_cheat:
 
 // Warp to snake pit
 013-2.gat,25,27,0	script	Spell	127,{
-	mes "You read: \"Slithering and scales make a poisonous bite - Where you go feels me with fright!\"";
+	mes "You read: \"Slithering and scales make a poisonous bite - Where you go fills me with fright!\"";
 	next;
 	mes "You feel yourself getting lighter...";
 	next;
diff --git a/npc/013-2_Magic_house/wizard.txt b/npc/013-2_Magic_house/wizard.txt
index f3964cc0..927ddfc4 100644
--- a/npc/013-2_Magic_house/wizard.txt
+++ b/npc/013-2_Magic_house/wizard.txt
@@ -109,9 +109,9 @@ L_astralsoul:
         set @SUP_name$, "Astral Soul";
         set @SUP_xp, 2500;
         callfunc "SkillUp";
-        mes "\"Now go and try to find someone, who can actually activate that focus.\"";
+        mes "\"Now go and try to find someone who can actually activate that focus.\"";
         next;
-        mes "\"You have the powers to focus on magic, but you need to get magic focussed now.\"";
+        mes "\"You have the powers to focus on magic, but you need to get magic focused now.\"";
         close;
 
 L_NotEnough:
diff --git a/npc/013-3_Cave/mask_chest.txt b/npc/013-3_Cave/mask_chest.txt
index 15404e6d..fb72f54c 100644
--- a/npc/013-3_Cave/mask_chest.txt
+++ b/npc/013-3_Cave/mask_chest.txt
@@ -77,7 +77,7 @@
 	delitem "PileOfAsh", 1;
 	delitem "BottleOfWater", 1;
 
-	mes "You managed to preform the ritual and open the chest.";
+	mes "You managed to perform the ritual and open the chest.";
 	getitem "DemonMask", 1;
 	mes "You found a demon mask inside.";
 	set QUEST_demon_mines, 3;
@@ -112,7 +112,7 @@ L_No_pink_antenna:
 	close;
 
 L_No_tongues:
-	mes "You don't four different snake tongues.";
+	mes "You don't have four different snake tongues.";
 	close;
 
 L_No_treasure_key:
diff --git a/npc/014-1_Woodland/wedding-officiator.txt b/npc/014-1_Woodland/wedding-officiator.txt
index bd19c734..f6bf7c9d 100644
--- a/npc/014-1_Woodland/wedding-officiator.txt
+++ b/npc/014-1_Woodland/wedding-officiator.txt
@@ -107,7 +107,7 @@ L_get_married:
 	mes "[Wedding Officiator]";
         mes "Wendy hesitates, then gives you a quick hug.  There are tears are in her eyes.";
         mes "\"Sorry, I always get a bit... emotional, I think...  but I'm so happy for you!\"";
-        mes "She smiles wipes the tears from her eyes.";
+        mes "She smiles and wipes the tears from her eyes.";
         next;
 
 	mes "[Wedding Officiator]";
diff --git a/npc/016-1_Woodland/gwendolyn.txt b/npc/016-1_Woodland/gwendolyn.txt
index c81fefd1..59f061c4 100644
--- a/npc/016-1_Woodland/gwendolyn.txt
+++ b/npc/016-1_Woodland/gwendolyn.txt
@@ -112,7 +112,7 @@ lesson:
     next;
     mes "\"The most important thing to improve is your dexterity. When you use a bow, it is your dexterity that determines if you are able to hit your enemy where it hurts most.\"";
     next;
-    mes "\"Also worth mentioning is how to improve your ability to shoot fast. You need to be agile to grab a new arrow from your quiver and aim for the next shot before your enemy has recoverd from your last.\"";
+    mes "\"Also worth mentioning is how to improve your ability to shoot fast. You need to be agile to grab a new arrow from your quiver and aim for the next shot before your enemy has recovered from your last.\"";
     next;
 
 state3:
@@ -144,13 +144,13 @@ state3:
 state4:
     if (baselevel < @BASELEVEL_GAME) goto not_ready;
     if (!(getskilllv(SKILL_POOL))) goto not_ready;
-    mes "Gwendolyn takes an analyzing look at you. Then she noods.";
+    mes "Gwendolyn takes an analyzing look at you. Then she nods.";
     next;
 
     set @Q_hawkseye, 5;
         callsub S_Update_Var;
     mes "[Gwendolyn Bowmaker]";
-    mes "\"Ok. You have made a great progress. I think you are ready for further tasks.\"";
+    mes "\"Ok. You have made great progress. I think you are ready for further tasks.\"";
     next;
 
 game_explain:
@@ -446,17 +446,17 @@ no_student:
     close;
 
 no_money:
-    mes "\"I am sorry, but it seems, that you don't have enough money. Come back, when you have reorganized your finances.\"";
+    mes "\"I am sorry, but it seems that you don't have enough money. Come back when you have reorganized your finances.\"";
     set @Q_hawkseye, 1;
         callsub S_Update_Var;
     close;
 
 no_bow:
-    mes "\"As an archer, you should carry your bow always with you. Go and get it.\"";
+    mes "\"As an archer, you should always carry your bow with you. Go and get it.\"";
     close;
 
 bow_bought:
-    mes "\"You just bought it? You won't learn anything from that. To understand the nature of this bow, you have to collect the needed material by yourself. Only this way you will get a feeling of what it means to use such a weapon. \"";
+    mes "\"You just bought it? You won't learn anything from that. To understand the nature of this bow, you have to collect the needed material by yourself. Only this way will you get a feeling of what it means to use such a weapon. \"";
     next;
     mes "\"The best thing would be to let you make the bow by yourself. But I guess, that would go to far. And it would take ages to get a high quality bow.\"";
     next;
@@ -474,7 +474,7 @@ not_ready:
 no_arrows:
     mes "Gwendolyn sighs and shake her head.";
     next;
-    mes "\"Another lecture: Take always enough arrows with you. Go and come back, when you are equipped adequately.\"";
+    mes "\"Another lecture: Take always enough arrows with you. Go and come back when you are equipped adequately.\"";
     close;
 
 quit:
diff --git a/npc/027-2_Caretakers_House/gy_inn_shops.txt b/npc/027-2_Caretakers_House/gy_inn_shops.txt
index af6b2d39..6d1ce909 100755
--- a/npc/027-2_Caretakers_House/gy_inn_shops.txt
+++ b/npc/027-2_Caretakers_House/gy_inn_shops.txt
@@ -1,35 +1,35 @@
-// chef: function, 

-// barmaid: function,

-// shopkeeper: multiples and function,

-// magic undead shop: function,

-// chief barman: function,

-// receptionist: function,

-// banker: function

-

-

-027-2.gat,75,22,0	shop	Chef	300,519:100

-027-2.gat,90,36,0	shop	Barmaid	301,519:100,533:150,534:90,562:500,676:200

-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,539:175,567:500,568:500

-

-// 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 ...";

-	next;

-	callfunc "Inn";

-	close;

-}

-

-// Bank and Storage

-027-2.gat,88,22,0	script	Undead Banker	321,{

-	set @npcName$, "J.P. Morbid";

-	callfunc "Banker";

-	close;

-}

-

+// chef: function, 
+// barmaid: function,
+// shopkeeper: multiples and function,
+// magic undead shop: function,
+// chief barman: function,
+// receptionist: function,
+// 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,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
+
+// 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 ...";
+	next;
+	callfunc "Inn";
+	close;
+}
+
+// Bank and Storage
+027-2.gat,88,22,0	script	Undead Banker	321,{
+	set @npcName$, "J.P. Morbid";
+	callfunc "Banker";
+	close;
+}
+
diff --git a/npc/027-2_Caretakers_House/testnpcs.txt b/npc/027-2_Caretakers_House/testnpcs.txt
index 9cd452c6..38f961c3 100755
--- a/npc/027-2_Caretakers_House/testnpcs.txt
+++ b/npc/027-2_Caretakers_House/testnpcs.txt
@@ -1,108 +1,111 @@
-// Temporary placing of all non shop npcs

-// A proper break down of files will need to be done later

-

-// drunk lover: quest, 

-// werewolf: gambling,

-// chef's helper: simple dialog,

-// horn mage: golbenez,

-// drunker: simple dialog,

-// barman: crafting related,

-// swordguy: weapon master,

-// ghost from dead drunk: simple dialog,

-// crying child: I don't know,

-// Innkeeper's ghost: quest,

-// evil guard: simple dialog,

-// hangman: quest,

-// headless: quest or simple dialog,

-// lightman: quest,

-

-

-027-2.gat,80,34,0	script	Drunk Lover	303,{

-	end;

-}

-

-027-2.gat,118,23,0	script	Werewolf	305,{

-	mes "debug for the lovetriangle quest";

-	menu

-		"reset reid", -,

-		"leave", L_Close;

-

-	set @Graveyard_Inn_MASK, NIBBLE_0_MASK;

-	set @Graveyard_Inn_SHIFT, NIBBLE_0_SHIFT;

-

-	set @state, ((QUEST_Graveyard_Inn & @Graveyard_Inn_MASK) >> @Graveyard_Inn_SHIFT);

-	set @state, 0;

-	callsub S_Update_Mask;

-

-L_Close:

-	close;

-

-S_Update_Mask:

-        set QUEST_Graveyard_Inn,

-        	(QUEST_Graveyard_Inn & ~(@Graveyard_Inn_MASK))

-                | (@state << @Graveyard_Inn_SHIFT);

-        return;

-}

-

-027-2.gat,75,29,0	script	Archibald	306,{

-	end;

-}

-

-027-2.gat,77,40,0	script	Drunker	308,{

-	set @drunker, rand(4);

-	if (@drunker == 0) goto L_0;

-	if (@drunker == 1) goto L_1;

-	if (@drunker == 2) goto L_2;

-	if (@drunker == 3) goto L_3;

-	end;

-L_0:

-	mes "[Ghost Drunker]";

-	mes "\"zzzZZZzzz...\"";

-	close;

-L_1:

-	mes "[Ghost Drunker]";

-	mes "\"Ish that a Zzombee?...\"";	

-	close;

-L_2:

-	mes "[Ghost Drunker]";

-	mes "\"Auuu... Hiccup... Don't byte mee... \"";	

-	close;

-L_3:

-	mes "[Ghost Drunker]";

-	mes "\"Moar Bearr...Pleash!\"";

-	close;

-}

-

-027-2.gat,103,22,0	script	Barman	310,{

-	end;

-}

-

-027-2.gat,70,77,0	script	Cerhan	311,{

-	end;

-}

-

-027-2.gat,110,23,0	script	Ghost Drunker	312,{

-	mes "[Ghost Drunker]";

-	mes "\"Ohh... My head is killing me! I have to stop drinking too much or I will lose my job... But being a waiter... oh I can't resist a drink or two!\"";

-	close;

-}

-

-027-2.gat,39,91,0	script	Golbenez	307,{

-	end;

-}

-

-027-2.gat,100,43,0	script	Evil Guard	316,{

-	end;

-}

-

-027-2.gat,43,73,0	script	Hanged Lover	317,{

-	end;

-}

-

-027-2.gat,24,77,0	script	Headless Man	318,{

-	end;

-}

-

-027-2.gat,22,84,0	script	Lantern Man	319,{

-	end;

-}

+// Temporary placing of all non shop npcs
+// A proper break down of files will need to be done later
+
+// drunk lover: quest, 
+// werewolf: gambling,
+// chef's helper: simple dialog,
+// horn mage: golbenez,
+// drunker: simple dialog,
+// barman: crafting related,
+// swordguy: weapon master,
+// ghost from dead drunk: simple dialog,
+// crying child: I don't know,
+// Innkeeper's ghost: quest,
+// evil guard: simple dialog,
+// hangman: quest,
+// headless: quest or simple dialog,
+// lightman: quest,
+
+
+027-2.gat,80,34,0	script	Drunk Lover	303,{
+	end;
+}
+
+027-2.gat,118,23,0	script	Werewolf	305,{
+	mes "debug for the lovetriangle quest";
+	menu
+		"reset reid", -,
+		"leave", L_Close;
+
+	set @Graveyard_Inn_MASK, NIBBLE_0_MASK;
+	set @Graveyard_Inn_SHIFT, NIBBLE_0_SHIFT;
+
+	set @state, ((QUEST_Graveyard_Inn & @Graveyard_Inn_MASK) >> @Graveyard_Inn_SHIFT);
+	set @state, 0;
+	callsub S_Update_Mask;
+	close;
+
+L_Close:
+	close;
+
+S_Update_Mask:
+        set QUEST_Graveyard_Inn,
+        	(QUEST_Graveyard_Inn & ~(@Graveyard_Inn_MASK))
+                | (@state << @Graveyard_Inn_SHIFT);
+        return;
+}
+
+027-2.gat,75,29,0	script	Archibald	306,{
+	end;
+}
+
+027-2.gat,77,40,0	script	Drunker	308,{
+	set @drunker, rand(4);
+	if (@drunker == 0) goto L_0;
+	if (@drunker == 1) goto L_1;
+	if (@drunker == 2) goto L_2;
+	if (@drunker == 3) goto L_3;
+	end;
+L_0:
+	mes "[Ghost Drunker]";
+	mes "\"zzzZZZzzz...\"";
+	close;
+L_1:
+	mes "[Ghost Drunker]";
+	mes "\"Ish that a Zzombee?...\"";	
+	close;
+L_2:
+	mes "[Ghost Drunker]";
+	mes "\"Auuu... Hiccup... Don't byte mee... \"";	
+	close;
+L_3:
+	mes "[Ghost Drunker]";
+	mes "\"Moar Bearr...Pleash!\"";
+	close;
+}
+
+027-2.gat,103,22,0	script	Barman	310,{
+	end;
+}
+
+027-2.gat,70,77,0	script	Cerhan	311,{
+	end;
+}
+
+027-2.gat,110,23,0	script	Ghost Drunker	312,{
+	mes "[Ghost Drunker]";
+	mes "\"Ohh... My head is killing me! I have to stop "
+		+ "drinking too much or I will lose my job... But "
+		+ "being a waiter... oh I can't resist a drink or two!\"";
+	close;
+}
+
+027-2.gat,39,91,0	script	Golbenez	307,{
+	end;
+}
+
+027-2.gat,100,43,0	script	Evil Guard	316,{
+	end;
+}
+
+027-2.gat,43,73,0	script	Hanged Lover	317,{
+	end;
+}
+
+027-2.gat,24,77,0	script	Headless Man	318,{
+	end;
+}
+
+027-2.gat,22,84,0	script	Lantern Man	319,{
+	end;
+}
diff --git a/npc/functions/dailyquest.txt b/npc/functions/dailyquest.txt
index 820516d6..0c99afd4 100644
--- a/npc/functions/dailyquest.txt
+++ b/npc/functions/dailyquest.txt
@@ -79,6 +79,7 @@ L_Not_Enough_Points:
 
 L_More_Points:
 	set DailyQuestPoints, BaseLevel + DailyQuestBonus;
+	set DailyQuestBonus, 0;
 	set DailyQuestTime, gettimetick(2);
 	goto L_Start;