Script/database bug fixes.

* Fixed an issue in "Message Delivery" quest blocking level 100+ characters. (bugreport:8373)
http://rathena.org/board/tracker/issue-8373-message-delivery/
* Added Renewal quest items to Ayothaya Dungeon Entrance quest. (bugreport:8375)
http://rathena.org/board/tracker/issue-8375-ayothaya-dungeon-entrance-quest/
* Temporarily moved the Renewal location of "Strange Machine" in the "Muff's Loan" quest; confirmation needed. (bugreport:8370)
http://rathena.org/board/tracker/issue-8370-muffs-loan/
* Updated Blacksmith job quest with some extra conditions. (fixes bugreport:8347)
http://rathena.org/board/tracker/issue-8347-about-blacksmith-job-quest/
* Changed all 'bAtk' bonuses to 'bBaseAtk', a continuation of r17149. (fixes bugreport:8372)
http://rathena.org/board/tracker/issue-8372-daehyon-card-is-not-working/

Signed-off-by: Euphy <euphy.raliel@rathena.org>

db/re/item_combo_db.txt

@@ -51,7 +51,7 @@
 1732:1756,{ bonus bLongAtkRate,25; bonus2 bAddEff,Eff_Stone,1000; }
 1733:1755,{ bonus bLongAtkRate,25; bonus3 bAutoSpell,"NJ_HUUJIN",5,100; if(readparam(bInt)>39) bonus3 bAutoSpell,"NJ_HUUJIN",5,200; }
 1734:1753,{ bonus bLongAtkRate,50; }
-1741:2748,{ bonus bAtk,25; bonus3 bAddEff,Eff_Curse,200,ATF_WEAPON|ATF_LONG|ATF_TARGET; }
+1741:2748,{ bonus bBaseAtk,25; bonus3 bAddEff,Eff_Curse,200,ATF_WEAPON|ATF_LONG|ATF_TARGET; }
 1746:1773,{ bonus bLongAtkRate,50; }
 1775:18114,{ bonus bLongAtkRate,40; }
 1776:18114,{ bonus bLongAtkRate,70; }
@@ -239,8 +239,8 @@
 24021:24022:24023,{ if(getequiprefinerycnt(EQI_SHADOW_ACC_R) + getequiprefinerycnt(EQI_SHADOW_ACC_L) + getequiprefinerycnt(EQI_SHADOW_WEAPON) >= 23) { bonus bMatkRate,1; } }
 24025:24028,{ set .@i,getequiprefinerycnt(EQI_SHADOW_ARMOR) + getequiprefinerycnt(EQI_SHADOW_SHOES); bonus bMaxHP,.@i; bonus bMaxSP,.@i; if(.@i >= 15) { bonus bMaxHPrate,1; } }
 24026:24027,{ set .@i,getequiprefinerycnt(EQI_SHADOW_ARMOR) + getequiprefinerycnt(EQI_SHADOW_SHIELD); bonus bDef,.@i; if(.@i >= 15) { bonus2 bSubEle,0,1; } }
-24029:24031,{ set .@i,getequiprefinerycnt(EQI_SHADOW_ARMOR) + getequiprefinerycnt(EQI_SHADOW_WEAPON); bonus bAtk,.@i; if(.@i >= 15) { bonus bLongAtkRate,1; } }
-24030:24032,{ set .@i,getequiprefinerycnt(EQI_SHADOW_ARMOR) + getequiprefinerycnt(EQI_SHADOW_WEAPON); bonus bCritical,.@i; bonus bAtk,.@i; if(.@i >= 15) { bonus bCritAtkRate,1; } }
+24029:24031,{ set .@i,getequiprefinerycnt(EQI_SHADOW_ARMOR) + getequiprefinerycnt(EQI_SHADOW_WEAPON); bonus bBaseAtk,.@i; if(.@i >= 15) { bonus bLongAtkRate,1; } }
+24030:24032,{ set .@i,getequiprefinerycnt(EQI_SHADOW_ARMOR) + getequiprefinerycnt(EQI_SHADOW_WEAPON); bonus bCritical,.@i; bonus bBaseAtk,.@i; if(.@i >= 15) { bonus bCritAtkRate,1; } }
 24034:24040,{ bonus bLuk,1; }
 24035:24041,{ bonus bStr,1; }
 24036:24042,{ bonus bInt,1; }

db/re/item_db.txt

@@ -1992,7 +1992,7 @@
 2992,Pendant_of_Maelstrom,Pendant of Maelstrom,4,20,,100,,0,,0,0xFFFFFFFF,63,2,136,,130,,,{ bonus bAtkRate,6; bonus bMatkRate,6; bonus bAllStats,1; bonus5 bAutoSpellWhenHit,"SC_MAELSTROM",1,100,BF_MAGIC,0; },{},{}
 2995,DEX_Complement,DEX Complement,4,20,,100,,0,,1,0x00000400,56,2,136,,100,0,0,{ bonus bUseSPrate,-10; bonus bDelayrate,-10; bonus bVariableCastrate,-10; bonus2 bSkillVariableCast,"NC_AXEBOOMERANG",-2000; if(getequipid(EQI_HAND_R) == 1368) { bonus bAtkRate,100; } },{},{}
 2996,Reinforced_Parts_Gun_Barrel,Reinforced Parts - Gun Barrel,4,10,,500,,,,,0xFFFFFFFF,63,2,136,,100,,,{ bonus bAtkRate,4; bonus bHit,10; bonus2 bSkillAtk,"NC_BOOSTKNUCKLE",30; },{},{}
-2997,RWC_Gold_Brooch,RWC Gold Brooch,4,10,,200,,0,,1,0xFFFFFFFF,63,2,136,,0,1,16,{ bonus bAtk,25; bonus bMatk,20; },{},{}
+2997,RWC_Gold_Brooch,RWC Gold Brooch,4,10,,200,,0,,1,0xFFFFFFFF,63,2,136,,0,1,16,{ bonus bBaseAtk,25; bonus bMatk,20; },{},{}
 2999,RWC_Brooch,RWC Brooch,4,10,,200,,0,,1,0xFFFFFFFF,63,2,136,,0,1,16,{ bonus bMaxHP,300; bonus bMaxSP,30; },{},{}
 
 // Cards
@@ -2562,12 +2562,12 @@
 4571,Gertie_Card,Gertie Card,6,20,,10,,,,,,,,4,,,,,{ bonus bFlee,10; skill "RG_CLOSECONFINE",1; },{},{}
 4572,Randel_Card,Randel Card,6,20,,10,,,,,,,,4,,,,,{ bonus bFlee,10; skill "CR_AUTOGUARD",3; },{},{}
 4573,Trentini_Card,Trentini Card,6,20,,10,,,,,,,,4,,,,,{ bonus bFlee,10; if(BaseJob==Job_Dancer) { bonus bMaxHPrate,10; bonus bMaxSPrate,5;} },{},{}
-4574,General_Daehyon_Card,General Daehyon Card,6,20,,10,,,,,,,,2,,,,,{ if((getiteminfo(getequipid(EQI_HAND_R),14) == 3) || (getiteminfo(getequipid(EQI_HAND_R),14) == 4)) { bonus bAtk,100; } },{},{}
-4575,Armed_Guard_Soheon_Card,Armed Guard Soheon Card,6,20,,10,,,,,,,,2,,,,,{ bonus bAtk,10; if(getiteminfo(getequipid(EQI_HAND_R),14) == 1) { if(getrefine()>=10) { bonus bAspd,1; } if(getrefine()>=14) { bonus bAspd,1; } } },{},{}
+4574,General_Daehyon_Card,General Daehyon Card,6,20,,10,,,,,,,,2,,,,,{ if((getiteminfo(getequipid(EQI_HAND_R),14) == 3) || (getiteminfo(getequipid(EQI_HAND_R),14) == 4)) { bonus bBaseAtk,100; } },{},{}
+4575,Armed_Guard_Soheon_Card,Armed Guard Soheon Card,6,20,,10,,,,,,,,2,,,,,{ bonus bBaseAtk,10; if(getiteminfo(getequipid(EQI_HAND_R),14) == 1) { if(getrefine()>=10) { bonus bAspd,1; } if(getrefine()>=14) { bonus bAspd,1; } } },{},{}
 4576,Gioia_Card,Gioia Card,6,20,,10,,,,,,,,4,,,,,{ bonus2 bMagicAtkEle,4,100; bonus2 bMagicAtkEle,8,100; bonus2 bSubEle,0,-30; bonus2 bSubEle,1,-30; bonus2 bSubEle,2,-30; bonus2 bSubEle,3,-30; bonus2 bSubEle,4,-30; bonus2 bSubEle,5,-30; bonus2 bSubEle,6,-30; bonus2 bSubEle,7,-30; bonus2 bSubEle,8,-30; bonus2 bSubEle,9,-30; },{},{}
 4577,Elvira_Card,Elvira Card,6,20,,10,,,,,,,,136,,,,,{ bonus2 bMagicAtkEle,4,20; bonus2 bMagicAtkEle,8,20; },{},{}
 4578,Angry_Student_Pyuriel_Card,Angry Student Pyuriel Card,6,20,,10,,,,,,,,2,,,,,{ bonus bCritAtkRate,30; bonus2 bSubRace,0,-10; bonus2 bSubRace,1,-10; bonus2 bSubRace,2,-10; bonus2 bSubRace,3,-10; bonus2 bSubRace,4,-10; bonus2 bSubRace,5,-10; bonus2 bSubRace,6,-10; bonus2 bSubRace,7,-10; bonus2 bSubRace,8,-10; bonus2 bSubRace,9,-10; },{},{}
-4579,Warrior_Lola_Card,Warrior Lola Card,6,20,,10,,,,,,,,2,,,,,{ if(getiteminfo(getequipid(EQI_HAND_R),14) == 8) { bonus bAtk,20; bonus bCritical,10; } bonus bAtk,getrefine(); bonus bCritical,getrefine(); },{},{}
+4579,Warrior_Lola_Card,Warrior Lola Card,6,20,,10,,,,,,,,2,,,,,{ if(getiteminfo(getequipid(EQI_HAND_R),14) == 8) { bonus bBaseAtk,20; bonus bCritical,10; } bonus bBaseAtk,getrefine(); bonus bCritical,getrefine(); },{},{}
 4580,Dark_Guardian_Kades_Card,Dark Guardian Kades Card,6,20,,10,,,,,,,,4,,,,,{ bonus2 bSubEle,1,50; bonus2 bSubEle,2,50; bonus2 bSubEle,3,50; bonus2 bSubEle,4,50; bonus2 bSubEle,7,50; bonus2 bSubEle,9,50; bonus2 bSubEle,6,-100; bonus2 bSubEle,8,-100; },{},{}
 4581,Rudo_Card,Rudo Card,6,20,,10,,,,,,,,64,,,,,{ /* TODO: { heal 0,-40; bonus_script "{ bonus bAgi,44; }",3,15,0; sc_start SC_SpeedUp1,3000,0; } */},{},{}
 4582,Bungisngis_Card,Bungisngis Card,6,20,,10,,,,,,,,769,,,,,{ bonus bMaxHPrate,(getrefine()/2); },{},{}
@@ -2576,7 +2576,7 @@
 4585,Mangkukulam_Card,Mangkukulam Card,6,20,,10,,,,,,,,16,,,,,{ bonus bMaxSPrate,10; bonus bHPGainValue,-666; },{},{}
 4586,Tikbalang_Card,Tikbalang Card,6,20,,10,,,,,,,,769,,,,,{ bonus bMatk,10; bonus2 bMagicAtkEle,4,5; },{},{}
 4587,Tiyanak_Card,Tiyanak Card,6,20,,10,,,,,,,,136,,,,,{ bonus2 bCriticalAddRace,2,12; bonus2 bCriticalAddRace,5,12; bonus2 bCriticalAddRace,7,12; },{},{}
-4588,Wakwak_Card,Wakwak Card,6,20,,10,,,,,,,,4,,,,,{ bonus bAtk,5*readparam(bStr)/10; },{},{}
+4588,Wakwak_Card,Wakwak Card,6,20,,10,,,,,,,,4,,,,,{ bonus bBaseAtk,5*readparam(bStr)/10; },{},{}
 4589,Jejeling_Card,Jejeling Card,6,20,,10,,,,,,,,4,,,,,{ bonus bMaxHP,200*readparam(bVit)/10; },{},{}
 4590,Bangungot_Card,Bangungot Card,6,20,,10,,,,,,,,16,,,,,{ bonus bInt,4; bonus5 bAutoSpellWhenHit,"NPC_WIDESLEEP",5,70,BF_MAGIC,0; },{},{}
 4591,Bakonawa_Card,Bakonawa Card,6,20,,10,,,,,,,,16,,,,,{ bonus bStr,4; bonus5 bAutoSpellWhenHit,"NPC_WIDEBLEEDING",5,70,BF_WEAPON,0; },{},{}
@@ -2591,12 +2591,12 @@
 4600,Lichtern_Yellow_Card,Lichtern Yellow Card,6,20,,10,,,,,,,,769,,,,,{ bonus bMatk,10; bonus2 bMagicAddEle,2,(getrefine()>=9)?10:5; },{},{}
 4601,Amdarais_Card,Amdarais Card,6,20,,10,,,,,,,,16,,,,,{ bonus bAtkRate,15; bonus bMatkRate,15; bonus2 bHPLossRate,666,4000; bonus2 bSPLossRate,66,4000; },{},{ heal -6666,-666; }
 4602,Realized_Amdarais_Card,Realized Amdarais Card,6,20,,10,,,,,,,,16,,,,,{ bonus bAtkRate,20; bonus bMatkRate,20; bonus2 bHPLossRate,666,6000; bonus2 bSPLossRate,66,6000; },{},{ heal -6666,-666; }
-4603,Corruption_Root_Card,Corruption Root Card,6,20,,10,,,,,,,,2,,,,,{ bonus bAtk,20; bonus5 bAutoSpellWhenHit,"NPC_WIDESTONE",1,70,BF_WEAPON,0; bonus5 bAutoSpellWhenHit,"NPC_WIDESLEEP",1,70,BF_WEAPON,0; bonus5 bAutoSpellWhenHit,"NPC_WIDECURSE",1,70,BF_WEAPON,0; },{},{}
-4604,Realized_Corruption_Root_Card,Realized Corruption Root Card,6,20,,10,,,,,,,,2,,,,,{ bonus bAtk,30; bonus5 bAutoSpellWhenHit,"NPC_WIDESTONE",2,70,BF_WEAPON,0; bonus5 bAutoSpellWhenHit,"NPC_WIDESLEEP",2,70,BF_WEAPON,0; bonus5 bAutoSpellWhenHit,"NPC_WIDECURSE",2,70,BF_WEAPON,0; },{},{}
+4603,Corruption_Root_Card,Corruption Root Card,6,20,,10,,,,,,,,2,,,,,{ bonus bBaseAtk,20; bonus5 bAutoSpellWhenHit,"NPC_WIDESTONE",1,70,BF_WEAPON,0; bonus5 bAutoSpellWhenHit,"NPC_WIDESLEEP",1,70,BF_WEAPON,0; bonus5 bAutoSpellWhenHit,"NPC_WIDECURSE",1,70,BF_WEAPON,0; },{},{}
+4604,Realized_Corruption_Root_Card,Realized Corruption Root Card,6,20,,10,,,,,,,,2,,,,,{ bonus bBaseAtk,30; bonus5 bAutoSpellWhenHit,"NPC_WIDESTONE",2,70,BF_WEAPON,0; bonus5 bAutoSpellWhenHit,"NPC_WIDESLEEP",2,70,BF_WEAPON,0; bonus5 bAutoSpellWhenHit,"NPC_WIDECURSE",2,70,BF_WEAPON,0; },{},{}
 4605,Agony_Of_Royal_Knight_Card,Agony Of Royal Knight Card,6,20,,10,,,,,,,,16,,,,,{ bonus bMaxHPrate,-44; bonus bHPGainValue,200+10*getrefine(); },{},{}
 4606,Grudge_of_Royal_Knight_Card,Grudge of Royal Knight Card,6,20,,10,,,,,,,,4,,,,,{ bonus bMaxSPrate,-44; bonus bSPGainValue,20+(getrefine()/2); },{},{ heal 0,-444; }
-4607,Faithful_Manager_Card,Faithful Manager Card,6,20,,10,,,,,,,,2,,,,,{ bonus bAtk,5; bonus bMatk,5; if(getiteminfo(getequipid(EQI_HAND_R),14) == 15) { if(getrefine()>=10) { bonus bAtk,20; bonus bMatk,20; } if(getrefine()>=14) { bonus bAtk,20; bonus bMatk,20; } } },{},{}
-4608,White_Knight_Card,White Knight Card,6,20,,10,,,,,,,,2,,,,,{ bonus bAtk,15; bonus2 bAddSize,Size_Medium,20; bonus2 bAddSize,Size_Large,20; },{},{}
+4607,Faithful_Manager_Card,Faithful Manager Card,6,20,,10,,,,,,,,2,,,,,{ bonus bBaseAtk,5; bonus bMatk,5; if(getiteminfo(getequipid(EQI_HAND_R),14) == 15) { if(getrefine()>=10) { bonus bBaseAtk,20; bonus bMatk,20; } if(getrefine()>=14) { bonus bBaseAtk,20; bonus bMatk,20; } } },{},{}
+4608,White_Knight_Card,White Knight Card,6,20,,10,,,,,,,,2,,,,,{ bonus bBaseAtk,15; bonus2 bAddSize,Size_Medium,20; bonus2 bAddSize,Size_Large,20; },{},{}
 4609,Khalitzburg_Knight_Card,Khalitzburg Knight Card,6,20,,10,,,,,,,,32,,,,,{ bonus bDef,20; bonus2 bSubSize,Size_Medium,25; bonus2 bSubSize,Size_Large,25; },{},{}
 
 // Armor Enchant System
@@ -2770,9 +2770,9 @@
 4870,SP25,SP+25,6,20,,10,,,,,,,,16,,,,,{ bonus bMaxSP,25; },{},{}
 4871,SP75,SP+75,6,20,,10,,,,,,,,16,,,,,{ bonus bMaxSP,75; },{},{}
 //
-4908,Essence_of_Evil_STR1,Essence of Evil STR1,6,20,,10,,,,,,,,16,,,,,{ bonus bStr,1; bonus bAtk,3; bonus bInt,-1;},{},{}
-4909,Essence_of_Evil_STR2,Essence of Evil STR2,6,20,,10,,,,,,,,16,,,,,{ bonus bStr,2; bonus bAtk,6; bonus bInt,-2;},{},{}
-4910,Essence_of_Evil_STR3,Essence of Evil STR3,6,20,,10,,,,,,,,16,,,,,{ bonus bStr,4; bonus bAtk,12; bonus bInt,-4;},{},{}
+4908,Essence_of_Evil_STR1,Essence of Evil STR1,6,20,,10,,,,,,,,16,,,,,{ bonus bStr,1; bonus bBaseAtk,3; bonus bInt,-1;},{},{}
+4909,Essence_of_Evil_STR2,Essence of Evil STR2,6,20,,10,,,,,,,,16,,,,,{ bonus bStr,2; bonus bBaseAtk,6; bonus bInt,-2;},{},{}
+4910,Essence_of_Evil_STR3,Essence of Evil STR3,6,20,,10,,,,,,,,16,,,,,{ bonus bStr,4; bonus bBaseAtk,12; bonus bInt,-4;},{},{}
 4911,Essence_of_Evil_INT1,Essence of Evil INT1,6,20,,10,,,,,,,,16,,,,,{ bonus bInt,1; bonus bMatk,3; bonus bStr,-1;},{},{}
 4912,Essence_of_Evil_INT2,Essence of Evil INT2,6,20,,10,,,,,,,,16,,,,,{ bonus bInt,2; bonus bMatk,6; bonus bStr,-2;},{},{}
 4913,Essence_of_Evil_INT3,Essence of Evil INT3,6,20,,10,,,,,,,,16,,,,,{ bonus bInt,4; bonus bMatk,12; bonus bStr,-4;},{},{}
@@ -7790,7 +7790,7 @@
 16023,Metal_Mace,Metal Mace,5,20,,0,80,,1,1,0x0004C5B3,63,2,2,3,1,1,8,{ bonus bUnbreakableWeapon,0; bonus bBaseAtk,(getrefine()*5); set .@i,((BaseLevel/10)>12)?12:(BaseLevel/10); if(.@i>2) bonus bBaseAtk,((.@i-2)*5); },{},{}
 16026,RWC_Memory_Mace,RWC Memory Mace,5,20,,800,100,,1,1,0x0004C5B2,63,2,2,3,1,1,8,{ bonus bUnbreakableWeapon,0; bonus bBaseAtk,(getrefine()/30)*30; if(getrefine()>=9){ set .@i,1; bonus3 bAutoSpellWhenHit,"BS_WEAPONPERFECT",1,10; } if(getrefine()>=6){ set .@rate,5*(.@i+1); bonus2 bAddRace,RC_Boss,5; bonus2 bAddRace,RC_NonBoss,5; } },{},{}
 16030,Pile_Bunker_S,Pile Bunker S,5,20,,3000,400,,1,,0x00000400,56,2,2,4,130,1,8,{ bonus bAspdRate,getrefine()/2; },{},{}
-16031,Pile_Bunker_P,Pile Bunker P,5,20,,4000,450,,1,,0x00000400,56,2,2,4,130,1,8,{ bonus bAtk,getrefine()*5; },{},{}
+16031,Pile_Bunker_P,Pile Bunker P,5,20,,4000,450,,1,,0x00000400,56,2,2,4,130,1,8,{ bonus bBaseAtk,getrefine()*5; },{},{}
 16032,Pile_Bunker_T,Pile Bunker T,5,20,,3500,400,,1,,0x00000400,56,2,2,4,130,1,8,{ bonus bUseSPrate,getrefine()*-1; },{},{}
 16033,Robots_Mechanical_Arm,Robot's Mechanical Arm,5,20,,3000,195,,1,,0x00000400,56,2,2,4,130,1,8,{ bonus bUnbreakableWeapon,1; bonus bCritical,20; },{},{}
 
@@ -8548,7 +8548,7 @@
 18759,Stretched_Nose_M,Wood Goblin's Nose,4,20,,200,,0,,0,0xFFFFFFFF,63,2,512,,50,0,737,{ bonus bUnbreakableHelm,0; },{},{}
 //
 18766,Improved_Helm_of_Angel,Improved Helm of Angel,4,10,,1600,,10,,1,0x7CCFDF80,63,2,256,,99,1,110,{ bonus bAgi,1; bonus bLuk,1; bonus bMDef,3; if (getrefine()>=7) { bonus bAgi,2; bonus bLuk,2; } if(getrefine()>=9) bonus bAspd,1; },{},{}
-18767,Improved_Helm_Of_Sun,Improved Hat of the Sun God,4,10,,2400,,4,,1,0x7CCFDF80,63,2,768,,99,1,138,{ bonus bStr,3; bonus bInt,2; bonus bAtk,10; bonus bMatk,10; if(getrefine()>=7){bonus bAtk,15;bonus bMatk,15;} if(getrefine()>=9){bonus bAtk,15;bonus bMatk,15;} },{},{}
+18767,Improved_Helm_Of_Sun,Improved Hat of the Sun God,4,10,,2400,,4,,1,0x7CCFDF80,63,2,768,,99,1,138,{ bonus bStr,3; bonus bInt,2; bonus bBaseAtk,10; bonus bMatk,10; if(getrefine()>=7){bonus bBaseAtk,15;bonus bMatk,15;} if(getrefine()>=9){bonus bBaseAtk,15;bonus bMatk,15;} },{},{}
 //
 18779,RWC_Champ_Crown_First_Place,RWC Champ Crown First Place,4,20,,500,,12,,,0xFFFFFFFF,63,2,256,,1,,902,{ bonus2 bResEff,Eff_Stun,10000; bonus2 bResEff,Eff_Curse,10000; bonus bUnbreakableHelm,0; bonus bAllStats,7; bonus bMdef,5; },{},{}
 18780,RWC_Champ_Crown_Second_Place,RWC Champ Crown Second Place,4,20,,500,,12,,,0xFFFFFFFF,63,2,256,,1,,903,{ bonus2 bResEff,Eff_Curse,10000; bonus bUnbreakableHelm,0; bonus bAllStats,7; bonus bMdef,5; },{},{}
@@ -8595,7 +8595,7 @@
 18879,Angry_Scorpion_Hat,Angry Scorpion Hat,4,10,,100,,5,,1,0xFFFFFFFF,63,2,256,,0,1,995,{ bonus bMdef,5; },{},{}
 18885,Jejecap,Jejecap,4,0,,100,,8,,0,0xFFFFFFFF,63,2,256,,70,1,1011,{ bonus bStr,2; bonus bInt,3; },{},{}
 18887,Aqua_Bunny_Band,Aqua Bunny Band,4,0,,100,,2,,1,0xFFFFFFFF,63,2,256,,0,1,1012,{ bonus bVit,3; bonus bMdef,5; },{},{}
-18936,Golden_Fish_In_Mouth,Golden Fish In Mouth,4,10,,10,,1,,0,0xFFFFFFFF,63,2,1,,1,0,1081,{ bonus bAllStats,2; bonus bAtk,10; bonus bMatk,10; bonus2 bExpAddRace,RC_Fish,2; bonus2 bSubRace,RC_Fish,2; },{},{}
+18936,Golden_Fish_In_Mouth,Golden Fish In Mouth,4,10,,10,,1,,0,0xFFFFFFFF,63,2,1,,1,0,1081,{ bonus bAllStats,2; bonus bBaseAtk,10; bonus bMatk,10; bonus2 bExpAddRace,RC_Fish,2; bonus2 bSubRace,RC_Fish,2; },{},{}
 // Costume System
 19500,T_Mr_Smile,T Mr Smile,4,0,,0,,0,,0,0xFFFFFFFF,63,2,6144,,0,0,65,{ bonus bStr,2; },{},{}
 19501,T_Spinx_Helm,T Spinx Helm,4,0,,0,,0,,1,0xFFFFFFFF,63,2,5120,,0,0,137,{},{},{}
@@ -8726,7 +8726,7 @@
 21003,Muramasa_,Muramasa,5,20,,1000,155,,1,2,0x00004082,63,2,34,4,48,1,3,{},{},{}
 21004,Alca_Bringer_,Alca Bringer,5,20,,3400,280,,2,2,0x00004082,63,2,34,3,100,1,3,{},{},{}
 21005,Metal_Two_Hand_Sword,Metal Two Hand Sword,5,20,,0,95,,1,1,0x00004082,63,2,34,3,1,1,3,{ bonus bBaseAtk,(getrefine()*6); bonus bMatk,(getrefine()*2); set .@i,((BaseLevel/10)>12)?12:(BaseLevel/10); if(.@i>2) bonus bBaseAtk,((.@i-2)*5); },{},{}
-21011,Gigantic_Blade,Gigantic Blade,3,10,,5000,300,,,,0xFFFFFFFF,56,2,2,4,130,1,3,{ bonus bUnbreakableWeapon,1; bonus bAspdRate,-5; if(readparam(bStr)<=110){ bonus bAtk,-250; } },{},{}
+21011,Gigantic_Blade,Gigantic Blade,3,10,,5000,300,,,,0xFFFFFFFF,56,2,2,4,130,1,3,{ bonus bUnbreakableWeapon,1; bonus bAspdRate,-5; if(readparam(bStr)<=110){ bonus bBaseAtk,-250; } },{},{}
 // New Items
 22014,Enhanced_Variant_Shoes,Enhanced Variant Shoes,3,10,,500,,13,,1,0x7CCFDF80,63,2,64,,85,1,,{ bonus bMaxHPrate,12; bonus bMaxSPrate,12; bonus bDef,getrefine(); bonus bMdef,getrefine(); },{},{}
 22043,AGI_Complement,AGI Complement,4,10,,350,,25,,,0x00000400,56,2,64,,100,1,,{ bonus bAspdRate,5+(getrefine()/4); },{},{}
@@ -8761,7 +8761,7 @@
 
 // Shadow Equip
 24018,Shadow_Physical_Earring,Shadow Physical Earring,12,10,,0,,0,,0,0xFFFFFFFF,63,2,3145728,,1,1,0,{ bonus bAspdRate,(getrefine()>=7)?2:1; },{},{}
-24019,Shadow_Physical_Weapon,Shadow Physical Weapon,12,10,,0,,0,,0,0xFFFFFFFF,63,2,131072,,1,1,0,{ bonus bAtk,10; if(getrefine()>=7) { bonus bAtkRate,1; } },{},{}
+24019,Shadow_Physical_Weapon,Shadow Physical Weapon,12,10,,0,,0,,0,0xFFFFFFFF,63,2,131072,,1,1,0,{ bonus bBaseAtk,10; if(getrefine()>=7) { bonus bAtkRate,1; } },{},{}
 24020,Shadow_Physical_Pendant,Shadow Physical Pendant,12,10,,0,,0,,0,0xFFFFFFFF,63,2,3145728,,1,1,0,{ bonus bMaxHP,100; if(getrefine()>=7) { bonus bMaxHPrate,1; } },{},{}
 24021,Shadow_Magical_Earring,Shadow Magical Earring,12,10,,0,,0,,0,0xFFFFFFFF,63,2,3145728,,1,1,0,{ bonus bVariableCastrate,-(getrefine()>=7)?2:1; },{},{}
 24022,Shadow_Magical_Weapon,Shadow Magical Weapon,12,10,,0,,0,,0,0xFFFFFFFF,63,2,131072,,1,1,0,{ bonus bMatk,10; if(getrefine()>=7) { bonus bMatkRate,1; } },{},{}
@@ -8772,8 +8772,8 @@
 24028,Hard_Shadow_Armor,Hard Shadow Armor,12,10,,0,,0,,0,0xFFFFFFFF,63,2,65536,,1,1,0,{ bonus bMaxHP,50; if(getrefine()>=7) { bonus bMaxHPrate,1; } },{},{}
 24029,Ancient_Shadow_Armor,Ancient Shadow Armor,12,10,,0,,0,,0,0xFFFFFFFF,63,2,65536,,1,1,0,{ bonus bHit,(getrefine()>=7)?20:10; },{},{}
 24030,Critital_Shadow_Armor,Critital Shadow Armor,12,10,,0,,0,,0,0xFFFFFFFF,63,2,65536,,1,1,0,{ bonus bCritical,(getrefine()>=7)?10:5; },{},{}
-24031,King_Bird_Shadow_Weapon,King Bird Shadow Weapon,12,10,,0,,0,,0,0xFFFFFFFF,63,2,131072,,1,1,0,{ bonus bAtk,10; if(getrefine()>=7) { bonus bLongAtkRate,1; } },{},{}
-24032,Critical_Hit_Shadow_Weapon,Critical Hit Shadow Weapon,12,10,,0,,0,,0,0xFFFFFFFF,63,2,131072,,1,1,0,{ bonus bAtk,10; if(getrefine()>=7) { bonus bCritAtkRate,1; } },{},{}
+24031,King_Bird_Shadow_Weapon,King Bird Shadow Weapon,12,10,,0,,0,,0,0xFFFFFFFF,63,2,131072,,1,1,0,{ bonus bBaseAtk,10; if(getrefine()>=7) { bonus bLongAtkRate,1; } },{},{}
+24032,Critical_Hit_Shadow_Weapon,Critical Hit Shadow Weapon,12,10,,0,,0,,0,0xFFFFFFFF,63,2,131072,,1,1,0,{ bonus bBaseAtk,10; if(getrefine()>=7) { bonus bCritAtkRate,1; } },{},{}
 24034,Lucky_Shadow_Weapon,Lucky Shadow Weapon,12,10,,0,,0,,0,0xFFFFFFFF,63,2,131072,,1,1,0,{ bonus bLuk,1; if(getrefine()>=7) { bonus bLuk,1; } if(getrefine()>=9) { bonus bLuk,1; } },{},{}
 24035,Power_Shadow_Earring,Power Shadow Earring,12,10,,0,,0,,0,0xFFFFFFFF,63,2,3145728,,1,1,0,{ bonus bStr,1; if(getrefine()>=7) { bonus bStr,1; } if(getrefine()>=9) { bonus bStr,1; } },{},{}
 24036,Ect_Shadow_Pendant,Ect Shadow Pendant,12,10,,0,,0,,0,0xFFFFFFFF,63,2,3145728,,1,1,0,{ bonus bInt,1; if(getrefine()>=7) { bonus bInt,1; } if(getrefine()>=9) { bonus bInt,1; } },{},{}
@@ -8781,7 +8781,7 @@
 24038,Vital_Shadow_Shoes,Vital Shadow Shoes,12,10,,0,,0,,0,0xFFFFFFFF,63,2,524288,,1,1,0,{ bonus bVit,1; if(getrefine()>=7) { bonus bVit,1; } if(getrefine()>=9) { bonus bVit,1; } },{},{}
 24039,Athletic_Shadow_Shield,Athletic Shadow Shield,12,10,,0,,0,,0,0xFFFFFFFF,63,2,262144,,1,1,0,{ bonus bAgi,1; if(getrefine()>=7) { bonus bAgi,1; } if(getrefine()>=9) { bonus bAgi,1; } },{},{}
 24040,Lucky_Shadow_Armor,Lucky Shadow Armor,12,10,,0,,0,,0,0xFFFFFFFF,63,2,65536,,1,1,0,{ bonus bLuk,1; bonus bCritical,(getrefine()/2); },{},{}
-24041,Power_Shadow_Pendant,Power Shadow Pendant,12,10,,0,,0,,0,0xFFFFFFFF,63,2,3145728,,1,1,0,{ bonus bStr,1; bonus bAtk,getrefine(); },{},{}
+24041,Power_Shadow_Pendant,Power Shadow Pendant,12,10,,0,,0,,0,0xFFFFFFFF,63,2,3145728,,1,1,0,{ bonus bStr,1; bonus bBaseAtk,getrefine(); },{},{}
 24042,Ect_Shadow_Earring,Ect Shadow Earring,12,10,,0,,0,,0,0xFFFFFFFF,63,2,3145728,,1,1,0,{ bonus bInt,1; bonus bMatk,getrefine(); },{},{}
 24043,Dexter_Travelers_Shadow_Weapon,Dexter Travelers Shadow Weapon,12,10,,0,,0,,0,0xFFFFFFFF,63,2,131072,,1,1,0,{ bonus bDex,1; bonus bHit,getrefine(); },{},{}
 24044,Vital_Shadow_Shield,Vital Shadow Shield,12,10,,0,,0,,0,0xFFFFFFFF,63,2,262144,,1,1,0,{ bonus bVit,1; bonus bDef,getrefine(); },{},{}

npc/jobs/2-1/blacksmith.txt

@@ -7,7 +7,7 @@
 //= Optimized and further edited by kobra_k88.
 //= Further bugfixed and tested by Lupus
 //===== Current Version: =====================================
-//= 2.8
+//= 2.9
 //===== Compatible With: =====================================
 //= rAthena SVN
 //===== Description: =========================================
@@ -40,6 +40,7 @@
 //= 2.6a Typo fix [Yommy]
 //= 2.7 Added Quest Log commands. [Kisuka]
 //= 2.8 Removed the need for use of 'goto.' [L0ne_W0lf]
+//= 2.9 Updated with some extra conditions. [Euphy]
 //==============================================================
 
 ein_in01,18,28,4	script	Guildsman#BLS	731,{
@@ -72,20 +73,29 @@ ein_in01,18,28,4	script	Guildsman#BLS	731,{
 	mes "and passion of our souls into";
 	mes "our craft. Our skills of melting metal into new weapons";
 	mes "and tools is truly a form of art!";
+	if (BaseClass >= Job_Thief) close;	// Custom expanded class check.
 	next;
+
+	// Third class check - precedes other BaseClass dialogue.
+	if (Class >= Job_Rune_Knight && Class <= Job_Baby_Mechanic2) {
+		mes "[Altiregen]";
+		mes "You... look like a stranger. But somehow it seems that you're related to our guild. Haha~";
+		mes "Am I right?";
+		close;
+	}
+
 	if (BaseClass == Job_Novice) {
+		mes "[Altiregen]";
 		if (Sex == 0) {
-			mes "[Altiregen]";
 			mes "Oh~";
 			mes "what a very";
 			mes "pretty lady!";
-			mes "Are you interested in";
-			mes "becoming a Blacksmith?";
-			next;
-			mes "[Altiregen]";
-			mes "First, you must become a Merchant before you can become a Blacksmith. Go to the city of Alberta to learn the Merchant trade.";
-			close;
 		}
+		mes "Are you interested in";
+		mes "becoming a Blacksmith?";
+		next;
+		mes "[Altiregen]";
+		mes "First, you must become a Merchant before you can become a Blacksmith. Go to the city of Alberta to learn the Merchant trade.";
 		close;
 	}
 	else if (BaseClass == Job_Swordman) {
@@ -249,6 +259,11 @@ ein_in01,18,28,4	script	Guildsman#BLS	731,{
 		}
 		else if (BSMITH_Q == 17 && countitem(1005) > 0 && JobLevel > 39) {
 			mes "[Altiregen]";
+			if (ismounting()) {
+				mes "You are on a riding pet, so you cannot change your job.";
+				mes "Please unequip your riding pet and try again!";
+				close;
+			}
 			mes "Excellent, I can tell by the twinkle in your eye that you were successful. I can now bestow upon you the gift of the smithing, the art of the Blacksmith.";
 			if (checkquest(2015) != -1) {
 				changequest 2015,2016;

npc/pre-re/quests/quests_nameless.txt

@@ -15,3 +15,4 @@
 //============================================================ 
 
 izlude_in,110,64,3	duplicate(Dorian_izlude)	Dorian	878,2,2
+izlude_in,113,66,0	duplicate(StrangeMachine_izlude)	Strange Machine	111

npc/quests/quests_ayothaya.txt

@@ -3,7 +3,7 @@
 //===== By ===================================================
 //= Fredzilla, MasterOfMuppets
 //===== Version ==============================================
-//= 2.5
+//= 2.6
 //===== Compatible With ======================================
 //= rAthena SVN
 //===== Description ==========================================
@@ -31,6 +31,7 @@
 //= 2.3 Replaced effect numerics with constants. [Samuray22]
 //= 2.4 Updated RE/Pre-RE EXP. [Euphy]
 //= 2.5 Added questlog support. [Euphy]
+//= 2.6 Added Renewal quest items. [Euphy]
 //============================================================
 
 // Ayothaya Ring Quest :: ayo_ring
@@ -1329,6 +1330,15 @@ ayothaya,83,132,0	script	Dusit#thai	843,{
 }
 
 ayo_in01,181,193,4	script	Shaman#thai	840,{
+
+	// For both parts of the quest:
+	// - Pre-Renewal requires Needle Packet and Spool.
+	// - Renewal requires Fabric and Nine Tails.
+	if (checkre(0))
+		setarray .@items[0],7213,7217; //Needle_Pouch, Spool
+	else
+		setarray .@items[0],1059,1022; //Transparent_Cloth, Fox_Tail
+
 	if (ayodunquest == 1) {
 		mes "[Boonthom]";
 		mes "You...!";
@@ -1443,8 +1453,8 @@ ayo_in01,181,193,4	script	Shaman#thai	840,{
 			mes "containing this holy power if you wish. In order to make it, I will need some materials.";
 			next;
 			mes "[Boonthom]";
-			mes "^3366991 Needle Packet^000000,";
-			mes "^3366991 Spool^000000,";
+			mes "^3366991 "+getitemname(.@items[0])+"^000000,";
+			mes "^3366991 "+getitemname(.@items[1])+"^000000,";
 			mes "^3366991 Solid Husk^000000 and";
 			mes "^3366991 Holy Water^000000...";
 			mes "That's all I need.";
@@ -1467,7 +1477,7 @@ ayo_in01,181,193,4	script	Shaman#thai	840,{
 		mes "............";
 		close;
 	} else if (ayodunquest == 2) {
-		if (countitem(7213) > 0 && countitem(7217) > 0 && countitem(7190) > 0 && countitem(523) > 0) {
+		if (countitem(.@items[0]) > 0 && countitem(.@items[1]) > 0 && countitem(7190) > 0 && countitem(523) > 0) {
 			mes "[Boonthom]";
 			mes "Excellent!";
 			mes "Now you have brought";
@@ -1488,8 +1498,8 @@ ayo_in01,181,193,4	script	Shaman#thai	840,{
 			mes "Here you go.";
 			mes "Please take these holy threads.";
 			mes "With this, you will be able to enter the ruins with less worry.";
-			delitem 7213,1; //Needle_Pouch
-			delitem 7217,1; //Spool
+			delitem .@items[0],1;
+			delitem .@items[1],1;
 			delitem 7190,1; //Solid_Peeling
 			delitem 523,1; //Holy_Water
 			set ayodunquest,3;
@@ -1510,8 +1520,8 @@ ayo_in01,181,193,4	script	Shaman#thai	840,{
 		mes "carefully this time.";
 		next;
 		mes "[Boonthom]";
-		mes "^3366991 Needle Packet^000000,";
-		mes "^3366991 Spool^000000,";
+		mes "^3366991 "+getitemname(.@items[0])+"^000000,";
+		mes "^3366991 "+getitemname(.@items[1])+"^000000,";
 		mes "^3366991 Solid Husk^000000 and";
 		mes "^3366991 Holy Water^000000.";
 		next;
@@ -1519,7 +1529,7 @@ ayo_in01,181,193,4	script	Shaman#thai	840,{
 		mes "See you later.";
 		close;
 	} else if (ayodunquest == 3) {
-		if (countitem(7213) > 0 && countitem(7217) > 0 && countitem(7190) > 0 && countitem(523) > 0) {
+		if (countitem(.@items[0]) > 0 && countitem(.@items[1]) > 0 && countitem(7190) > 0 && countitem(523) > 0) {
 			mes "[Boonthom]";
 			mes "Excellent! Now you have brought everything I need, let me make the thing for you as I promised...";
 			next;
@@ -1537,8 +1547,8 @@ ayo_in01,181,193,4	script	Shaman#thai	840,{
 			mes "Here you go.";
 			mes "Please take these holy threads.";
 			mes "With this, you will be able to enter the ruins with less worry.";
-			delitem 7213,1; //Needle_Pouch
-			delitem 7217,1; //Spool
+			delitem .@items[0],1;
+			delitem .@items[1],1;
 			delitem 7190,1; //Solid_Peeling
 			delitem 523,1; //Holy_Water
 			getitem 7285,1; //Thread_Skein
@@ -1551,8 +1561,8 @@ ayo_in01,181,193,4	script	Shaman#thai	840,{
 		mes "If you lose the holy threads, don't worry. I can make some more for you. Just gather the following items.";
 		next;
 		mes "[Boonthom]";
-		mes "^3366991 Needle Packet^000000,";
-		mes "^3366991 Spool^000000,";
+		mes "^3366991 "+getitemname(.@items[0])+"^000000,";
+		mes "^3366991 "+getitemname(.@items[1])+"^000000,";
 		mes "^3366991 Solid Husk^000000 and";
 		mes "^3366991 Holy Water^000000.";
 		next;
@@ -1601,8 +1611,8 @@ ayo_in01,181,193,4	script	Shaman#thai	840,{
 		mes "[Boonthom]";
 		mes "^3366992 Holy Water^000000,";
 		mes "^3366991 Yggdrasil Leaf^000000,";
-		mes "^3366992 Needle Packet^000000 and";
-		mes "^3366992 Spool^000000.";
+		mes "^3366992 "+getitemname(.@items[0])+"^000000 and";
+		mes "^3366992 "+getitemname(.@items[0])+"^000000.";
 		set ayodunquest,10;
 		changequest 12037,12038;
 		next;
@@ -1612,7 +1622,7 @@ ayo_in01,181,193,4	script	Shaman#thai	840,{
 		mes "gathered everything.";
 		close;
 	} else if (ayodunquest == 10) {
-		if (countitem(523) > 1 && countitem(610) > 0 && countitem(7213) > 1 && countitem(7217) > 1) {
+		if (countitem(523) > 1 && countitem(610) > 0 && countitem(.@items[0]) > 1 && countitem(.@items[1]) > 1) {
 			mes "[Boonthom]";
 			mes "Hmm~";
 			mes "You've brought";
@@ -1634,8 +1644,8 @@ ayo_in01,181,193,4	script	Shaman#thai	840,{
 			mes "Here you go.";
 			mes "Please take these holy threads.";
 			mes "With this, you will be able to enter the ruins with less worry.";
-			delitem 7213,2; //Needle_Pouch
-			delitem 7217,2; //Spool
+			delitem .@items[0],2;
+			delitem .@items[1],2;
 			delitem 610,1; //Leaf_Of_Yggdrasil
 			delitem 523,2; //Holy_Water
 			set ayodunquest,11;
@@ -1657,8 +1667,8 @@ ayo_in01,181,193,4	script	Shaman#thai	840,{
 		mes "[Boonthom]";
 		mes "^3366992 Holy Water^000000,";
 		mes "^3366991 Yggdrasil Leaf^000000,";
-		mes "^3366992 Needle Packet^000000 and";
-		mes "^3366992 Spool^000000.";
+		mes "^3366992 "+getitemname(.@items[0])+"^000000 and";
+		mes "^3366992 "+getitemname(.@items[1])+"^000000.";
 		next;
 		mes "[Boonthom]";
 		mes "Return to me";
@@ -1677,7 +1687,7 @@ ayo_in01,181,193,4	script	Shaman#thai	840,{
 			mes "to you to defend yourself";
 			mes "from monster attacks, okay?";
 			close;
-		} else if (countitem(523) > 1 && countitem(610) > 0 && countitem(7213) > 1 && countitem(7217) > 1 && countitem(7287) == 0) {
+		} else if (countitem(523) > 1 && countitem(610) > 0 && countitem(.@items[0]) > 1 && countitem(.@items[1]) > 1 && countitem(7287) == 0) {
 			mes "[Boonthom]";
 			mes "Ooooohmmmmm...";
 			next;
@@ -1692,8 +1702,8 @@ ayo_in01,181,193,4	script	Shaman#thai	840,{
 			mes "Here you go.";
 			mes "Please take these holy threads.";
 			mes "With this, you will be able to enter the ruins with less worry.";
-			delitem 7213,2; //Needle_Pouch
-			delitem 7217,2; //Spool
+			delitem .@items[0],2;
+			delitem .@items[1],2;
 			delitem 610,1; //Leaf_Of_Yggdrasil
 			delitem 523,2; //Holy_Water
 			getitem 7287,1; //Thread_Skein_
@@ -1709,8 +1719,8 @@ ayo_in01,181,193,4	script	Shaman#thai	840,{
 		mes "[Boonthom]";
 		mes "^3366992 Holy Water^000000,";
 		mes "^3366991 Yggdrasil Leaf^000000,";
-		mes "^3366992 Needle Packet^000000 and";
-		mes "^3366992 Spool^000000.";
+		mes "^3366992 "+getitemname(.@items[0])+"^000000 and";
+		mes "^3366992 "+getitemname(.@items[1])+"^000000.";
 		close;
 	} else if (ayodunquest == 12) {
 		mes "[Boonthom]";
@@ -1748,7 +1758,7 @@ ayo_in01,181,193,4	script	Shaman#thai	840,{
 			mes "expeditions, brave";
 			mes "adventurer~";
 			close;
-		} else if (countitem(523) > 1 && countitem(610) > 0 && countitem(7213) > 1 && countitem(7217) > 1 && countitem(7287) == 0) {
+		} else if (countitem(523) > 1 && countitem(610) > 0 && countitem(.@items[0]) > 1 && countitem(.@items[1]) > 1 && countitem(7287) == 0) {
 			mes "[Boonthom]";
 			mes "Lost the";
 			mes "holy threads";
@@ -1771,8 +1781,8 @@ ayo_in01,181,193,4	script	Shaman#thai	840,{
 			mes "Here you go.";
 			mes "Please take these holy threads.";
 			mes "With this, you will be able to enter the ruins with less worry.";
-			delitem 7213,2; //Needle_Pouch
-			delitem 7217,2; //Spool
+			delitem .@items[0],2;
+			delitem .@items[1],2;
 			delitem 610,1; //Leaf_Of_Yggdrasil
 			delitem 523,2; //Holy_Water
 			getitem 7287,1; //Thread_Skein_
@@ -1788,8 +1798,8 @@ ayo_in01,181,193,4	script	Shaman#thai	840,{
 		mes "[Boonthom]";
 		mes "^3366992 Holy Water^000000,";
 		mes "^3366991 Yggdrasil Leaf^000000,";
-		mes "^3366992 Needle Packet^000000 and";
-		mes "^3366992 Spool^000000.";
+		mes "^3366992 "+getitemname(.@items[0])+"^000000 and";
+		mes "^3366992 "+getitemname(.@items[1])+"^000000.";
 		close;
 	}
 	mes "[Boonthom]";

npc/quests/quests_nameless.txt

@@ -4284,7 +4284,7 @@ OnTouch:
 	end;
 }
 
-izlude_in,113,66,0	script	Strange Machine	111,{
+-	script	::StrangeMachine_izlude	-1,{
 	if (checkweight(907,200) == 0) {
 		mes "[Dorian]";
 		mes "Ugh, just like a member";

npc/quests/quests_niflheim.txt

@@ -650,7 +650,7 @@ niflheim,153,215,3	script	Feylin	794,{
 			mes "more that you expect...";
 			next;
 			if (select("I'm willing to do this.:I don't think I can do this.") == 1) {
-				if (BaseLevel > 79 && BaseLevel < 100) {
+				if (BaseLevel > 79) {
 					mes "[Feylin]";
 					mes "Alright, but you must promise";
 					mes "me that you will not let other";

npc/re/quests/quests_nameless.txt

@@ -15,3 +15,4 @@
 //============================================================ 
 
 izlude_in,57,92,3	duplicate(Dorian_izlude)	Dorian	878,2,2
+izlude_in,58,90,1	duplicate(StrangeMachine_izlude)	Strange Machine	111	// unconfirmed

sql-files/item_db_re.sql

@@ -2023,7 +2023,7 @@ REPLACE INTO `item_db_re` VALUES (2991,'Pendant_of_Chaos','Pendant of Chaos','4'
 REPLACE INTO `item_db_re` VALUES (2992,'Pendant_of_Maelstrom','Pendant of Maelstrom','4','20','','100','','0','','0','0xFFFFFFFF','63','2','136','','130','','','bonus bAtkRate,6; bonus bMatkRate,6; bonus bAllStats,1; bonus5 bAutoSpellWhenHit,"SC_MAELSTROM",1,100,BF_MAGIC,0;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (2995,'DEX_Complement','DEX Complement','4','20','','100','','0','','1','0x00000400','56','2','136','','100','0','0','bonus bUseSPrate,-10; bonus bDelayrate,-10; bonus bVariableCastrate,-10; bonus2 bSkillVariableCast,"NC_AXEBOOMERANG",-2000; if(getequipid(EQI_HAND_R) == 1368) { bonus bAtkRate,100; }',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (2996,'Reinforced_Parts_Gun_Barrel','Reinforced Parts - Gun Barrel','4','10','','500','','','','','0xFFFFFFFF','63','2','136','','100','','','bonus bAtkRate,4; bonus bHit,10; bonus2 bSkillAtk,"NC_BOOSTKNUCKLE",30;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (2997,'RWC_Gold_Brooch','RWC Gold Brooch','4','10','','200','','0','','1','0xFFFFFFFF','63','2','136','','0','1','16','bonus bAtk,25; bonus bMatk,20;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (2997,'RWC_Gold_Brooch','RWC Gold Brooch','4','10','','200','','0','','1','0xFFFFFFFF','63','2','136','','0','1','16','bonus bBaseAtk,25; bonus bMatk,20;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (2999,'RWC_Brooch','RWC Brooch','4','10','','200','','0','','1','0xFFFFFFFF','63','2','136','','0','1','16','bonus bMaxHP,300; bonus bMaxSP,30;',NULL,NULL);
 
 # Cards
@@ -2593,12 +2593,12 @@ REPLACE INTO `item_db_re` VALUES (4570,'Flamel_Card','Flamel Card','6','20','','
 REPLACE INTO `item_db_re` VALUES (4571,'Gertie_Card','Gertie Card','6','20','','10','','','','','','','','4','','','','','bonus bFlee,10; skill "RG_CLOSECONFINE",1;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (4572,'Randel_Card','Randel Card','6','20','','10','','','','','','','','4','','','','','bonus bFlee,10; skill "CR_AUTOGUARD",3;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (4573,'Trentini_Card','Trentini Card','6','20','','10','','','','','','','','4','','','','','bonus bFlee,10; if(BaseJob==Job_Dancer) { bonus bMaxHPrate,10; bonus bMaxSPrate,5;}',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (4574,'General_Daehyon_Card','General Daehyon Card','6','20','','10','','','','','','','','2','','','','','if((getiteminfo(getequipid(EQI_HAND_R),14) == 3) || (getiteminfo(getequipid(EQI_HAND_R),14) == 4)) { bonus bAtk,100; }',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (4575,'Armed_Guard_Soheon_Card','Armed Guard Soheon Card','6','20','','10','','','','','','','','2','','','','','bonus bAtk,10; if(getiteminfo(getequipid(EQI_HAND_R),14) == 1) { if(getrefine()>=10) { bonus bAspd,1; } if(getrefine()>=14) { bonus bAspd,1; } }',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (4574,'General_Daehyon_Card','General Daehyon Card','6','20','','10','','','','','','','','2','','','','','if((getiteminfo(getequipid(EQI_HAND_R),14) == 3) || (getiteminfo(getequipid(EQI_HAND_R),14) == 4)) { bonus bBaseAtk,100; }',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (4575,'Armed_Guard_Soheon_Card','Armed Guard Soheon Card','6','20','','10','','','','','','','','2','','','','','bonus bBaseAtk,10; if(getiteminfo(getequipid(EQI_HAND_R),14) == 1) { if(getrefine()>=10) { bonus bAspd,1; } if(getrefine()>=14) { bonus bAspd,1; } }',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (4576,'Gioia_Card','Gioia Card','6','20','','10','','','','','','','','4','','','','','bonus2 bMagicAtkEle,4,100; bonus2 bMagicAtkEle,8,100; bonus2 bSubEle,0,-30; bonus2 bSubEle,1,-30; bonus2 bSubEle,2,-30; bonus2 bSubEle,3,-30; bonus2 bSubEle,4,-30; bonus2 bSubEle,5,-30; bonus2 bSubEle,6,-30; bonus2 bSubEle,7,-30; bonus2 bSubEle,8,-30; bonus2 bSubEle,9,-30;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (4577,'Elvira_Card','Elvira Card','6','20','','10','','','','','','','','136','','','','','bonus2 bMagicAtkEle,4,20; bonus2 bMagicAtkEle,8,20;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (4578,'Angry_Student_Pyuriel_Card','Angry Student Pyuriel Card','6','20','','10','','','','','','','','2','','','','','bonus bCritAtkRate,30; bonus2 bSubRace,0,-10; bonus2 bSubRace,1,-10; bonus2 bSubRace,2,-10; bonus2 bSubRace,3,-10; bonus2 bSubRace,4,-10; bonus2 bSubRace,5,-10; bonus2 bSubRace,6,-10; bonus2 bSubRace,7,-10; bonus2 bSubRace,8,-10; bonus2 bSubRace,9,-10;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (4579,'Warrior_Lola_Card','Warrior Lola Card','6','20','','10','','','','','','','','2','','','','','if(getiteminfo(getequipid(EQI_HAND_R),14) == 8) { bonus bAtk,20; bonus bCritical,10; } bonus bAtk,getrefine(); bonus bCritical,getrefine();',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (4579,'Warrior_Lola_Card','Warrior Lola Card','6','20','','10','','','','','','','','2','','','','','if(getiteminfo(getequipid(EQI_HAND_R),14) == 8) { bonus bBaseAtk,20; bonus bCritical,10; } bonus bBaseAtk,getrefine(); bonus bCritical,getrefine();',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (4580,'Dark_Guardian_Kades_Card','Dark Guardian Kades Card','6','20','','10','','','','','','','','4','','','','','bonus2 bSubEle,1,50; bonus2 bSubEle,2,50; bonus2 bSubEle,3,50; bonus2 bSubEle,4,50; bonus2 bSubEle,7,50; bonus2 bSubEle,9,50; bonus2 bSubEle,6,-100; bonus2 bSubEle,8,-100;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (4581,'Rudo_Card','Rudo Card','6','20','','10','','','','','','','','64','','','','','/* TODO: { heal 0,-40; bonus_script "{ bonus bAgi,44; }",3,15,0; sc_start SC_SpeedUp1,3000,0; } */',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (4582,'Bungisngis_Card','Bungisngis Card','6','20','','10','','','','','','','','769','','','','','bonus bMaxHPrate,(getrefine()/2);',NULL,NULL);
@@ -2607,7 +2607,7 @@ REPLACE INTO `item_db_re` VALUES (4584,'Manananggal_Card','Manananggal Card','6'
 REPLACE INTO `item_db_re` VALUES (4585,'Mangkukulam_Card','Mangkukulam Card','6','20','','10','','','','','','','','16','','','','','bonus bMaxSPrate,10; bonus bHPGainValue,-666;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (4586,'Tikbalang_Card','Tikbalang Card','6','20','','10','','','','','','','','769','','','','','bonus bMatk,10; bonus2 bMagicAtkEle,4,5;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (4587,'Tiyanak_Card','Tiyanak Card','6','20','','10','','','','','','','','136','','','','','bonus2 bCriticalAddRace,2,12; bonus2 bCriticalAddRace,5,12; bonus2 bCriticalAddRace,7,12;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (4588,'Wakwak_Card','Wakwak Card','6','20','','10','','','','','','','','4','','','','','bonus bAtk,5*readparam(bStr)/10;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (4588,'Wakwak_Card','Wakwak Card','6','20','','10','','','','','','','','4','','','','','bonus bBaseAtk,5*readparam(bStr)/10;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (4589,'Jejeling_Card','Jejeling Card','6','20','','10','','','','','','','','4','','','','','bonus bMaxHP,200*readparam(bVit)/10;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (4590,'Bangungot_Card','Bangungot Card','6','20','','10','','','','','','','','16','','','','','bonus bInt,4; bonus5 bAutoSpellWhenHit,"NPC_WIDESLEEP",5,70,BF_MAGIC,0;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (4591,'Bakonawa_Card','Bakonawa Card','6','20','','10','','','','','','','','16','','','','','bonus bStr,4; bonus5 bAutoSpellWhenHit,"NPC_WIDEBLEEDING",5,70,BF_WEAPON,0;',NULL,NULL);
@@ -2622,12 +2622,12 @@ REPLACE INTO `item_db_re` VALUES (4599,'Lichtern_Red_Card','Lichtern Red Card','
 REPLACE INTO `item_db_re` VALUES (4600,'Lichtern_Yellow_Card','Lichtern Yellow Card','6','20','','10','','','','','','','','769','','','','','bonus bMatk,10; bonus2 bMagicAddEle,2,(getrefine()>=9)?10:5;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (4601,'Amdarais_Card','Amdarais Card','6','20','','10','','','','','','','','16','','','','','bonus bAtkRate,15; bonus bMatkRate,15; bonus2 bHPLossRate,666,4000; bonus2 bSPLossRate,66,4000;',NULL,'heal -6666,-666;');
 REPLACE INTO `item_db_re` VALUES (4602,'Realized_Amdarais_Card','Realized Amdarais Card','6','20','','10','','','','','','','','16','','','','','bonus bAtkRate,20; bonus bMatkRate,20; bonus2 bHPLossRate,666,6000; bonus2 bSPLossRate,66,6000;',NULL,'heal -6666,-666;');
-REPLACE INTO `item_db_re` VALUES (4603,'Corruption_Root_Card','Corruption Root Card','6','20','','10','','','','','','','','2','','','','','bonus bAtk,20; bonus5 bAutoSpellWhenHit,"NPC_WIDESTONE",1,70,BF_WEAPON,0; bonus5 bAutoSpellWhenHit,"NPC_WIDESLEEP",1,70,BF_WEAPON,0; bonus5 bAutoSpellWhenHit,"NPC_WIDECURSE",1,70,BF_WEAPON,0;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (4604,'Realized_Corruption_Root_Card','Realized Corruption Root Card','6','20','','10','','','','','','','','2','','','','','bonus bAtk,30; bonus5 bAutoSpellWhenHit,"NPC_WIDESTONE",2,70,BF_WEAPON,0; bonus5 bAutoSpellWhenHit,"NPC_WIDESLEEP",2,70,BF_WEAPON,0; bonus5 bAutoSpellWhenHit,"NPC_WIDECURSE",2,70,BF_WEAPON,0;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (4603,'Corruption_Root_Card','Corruption Root Card','6','20','','10','','','','','','','','2','','','','','bonus bBaseAtk,20; bonus5 bAutoSpellWhenHit,"NPC_WIDESTONE",1,70,BF_WEAPON,0; bonus5 bAutoSpellWhenHit,"NPC_WIDESLEEP",1,70,BF_WEAPON,0; bonus5 bAutoSpellWhenHit,"NPC_WIDECURSE",1,70,BF_WEAPON,0;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (4604,'Realized_Corruption_Root_Card','Realized Corruption Root Card','6','20','','10','','','','','','','','2','','','','','bonus bBaseAtk,30; bonus5 bAutoSpellWhenHit,"NPC_WIDESTONE",2,70,BF_WEAPON,0; bonus5 bAutoSpellWhenHit,"NPC_WIDESLEEP",2,70,BF_WEAPON,0; bonus5 bAutoSpellWhenHit,"NPC_WIDECURSE",2,70,BF_WEAPON,0;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (4605,'Agony_Of_Royal_Knight_Card','Agony Of Royal Knight Card','6','20','','10','','','','','','','','16','','','','','bonus bMaxHPrate,-44; bonus bHPGainValue,200+10*getrefine();',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (4606,'Grudge_of_Royal_Knight_Card','Grudge of Royal Knight Card','6','20','','10','','','','','','','','4','','','','','bonus bMaxSPrate,-44; bonus bSPGainValue,20+(getrefine()/2);',NULL,'heal 0,-444;');
-REPLACE INTO `item_db_re` VALUES (4607,'Faithful_Manager_Card','Faithful Manager Card','6','20','','10','','','','','','','','2','','','','','bonus bAtk,5; bonus bMatk,5; if(getiteminfo(getequipid(EQI_HAND_R),14) == 15) { if(getrefine()>=10) { bonus bAtk,20; bonus bMatk,20; } if(getrefine()>=14) { bonus bAtk,20; bonus bMatk,20; } }',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (4608,'White_Knight_Card','White Knight Card','6','20','','10','','','','','','','','2','','','','','bonus bAtk,15; bonus2 bAddSize,Size_Medium,20; bonus2 bAddSize,Size_Large,20;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (4607,'Faithful_Manager_Card','Faithful Manager Card','6','20','','10','','','','','','','','2','','','','','bonus bBaseAtk,5; bonus bMatk,5; if(getiteminfo(getequipid(EQI_HAND_R),14) == 15) { if(getrefine()>=10) { bonus bBaseAtk,20; bonus bMatk,20; } if(getrefine()>=14) { bonus bBaseAtk,20; bonus bMatk,20; } }',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (4608,'White_Knight_Card','White Knight Card','6','20','','10','','','','','','','','2','','','','','bonus bBaseAtk,15; bonus2 bAddSize,Size_Medium,20; bonus2 bAddSize,Size_Large,20;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (4609,'Khalitzburg_Knight_Card','Khalitzburg Knight Card','6','20','','10','','','','','','','','32','','','','','bonus bDef,20; bonus2 bSubSize,Size_Medium,25; bonus2 bSubSize,Size_Large,25;',NULL,NULL);
 
 # Armor Enchant System
@@ -2801,9 +2801,9 @@ REPLACE INTO `item_db_re` VALUES (4868,'MHP4','MHP+4%','6','20','','10','','',''
 REPLACE INTO `item_db_re` VALUES (4870,'SP25','SP+25','6','20','','10','','','','','','','','16','','','','','bonus bMaxSP,25;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (4871,'SP75','SP+75','6','20','','10','','','','','','','','16','','','','','bonus bMaxSP,75;',NULL,NULL);
 #
-REPLACE INTO `item_db_re` VALUES (4908,'Essence_of_Evil_STR1','Essence of Evil STR1','6','20','','10','','','','','','','','16','','','','','bonus bStr,1; bonus bAtk,3; bonus bInt,-1;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (4909,'Essence_of_Evil_STR2','Essence of Evil STR2','6','20','','10','','','','','','','','16','','','','','bonus bStr,2; bonus bAtk,6; bonus bInt,-2;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (4910,'Essence_of_Evil_STR3','Essence of Evil STR3','6','20','','10','','','','','','','','16','','','','','bonus bStr,4; bonus bAtk,12; bonus bInt,-4;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (4908,'Essence_of_Evil_STR1','Essence of Evil STR1','6','20','','10','','','','','','','','16','','','','','bonus bStr,1; bonus bBaseAtk,3; bonus bInt,-1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (4909,'Essence_of_Evil_STR2','Essence of Evil STR2','6','20','','10','','','','','','','','16','','','','','bonus bStr,2; bonus bBaseAtk,6; bonus bInt,-2;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (4910,'Essence_of_Evil_STR3','Essence of Evil STR3','6','20','','10','','','','','','','','16','','','','','bonus bStr,4; bonus bBaseAtk,12; bonus bInt,-4;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (4911,'Essence_of_Evil_INT1','Essence of Evil INT1','6','20','','10','','','','','','','','16','','','','','bonus bInt,1; bonus bMatk,3; bonus bStr,-1;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (4912,'Essence_of_Evil_INT2','Essence of Evil INT2','6','20','','10','','','','','','','','16','','','','','bonus bInt,2; bonus bMatk,6; bonus bStr,-2;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (4913,'Essence_of_Evil_INT3','Essence of Evil INT3','6','20','','10','','','','','','','','16','','','','','bonus bInt,4; bonus bMatk,12; bonus bStr,-4;',NULL,NULL);
@@ -7821,7 +7821,7 @@ REPLACE INTO `item_db_re` VALUES (16022,'Nemesis_','Nemesis','5','20','','900','
 REPLACE INTO `item_db_re` VALUES (16023,'Metal_Mace','Metal Mace','5','20','','0','80','','1','1','0x0004C5B3','63','2','2','3','1','1','8','bonus bUnbreakableWeapon,0; bonus bBaseAtk,(getrefine()*5); set .@i,((BaseLevel/10)>12)?12:(BaseLevel/10); if(.@i>2) bonus bBaseAtk,((.@i-2)*5);',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (16026,'RWC_Memory_Mace','RWC Memory Mace','5','20','','800','100','','1','1','0x0004C5B2','63','2','2','3','1','1','8','bonus bUnbreakableWeapon,0; bonus bBaseAtk,(getrefine()/30)*30; if(getrefine()>=9){ set .@i,1; bonus3 bAutoSpellWhenHit,"BS_WEAPONPERFECT",1,10; } if(getrefine()>=6){ set .@rate,5*(.@i+1); bonus2 bAddRace,RC_Boss,5; bonus2 bAddRace,RC_NonBoss,5; }',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (16030,'Pile_Bunker_S','Pile Bunker S','5','20','','3000','400','','1','','0x00000400','56','2','2','4','130','1','8','bonus bAspdRate,getrefine()/2;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (16031,'Pile_Bunker_P','Pile Bunker P','5','20','','4000','450','','1','','0x00000400','56','2','2','4','130','1','8','bonus bAtk,getrefine()*5;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (16031,'Pile_Bunker_P','Pile Bunker P','5','20','','4000','450','','1','','0x00000400','56','2','2','4','130','1','8','bonus bBaseAtk,getrefine()*5;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (16032,'Pile_Bunker_T','Pile Bunker T','5','20','','3500','400','','1','','0x00000400','56','2','2','4','130','1','8','bonus bUseSPrate,getrefine()*-1;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (16033,'Robots_Mechanical_Arm','Robot\'s Mechanical Arm','5','20','','3000','195','','1','','0x00000400','56','2','2','4','130','1','8','bonus bUnbreakableWeapon,1; bonus bCritical,20;',NULL,NULL);
 
@@ -8579,7 +8579,7 @@ REPLACE INTO `item_db_re` VALUES (18758,'Hat_Of_Scrat','Hat Of Scrat','4','20','
 REPLACE INTO `item_db_re` VALUES (18759,'Stretched_Nose_M','Wood Goblin\'s Nose','4','20','','200','','0','','0','0xFFFFFFFF','63','2','512','','50','0','737','bonus bUnbreakableHelm,0;',NULL,NULL);
 #
 REPLACE INTO `item_db_re` VALUES (18766,'Improved_Helm_of_Angel','Improved Helm of Angel','4','10','','1600','','10','','1','0x7CCFDF80','63','2','256','','99','1','110','bonus bAgi,1; bonus bLuk,1; bonus bMDef,3; if (getrefine()>=7) { bonus bAgi,2; bonus bLuk,2; } if(getrefine()>=9) bonus bAspd,1;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (18767,'Improved_Helm_Of_Sun','Improved Hat of the Sun God','4','10','','2400','','4','','1','0x7CCFDF80','63','2','768','','99','1','138','bonus bStr,3; bonus bInt,2; bonus bAtk,10; bonus bMatk,10; if(getrefine()>=7){bonus bAtk,15;bonus bMatk,15;} if(getrefine()>=9){bonus bAtk,15;bonus bMatk,15;}',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18767,'Improved_Helm_Of_Sun','Improved Hat of the Sun God','4','10','','2400','','4','','1','0x7CCFDF80','63','2','768','','99','1','138','bonus bStr,3; bonus bInt,2; bonus bBaseAtk,10; bonus bMatk,10; if(getrefine()>=7){bonus bBaseAtk,15;bonus bMatk,15;} if(getrefine()>=9){bonus bBaseAtk,15;bonus bMatk,15;}',NULL,NULL);
 #
 REPLACE INTO `item_db_re` VALUES (18779,'RWC_Champ_Crown_First_Place','RWC Champ Crown First Place','4','20','','500','','12','','','0xFFFFFFFF','63','2','256','','1','','902','bonus2 bResEff,Eff_Stun,10000; bonus2 bResEff,Eff_Curse,10000; bonus bUnbreakableHelm,0; bonus bAllStats,7; bonus bMdef,5;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (18780,'RWC_Champ_Crown_Second_Place','RWC Champ Crown Second Place','4','20','','500','','12','','','0xFFFFFFFF','63','2','256','','1','','903','bonus2 bResEff,Eff_Curse,10000; bonus bUnbreakableHelm,0; bonus bAllStats,7; bonus bMdef,5;',NULL,NULL);
@@ -8626,7 +8626,7 @@ REPLACE INTO `item_db_re` VALUES (18873,'Sweet_Valentine_Out','Sweet Valentine O
 REPLACE INTO `item_db_re` VALUES (18879,'Angry_Scorpion_Hat','Angry Scorpion Hat','4','10','','100','','5','','1','0xFFFFFFFF','63','2','256','','0','1','995','bonus bMdef,5;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (18885,'Jejecap','Jejecap','4','0','','100','','8','','0','0xFFFFFFFF','63','2','256','','70','1','1011','bonus bStr,2; bonus bInt,3;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (18887,'Aqua_Bunny_Band','Aqua Bunny Band','4','0','','100','','2','','1','0xFFFFFFFF','63','2','256','','0','1','1012','bonus bVit,3; bonus bMdef,5;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (18936,'Golden_Fish_In_Mouth','Golden Fish In Mouth','4','10','','10','','1','','0','0xFFFFFFFF','63','2','1','','1','0','1081','bonus bAllStats,2; bonus bAtk,10; bonus bMatk,10; bonus2 bExpAddRace,RC_Fish,2; bonus2 bSubRace,RC_Fish,2;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18936,'Golden_Fish_In_Mouth','Golden Fish In Mouth','4','10','','10','','1','','0','0xFFFFFFFF','63','2','1','','1','0','1081','bonus bAllStats,2; bonus bBaseAtk,10; bonus bMatk,10; bonus2 bExpAddRace,RC_Fish,2; bonus2 bSubRace,RC_Fish,2;',NULL,NULL);
 # Costume System
 REPLACE INTO `item_db_re` VALUES (19500,'T_Mr_Smile','T Mr Smile','4','0','','0','','0','','0','0xFFFFFFFF','63','2','6144','','0','0','65','bonus bStr,2;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (19501,'T_Spinx_Helm','T Spinx Helm','4','0','','0','','0','','1','0xFFFFFFFF','63','2','5120','','0','0','137',NULL,NULL,NULL);
@@ -8757,7 +8757,7 @@ REPLACE INTO `item_db_re` VALUES (21002,'Velum_Katzbalger','Vellum Katzbalger','
 REPLACE INTO `item_db_re` VALUES (21003,'Muramasa_','Muramasa','5','20','','1000','155','','1','2','0x00004082','63','2','34','4','48','1','3',NULL,NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (21004,'Alca_Bringer_','Alca Bringer','5','20','','3400','280','','2','2','0x00004082','63','2','34','3','100','1','3',NULL,NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (21005,'Metal_Two_Hand_Sword','Metal Two Hand Sword','5','20','','0','95','','1','1','0x00004082','63','2','34','3','1','1','3','bonus bBaseAtk,(getrefine()*6); bonus bMatk,(getrefine()*2); set .@i,((BaseLevel/10)>12)?12:(BaseLevel/10); if(.@i>2) bonus bBaseAtk,((.@i-2)*5);',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (21011,'Gigantic_Blade','Gigantic Blade','3','10','','5000','300','','','','0xFFFFFFFF','56','2','2','4','130','1','3','bonus bUnbreakableWeapon,1; bonus bAspdRate,-5; if(readparam(bStr)<=110){ bonus bAtk,-250; }',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (21011,'Gigantic_Blade','Gigantic Blade','3','10','','5000','300','','','','0xFFFFFFFF','56','2','2','4','130','1','3','bonus bUnbreakableWeapon,1; bonus bAspdRate,-5; if(readparam(bStr)<=110){ bonus bBaseAtk,-250; }',NULL,NULL);
 # New Items
 REPLACE INTO `item_db_re` VALUES (22014,'Enhanced_Variant_Shoes','Enhanced Variant Shoes','3','10','','500','','13','','1','0x7CCFDF80','63','2','64','','85','1','','bonus bMaxHPrate,12; bonus bMaxSPrate,12; bonus bDef,getrefine(); bonus bMdef,getrefine();',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (22043,'AGI_Complement','AGI Complement','4','10','','350','','25','','','0x00000400','56','2','64','','100','1','','bonus bAspdRate,5+(getrefine()/4);',NULL,NULL);
@@ -8792,7 +8792,7 @@ REPLACE INTO `item_db_re` VALUES (22676,'Hangul_Day_Event_Box','Hangul Day Event
 
 # Shadow Equip
 REPLACE INTO `item_db_re` VALUES (24018,'Shadow_Physical_Earring','Shadow Physical Earring','12','10','','0','','0','','0','0xFFFFFFFF','63','2','3145728','','1','1','0','bonus bAspdRate,(getrefine()>=7)?2:1;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (24019,'Shadow_Physical_Weapon','Shadow Physical Weapon','12','10','','0','','0','','0','0xFFFFFFFF','63','2','131072','','1','1','0','bonus bAtk,10; if(getrefine()>=7) { bonus bAtkRate,1; }',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (24019,'Shadow_Physical_Weapon','Shadow Physical Weapon','12','10','','0','','0','','0','0xFFFFFFFF','63','2','131072','','1','1','0','bonus bBaseAtk,10; if(getrefine()>=7) { bonus bAtkRate,1; }',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (24020,'Shadow_Physical_Pendant','Shadow Physical Pendant','12','10','','0','','0','','0','0xFFFFFFFF','63','2','3145728','','1','1','0','bonus bMaxHP,100; if(getrefine()>=7) { bonus bMaxHPrate,1; }',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (24021,'Shadow_Magical_Earring','Shadow Magical Earring','12','10','','0','','0','','0','0xFFFFFFFF','63','2','3145728','','1','1','0','bonus bVariableCastrate,-(getrefine()>=7)?2:1;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (24022,'Shadow_Magical_Weapon','Shadow Magical Weapon','12','10','','0','','0','','0','0xFFFFFFFF','63','2','131072','','1','1','0','bonus bMatk,10; if(getrefine()>=7) { bonus bMatkRate,1; }',NULL,NULL);
@@ -8803,8 +8803,8 @@ REPLACE INTO `item_db_re` VALUES (24027,'Immune_Shadow_Armor','Immune Shadow Arm
 REPLACE INTO `item_db_re` VALUES (24028,'Hard_Shadow_Armor','Hard Shadow Armor','12','10','','0','','0','','0','0xFFFFFFFF','63','2','65536','','1','1','0','bonus bMaxHP,50; if(getrefine()>=7) { bonus bMaxHPrate,1; }',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (24029,'Ancient_Shadow_Armor','Ancient Shadow Armor','12','10','','0','','0','','0','0xFFFFFFFF','63','2','65536','','1','1','0','bonus bHit,(getrefine()>=7)?20:10;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (24030,'Critital_Shadow_Armor','Critital Shadow Armor','12','10','','0','','0','','0','0xFFFFFFFF','63','2','65536','','1','1','0','bonus bCritical,(getrefine()>=7)?10:5;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (24031,'King_Bird_Shadow_Weapon','King Bird Shadow Weapon','12','10','','0','','0','','0','0xFFFFFFFF','63','2','131072','','1','1','0','bonus bAtk,10; if(getrefine()>=7) { bonus bLongAtkRate,1; }',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (24032,'Critical_Hit_Shadow_Weapon','Critical Hit Shadow Weapon','12','10','','0','','0','','0','0xFFFFFFFF','63','2','131072','','1','1','0','bonus bAtk,10; if(getrefine()>=7) { bonus bCritAtkRate,1; }',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (24031,'King_Bird_Shadow_Weapon','King Bird Shadow Weapon','12','10','','0','','0','','0','0xFFFFFFFF','63','2','131072','','1','1','0','bonus bBaseAtk,10; if(getrefine()>=7) { bonus bLongAtkRate,1; }',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (24032,'Critical_Hit_Shadow_Weapon','Critical Hit Shadow Weapon','12','10','','0','','0','','0','0xFFFFFFFF','63','2','131072','','1','1','0','bonus bBaseAtk,10; if(getrefine()>=7) { bonus bCritAtkRate,1; }',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (24034,'Lucky_Shadow_Weapon','Lucky Shadow Weapon','12','10','','0','','0','','0','0xFFFFFFFF','63','2','131072','','1','1','0','bonus bLuk,1; if(getrefine()>=7) { bonus bLuk,1; } if(getrefine()>=9) { bonus bLuk,1; }',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (24035,'Power_Shadow_Earring','Power Shadow Earring','12','10','','0','','0','','0','0xFFFFFFFF','63','2','3145728','','1','1','0','bonus bStr,1; if(getrefine()>=7) { bonus bStr,1; } if(getrefine()>=9) { bonus bStr,1; }',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (24036,'Ect_Shadow_Pendant','Ect Shadow Pendant','12','10','','0','','0','','0','0xFFFFFFFF','63','2','3145728','','1','1','0','bonus bInt,1; if(getrefine()>=7) { bonus bInt,1; } if(getrefine()>=9) { bonus bInt,1; }',NULL,NULL);
@@ -8812,7 +8812,7 @@ REPLACE INTO `item_db_re` VALUES (24037,'Dexter_travelers_Shadow_Armor','Dexter
 REPLACE INTO `item_db_re` VALUES (24038,'Vital_Shadow_Shoes','Vital Shadow Shoes','12','10','','0','','0','','0','0xFFFFFFFF','63','2','524288','','1','1','0','bonus bVit,1; if(getrefine()>=7) { bonus bVit,1; } if(getrefine()>=9) { bonus bVit,1; }',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (24039,'Athletic_Shadow_Shield','Athletic Shadow Shield','12','10','','0','','0','','0','0xFFFFFFFF','63','2','262144','','1','1','0','bonus bAgi,1; if(getrefine()>=7) { bonus bAgi,1; } if(getrefine()>=9) { bonus bAgi,1; }',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (24040,'Lucky_Shadow_Armor','Lucky Shadow Armor','12','10','','0','','0','','0','0xFFFFFFFF','63','2','65536','','1','1','0','bonus bLuk,1; bonus bCritical,(getrefine()/2);',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (24041,'Power_Shadow_Pendant','Power Shadow Pendant','12','10','','0','','0','','0','0xFFFFFFFF','63','2','3145728','','1','1','0','bonus bStr,1; bonus bAtk,getrefine();',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (24041,'Power_Shadow_Pendant','Power Shadow Pendant','12','10','','0','','0','','0','0xFFFFFFFF','63','2','3145728','','1','1','0','bonus bStr,1; bonus bBaseAtk,getrefine();',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (24042,'Ect_Shadow_Earring','Ect Shadow Earring','12','10','','0','','0','','0','0xFFFFFFFF','63','2','3145728','','1','1','0','bonus bInt,1; bonus bMatk,getrefine();',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (24043,'Dexter_Travelers_Shadow_Weapon','Dexter Travelers Shadow Weapon','12','10','','0','','0','','0','0xFFFFFFFF','63','2','131072','','1','1','0','bonus bDex,1; bonus bHit,getrefine();',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (24044,'Vital_Shadow_Shield','Vital Shadow Shield','12','10','','0','','0','','0','0xFFFFFFFF','63','2','262144','','1','1','0','bonus bVit,1; bonus bDef,getrefine();',NULL,NULL);