- Changed some duplicates so they use a floating NPC as their original. (bugreport:1395)

- Fixed the NPC looking for missing label in the Cursed Spirit quest. (bugreport:4654)
- Applied Uno's fix for the cooldown condition in Endless Tower. (bugreport:4677)
- Removed level requirement for the Viens Stone gathering quest. (bugreport:4678)
- Added the missing restricted skills to zone 6 for Endless Tower. (bugreport:4707)
  It's worth noting how much I hate the system for restricting skills per zone.
- Fixed Cat Hand warp service warping players to all warp options. (bugreport:4709)
- Fixed floor 75 warp in endless tower disabling the wrong warp. (bugreport:4711)
- Added a condition for Chungwolmang to only delete items if a certain ID is specified. (bugreport:4719)
- Corrected a mobcount specifying the wrong NPC in the Moscovia Ship quest. (bugreport:4736)


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

20 files changed, 327 insertions, 228 deletions

diff --git a/conf/mapflag/restricted.txt b/conf/mapflag/restricted.txt
index 94920d422..6de962dff 100644
--- a/conf/mapflag/restricted.txt
+++ b/conf/mapflag/restricted.txt
@@ -5,6 +5,7 @@
 //= eAthena Dev Team
 //= 1.0 [Komurka]
 //= 1.1 Added WoE:SE Map restrictions. [L0ne_W0lf]
+//= 1.2 Added Endless Tower Restrictions. (bugreport:4707) [L0ne_W0lf]
 //===== Current Version: =====================================
 
 //Aldebaran Turbo Track
@@ -45,3 +46,11 @@ arug_cas05	mapflag	restricted	4
 //Sealed Shrine ==================
 1@cata	mapflag	restricted	5
 2@cata	mapflag	restricted	5
+
+//Endless Tower ==================
+1@tower	mapflag	restricted	6
+2@tower	mapflag	restricted	6
+3@tower	mapflag	restricted	6
+4@tower	mapflag	restricted	6
+5@tower	mapflag	restricted	6
+6@tower	mapflag	restricted	6
diff --git a/db/Changelog.txt b/db/Changelog.txt
index b1fe0a256..add99e90d 100644
--- a/db/Changelog.txt
+++ b/db/Changelog.txt
@@ -9,6 +9,9 @@
 	13005 Angelic Wing Dagger:	NEED INFO.
 =======================
 
+2011/02/06
+	* Rev. 14697 Added the missing restricted skills to zone 6 for Endless Tower. (bugreport:4707) [L0ne_W0lf]
+	* Adjusted the rates for item using bAddEffOnSkill bonus. 
 2011/01/23
 	* Rev. 14679 Updated Aegis NPC ID constants from current npcidentity.lub (bugreport:4706). [Ai4rei]
 	- Fixes some incorrect NPC ID constants (since r12780).
diff --git a/db/item_db.txt b/db/item_db.txt
index 79976f541..61c7a4adb 100644
--- a/db/item_db.txt
+++ b/db/item_db.txt
@@ -684,7 +684,7 @@
 1382,Krieger_Twohand_Axe1,Glorious Two-Handed Axe,4,0,,0,220,,1,0,0x000444A2,7,2,34,4,80,1,7,{ bonus2 bAddRace,RC_DemiHuman,70; bonus2 bIgnoreDefRate,RC_DemiHuman,20; bonus bUnbreakableWeapon,0; if(getrefine() > 5) { bonus2 bAddRace,RC_DemiHuman,(getrefine()-3)*(getrefine()-3); bonus2 bIgnoreDefRate,RC_DemiHuman,5; bonus3 bAutoSpell,"NPC_CRITICALWOUND",1,50; } if(getrefine() > 8) { bonus3 bAutoSpell,"NPC_CRITICALWOUND",1,100; bonus4 bAutoSpellOnSkill,"MC_MAMMONITE","NPC_CRITICALWOUND",2,200; bonus4 bAutoSpellOnSkill,"WS_CARTTERMINATION","NPC_CRITICALWOUND",2,200; } },{},{}
 1383,Holy_Celestial_Axe,Celestial Axe,4,0,,1500,250,,1,0,0x000444A2,7,2,34,4,60,1,7,{ bonus2 bAddRace,RC_Undead,10; bonus3 bAutoSpell,"AL_BLESSING",5,50; },{},{}
 1384,Veteran_Axe,Veteran Axe,4,0,,3000,250,,1,2,0x000444A2,7,2,34,3,80,1,7,{ if(getskilllv("BS_DAGGER")==3) { bonus bAtk,10; } if(getskilllv("BS_SWORD")==3) { bonus bAtk,10; } if(getskilllv("BS_TWOHANDSWORD")==3) { bonus bAtk,10; } if(getskilllv("BS_KNUCKLE")==3) { bonus bAtk,10; } if(getskilllv("BS_SPEAR")==3) { bonus bAtk,10; } if(getskilllv("BS_AXE")==3) { bonus bAtk,10; } if(getskilllv("BS_MACE")==3) { bonus bAtk,10; } bonus bVit,2; },{},{}
-1385,Bradium_Stonehammer,Bradium Stone Hammer,4,0,,2700,210,,1,0,0x000444A2,2,2,34,4,75,1,7,{ bonus3 bAddEffOnSkill,"BS_HAMMERFALL",Eff_Stun,50+(20*getrefine()); },{},{}
+1385,Bradium_Stonehammer,Bradium Stone Hammer,4,0,,2700,210,,1,0,0x000444A2,2,2,34,4,75,1,7,{ bonus3 bAddEffOnSkill,"BS_HAMMERFALL",Eff_Stun,500+(200*getrefine()); },{},{}
 1386,Doom_Slayer_I,Doom Slayer,4,20,,0,20,,1,0,0x000444A2,7,2,34,4,0,0,7,{ if(readparam(bStr)>=95){ bonus bBaseAtk,400; bonus2 bAddEff,Eff_Stun,3000; bonus bAspdRate,-25; bonus bUseSPrate,100; bonus bBreakArmorRate,500; } },{},{}
 1387,Giant_Axe,Giant Axe,4,0,,4000,330,,1,1,0x000444A2,2,2,34,3,50,1,7,{ bonus2 bSkillAtk,"WS_CARTTERMINATION",15; if(readparam(bStr)>=95) { bonus bHit,10; bonus bAspdRate,3; } },{},{}
 1388,Two_Handed_Axe_C,Two-Handed Axe,4,0,,0,220,,1,0,0x000444A2,7,2,34,3,1,0,7,{ bonus2 bAddSize,0,40; bonus2 bAddSize,1,40; bonus2 bAddSize,2,40; },{},{}
@@ -1024,7 +1024,7 @@
 1923,BF_Instrument1,Valorous Battlefield Guitar,4,0,,0,50,,1,0,0x00080000,7,1,2,3,80,1,13,{ bonus bDex,2; bonus2 bAddRace,RC_DemiHuman,95; bonus2 bIgnoreDefRate,RC_DemiHuman,20; bonus bUnbreakableWeapon,0; },{},{}
 1924,BF_Instrument2,Brave Battlefield Guitar,4,0,,0,50,,1,0,0x00080000,7,1,2,3,80,1,13,{ bonus bDex,2; bonus2 bAddRace,RC_DemiHuman,95; bonus2 bSkillAtk,"CG_ARROWVULCAN",20; bonus bUnbreakableWeapon,0; },{},{}
 1925,Chello,Cello,4,20,,700,110,,1,3,0x00080000,2,1,002,3,70,1,13,{ bonus bAgi,2; bonus bDex,3; bonus2 bAddSkillBlow,"BA_MUSICALSTRIKE",2; bonus2 bAddSkillBlow,"CG_ARROWVULCAN",3; },{},{}
-1926,Harp_Of_Nepenthes,Harp of Nepenthes,4,20,,1000,120,,1,2,0x00080000,2,1,2,4,60,1,13,{ bonus bInt,2; bonus3 bAddEffOnSkill,"BA_MUSICALSTRIKE",Eff_Stun,100; if( getrefine() > 9 ) { bonus3 bAddEffOnSkill,"BA_MUSICALSTRIKE",Eff_Stun,200; } },{},{}
+1926,Harp_Of_Nepenthes,Harp of Nepenthes,4,20,,1000,120,,1,2,0x00080000,2,1,2,4,60,1,13,{ bonus bInt,2; if( getrefine() > 9 ) { bonus3 bAddEffOnSkill,"BA_MUSICALSTRIKE",Eff_Stun,2000; } else { bonus3 bAddEffOnSkill,"BA_MUSICALSTRIKE",Eff_Stun,1000; } },{},{}
 1927,Krieger_Instrument1,Glorious Guitar,4,0,,0,50,,1,0,0x00180000,7,1,2,4,80,1,13,{ bonus2 bAddRace,RC_DemiHuman,95; bonus2 bIgnoreDefRate,RC_DemiHuman,20; bonus bUnbreakableWeapon,0; if(getrefine() > 5) { bonus2 bAddRace,RC_DemiHuman,(getrefine()-4)*(getrefine()-4); bonus2 bIgnoreDefRate,RC_DemiHuman,5; } if(getrefine() > 8) bonus4 bAutoSpellOnSkill,"CG_ARROWVULCAN","CG_TAROTCARD",5,100; },{},{}
 1928,Berserk_Guitar_I,Spirited Guitar,4,0,,0,40,,1,0,0x00080000,2,1,2,4,0,1,13,{ bonus bAspdRate,100; bonus bHPrecovRate,-100; bonus2 bHPLossRate,50,5000; bonus bDex,-readparam(bDex); },{},{}
 1929,Guitar_C,Guitar,4,0,,0,177,,1,0,0x00080000,7,1,2,3,1,0,13,{ bonus2 bAddSize,0,40; bonus2 bAddSize,1,40; bonus2 bAddSize,2,40; },{},{}
@@ -1058,7 +1058,7 @@
 1976,Queen's_Whip_,Queen's Whip,4,20,,1100,150,,2,2,0x00080000,7,0,2,4,65,1,14,{ bonus2 bSkillAtk,"CG_ARROWVULCAN",10; bonus2 bSkillAtk,"DC_THROWARROW",10; },{},{}
 1977,BF_Whip1,Valorous Battle Lariat,4,0,,0,50,,2,0,0x00080000,7,0,2,3,80,1,14,{ bonus bDex,2; bonus2 bAddRace,RC_DemiHuman,95; bonus2 bIgnoreDefRate,RC_DemiHuman,20; bonus bUnbreakableWeapon,0; },{},{}
 1978,BF_Whip2,Brave Battle Lariat,4,0,,0,50,,2,0,0x00080000,7,0,2,3,80,1,14,{ bonus bDex,2; bonus2 bAddRace,RC_DemiHuman,95; bonus2 bSkillAtk,"CG_ARROWVULCAN",20; bonus bUnbreakableWeapon,0; },{},{}
-1979,Stem_Of_Nepenthes,Stem of Nepenthes,4,20,,1000,120,,1,2,0x00080000,2,0,2,4,60,1,14,{ bonus bInt,2; bonus3 bAddEffOnSkill,"DC_THROWARROW",Eff_Freeze,100; if( getrefine() >= 9 ) { bonus3 bAddEffOnSkill,"DC_THROWARROW",Eff_Freeze,200; } },{},{}
+1979,Stem_Of_Nepenthes,Stem of Nepenthes,4,20,,1000,120,,1,2,0x00080000,2,0,2,4,60,1,14,{ bonus bInt,2; if( getrefine() >= 9 ) { bonus3 bAddEffOnSkill,"DC_THROWARROW",Eff_Freeze,2000; } else { bonus3 bAddEffOnSkill,"DC_THROWARROW",Eff_Freeze,1000; } },{},{}
 1980,Whip_Of_Balance,Whip of Balance,4,20,,700,110,,1,3,0x00080000,2,0,2,3,70,1,14,{ bonus bAgi,2; bonus bDex,3; bonus2 bAddSkillBlow,"DC_THROWARROW",2; bonus2 bAddSkillBlow,"CG_ARROWVULCAN",3; },{},{}
 1981,Krieger_Whip1,Glorious Lariat,4,0,,0,50,,2,0,0x00180000,7,0,2,4,80,1,14,{ bonus2 bAddRace,RC_DemiHuman,95; bonus2 bIgnoreDefRate,RC_DemiHuman,20; bonus bUnbreakableWeapon,0; if(getrefine() > 5) { bonus2 bAddRace,RC_DemiHuman,(getrefine()-4)*(getrefine()-4); bonus2 bIgnoreDefRate,RC_DemiHuman,5; } if(getrefine() > 8) bonus4 bAutoSpellOnSkill,"CG_ARROWVULCAN","CG_TAROTCARD",5,100; },{},{}
 1982,Phenomena_Whip,Phenomena Whip,4,0,,0,160,,2,0,0x00080000,7,0,2,4,1,0,14,{ bonus2 bSkillAtk,"DC_THROWARROW",25; },{},{}
@@ -2763,7 +2763,7 @@
 5555,Leaf_Cat_Hat,Leaf Cat Hat,5,20,,100,,3,,0,0xFFFFFFFF,7,2,256,,0,1,539,{ bonus bAgi,1; bonus3 bAutoSpellWhenHit,"AL_HEAL",3,10; },{},{}
 5556,Seal_Hat,Seal Hat,5,20,,500,,3,,0,0xFFFFFFFF,7,2,769,,55,1,540,{ bonus bInt,1; bonus3 bAutoSpell,"WZ_FROSTNOVA",1,30; },{},{}
 //5557,Wild_Rose_Hat,Wild Rose Hat,5,20,,500,,3,,1,0xFFFFFFFE,7,2,256,,20,1,541,{ bonus bAgi,3; },{},{}
-//5558,Luxury_Hat,Luxury Hat,5,20,,100,,3,,1,0xFFFFFFFF,7,2,256,,30,1,542,{ bonus3 bAddMonsterDropItem,511,RC_Plant,500; },{},{}
+//5558,Luxury_Hat,Luxury Hat,5,20,,100,,3,,1,0xFFFFFFFF,7,2,256,,30,1,542,{ bonus3 bAddMonsterDropItem,510,RC_Plant,500; },{},{}
 5559,Piece_Of_White_Cloth,Piece Of White Cloth,5,20,,100,,1,,0,0xFFFFFFFF,7,2,256,,0,1,543,{},{},{}
 5560,Bullock_Helm_,Bullock Helm,5,20,,300,,3,,0,0xFFFFFFFF,7,2,256,,75,1,322,{ bonus bMaxHP,100; bonus bNoKnockback,0; bonus2 bSubEle,Ele_Neutral,-20; bonus2 bSubEle,Ele_Fire,-20; bonus2 bSubEle,Ele_Water,-20; bonus2 bSubEle,Ele_Wind,-20; bonus2 bSubEle,Ele_Earth,-20; bonus2 bSubEle,Ele_Dark,-20; bonus2 bSubEle,Ele_Holy,-20; bonus2 bSubEle,Ele_Ghost,-20; },{},{}
 5561,Magic_Rabbit_Hat,Magic Rabbit Hat,5,20,,800,,1,,0,0xFFFFFFFF,7,2,256,,0,1,497,{ bonus bInt,1; bonus bMaxSP,50; bonus4 bAutoSpellWhenHit,"MG_FIREBOLT",3,10,3; bonus4 bAutoSpellWhenHit,"MG_COLDBOLT",3,10,3; bonus4 bAutoSpellWhenHit,"MG_LIGHTNINGBOLT",3,10,3; bonus3 bAutoSpellWhenHit,"AL_HEAL",1,10; },{},{}
@@ -5025,8 +5025,8 @@
 //13043,Fortune_Sword_I
 //13044,House_Auger_I
 //13045,Kamaitachi_I
-13046,Krieg,Krierg,4,20,,500,110,,1,3,0x00021040,2,2,2,2,50,1,1,{ bonus3 bAddEffOnSkill,"RG_BACKSTAP",Eff_Bleeding,100; bonus2 bSkillAtk,"RG_BACKSTAP",15; },{},{}
-13047,Weihna,Weihna,4,20,,500,135,,1,2,0x00021040,2,2,2,3,50,1,1,{ bonus3 bAddEffOnSkill,"RG_RAID",Eff_Poison,100; autobonus "{ bonus2 bAddRace,RC_NonBoss,10; bonus2 bAddRace,RC_Boss,10; }",5,5000,BF_WEAPON|BF_SHORT,"{ specialeffect2 EF_POTION_BERSERK; }"; },{},{}
+13046,Krieg,Krierg,4,20,,500,110,,1,3,0x00021040,2,2,2,2,50,1,1,{ bonus3 bAddEffOnSkill,"RG_BACKSTAP",Eff_Bleeding,1000; bonus2 bSkillAtk,"RG_BACKSTAP",15; },{},{}
+13047,Weihna,Weihna,4,20,,500,135,,1,2,0x00021040,2,2,2,3,50,1,1,{ bonus3 bAddEffOnSkill,"RG_RAID",Eff_Poison,1000; autobonus "{ bonus2 bAddRace,RC_NonBoss,10; bonus2 bAddRace,RC_Boss,10; }",5,5000,BF_WEAPON|BF_SHORT,"{ specialeffect2 EF_POTION_BERSERK; }"; },{},{}
 //13048,Damascus_C
 //13050,P_Dagger1,Eden Dagger I,4,0,,0,124,,1,0,0xFE9F7EEF,7,2,2,2,26,0,1,{},{},{}
 //13051,P_Dagger2,Eden Dagger II,4,0,,0,158,,1,0,0xFE9F7EEF,7,2,2,2,40,0,1,{},{},{}
@@ -5077,8 +5077,8 @@
 //13175,Lever_Action_Rifle_C
 13176,Krieger_Rifle1,Glorious Rifle,4,0,,0,90,,9,0,0x01000000,7,2,34,4,80,1,18,{ bonus2 bAddRace,RC_DemiHuman,75; bonus2 bIgnoreDefRate,RC_DemiHuman,20; bonus2 bSkillAtk,"GS_TRIPLEACTION",30; bonus bUnbreakableWeapon,0; if(getrefine() > 5) { bonus2 bAddRace,RC_DemiHuman,(getrefine()-4)*(getrefine()-4); bonus2 bIgnoreDefRate,RC_DemiHuman,5; }  if(getrefine() > 8) { bonus2 bCastrate,"GS_TRACKING",25; bonus2 bSkillAtk,"GS_TRACKING",getrefine() * 3; } },{},{}
 13177,Krieger_Gatling1,Glorious Gatling Gun,4,0,,0,90,,9,0,0x01000000,7,2,34,4,80,1,19,{ bonus2 bAddRace,RC_DemiHuman,35; bonus2 bIgnoreDefRate,RC_DemiHuman,25; bonus2 bSkillAtk,"GS_TRIPLEACTION",30; bonus bUnbreakableWeapon,0; if(getrefine() > 5) { bonus2 bAddRace,RC_DemiHuman,(getrefine()-4)*(getrefine()-4); bonus2 bIgnoreDefRate,RC_DemiHuman,5; }  if(getrefine() > 8) {bonus2 bAddRace,RC_Boss,getrefine(); bonus2 bAddRace,RC_NonBoss,getrefine(); } },{},{}
-13178,Krieger_Shotgun1,Glorious Shotgun,4,0,,0,110,,9,0,0x01000000,7,2,34,4,80,1,20,{ bonus2 bAddRace,RC_DemiHuman,55; bonus2 bIgnoreDefRate,RC_DemiHuman,20; bonus bSplashRange,1; bonus2 bSkillAtk,"GS_TRIPLEACTION",30; bonus bUnbreakableWeapon,0; if(getrefine() > 5) { bonus2 bAddRace,RC_DemiHuman,(getrefine()-4)*(getrefine()-4); bonus2 bIgnoreDefRate,RC_DemiHuman,5; }  if(getrefine() > 8) { bonus2 bSkillAtk,"GS_SPREADATTACK",getrefine() * 2; bonus3 bAddEffOnSkill,"GS_SPREADATTACK",Eff_Stun,200; } },{},{}
-13179,Krieger_Launcher1,Glorious Grenade Launcher,4,0,,0,330,,9,0,0x01000000,7,2,34,4,80,1,21,{ bonus2 bAddRace,RC_DemiHuman,35; bonus2 bIgnoreDefRate,RC_DemiHuman,20; bonus2 bSkillAtk,"GS_TRIPLEACTION",30; bonus bUnbreakableWeapon,0; if(getrefine() > 5) { bonus2 bAddRace,RC_DemiHuman,(getrefine()-4)*(getrefine()-4); bonus2 bIgnoreDefRate,RC_DemiHuman,5; }  if(getrefine() > 8) { bonus2 bSkillAtk,"GS_GROUNDDRIFT",getrefine() * 2; bonus3 bAddEffOnSkill,"GS_SPREADATTACK",Eff_Stun,200; autobonus "{ bonus bAspdRate,20; }",200,20000,BF_WEAPON,"{ specialeffect2 EF_POTION_BERSERK; }"; } },{},{}
+13178,Krieger_Shotgun1,Glorious Shotgun,4,0,,0,110,,9,0,0x01000000,7,2,34,4,80,1,20,{ bonus2 bAddRace,RC_DemiHuman,55; bonus2 bIgnoreDefRate,RC_DemiHuman,20; bonus bSplashRange,1; bonus2 bSkillAtk,"GS_TRIPLEACTION",30; bonus bUnbreakableWeapon,0; if(getrefine() > 5) { bonus2 bAddRace,RC_DemiHuman,(getrefine()-4)*(getrefine()-4); bonus2 bIgnoreDefRate,RC_DemiHuman,5; }  if(getrefine() > 8) { bonus2 bSkillAtk,"GS_SPREADATTACK",getrefine() * 2; bonus3 bAddEffOnSkill,"GS_SPREADATTACK",Eff_Stun,2000; } },{},{}
+13179,Krieger_Launcher1,Glorious Grenade Launcher,4,0,,0,330,,9,0,0x01000000,7,2,34,4,80,1,21,{ bonus2 bAddRace,RC_DemiHuman,35; bonus2 bIgnoreDefRate,RC_DemiHuman,20; bonus2 bSkillAtk,"GS_TRIPLEACTION",30; bonus bUnbreakableWeapon,0; if(getrefine() > 5) { bonus2 bAddRace,RC_DemiHuman,(getrefine()-4)*(getrefine()-4); bonus2 bIgnoreDefRate,RC_DemiHuman,5; }  if(getrefine() > 8) { bonus2 bSkillAtk,"GS_GROUNDDRIFT",getrefine() * 2; bonus3 bAddEffOnSkill,"GS_SPREADATTACK",Eff_Stun,2000; autobonus "{ bonus bAspdRate,20; }",200,20000,BF_WEAPON,"{ specialeffect2 EF_POTION_BERSERK; }"; } },{},{}
 // Bullets
 13200,Bullet,Bullet,10,1,,2,10,,,,0x01000000,7,2,32768,,1,,3,{},{},{}
 13201,Silver_Bullet,Silver Bullet,10,15,,2,15,,,,0x01000000,7,2,32768,,1,,3,{ bonus bAtkEle,Ele_Holy; },{},{}
diff --git a/db/skill_nocast_db.txt b/db/skill_nocast_db.txt
index f52324d0e..47ec1226b 100644
--- a/db/skill_nocast_db.txt
+++ b/db/skill_nocast_db.txt
@@ -39,12 +39,14 @@
 27,8	//AL_WARP
 87,8	//WZ_ICEWALL
 150,8	//TF_BACKSLIDING
+264,8	//MO_BODYRELOCATION
 361,8	//HP_ASSUMPTIO
 362,8	//HP_BASILICA
 395,8	//CG_MOONLIT
+396,8	//CG_MARIONETTE
 491,8	//CR_CULTIVATION
 411,8	//TK_RUN
-426,8	//High Jump
+426,8	//TK_HIGHJUMP
 427,8	//SG_FEEL
 428,8	//SG_SUN_WARM
 429,8	//SG_MOON_WARM
@@ -59,6 +61,7 @@
 438,8	//SG_SUN_BLESS
 439,8	//SG_MOON_BLESS
 440,8	//SG_STAR_BLESS
+530,8	//NJ_KIRIKAGE
 691,8	//CASH_ASSUMPITO
 
 //mixed
@@ -69,34 +72,41 @@
 79,16	//PR_MAGNUS
 
 //Zone 1 - Aldebaran Turbo Track
-219,32	//Snatch
-26,32	//Teleport
-27,32	//Warp portal
-51,32	//Hiding
-135,32	//Cloaking
-389,32	//Stealth
-35,32	//Cure
-87,32	//Ice Wall
-359,32	//Berserk (Frenzy)
-362,32	//Basilica
-395,32	//Sheltering Bliss
-357,32	//Spear Dynamo (Concentration)
-264,32	//Snap (Body Relocation)
+219,32	//RG_INTIMIDATE
+26,32	//AL_TELEPORT
+27,32	//AL_WARP
+51,32	//TF_HIDING
+135,32	//AS_CLOAKING
+389,32	//ST_CHASEWALK
+35,32	//AL_CURE
+87,32	//WZ_ICEWALL
+359,32	//LK_BERSERK
+362,32	//HP_BASILICA
+395,32	//CG_MOONLIT
+357,32	//LK_CONCENTRATION
+264,32	//MO_BODYRELOCATION
 
 //Zone 2 - Jail
-421,64	//TK_JUMPKICK#Flying Side Kick#
-426,64	//TK_HIGHJUMP#Taekwon Jump#
+421,64	//TK_JUMPKICK
+426,64	//TK_HIGHJUMP
 
 //Zone 3 - Izlude Battle Arena
-219,128 //Snatch
-26,128	//Teleport
+219,128 //RG_INTIMIDATE
+26,128	//AL_TELEPORT
 
 //Zone 4 - WoE:SE
-426,256 //High Jump
+426,256 //TK_HIGHJUMP
 
 //Zone 5 - Sealed Shrine
 12,512	//MG_SAFETYWALL
 26,512	//AL_TELEPORT
-219,512	//Snatch
+219,512	//RG_INTIMIDATE
 361,512	//HP_ASSUMPTIO
 691,512	//CASH_ASSUMPTIO
+
+//Zone 6 -Endless Tower
+26,1024	//AL_TELEPORT
+87,1024	//WZ_ICEWALL
+219,1024	//RG_INTIMIDATE
+405,1024	//PF_SPIDERWEB
+674,1024	//NPC_EXPULSION
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 458bbc4f5..b0b1e3f3f 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,5 +1,17 @@
 Date		Added
 ======
+2011/02/06
+	* Rev. 14697 Script bug fixing. :] Here's some. I know it's been awhile. [L0ne_W0lf]
+	- Changed some duplicates so they use a floating NPC as their original. (bugreport:1395)
+	- Fixed the NPC looking for missing label in the Cursed Spirit quest. (bugreport:4654)
+	- Applied Uno's fix for the cooldown condition in Endless Tower. (bugreport:4677)
+	- Removed level requirement for the Viens Stone gathering quest. (bugreport:4678)
+	- Added the missing restricted skills to zone 6 for Endless Tower. (bugreport:4707)
+	  It's worth noting how much I hate the system for restricting skills per zone.
+	- Fixed Cat Hand warp service warping players to all warp options. (bugreport:4709)
+	- Fixed floor 75 warp in endless tower disabling the wrong warp. (bugreport:4711)
+	- Added a condition for Chungwolmang to only delete items if a certain ID is specified. (bugreport:4719)
+	- Corrected a mobcount specifying the wrong NPC in the Moscovia Ship quest. (bugreport:4736)
 2011/01/16
 	* Rev. 14676 Various fixes for scripts that are disabled by default. [Ai4rei]
 	- Fixed name collision in Baphomet Jr. taming item quest (custom) with 'Little Boy' in cities/lutie.txt
diff --git a/npc/events/gdevent_aru.txt b/npc/events/gdevent_aru.txt
index e18495620..1c6c70d95 100644
--- a/npc/events/gdevent_aru.txt
+++ b/npc/events/gdevent_aru.txt
@@ -1,10 +1,26 @@
+//===== eAthena Script ======================================= 
+//= Guild dungeon event, Arunafeltz.
+//===== By: ================================================== 
+//= L0ne_W0lf
+//===== Current Version: ===================================== 
+//= 1.1
+//===== Compatible With: ===================================== 
+//= eAthena SVN
+//===== Description: ========================================= 
+//= Guild dungeon event, Arunafeltz. Retrieve Morestone's
+//= pickaxe from Kublin.
+//===== Additional Comments: =================================
+//= 1.0 First version
+//= 1.1 Changed spawn timer to 1 hour. [L0ne_w0lf]
+//============================================================
+
 arug_dun01,1,1,1	script	Monster Controler#aru_gd	81,{
 OnInit:
 	donpcevent "Monster Controler1#aru::OnKill";
 	initnpctimer;
 	end;
 
-OnTimer10000:
+OnTimer3600000:
 	donpcevent "Monster Controler1#aru::OnEnable";
 	mapannounce "arug_dun01", "Kublin: Aargh!",bc_map,"0x99CC00";
 	mapannounce "arug_dun01", "Morestone: Stop righ there! You thief!",bc_map,"0x99CC00";
diff --git a/npc/events/gdevent_sch.txt b/npc/events/gdevent_sch.txt
index 011d0acd7..9f2064afd 100644
--- a/npc/events/gdevent_sch.txt
+++ b/npc/events/gdevent_sch.txt
@@ -1,10 +1,26 @@
+//===== eAthena Script ======================================= 
+//= Guild dungeon event, Schwaltzvalt.
+//===== By: ================================================== 
+//= L0ne_W0lf
+//===== Current Version: ===================================== 
+//= 1.1
+//===== Compatible With: ===================================== 
+//= eAthena SVN
+//===== Description: ========================================= 
+//= Guild dungeon event, Schwaltzvalt. Retrieve Morestone's
+//= pickaxe from Kublin.
+//===== Additional Comments: =================================
+//= 1.0 First version
+//= 1.1 Changed spawn timer to 1 hour. [L0ne_w0lf]
+//============================================================
+
 schg_dun01,1,1,1	script	Monster Controler#sch_gd	81,{
 OnInit:
 	donpcevent "Monster Controler1#sch::OnKill";
 	initnpctimer;
 	end;
 
-OnTimer10000:
+OnTimer3600000:
 	donpcevent "Monster Controler1#sch::OnEnable";
 	mapannounce "schg_dun01", "Kublin: Aargh!",bc_map,"0x99CC00";
 	mapannounce "schg_dun01", "Morestone: Stop righ there! You thief!",bc_map,"0x99CC00";
diff --git a/npc/instances/EndlessTower.txt b/npc/instances/EndlessTower.txt
index b1dc002b9..495b367d2 100644
--- a/npc/instances/EndlessTower.txt
+++ b/npc/instances/EndlessTower.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.5
+//= 1.6
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -21,6 +21,8 @@
 //=     You may need to update your questid2display.
 //=     Changed White lady spawn to MVP White Lady. (bugreport:4601)
 //= 1.5 Corrected some grammar and typos.
+//= 1.6 Corrected the tower re-entry blocked condition. (bugreport:4677) [L0ne_W0lf]
+//=     Corrected floor 75 warp disabling the wrong NPC. (bugreport:4711)
 //============================================================ 
 
 alberta,214,77,6	script	Captain Janssen	709,{
@@ -352,7 +354,7 @@ e_tower,81,105,0	script	Tower Protection Stone	406,{
 			}
 			close;
 		}
-		else if ((.@etower_timer >= 0) && (.@etower_timer2 == 2)) {
+		else if ((.@etower_timer >= 0) && (.@etower_timer < 2) && (.@etower_timer2 == 2)) {
 			mes "Due to the tower's aftereffects, you cannot enter the dungeon right now, " + .@dun_h + "hours " + .@dun_m + "minutes " + .@dun_s + "seconds left to enter the next dungeon.";
 			next;
 			mes "It is dangerous here. Let me move you to Alberta.";
@@ -2807,11 +2809,11 @@ OnTimer120000:
 
 3@tower,355,51,0	script	75FGate102tower-2	45,2,2,{
 OnInstanceInit:
-	disablenpc instance_npcname("75FGate102tower", instance_id());
+	disablenpc instance_npcname("75FGate102tower-2", instance_id());
 	end;
 
 OnEnable:
-	enablenpc instance_npcname("75FGate102tower", instance_id());
+	enablenpc instance_npcname("75FGate102tower-2", instance_id());
 	end;
 
 OnTouch_:
diff --git a/npc/merchants/icecream.txt b/npc/merchants/icecream.txt
index eb1dd0c63..ddc5fce03 100644
--- a/npc/merchants/icecream.txt
+++ b/npc/merchants/icecream.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= KOOK SWU, Kisuka
 //===== Current Version: =====================================
-//= 1.3
+//= 1.4
 //===== Compatible With: =====================================
 //= eAthena SVN
 //===== Description: =========================================
@@ -12,10 +12,10 @@
 //= 1.1 Optimized, changed overlapping coords in Alberta [Lupus]
 //= 1.2 According to the patch, IceCream seller has been removed from Morocc [Lupus]
 //= 1.3 No more label menu and updated to match AEGIS script. [Kisuka]
+//= 1.4 Duplicates now spawn from floating NPCs. [L0ne_W0lf]
 //============================================================
 
-// Alberta
-alberta,120,45,2	script	Ice Cream Maker::IceCreamer	85,{
+-	script	Ice Cream Maker::IceCreamer	-1,{
 	mes "[Ice Cream Maker]";
 	mes "Fresh Ice Cream made with snow from Lutie!";
 	mes "Enjoy it now, it won't be on sale for long!";
@@ -75,6 +75,9 @@ alberta,120,45,2	script	Ice Cream Maker::IceCreamer	85,{
 	close;
 }
 
+// Alberta
+alberta,120,45,2	duplicate(IceCreamer)	Ice Cream Maker#1	85
+
 // Morroc Field
 moc_fild16,88,304,4	duplicate(IceCreamer)	Ice Cream Maker#2	85
 
diff --git a/npc/merchants/socket_enchant.txt b/npc/merchants/socket_enchant.txt
index 8f8a13b0d..9e9af6d68 100644
--- a/npc/merchants/socket_enchant.txt
+++ b/npc/merchants/socket_enchant.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= eAthena dev team
 //===== Current Version: =====================================
-//= 1.9
+//= 2.0
 //===== Compatible With: =====================================
 //= eAthena SVN
 //===== Description: =========================================
@@ -26,9 +26,10 @@
 //= 1.8 Added missing Gae Bolg and Dragon Slayer. [Kisuka]
 //= 1.9 Moved Episode 12 items to separate NPC.
 //=     Some cleanup & optimization. [Gepard]
+//= 2.0 Duplicates now spawn from floating NPCs. [L0ne_W0lf]
 //============================================================
 
-payon,140,151,5	script	Seiyablem#pay	84,{
+-	script	Seiyablem#dummy::SocketEnchant	-1,{
 	if (checkweight(1201,1) == 0)
 	{
 		mes "- Wait a minute !! -";
@@ -333,11 +334,12 @@ function	script	Func_Socket	{
 	}
 }
 
-lhz_in02,281,35,5	duplicate(Seiyablem#pay)	Seiyablem#lhz	84
-prt_in,33,70,5	duplicate(Seiyablem#pay)	Seiyablem#prt	84
-morocc,51,41,4	duplicate(Seiyablem#pay)	Seiyablem#moc	84
+payon,140,151,5	duplicate(SocketEnchant)	Seiyablem#pay	84
+lhz_in02,281,35,5	duplicate(SocketEnchant)	Seiyablem#lhz	84
+prt_in,33,70,5	duplicate(SocketEnchant)	Seiyablem#prt	84
+morocc,51,41,4	duplicate(SocketEnchant)	Seiyablem#moc	84
 
-prt_in,31,57,1	script	Young Man#prt	97,{
+-	script	Young Man#dummy::SocketMan	-1,{
 	mes "[Young Man]";
 	mes "I'm considering becoming a Slotting Engineer.";
 	mes "It's a new field where you can add Slots to equipment, and it'd be cool if I can work in such a lucrative career.";
@@ -354,6 +356,7 @@ prt_in,31,57,1	script	Young Man#prt	97,{
 	close;
 }
 
-payon,143,143,7	duplicate(Young Man#prt)	Young Man#pay	97
-morocc,60,42,3	duplicate(Young Man#prt)	Young Man#moc	97
-lhz_in02,269,33,5	duplicate(Young Man#prt)	Young Man#lhz	97
+prt_in,31,57,1	duplicate(SocketMan)	Young Man#prt	97
+payon,143,143,7	duplicate(SocketMan)	Young Man#pay	97
+morocc,60,42,3	duplicate(SocketMan)	Young Man#moc	97
+lhz_in02,269,33,5	duplicate(SocketMan)	Young Man#lhz	97
diff --git a/npc/merchants/socket_enchant2.txt b/npc/merchants/socket_enchant2.txt
index 58b934b24..e7f14c37c 100644
--- a/npc/merchants/socket_enchant2.txt
+++ b/npc/merchants/socket_enchant2.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= Gepard
 //===== Current Version: ===================================== 
-//= 1.0
+//= 1.1
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -11,9 +11,10 @@
 //= Adds slots to selected weapons and armor.
 //===== Additional Comments: ================================= 
 //= 1.0 First version.
+//= 1.1 Duplicates now spawn from floating NPCs. [L0ne_W0lf]
 //============================================================ 
 
-payon,236,199,3	script	Leablem	86,{
+-	script	Leablem#dummy::SocketEnchant2	-1,{
 	if (checkweight(1201,1) == 0)
 	{
 		mes "- Wait a seconds !! -";
@@ -377,9 +378,10 @@ payon,236,199,3	script	Leablem	86,{
 	}
 }
 
-lighthalzen,96,137,3	duplicate(Leablem)	Leablem#lhz	86
-prontera,244,169,5	duplicate(Leablem)	Leablem#prt	86
-moc_ruins,154,86,3	duplicate(Leablem)	Leablem#moc	86
+payon,236,199,3	duplicate(SocketEnchant2)	Leablem#pay	86,{
+lighthalzen,96,137,3	duplicate(SocketEnchant2)	Leablem#lhz	86
+prontera,244,169,5	duplicate(SocketEnchant2)	Leablem#prt	86
+moc_ruins,154,86,3	duplicate(SocketEnchant2)	Leablem#moc	86
 
 function	script	Func_Socket2	{
 
diff --git a/npc/other/auction.txt b/npc/other/auction.txt
index 4a033fa3a..20fcde573 100644
--- a/npc/other/auction.txt
+++ b/npc/other/auction.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
-//= 1.2
+//= 1.3
 //===== Compatible With: =====================================
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -13,6 +13,7 @@
 //= 1.0 First version, place holders only. [L0ne_W0lf]
 //= 1.1 Moved Morroc Auction NPCs to Morroc Ruins. [L0ne_W0lf]
 //= 1.2 Warp fixed. Dialog in Ruins/Lighthalzen changed. [Kisuka]
+//= 1.3 Duplicates now spawn from floating NPCs. [L0ne_W0lf]
 //============================================================
 
 // Auction House warpers
@@ -72,14 +73,15 @@ function	script	F_AuctionWarper	{
 
 // Sign posts
 //============================================================
-moc_ruins,76,176,6	script	Information Post#moc::AuctionSign	837,{
+-	script	Information Post#dum::AuctionSign	-1,{
 	mes "[Information]";
 	mes "Auction Warp Guide";
 	close;
 }
 
-prontera,216,120,4	duplicate(AuctionSign)	Information Post#prt	837,{
-yuno,131,116,0	duplicate(AuctionSign)	Information Post#yuno	837,{
+moc_ruins,76,176,6	duplicate(AuctionSign)	Information Post#moc	837
+prontera,216,120,4	duplicate(AuctionSign)	Information Post#prt	837
+yuno,131,116,0	duplicate(AuctionSign)	Information Post#yuno	837
 lighthalzen,207,169,6	duplicate(AuctionSign)	Information Post#lhz	837
 
 // Warps
@@ -91,7 +93,7 @@ auction_02,43,17,0	warp	auction_enterance_lhz	1,1,lighthalzen,209,169
 
 // Auction House NPCs
 //============================================================
-auction_01,182,68,6	script	Auction Broker#moc1::AuctionBroker	98,{
+-	script	Auction Broker#dum::AuctionBroker	-1,{
 	mes "[Auction Broker]";
 	mes "Welcome to the Auction Hall.";
 	mes "Would you like to view the goods?";
@@ -114,6 +116,7 @@ auction_01,182,68,6	script	Auction Broker#moc1::AuctionBroker	98,{
 	close;
 }
 
+auction_01,182,68,6	duplicate(AuctionBroker)	Auction Broker#moc1	98
 auction_01,182,75,0	duplicate(AuctionBroker)	Auction Broker#moc2	99
 auction_01,177,75,2	duplicate(AuctionBroker)	Auction Broker#moc3	98
 auction_01,177,68,4	duplicate(AuctionBroker)	Auction Broker#moc4	99
diff --git a/npc/other/mail.txt b/npc/other/mail.txt
index 626efcb0b..778dba4f4 100644
--- a/npc/other/mail.txt
+++ b/npc/other/mail.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
-//= 1.5
+//= 1.6
 //===== Compatible With: =====================================
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -17,14 +17,12 @@
 //= 1.3a Corrected a typo error. (bugreport:798) [Samuray22]
 //= 1.4 Added a Mapflag to prevent mail operations in other maps [Zephyrus]
 //= 1.5 Moved Morroc Mail boxes to Morroc Ruins. [L0ne_W0lf]
+//= 1.6 Duplicates now spawn from floating NPCs. [L0ne_W0lf]
 //============================================================
 
-// Allow Mail Inbox reading from
+// Floating mailbox npc that all NPCs duplicate from.
 //============================================================
-
-// Prontera
-//============================================================
-prontera,146,86,0	script	Mailbox#prt::MailBox	888,{
+-	script	Mailbox#dummy::MailBox	-1,{
 	mes "[Mailbox]";
 	mes "If you'd like to use";
 	mes "the Mailbox Service,";
@@ -57,6 +55,9 @@ prontera,146,86,0	script	Mailbox#prt::MailBox	888,{
 	close;
 }
 
+// Prontera
+//============================================================
+prontera,146,86,0	duplicate(MailBox)	Mailbox#prt	888
 prontera,275,213,0	duplicate(MailBox)	Mailbox#2prt	888
 prontera,34,212,0	duplicate(MailBox)	Mailbox#3prt	888
 
diff --git a/npc/other/mercenary_rent.txt b/npc/other/mercenary_rent.txt
index 645f7dfd6..23c3e78c1 100644
--- a/npc/other/mercenary_rent.txt
+++ b/npc/other/mercenary_rent.txt
@@ -1,9 +1,10 @@
 //===== eAthena Script ======================================= 
+//===== eAthena Script ======================================= 
 //= Mercenary related NPCs
 //===== By: ================================================== 
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.2
+//= 1.3
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -14,6 +15,7 @@
 //= 1.0 First version. [L0ne_W0lf]
 //= 1.1 Optimization. [Zephyrus]
 //= 1.2 Removed redundent input. [L0ne_W0lf]
+//= 1.3 Duplicates now spawned from floating NPCs. [L0ne_W0lf]
 //============================================================ 
 
 prontera,41,337,5	script	Mercenary Manager#Spear	105,{
@@ -653,7 +655,7 @@ pay_arche,99,167,4	script	Mercenary Manager#Bow	732,{
 
 // Mercenary Merchant NPCs
 //============================================================
-prontera,30,337,4	script	Mercenary Merchant#Spear::MercMerchant	700,{
+-	script	Mercenary Merchant#dummy::MercMerchant	-1,{
 	mes "[Mercenary Goods Merchant]";
 	mes "Hello, I sell goods";
 	mes "that Mercenaries can";
@@ -698,8 +700,10 @@ prontera,30,337,4	script	Mercenary Merchant#Spear::MercMerchant	700,{
 		next;
 		callfunc "F_PurchaseMercItem",12243,2100;
 	}
+	close;
 }
 
+prontera,30,337,4	duplicate(MercMerchant)	Mercenary Merchant#Spear	700
 izlude,56,139,4	duplicate(MercMerchant)	Mercenary Merchant#Sword	892
 pay_arche,102,167,5	duplicate(MercMerchant)	Mercenary Merchant#Bow	879
 
diff --git a/npc/other/pvp.txt b/npc/other/pvp.txt
index 05c56e2e5..5a7673ce9 100644
--- a/npc/other/pvp.txt
+++ b/npc/other/pvp.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= kobra_k88; L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.4
+//= 1.5
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -26,15 +26,12 @@
 //=	exception of the "Free for all" mode.
 //=	Added PVP event NPCs.
 //= 1.4 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
+//= 1.5 Duplicates now spawn from floating NPCs. [L0ne_W0lf]
 //============================================================ 
 
-// Morroc
+// Floating NPC
 //============================================================ 
-morocc_in,144,138,4	script	PVPNarrator#moc	84,{
-	callfunc "F_PVPNarrator","morocc_in",141,139;
-}
-
-morocc_in,144,142,4	script	Gate Keeper#moc::PVPGateKeeper	83,{
+-	script	Gate Keeper#dummy::PVPGateKeeper	-1,{
 	mes "[Gate Keeper]";
 	mes "Glad to be of service.";
 	mes "I will open the PVP fight";
@@ -114,6 +111,15 @@ morocc_in,144,142,4	script	Gate Keeper#moc::PVPGateKeeper	83,{
 	}
 }
 
+// Morroc
+//============================================================ 
+morocc_in,144,138,4	script	PVPNarrator#moc	84,{
+	callfunc "F_PVPNarrator","morocc_in",141,139;
+}
+
+morocc_in,144,142,4	duplicate(PVPGateKeeper)	Gate Keeper#moc	83,{
+
+
 // Alberta
 //============================================================ 
 alberta_in,22,146,4	script	PVP Narrator#alb	84,{
@@ -465,7 +471,7 @@ OnInit:
 
 // Spectator Entrance
 //============================================================ 
-pvp_room,62,85,4	script	Spectator's Entrance#1::PVPSpectator	105,{
+-	script	Spectator's Entrance#dum::PVPSpectator	-1,{
 	if (countitem(7029) == 0) {
 		mes "[PVP Compete Square Register Staff]";
 		mes "This is the entrance for viewers.";
@@ -492,6 +498,8 @@ OnInit:
 	end;
 }
 
+pvp_room,62,85,4	duplicate(PVPSpectator)	Spectator's Entrance#1	105
+
 pvp_room,70,85,4	duplicate(PVPSpectator)	Spectator's Entrance#2	105
 
 pvp_room,78,85,4	duplicate(PVPSpectator)	Spectator's Entrance#3	105
@@ -500,7 +508,7 @@ pvp_room,86,85,4	duplicate(PVPSpectator)	Spectator's Entrance#4	105
 
 // Spectator Warps
 //============================================================ 
-pvp_2vs2,5,4,0	script	Combat Square Staff#1::PVPSpecWarp	45,1,1,{
+-	script	Combat Square Staff#dum::PVPSpecWarp	-1,{
 OnTouch:
 	mes "[Combat Square Staff]";
 	mes "May I help you?";
@@ -512,6 +520,8 @@ OnTouch:
 	end;
 }
 
+pvp_2vs2,5,4,0	duplicate(PVPSpecWarp)	Combat Square Staff#1	45,1,1,{
+
 pvp_2vs2,5,74,0	duplicate(PVPSpecWarp)	Combat Square Staff#2	45,1,1
 
 pvp_2vs2,74,74,0	duplicate(PVPSpecWarp)	Combat Square Staff#3	45,1,1
diff --git a/npc/quests/newgears/2006_headgear.txt b/npc/quests/newgears/2006_headgear.txt
index e8980b0be..25d69475d 100644
--- a/npc/quests/newgears/2006_headgear.txt
+++ b/npc/quests/newgears/2006_headgear.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= DiviniaRO members, cleaned by reddozen
 //===== Current Version: =====================================
-//= 1.3a
+//= 1.4
 //===== Compatible With: =====================================
 //= SVN eA
 //===== Description: =========================================
@@ -21,6 +21,7 @@
 //=	Fixed some of the names to iRO.
 //= 1.3 Fixed some color code bugs in Ghenirhemin. Thanks to yyCC. [L0ne_W0lf]
 //= 1.3a Fixed wrong item names (due to copy/paste) [Lupus]
+//= 1.4 Chungwolmang now checks if the last item set should be deleted. (bugreport:4719) [L0ne_W0lf]
 //============================================================
 
 //===================== Censor Bar =====================================================
@@ -781,7 +782,8 @@ S_MakeMask:
 		delitem getarg(1),getarg(2);
 		delitem getarg(3),getarg(4);
 		delitem getarg(5),getarg(6);
-		delitem getarg(7),getarg(8);
+		if (getarg(0) == 5169) 
+			delitem getarg(7),getarg(8);
 		getitem getarg(0),1;
 		set moza_tal,0;
 		mes "[Chungwolmang]";
diff --git a/npc/quests/quests_13_1.txt b/npc/quests/quests_13_1.txt
index e1b885d5d..a85c3173d 100644
--- a/npc/quests/quests_13_1.txt
+++ b/npc/quests/quests_13_1.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.6
+//= 1.7
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -33,6 +33,7 @@
 //= 1.4 Changed killmonsterall -> killmonster. (bugreport:4131)
 //= 1.5 Removed a 'close;' which should have been 'close2'. (bugreport:4276)
 //= 1.6 Fixed check in cat hand agent.
+//= 1.7 Moved the close in Cat Hand Service Warps. (bugreport:4079) [L0ne_W0lf]
 //============================================================ 
 
 // Onward to the New World
@@ -8956,8 +8957,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 2:
 					break;
 				}
@@ -8972,8 +8973,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 2:
 					if (Zeny >= 5500) {
 						set zeny,zeny-5500;
@@ -8982,8 +8983,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 3:
 					break;
 				}
@@ -8998,8 +8999,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 2:
 					if (Zeny >= 5025) {
 						set zeny,zeny-5025;
@@ -9008,8 +9009,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 3:
 					if (Zeny >= 5025) {
 						set zeny,zeny-5025;
@@ -9018,8 +9019,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 4:
 					break;
 				}
@@ -9034,8 +9035,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 2:
 					if (Zeny >= 5025) {
 						set zeny,zeny-5025;
@@ -9044,8 +9045,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 3:
 					if (Zeny >= 5025) {
 						set zeny,zeny-5025;
@@ -9054,8 +9055,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 4:
 					if (Zeny >= 5025) {
 						set zeny,zeny-5025;
@@ -9064,8 +9065,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 5:
 					break;
 				}
@@ -9080,8 +9081,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 2:
 					if (Zeny >= 4765) {
 						set zeny,zeny-4765;
@@ -9090,8 +9091,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 3:
 					if (Zeny >= 4765) {
 						set zeny,zeny-4765;
@@ -9100,8 +9101,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 4:
 					if (Zeny >= 4765) {
 						set zeny,zeny-4765;
@@ -9110,8 +9111,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 5:
 					if (Zeny >= 4765) {
 						set zeny,zeny-4765;
@@ -9120,8 +9121,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 6:
 					break;
 				}
@@ -9136,8 +9137,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 2:
 					if (Zeny >= 4765) {
 						set zeny,zeny-4765;
@@ -9146,8 +9147,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 3:
 					if (Zeny >= 4765) {
 						set zeny,zeny-4765;
@@ -9156,8 +9157,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 4:
 					if (Zeny >= 4765) {
 						set zeny,zeny-4765;
@@ -9166,8 +9167,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 5:
 					if (Zeny >= 4765) {
 						set zeny,zeny-4765;
@@ -9176,8 +9177,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 6:
 					if (Zeny >= 4765) {
 						set zeny,zeny-4765;
@@ -9186,8 +9187,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 7:
 					break;
 				}
@@ -9202,8 +9203,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 2:
 					if (Zeny >= 4590) {
 						set zeny,zeny-4590;
@@ -9212,8 +9213,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 3:
 					if (Zeny >= 4590) {
 						set zeny,zeny-4590;
@@ -9222,8 +9223,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 4:
 					if (Zeny >= 4590) {
 						set zeny,zeny-4590;
@@ -9232,8 +9233,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 5:
 					if (Zeny >= 4590) {
 						set zeny,zeny-4590;
@@ -9242,8 +9243,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 6:
 					if (Zeny >= 4590) {
 						set zeny,zeny-4590;
@@ -9252,8 +9253,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 7:
 					if (Zeny >= 4590) {
 						set zeny,zeny-4590;
@@ -9262,8 +9263,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 8:
 					break;
 				}
@@ -9338,8 +9339,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 2:
 					if (Zeny >= 4590) {
 						set zeny,zeny-4590;
@@ -9348,8 +9349,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 3:
 					if (Zeny >= 4590) {
 						set zeny,zeny-4590;
@@ -9358,8 +9359,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 4:
 					if (Zeny >= 4590) {
 						set zeny,zeny-4590;
@@ -9368,8 +9369,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 5:
 					if (Zeny >= 4590) {
 						set zeny,zeny-4590;
@@ -9378,8 +9379,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 6:
 					if (Zeny >= 4590) {
 						set zeny,zeny-4590;
@@ -9388,8 +9389,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 7:
 					if (Zeny >= 4590) {
 						set zeny,zeny-4590;
@@ -9398,8 +9399,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 8:
 					break;
 				}
@@ -9414,8 +9415,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 2:
 					if (Zeny >= 4170) {
 						set zeny,zeny-4170;
@@ -9424,8 +9425,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 3:
 					if (Zeny >= 4170) {
 						set zeny,zeny-4170;
@@ -9434,8 +9435,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 4:
 					if (Zeny >= 4170) {
 						set zeny,zeny-4170;
@@ -9444,8 +9445,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 5:
 					if (Zeny >= 4170) {
 						set zeny,zeny-4170;
@@ -9454,8 +9455,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 6:
 					if (Zeny >= 4170) {
 						set zeny,zeny-4170;
@@ -9464,8 +9465,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 7:
 					if (Zeny >= 4170) {
 						set zeny,zeny-4170;
@@ -9474,8 +9475,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 8:
 					if (Zeny >= 4170) {
 						set zeny,zeny-4170;
@@ -9484,8 +9485,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 9:
 					break;
 				}
@@ -9500,8 +9501,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 2:
 					if (Zeny >= 4025) {
 						set zeny,zeny-4025;
@@ -9510,8 +9511,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 3:
 					if (Zeny >= 4025) {
 						set zeny,zeny-4025;
@@ -9520,8 +9521,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 4:
 					if (Zeny >= 4025) {
 						set zeny,zeny-4025;
@@ -9530,8 +9531,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 5:
 					if (Zeny >= 4025) {
 						set zeny,zeny-4025;
@@ -9540,8 +9541,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 6:
 					if (Zeny >= 4025) {
 						set zeny,zeny-4025;
@@ -9550,8 +9551,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 7:
 					if (Zeny >= 4025) {
 						set zeny,zeny-4025;
@@ -9560,8 +9561,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 8:
 					if (Zeny >= 4025) {
 						set zeny,zeny-4025;
@@ -9570,8 +9571,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 9:
 					if (Zeny >= 4025) {
 						set zeny,zeny-4025;
@@ -9580,8 +9581,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 10:
 					break;
 				}
@@ -9596,8 +9597,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 2:
 					if (Zeny >= 3970) {
 						set zeny,zeny-3970;
@@ -9606,8 +9607,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 3:
 					if (Zeny >= 3970) {
 						set zeny,zeny-3970;
@@ -9616,8 +9617,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 4:
 					if (Zeny >= 3970) {
 						set zeny,zeny-3970;
@@ -9626,8 +9627,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 5:
 					if (Zeny >= 3970) {
 						set zeny,zeny-3970;
@@ -9636,8 +9637,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 6:
 					if (Zeny >= 3970) {
 						set zeny,zeny-3970;
@@ -9646,8 +9647,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 7:
 					if (Zeny >= 3970) {
 						set zeny,zeny-3970;
@@ -9656,8 +9657,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 8:
 					if (Zeny >= 3970) {
 						set zeny,zeny-3970;
@@ -9666,8 +9667,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 9:
 					if (Zeny >= 3970) {
 						set zeny,zeny-3970;
@@ -9676,8 +9677,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 10:
 					if (Zeny >= 3970) {
 						set zeny,zeny-3970;
@@ -9686,8 +9687,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 11:
 					break;
 				}
@@ -9708,8 +9709,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 				else {
 					mes "[Cat Hand Agent]";
 					mes "Don't play with money.";
-					close;
 				}
+				close;
 			case 2:
 				if (Zeny >= 5500) {
 					set zeny,zeny-5500;
@@ -9718,8 +9719,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 				else {
 					mes "[Cat Hand Agent]";
 					mes "Don't play with money.";
-					close;
 				}
+				close;
 			case 3:
 				mes "[Cat Hand Agent]";
 				mes "Thank you for using our service.";
diff --git a/npc/quests/quests_lighthalzen.txt b/npc/quests/quests_lighthalzen.txt
index 27d9aa452..1917386cf 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.6
+//= 4.7
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -76,6 +76,7 @@
 //= 4.5 Official Gangster Alert script. [Gepard]
 //= 4.6 Added quest log entries for:
 //=     - Cursed Spirit Quest
+//= 4.7 Fixed missing label. (bugreport:4654) [L0ne_W0lf]
 //============================================================ 
 
 // Gangster Alert [Aegis Conversion]
@@ -5235,89 +5236,93 @@ lhz_in01,114,181,3	script	Representative	71,{
 	mes "to the Rekenber Corporation.";
 	mes "How may I be of service today?";
 	next;
-	if(lhz_curse == 7) menu "Building Information",L_Building,"Corporation History",L_History;
-	else menu "Building Information",L_Building;
-
-	while(1) {
-		mes "[Representative]";
-		mes "Please tell me";
-		mes "which floor you'd like";
-		mes "to know more about.";
-		next;
-		switch( select( "1F","2F","B1","Cancel" ) )
-		{
-			case 1:
-				mes "[Representative]";
-				mes "The ^3131FFRekenber Library^000000 can";
-				mes "be found at the end of the";
-				mes "left hallway. Our library is";
-				mes "a great resource of innovative";
-				mes "ideas and information for our";
-				mes "system development employees.";
-				next;
-				mes "[Representative]";
-				mes "The ^3131FFBall Room^000000, where";
-				mes "various official events are";
-				mes "usually held, can be accessed";
-				mes "through the right hallway.";
-				next;
-				break;
+	if(lhz_curse == 7)
+		select("Building Information","Corporation History");
+	else 
+		select("Building Information");
+
+	if (@menu == 1) {
+		while(1) {
+			mes "[Representative]";
+			mes "Please tell me";
+			mes "which floor you'd like";
+			mes "to know more about.";
+			next;
+			switch( select( "1F","2F","B1","Cancel" ) )
+			{
+				case 1:
+					mes "[Representative]";
+					mes "The ^3131FFRekenber Library^000000 can";
+					mes "be found at the end of the";
+					mes "left hallway. Our library is";
+					mes "a great resource of innovative";
+					mes "ideas and information for our";
+					mes "system development employees.";
+					next;
+					mes "[Representative]";
+					mes "The ^3131FFBall Room^000000, where";
+					mes "various official events are";
+					mes "usually held, can be accessed";
+					mes "through the right hallway.";
+					next;
+					break;
 
-			case 2:
-				mes "[Representative]";
-				mes "Please use the stairs";
-				mes "located on both sides of";
-				mes "the Help Desk to go to the";
-				mes "Second Floor. The Second";
-				mes "Floor is mostly used for";
-				mes "administrative purposes.";
-				next;
-				mes "[Representative]";
-				mes "There, you can find";
-				mes "the ^3131FFConference Room^000000,";
-				mes "^3131FFSecretary Office^000000, the";
-				mes "^3131FFAuditorium^000000 and the";
-				mes "^3131FFChairman's Office^000000.";
-				next;
-				break;
+				case 2:
+					mes "[Representative]";
+					mes "Please use the stairs";
+					mes "located on both sides of";
+					mes "the Help Desk to go to the";
+					mes "Second Floor. The Second";
+					mes "Floor is mostly used for";
+					mes "administrative purposes.";
+					next;
+					mes "[Representative]";
+					mes "There, you can find";
+					mes "the ^3131FFConference Room^000000,";
+					mes "^3131FFSecretary Office^000000, the";
+					mes "^3131FFAuditorium^000000 and the";
+					mes "^3131FFChairman's Office^000000.";
+					next;
+					break;
 
-			case 3:
-				mes "[Representative]";
-				mes "The first underground floor";
-				mes "is used by the ^3131FFRegenshirm^000000,";
-				mes "our laboratory affiliate. For";
-				mes "security reasons, this floor";
-				mes "is not accessible to visitors";
-				next;
-				break;
+				case 3:
+					mes "[Representative]";
+					mes "The first underground floor";
+					mes "is used by the ^3131FFRegenshirm^000000,";
+					mes "our laboratory affiliate. For";
+					mes "security reasons, this floor";
+					mes "is not accessible to visitors";
+					next;
+					break;
 
-			case 4:
-				mes "[Representative]";
-				mes "We are always doing our";
-				mes "best to provide the best";
-				mes "services to our customers.";
-				mes "Remember that Rekenber";
-				mes "is the name you can trust.";
-				mes "Thank you and have a nice day.";
-				close;
+				case 4:
+					mes "[Representative]";
+					mes "We are always doing our";
+					mes "best to provide the best";
+					mes "services to our customers.";
+					mes "Remember that Rekenber";
+					mes "is the name you can trust.";
+					mes "Thank you and have a nice day.";
+					close;
+			}
 		}
 	}
-
-L_History:
-	mes "[Representative]";
-	mes "If you're interested in";
-	mes "learning the history of";
-	mes "our corporation, please";
-	mes "speak to the representative";
-	mes "inside our Library. Thank you.";
-	next;
-	mes "[Representative]";
-	mes "Please head down";
-	mes "the hallway to the left in";
-	mes "order to find our Library.";
-	mes "Thank you and have a nice day.";
-	changequest 2087,2088;
-	set lhz_curse,8;
+	else {
+		mes "[Representative]";
+		mes "If you're interested in";
+		mes "learning the history of";
+		mes "our corporation, please";
+		mes "speak to the representative";
+		mes "inside our Library. Thank you.";
+		next;
+		mes "[Representative]";
+		mes "Please head down";
+		mes "the hallway to the left in";
+		mes "order to find our Library.";
+		mes "Thank you and have a nice day.";
+		changequest 2087,2088;
+		set lhz_curse,8;
+	}
 	close;
 }
 
diff --git a/npc/quests/quests_moscovia.txt b/npc/quests/quests_moscovia.txt
index 8371f59bd..89f642316 100644
--- a/npc/quests/quests_moscovia.txt
+++ b/npc/quests/quests_moscovia.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= Kisuka
 //===== Current Version: ===================================== 
-//= 1.8
+//= 1.9
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -20,6 +20,7 @@
 //= 1.6 Added 'tides' to Ibanoff & Fixed time check for Marozka. [Kisuka]
 //= 1.7 Fixes on donpcevents and fixed some left over aegis stuff. [Kisuka]
 //= 1.8 Fixed some condition checks. [Gepard]
+//= 1.9 Corrected NPC counting mobs for the wrong NPC. (bugreport:4736) [L0ne_W0lf]
 //============================================================ 
 
 //============================================================================
@@ -5117,7 +5118,7 @@ OnDisable:
 	end;
 
 OnMyMobDead:
-	if (mobcount("mosk_ship","Baehideun1#ship::OnMyMobDead") < 1) {
+	if (mobcount("mosk_ship","Baehideun4#ship::OnMyMobDead") < 1) {
 		set $@mos1_edq,0;
 		mes "[Mr. Ibanoff]";
 		mes "Now that all the monsters are gone,";
diff --git a/npc/quests/quests_veins.txt b/npc/quests/quests_veins.txt
index 8decb1264..a3647b34a 100644
--- a/npc/quests/quests_veins.txt
+++ b/npc/quests/quests_veins.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.9
+//= 2.0
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -43,6 +43,7 @@
 //= 1.9 Added quest log entries for:
 //=     - Siblings Quest
 //=     - Thor Volcano Base Quest
+//= 2.0 Removed lvel requirement. (bugreport:4678) [L0ne_W0lf]
 //============================================================ 
 
 // Stone Quest
@@ -56,7 +57,7 @@ ve_fild05,257,130,4	script	Wincing Old Man#ve	945,{
 		mes "- you put some items into Kafra Storage. -";
 		close;
 	}
-	if ((veins_stone == 0) && (BaseLevel > 59)) {
+	if (veins_stone == 0) {
 		mes "[Zabaroo]";
 		mes "My back is killing me";
 		mes "after stooping over to";
@@ -300,11 +301,6 @@ ve_fild05,257,130,4	script	Wincing Old Man#ve	945,{
 		mes "care of myself at my age...";
 		close;
 	}
-	mes "[Zabaroo]";
-	mes "I'm sorry dear.";
-	mes "You're not strong enough for this kind of work.";
-	mes "Put on some muscle and talk to me again.";
-	close;
 }
 
 ve_in,169,310,6	script	Strange Old Man#ve	121,{