Browse Source

Corrected script for some item #12 (#7399)

Thanks to @Atemo
idk-whoami 2 years ago
parent
commit
8d536e7ffe

+ 975 - 0
db/re/item_combos.yml

@@ -29392,3 +29392,978 @@ Body:
       bonus2 bMagicAtkEle,Ele_Water,15;
       bonus2 bMagicAtkEle,Ele_Water,15;
       bonus bDelayrate,7;
       bonus bDelayrate,7;
       bonus bMaxSPrate,15;
       bonus bMaxSPrate,15;
+  - Combos:
+      - Combo:
+          - aegis_490272   # 490272
+          - Goddess_of_Abundance   # 311073
+    Script: |
+      bonus bMdef,50;
+      bonus2 bSubRace,RC_DemiHuman,3;
+      bonus2 bSubRace,RC_Angel,3;
+  - Combos:
+      - Combo:
+          - DivineGrace_of_Kings   # 310760
+          - aegis_700069   # 700069
+    Script: |
+      bonus bAspdRate,15;
+      bonus2 bSubRace,RC_Player_Human,40;
+      skill "PA_GOSPEL",1;
+  - Combos:
+      - Combo:
+          - Yggdrasil_Ring   # 2993
+          - Yggdrasil_Hat   # 18881
+    Script: |
+      bonus2 bSkillHeal,"AL_HEAL",5;
+      bonus2 bSkillHeal,"PR_SANCTUARY",5;
+      bonus2 bSkillHeal,"AM_POTIONPITCHER",5;
+      bonus2 bSkillHeal,"AB_HIGHNESSHEAL",5;
+      bonus2 bSkillHeal,"AB_CHEAL",5;
+      bonus2 bSubEle,Ele_All,3;
+  - Combos:
+      - Combo:
+          - 2017RTCRobe   # 15207
+          - 2017RTCRING   # 28516
+    Script: |
+      .@r = getequiprefinerycnt(EQI_ARMOR);
+      bonus bHPrecovRate,12*(.@r/3);
+      bonus bSPrecovRate,8*(.@r/3);
+  - Combos:
+      - Combo:
+          - 2017RTCShoes   # 22139
+          - 2017RTCRING   # 28516
+    Script: |
+      .@r = getequiprefinerycnt(EQI_SHOES);
+      bonus bMaxHPrate,2*(.@r/4);
+      bonus bMaxSPrate,.@r/4;
+  - Combos:
+      - Combo:
+          - 2017RTCRobe   # 15207
+          - 2017RTCShoes   # 22139
+          - 2017RTCRING   # 28516
+    Script: |
+      bonus bAllStats,(getequiprefinerycnt(EQI_ARMOR)+getequiprefinerycnt(EQI_SHOES));
+      bonus bIgnoreDefRace,RC_All;
+      bonus bIgnoreMDefRace,RC_All;
+  - Combos:
+      - Combo:
+          - Garm_Card   # 4324
+          - lunar_eclipse_Armor_   # 15374
+    Script: |
+      .@r = getequiprefinerycnt(EQI_ARMOR);
+      bonus2 bResEff,Eff_Freeze,10000;
+      bonus2 bAddEffWhenHit,Eff_Freeze,2000;
+      bonus2 bAddEle,Ele_Water,5*.@r;
+  - Combos:
+      - Combo:
+          - aegis_300400   # 300400
+          - lunar_eclipse_Armor_   # 15374
+    Script: |
+      .@r = getequiprefinerycnt(EQI_ARMOR);
+      bonus2 bResEff,Eff_Freeze,10000;
+      bonus2 bAddEffWhenHit,Eff_Freeze,1000;
+      bonus2 bAddEle,Ele_Water,2*.@r;
+  - Combos:
+      - Combo:
+          - Loard_Circlet   # 5007
+          - Gossip_Raven   # 18913
+    Script: |
+      bonus2 bExpAddClass,Class_All,5;
+  - Combos:
+      - Combo:
+          - aegis_490284   # 490284
+          - S_Circlet_Of_Time_RA   # 19484
+    Script: |
+      .@r = getequiprefinerycnt(EQI_HEAD_TOP);
+      bonus bBaseAtk,80;
+      bonus2 bSkillAtk,"WH_GALESTORM",5*(.@r/2);
+      bonus2 bSkillAtk,"RA_ARROWSTORM",10*(.@r/3);
+      bonus2 bSkillAtk,"SN_SHARPSHOOTING",10*(.@r/3);
+  - Combos:
+      - Combo:
+          - aegis_490284   # 490284
+          - S_Circlet_Of_Time_RA   # 19484
+          - Time_Jewely_Dex_2   # 29685
+      - Combo:
+          - aegis_490284   # 490284
+          - S_Circlet_Of_Time_RA   # 19484
+          - Time_Jewely_Dex_3   # 29686
+    Script: |
+      bonus bFixedCast,-300;
+  - Combos:
+      - Combo:
+          - aegis_490284   # 490284
+          - S_Circlet_Of_Time_RA   # 19484
+          - Time_Jewely_Luk_2   # 29688
+      - Combo:
+          - aegis_490284   # 490284
+          - S_Circlet_Of_Time_RA   # 19484
+          - Time_Jewely_Luk_3   # 29689
+    Script: |
+      bonus bCritAtkRate,10;
+      bonus2 bSkillAtk,"WH_CRESCIVE_BOLT",10;
+  - Combos:
+      - Combo:
+          - aegis_490281   # 490281
+          - S_Circlet_Of_Time_NC   # 19476
+    Script: |
+      .@r = getequiprefinerycnt(EQI_HEAD_TOP);
+      bonus bPAtk,.@r/2;
+      bonus bBaseAtk,2*(.@r/2);
+      bonus2 bSkillAtk,"NC_VULCANARM",12*(.@r/3);
+      bonus2 bSkillAtk,"NC_ARMSCANNON",12*(.@r/3);
+      if (.@r >= 12)
+         bonus bFixedCast,-500;
+  - Combos:
+      - Combo:
+          - aegis_490269   # 490269
+          - S_Circlet_Of_Time_AB   # 19480
+    Script: |
+      .@r = getequiprefinerycnt(EQI_HEAD_TOP);
+      bonus bMatk,80;
+      bonus2 bSkillAtk,"CD_FRAMEN",5*(.@r/2);
+      bonus2 bSkillAtk,"AB_ADORAMUS",10*(.@r/3);
+      bonus2 bSkillAtk,"2038 AB_JUDEX",10*(.@r/3);
+  - Combos:
+      - Combo:
+          - aegis_490269   # 490269
+          - S_Circlet_Of_Time_AB   # 19480
+          - Time_Jewely_Int_2   # 29682
+      - Combo:
+          - aegis_490269   # 490269
+          - S_Circlet_Of_Time_AB   # 19480
+          - Time_Jewely_Int_3   # 29683
+    Script: |
+      bonus bFixedCast,-300;
+  - Combos:
+      - Combo:
+          - aegis_490269   # 490269
+          - S_Circlet_Of_Time_AB   # 19480
+          - Time_Jewely_Agi_2   # 29676
+      - Combo:
+          - aegis_490269   # 490269
+          - S_Circlet_Of_Time_AB   # 19480
+          - Time_Jewely_Agi_3   # 29677
+    Script: |
+      bonus bDelayRate,-8;
+  - Combos:
+      - Combo:
+          - aegis_490238   # 490238
+          - S_Circlet_Of_Time_GC   # 19478
+    Script: |
+      .@r = getequiprefinerycnt(EQI_HEAD_TOP);
+      bonus2 bSkillAtk,"SHC_IMPACT_CRATER",4*(.@r/2);
+      bonus2 bSkillAtk,"SHC_DANCING_KNIFE",4*(.@r/2);
+      bonus2 bSkillAtk,"GC_ROLLINGCUTTER",10*(.@r/3);
+      bonus2 bSkillAtk,"GC_COUNTERSLASH",10*(.@r/3);
+  - Combos:
+      - Combo:
+          - Twin_Dragonic_Ring   # 490219
+          - S_Circlet_Of_Time_RK   # 19474
+    Script: |
+      bonus bVariableCastrate,-10;
+      bonus bDelayRate,-5;
+      bonus2 bHPDrainRate,30,3;
+      bonus2 bSkillAtk,"RK_DRAGONBREATH",BaseLevel/12;
+      bonus2 bSkillAtk,"RK_DRAGONBREATH_WATER",BaseLevel/12;
+  - Combos:
+      - Combo:
+          - WM_Job_Pick   # 490211
+          - S_Circlet_Of_Time_WM   # 19485
+    Script: |
+      .@r = getequiprefinerycnt(EQI_HEAD_TOP);
+      bonus bMatk,20*(.@r/2);
+      bonus2 bMagicAddRace,RC_All,7*(.@r/3);
+  - Combos:
+      - Combo:
+          - Palace_Ring   # 490208
+          - Two_Hand_Spear_170   # 21018
+    Script: |
+      .@r = getequiprefinerycnt(EQI_HAND_R);
+      bonus2 bSkillCooldown,"RK_IGNITIONBREAK",-1500;
+      bonus bShortAtkRate,3*(.@r/2);
+  - Combos:
+      - Combo:
+          - Palace_Ring   # 490208
+          - Katar_170   # 28010
+    Script: |
+      .@r = getequiprefinerycnt(EQI_HAND_R);
+      bonus2 bSkillCooldown,"GC_DARKCROW",-8000;
+      bonus bShortAtkRate,3*(.@r/2);
+  - Combos:
+      - Combo:
+          - Palace_Ring   # 490208
+          - Staff_170   # 2027
+    Script: |
+      .@r = getequiprefinerycnt(EQI_HAND_R);
+      bonus2 bSkillAtk,"WL_TETRAVORTEX",30;
+      bonus2 bMagicAddRace,RC_All,4*(.@r/2);
+  - Combos:
+      - Combo:
+          - Palace_Ring   # 490208
+          - As_Ragged_Golem_Card   # 31026
+    Script: |
+      bonus2 bAddRace,RC_All,10;
+      bonus2 bMagicAddRace,RC_All,10;
+      autobonus "{ bonus bBaseAtk,200; }",30,10000,BF_WEAPON;
+      autobonus "{ bonus bMatk,200; }",30,10000,BF_MAGIC;
+  - Combos:
+      - Combo:
+          - Record_Acher2_TW   # 490198
+          - Old_Camo_RabbitHood   # 18984
+    Script: |
+      bonus bLongAtkRate,15;
+      bonus2 bSkillAtk,"RA_AIMEDBOLT",30;
+  - Combos:
+      - Combo:
+          - Record_Acher2_TW   # 490198
+          - Old_Minstrel_Song_Hat   # 18976
+      - Combo:
+          - Record_Acher2_TW   # 490198
+          - Old_Dying_Swan   # 18981
+    Script: |
+      bonus bLongAtkRate,15;
+      bonus2 bSkillAtk,"WM_SEVERE_RAINSTORM",30;
+  - Combos:
+      - Combo:
+          - Record_Acher2_TW   # 490198
+          - Record_Acher_TW   # 490095
+    Script: |
+      bonus2 bAddRace,RC_All,10;
+      bonus2 bMagicAddRace,RC_All,10;
+  - Combos:
+      - Combo:
+          - Record_Acher2_TW   # 490198
+          - B_Shecil_Card   # 4367
+    Script: |
+      bonus2 bMagicAddClass,Class_All,35;
+  - Combos:
+      - Combo:
+          - Record_Acher2_TW   # 490198
+          - Clown_Card   # 4560
+      - Combo:
+          - Record_Acher2_TW   # 490198
+          - Gypsy_Card   # 4566
+    Script: |
+      skill "RA_UNLIMIT",3;
+  - Combos:
+      - Combo:
+          - Record_Acher_TW   # 490095
+          - RingOfThought_TW   # 32245
+    Script: |
+      bonus2 bAddRace2,RC2_BioLab,20;
+      bonus2 bMagicAddRace2,RC2_BioLab,20;
+  - Combos:
+      - Combo:
+          - Record_Acher_TW   # 490095
+          - Subject_Cape_TW   # 480024
+    Script: |
+      if (getequiprefinerycnt(EQI_GARMENT) >= 10) {
+         if (eaclass()&EAJL_THIRD && BaseJob == Job_Hunter) {
+            bonus bLongAtkRate,15;
+            bonus bDelayRate,-5;
+            bonus2 bSkillAtk,"RA_AIMEDBOLT",30;
+         }
+         if ((eaclass()&EAJL_THIRD && BaseJob == Job_Bard) || (eaclass()&EAJL_THIRD && BaseJob == Job_Dancer)) {
+            bonus2 bMagicAddRace,RC_All,10;
+            bonus2 bSkillCooldown,"WM_METALICSOUND",-2000;
+            bonus2 bSkillAtk,"WM_METALICSOUND",80;
+         }
+      }
+  - Combos:
+      - Combo:
+          - Subject_Cape_TW   # 480024
+          - Old_Rune_Circlet   # 18971
+    Script: |
+      .@r = getequiprefinerycnt(EQI_GARMENT);
+      bonus2 bSkillAtk,"RK_WINDCUTTER",20*(.@r/2);
+      if (.@r >= 12)
+         autobonus3 "{ bonus bShortWeaponDamageReturn,10; }",1000,10000,"RK_DEATHBOUND";
+  - Combos:
+      - Combo:
+          - Subject_Cape_TW   # 480024
+          - Old_Protect_Of_Crown   # 18983
+    Script: |
+      .@r = getequiprefinerycnt(EQI_GARMENT);
+      bonus2 bSkillAtk,"LG_EXEEDBREAK",15*(.@r/2);
+      if (.@r >= 12)
+         bonus2 bSkillCooldown,"LG_KINGS_GRACE",-15000;
+  - Combos:
+      - Combo:
+          - Subject_Cape_TW   # 480024
+          - Old_Mitra   # 18972
+    Script: |
+      .@r = getequiprefinerycnt(EQI_GARMENT);
+      bonus bLongAtkDef,2*(.@r/2);
+      if (.@r >= 12)
+         bonus2 bSubRace,RC_All,15;
+  - Combos:
+      - Combo:
+          - Subject_Cape_TW   # 480024
+          - Old_Blazing_Soul   # 18979
+    Script: |
+      .@r = getequiprefinerycnt(EQI_GARMENT);
+      bonus bLongAtkDef,2*(.@r/2);
+      if (.@r >= 12)
+         bonus bBaseAtk,30;
+  - Combos:
+      - Combo:
+          - Subject_Cape_TW   # 480024
+          - Old_Magic_Stone_Hat   # 18978
+    Script: |
+      .@r = getequiprefinerycnt(EQI_GARMENT);
+      bonus2 bMagicAddClass,Class_All,.@r/2;
+      if (.@r >= 12)
+         bonus2 bSkillCooldown,"WL_TELEKINESIS_INTENSE",-30000;
+  - Combos:
+      - Combo:
+          - Subject_Cape_TW   # 480024
+          - Old_Wind_Whisper   # 18980
+    Script: |
+      .@r = getequiprefinerycnt(EQI_GARMENT);
+      bonus2 bMagicAddRace,RC_All,.@r/2;
+      if (.@r >= 12)
+         bonus bMatk,30;
+  - Combos:
+      - Combo:
+          - Subject_Cape_TW   # 480024
+          - Old_Circlet_Of_Bone   # 18982
+    Script: |
+      .@r = getequiprefinerycnt(EQI_GARMENT);
+      bonus bCritAtkRate,3*(.@r/2);
+      if (.@r >= 12)
+         bonus2 bIgnoreDefRaceRate,RC_All,25;
+  - Combos:
+      - Combo:
+          - Subject_Cape_TW   # 480024
+          - Old_Shadow_Handicraft   # 18975
+    Script: |
+      .@r = getequiprefinerycnt(EQI_GARMENT);
+      bonus bFlee,5*(.@r/2);
+      if (.@r >= 12)
+         bonus2 bSubRace,RC_All,15;
+  - Combos:
+      - Combo:
+          - Subject_Cape_TW   # 480024
+          - Old_Driver_Band_R   # 18973
+    Script: |
+      .@r = getequiprefinerycnt(EQI_GARMENT);
+      bonus2 bSkillAtk,"NC_AXEBOOMERANG",5*(.@r/2);
+      if (.@r >= 12)
+         bonus bBaseAtk,30;
+  - Combos:
+      - Combo:
+          - Subject_Cape_TW   # 480024
+          - Old_Driver_Band_Y   # 18974
+    Script: |
+      .@r = getequiprefinerycnt(EQI_GARMENT);
+      bonus2 bSkillAtk,"NC_VULCANARM",15*(.@r/2);
+      bonus2 bSkillAtk,"NC_PILEBUNKER",15*(.@r/2);
+      if (.@r >= 12)
+         bonus2 bSkillCooldown,"NC_SELFDESTRUCTION",-30000;
+  - Combos:
+      - Combo:
+          - Subject_Cape_TW   # 480024
+          - Old_Midas_Whisper   # 18977
+    Script: |
+      .@r = getequiprefinerycnt(EQI_GARMENT);
+      bonus bLongAtkRate,2*(.@r/2);
+      bonus2 bSkillAtk,"GN_HELLS_PLANT",15*(.@r/2);
+      if (.@r >= 12)
+         bonus bBaseAtk,30;
+  - Combos:
+      - Combo:
+          - Subject_Cape_TW   # 480024
+          - Old_Camo_RabbitHood   # 18984
+    Script: |
+      .@r = getequiprefinerycnt(EQI_GARMENT);
+      bonus bLongAtkRate,2*(.@r/2);
+      bonus2 bSkillAtk,"RA_ARROWSTORM",5*(.@r/2);
+      if (.@r >= 12)
+         bonus2 bSkillCooldown,"RA_ARROWSTORM",-500;
+  - Combos:
+      - Combo:
+          - Subject_Cape_TW   # 480024
+          - Old_Minstrel_Song_Hat   # 18976
+    Script: |
+      .@r = getequiprefinerycnt(EQI_GARMENT);
+      bonus2 bSkillAtk,"WM_METALICSOUND",15*(.@r/2);
+      if (.@r >= 12)
+         bonus2 bSkillCooldown,"WM_METALICSOUND",-1000;
+  - Combos:
+      - Combo:
+          - Subject_Cape_TW   # 480024
+          - Old_Dying_Swan   # 18981
+    Script: |
+      .@r = getequiprefinerycnt(EQI_GARMENT);
+      bonus2 bSkillAtk,"WM_METALICSOUND",15*(.@r/2);
+      if (.@r >= 12)
+         bonus2 bSkillCooldown,"WM_METALICSOUND",-1000;
+  - Combos:
+      - Combo:
+          - Record_Acolyte2_TW   # 490192
+          - Old_Mitra   # 18972
+    Script: |
+      bonus bFixedCast,-300;
+      bonus bHealPower,30;
+  - Combos:
+      - Combo:
+          - Record_Acolyte2_TW   # 490192
+          - Old_Blazing_Soul   # 18979
+    Script: |
+      bonus bLongAtkRate,15;
+      bonus2 bSkillAtk,"SR_RAMPAGEBLASTER",30;
+  - Combos:
+      - Combo:
+          - Record_Acolyte2_TW   # 490192
+          - Record_Acol_TW   # 32288
+    Script: |
+      bonus bMaxHPrate,15;
+  - Combos:
+      - Combo:
+          - Record_Acolyte2_TW   # 490192
+          - B_Magaleta_Card   # 4363
+    Script: |
+      bonus bMaxHPrate,40;
+  - Combos:
+      - Combo:
+          - Record_Acolyte2_TW   # 490192
+          - Champion_Card   # 4562
+    Script: |
+      bonus2 bAddRace,RC_All,25;
+  - Combos:
+      - Combo:
+          - Record_Acol_TW   # 32288
+          - RingOfThought_TW   # 32245
+    Script: |
+      bonus2 bAddRace2,RC2_BioLab,20;
+      bonus2 bMagicAddRace2,RC2_BioLab,20;
+  - Combos:
+      - Combo:
+          - Record_Acol_TW   # 32288
+          - Subject_Cape_TW   # 480024
+    Script: |
+      if (getequiprefinerycnt(EQI_GARMENT) >= 10) {
+         if (eaclass()&EAJL_THIRD && BaseJob == Job_Priest) {
+            bonus bFixedCast,-300;
+            bonus2 bMagicAtkEle,Ele_Holy,15;
+            bonus2 bSkillAtk,"PR_MAGNUS",40;
+         }
+         if (eaclass()&EAJL_THIRD && BaseJob == Job_Monk) {
+            bonus bDelayRate,-5;
+            autobonus3 "{ bonus bMaxHPrate,20; }",1000,5000,"SR_GATEOFHELL";
+            bonus2 bSkillAtk,"SR_GATEOFHELL",10;
+         }
+      }
+  - Combos:
+      - Combo:
+          - Record_Thief2_TW   # 490191
+          - Old_Circlet_Of_Bone   # 18982
+    Script: |
+      bonus bLongAtkRate,10;
+      bonus2 bSkillCooldown,"ASC_BREAKER",-150;
+  - Combos:
+      - Combo:
+          - Record_Thief2_TW   # 490191
+          - Old_Shadow_Handicraft   # 18975
+    Script: |
+      bonus bLongAtkRate,15;
+      bonus2 bSkillAtk,"SC_TRIANGLESHOT",30;
+  - Combos:
+      - Combo:
+          - Record_Thief2_TW   # 490191
+          - Record_Thief_TW   # 32287
+    Script: |
+      bonus2 bAddRace,RC_All,10;
+  - Combos:
+      - Combo:
+          - Record_Thief2_TW   # 490191
+          - B_Eremes_Card   # 4359
+    Script: |
+      bonus2 bAddClass,Class_Boss,30;
+  - Combos:
+      - Combo:
+          - Record_Thief2_TW   # 490191
+          - Stalker_Card   # 4564
+    Script: |
+      bonus2 bMagicAddRace,RC_All,30;
+  - Combos:
+      - Combo:
+          - Record_Thief_TW   # 32287
+          - RingOfThought_TW   # 32245
+    Script: |
+      bonus2 bAddRace2,RC2_BioLab,20;
+      bonus2 bMagicAddRace2,RC2_BioLab,20;
+  - Combos:
+      - Combo:
+          - Record_Thief_TW   # 32287
+          - Subject_Cape_TW   # 480024
+    Script: |
+      if (getequiprefinerycnt(EQI_GARMENT) >= 10) {
+         if (eaclass()&EAJL_THIRD && BaseJob == Job_Assassin) {
+            bonus2 bIgnoreDefRaceRate,RC_All,10;
+            bonus2 bAddClass,Class_All,15;
+            bonus2 bSkillAtk,"GC_ROLLINGCUTTER",30;
+         }
+         if (eaclass()&EAJL_THIRD && BaseJob == Job_Rogue) {
+            bonus bDelayRate,-5;
+            bonus2 bSkillCooldown,"SC_FEINTBOMB",-800;
+            bonus2 bSkillAtk,"SC_FEINTBOMB",40;
+         }
+      }
+  - Combos:
+      - Combo:
+          - Record_Merchant2_TW   # 490175
+          - Old_Driver_Band_R   # 18973
+    Script: |
+      bonus bDelayRate,-5;
+      bonus bShortAtkRate,20;
+  - Combos:
+      - Combo:
+          - Record_Merchant2_TW   # 490175
+          - Old_Driver_Band_Y   # 18974
+    Script: |
+      bonus bLongAtkRate,15;
+      bonus2 bSkillAtk,"NC_COLDSLOWER",40;
+  - Combos:
+      - Combo:
+          - Record_Merchant2_TW   # 490175
+          - Old_Midas_Whisper   # 18977
+    Script: |
+      bonus bShortAtkRate,15;
+      bonus2 bSkillAtk,"GN_HELLS_PLANT",20;
+  - Combos:
+      - Combo:
+          - Record_Merchant2_TW   # 490175
+          - Record_Merchant_TW   # 32286
+    Script: |
+      bonus bAtkRate,10;
+  - Combos:
+      - Combo:
+          - Record_Merchant2_TW   # 490175
+          - B_Harword_Card   # 4361
+    Script: |
+      bonus2 bAddClass,Class_Boss,40;
+  - Combos:
+      - Combo:
+          - Record_Merchant2_TW   # 490175
+          - Creator_Card   # 4563
+    Script: |
+      bonus2 bAddRace,RC_All,20;
+  - Combos:
+      - Combo:
+          - Record_Merchant_TW   # 32286
+          - RingOfThought_TW   # 32245
+    Script: |
+      bonus2 bAddRace2,RC2_BioLab,20;
+      bonus2 bMagicAddRace2,RC2_BioLab,20;
+  - Combos:
+      - Combo:
+          - Record_Merchant_TW   # 32286
+          - Subject_Cape_TW   # 480024
+    Script: |
+      if (getequiprefinerycnt(EQI_GARMENT) >= 10) {
+         if (eaclass()&EAJL_THIRD && BaseJob == Job_Blacksmith) {
+            bonus2 bAddRace,RC_All,15;
+            bonus2 bSkillCooldown,"NC_ARMSCANNON",-150;
+            bonus2 bSkillAtk,"NC_ARMSCANNON",40;
+         }
+         if (eaclass()&EAJL_THIRD && BaseJob == Job_Alchemist) {
+            bonus2 bAddRace,RC_All,15;
+            bonus2 bSkillCooldown,"GN_SPORE_EXPLOSION",-2000;
+            bonus2 bSkillAtk,"GN_SPORE_EXPLOSION",40;
+         }
+      }
+  - Combos:
+      - Combo:
+          - Record_Sward2_TW   # 490173
+          - Old_Rune_Circlet   # 18971
+    Script: |
+      bonus bLongAtkRate,15;
+      bonus2 bSkillAtk,"RK_HUNDREDSPEAR",30;
+  - Combos:
+      - Combo:
+          - Record_Sward2_TW   # 490173
+          - Old_Protect_Of_Crown   # 18983
+    Script: |
+      bonus bStr,20;
+      bonus bCritical,15;
+      bonus2 bSkillCooldown,"LG_CANNONSPEAR",-500;
+  - Combos:
+      - Combo:
+          - Record_Sward2_TW   # 490173
+          - Record_Sward_TW   # 490094
+    Script: |
+      bonus2 bAddRace,RC_All,10;
+      bonus2 bMagicAddRace,RC_All,10;
+  - Combos:
+      - Combo:
+          - Record_Sward2_TW   # 490173
+          - B_Seyren_Card   # 4357
+    Script: |
+      bonus2 bAddClass,Class_Boss,30;
+  - Combos:
+      - Combo:
+          - Record_Sward2_TW   # 490173
+          - Paladin_Card   # 4565
+    Script: |
+      bonus2 bMagicAddRace,RC_All,25;
+  - Combos:
+      - Combo:
+          - Record_Sward_TW   # 490094
+          - RingOfThought_TW   # 32245
+    Script: |
+      bonus2 bAddRace2,RC2_BioLab,20;
+      bonus2 bMagicAddRace2,RC2_BioLab,20;
+  - Combos:
+      - Combo:
+          - Record_Sward_TW   # 490094
+          - Subject_Cape_TW   # 480024
+    Script: |
+      if (getequiprefinerycnt(EQI_GARMENT) >= 10) {
+         if (eaclass()&EAJL_THIRD && BaseJob == Job_Knight) {
+            bonus2 bAddRace,RC_All,15;
+            autobonus "{ bonus3 bAutoSpell,\"RK_MILLENNIUMSHIELD\",1,10; }",1000,6000,BF_WEAPON;
+            autobonus3 "{ bonus3 bAutoSpell,\"RK_MILLENNIUMSHIELD\",1,10; }",1000,6000,"RK_STORMBLAST";
+            bonus2 bSkillAtk,"RK_IGNITIONBREAK",30;
+         }
+         if (eaclass()&EAJL_THIRD && BaseJob == Job_Crusader) {
+            bonus2 bMagicAddRace,RC_All,15;
+            bonus bShortWeaponDamageReturn,25;
+            bonus2 bSkillAtk,"LG_RAYOFGENESIS",30;
+         }
+      }
+  - Combos:
+      - Combo:
+          - Record_Mage2_TW   # 490170
+          - Old_Magic_Stone_Hat   # 18978
+    Script: |
+      bonus bFixedCast,-200;
+      bonus2 bSkillAtk,"WL_COMET",30;
+  - Combos:
+      - Combo:
+          - Record_Mage2_TW   # 490170
+          - Old_Wind_Whisper   # 18980
+    Script: |
+      bonus bInt,20;
+      bonus2 bSkillCooldown,"SO_POISON_BUSTER",-500;
+      if (getskilllv("SO_POISON_BUSTER") >= 5)
+         bonus2 bResEff,Eff_Poison,5000;
+  - Combos:
+      - Combo:
+          - Record_Mage2_TW   # 490170
+          - Record_Mage_TW   # 32285
+    Script: |
+      bonus bMatkRate,10;
+  - Combos:
+      - Combo:
+          - Record_Mage2_TW   # 490170
+          - B_Katrinn_Card   # 4365
+    Script: |
+      bonus2 bMagicAddClass,Class_Boss,30;
+  - Combos:
+      - Combo:
+          - Record_Mage2_TW   # 490170
+          - Professor_Card   # 4561
+    Script: |
+      bonus2 bMagicAtkEle,Ele_All,20;
+  - Combos:
+      - Combo:
+          - Record_Mage2_TW   # 490170
+          - Celine_Brooch   # 28513
+    Script: |
+      bonus2 bMagicAddClass,Class_Boss,-50;
+  - Combos:
+      - Combo:
+          - Record_Mage_TW   # 32285
+          - RingOfThought_TW   # 32245
+    Script: |
+      bonus2 bAddRace2,RC2_BioLab,20;
+      bonus2 bMagicAddRace2,RC2_BioLab,20;
+  - Combos:
+      - Combo:
+          - Record_Mage_TW   # 32285
+          - Subject_Cape_TW   # 480024
+    Script: |
+      if (getequiprefinerycnt(EQI_GARMENT) >= 10) {
+         if (eaclass()&EAJL_THIRD && BaseJob == Job_Wizard) {
+            bonus bFixedCast,-300;
+            bonus2 bMagicAtkEle,Ele_Neutral,15;
+            bonus2 bSkillAtk,"WL_COMET",30;
+         }
+         if (eaclass()&EAJL_THIRD && BaseJob == Job_Sage) {
+            bonus2 bSkillCooldown,"SO_VACUUM_EXTREME",-1000;
+            bonus2 bSkillAtk,"MG_FIREBOLT",30;
+            bonus2 bSkillAtk,"MG_COLDBOLT",30;
+            bonus2 bSkillAtk,"MG_LIGHTNINGBOLT",30;
+            bonus2 bSkillAtk,"SO_PSYCHIC_WAVE",30;
+            skill "NJ_UTSUSEMI",1;
+            bonus2 bSkillCooldown,"NJ_UTSUSEMI",30000;
+         }
+      }
+  - Combos:
+      - Combo:
+          - Wind_Spirit_Ring_TW   # 490168
+          - Old_Wind_Whisper   # 18980
+    Script: |
+      .@r = getequiprefinerycnt(EQI_HEAD_TOP);
+      bonus bMdef,5;
+      bonus2 bSkillCooldown,"SO_VARETYR_SPEAR",-100*(.@r/2);
+      autobonus3 "{ bonus2 bSkillCooldown,\"SO_VARETYR_SPEAR\",-400; }",1000,120000,"SO_SUMMON_VENTUS";
+      bonus2 bMagicAtkEle,Ele_Wind,20;
+  - Combos:
+      - Combo:
+          - TimeOverloadRing_TW   # 490097
+          - Temporal_Boots_TW   # 22202
+    Script: |
+      bonus bMdef,5;
+      if (readparam(bStr) >= 120) {
+         bonus bAtkRate,8;
+         bonus2 bAddSize,Size_All,8;
+      }
+      if (readparam(bAgi) >= 120) {
+         bonus bAspdRate,4;
+         bonus bCritAtkRate,15;
+      }
+      if (readparam(bVit) >= 120) {
+         bonus bMaxHPrate,8;
+         bonus bDelayRate,-8;
+      }
+      if (readparam(bInt) >= 120) {
+         bonus bMatkRate,8;
+         bonus2 bMagicAtkEle,Ele_All,8;
+      }
+      if (readparam(bDex) >= 120) {
+         bonus bLongAtkRate,5;
+         bonus bAtkRate,8;
+      }
+      if (readparam(bLuk) >= 120) {
+         bonus bCritAtkRate,10;
+         bonus bAspd,1;
+      }
+  - Combos:
+      - Combo:
+          - TimeOverloadRing_TW   # 490097
+          - Temporal_Cape_TW   # 480076
+    Script: |
+      .@r = getequiprefinerycnt(EQI_GARMENT);
+      bonus bMdef,5;
+      if (.@r >= 9) {
+         bonus2 bIgnoreDefRaceRate,RC_All,5;
+         bonus2 bIgnoreMdefRaceRate,RC_All,5;
+         bonus2 bIgnoreDefRaceRate,RC_Player_Human,-5;
+         bonus2 bIgnoreMdefRaceRate,RCRC_Player_Doram_All,-5;
+         if (.@r >= 12) {
+            bonus2 bIgnoreDefRaceRate,RC_All,10;
+            bonus2 bIgnoreMdefRaceRate,RC_All,10;
+            bonus2 bIgnoreDefRaceRate,RC_Player_Human,-10;
+            bonus2 bIgnoreMdefRaceRate,RCRC_Player_Doram_All,-10;
+         }
+      }
+  - Combos:
+      - Combo:
+          - Temporal_Cape_TW   # 480076
+          - Temporal_Ring_TW   # 490030
+          - Bear's_Power   # 4875
+    Script: |
+      bonus bBaseAtk,25;
+  - Combos:
+      - Combo:
+          - Temporal_Cape_TW   # 480076
+          - Temporal_Ring_TW   # 490030
+          - Speed_Of_Light   # 4877
+    Script: |
+      bonus bDelayRate,-4;
+  - Combos:
+      - Combo:
+          - Temporal_Cape_TW   # 480076
+          - Temporal_Ring_TW   # 490030
+          - Muscle_Fool   # 4878
+    Script: |
+      bonus bMaxHPrate,7;
+  - Combos:
+      - Combo:
+          - Temporal_Cape_TW   # 480076
+          - Temporal_Ring_TW   # 490030
+          - Runaway_Magic   # 4876
+    Script: |
+      bonus bMatk,25;
+  - Combos:
+      - Combo:
+          - Temporal_Cape_TW   # 480076
+          - Temporal_Ring_TW   # 490030
+          - Hawkeye   # 4879
+    Script: |
+      bonus bLongAtkRate,5;
+  - Combos:
+      - Combo:
+          - Temporal_Cape_TW   # 480076
+          - Temporal_Ring_TW   # 490030
+          - Lucky_Day   # 4880
+    Script: |
+      bonus bCritAtkRate,5;
+  - Combos:
+      - Combo:
+          - Temporal_Cape_TW   # 480076
+          - Temporal_Boots_TW   # 22202
+    Script: |
+      .@r = getequiprefinerycnt(EQI_GARMENT) + getequiprefinerycnt(EQI_SHOES);
+      if (.@r >= 22) {
+         if (readparam(bStr) >= 108)
+            bonus bBaseAtk,50;
+         if (readparam(bAgi) >= 108)
+            bonus bAspd,1;
+         if (readparam(bVit) >= 108)
+            bonus bDelayRate,-5;
+         if (readparam(bInt) >= 108)
+            bonus bMatk,50;
+         if (readparam(bDex) >= 108)
+            bonus bLongAtkRate,7;
+         if (readparam(bLuk) >= 108)
+            bonus bCritAtkRate,7;
+      }
+  - Combos:
+      - Combo:
+          - aegis_311912   # 311912
+          - Kagerou_Robe   # 29662
+    Script: |
+      bonus2 bSkillAtk,"KO_HUUMARANKA",25;
+  - Combos:
+      - Combo:
+          - aegis_311913   # 311913
+          - Kagerou_Robe   # 29662
+    Script: |
+      bonus2 bSkillAtk,"KO_JYUMONJIKIRI",25;
+  - Combos:
+      - Combo:
+          - aegis_311914   # 311914
+          - Kagerou_Robe   # 29662
+    Script: |
+      bonus2 bSkillAtk,"KO_HAPPOKUNAI",25;
+  - Combos:
+      - Combo:
+          - aegis_311915   # 311915
+          - Oboro_Robe   # 29663
+    Script: |
+      bonus2 bSkillAtk,"NJ_HYOUSENSOU",25;
+      bonus2 bSkillAtk,"NJ_HUUJIN",25;
+  - Combos:
+      - Combo:
+          - aegis_311916   # 311916
+          - Oboro_Robe   # 29663
+    Script: |
+      bonus2 bSkillAtk,"NJ_BAKUENRYU",30;
+      bonus2 bSkillAtk,"NJ_HYOUSYOURAKU",30;
+      bonus2 bSkillAtk,"NJ_KAMAITACHI",30;
+  - Combos:
+      - Combo:
+          - aegis_311917   # 311917
+          - Oboro_Robe   # 29663
+    Script: |
+      bonus bVariableCastrate,-15;
+  - Combos:
+      - Combo:
+          - aegis_311918   # 311918
+          - Doram_Robe   # 29671
+    Script: |
+      bonus bFixedCast,-500;
+  - Combos:
+      - Combo:
+          - aegis_311919   # 311919
+          - Doram_Robe   # 29671
+    Script: |
+      bonus2 bSkillAtk,"SU_CN_METEOR",25;
+  - Combos:
+      - Combo:
+          - aegis_311920   # 311920
+          - Doram_Robe   # 29671
+    Script: |
+      bonus2 bSkillAtk,"SU_LUNATICCARROTBEAT",25;
+  - Combos:
+      - Combo:
+          - aegis_311921   # 311921
+          - aegis_311922   # 311922
+          - aegis_311923   # 311923
+    Script: |
+      bonus bDef,100;
+      bonus bMdef,25;
+      bonus bRes,5;
+      bonus bMRes,5;
+  - Combos:
+      - Combo:
+          - aegis_311921   # 311921
+          - aegis_311922   # 311922
+          - aegis_311923   # 311923
+          - aegis_311924   # 311924
+    Script: |
+      bonus bRes,20;
+      bonus bMRes,20;
+  - Combos:
+      - Combo:
+          - Whike_Black_Tail   # 2855
+          - Whikebain_Ears_   # 5986
+    Script: |
+      bonus bCritAtkRate,10;
+      if (getequiprefinerycnt(EQI_HEAD_TOP) >= 7)
+         bonus bCritical,5;
+  - Combos:
+      - Combo:
+          - Whike_Black_Tail_S   # 28351
+          - Whikebain_Ears_   # 5986
+    Script: |
+      bonus bCritAtkRate,10;
+      if (getequiprefinerycnt(EQI_HEAD_TOP) >= 7)
+         bonus bCritical,5;
+  - Combos:
+      - Combo:
+          - Whike_Black_Tail   # 2855
+          - Black_Cat_Ears_Beret   # 18939
+    Script: |
+      .@r =  getequiprefinerycnt(EQI_HEAD_TOP);
+      autobonus "{ bonus bAllStats,8; }",10+.@r,5000,BF_WEAPON,"{ active_transform 1261,5000; }";
+  - Combos:
+      - Combo:
+          - Whike_Black_Tail_S   # 28351
+          - Black_Cat_Ears_Beret   # 18939
+    Script: |
+      .@r =  getequiprefinerycnt(EQI_HEAD_TOP);
+      autobonus "{ bonus bAllStats,8; }",10+.@r,5000,BF_WEAPON,"{ active_transform 1261,5000; }";
+  - Combos:
+      - Combo:
+          - Etran_Shirt_TW    # 20910
+          - G_Strings    # 2339
+      - Combo:
+          - Etran_Shirt_TW    # 20910
+          - G_Strings    # 2371
+    Script: |
+      .@r =  getequiprefinerycnt(EQI_ARMOR);
+      bonus bInt,15;
+      bonus bMaxHPrate,5;
+      bonus bMaxSPrate,5;
+      if (.@r>=7)
+         bonus bNoCastCancel;
+  - Combos:
+      - Combo:
+          - Santa's_Shoes  # 22068
+          - Permeter_Card    # 4311
+    Script: |
+      autobonus "{ bonus bDef,200; bonus bMdef,20; }",10,10000,BF_WEAPON|BF_MAGIC;
+  - Combos:
+      - Combo:
+          - Santa's_Shoes  # 22068
+          - Rideword_Card    # 4185
+    Script: |
+      autobonus "{ bonus bMaxHP,50; bonus bMaxSP,10; }",10,10000,BF_WEAPON|BF_MAGIC;
+  - Combos:
+      - Combo:
+          - Santa's_Shoes  # 22068
+          - Mystcase_Card    # 4206
+    Script: |
+      bonus2 bAddItemHealRate,569,100;
+      bonus2 bAddMonsterDropItem,569,50;
+  - Combos:
+      - Combo:
+          - Santa's_Shoes  # 22068
+          - Mole_Card    # 4343
+    Script: |
+      if (getequiprefinerycnt(EQI_SHOES) >= 6)
+         bonus2 bSkillUseSP,"MC_CARTREVOLUTION",4;

File diff suppressed because it is too large
+ 782 - 2
db/re/item_db_equip.yml


+ 274 - 0
db/re/item_db_etc.yml

@@ -47195,6 +47195,24 @@ Body:
     Script: |
     Script: |
       bonus bLongAtkRate,25;
       bonus bLongAtkRate,25;
       bonus bPerfectHitRate,5;
       bonus bPerfectHitRate,5;
+  - Id: 300152
+    AegisName: AngelBlessing_Effect
+    Name: Angel Blessing Effect
+    Type: Card
+    SubType: Enchant
+    Script: |
+      hateffect HAT_EF_Blessing_Of_Angels,true;
+    UnEquipScript: |
+      hateffect HAT_EF_Blessing_Of_Angels,false;
+  - Id: 300157
+    AegisName: Time_Effect
+    Name: Time Accessory Effect
+    Type: Card
+    SubType: Enchant
+    Script: |
+      hateffect HAT_EF_C_Time_Accessory,true;
+    UnEquipScript: |
+      hateffect HAT_EF_C_Time_Accessory,false;
   - Id: 300163
   - Id: 300163
     AegisName: Card_Of_Emperor_R
     AegisName: Card_Of_Emperor_R
     Name: The Emperor Reversed
     Name: The Emperor Reversed
@@ -49806,6 +49824,15 @@ Body:
       bonus2 bMagicAtkEle,Ele_Poison,100;
       bonus2 bMagicAtkEle,Ele_Poison,100;
       bonus2 bMagicAtkEle,Ele_Undead,100;
       bonus2 bMagicAtkEle,Ele_Undead,100;
       bonus2 bSubEle,Ele_All,-30;
       bonus2 bSubEle,Ele_All,-30;
+  - Id: 300385
+    AegisName: VF_Effect_TW
+    Name: Valhalla Effect Effect
+    Type: Card
+    SubType: Enchant
+    Script: |
+      hateffect HAT_EF_VALHALLA_IDOL,true;
+    UnEquipScript: |
+      hateffect HAT_EF_VALHALLA_IDOL,false;
   - Id: 300392
   - Id: 300392
     AegisName: aegis_300392
     AegisName: aegis_300392
     Name: Sealed Stormy Knight Card
     Name: Sealed Stormy Knight Card
@@ -52284,6 +52311,15 @@ Body:
     SubType: Enchant
     SubType: Enchant
     Script: |
     Script: |
       bonus bAllStats,10;
       bonus bAllStats,10;
+  - Id: 310322
+    AegisName: MagicFeather_Effect
+    Name: Magic Feather Effect
+    Type: Card
+    SubType: Enchant
+    Script: |
+      hateffect HAT_EF_magical_feather,true;
+    UnEquipScript: |
+      hateffect HAT_EF_magical_feather,false;
   - Id: 310325
   - Id: 310325
     AegisName: Range_Top
     AegisName: Range_Top
     Name: Range Stone (Top)
     Name: Range Stone (Top)
@@ -64678,6 +64714,123 @@ Body:
             }
             }
          }
          }
       }
       }
+  - Id: 311912
+    AegisName: aegis_311912
+    Name: Kagerou Stone (Upper)
+    Type: Card
+    SubType: Enchant
+    Script: |
+      bonus2 bAddSize,Size_All,2*getskilllv("KO_RIGHT");
+  - Id: 311913
+    AegisName: aegis_311913
+    Name: Kagerou Stone (Middle)
+    Type: Card
+    SubType: Enchant
+    Script: |
+      bonus bLongAtkRate,2*getskilllv("KO_RIGHT");
+  - Id: 311914
+    AegisName: aegis_311914
+    Name: Kagerou Stone (Lower)
+    Type: Card
+    SubType: Enchant
+    Script: |
+      bonus2 bSkillAtk,"KO_HAPPOKUNAI",5*getskilllv("KO_MEIKYOUSISUI");
+  - Id: 311915
+    AegisName: aegis_311915
+    Name: Oboro Stone (Upper)
+    Type: Card
+    SubType: Enchant
+    Script: |
+      bonus2 bMagicAddSize,Size_All,2*getskilllv("KO_RIGHT");
+  - Id: 311916
+    AegisName: aegis_311916
+    Name: Oboro Stone (Middle)
+    Type: Card
+    SubType: Enchant
+    Script: |
+      bonus bMaxSPrate,3*getskilllv("KO_MEIKYOUSISUI");
+  - Id: 311917
+    AegisName: aegis_311917
+    Name: Oboro Stone (Lower)
+    Type: Card
+    SubType: Enchant
+    Script: |
+      bonus2 bSkillAtk,"NJ_KOUENKA",4*getskilllv("KO_IZAYOI");
+      bonus2 bSkillAtk,"NJ_HYOUSENSOU",4*getskilllv("KO_IZAYOI");
+      bonus2 bSkillAtk,"NJ_HUUJIN",4*getskilllv("KO_IZAYOI");
+  - Id: 311918
+    AegisName: aegis_311918
+    Name: Summoner Stone (Upper)
+    Type: Card
+    SubType: Enchant
+    Script: |
+      bonus2 bSkillAtk,"SU_LUNATICCARROTBEAT",5*getskilllv("SU_PICKYPECK");
+      bonus2 bSkillAtk,"SU_CN_METEOR",5*getskilllv("SU_SV_STEMSPEAR");
+  - Id: 311919
+    AegisName: aegis_311919
+    Name: Summoner Stone (Middle)
+    Type: Card
+    SubType: Enchant
+    Script: |
+      bonus bVariableCastrate,-2*getskilllv("SU_FRESHSHRIMP");
+  - Id: 311920
+    AegisName: aegis_311920
+    Name: Summoner Stone (Lower)
+    Type: Card
+    SubType: Enchant
+    Script: |
+      bonus bLongAtkRate,2*getskilllv("SU_ARCLOUSEDASH");
+  - Id: 311921
+    AegisName: aegis_311921
+    Name: Defense Stone (Upper)
+    Type: Card
+    SubType: Enchant
+    Script: |
+      bonus bDef,20;
+      bonus bMdef,4;
+  - Id: 311922
+    AegisName: aegis_311922
+    Name: Defense Stone (Middle)
+    Type: Card
+    SubType: Enchant
+    Script: |
+      bonus bDef,20;
+      bonus bMdef,4;
+  - Id: 311923
+    AegisName: aegis_311923
+    Name: Defense Stone (Lower)
+    Type: Card
+    SubType: Enchant
+    Script: |
+      bonus bDef,20;
+      bonus bMdef,4;
+  - Id: 311924
+    AegisName: aegis_311924
+    Name: Resist Defense Stone (Garment)
+    Type: Card
+    SubType: Enchant
+    Script: |
+      bonus bDef,100;
+      bonus bMdef,25;
+      bonus bRes,20;
+      bonus bMRes,20;
+  - Id: 311925
+    AegisName: aegis_311925
+    Name: Stamina Wisdom Stone (Dual)
+    Type: Card
+    SubType: Enchant
+    Script: |
+      bonus bSta,5;
+      bonus bWis,5;
+  - Id: 311926
+    AegisName: aegis_311926
+    Name: Romance Rose Effect
+    Type: Card
+    SubType: Enchant
+    Script: |
+      hateffect HAT_EF_C_Romance_Rose_TW,true;
+    UnEquipScript: |
+      hateffect HAT_EF_C_Romance_Rose_TW,false;
   - Id: 1000000
   - Id: 1000000
     AegisName: IDTest_event
     AegisName: IDTest_event
     Name: IDTest event
     Name: IDTest event
@@ -65982,6 +66135,11 @@ Body:
     Type: Etc
     Type: Etc
     Flags:
     Flags:
       BuyingStore: true
       BuyingStore: true
+  - Id: 1000319
+    AegisName: AngelBlessingEffect_Mid
+    Name: Angel Blessing Effect (Middle)
+    Type: Etc
+    Weight: 100
   - Id: 1000320
   - Id: 1000320
     AegisName: Kafra_Coin_Kr
     AegisName: Kafra_Coin_Kr
     Name: Kafra Coin
     Name: Kafra Coin
@@ -66091,6 +66249,11 @@ Body:
     Weight: 10
     Weight: 10
     Flags:
     Flags:
       BuyingStore: true
       BuyingStore: true
+  - Id: 1000345
+    AegisName: TimeEffect_Middle
+    Name: Time Accessory Effect (Middle)
+    Type: Etc
+    Weight: 100
   - Id: 1000346
   - Id: 1000346
     AegisName: 4th_Job_Guide
     AegisName: 4th_Job_Guide
     Name: 4th Job Guide
     Name: 4th Job Guide
@@ -66119,6 +66282,11 @@ Body:
       NoGuildStorage: true
       NoGuildStorage: true
       NoMail: true
       NoMail: true
       NoAuction: true
       NoAuction: true
+  - Id: 1000365
+    AegisName: MagicFeatherEffect_Top
+    Name: Magic Feather Effect (Upper)
+    Type: Etc
+    Weight: 10
   - Id: 1000366
   - Id: 1000366
     AegisName: MD_Geffen_Win
     AegisName: MD_Geffen_Win
     Name: Geffen Arena Championship
     Name: Geffen Arena Championship
@@ -66210,6 +66378,18 @@ Body:
     Name: Melee Stone (Lower)
     Name: Melee Stone (Lower)
     Type: Etc
     Type: Etc
     Weight: 100
     Weight: 100
+  - Id: 1000395
+    AegisName: Jellopy_Essence_TW
+    Name: Jellopy Essence
+    Type: Etc
+    Trade:
+      NoDrop: true
+      NoTrade: true
+      NoSell: true
+      NoCart: true
+      NoGuildStorage: true
+      NoMail: true
+      NoAuction: true
   - Id: 1000396
   - Id: 1000396
     AegisName: Naght_Sieger_Soul
     AegisName: Naght_Sieger_Soul
     Name: Naght Sieger Soul
     Name: Naght Sieger Soul
@@ -66938,6 +67118,14 @@ Body:
     Name: Royal Guard Stone (Lower)
     Name: Royal Guard Stone (Lower)
     Type: Etc
     Type: Etc
     Weight: 100
     Weight: 100
+  - Id: 1000620
+    AegisName: Timeoverload_Power_TW
+    Name: Time Overload Power
+    Type: Etc
+    Weight: 10
+    Trade:
+      NoDrop: true
+      NoSell: true
   - Id: 1000635
   - Id: 1000635
     AegisName: 19th_Anniv_Invitation
     AegisName: 19th_Anniv_Invitation
     Name: 19th Anniversary Thank You Letter
     Name: 19th Anniversary Thank You Letter
@@ -67820,6 +68008,11 @@ Body:
     Type: Etc
     Type: Etc
     Flags:
     Flags:
       BuyingStore: true
       BuyingStore: true
+  - Id: 1000875
+    AegisName: Valhalla_F_Effect_T
+    Name: Valhalla Effect (Middle)
+    Type: Etc
+    Weight: 100
   - Id: 1000882
   - Id: 1000882
     AegisName: aegis_1000882
     AegisName: aegis_1000882
     Name: Electric Effect (Bottom)
     Name: Electric Effect (Bottom)
@@ -69048,6 +69241,87 @@ Body:
       NoGuildStorage: true
       NoGuildStorage: true
       NoMail: true
       NoMail: true
       NoAuction: true
       NoAuction: true
+  - Id: 1001159
+    AegisName: KagerouStone_Top3
+    Name: Kagerou Stone (Upper)
+    Type: Etc
+    Weight: 100
+  - Id: 1001160
+    AegisName: KagerouStone_Middle3
+    Name: Kagerou Stone (Middle)
+    Type: Etc
+    Weight: 100
+  - Id: 1001161
+    AegisName: KagerouStone_Bottom3
+    Name: Kagerou Stone (Lower)
+    Type: Etc
+    Weight: 100
+  - Id: 1001162
+    AegisName: OboroStone_Top3
+    Name: Oboro Stone (Upper)
+    Type: Etc
+    Weight: 100
+  - Id: 1001163
+    AegisName: OboroStone_Middle3
+    Name: Oboro Stone (Middle)
+    Type: Etc
+    Weight: 100
+  - Id: 1001164
+    AegisName: OboroStone_Bottom3
+    Name: Oboro Stone (Lower)
+    Type: Etc
+    Weight: 100
+  - Id: 1001165
+    AegisName: DoramStone_Top3
+    Name: Summoner Stone (Upper)
+    Type: Etc
+    Weight: 100
+  - Id: 1001166
+    AegisName: DoramStone_Middle3
+    Name: Summoner Stone (Middle)
+    Type: Etc
+    Weight: 100
+  - Id: 1001167
+    AegisName: DoramStone_Bottom3
+    Name: Summoner Stone (Lower)
+    Type: Etc
+    Weight: 100
+  - Id: 1001168
+    AegisName: DefenseStone_Top
+    Name: Defense Stone (Upper)
+    Type: Etc
+    Weight: 100
+  - Id: 1001169
+    AegisName: DefenseStone_Middle
+    Name: Defense Stone (Middle)
+    Type: Etc
+    Weight: 100
+  - Id: 1001170
+    AegisName: DefenseStone_Bottom
+    Name: Defense Stone (Lower)
+    Type: Etc
+    Weight: 100
+  - Id: 1001171
+    AegisName: ResistDefStone_Robe
+    Name: Resist Defense Stone (Garment)
+    Type: Etc
+    Weight: 100
+  - Id: 1001172
+    AegisName: StaminaWISStone_Robe_D
+    Name: Stamina Wisdom Stone (Dual)
+    Type: Etc
+    Weight: 100
+  - Id: 1001174
+    AegisName: Ymir_Heart_TW
+    Name: Imelo Heart Power Stone    # !todo check english name
+    Type: Etc
+    Trade:
+      NoDrop: true
+  - Id: 1001175
+    AegisName: aegis_1001175
+    Name: Romance Rose Effect (Upper)
+    Type: Etc
+    Weight: 10
   - Id: 1220001
   - Id: 1220001
     AegisName: Kunai
     AegisName: Kunai
     Name: Kunai
     Name: Kunai

+ 9 - 0
db/re/item_db_usable.yml

@@ -52857,6 +52857,15 @@ Body:
       BuyingStore: true
       BuyingStore: true
     Script: |
     Script: |
       laphine_upgrade();
       laphine_upgrade();
+  - Id: 101876
+    AegisName: aegis_101876
+    Name: Costume Enchant Stone Box 29
+    Type: Usable
+    Weight: 10
+    Flags:
+      Container: true
+    Script: |
+      getgroupitem(IG_Enchant_Stone_Box29);
   - Id: 200055
   - Id: 200055
     AegisName: C_Acid_B_50Box
     AegisName: C_Acid_B_50Box
     Name: Acid Bomb 50 Box
     Name: Acid Bomb 50 Box

+ 118 - 0
db/re/item_group_db.yml

@@ -31487,3 +31487,121 @@ Body:
             Amount: 5
             Amount: 5
           - Item: Candy_B
           - Item: Candy_B
             Amount: 5
             Amount: 5
+  - Group: ENCHANT_STONE_BOX29
+    SubGroups:
+      - SubGroup: 1
+        List:
+          - Item: SmatkStone_Robe
+            Rate: 10
+          - Item: SplStone_Robe_D
+            Rate: 10
+          - Item: ResistDefStone_Robe
+            Rate: 10
+          - Item: StaminaWISStone_Robe_D
+            Rate: 10
+          - Item: MinorCastStone_Robe_D
+            Rate: 10
+          - Item: CastStone_Robe_D
+            Rate: 40
+          - Item: SPdrainStone_Top
+            Rate: 80
+          - Item: CastStone_Robe
+            Rate: 80
+          - Item: ASPDStone_Top
+            Rate: 160
+          - Item: ASPDStone_Robe_D
+            Rate: 80
+          - Item: HPdrainStone_Robe_D
+            Rate: 80
+          - Item: MinorCastingStone_Robe
+            Rate: 160
+          - Item: BlueAuraEffect_Middle
+            Rate: 160
+          - Item: KagerouStone_Robe
+            Rate: 80
+          - Item: OboroStone_Robe
+            Rate: 80
+          - Item: DoramStone_Robe
+            Rate: 80
+          - Item: KagerouStone_Top3
+            Rate: 80
+          - Item: KagerouStone_Middle3
+            Rate: 80
+          - Item: KagerouStone_Bottom3
+            Rate: 80
+          - Item: OboroStone_Top3
+            Rate: 80
+          - Item: OboroStone_Middle3
+            Rate: 80
+          - Item: OboroStone_Bottom3
+            Rate: 80
+          - Item: DoramStone_Top3
+            Rate: 80
+          - Item: DoramStone_Middle3
+            Rate: 80
+          - Item: DoramStone_Bottom3
+            Rate: 80
+          - Item: aegis_100465
+            Rate: 160
+          - Item: aegis_100495
+            Rate: 160
+          - Item: Magic_Stone_Top
+            Rate: 240
+          - Item: Magic_Stone_Middle
+            Rate: 240
+          - Item: Magic_Stone_Bottom
+            Rate: 240
+          - Item: DefenseStone_Top
+            Rate: 150
+          - Item: DefenseStone_Middle
+            Rate: 150
+          - Item: DefenseStone_Bottom
+            Rate: 150
+          - Item: NinjaStone_Top
+            Rate: 150
+          - Item: NinjaStone_Middle
+            Rate: 150
+          - Item: NinjaStone_Bottom
+            Rate: 150
+          - Item: DoramStone_Top
+            Rate: 150
+          - Item: DoramStone_Middle
+            Rate: 150
+          - Item: DoramStone_Bottom
+            Rate: 150
+          - Item: ReloadStone_Top
+            Rate: 240
+          - Item: ReloadStone_Middle
+            Rate: 240
+          - Item: ReloadStone_Bottom
+            Rate: 240
+          - Item: EXPStone_Middle
+            Rate: 240
+          - Item: EXPStone_Bottom
+            Rate: 240
+          - Item: EXPStone_Top
+            Rate: 240
+          - Item: aegis_100496
+            Rate: 360
+          - Item: aegis_100497
+            Rate: 360
+          - Item: aegis_100498
+            Rate: 360
+          - Item: aegis_100499
+            Rate: 360
+          - Item: aegis_100500
+            Rate: 360
+          - Item: aegis_100501
+            Rate: 360
+          - Item: CastingStone_Top
+            Rate: 360
+          - Item: CastingStone_Middle
+            Rate: 360
+          - Item: CastingStone_Bottom
+            Rate: 360
+          - Item: Critical_Stone
+            Rate: 360
+          - Item: Critical_Stone_Top
+            Rate: 360
+          - Item: Critical_Stone_Bottom
+            Rate: 360

+ 1 - 0
src/map/itemdb.hpp

@@ -1026,6 +1026,7 @@ enum e_random_item_group {
 	IG_S_ABSORB_WEAPON,
 	IG_S_ABSORB_WEAPON,
 	IG_S_ABSORB_SHIELD,
 	IG_S_ABSORB_SHIELD,
 	IG_PORINGSPRECIOUSBOX,
 	IG_PORINGSPRECIOUSBOX,
+	IG_ENCHANT_STONE_BOX29,
 
 
 	IG_MAX,
 	IG_MAX,
 };
 };

+ 1 - 0
src/map/script_constants.hpp

@@ -5824,6 +5824,7 @@
 	export_constant(IG_S_ABSORB_WEAPON);
 	export_constant(IG_S_ABSORB_WEAPON);
 	export_constant(IG_S_ABSORB_SHIELD);
 	export_constant(IG_S_ABSORB_SHIELD);
 	export_constant(IG_PORINGSPRECIOUSBOX);
 	export_constant(IG_PORINGSPRECIOUSBOX);
+	export_constant(IG_ENCHANT_STONE_BOX29);
 
 
 	/* unit stop walking */
 	/* unit stop walking */
 	export_constant(USW_NONE);
 	export_constant(USW_NONE);

Some files were not shown because too many files changed in this diff