* Deleted Unnecesary Next; in Hunter Job Quest. (bugreports:1665,2239,2179)

* Fixed a bug with the Bio Lab Quest when you relog. (bugreport:1798)
* Corrected some Issues with the Waiting Room in Hunter Job Quest. (bugreport:1890)

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13227 54d463be-8e91-2dee-dedb-b68131a5f0ec

3 files changed, 71 insertions, 62 deletions

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index cca54e4c5..1ef339ef0 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,7 +1,10 @@
-Date		Added
+Date		Added
 ======
 2008/09/21
 	* Rev. 13224 Corrected Sealstatus checking global vars instead of character. (bugreport:2250) [L0ne_W0lf]
+	* Deleted Unnecesary Next; in Hunter Job Quest. (bugreports:1665,2239,2179) [Samuray22]
+	* Fixed a bug with the Bio Lab Quest when you relog. (bugreport:1798)
+	* Corrected some Issues with the Waiting Room in Hunter Job Quest. (bugreport:1890)
 2008/09/20
 	* Rev. 13222 Fixed DZeroX's fix! (Missing ;'s) [L0ne_W0lf]
 	* Added Guild PVP NPC, and seal progress NPC.
@@ -147,7 +150,7 @@
 	- Added Some duplicate NPCs for the combat training.
 	- Corrected bug in Hanson's dialog. (bugreport:1703)
 2008/06/15
-	* Fixed bad variables on dancer job quest, bugreport:1685 [Brainstorm]
+	* Fixed bad va?iables on dancer job quest, bugreport:1685 [Brainstorm]
 	* Yet again, updated mosk_dun.txt [Lupus]
 2008/06/14
 	* Rev. 12833 Large update to the novice grounds. Fixed bugreport:1666 [L0ne_W0lf]
@@ -219,7 +222,7 @@
 	* Rev. 12673 Rewrote the WoE 1.0 from the ground up nearly. [L0ne_W0lf]
 	- Renamed the WoE Time setting NPC to "agit_controller.txt"
 	- System is set up to mimic Aegis, some parts are still lacking.
-	- Documentation on the new system is forth-coming.
+	- Document?tion on the new system is forth-coming.
 	- Updated Novice WoE scripts to keep them from breaking.
 2008/04/26
 	* Rev. 12654 Fixed escape problem in jobs/novice/novice.txt [Toms]
@@ -290,7 +293,7 @@
 	* Updated Drunkard#Payon to use a better Class check that won't freeze Novices. [Paradox924X]
 2008/03/12
 	* Rev. 12346 Another Small update to castle ownership announcement. [L0ne_W0lf]
-	* Rev. 12345 Small update to castle ownership announcement. [L0ne_W0lf]
+	* Rev. 12345 Small update to castle owne?ship announcement. [L0ne_W0lf]
 2008/03/08
 	* Rev. 12329 Follow up fix in assassin job quest. [L0ne_W0lf]
 2008/03/08
@@ -366,7 +369,7 @@
 	* rev. 12188 Castle ownership displays at the start and end of WoE. [L0ne_W0lf]
 	* Rev. 12187 Fixed a typo in the Lunar new year event. [L0ne_W0lf]
 2008/02/07
-	* Rev. 12183 Added Lunar new year event for 2008 from iRO. [L0ne_W0lf]
+	* Rev. 12183 Added Lunar new year event for 2008 from iRO. [L?ne_W0lf]
 	- Please read the comments before enabling.
 	* Rev. 12182 Updated some Airship/port npcs. [L0ne_W0lf]
 	* Rev. 12181 Updated "Old Blue Box quest" and enabled it. [L0ne_W0lf]
@@ -448,7 +451,7 @@
 	* Fixed problem in the Hair Dyer NPC. (bugreport:509) [Samuray22]
 2007/11/27
 	* Corrected some broken warp points. (bugreport:497) [Samuray22]
-	* Corrected a bug on Sample Dynamic Shop. (bugreport:421) [Samuray22]
+	* Corrected a bug on Sample Dynamic Shop. (bugreport:421) [Samuray22?
 2007/11/26
 	* Rev. 11815 Fixed a bad warp in ice dungeon. [L0ne_W0lf]
 	* Rev. 11814 Updated the Soul Linker job quest. [L0ne_W0lf]
@@ -525,7 +528,7 @@
 	* Rev. 11649 Corrected an typo in the guild flag function. [L0ne_W0lf]
 2007/11/02
 	* Rev. 11646 Fixed some NPC headers in the custom scripts. [L0ne_W0lf]
-	* Rev. 11645 Some NPC and CONF file clean up. More duplicate removal. [L0ne_W0lf]
+	* Rev. 11645 Some NPC and CONF file clean?up. More duplicate removal. [L0ne_W0lf]
 	* Rev. 11643 Bug fixes in rogue skill quest resolved bugreport:351 [L0ne_W0lf]
 2007/11/01
 	* Rev. 11635 Fixed an incorrect answer in the blacksmith quiz. (Trojal) [L0ne_W0lf]
@@ -593,7 +596,7 @@
 2007/10/19
 	* Rev. 11527 Small Adjustment to the Juperos Elevator timer. [L0ne_W0lf]
 	* Rev. 11524 Fixed the errors in the recent change to the juperos warps. [L0ne_W0lf]
-	* Rev. 11523 Implemented proper Juperos Core event-driven access. [L0ne_W0lf]
+	* Rev. 11523 Implemented proper Juperos Core event-d?iven access. [L0ne_W0lf]
 	- Bug testing and further optimization required.
 2007/10/18
 	* Rev. 11516 Cleaned up several duplicates and NPC names. [L0ne_W0lf]
@@ -668,7 +671,7 @@
 	* Fixed several text typos in the Kiel quest [ultramage]
 2007/09/12
 	* Moved the Nameless Island warp npc to warps/cities/nameless.txt [Playtester]
-	* Added first version of Nameless Islet sailor.
+	* Added first version of Nameles? Islet sailor.
 	- Players can now access Cursed Abbey for further testings.
 2007/09/10
 	* Updated experience rewards in a lot of quests to match upcoming rate adjustments changes. [SinSloth]
@@ -739,7 +742,7 @@
 	* Fixed some bugs in various quests. [SinSloth]
 	- Einbroch laboratory now correctly checks for players entrance
 	- Small fix with Laboratory device to make it more understandable.
-	- Fixed a misorder with some checkings of a Rachel quest.
+	- Fixed a misorder with some checkings o? a Rachel quest.
 2007/08/10
 	* Fixed typos [Playtester]
 	* Removed .gat from the remaining npcs [ultramage]
@@ -792,7 +795,7 @@
 	- Thanks to Barron-Monster.
 	* Rev. 10906 Fixed the Kafra Welcome message for guilds. Thanks Barron-Monster. [L0ne_W0lf]
 2007/07/23
-	* Fixed 3� Test in Hunter Job Quest. [Samuray22]
+	* Fixed 3  Test in Hunter Job Quest. [Samuray22]
 	-Thanks to ultramage.
 	* Fixed a little bug in "Dandelion Quest" with "Job_Alchemist" changed to "Job_Alchem". [Samuray22]
 	-Thanks to Nobuo
@@ -896,7 +899,7 @@
 	* Updated Dialogs from "Stop Post Quest". [Samuray22]
 2007/06/17
 	* Fixed a Little Bug with the "How Does the Airship Work" Quest. [Samuray22]
-	-Thanks to Playtester ^^U.
+	-Thanks to Playtester?^^U.
 2007/06/16
 	* Rev. 10777 Fixed the Kafra function, which was screwing up teleporting. [L0ne_W0lf]
 	* Undid come of the changes to the Jawaii and Izlude NPCs.
@@ -971,7 +974,7 @@
 	- Added totally custom Moscovia warps by Azazel [Lupus]
 2007/06/06
 	* More Breeder fixes [Playtester]
-	* Added Dandelion's Request / Morroc Invasion quest. [SinSloth]
+	* Added Dandelion'? Request / Morroc Invasion quest. [SinSloth]
 2007/06/05
 	* Updated Arena warp, thanks to diedlikeahero [Lupus]
 	- removed old temp shop scrolls_arrows [Lupus]
@@ -1041,7 +1044,7 @@
 		Not a final version yet
 	- What's correct? a swordman or a sdordSman (we have both words mixed in all scripts)
 	* Added a check in Thanatos Boss room to reset event if there's no player inside. [SinSloth]
-2007/05/22
+2?07/05/22
 	* Tweaked some recent npcs [ultramage]
 	- I find using close; to exit a switched callsub/callfunc a major wtf,
 	  similarly when using switch witout absolutely no break statements;
@@ -1108,7 +1111,7 @@
 2007/05/10
 	* Updated Knight Skill Quest to the oficial. [Samuray22]
 	* Updated Blacksmith Skill Quest to the Oficial. [Samuray22]
-	* Rev. 10512 Removed a debugmes from the Kiel Hyre quest. [L0ne_W0lf]
+	* Rev. 10512 Removed a debugmes from the Kiel Hyre ques?. [L0ne_W0lf]
 	* Rev. 10508 Stupid mistake, accidentally had 4 copies of the same script in 1... [L0ne_W0lf the bonehead]
 	* Rev. 10507 Large update to the Kiel Hyre Quest. [L0ne_W0lf]
 	- FIxed several small issues (and large one) such as typos in cutins, typos in dialog, etc.
@@ -1176,7 +1179,7 @@
 	- Garrison Quest updated to official, thanks to Lazarus^.
 	* More Fixes to the Kiel Hyre Quest [L0ne_W0lf]
 	- Elly now deletes the Iron_Box, and Kiel Hyre deletes the Pin. [L0ne_W0lf]
-	- More security on the 5th Big Door, now makes sure no one outside of who acticated it initially can use it. Resets after 10 minutes to make it.
+	- More security on the 5th Bi? Door, now makes sure no one outside of who acticated it initially can use it. Resets after 10 minutes to make it.
 	- Made it so that you need to be at least step 84 to activate the final door.
 	- Corrected not deleting Allysia's Ring from inventory.
 2007/04/30
@@ -1265,7 +1268,7 @@
 	* Updated Ninja quest variable usage [Playtester]
 	- now MISC_QUEST variable is used when completed
 2007/04/03
-	* Removed the never-updated "who does what" header in this very file [DracoRPG]
+	* Rem?ved the never-updated "who does what" header in this very file [DracoRPG]
 	* Got screenie of wedding NPC, made ours stick to it as much as possible [DracoRPG]
 	* Small fix in Monk Quest [Playtester]
 	* Officialized Kunai/Shuriken traders [Playtester]
@@ -1345,7 +1348,7 @@
 	* Removed old custom geffenia warper since TSQ is done
 	* Removed the duplicit and untranslated alchemist.txt event [ultramage]
 2007/01/26
-	* More typo fixes
+	* More typo fix?s
 	* Added a missing dialogue branch in novice.txt
 	* Fixed a monster spawn typo in hu_fild05 and lou_fild01 [ultramage]
 	  Ref: http://www.eathena.ws/board/index.php?showtopic=136426
@@ -1440,7 +1443,7 @@
 2006/11/12
 	* According to recent info you can re-install Guardians during WoE [Lupus]
 2006/11/11
-	* Fixed warp on timeout in swordman.txt [KarLaeda]
+	* Fixed w?rp on timeout in swordman.txt [KarLaeda]
 2006/11/09
 	* Added Bingo - Hugel warps, thanks to erKURITA [Lupus]
 	- Added Hugel INN
@@ -1538,7 +1541,7 @@
 	- Optimized Novice Exchanged (loot->Red Potions), moved the file to NPC\Merchants
 	- Fixed The Sign bugs, thanks to Tantarian
 		+ added get rid of sobbing pieces to let people reborn
-		If u finished the Sign Quest and have some undeleted sobbing pieces, then visit this man
+		If?u finished the Sign Quest and have some undeleted sobbing pieces, then visit this man
 		mjo_dun02.gat 88,295 Flaming Spirit Man - he'll wipe them 8)
 	- Fixed wrong label names in mjolnir_seal.txt, thanks to Tantarian
 	- Added Feast Day Of Ramadan Idul Fitri Event (official idRO) by $ephiroth
@@ -1628,7 +1631,7 @@
 	- Book of Devil Quest uses bit-wise var MISC_QUEST | 256. Removed extra vars
 	- Piano Quest uses 1 bit-wise temp var instead of 5 variables.
 	- Clear Niflheim garbage vars in Global_Functions.txt
-	- Added few missing NEXT; into job quests, thanks to $ephiroth
+	- Added few miss?ng NEXT; into job quests, thanks to $ephiroth
 	- Changed permanent variables in 1st Job Quest skills to @temp ones
 	- Cube Room: 5 key vars -> 1 var cubekey
 2006/09/19
@@ -1682,7 +1685,7 @@
 	* Tried to remove all duplicates (in default NPCs) [Toms]
 	* Removed useless 'npc\other\old' directory, who would need that anyway... [DracoRPG]
 	* Commented out the path to Divorce NPC as Lupus forgot to add it for good [DracoRPG]
-	* Fixed critical syntax errors in the new Valkyrie script, (�_�) @ Lupus [DracoRPG]
+	* Fixed critical syntax errors in the new Valkyrie script, ( _ ) @ Lupus [DracoRPG]
 	* Improved Bioethics quest & nearby Rekenber Guards [DracoRPG]
 	  - Used isequipped() instead of getequipid() to simplify code (esp. with accessories)
 	  - Rewritten the custom text about Hom. Res. and removed its actual learning
@@ -1774,7 +1777,7 @@
 	* Added Violin[3] to the Comodo Weapon seller [Playtester]
 	* Optimized a warp near Gunslinger weapon shop [Playtester]
 	* Extended the Garrison quest to slot the Garrison [Playtester]
-2006/08/10
+2006/0?/10
 	* Switch airplanelocation variables to temp variables to avoid unuseful mapreg(sql/txt) writes [Toms]
 	* Added file for gunslinger quests [Playtester]
 	- Garrison quest is done and tested
@@ -1853,7 +1856,7 @@
 2006/07/20
 	* Split quest from cities/izlude.txt to quests/quests_izlude.txt [Evera]
 	* Split quest from cities/alberta.txt to quests/quests_alberta.txt [Evera]
-	* Split quests from cities/amatsu.txt to quests/quests_amatsu.txt [Evera]
+	* Split que?ts from cities/amatsu.txt to quests/quests_amatsu.txt [Evera]
 	* Split quests from cities/ayothaya.txt to quests/quests_ayothaya.txt [Evera]
 	* Split Doomed Sword quests from cities/comodo.txt to quests/quests_comodo.txt [Evera]
 	* Split Einbech quests from cities/einbech.txt to quests/quests_ein.txt [Evera]
@@ -1933,7 +1936,7 @@
 	* Implemented the eye of hellion quest. [MasterOfMuppets]
 	* Added official Thanatos Tower quest thanks to Ishizu-chan [Playtester]
 	* Completely updated Lighthalzen Field spawns to X.4 [Playtester]
-	* Completely updated Einbroch Field spawns to X.4 [Playtester]
+	* Completely updated Einbroch Field spawns t? X.4 [Playtester]
 	* Completely updated Yuno Field spawns to X.4 [Playtester]
 	* Updated Orc Village spawns to X.4 [Playtester]
 	* Fixed a Rachel Field warp [Playtester]
@@ -2009,7 +2012,7 @@
 2006/06/14
 	* Separated the Metto quest from the juno town npcs file. [musashiden]
 	* Juno Update Process. 30% complete. [Musashiden]
-	* Some more sign quest warps [MasterOfMuppets]
+	* Some more si?n quest warps [MasterOfMuppets]
 	* Fixed Job Level requirement for Auto-Berserk [Playtester]
 	* Fixed some experience gained bugs in two scripts. [MasterOfMuppets]
 	- Also fixed a major problem in the level 4 weapon quest, thanks to Qwadrat.
@@ -2079,7 +2082,7 @@
 	  Morgenstein, Nifl Witch, Edgar's Offer, Prontera Culvert,
 	  Juice Maker, Tempestra,
 	- replaced BUNYBND with @BUNYBND
-	- added a special global function "F_ClearGarbage" function [Lupus]
+	- added a special global function "F_ClearGarbage" functi?n [Lupus]
 	  that converts old quest variables into MISC_QUEST bits;
 	  clears outdated, wasted variables. Temporary added its calls into Warpra & Kafra
 	IMPORTANT! Update all your quests and Global_Functions.txt
@@ -2163,7 +2166,7 @@
 	* Fixed a missing " in the gunslinger jobquest script [Playtester]
 	- some others fixes as well thanks to sodaboy581 and css25
 	- some typo fixed as well
-2006/05/02
+2006/05/02?
 	* Added kunai_maker.txt to make elemental kunais. [erKURITA]
 	* Added new npcs @ que_ng.gat ninja map portion. [erKURITA]
 	* Added new shops @ que_ng.gat ninja map portion. [erKURITA]
@@ -2235,7 +2238,7 @@
 	* Fixed names of Lighthalzen mobs in spawn files [Playtester]
 	* Changed Juperos spawns according to info provided by Tharis [Playtester]
 2006/04/14
-	* Added quest_warper.txt to eAAC_Scripts. Deleted the sql and txt versions
+	* Added quest_warper.txt to eAAC_Scripts. De?eted the sql and txt versions
 	  of the disguiser and added a merge of both. Deleted clone_arena.txt.
 	  Updated global_functionsKE.txt of Skotlex. [erKURITA]
 	* Added some more Kiel warps thanks to Celestria [Playtester]
@@ -2312,7 +2315,7 @@
 2006/03/21
 	* Improved payment healer. [Lance]
 2006/03/20
-	* Added temp Job quests of Ninja and Gunslinger, thx2 Gywall [Lupus]
+	* Added temp Job quests of Ninja ?nd Gunslinger, thx2 Gywall [Lupus]
 	* Fixed endless warping loops, thanks to Manipulator [Lupus]
 	* Fixed possible Castle Economy investment overflow with Emsolute Develop learnt [Lupus]
 	* Removed Berserk Potions from all shops, but Comodo [Lupus]
@@ -2391,7 +2394,7 @@
 	* Removed dup warps around Einbroch. [Poki#3]
 	* Fixed ein_fild04 -> ein_fild05 warp. THanks to Playtester [Poki#3]
 	* Re-wrote the Dye NCP (original, not the custom one) [Poki#3]
-	- I hope there aren't any bugs in it. The Jobs are sorted based on the file names
+	-?I hope there aren't any bugs in it. The Jobs are sorted based on the file names
 	  that the client reads.
 	* Fixed the Warper [Poki#3]
 	* Fixed Hugel warps (htere weren't any TABs) [Lupus]
@@ -2460,7 +2463,7 @@
 	* Fixed scripts that were reported in the forum. [Vicious]
 2006/01/08
 	* Changed the name of Chung E to Green Maiden in the spawn files [MasterOfMuppets]
-	* Changed some Zherlthsh to Zealotus as it is in iRO [MasterOfMuppets]
+	? Changed some Zherlthsh to Zealotus as it is in iRO [MasterOfMuppets]
 	* Added exp bonus to the factory quest in Einbroch, thanks to a [MasterOfMuppets]
 	  Korean fansite
 2006/01/07
@@ -2538,7 +2541,7 @@
 2005/12/08
 	* Updated 2nd class quest skills NPCs, made by Reddozen and battousai90. [Vicious]
 	* Organized Jobs folder a bit for Expended Classes. [Vicious]
-	* Fixed dialouge in blood_bandana quest. Thanks Razor87 for the report. [Kayla]
+	* Fixed dialouge in blood_bandana quest. Thanks Razo?87 for the report. [Kayla]
 2005/12/07
 	* Added the New Novice Training grounds, beware of potentional bugs and [MasterOfMuppets]
 	  faulty dialogues. I kept the old script as OLDnovice.txt just incase. Thanks to Dr.Evil
@@ -2607,7 +2610,7 @@
 	* Removed some buggy custom quests. Those items has appeared in recent official quests [Lupus]
 		e.g. Excalibur, some hats, etc
 2005/11/25
-	* Added a temp shop in Yuno to sell blank scrolls, thanks to reddozen [MasterOfMuppets]
+	* Added a?temp shop in Yuno to sell blank scrolls, thanks to reddozen [MasterOfMuppets]
 	* Added the Einbech Kafra [MasterOfMuppets]
 	* Added Thanatos entrance warp. Thanks to Justin84 [Lupus]
 2005/11/23
@@ -2674,7 +2677,7 @@
 	* A lot of typos fixed in the lvl 4 weapon quest, thanks to Silent. [MasterOfMuppets]
 2005/11/07
 	* Added the lvl 4 weapon quest, thanks a lot to Vicious_pucca for converting it from [MasterOfMuppets]
-	  aegis format to eA format. a lot of thanks to reddozen as well for fixing bugs.
+	  aegis format to eA format. a lot of thanks to reddozen as well for?fixing bugs.
 	  - Also two quest related NPCs was added to Geffen and Morroc
 	* Fixed a misleading typo in quest/monstertamers.txt, thanks to vicious_pucca [MasterOfMuppets]
 	  for pointing it out.
@@ -2752,7 +2755,7 @@
 	* Added the noteleport mapflag to Amatsu Dungeon lvl 1, thanks to frugal [MasterOfMuppets]
 	*Fixed a lot of scripts that may have been exploitable, fixed typos, and optimized a bunch of other scripts. Thanks to Silent. [Nexon]
 2005/10/16
-	* Fixed Einbroch Airport, Lighhalzen Dungeon warp. Thanks to Justin84 [Lupus]
+	* Fixed Einbroch Airport, Lighhalzen?Dungeon warp. Thanks to Justin84 [Lupus]
 	* Fixed Thanatos Tower Statues quest bug, thanx 2 Dr.Evil for info [Lupus]
 	* Enabled lighthalzen guards quest, updated lighthalzen warps, thx2Justin84 [Lupus]
 2005/10/15
@@ -2818,7 +2821,7 @@
 	* Updated some of the Lighthalzen mobs as pointed out by Master of Muppets.
 	  [Skotlex]
 	* Added 5092 Coif into Prontera Church Shop. Thanx 2 andz  [Lupus]
-	* Fixed Thanatos and Abyss Dungeon Spawns. Thanks to Azazel. [Nexon]
+	* Fixed Thanatos and Abyss Dungeon Spawns. Thanks to Azazel. [Ne?on]
 	* Fixed 700+ spelling mistakes. I have alot of time on my hands for some reason... [Nexon]
 2005/10/02
 	* Added Gotanblue#2 to Turtle Island (to be able to return back) [Lupus]
@@ -2893,7 +2896,7 @@
 	* Added an official Bards Job Quest. [Lupus]
 	- Basical conversion from Muad-Dib's Prometeus format by Dr.Evil
 	- Implementation of 4 official Bards weapon prizes by Dr.Evil
-	- Final optimization and bug fix by Lupus
+	- Final optimization and ?ug fix by Lupus
 		NOTE: Don't forget to update your old Lutie.txt and Global_Functions.txt
 	* Added temp Amatsu Kafra (wrong sprite, wrong coords yet) [Lupus]
 2005/09/11
@@ -2965,7 +2968,7 @@
 	* Updated refine npc to stop it from making the server crash (features = 1,
 	  refining past safe level) [Skotlex]
 	* Updated Glastheim spawns
-	* Added new items, fixed items, added new official drops [Lupus]
+	* Added new items, fixed items, a?ded new official drops [Lupus]
 	* Added a temp shop of official sellable items 8) [Lupus]
 2005/08/18
 	* Added anti-Taekwon Class protection into Valhalla, into Adoption NPC [Lupus]
@@ -3039,7 +3042,7 @@
 2005/06/29
 	* Fixed massive EXP/Loot exploits of all Job Quests (especially in the Rogue JQ) [Lupus]
 	* Inserted a missing ".gat" in alberta city NPC header
-	* Moved banks scripts into /banks/ [massdriller]
+	* Moved ?anks scripts into /banks/ [massdriller]
 	* Corrected small typo in config for marraige script [massdriller]
 	* Added Jawaii npcs thanks to DNett123 [massdriller]
 	* Updated Sara-Chan's Lighthalzen Warps [massdriller]
@@ -3124,7 +3127,7 @@
 2005/05/09
 	* Added new Sara-chan's maps / warps for Einbroch and Lhztargen [Lupus]
 	* Fixed some typos [massdriller] (Thanks to neko for point those out)
-	* Fixed Ayothaya warps.[massdriller] [Thanks to akusarujin]
+	* Fixed Ayothaya warps.[massdriller] [Thanks ?o akusarujin]
 2005/05/07
 	* Modified and added more npc location for healers [massdriller]
 	* Added city cleaners as these were reported systems that exist
@@ -3204,7 +3207,7 @@
 2005/04/03
 	* Finished Valkyrie. Now it correctly works. Valhallana reborns players to High Novices. [Lupus]
 	  (added missed kRO condition: to reborn, player shouldn't have money nor items(equipment) )
-	  Then Valhallana warps just reborn players to the home city of their main job.
+	  Then Valhallana wa?ps just reborn players to the home city of their main job.
 	  On Job Level 10 of High Novice they can get 1st Advanced Job from correct 1-1 job quests NPC.
 	  They'll get there all learnt skill quests.
 	  On reaching 45 Job Level they may visit Valkyrie and get 2-2-1 / 2-1-1 class (3rd Job)
@@ -3287,7 +3290,7 @@
 	* Added Dino9021's monk job quest script - still need checking before adding to
 	  scripts list [celest]
 	* Added gvg mapflags to the guild dungeons, and removed 4 items from
-	  item_avail.txt, thanks Poki [celest]
+	  item_avail.txt, thanks Poki [cel?st]
 	* Translated npc/sample/npc_extend_shop.txt [MC Cameri]
 	* Translated npc/sample/bank_test.txt [MC Cameri]
 	* Fixed respawn delay of Toad and Golden Thief Bug (it was the actual_delay/2). Mob placement files should be revised again [Lupus]
@@ -3356,7 +3359,7 @@
 	* - Now wedding merchant sells tuxedos for 43k, implemented a easier way to change prices of weddings.
 	  - Fixed wrong label calling on jobchange.txt.
 	  - Fixed a timer on momotaro.txt and translated tougijou.txt. Thanks to Shinomori .[shadow]
-2004/11/20
+2004/?1/20
 	* Reduced walking speed for davidsiaw's Dev NPC. [MC Cameri]
 	* Fixed some typos in MC Cameri's Dev NPC, walking speed, etc. [MC Cameri]
 	* Fixed spawns on umbala fields, Fixed spawn point of Amon Ra in morroc pyramids B2 [shadow]
@@ -3422,7 +3425,7 @@
 	* Fixed and redo optional Umbalian quests:
 	- Wise Man Fabius' Umbalian Language Quest (you can learn Umbalian language in
 	  alternative way)
-	- On speaking with Umbalian Chief about meaning of masks you activate Turban Thief Quest
+	- On speaking with Umbalian Chief about meaning of masks you activate Turban Thief ?uest
 	  (For Sphinx Mask)
 	* Fixed several bugs in Niflheim Piano Keys Quest (wrong variable name, missing CLOSE buttons)
 	  Zeny/Item Exploit in Niflhein Sairin NPC quest (should add similiar checks in every
@@ -3491,7 +3494,7 @@
 2004/10/16
 	* Fixed my stupid mistake with the guild switches.
 	  Moved shops from umbala.txt to shops.txt.  Commented out the other ones.
-	  Updated mapflags and re-organized them again.  Files in "mapflag\type" folder are the
+	  Updated mapflags and re-organized them again.  Files?in "mapflag\type" folder are the
 	  same as ones in "mapflag" folder, just organized differently.  ONLY use 1 set.[kobra_k88]
 	* Corrected Morroc warp npc overlaying Kafra npc. [Aria]
 	* Corrected kafra typo. [Shinigami]
@@ -3572,7 +3575,7 @@
 	* Removed duplicate waprs from izlude.txt, comodo.txt, morroc.txt, and jobquest.txt.
 	  Added complete rogue warps. Removed traingnd.txt file as those warps are
 	  already in jobquest.txt.  Added correct tabs to first 2 warps in louyang.txt. [kobra_k88]
-	* Fixed various typos in kafra files.  Now using arrays for the teleport service.
+	* F?xed various typos in kafra files.  Now using arrays for the teleport service.
 	  Also added guild options. [kobra_k88]
 2004/09/06
 	* Forgot the dun/field warps for payon, added now! [Darkchild]
diff --git a/npc/jobs/2-1/hunter.txt b/npc/jobs/2-1/hunter.txt
index f35ef8e64..dea9748c7 100644
--- a/npc/jobs/2-1/hunter.txt
+++ b/npc/jobs/2-1/hunter.txt
@@ -5,7 +5,7 @@
 //= Converted by kobra_k88
 //= Further bugfixed and tested by Lupus
 //===== Current Version: ===================================== 
-//= 3.2
+//= 3.4
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -48,6 +48,8 @@
 //= 3.2 Fixes a bug where the timer was stopped causing the [L0ne_W0lf]
 //=	test to freeze. (bugreport:1099)
 //= 3.3 Added missing next. [L0ne_W0lf]
+//= 3.4 Corrected some Issues with the Waiting Room. (bugreport:1890) [Samuray22]
+//=	-Deleted a Unnecesary Next; on Hunter Guildsman#hnt. (bugreports:1665,2239,2179)
 //============================================================ 
 
 // Notices in the old Hunter Guild.
@@ -439,7 +441,6 @@ L_AskQuestions:
 			mes "I want to see you become a Hunter...! Waaah~ I think you'd look great, so please hurry!";
 			close;
 		}
-		next;
 		mes "[Hunter Sherin]";
 		mes "Hmm, I think you're supposed to visit someone else, not me. Like our Guildmaster who's out for business, you know?";
 		next;
@@ -964,7 +965,7 @@ OnTouch:
 			mapannounce "job_hunte",strcharinfo(0)+ " has resigned. Next person, please enter.",bc_map;
 			mes "[Guide]";
 			mes "Very well. I'll send you to Payon. Hope to see you next time. Don't forget to save when you leave.";
-			donpcevent "Waiting Room#hnt::OnStart";
+			// donpcevent "Waiting Room#hnt::OnStart";
 			close2;
 			set HNTR_Q,13;
 			savepoint "payon",104,99;
@@ -990,10 +991,8 @@ OnInit:
 	end;
 
 OnStartArena:
-	killmonsterall "job_hunte";
 	warpwaitingpc "job_hunte", 90, 67;
 	donpcevent "Manager#hnt::OnEnable";
-	donpcevent "Switch#hnt::OnDisable";
 	disablewaitingroomevent;
 	end;
 
@@ -1008,8 +1007,10 @@ OnInit:
 	end;
 
 OnEnable:
+	donpcevent "Switch#hnt::OnDisable";
 	enablenpc "Manager#hnt";
 	set .MyMobs,6;
+	initnpctimer;
 	// Target Mosnters
 	monster "job_hunte",67,80,"Job Change Monster",1015,1,"Manager#hnt::OnMyMobDead";
 	monster "job_hunte",114,78,"Job Change Monster",1015,1,"Manager#hnt::OnMyMobDead";
@@ -1017,7 +1018,6 @@ OnEnable:
 	monster "job_hunte",53,73,"Job Change Monster",1041,1,"Manager#hnt::OnMyMobDead";
 	monster "job_hunte",125,70,"Job Change Monster",1016,1,"Manager#hnt::OnMyMobDead";
 	monster "job_hunte",90,92,"Job Change Monster",1015,1,"Manager#hnt::OnMyMobDead";
-	initnpctimer;
 	// Decoy Monsters
 	monster "job_hunte",85,100,"Job Test Monster",1016,1,"Manager#hnt::OnMyMobDead2";
 	monster "job_hunte",72,102,"Job Test Monster",1041,1,"Manager#hnt::OnMyMobDead2";
@@ -1068,8 +1068,8 @@ OnMyMobDead2:
 	mapannounce "job_hunte",strcharinfo(0)+ "!! You made a mistake...Please try again.",bc_map;
 	set HNTR_Q,13;
 	warp "job_hunte",176,22;
-	donpcevent "Waiting Room#hnt::OnStart";
 	donpcevent "Manager#hnt::OnReset";
+	donpcevent "Waiting Room#hnt::OnStart";
 	end;
 
 OnReset:
@@ -1190,6 +1190,7 @@ OnTouch:
 		close2;
 		set HNTR_Q,13;
 		warp "job_hunte",176,22;
+		donpcevent "Manager#hnt::OnReset";
 		donpcevent "Waiting Room#hnt::OnStart";
 		end;
 	}
@@ -1210,6 +1211,7 @@ OnInit:
 	end;
 
 OnTouch:
+	donpcevent "Manager#hnt::OnReset";
 	donpcevent "Waiting Room#hnt::OnStart";
 	set HNTR_Q,16;
 	savepoint "payon",104,99;
@@ -1358,8 +1360,8 @@ OnTouch:
 	}
 	set HNTR_Q,13;
 	warp "job_hunte",176,22;
-	donpcevent "Waiting Room#hnt::OnStart";
 	donpcevent "Manager#hnt::OnReset";
+	donpcevent "Waiting Room#hnt::OnStart";
 	end;
 }
 
@@ -1594,8 +1596,8 @@ OnTouch:
 	mapannounce "job_hunte",strcharinfo(0) + ", has failed me! Go back to where you started!",bc_map;
 	set HNTR_Q,13;
 	warp "job_hunte",176,22;
-	donpcevent "Waiting Room#hnt::OnStart";
 	donpcevent "Manager#hnt::OnReset";
+	donpcevent "Waiting Room#hnt::OnStart";
 	end;
 }
 
@@ -1756,4 +1758,4 @@ job_hunte,125,67,0	duplicate(HntTrap2)	96-4	-1,0,0
 job_hunte,126,70,0	duplicate(HntTrap2)	97-1	-1,0,0
 job_hunte,126,71,0	duplicate(HntTrap2)	97-2	-1,0,0
 job_hunte,127,70,0	duplicate(HntTrap2)	97-3	-1,0,0
-job_hunte,127,71,0	duplicate(HntTrap2)	97-4	-1,0,0
+job_hunte,127,71,0	duplicate(HntTrap2)	97-4	-1,0,0
\ No newline at end of file
diff --git a/npc/quests/quests_lighthalzen.txt b/npc/quests/quests_lighthalzen.txt
index 3c2fe4b83..be6c57763 100644
--- a/npc/quests/quests_lighthalzen.txt
+++ b/npc/quests/quests_lighthalzen.txt
@@ -4,7 +4,7 @@
 //= Persian, Vicious_Pucca, aoa00, Evera, MasterOfMupppets,
 //= Lupus, Lord Gywall
 //===== Current Version: ===================================== 
-//= 4.2
+//= 4.3
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -65,6 +65,8 @@
 //= 4.0 Updated several NPCs to Official (iRO) dialog, and restrucured. [L0ne_W0lf]
 //= 4.1 Updated Dungeon quest, and Friendhsip quest to 10.3 standards. [L0ne_W0lf]
 //= 4.2 Fixed wrong variable type in use in "Box#cube1". [L0ne_W0lf]
+//= 4.3 Fixed a bug where if you relog after you take out the Lab Permit from the Box
+//=	You can't finish the quest. (bugreport:1798) [Samuray22]
 //============================================================ 
 
 lighthalzen,1,1,7	script	sneakAddSuber	-1,{
@@ -593,7 +595,7 @@ lighthalzen,341,224,3	script	Fishbone	868,{
 			}
 			end;
 		}
-		else if (lhz_sincube < 10) {
+		else if (lhz_sincube <= 10) {
 			mes "[Fishbone]";
 			mes "Hm, you must not have";
 			mes "accomplished whatever";
@@ -724,7 +726,7 @@ lhz_cube,237,198,0	script	Bundle of Files#cube	111,{
 		mes "on the ground.^000000";
 		close;
 	}
-	else if (lhz_sincube < 10) {
+	else if (lhz_sincube <= 10) {
 		if (@lhz_secret01 < 1) {
 			mes "^3355FFThere are a bunch";
 			mes "of files scattered";
@@ -904,7 +906,7 @@ lhz_cube,248,179,0	script	Chest#cube	111,{
 		mes "and isn't suited for battle.^000000";
 		close;
 	}
-	else if (lhz_sincube == 7) {
+	else if (lhz_sincube == 7 || lhz_sincube == 10) {
 		mes "^3355FFYou've found a chest,";
 		mes "but more importantly,";
 		mes "there is a utility Axe";
@@ -1732,7 +1734,9 @@ lhz_cube,248,193,0	script	Box#cube1	111,{
 			mes "Permit^3355FF, knowing that you";
 			mes "will be needing it later.";
 			set lhz_sincube,10;
-			getitem 2657,1; //Lab_Passport
+			if(countitem(2657) < 1) {
+				getitem 2657,1; //Lab_Passport
+			}
 		}
 		close;
 	}