Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed two npcs which used hardcoded EQI_ values

Browse Source 
Follow up to 2bf64c9
This commit is contained in:
Lemongrass3110 2016-04-16 11:14:36 +02:00
parent 5731eca3b0
commit 7046cf8fc5
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
npc/merchants/refine.txt
View File

@ -570,10 +570,11 @@ function script refinemain {
next;
setarray .@position$[1], "Head","Body","Left hand","Right hand","Robe","Shoes","Accessory 1","Accessory 2","Head 2","Head 3";
setarray .@indizes[1], EQI_HEAD_TOP, EQI_ARMOR, EQI_HAND_L, EQI_HAND_R, EQI_GARMENT, EQI_SHOES, EQI_ACC_L, EQI_ACC_R, EQI_HEAD_MID, EQI_HEAD_LOW;
set .@menu$,"";
for(set .@i,1; .@i<=10; set .@i,.@i+1) {
if(getequipisequiped(.@i)) {
set .@menu$, .@menu$ + .@position$[.@i] + "-" + "[" + getequipname(.@i) + "]";
for(set .@i,1; .@i<getarraysize(.@indizes); set .@i,.@i+1) {
if(getequipisequiped(.@indizes[.@i])) {
set .@menu$, .@menu$ + .@position$[.@i] + "-" + "[" + getequipname(.@indizes[.@i]) + "]";
set .@equipped,1;
}
set .@menu$, .@menu$ + ":";
@ -583,7 +584,7 @@ function script refinemain {
mes "I don't think I can refine any items you have...";
close;
}
set .@part, select(.@menu$);
set .@part, .@indizes[select(.@menu$)];
if(!getequipisequiped(.@part)) { //custom check
mes "["+ .@npc_name$ +"]";

10
npc/re/merchants/enchan_mora.txt
View File

@ -661,7 +661,7 @@ mora,148,98,3 script Artifact Researcher#new 521,{
// Enchant types:
// [1]ATK [2]CRIT [3]EVA [4]Healer [5]Spell 1 [6]Assist 1 [7]Assist 2 [8]STR [9]Range [10]Physical [11]Spell 2
switch(.@part) {
case 4: //EQI_HAND_R
case EQI_HAND_R:
switch(.@equip_id) {
case 1660: callsub L_Socket,4,5,1; //Wand_Of_Affection2
case 2011: callsub L_Socket,5,11,1; //Golden_Rod_Staff2
@ -671,7 +671,7 @@ mora,148,98,3 script Artifact Researcher#new 521,{
case 16018: callsub L_Socket,1,5,1; //Mace_Of_Judgement2
}
break;
case 6: //EQI_SHOES
case EQI_SHOES:
switch(.@equip_id) {
case 2475: callsub L_Socket,6,8,1; //Ur_Greave
case 2476: callsub L_Socket,6,10,1; //Peuz_Greave
@ -681,7 +681,7 @@ mora,148,98,3 script Artifact Researcher#new 521,{
case 2480: callsub L_Socket,6,1,1; //Black_Wing_Boots
}
break;
case 5: //EQI_GARMENT
case EQI_GARMENT:
switch(.@equip_id) {
case 2574: callsub L_Socket,3,8,1; //Ur_Manteau
case 2575: callsub L_Socket,3,2,1; //Peuz_Manteau
@ -691,7 +691,7 @@ mora,148,98,3 script Artifact Researcher#new 521,{
case 2581: callsub L_Socket,3,1,1; //Black_Wing_Manteau
}
break;
case 2: //EQI_ARMOR
case EQI_ARMOR:
switch(.@equip_id) {
case 15036: callsub L_Socket,8,1,1; //Ur_Plate
case 15037: callsub L_Socket,10,2,1; //Peuz_Plate
@ -701,7 +701,7 @@ mora,148,98,3 script Artifact Researcher#new 521,{
case 15043: callsub L_Socket,1,9,1; //Black_Wing_Suits
}
break;
case 7: //EQI_ACC_L
case EQI_ACC_L:
switch(.@equip_id) {
case 2883: callsub L_Socket,6,0,2; //Ur_Seal
case 2884: callsub L_Socket,6,0,2; //Peuz_Seal