summaryrefslogtreecommitdiff
path: root/npc/re/merchants/enchan_mal.txt
diff options
context:
space:
mode:
authoreuphyy <euphyy@54d463be-8e91-2dee-dedb-b68131a5f0ec>2013-03-04 04:32:43 +0000
committershennetsind <ind@henn.et>2013-04-11 16:48:45 -0300
commitdbb062c2f3657746a36feebc190c736ddcaa3881 (patch)
treec7471998af1d8aa399cae2fd4fd2713c9b493303 /npc/re/merchants/enchan_mal.txt
parente1f41ae8fdac977851bfd090a6e266a0dda8ed29 (diff)
downloadhercules-dbb062c2f3657746a36feebc190c736ddcaa3881.tar.gz
hercules-dbb062c2f3657746a36feebc190c736ddcaa3881.tar.bz2
hercules-dbb062c2f3657746a36feebc190c736ddcaa3881.tar.xz
hercules-dbb062c2f3657746a36feebc190c736ddcaa3881.zip
* Initial implementation of Malangdo Card Separation script.
* Added and documented 'delequip' command, used in new official scripts. * Fixed issue in Guillotine Cross job quest where mobs did not properly reset (bugreport:7323). * Minor cleaning of script_commands.txt. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17168 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc/re/merchants/enchan_mal.txt')
-rw-r--r--npc/re/merchants/enchan_mal.txt29
1 files changed, 11 insertions, 18 deletions
diff --git a/npc/re/merchants/enchan_mal.txt b/npc/re/merchants/enchan_mal.txt
index 36e8487b5..5caa70217 100644
--- a/npc/re/merchants/enchan_mal.txt
+++ b/npc/re/merchants/enchan_mal.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= Muad_Dib
//===== Current Version: =====================================
-//= 1.0
+//= 1.0a
//===== Compatible With: =====================================
//= rAthena SVN
//===== Description: =========================================
@@ -12,6 +12,7 @@
//= for Malangdo coins.
//===== Additional Comments: =================================
//= 1.0 First Version. [Euphy]
+//= 1.0a Added 'delequip' command. [Euphy]
//============================================================
malangdo,213,167,4 script Mayomayo#mal 555,{
@@ -567,10 +568,10 @@ L_Socket:
mes "There is something wrong. Please try again.";
close;
}
- if (.@equip_card[3] == 0 && getarg(1) < 4) set .@target,3;
- else if (.@equip_card[2] == 0 && getarg(1) < 3) set .@target,2;
- else if (.@equip_card[1] == 0 && getarg(1) < 2) set .@target,1;
- else if (.@equip_card[0] == 0 && getarg(1) < 1) set .@target,0;
+ if (.@equip_card[3] == 0 && getarg(1) < 4) set .@equip_card[3],.@enchant;
+ else if (.@equip_card[2] == 0 && getarg(1) < 3) set .@equip_card[2],.@enchant;
+ else if (.@equip_card[1] == 0 && getarg(1) < 2) set .@equip_card[1],.@enchant;
+ else if (.@equip_card[0] == 0 && getarg(1) < 1) set .@equip_card[0],.@enchant;
else {
mes "[Mayomayo]";
mes "This equipment is at the end of enchant. I provide enchant for two times maximum.";
@@ -585,24 +586,18 @@ L_Socket:
mes "Oh my god!";
mes "This equipment is destroyed because it could not endure powerful ability. I'm so sorry.";
delitem .@coin[.@coin_select],.@total[.@coin_select];
-
-// dropequipitem EQI_HAND_R
- unequip EQI_HAND_R;
- delitem2 .@equip_id,1,1,.@equip_refine,0,.@equip_card[0],.@equip_card[1],.@equip_card[2],.@equip_card[3];
+ delequip EQI_HAND_R;
close;
}
specialeffect2 EF_REPAIRWEAPON;
mes "[Mayomayo]";
mes "I have enchanted ^990000slot "+.@socket+"^000000 of this equipment.";
delitem .@coin[.@coin_select],.@total[.@coin_select];
-
-// dropequipitem EQI_HAND_R
- unequip EQI_HAND_R;
- delitem2 .@equip_id,1,1,.@equip_refine,0,.@equip_card[0],.@equip_card[1],.@equip_card[2],.@equip_card[3];
+ delequip EQI_HAND_R;
// GetNonSlotItemSock2 .@equip_refine .@equip_id .@equip_card[0] .@equip_card[1] .@equip_card[2] .@equip_card[3]
- set .@equip_card[.@target],.@enchant;
getitem2 .@equip_id,1,1,.@equip_refine,0,.@equip_card[0],.@equip_card[1],.@equip_card[2],.@equip_card[3];
+
close;
} else if (.@select == 2) {
mes "[Mayomayo]";
@@ -632,10 +627,7 @@ L_Socket:
mes "[Mayomayo]";
mes "Initialize the enchant effect from the equipment.";
delitem 6417,1; //Silvervine
-
-// dropequipitem EQI_HAND_R
- unequip EQI_HAND_R;
- delitem2 .@equip_id,1,1,.@equip_refine,0,.@equip_card[0],.@equip_card[1],.@equip_card[2],.@equip_card[3];
+ delequip EQI_HAND_R;
// GetNonSlotItemSock2 .@equip_refine .@equip_id .@equip_card[0] .@equip_card[1] .@equip_card[2] .@equip_card[3]
for(set .@i,0; .@i<4; set .@i,.@i+1) {
@@ -643,6 +635,7 @@ L_Socket:
set .@equip_card[.@i],0;
}
getitem2 .@equip_id,1,1,.@equip_refine,0,.@equip_card[0],.@equip_card[1],.@equip_card[2],.@equip_card[3];
+
close;
}
}