diff options
Diffstat (limited to 'npc/merchants')
| -rw-r--r-- | npc/merchants/advanced_refiner.txt | 6 | ||||
| -rw-r--r-- | npc/merchants/enchan_arm.txt | 6 | ||||
| -rw-r--r-- | npc/merchants/old_pharmacist.txt | 5 | ||||
| -rw-r--r-- | npc/merchants/refine.txt | 6 | ||||
| -rw-r--r-- | npc/merchants/socket_enchant.txt | 6 | ||||
| -rw-r--r-- | npc/merchants/socket_enchant2.txt | 6 |
6 files changed, 26 insertions, 9 deletions
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) { |