* Part one of fixing bugreport:6527. This does not yet change functionality.

-- Added 'disable_items' to all applicable scripts.

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

17 files changed, 67 insertions, 29 deletions

diff --git a/db/re/item_db.txt b/db/re/item_db.txt
index d8d0111cd..b9696b7a3 100644
--- a/db/re/item_db.txt
+++ b/db/re/item_db.txt
@@ -5059,9 +5059,9 @@
 11529,MAAMOUL_,Maamoul,0,500,,100,,,,,0xFFFFFFFF,7,2,,,,,,{ itemheal 120,60; },{},{}
 11530,Jujube,Jujube,0,10,,100,,,,,0xFFFFFFFF,7,2,,,,,,{ itemheal 30,0; },{},{}
 11531,Coffee,Coffee,0,10,,100,,,,,0xFFFFFFFF,7,2,,,,,,{ itemheal 0,10; },{},{}
-11532,Nasi_Goreng,Nasi_Goreng,0,15,,20,,,,,0xFFFFFFFF,7,2,,,,,,{ itemheal rand(17,23),0; },{},{}
+11532,Nasi_Goreng,Nasi Goreng,0,15,,20,,,,,0xFFFFFFFF,7,2,,,,,,{ itemheal rand(17,23),0; },{},{}
 11533,Satay,Satay,0,15,,20,,,,,0xFFFFFFFF,7,2,,,,,,{ itemheal rand(17,23),0; },{},{}
-11534,Coconut_Juice,Coconut Juice,0,20,,20,,,,,0xFFFFFFFF,7,2,,,,,,{ itemheal rand(17,23),0; },{},{}
+11534,Coco_Juice,Coconut Juice,0,20,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ itemheal rand(17,23),0; },{},{}
 //
 11536,Cat_Hard_Biscuit,Cat Biscuit,0,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ itemheal rand(70,110),0; },{},{}
 //
diff --git a/npc/custom/card_remover.txt b/npc/custom/card_remover.txt
index 1e0a1c8f7..45e5e42c8 100644
--- a/npc/custom/card_remover.txt
+++ b/npc/custom/card_remover.txt
@@ -3,18 +3,24 @@
 //===== By: ==================================================
 //= TyrNemesis^
 //===== Current Version: =====================================
-//= 1.2
+//= 1.2a
+//===== Compatible With: =====================================
+//= Hercules Git
 //===== Description: =========================================
 //= Removes cards from equipped items.
 //===== Additional Comments: =================================
 //= 1.0 First version. [TyrNemesis^]
 //= 1.2 Optimized and fixed getequipname menu. [Kisuka]
+//= 1.2a Added 'disable_items' command. [Euphy]
 //============================================================
 
 prt_in,28,73,4	script	Wise Old Woman#eAcustom	78,{
+
 	set .zenycost,200000; // Set base cost in zeny of the card remover services
 	set .percardcost,25000; // set cost per card of the card remover services
 	set .faildestroy,1; // Should the card remover have a chance of failure that destroys items? 1 = Yes, 0 = No.
+
+	disable_items;
 	mes "[Wise Old Woman]";
 	mes "Good day, young one. I have the power to remove cards that you have compounded onto your equipment. Does this idea please you?";
 	next;
diff --git a/npc/custom/item_signer.txt b/npc/custom/item_signer.txt
index a3aba3771..96c33ba00 100644
--- a/npc/custom/item_signer.txt
+++ b/npc/custom/item_signer.txt
@@ -3,20 +3,22 @@
 //===== By: ==================================================
 //= Lupus
 //===== Current Version: =====================================
-//= 1.1
+//= 1.1a
 //===== Compatible With: =====================================
 //= rAthena SVN
 //===== Description: =========================================
 //= Write you name on your rare equipment or weapon ^_-
 //===== Additional Comments: =================================
 //= 1.1 Cleaned and edited for general use. [Euphy]
+//= 1.1a Added 'disable_items' command. [Euphy]
 //============================================================
 
 prt_in,24,61,7	script	Perchik	47,{
 	
 	setarray .@Item[0],644,3;	// Item requirements: <ID>,<Count>{,...} (0 to disable)
 	setarray .@Cost[0],0,5000;	// Zeny requirements: <base price>,<price per refine>
-	
+
+	disable_items;
 	mes "[Perchik]";
 	mes "I can ^0055FFsign your name^000000 on almost any rare item you hold.";
 	next;
diff --git a/npc/custom/quests/quest_shop.txt b/npc/custom/quests/quest_shop.txt
index 539c29f23..ec4556721 100644
--- a/npc/custom/quests/quest_shop.txt
+++ b/npc/custom/quests/quest_shop.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Euphy
 //===== Current Version: =====================================
-//= 1.6
+//= 1.6a
 //===== Compatible With: =====================================
 //= rAthena SVN r16862+
 //===== Description: =========================================
@@ -107,6 +107,7 @@ OnBuyItem:
 		message strcharinfo(0),"You can't purchase that many "+getitemname(.@q[0])+".";
 		end;
 	}
+	disable_items;
 	mes "[Quest Shop]";
 	mes "Reward: ^0055FF"+((.@q[2] > 1)?.@q[2]+"x ":"")+Slot(.@q[0])+"^000000";
 	mes "Requirements:";
diff --git a/npc/merchants/advanced_refiner.txt b/npc/merchants/advanced_refiner.txt
index 01983d96d..eca847c6f 100644
--- a/npc/merchants/advanced_refiner.txt
+++ b/npc/merchants/advanced_refiner.txt
@@ -3,7 +3,9 @@
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
-//= 1.4
+//= 1.4a
+//===== Compatible With: =====================================
+//= Hercules Git
 //===== Description: =========================================
 //= [Aegis Conversion]
 //= Refiner that uses Enriched ores to increase upgrade success.
@@ -20,9 +22,11 @@
 //= 1.2 Optimizing refine method [Zephyrus]
 //= 1.3 Typo fixes [Yommy]
 //= 1.4 Removed unnecessary dialogs [Zephyrus]
+//= 1.4a Added 'disable_items' command. [Euphy]
 //============================================================
 
 payon,174,138,0	script	Suhnbi#cash	85,{
+	disable_items;
 	mes "[Suhnbi]";
 	mes "I am the Armsmith";
 	mes "I can refine all kinds of weapons,";
diff --git a/npc/merchants/enchan_arm.txt b/npc/merchants/enchan_arm.txt
index 94cdd615e..a9ad383b8 100644
--- a/npc/merchants/enchan_arm.txt
+++ b/npc/merchants/enchan_arm.txt
@@ -3,7 +3,9 @@
 //===== By: ================================================== 
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.3
+//= 1.3a
+//===== Compatible With: ===================================== 
+//= Hercules Git
 //===== Description: ========================================= 
 //= [Aegis Conversion]
 //= Add a +1, +2, or +3 random stat to a specified armor.
@@ -12,9 +14,11 @@
 //= 1.1 Corrected typo (Sit -> Suit) (bugreport:4586)
 //= 1.2 Optimized. [Euphy]
 //= 1.3 Fixed some typos and optimized a little more. [Daegaladh]
+//= 1.3a Added 'disable_items' command. [Euphy]
 //============================================================ 
 
 prontera,165,60,2	script	Apprentice Craftsman	73,{
+	disable_items;
 	mes "[Apprentice Craftsman]";
 	if (Zeny > 399999) {
 		mes "I've been studying ways to enhance an armor to maximize its capability.";
diff --git a/npc/merchants/old_pharmacist.txt b/npc/merchants/old_pharmacist.txt
index d01eb92e3..f913b0eec 100644
--- a/npc/merchants/old_pharmacist.txt
+++ b/npc/merchants/old_pharmacist.txt
@@ -221,25 +221,22 @@ L_making:
 			mes "[Old Pharmacist]";
 			mes "Then pick a number below 100. If you don't want any, just enter '0'. With the materials you have, you can make about "+.@max+" potions.";
 			input .@amount;
+			next;
 			if (.@amount == 0) {
-				next;
 				mes "[Old Pharmacist]";
 				mes "Make up your mind, will you?!";
 				close;
 			}
 			if (.@amount > 100) {
-				next;
 				mes "[Old Pharmacist]";
 				mes "Are you deaf? I said less than 100!";
 				close;
 			}
 			if ((countitem(getarg(0)) < .@amount*2) || (countitem(713) < .@amount) || (Zeny < .@amount*getarg(1))) {
-				next;
 				mes "[Old Pharmacist]";
 				mes "You rascal! You don't even have all the materials and you want me to make you potions?!";
 				close;
 			}
-			next;
 			set Zeny,Zeny-(.@amount*getarg(1));
 			delitem getarg(0),.@amount*2;
 			delitem 713,.@amount;	// Empty_Bottle
diff --git a/npc/merchants/refine.txt b/npc/merchants/refine.txt
index a6a799774..da51dee3d 100644
--- a/npc/merchants/refine.txt
+++ b/npc/merchants/refine.txt
@@ -3,7 +3,9 @@
 //===== By: ==================================================
 //= Syrus22 (1.1) dafide18 (1.4) Skotlex (1.5)
 //===== Current Version: =====================================
-//= 3.2
+//= 3.2a
+//===== Compatible With: =====================================
+//= Hercules Git
 //===== Description: =========================================
 //= Refining NPCs and Metal Salesmen.
 //===== Additional Comments: =================================
@@ -57,6 +59,7 @@
 //		Added WoE map Refiners.
 //= 3.1 Added the new refinement & Ore creation NPC's for +11 and above Refinement. [Masao]
 //= 3.2 Moved some scripts to Renewal file, other minor changes. [Euphy]
+//= 3.2a Added 'disable_items' command. [Euphy]
 //============================================================
 
 // Christopher: Geffen Blacksmith
@@ -601,6 +604,7 @@ lhz_in02,282,20,7	script	Fulerr	869,{
 //= .@safe to the max safe refine in refine_db.txt as well.
 //============================================================
 function	script	refinemain	{
+	disable_items;
 	set .@features,getarg(1);
 	mes "[" + getarg(0) + "]";
 	mes "I'm the Armsmith.";
diff --git a/npc/merchants/socket_enchant.txt b/npc/merchants/socket_enchant.txt
index 4e0b7985d..7ace07bee 100644
--- a/npc/merchants/socket_enchant.txt
+++ b/npc/merchants/socket_enchant.txt
@@ -3,7 +3,9 @@
 //===== By: ==================================================
 //= rAthena Dev Team
 //===== Current Version: =====================================
-//= 2.0
+//= 2.0a
+//===== Compatible With: =====================================
+//= Hercules Git
 //===== Description: =========================================
 //= [Aegis Conversion]
 //= Adds slots to selected weapons and armor.
@@ -25,6 +27,7 @@
 //= 1.9 Moved Episode 12 items to separate NPC.
 //=     Some cleanup & optimization. [Gepard]
 //= 2.0 Duplicates now spawn from floating NPCs. [L0ne_W0lf]
+//= 2.0a Added 'disable_items' command. [Euphy]
 //============================================================
 
 -	script	Seiyablem#dummy::SocketEnchant	-1,{
@@ -245,6 +248,7 @@
 
 function	script	Func_Socket	{
 
+	disable_items;
 	mes "[Seiyablem]";
 	mes "You want to add a Slot to a " + getitemname(getarg(0)) + "?";
 	mes "Alright, please bring me ^FF0000" + getarg(6) + " " + getitemname(getarg(5)) + (getarg(6) > 1 && getarg(5) != 999 ? "s":"") + "^000000, " + (getarg(7,0) != 0 && getarg(8,0) != 0 ? ("^FF0000" + getarg(8,0) + " " + getitemname(getarg(7,0)) + (getarg(8,0) > 1 && getarg(7,0) != 999 ? "s":"") + "^000000 ") : "") + "and my ^FF0000" + (getarg(4) >= 1000 ? (getarg(4)/1000 + ",000") : getarg(4)) + ",000 zeny^000000 service fee.";
diff --git a/npc/merchants/socket_enchant2.txt b/npc/merchants/socket_enchant2.txt
index 6456ca25d..6c21bdcf7 100644
--- a/npc/merchants/socket_enchant2.txt
+++ b/npc/merchants/socket_enchant2.txt
@@ -3,13 +3,16 @@
 //===== By: ================================================== 
 //= Gepard
 //===== Current Version: ===================================== 
-//= 1.1
+//= 1.1a
+//===== Compatible With: ===================================== 
+//= Hercules Git
 //===== Description: ========================================= 
 //= [Aegis Conversion]
 //= Adds slots to selected weapons and armor.
 //===== Additional Comments: ================================= 
 //= 1.0 First version.
 //= 1.1 Duplicates now spawn from floating NPCs. [L0ne_W0lf]
+//= 1.1a Added 'disable_items' command. [Euphy]
 //============================================================ 
 
 -	script	Leablem#dummy::SocketEnchant2	-1,{
@@ -383,6 +386,7 @@ moc_ruins,154,86,3	duplicate(SocketEnchant2)	Leablem#moc	86
 
 function	script	Func_Socket2	{
 
+	disable_items;
 	mes "[Leablem]";
 	if(getarg(7,0) != 0 && getarg(8,0) != 0)
 	{
diff --git a/npc/quests/newgears/2004_headgears.txt b/npc/quests/newgears/2004_headgears.txt
index 4a347877d..71c33e6aa 100644
--- a/npc/quests/newgears/2004_headgears.txt
+++ b/npc/quests/newgears/2004_headgears.txt
@@ -3,7 +3,9 @@
 //===== By: ================================================== 
 //= Dj-Yhn
 //===== Current Version: ===================================== 
-//= 1.6
+//= 1.6a
+//===== Compatible With: ===================================== 
+//= Hercules Git
 //===== Description: ========================================= 
 //= [Aegis Conversion]
 //= 2004 New Headgears. Official Quests
@@ -31,6 +33,7 @@
 //= 1.4 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
 //= 1.5 Vito'd function call for checkweight. [L0ne_W0lf]
 //= 1.6 Replaced effect numerics with constants. [L0ne_W0lf]
+//= 1.6a Added 'disable_items' command. [Euphy]
 //============================================================
 
 // Black Cat Ears
@@ -635,7 +638,7 @@ geffen,67,87,3	script	Ipore#1	700,{
 // Angel Wing Ears, Devil Wing Ears
 //============================================================
 yuno,241,52,3	script	Old Blacksmith#hgear	813,{
-	//DisableItemMove
+	disable_items;
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a minute! -";
 		mes "- Currently you're carrying -";
@@ -643,9 +646,6 @@ yuno,241,52,3	script	Old Blacksmith#hgear	813,{
 		mes "- Please try again after -";
 		mes "- you put some items into Kafra Storage. -";
 		close;
-	//	close2;
-	//	EnableItemMove
-	//	end;
 	}
 	mes "[Skillful Looking Artisan]";
 	mes "Aha~";
@@ -958,7 +958,6 @@ yuno,241,52,3	script	Old Blacksmith#hgear	813,{
 		mes "I'm always here at this scenic spot so I can enjoy the view. Just come back whenever you feel like it.";
 		close;
 	}
-	//EnableItemMove
 }
 
 // Sea-Otter Hat
diff --git a/npc/quests/newgears/2005_headgears.txt b/npc/quests/newgears/2005_headgears.txt
index 862e9d364..e60169ab0 100644
--- a/npc/quests/newgears/2005_headgears.txt
+++ b/npc/quests/newgears/2005_headgears.txt
@@ -3,7 +3,9 @@
 //===== By: ================================================== 
 //= MasterOfMuppets
 //===== Current Version: ===================================== 
-//= 1.3
+//= 1.3a
+//===== Compatible With: ===================================== 
+//= Hercules Git
 //===== Description: ========================================= 
 //= [Aegis Conversion]
 //= 2005 Headgears Official Quest.
@@ -13,6 +15,7 @@
 //= 1.2 Replaced effect numerics with constants. [L0ne_W0lf]
 //= 1.3 Fixed item check bugs, added missing airport NPC,
 //      and took out unneeded breaks [Xantara] [Muad_Dib]
+//= 1.3a Added 'disable_items' command. [Euphy]
 //============================================================ 
 
 yuno,222,116,3	script	Kasis#LhzHat	851,{
@@ -225,6 +228,7 @@ yuno,222,116,3	script	Kasis#LhzHat	851,{
 }
 
 lighthalzen,143,68,0	script	Strange Guy#LhzHat	47,{
+	disable_items;
 	if(DTHATQ == 0)
 	{
 		mes "[Strange Guy]";
@@ -1083,6 +1087,7 @@ lhz_in02,91,38,5	script	Margaret Mary#LhzHat	90,{
 }
 
 lighthalzen,182,89,0	script	Relaxed-Looking Lady	91,{
+	disable_items;
 	if(LHZBTQ == 0)
 	{
 		mes "[Relaxed-Looking Lady]";
diff --git a/npc/quests/seals/mjolnir_seal.txt b/npc/quests/seals/mjolnir_seal.txt
index 95a3d5098..e2be244ea 100644
--- a/npc/quests/seals/mjolnir_seal.txt
+++ b/npc/quests/seals/mjolnir_seal.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= SinSloth
 //===== Current Version: ===================================== 
-//= 1.8
+//= 1.8a
 //===== Compatible With: ===================================== 
 //= rAthena
 //===== Description: ========================================= 
@@ -20,6 +20,7 @@
 //=     Corrected Sudi's and player's HP settings.
 //= 1.7 Fixed a copy/paste error in Nordri. [L0ne_W0lf]
 //= 1.8 Fixed item check for Oridecon. [L0ne_W0lf]
+//= 1.8a Added 'disable_items' command. [Euphy]
 //============================================================
 
 prontera,124,297,3	script	Tialfi	706,{
@@ -1934,6 +1935,7 @@ mjolnir_01,35,136,7	script	Dwarf Blacksmith#west	826,{
 				}
 			}
 			else if(god_mjo_3 == 1) {
+				disable_items;
 				mes "[Vestri]";
 				mes "Great...!";
 				mes "Which one should I upgrade first, huh? My heart is pounding with anticipation...";
diff --git a/npc/re/merchants/refine.txt b/npc/re/merchants/refine.txt
index 749f573aa..4b02e0d22 100644
--- a/npc/re/merchants/refine.txt
+++ b/npc/re/merchants/refine.txt
@@ -3,11 +3,14 @@
 //===== By: ==================================================
 //= rAthena Dev Team
 //===== Current Version: =====================================
-//= 1.0
+//= 1.0a
+//===== Compatible With: =====================================
+//= Hercules
 //===== Description: =========================================
 //= Renewal-specific refining NPCs and material merchants.
 //===== Additional Comments: =================================
 //= 1.0 Moved some scripts to Renewal file, optimized "Austry" NPC. [Euphy]
+//= 1.0a Added 'disable_items' command. [Euphy]
 //============================================================
 
 // +11 and above Refiners
@@ -39,6 +42,7 @@ payon_in01,18,132,3	script	Bestry#pay	826,{
 //= function call.  Otherwise, the chance in refine_db.txt is used.
 //============================================================
 function	script	refinenew	{
+	disable_items;
 	mes "["+ getarg(0) +"]";
 	mes "I am the best Blacksmith ever!";
 	mes "I don't work with normal, boring items.";
diff --git a/npc/re/quests/eden/eden_quests.txt b/npc/re/quests/eden/eden_quests.txt
index c6776d9b4..3c9d421a7 100644
--- a/npc/re/quests/eden/eden_quests.txt
+++ b/npc/re/quests/eden/eden_quests.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
-//= 1.4a
+//= 1.4b
 //===== Compatible With: =====================================
 //= rAthena SVN
 //===== Description: =========================================
@@ -17,6 +17,7 @@
 //= alongside him. Special thanks to Chilly for the base. [Masao]
 //= 1.4 Partial cleaning and bug fixing. [Euphy]
 //= 1.4a Added 'npcskill' command. [Euphy]
+//= 1.4b Added 'disable_items' command. [Euphy]
 //============================================================
 
 moc_para01,25,35,4	script	Instructor Boya#para01	469,{
@@ -3364,6 +3365,7 @@ moc_para01,112,96,5	script	Administrator Michael	967,{
 		mes "We can only upgrade the Eden Group Hat.";
 		if (para_suv02 == 3) {
 			if (countitem(5583) > 0) {
+				disable_items;
 				mes "[Michael]";
 				mes "What status bonus do you want to upgrade?";
 				next;
diff --git a/sql-files/item_db_re.sql b/sql-files/item_db_re.sql
index a3fd574f7..7012c2a4c 100644
--- a/sql-files/item_db_re.sql
+++ b/sql-files/item_db_re.sql
@@ -5090,9 +5090,9 @@ REPLACE INTO `item_db_re` VALUES (11528,'Kanafeh','Kanafeh',0,1500,NULL,200,NULL
 REPLACE INTO `item_db_re` VALUES (11529,'MAAMOUL_','Maamoul',0,500,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'itemheal 120,60;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (11530,'Jujube','Jujube',0,10,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'itemheal 30,0;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (11531,'Coffee','Coffee',0,10,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'itemheal 0,10;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (11532,'Nasi_Goreng','Nasi_Goreng',0,15,NULL,20,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'itemheal rand(17,23),0;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (11532,'Nasi_Goreng','Nasi Goreng',0,15,NULL,20,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'itemheal rand(17,23),0;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (11533,'Satay','Satay',0,15,NULL,20,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'itemheal rand(17,23),0;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (11534,'Coconut_Juice','Coconut Juice',0,20,NULL,20,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'itemheal rand(17,23),0;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (11534,'Coco_Juice','Coconut Juice',0,20,NULL,50,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'itemheal rand(17,23),0;',NULL,NULL);
 #
 REPLACE INTO `item_db_re` VALUES (11536,'Cat_Hard_Biscuit','Cat Biscuit',0,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'itemheal rand(70,110),0;',NULL,NULL);
 #
diff --git a/src/map/clif.c b/src/map/clif.c
index dcbeae3c4..82ff333a1 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -1347,8 +1347,8 @@ int clif_spawn(struct block_list *bl)
 
 	if (vd->cloth_color)
 		clif_refreshlook(bl,bl->id,LOOK_CLOTHES_COLOR,vd->cloth_color,AREA_WOS);
-	
-	
+
+
 	switch (bl->type)
 	{
 	case BL_PC: