Implemented several "checkweights" in other NPCs.

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

16 files changed, 169 insertions, 392 deletions

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index fae5e265c..7401dc2c8 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,6 +1,7 @@
 Date		Added
 ======
 2008/02/28
+	* Rev 12258 Implemented several "checkweights" in other NPCs. [L0ne_W0lf]
 	* Rev 12257 Implemented several "checkweight" NPC merchants. [L0ne_W0lf]
 2008/02/27
 	* Rev 12256 Removed "F_CheckMaxCount" as it seems "checkweight". [L0ne_W0lf]
diff --git a/npc/cities/jawaii.txt b/npc/cities/jawaii.txt
index 9a7635933..1557d3a4c 100644
--- a/npc/cities/jawaii.txt
+++ b/npc/cities/jawaii.txt
@@ -5,7 +5,7 @@
 //= DNett123 (1.1 - 1.5)
 //= L0ne_w0lf
 //===== Current Version: =====================================
-//= 3.3a
+//= 3.4
 //===== Compatible With: =====================================
 //= eAthena SVN
 //===== Description: =========================================
@@ -32,7 +32,9 @@
 //=	None of the NPCs need the player's partner to be online.
 //= 3.3 Just a small fix up on the Bartender. [L0ne_W0lf]
 //= 3.3a Just a little typo error. [Samuray22]
+//= 3.4 Added missing checkweights. [L0ne_W0lf]
 //============================================================
+
 // Jawaii
 //============================================================
 jawaii,239,112,7	script	Mariner#toizu	100,{
@@ -708,13 +710,11 @@ OnTouch:
 }
 	
 jawaii_in,15,104,0	script	Waitress#jawaii	80,{
-	//var max_max_c = CheckMaxCount 1201 1
-	//if (max_max_c == 1) {
-	//	mes "^3355FF * Wait a minute! *"
-	//	mes "You're carrying too many items with you right now. Please store some of your things into Kafra Storage and try again.^000000"
-	//	close
-	//	return
-	//}
+	if (checkweight(1201,1) == 0) {
+		mes "^3355FF * Wait a minute! *";
+		mes "You're carrying too many items with you right now. Please store some of your things into Kafra Storage and try again.^000000";
+		close;
+	}
 	if (getpartnerid()) {
 		mes "[Waitress]";
 		mes "Hello,";
diff --git a/npc/events/halloween_2006.txt b/npc/events/halloween_2006.txt
index 8e8d60684..64fef4c0d 100644
--- a/npc/events/halloween_2006.txt
+++ b/npc/events/halloween_2006.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Brainstorm
 //===== Current Version: =====================================
-//= 1.1a
+//= 1.2
 //===== Compatible With: =====================================
 //= eAthena SVN
 //===== Description: =========================================
@@ -14,6 +14,7 @@
 //= 1.0 First semi-working conversion. [Brainstorm]
 //= 1.1 Refined Brainstorm's conversion. [L0ne_W0lf]
 //= 1.1a Minor fixes. (Screwed up weight checks somehow) [L0ne_W0lf]
+//= 1.2 Added missing checkweights. [L0ne_W0lf]
 //============================================================
 
 // Pumpkin Mojo quest (Event 1)
@@ -29,18 +30,8 @@ OnTouch:
 }
 
 prontera,164,69,3	script	Cool Devi#06_hw	738,{
-	/*var max_max_c = CheckMaxCount 1201 1
-	if max_max_c == 1
-		mes "^3355FFWait a second!"
-		mes "Right now, you're carrying"
-		mes "too many things with you."
-		mes "Please come back after"
-		mes "using the Kafra Service"
-		mes "to store some of your items.^000000"
-		close;
-	}*/
 	set .@now_weight,MaxWeight-Weight;
-	if (.@now_weight < 2000) {
+	if (.@now_weight < 2000 || checkweight(1201,1) == 0) {
 		mes "^3355FFWait a second!";
 		mes "Right now, you're carrying";
 		mes "too many things with you.";
@@ -236,18 +227,8 @@ prontera,164,69,3	script	Cool Devi#06_hw	738,{
 
 
 geffen,145,132,3	script	Hoirin#06_hw	729,{
-	/*var max_max_c = CheckMaxCount 1201 1
-	if max_max_c == 1
-		mes "^3355FFWait a second!"
-		mes "Right now, you're carrying"
-		mes "too many things with you."
-		mes "Please come back after"
-		mes "using the Kafra Service"
-		mes "to store some of your items.^000000"
-		close;
-	}*/
 	set .@now_weight,MaxWeight-Weight;
-	if (.@now_weight < 2000) {
+	if (.@now_weight < 2000 || checkweight(1201,1) == 0) {
 		mes "^3355FFWait a second!";
 		mes "Right now, you're carrying";
 		mes "too many things with you.";
@@ -402,18 +383,8 @@ OnTouch:
 }
 
 nif_in,19,32,3	script	Deviruchi#06_hw	738,{
-	/*var max_max_c = CheckMaxCount 1201 1
-	if max_max_c == 1
-		mes "^3355FFWait a second!"
-		mes "Right now, you're carrying"
-		mes "too many things with you."
-		mes "Please come back after"
-		mes "using the Kafra Service"
-		mes "to store some of your items.^000000"
-		close;
-	}*/
 	set .@now_weight,MaxWeight-Weight;
-	if (.@now_weight < 2000) {
+	if (.@now_weight < 2000 || checkweight(1201,1) == 0) {
 		mes "^3355FFWait a second!";
 		mes "Right now, you're carrying";
 		mes "too many things with you.";
@@ -504,18 +475,8 @@ nif_in,19,32,3	script	Deviruchi#06_hw	738,{
 
 // Creation of Pumpkin Pie (Event 2)
 nif_fild01,165,115,3	script	Chicken Masta#06_hw	794,{
-	/*var max_max_c = CheckMaxCount 1201 1
-	if max_max_c == 1
-		mes "^3355FFWait a second!"
-		mes "Right now, you're carrying"
-		mes "too many things with you."
-		mes "Please come back after"
-		mes "using the Kafra Service"
-		mes "to store some of your items.^000000"
-		close;
-	}*/
 	set .@now_weight,MaxWeight-Weight;
-	if (.@now_weight < 2000) {
+	if (.@now_weight < 2000 || checkweight(1201,1) == 0) {
 		mes "^3355FFWait a second!";
 		mes "Right now, you're carrying";
 		mes "too many things with you.";
diff --git a/npc/events/lunar_2008.txt b/npc/events/lunar_2008.txt
index 1492206e4..ff02788aa 100644
--- a/npc/events/lunar_2008.txt
+++ b/npc/events/lunar_2008.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
-//= 1.0
+//= 1.1
 //===== Compatible With: =====================================
 //= eAthena SVN
 //===== Description: =========================================
@@ -20,7 +20,8 @@
 //= or are unsure if your client supports that sprite, an
 //= alternate NPC header has been included.
 //===== Additional Comments: =================================
-//= v1.0 First version.
+//= 1.0 First version. [L0ne_W0lf]
+//= 1.1 Added missing checkweights. [L0ne_W0lf]
 //============================================================
 
 payon_in01,193,30,4	script	Rice Mill Grandma#rat	78,{
@@ -227,7 +228,7 @@ payon,215,127,4	script	Rice Mill Man#rat	54,{
 //payon,126,113,4	script	Miss Lunar#rat	862,{
 payon,126,113,4	script	Miss Lunar#rat	719,{
 	mes "[Lunar]";
-	if ((MaxWeight-Weight) < 3000) {
+	if ((MaxWeight-Weight) < 3000 || checkweight(1201,1) == 0) {
 		mes "Oh, I'm sorry, but we";
 		mes "can't do any business if";
 		mes "you're carry so much stuff.";
diff --git a/npc/other/turbotrack/Turbo_Track.txt b/npc/other/turbotrack/Turbo_Track.txt
index 90481a9b5..e84403c4d 100644
--- a/npc/other/turbotrack/Turbo_Track.txt
+++ b/npc/other/turbotrack/Turbo_Track.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
-//= 1.3
+//= 1.4
 //===== Compatible With: =====================================
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -15,6 +15,7 @@
 //=	Fixed a bug in the while loop in the guide.
 //= 1.2 Fix to prevent point converter from hanging. [L0ne_W0lf]
 //= 1.3 Slight optimization to the point exchanger. [L0ne_W0lf]
+//= 1.4 Added missing checkweights. [L0ne_W0lf]
 //============================================================
 
 turbo_room,130,92,3	script	Kafra Staff#tt	115,{
@@ -411,18 +412,7 @@ turbo_room,71,95,5	duplicate(TurboExpertNames)	Expert Mode Records#1	857
 
 // Turbo Track Item Exchanger
 turbo_room,93,117,5	script	Point Exchange Helper	125,{
-	//set max_max_c1,1201;
-	//if (max_max_c1 == 1) {
-	//	mes "^3355FFWait a second!";
-	//	mes "Right now, you're carrying";
-	//	mes "too many items with you.";
-	//	mes "Please come back after";
-	//	mes "putting storing some of your";
-	//	mes "things using the Kafra Service.^000000";
-	//	close;
-	//}
-	set .@now_weight,MaxWeight-Weight;
-	if (.@now_weight < 2000) {
+	if ((MaxWeight-Weight) < 2000 || checkweight(1201,1) == 0) {
 		mes "^3355FFWait a second!";
 		mes "Right now, you're carrying";
 		mes "too many items with you.";
@@ -985,16 +975,15 @@ S_ExchangePoints:
 
 alde_gld,183,204,0	script	en_turbo	45,1,1,{
 OnTouch:
-	//set max_max_c,1201;
-	//if (max_max_c == 1) {
-	//	mes "^3355FFWait a second!";
-	//	mes "Right now, you're carrying";
-	//	mes "too many items with you.";
-	//	mes "Please come back after";
-	//	mes "putting storing some of your";
-	//	mes "things using the Kafra Service.^000000";
-	//	close;
-	//}
+	if (checkweight(1201,1) == 0) {
+		mes "^3355FFWait a second!";
+		mes "Right now, you're carrying";
+		mes "too many items with you.";
+		mes "Please come back after";
+		mes "putting storing some of your";
+		mes "things using the Kafra Service.^000000";
+		close;
+	}
 	set .@now_weight,MaxWeight-Weight;
 	if ((BaseJob == Job_Knight || BaseJob == Job_Crusader) && checkriding()) {
 		if (.@now_weight < 20000) {
diff --git a/npc/quests/doomed_swords.txt b/npc/quests/doomed_swords.txt
index b43ed5645..1d736c122 100644
--- a/npc/quests/doomed_swords.txt
+++ b/npc/quests/doomed_swords.txt
@@ -20,6 +20,7 @@
 //= 1.3 Fixed exploit [Lupus]
 //= 1.4 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
 //=	Moved all non-related NPCs to their repsective files.
+//= 1.5 Added missing checkweight. [L0ne_W0lf]
 //============================================================
 
 prt_in,162,11,2	script	Ghatu#magum	86,{
@@ -254,16 +255,16 @@ izlude_in,173,88,2	script	Nain#magum	102,{
 }
 
 pay_fild08,218,283,2	script	Mysterious Man#magum	89,{
-	//if (max_max_c == 1) {
-	//	mes "[Mysterious Man]";
-	//	mes "Hold it.";
-	//	mes "You're carrying";
-	//	mes "far too many items";
-	//	mes "with you. Speak to me";
-	//	mes "after you've placed your";
-	//	mes "goods into Kafra Storage.";
-	//	close;
-	//}
+	if (checkweight(1201,1) == 0) {
+		mes "[Mysterious Man]";
+		mes "Hold it.";
+		mes "You're carrying";
+		mes "far too many items";
+		mes "with you. Speak to me";
+		mes "after you've placed your";
+		mes "goods into Kafra Storage.";
+		close;
+	}
 	if (event_magum == 0) {
 		if (dmdswrd_Q2 & 1 || dmdswrd_Q2 & 2 || dmdswrd_Q2 & 4 || dmdswrd_Q2 & 8 || dmdswrd_Q2 & 16 || dmdswrd_Q2 & 32) {
 			mes "[Mysterious Man]";
diff --git a/npc/quests/juice_maker.txt b/npc/quests/juice_maker.txt
index ea1850792..752c246c4 100644
--- a/npc/quests/juice_maker.txt
+++ b/npc/quests/juice_maker.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= kobra_k88
 //===== Current Version: =====================================
-//= 1.9
+//= 2,0
 //===== Compatible With: =====================================
 //= eAthena SVN
 //===== Description: =========================================
@@ -14,6 +14,7 @@
 //===== Additional Comments: =================================
 //= 1.9 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
 //=	Added tracking variables in, which are unset when complete.
+//= 2.0 Added missing checkweight. [L0ne_W0lf]
 //============================================================
 
 prt_in,49,172,3	script	Marianne#juice	53,{
@@ -168,17 +169,14 @@ prt_in,47,173,3	script	Morrison#juice	97,{
 }
 
 payon_in03,188,146,5	script	Marx Hansen#juice	86,{
-	// Check if the user carries 100 items.
-	//set max_max_c,1201;
-	//if (max_max_c == 1) {
-	//	mes "- Wait a moment! -";
-	//	mes "- Currently you're carrying -";
-	//	mes "- too many items with you. -";
-	//	mes "- Please come back later -";
-	//	mes "- after you put some items into kafra storage. -";
-	//	close;
-	//}
-	// end check
+	if (checkweight(1201,1) == 0) {
+		mes "- Wait a moment! -";
+		mes "- Currently you're carrying -";
+		mes "- too many items with you. -";
+		mes "- Please come back later -";
+		mes "- after you put some items into kafra storage. -";
+		close;
+	}
 	if (MISC_QUEST&1) {
 		mes "[Merchant Marx Hansen]";
 		mes "Welcome.";
diff --git a/npc/quests/obb_quest.txt b/npc/quests/obb_quest.txt
index 032331c40..0b7a7f42c 100644
--- a/npc/quests/obb_quest.txt
+++ b/npc/quests/obb_quest.txt
@@ -3,7 +3,7 @@
 //===== By ===================================================
 //= Celesta, Lupus
 //===== Version ==============================================
-//= 1.7
+//= 1.8
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -17,17 +17,18 @@
 //= branch from this one.
 //===== Additional Comments: ================================= 
 //= 1.7 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
+//= 1.8 Added missing checkweights. [L0ne_W0lf]
 //============================================================ 
 
 alberta,43,244,0	script	Tourist#thai	99,{
-	//if (max_max_c == 1) {
-	//	mes "- Wait a moment! -";
-	//	mes "- Currently you're carrying -";
-	//	mes "- too many items with you. -";
-	//	mes "- Please enlighten your weight -";
-	//	mes "- and try again. -";
-	//	close;
-	//}
+	if (checkweight(1201,1) == 0) {
+		mes "- Wait a moment! -";
+		mes "- Currently you're carrying -";
+		mes "- too many items with you. -";
+		mes "- Please enlighten your weight -";
+		mes "- and try again. -";
+		close;
+	}
 	if (thai_head >= 1 && thai_head <= 5) {
 		switch(thai_head) {
 		case 1:
@@ -1062,14 +1063,14 @@ morocc,230,150,0	script	Jacob#thai	50,{
 }
 
 comodo,68,195,0	script	Old Man#thai	120,{
-	//if (max_max_c == 1) {
-	//	mes "- Wait a moment! -";
-	//	mes "- Currently you're carrying -";
-	//	mes "- too many items with you. -";
-	//	mes "- Please enlighten your weight -";
-	//	mes "- and try again. -";
-	//	close;
-	//}
+	if (checkweight(1201,1) == 0) {
+		mes "- Wait a moment! -";
+		mes "- Currently you're carrying -";
+		mes "- too many items with you. -";
+		mes "- Please enlighten your weight -";
+		mes "- and try again. -";
+		close;
+	}
 	if (thai_head >= 11 && thai_head <= 15) {
 		switch(thai_head) {
 		case 11:
diff --git a/npc/quests/quests_amatsu.txt b/npc/quests/quests_amatsu.txt
index 67668eb9f..251a96d86 100644
--- a/npc/quests/quests_amatsu.txt
+++ b/npc/quests/quests_amatsu.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= eAthena team & others? & MasterOfMuppets
 //===== Current Version: ===================================== 
-//= 1.2
+//= 1.4
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -13,19 +13,20 @@
 //= Dungeon Quest
 //===== Additional Comments: ================================= 
 //= 1.3 Rescripted to Aegis 10.3 Standards. [L0ne_W0lf]
+//= 1.4 Added missing checkweight. [L0ne_W0lf]
 //============================================================ 
 
 // Momotaro Event
 //============================================================ 
 amatsu,223,236,3	script	Publisher#ama	763,{
-	//if (max_max_c == 1) {
-	//	mes "- Wait a moment!! -";
-	//	mes "- Currently you are carrying -";
-	//	mes "- too many items with you. -";
-	//	mes "- Please store some items into your Kafra storage -";
-	//	mes "- and try again. -";
-	//	close;
-	//}
+	if (checkweight(1201,1) == 0) {
+		mes "- Wait a moment!! -";
+		mes "- Currently you are carrying -";
+		mes "- too many items with you. -";
+		mes "- Please store some items into your Kafra storage -";
+		mes "- and try again. -";
+		close;
+	}
 	if (event_momo < 2) {
 		mes "[Publisher]";
 		mes "Hello~!!";
diff --git a/npc/quests/quests_ayothaya.txt b/npc/quests/quests_ayothaya.txt
index 284566529..ea0e154d3 100644
--- a/npc/quests/quests_ayothaya.txt
+++ b/npc/quests/quests_ayothaya.txt
@@ -3,7 +3,7 @@
 //===== By ===================================================
 //= Fredzilla, MasterOfMuppets
 //===== Version ==============================================
-//= 2.0a
+//= 2.1
 //===== Compatible With ======================================
 //= eAthena SVN
 //===== Description ==========================================
@@ -26,6 +26,7 @@
 //= 2.0 Rescripted Tom Yum Goong and Dungeon quest to Aegis [L0ne_W0lf]
 //=	10.3 standards.
 //= 2.0a Corrected a Typo error ";;". [Samuray22]
+//= 2.1 Added missing checkweights. [L0ne_W0lf]
 //============================================================
 
 // Ayothaya Ring Quest
@@ -2685,16 +2686,7 @@ ayo_in01,145,163,3	script	Cook#ayo	839,{
 }
 	
 ayothaya,153,86,5	script	Thongpool#ayo	843,{
-	//if (max_max_c1 == 1) {
-	//	mes "- Wait a minute! -";
-	//	mes "- Currently you're carrying -";
-	//	mes "- too many items with you. -";
-	//	mes "- Please enlighten your weight -";
-	//	mes "- and try again. -";
-	//	close;
-	//}
-	set .@now_weight,MaxWeight-Weight;
-	if (.@now_weight < 2000) {
+	if ((MaxWeight-Weight) < 2000 || checkweight(1201,1) == 0) {
 		mes "- Wait a minute! -";
 		mes "- Currently you're carrying -";
 		mes "- too many items with you. -";
@@ -2810,16 +2802,7 @@ ayothaya,153,86,5	script	Thongpool#ayo	843,{
 }
 	
 ayothaya,121,240,7	script	Mr. Jun#ayo	842,1,1,{
-	//if (max_max_c1 == 1) {
-	//	mes "- Wait a minute! -";
-	//	mes "- Currently you're carrying -";
-	//	mes "- too many items with you. -";
-	//	mes "- Please enlighten your weight -";
-	//	mes "- and try again. -";
-	//	close;
-	//}
-	set .@now_weight,MaxWeight-Weight;
-	if (.@now_weight < 2000) {
+	if ((MaxWeight-Weight) < 2000 || checkweight(1201,1) == 0) {
 		mes "- Wait a minute! -";
 		mes "- Currently you're carrying -";
 		mes "- too many items with you. -";
@@ -2867,16 +2850,7 @@ ayothaya,121,240,7	script	Mr. Jun#ayo	842,1,1,{
 	close;
 
 OnTouch:
-	//if (max_max_c1 == 1) {
-	//	mes "- Wait a minute! -";
-	//	mes "- Currently you're carrying -";
-	//	mes "- too many items with you. -";
-	//	mes "- Please enlighten your weight -";
-	//	mes "- and try again. -";
-	//	close;
-	//}
-	set .@now_weight,MaxWeight-Weight;
-	if (.@now_weight < 2000) {
+	if ((MaxWeight-Weight) < 2000 || checkweight(1201,1) == 0) {
 		mes "- Wait a minute! -";
 		mes "- Currently you're carrying -";
 		mes "- too many items with you. -";
diff --git a/npc/quests/quests_hugel.txt b/npc/quests/quests_hugel.txt
index 419624cfe..e347bea88 100644
--- a/npc/quests/quests_hugel.txt
+++ b/npc/quests/quests_hugel.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= MasterOfMuppets & SinSloth
 //===== Current Version: =====================================
-//= 1.7
+//= 1.8
 //===== Compatible With: =====================================
 //= eAthena
 //===== Description: =========================================
@@ -20,6 +20,7 @@
 //= 1.5b Fixed a variable name. [SinSloth]
 //= 1.6 Fixed bad NPC header data to comply with rev. 11603. [L0ne_W0lf]
 //= 1.7 Corrected locations of warpinside#1. (DarkValmir) [L0ne_W0lf]
+//= 1.8 Added missing checkweight. [L0ne_W0lf]
 //============================================================
 
 //-------------------------------------------------------------------------
@@ -3738,22 +3739,12 @@ einbech,208,124,3	script	Bomb Maker	851,{
 
 	if(hg_tre == 54)
 	{
-		/*var max_max_c1 = CheckMaxCount 1201 1
-		if (max_max_c1 == 1)
+		if ((MaxWeight-Weight) < 2000 || checkweight(1201,1) == 0) {
 			mes "[Boomer]";
 			mes "Hey, you look pretty heavy, huh?";
 			mes "Do you want me to help you?";
-			close
-			return
-		endif
-		var now_weight = v[VAR_MAXWEIGHT] - v[VAR_WEIGHT]
-		if (now_weight < 2000)
-			mes "[Boomer]";
-			mes "Hey, you look pretty heavy, huh?";
-			mes "Do you want me to help you?";
-			close
-			return
-		endif*/
+			close;
+		}
 		mes "[Boomer]";
 		mes "Hey, what's up?";
 		mes "I am a professional Marine Sphere Bottle maker.";
diff --git a/npc/quests/quests_louyang.txt b/npc/quests/quests_louyang.txt
index 7856ec21f..d2f1514d3 100644
--- a/npc/quests/quests_louyang.txt
+++ b/npc/quests/quests_louyang.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= Evera and The eAthena Dev Team
 //===== Current Version: ===================================== 
-//= 1.6
+//= 1.7
 //===== Compatible With: ===================================== 
 //= eAthena 1.0
 //===== Description: ========================================= 
@@ -26,6 +26,8 @@
 //= 1.6 Rescripted Soup, Doctor, and Poison King quests [L0ne_W0lf]
 //=	to Aegis 10.3 standards. Attempted to save current
 //=	quest progress from the old scripts.
+//= 1.7 Added missing checkweights. And corrected [L0ne_W0lf]
+//=	a typo in Poison King quest.
 //============================================================ 
 
 // Soup Quest
@@ -1090,12 +1092,7 @@ lou_in02,265,69,5	script	Doctor#lyang	814,{
 	if (QL_GOTHERB) set ch_par,16;
 	set QL_DOC1STTIME,0; set QL_DOCQUEST,0; set QL_GOTHERB,0; set QL_BEENTOSTORAGE,0; set QL_GOTCOMPROP,0; set QL_TOOLMASTER,0;
 
-	//if (max_max_c1 == 1) {
-	//	mes "^3355FFWait a minute! Right now, you're carrying too many items. Please place some of your things in Kafra Storage and then come here again.^000000";
-	//	close;
-	//}
-	set .@now_weight,MaxWeight-Weight;
-	if (.@now_weight < 2000) {
+	if ((MaxWeight-Weight) < 2000 || checkweight(1201,1) == 0) {
 		mes "^3355FFWait a minute! Right now, you're over weight, so you cannot receive more items. Please store some of your things in Kafra Storage and try again.^000000";
 		close;
 	}
@@ -1590,13 +1587,7 @@ lou_in02,248,166,2	script	Tool Shop Master#lou	824,{
 }
 
 lou_in02,201,166,4	script	Storage Keeper#lou	819,{
-	//if (max_max_c1 == 1) {
-	//	mes "^3355FF* Wait a moment!! *";
-	//	mes "Currently you're carryingtoo many items with you. Please store some of your items into Kafra Storage and try again.^000000";
-	//	close;
-	//}
-	set .@now_weight,MaxWeight-Weight;
-	if (.@now_weight < 2000) {
+	if ((MaxWeight-Weight) < 2000 || checkweight(1201,1) == 0) {
 		mes "^3355FF * Wait a moment!! *";
 		mes "Currently you're over weight, so you cannot receive more items into your inventory. Please store some of your items into Kafra Storage and try again.^000000";
 		close;
@@ -2425,17 +2416,18 @@ lou_in02,203,159,0	warp	Storage Warp#4	1,1,louyang,129,118
 // Poison King Quest
 //============================================================
 lou_in02,123,39,4	script	Poison King#lou	824,{
-	//Remove outdated variables and attempt to preserve prior quest progress.
-	if (QL_POISONKING <= 12) set ch_poison,QL_POISON;
+	// Attempt to preserve prior quest progress.
+	if (QL_POISONKING <= 12) set ch_poison,QL_POISONKING;
 	else if (QL_POISONKING == 16) set ch_poison,19;
 	else if (QL_POISONKING >= 17) set ch_poison,20;
+	// Remove outdated variable.
 	set QL_POISONKING,0;
 
-	//if (max_max_c == 1) {
-	//	mes "^3355FF * Wait a minute! *";
-	//	mes "Right now, you are carrying too many items with you. Please place some of your items into Kafra Storage and try again.^000000";
-	//	close;
-	//}
+	if (checkweight(1201,1) == 0) {
+		mes "^3355FF * Wait a minute! *";
+		mes "Right now, you are carrying too many items with you. Please place some of your items into Kafra Storage and try again.^000000";
+		close;
+	}
 	if (ch_poison < 6) {
 		mes "[Nagash Arses]";
 		mes "It's been 40 years since I came here. Hahaha, but it doesn't feel like it's been that long.";
@@ -3416,11 +3408,11 @@ lou_in02,123,39,4	script	Poison King#lou	824,{
 }
 
 lou_in02,253,45,0	script	Employee#poison	822,{
-	//if (max_max_c == 1) {
-	//	mes "^3355FF * Wait a minute! *";
-	//	mes "You're carrying too many items with you right now. Please put some of your things into Kafra Storage and try again.^000000";
-	//	close;
-	//}
+	if (checkweight(1201,1) == 0) {
+		mes "^3355FF * Wait a minute! *";
+		mes "You're carrying too many items with you right now. Please put some of your things into Kafra Storage and try again.^000000";
+		close;
+	}
 	if (ch_par < 10 && ch_poison < 6) {
 		while(1) {
 			if (.@r_o_o_f > 5) {
@@ -4104,11 +4096,11 @@ lou_in02,253,45,0	script	Employee#poison	822,{
 }
 
 lou_fild01,224,348,0	script	Lady#delivery	817,{
-	//if (max_max_c == 1) {
-	//	mes "^3355FF * Wait a minute! *";
-	//	mes "Currently, you're carrying too many items. Please put some of your things into Kafra Storage and try again.^000000";
-	//	close;
-	//}
+	if (checkweight(1201,1) == 0) {
+		mes "^3355FF * Wait a minute! *";
+		mes "Currently, you're carrying too many items. Please put some of your things into Kafra Storage and try again.^000000";
+		close;
+	}
 	if (ch_poison < 8) {
 		if (rand(1,10) > 5) {
 			mes "[Lady]";
@@ -4399,11 +4391,11 @@ lou_in01,118,167,0	script	 #lou_drink2	111,{
 }
 
 lou_in01,99,158,4	script	Lord#bailong	821,{
-	//if (max_max_c == 1) {
-	//	mes "^3355FF * Wait a minute! *";
-	//	mes "Right now you're carrying too many items. Please put some of your things into Kafra Storage and try again.^000000";
-	//	close;
-	//}
+	if (checkweight(1201,1) == 0) {
+		mes "^3355FF * Wait a minute! *";
+		mes "Right now you're carrying too many items. Please put some of your things into Kafra Storage and try again.^000000";
+		close;
+	}
 	if (ch_poison == 12 || ch_poison == 16) {
 		mes "[Lord Bai Long]";
 		mes "Hey...!";
diff --git a/npc/quests/quests_prontera.txt b/npc/quests/quests_prontera.txt
index 45d30acfb..00532ad7e 100644
--- a/npc/quests/quests_prontera.txt
+++ b/npc/quests/quests_prontera.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= kobra_k88; L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 2.0b
+//= 2.1
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -36,6 +36,7 @@
 //= 2.0 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
 //= 2.0a Corrected a Typo error ";;". [Samuray22]
 //= 2.0b Corrected a Typo error. (bugreport:950) [Samuray22]
+//= 2.1 Added missing checkweights. [L0ne_W0lf]
 //============================================================ 
 
 // Prontera Culvert
@@ -550,18 +551,7 @@ S_GetBooks:
 	return;
 
 S_CheckWeight:
-	//var max_max_c1 = CheckMaxCount 1201 1
-	//if (max_max_c1 == 1) {
-	//	mes "^3355FFWait a second!";
-	//	mes "Right now, you're carrying";
-	//	mes "too many things with you.";
-	//	mes "Please come back after";
-	//	mes "using the Kafra Service";
-	//	mes "to store some of your items.^000000";
-	//	close;
-	//}
-	set .@now_weight,MaxWeight-Weight;
-	if (.@now_weight < 2000) {
+	if ((MaxWeight-Weight) < 2000 || checkweight(1201,1) == 0) {
 		mes "^3355FFWait a second!";
 		mes "Right now, you're carrying";
 		mes "too many things with you.";
@@ -574,18 +564,7 @@ S_CheckWeight:
 }
 
 yuno,311,195,3	script	Historian#prt01	754,{
-	//var max_max_c1 = CheckMaxCount 1201 1
-	//if (max_max_c1 == 1) {
-	//	mes "^3355FFWait a second!";
-	//	mes "Right now, you're carrying";
-	//	mes "too many things with you.";
-	//	mes "Please come back after";
-	//	mes "using the Kafra Service";
-	//	mes "to store some of your items.^000000";
-	//	close;
-	//}
-	set .@now_weight,MaxWeight-Weight;
-	if (.@now_weight < 2000) {
+	if ((MaxWeight-Weight) < 2000 || checkweight(1201,1) == 0) {
 		mes "^3355FFWait a second!";
 		mes "Right now, you're carrying";
 		mes "too many things with you.";
@@ -936,18 +915,7 @@ yuno,311,195,3	script	Historian#prt01	754,{
 }
 
 morocc_in,45,126,3	script	Historian#prt02	702,{
-	//var max_max_c1 = CheckMaxCount 1201 1
-	//if (max_max_c1 == 1) {
-	//	mes "^3355FFWait a second!";
-	//	mes "Right now, you're carrying";
-	//	mes "too many things with you.";
-	//	mes "Please come back after";
-	//	mes "using the Kafra Service";
-	//	mes "to store some of your items.^000000";
-	//	close;
-	//}
-	set .@now_weight,MaxWeight-Weight;
-	if (.@now_weight < 2000) {
+	if ((MaxWeight-Weight) < 2000 || checkweight(1201,1) == 0) {
 		mes "^3355FFWait a second!";
 		mes "Right now, you're carrying";
 		mes "too many things with you.";
@@ -1374,18 +1342,7 @@ S_GiveName:
 }
 
 mjolnir_01,135,168,3	script	Historian#prt03	754,{
-	//var max_max_c1 = CheckMaxCount 1201 1
-	//if (max_max_c1 == 1) {
-	//	mes "^3355FFWait a second!";
-	//	mes "Right now, you're carrying";
-	//	mes "too many things with you.";
-	//	mes "Please come back after";
-	//	mes "using the Kafra Service";
-	//	mes "to store some of your items.^000000";
-	//	close;
-	//}
-	set .@now_weight,MaxWeight-Weight;
-	if (.@now_weight < 2000) {
+	if ((MaxWeight-Weight) < 2000 || checkweight(1201,1) == 0) {
 		mes "^3355FFWait a second!";
 		mes "Right now, you're carrying";
 		mes "too many things with you.";
@@ -1775,18 +1732,7 @@ mjolnir_01,313,269,5	script	Dazed Boy#prt	706,{
 }
 
 mjolnir_01,316,268,3	script	Exhausted-Looking Woman	879,{
-	//var max_max_c1 = CheckMaxCount 1201 1
-	//if (max_max_c1 == 1) {
-	//	mes "^3355FFWait a second!";
-	//	mes "Right now, you're carrying";
-	//	mes "too many things with you.";
-	//	mes "Please come back after";
-	//	mes "using the Kafra Service";
-	//	mes "to store some of your items.^000000";
-	//	close;
-	//}
-	set .@now_weight,MaxWeight-Weight;
-	if (.@now_weight < 2000) {
+	if ((MaxWeight-Weight) < 2000 || checkweight(1201,1) == 0) {
 		mes "^3355FFWait a second!";
 		mes "Right now, you're carrying";
 		mes "too many things with you.";
@@ -3437,16 +3383,15 @@ OnTouch:
 }
 
 prt_in,162,99,4	script	Librarian#curse	67,{
-	//var max_max_c1 = CheckMaxCount 1201 1
-	//if (max_max_c1 == 1) {
-	//	mes "^3355FFWait a second!";
-	//	mes "Right now, you're carrying";
-	//	mes "too many things with you.";
-	//	mes "Please come back after";
-	//	mes "using the Kafra Service";
-	//	mes "to store some of your items.";
-	//	close;
-	//}
+	if (checkweight(1201,1) == 0) {
+		mes "^3355FFWait a second!";
+		mes "Right now, you're carrying";
+		mes "too many things with you.";
+		mes "Please come back after";
+		mes "using the Kafra Service";
+		mes "to store some of your items.";
+		close;
+	}
 	if (prt_curse == 3) {
 		if (countitem(7431) < 1) {
 			mes "[Librarian]";
diff --git a/npc/quests/quests_veins.txt b/npc/quests/quests_veins.txt
index 00a56f32a..ea9f56ba4 100644
--- a/npc/quests/quests_veins.txt
+++ b/npc/quests/quests_veins.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.3a
+//= 1.4
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -33,20 +33,13 @@
 //=	Start NPC is missing, but will be added when I get it.
 //= 1.3 Fixed two typos small in Asbar. [L0ne_W0lf]
 //= 1.3a More fixes to some of the Base quest NPCs. [L0ne_W0lf]
+//= 1.4 Added missing checkweights. [L0ne_W0lf]
 //============================================================ 
 
 // Stone Quest
 //============================================================ 
 ve_fild05,257,130,4	script	Wincing Old Man#ve	945,{
-	//if (max_max_c1 == 1) {
-	//	mes "- Wait a moment! -";
-	//	mes "- Currently you are carrying -";
-	//	mes "- too many items with you. -";
-	//	mes "- Please come back after -";
-	//	mes "- you put some items into Kafra Storage. -";
-	//	close;
-	//}
-	if ((MaxWeight - Weight) < 2000) {
+	if ((MaxWeight - Weight) < 2000 || checkweight(1201,1) == 0) {
 		mes "- Wait a moment! -";
 		mes "- Currently you are carrying -";
 		mes "- too many items with you. -";
@@ -735,16 +728,7 @@ prontera,202,122,0	script	Kid#sch	703,{
 }
 
 prt_church,89,108,6	script	Bard#sch	741,{
-	//if (max_max_c1 == 1) {
-	//	mes "^3355FFWait a second!";
-	//	mes "Right now, you're carrying";
-	//	mes "too many things with you.";
-	//	mes "Please come back after";
-	//	mes "using the Kafra Service";
-	//	mes "to store some of your items.^000000";
-	//	close;
-	//}
-	if ((MaxWeight-Weight) < 2000) {
+	if ((MaxWeight-Weight) < 2000 || checkweight(1201,1) == 0) {
 		mes "^3355FFWait a second!";
 		mes "Right now, you're carrying";
 		mes "too many things with you.";
@@ -1459,16 +1443,7 @@ ra_in01,58,389,0	script	Guant Prisoner#sch	929,{
 
 // Escort Dancers to Schwaltzvalt Republic
 job_duncer,93,106,6	script	Dance Instructor#sch	892,{
-	//if (max_max_c1 == 1) {
-	//	mes "^3355FFWait a second!";
-	//	mes "Right now, you're carrying";
-	//	mes "too many things with you.";
-	//	mes "Please come back after";
-	//	mes "using the Kafra Service";
-	//	mes "to store some of your items.^000000";
-	//	close;
-	//}
-	if ((MaxWeight-Weight) < 2000) {
+	if ((MaxWeight-Weight) < 2000 || checkweight(1201,1) == 0) {
 		mes "^3355FFWait a second!";
 		mes "Right now, you're carrying";
 		mes "too many things with you.";
@@ -2161,16 +2136,7 @@ ein_in01,170,284,4	script	Arunafeltz Figure#sch	920,{
 }
 
 morocc,297,154,0	script	Thin-Faced Bard#sch	51,{
-	//if (max_max_c1 == 1) {
-	//	mes "^3355FFWait a second!";
-	//	mes "Right now, you're carrying";
-	//	mes "too many things with you.";
-	//	mes "Please come back after";
-	//	mes "using the Kafra Service";
-	//	mes "to store some of your items.^000000";
-	//	close;
-	//}
-	if ((MaxWeight-Weight) < 2000) {
+	if ((MaxWeight-Weight) < 2000 || checkweight(1201,1) == 0) {
 		mes "^3355FFWait a second!";
 		mes "Right now, you're carrying";
 		mes "too many things with you.";
@@ -5412,16 +5378,7 @@ ra_temin,87,118,3	script	Drawer#vol1::VeinsDrawer	111,{
 ra_temin,83,118,3	duplicate(VeinsDrawer)	Drawer#vol2	111
 
 ra_temin,85,118,3	script	Drawer#vol3	111,{
-	//if (max_max_c1 == 1) {
-	//	mes "^3355FFWait a second!";
-	//	mes "Right now, you're carrying";
-	//	mes "too many things with you.";
-	//	mes "Please come back after";
-	//	mes "using the Kafra Service";
-	//	mes "to store some of your items.^000000";
-	//	close;
-	//}
-	if ((MaxWeight-Weight) < 2000) {
+	if ((MaxWeight-Weight) < 2000 || checkweight(1201,1) == 0) {
 		mes "^3355FFWait a second!";
 		mes "Right now, you're carrying";
 		mes "too many things with you.";
@@ -5583,16 +5540,7 @@ veins,159,171,3	script	Towner#vol	945,{
 }
 
 ve_in,233,116,3	script	Drunken Man#vol	901,{
-	//if (max_max_c1 == 1) {
-	//	mes "^3355FFWait a second!";
-	//	mes "Right now, you're carrying";
-	//	mes "too many things with you.";
-	//	mes "Please come back after";
-	//	mes "using the Kafra Service";
-	//	mes "to store some of your items.^000000";
-	//	close;
-	//}
-	if ((MaxWeight-Weight) < 2000) {
+	if ((MaxWeight-Weight) < 2000 || checkweight(1201,1) == 0) {
 		mes "^3355FFWait a second!";
 		mes "Right now, you're carrying";
 		mes "too many things with you.";
@@ -6014,16 +5962,7 @@ OnEmote:
 }
 
 ve_in,277,229,3	script	Wall Closet#vol	111,{
-	//if (max_max_c1 == 1) {
-	//	mes "^3355FFWait a second!";
-	//	mes "Right now, you're carrying";
-	//	mes "too many things with you.";
-	//	mes "Please come back after";
-	//	mes "using the Kafra Service";
-	//	mes "to store some of your items.^000000";
-	//	close;
-	//}
-	if ((MaxWeight-Weight) < 2000) {
+	if ((MaxWeight-Weight) < 2000 || checkweight(1201,1) == 0) {
 		mes "^3355FFWait a second!";
 		mes "Right now, you're carrying";
 		mes "too many things with you.";
@@ -6050,16 +5989,7 @@ ve_in,277,229,3	script	Wall Closet#vol	111,{
 }
 
 ve_in,281,214,3	script	Bookshelf#vol	111,{
-	//if (max_max_c1 == 1) {
-	//	mes "^3355FFWait a second!";
-	//	mes "Right now, you're carrying";
-	//	mes "too many things with you.";
-	//	mes "Please come back after";
-	//	mes "using the Kafra Service";
-	//	mes "to store some of your items.^000000";
-	//	close;
-	//}
-	if ((MaxWeight-Weight) < 2000) {
+	if ((MaxWeight-Weight) < 2000 || checkweight(1201,1) == 0) {
 		mes "^3355FFWait a second!";
 		mes "Right now, you're carrying";
 		mes "too many things with you.";
@@ -6302,16 +6232,7 @@ que_thor,136,66,3	duplicate(VeinsGuard)	Guard#vol2	939
 que_thor,127,60,5	duplicate(VeinsGuard)	Guard#vol3	939
 
 thor_camp,250,104,3	script	Sahedi#vol	934,{
-	//if (max_max_c1 == 1) {
-	//	mes "^3355FFWait a second!";
-	//	mes "Right now, you're carrying";
-	//	mes "too many things with you.";
-	//	mes "Please come back after";
-	//	mes "using the Kafra Service";
-	//	mes "to store some of your items.^000000";
-	//	close;
-	//}
-	if ((MaxWeight-Weight) < 2000) {
+	if ((MaxWeight-Weight) < 2000 || checkweight(1201,1) == 0) {
 		mes "^3355FFWait a second!";
 		mes "Right now, you're carrying";
 		mes "too many things with you.";
diff --git a/npc/quests/quests_yuno.txt b/npc/quests/quests_yuno.txt
index f6ee4e3c0..275b265c9 100644
--- a/npc/quests/quests_yuno.txt
+++ b/npc/quests/quests_yuno.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= eAthena Dev Team; L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.9
+//= 2.0
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -31,6 +31,7 @@
 //= 1.7 Changed ALCH_Q check and set to corrispond to new alchemist job quest. [L0ne_W0lf]
 //= 1.8 Fixed metto_q never reaching 2. Made some names more unique. [L0ne_W0lf]
 //= 1.9 Fixed Missing Variables in Metto quest. (bugreport:473) [Samuray22]
+//= 2.0 Added missing checkweights. [L0ne_W0lf]
 //============================================================ 
 
 // Metto Quest
@@ -424,14 +425,14 @@ yuno_in03,178,43,0	script	CiCi#juno	121,{
 
 // Alechmist Brothers
 yuno_in01,103,157,3	script	Bain#juno	98,{
-	//if (max_max_c == 1) {
-	//	mes "- Wait a minute !! -";
-	//	mes "- Currently you're carrying -";
-	//	mes "- too many items with you. -";
-	//	mes "- Please try again -";
-	//	mes "- after you loose some weight. -";
-	//	close;
-	//}
+	if (checkweight(1201,1) == 0) {
+		mes "- Wait a minute !! -";
+		mes "- Currently you're carrying -";
+		mes "- too many items with you. -";
+		mes "- Please try again -";
+		mes "- after you loose some weight. -";
+		close;
+	}
 	if (countitem(974) > 0 && countitem(612) > 4 && countitem(1003) > 4 && countitem(7068) > 4 && countitem(7043) > 4 && countitem(757) > 2 && countitem(756) > 2 && Zeny > 2000) {
 		if (ALCH_Q == 23) set ALCH_Q,24;
 		set .@kyulkwa,rand(1,10);
@@ -556,14 +557,14 @@ S_DelItems:
 }
 	
 yuno_in01,100,153,7	script	Bajin	47,0,0,{
-	//if (max_max_c == 1) {
-	//	mes "- Wait a minute !! -";
-	//	mes "- Currently you're carrying -";
-	//	mes "- too many items with you. -";
-	//	mes "- Please try again -";
-	//	mes "- after you loose some weight. -";
-	//	close;
-	//}
+	if (checkweight(1201,1) == 0) {
+		mes "- Wait a minute !! -";
+		mes "- Currently you're carrying -";
+		mes "- too many items with you. -";
+		mes "- Please try again -";
+		mes "- after you loose some weight. -";
+		close;
+	}
 	if (countitem(974) > 0 && countitem(612) > 4 && countitem(1003) > 4 && countitem(7068) > 4 && countitem(7043) > 4 && countitem(757) > 2 && countitem(756) > 2 && Zeny > 2000) {
 		if (ALCH_Q == 23) set ALCH_Q,24;
 		set .@kyulkwa,rand(1,10);
diff --git a/npc/quests/skills/bard_skills.txt b/npc/quests/skills/bard_skills.txt
index f6a7b964d..14ee07108 100644
--- a/npc/quests/skills/bard_skills.txt
+++ b/npc/quests/skills/bard_skills.txt
@@ -23,6 +23,7 @@
 //= 1.4	Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
 //= 1.4a Checks the proper variable now. (bard_q -> gef_bard_q) [L0ne_W0lf]
 //= 1.5 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
+//= 1.6 Added missing checkweights. [L0ne_W0lf]
 //============================================================
 
 prontera,174,328,3	script	Young Man#bard_q1	89,3,3,{
@@ -1164,12 +1165,11 @@ morocc_in,175,70,7	script	Customer#bard_skill02	50,{
 // Bartender
 //============================================================ 
 morocc_in,166,76,7	script	Bartender#bard_qskill	46,{
-	//set max_max_c,1201;
-	//if (max_max_c == 1) {
-	//	mes "^3355FFHold it right there!";
-	//	mes "You're carrying too many items and don't have enough inventory space to receive any rewards. Please make more inventory space available and come back to take this challenge.";
-	//	close;
-	//}
+	if (checkweight(1201,1) == 0) {
+		mes "^3355FFHold it right there!";
+		mes "You're carrying too many items and don't have enough inventory space to receive any rewards. Please make more inventory space available and come back to take this challenge.";
+		close;
+	}
 	mes "[Bartender]";
 	mes "So what would";
 	mes "you like to order?";