Index: npc/custom/card_remover.txt =================================================================== --- npc/custom/card_remover.txt (revision 17159) +++ npc/custom/card_remover.txt (working copy) @@ -3,7 +3,7 @@ //===== By: ================================================== //= TyrNemesis^ //===== Current Version: ===================================== -//= 1.2 +//= 1.2a //===== Compatible With: ===================================== //= rAthena SVN //===== Description: ========================================= @@ -11,12 +11,16 @@ //===== 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; Index: npc/custom/item_signer.txt =================================================================== --- npc/custom/item_signer.txt (revision 17159) +++ npc/custom/item_signer.txt (working copy) @@ -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: ,{,...} (0 to disable) setarray .@Cost[0],0,5000; // Zeny requirements: , - + + disable_items; mes "[Perchik]"; mes "I can ^0055FFsign your name^000000 on almost any rare item you hold."; next; Index: npc/custom/quests/quest_shop.txt =================================================================== --- npc/custom/quests/quest_shop.txt (revision 17159) +++ npc/custom/quests/quest_shop.txt (working copy) @@ -3,7 +3,7 @@ //===== By: ================================================== //= Euphy //===== Current Version: ===================================== -//= 1.6 +//= 1.6a //===== Compatible With: ===================================== //= rAthena SVN r16862+ //===== Description: ========================================= @@ -107,6 +107,7 @@ 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:"; Index: npc/merchants/advanced_refiner.txt =================================================================== --- npc/merchants/advanced_refiner.txt (revision 17159) +++ npc/merchants/advanced_refiner.txt (working copy) @@ -3,7 +3,7 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.4 +//= 1.4a //===== Compatible With: ===================================== //= rAthena SVN //===== Description: ========================================= @@ -22,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,"; Index: npc/merchants/enchan_arm.txt =================================================================== --- npc/merchants/enchan_arm.txt (revision 17159) +++ npc/merchants/enchan_arm.txt (working copy) @@ -3,7 +3,7 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.3 +//= 1.3a //===== Compatible With: ===================================== //= rAthena SVN //===== Description: ========================================= @@ -14,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."; Index: npc/merchants/old_pharmacist.txt =================================================================== --- npc/merchants/old_pharmacist.txt (revision 17159) +++ npc/merchants/old_pharmacist.txt (working copy) @@ -223,25 +223,22 @@ 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 Index: npc/merchants/refine.txt =================================================================== --- npc/merchants/refine.txt (revision 17159) +++ npc/merchants/refine.txt (working copy) @@ -3,7 +3,7 @@ //===== By: ================================================== //= Syrus22 (1.1) dafide18 (1.4) Skotlex (1.5) //===== Current Version: ===================================== -//= 3.2 +//= 3.2a //===== Compatible With: ===================================== //= Any Athena Version //===== Description: ========================================= @@ -59,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 @@ -603,6 +604,7 @@ //= .@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."; Index: npc/merchants/socket_enchant.txt =================================================================== --- npc/merchants/socket_enchant.txt (revision 17159) +++ npc/merchants/socket_enchant.txt (working copy) @@ -3,7 +3,7 @@ //===== By: ================================================== //= rAthena Dev Team //===== Current Version: ===================================== -//= 2.0 +//= 2.0a //===== Compatible With: ===================================== //= rAthena SVN //===== Description: ========================================= @@ -27,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,{ @@ -247,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."; Index: npc/merchants/socket_enchant2.txt =================================================================== --- npc/merchants/socket_enchant2.txt (revision 17159) +++ npc/merchants/socket_enchant2.txt (working copy) @@ -3,7 +3,7 @@ //===== By: ================================================== //= Gepard //===== Current Version: ===================================== -//= 1.1 +//= 1.1a //===== Compatible With: ===================================== //= rAthena SVN //===== Description: ========================================= @@ -12,6 +12,7 @@ //===== 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,{ @@ -385,6 +386,7 @@ function script Func_Socket2 { + disable_items; mes "[Leablem]"; if(getarg(7,0) != 0 && getarg(8,0) != 0) { Index: npc/quests/newgears/2004_headgears.txt =================================================================== --- npc/quests/newgears/2004_headgears.txt (revision 17159) +++ npc/quests/newgears/2004_headgears.txt (working copy) @@ -3,7 +3,7 @@ //===== By: ================================================== //= Dj-Yhn //===== Current Version: ===================================== -//= 1.6 +//= 1.6a //===== Compatible With: ===================================== //= rAthena SVN //===== Description: ========================================= @@ -33,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 @@ -637,7 +638,7 @@ // 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 -"; @@ -645,9 +646,6 @@ mes "- Please try again after -"; mes "- you put some items into Kafra Storage. -"; close; - // close2; - // EnableItemMove - // end; } mes "[Skillful Looking Artisan]"; mes "Aha~"; @@ -960,7 +958,6 @@ 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 Index: npc/quests/newgears/2005_headgears.txt =================================================================== --- npc/quests/newgears/2005_headgears.txt (revision 17159) +++ npc/quests/newgears/2005_headgears.txt (working copy) @@ -3,9 +3,9 @@ //===== By: ================================================== //= MasterOfMuppets //===== Current Version: ===================================== -//= 1.3 +//= 1.3a //===== Compatible With: ===================================== -//= rAthena +//= rAthena SVN //===== Description: ========================================= //= [Aegis Conversion] //= 2005 Headgears Official Quest. @@ -15,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,{ @@ -227,6 +228,7 @@ } lighthalzen,143,68,0 script Strange Guy#LhzHat 47,{ + disable_items; if(DTHATQ == 0) { mes "[Strange Guy]"; @@ -1085,6 +1087,7 @@ } lighthalzen,182,89,0 script Relaxed-Looking Lady 91,{ + disable_items; if(LHZBTQ == 0) { mes "[Relaxed-Looking Lady]"; Index: npc/quests/seals/mjolnir_seal.txt =================================================================== --- npc/quests/seals/mjolnir_seal.txt (revision 17159) +++ npc/quests/seals/mjolnir_seal.txt (working copy) @@ -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 @@ } } 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..."; Index: npc/re/merchants/refine.txt =================================================================== --- npc/re/merchants/refine.txt (revision 17159) +++ npc/re/merchants/refine.txt (working copy) @@ -3,13 +3,14 @@ //===== By: ================================================== //= rAthena Dev Team //===== Current Version: ===================================== -//= 1.0 +//= 1.0a //===== Compatible With: ===================================== //= rAthena SVN //===== 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 @@ -41,6 +42,7 @@ //= 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."; Index: npc/re/quests/eden/eden_quests.txt =================================================================== --- npc/re/quests/eden/eden_quests.txt (revision 17159) +++ npc/re/quests/eden/eden_quests.txt (working copy) @@ -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 @@ 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;