From 68059ee62a223edb323abba0bc980faab8ed4b52 Mon Sep 17 00:00:00 2001 From: Haru Date: Sat, 3 Jun 2017 22:47:54 +0200 Subject: Revert "Unify specialeffect, convert legacy scripts (#1746)" This reverts commit 19883c583e5e1471c87ae80e67f34882a7e75bc6. The commit was squashed by accident, my fault. I'm merging the PR again, this time preserving the indivisual commits. --- npc/re/merchants/enchan_mora.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'npc/re/merchants/enchan_mora.txt') diff --git a/npc/re/merchants/enchan_mora.txt b/npc/re/merchants/enchan_mora.txt index 46979c82b..fe2b21754 100644 --- a/npc/re/merchants/enchan_mora.txt +++ b/npc/re/merchants/enchan_mora.txt @@ -230,7 +230,7 @@ mora,96,74,5 script Master of Relics#pa0829 4_M_MERCAT1,{ mes "For 2 Mora Coins I can strengthen the relic you have in many ways!"; close; } - specialeffect(EF_REPAIRWEAPON, AREA, playerattached()); + specialeffect2 EF_REPAIRWEAPON; delitem Mora_Coin,2; delitem .@item,1; switch(.@enchant_type) { @@ -478,7 +478,7 @@ mora,99,93,5 script Artifact Crafter#pa0829 4_M_MERCAT1,{ mes "You have to have 2 Mora Coins and an item to be reinforced before I can do my work."; close; } - specialeffect(EF_REPAIRWEAPON, AREA, playerattached()); + specialeffect2 EF_REPAIRWEAPON; delitem Mora_Coin,2; delitem .@item,1; switch(.@enchant_type) { @@ -1119,18 +1119,18 @@ L_Socket: Zeny -= 100000; delequip .@part; if (.@enchant == 9) { - specialeffect(EF_SUI_EXPLOSION, AREA, playerattached()); + specialeffect2 EF_SUI_EXPLOSION; mes "[Artifact Researcher]"; mes "This!"; mes "I... I'm sorry but the equipment has been destroyed."; close; } if (.@enchant == 0) { - specialeffect(EF_SHIELDCHARGE, AREA, playerattached()); + specialeffect2 EF_SHIELDCHARGE; mes "[Artifact Researcher]"; mes "Since the balance of power does not match, the given existing ability has been destroyed. It is unfortunate but please try again next time."; } else { - specialeffect(EF_REPAIRWEAPON, AREA, playerattached()); + specialeffect2 EF_REPAIRWEAPON; mes "[Artifact Researcher]"; // Replacing original dialogue since it doesn't make sense. //mes "The artifact ^990000"+.@slot+" will have the first enhancement retained."; @@ -1147,7 +1147,7 @@ L_Socket: mes "You've got to pay if you want the services."; close; } - specialeffect(EF_REPAIRWEAPON, AREA, playerattached()); + specialeffect2 EF_REPAIRWEAPON; mes "[Artifact Researcher]"; mes "The ability to enhance remains."; delitem Mora_Coin,1; @@ -1487,7 +1487,7 @@ L_ShowInfo: //== Other Enchants :: sangjo ============================== function script F_Mora_Enchant { - specialeffect(EF_REPAIRWEAPON, AREA, playerattached()); + specialeffect2 EF_REPAIRWEAPON; progressbar "ffff00",3; delitem Mora_Coin,5; delitem getarg(0),1; -- cgit v1.2.3-70-g09d2