Browse Source

Added new etc/equipment/enchant up to december 2022 (#7489)

* Implemented new equipments and etc
* Updated item_enchant.yml

Thanks to @attackjom !
Atemo 2 years ago
parent
commit
3d5cd57c54
5 changed files with 2219 additions and 183 deletions
  1. 859 4
      db/re/item_combos.yml
  2. 1249 1
      db/re/item_db_equip.yml
  3. 23 2
      db/re/item_db_etc.yml
  4. 86 174
      db/re/item_enchant.yml
  5. 2 2
      db/re/laphine_synthesis.yml

+ 859 - 4
db/re/item_combos.yml

@@ -23129,10 +23129,10 @@ Body:
     Script: |
       bonus bLongAtkRate,10;
       .@r_weapon = getequiprefinerycnt(EQI_HAND_R);
-      bonus2 bSkillAtk,"NW_THE_VIGILANTE_AT_NIGHT_GUN_GATLING",7*(.@r_weapon/3);
+      bonus2 bSkillAtk,"NW_THE_VIGILANTE_AT_NIGHT",7*(.@r_weapon/3);
       bonus2 bSkillAtk,"RL_R_TRIP",5*(.@r_weapon/3);
       if (getenchantgrade(EQI_HAND_R) >= ENCHANTGRADE_C) {
-         bonus2 bSkillAtk,"NW_THE_VIGILANTE_AT_NIGHT_GUN_GATLING",15;
+         bonus2 bSkillAtk,"NW_THE_VIGILANTE_AT_NIGHT",15;
       }
   - Combos:
       - Combo:
@@ -23473,12 +23473,12 @@ Body:
       bonus2 bAddSize,Size_All,15;
       if (getequiprefinerycnt(EQI_HAND_R) >= 10) {
          bonus bLongAtkRate,10;
-         bonus2 bSkillAtk,"NW_THE_VIGILANTE_AT_NIGHT_GUN_GATLING",10;
+         bonus2 bSkillAtk,"NW_THE_VIGILANTE_AT_NIGHT",10;
       }
       if (getenchantgrade(EQI_HAND_R) >= ENCHANTGRADE_C) {
          bonus bPAtk,5;
          bonus bPow,5;
-         bonus2 bSkillAtk,"NW_THE_VIGILANTE_AT_NIGHT_GUN_GATLING",10;
+         bonus2 bSkillAtk,"NW_THE_VIGILANTE_AT_NIGHT",10;
       }
   - Combos:
       - Combo:
@@ -30385,3 +30385,858 @@ Body:
           - S_Helmut_Card   # 300310
     Script: |
       bonus bLongAtkRate,5;
+  - Combos:
+      - Combo:
+          - GoodnEvil_Circlet_DK   # 400374
+          - Justice_Power   # 312014
+          - Luppiter_Spear   # 630027
+    Script: |
+      bonus2 bSkillAtk,"DK_MADNESS_CRUSHER",20;
+      bonus2 bSkillAtk,"DK_DRAGONIC_BREATH",15;
+  - Combos:
+      - Combo:
+          - GoodnEvil_Circlet_DK   # 400374
+          - Injustice_Power   # 312021
+          - Execution_Great_Sword   # 600041
+    Script: |
+      bonus2 bSkillAtk,"DK_STORMSLASH",20;
+      bonus2 bSkillAtk,"DK_HACKANDSLASHER",15;
+  - Combos:
+      - Combo:
+          - GoodnEvil_Circlet_DK   # 400374
+          - Execution_Great_Sword   # 600041
+    Script: |
+      .@r = getequiprefinerycnt(EQI_HAND_R)/3;
+      bonus2 bSkillAtk,"DK_STORMSLASH",5*.@r;
+      bonus2 bSkillAtk,"DK_HACKANDSLASHER",4*.@r;
+      if (getenchantgrade(EQI_HAND_R)>=ENCHANTGRADE_B) {
+         bonus2 bSkillAtk,"DK_HACKANDSLASHER",10;
+      }
+  - Combos:
+      - Combo:
+          - GoodnEvil_Circlet_DK   # 400374
+          - Luppiter_Spear   # 630027
+    Script: |
+      .@r = getequiprefinerycnt(EQI_HAND_R)/3;
+      bonus2 bSkillAtk,"DK_MADNESS_CRUSHER",5*.@r;
+      bonus2 bSkillAtk,"DK_DRAGONIC_BREATH",4*.@r;
+      if (getenchantgrade(EQI_HAND_R)>=ENCHANTGRADE_B) {
+         bonus2 bSkillAtk,"DK_DRAGONIC_BREATH",10;
+      }
+  - Combos:
+      - Combo:
+          - GoodnEvil_Circlet_IG   # 400375
+          - Justice_Power   # 312014
+          - Holy_Raise_Spear   # 530045
+    Script: |
+      bonus bShortAtkRate,20;
+      bonus2 bSkillAtk,"IG_OVERSLASH",15;
+  - Combos:
+      - Combo:
+          - GoodnEvil_Circlet_IG   # 400375
+          - Injustice_Power   # 312021
+          - Devil_Guardian_Sword   # 500072
+    Script: |
+      bonus2 bMagicAtkEle,Ele_Holy,20;
+      bonus2 bSkillAtk,"IG_CROSS_RAIN",15;
+  - Combos:
+      - Combo:
+          - GoodnEvil_Circlet_IG   # 400375
+          - Devil_Guardian_Sword   # 500072
+    Script: |
+      .@r = getequiprefinerycnt(EQI_HAND_R)/3;
+      bonus2 bMagicAtkEle,Ele_Holy,5*.@r;
+      bonus2 bSkillAtk,"IG_CROSS_RAIN",4*.@r;
+      if (getenchantgrade(EQI_HAND_R)>=ENCHANTGRADE_B) {
+         bonus2 bSkillAtk,"IG_CROSS_RAIN",10;
+      }
+  - Combos:
+      - Combo:
+          - GoodnEvil_Circlet_IG   # 400375
+          - Holy_Raise_Spear   # 530045
+    Script: |
+      .@r = getequiprefinerycnt(EQI_HAND_R)/3;
+      bonus bShortAtkRate,5*.@r;
+      bonus2 bSkillAtk,"IG_OVERSLASH",4*.@r;
+      if (getenchantgrade(EQI_HAND_R)>=ENCHANTGRADE_B) {
+         bonus2 bSkillAtk,"IG_OVERSLASH",10;
+      }
+  - Combos:
+      - Combo:
+          - GoodnEvil_Circlet_AG   # 400376
+          - Justice_Power   # 312014
+          - Destiny_Staff   # 640037
+    Script: |
+      bonus2 bSkillAtk,"AG_RAIN_OF_CRYSTAL",20;
+      bonus2 bSkillAtk,"AG_FROZEN_SLASH",15;
+  - Combos:
+      - Combo:
+          - GoodnEvil_Circlet_AG   # 400376
+          - Injustice_Power   # 312021
+          - Devil_Wing_Staff   # 640036
+    Script: |
+      bonus2 bSkillAtk,"AG_MYSTERY_ILLUSION",20;
+      bonus2 bSkillAtk,"AG_SOUL_VC_STRIKE",15;
+  - Combos:
+      - Combo:
+          - GoodnEvil_Circlet_AG   # 400376
+          - Devil_Wing_Staff   # 640036
+    Script: |
+      .@r = getequiprefinerycnt(EQI_HAND_R)/3;
+      bonus2 bSkillAtk,"AG_MYSTERY_ILLUSION",5*.@r;
+      bonus2 bSkillAtk,"AG_SOUL_VC_STRIKE",4*.@r;
+      if (getenchantgrade(EQI_HAND_R)>=ENCHANTGRADE_B) {
+         bonus2 bSkillAtk,"AG_SOUL_VC_STRIKE",10;
+      }
+  - Combos:
+      - Combo:
+          - GoodnEvil_Circlet_AG   # 400376
+          - Destiny_Staff   # 640037
+    Script: |
+      .@r = getequiprefinerycnt(EQI_HAND_R)/3;
+      bonus2 bSkillAtk,"AG_FROZEN_SLASH",4*.@r;
+      bonus2 bSkillAtk,"AG_RAIN_OF_CRYSTAL",5*.@r;
+      if (getenchantgrade(EQI_HAND_R)>=ENCHANTGRADE_B) {
+         bonus2 bSkillAtk,"AG_FROZEN_SLASH",10;
+      }
+  - Combos:
+      - Combo:
+          - GoodnEvil_Circlet_EM   # 400377
+          - Justice_Power   # 312014
+          - Blessed_Bible   # 540060
+    Script: |
+      bonus2 bSkillAtk,"EM_TERRA_DRIVE",20;
+      bonus2 bSkillAtk,"EM_DIAMOND_STORM",15;
+  - Combos:
+      - Combo:
+          - GoodnEvil_Circlet_EM   # 400377
+          - Injustice_Power   # 312021
+          - Doom_Bible   # 540059
+    Script: |
+      bonus2 bSkillAtk,"EM_CONFLAGRATION",20;
+      bonus2 bSkillAtk,"EM_VENOM_SWAMP",15;
+  - Combos:
+      - Combo:
+          - GoodnEvil_Circlet_EM   # 400377
+          - Doom_Bible   # 540059
+    Script: |
+      .@r = getequiprefinerycnt(EQI_HAND_R)/3;
+      bonus2 bSkillAtk,"EM_CONFLAGRATION",5*.@r;
+      bonus2 bSkillAtk,"EM_VENOM_SWAMP",4*.@r;
+      if (getenchantgrade(EQI_HAND_R)>=ENCHANTGRADE_B) {
+         bonus2 bSkillAtk,"EM_VENOM_SWAMP",10;
+      }
+  - Combos:
+      - Combo:
+          - GoodnEvil_Circlet_EM   # 400377
+          - Blessed_Bible   # 540060
+    Script: |
+      .@r = getequiprefinerycnt(EQI_HAND_R)/3;
+      bonus2 bSkillAtk,"EM_DIAMOND_STORM",4*.@r;
+      bonus2 bSkillAtk,"EM_TERRA_DRIVE",5*.@r;
+      if (getenchantgrade(EQI_HAND_R)>=ENCHANTGRADE_B) {
+         bonus2 bSkillAtk,"EM_DIAMOND_STORM",10;
+      }
+  - Combos:
+      - Combo:
+          - GoodnEvil_Circlet_CD   # 400378
+          - Justice_Power   # 312014
+          - Saint_Bringer   # 550088
+    Script: |
+      bonus2 bSkillAtk,"CD_ARBITRIUM_ATK",20;
+      bonus2 bSkillAtk,"CD_FRAMEN",15;
+  - Combos:
+      - Combo:
+          - GoodnEvil_Circlet_CD   # 400378
+          - Injustice_Power   # 312021
+          - Sealed_Bible   # 540053
+    Script: |
+      bonus bCritAtkRate,25;
+      bonus2 bSkillAtk,"CD_PETITIO",15;
+  - Combos:
+      - Combo:
+          - GoodnEvil_Circlet_CD   # 400378
+          - Sealed_Bible   # 540053
+    Script: |
+      .@r = getequiprefinerycnt(EQI_HAND_R)/3;
+      bonus bCritAtkRate,10*.@r;
+      bonus2 bSkillAtk,"CD_PETITIO",4*.@r;
+      if (getenchantgrade(EQI_HAND_R)>=ENCHANTGRADE_B) {
+         bonus2 bSkillAtk,"CD_PETITIO",10;
+      }
+  - Combos:
+      - Combo:
+          - GoodnEvil_Circlet_CD   # 400378
+          - Saint_Bringer   # 550088
+    Script: |
+      .@r = getequiprefinerycnt(EQI_HAND_R)/3;
+      bonus2 bSkillAtk,"CD_FRAMEN",4*.@r;
+      bonus2 bSkillAtk,"CD_ARBITRIUM_ATK",5*.@r;
+      if (getenchantgrade(EQI_HAND_R)>=ENCHANTGRADE_B) {
+         bonus2 bSkillAtk,"CD_FRAMEN",10;
+      }
+  - Combos:
+      - Combo:
+          - GoodnEvil_Circlet_IQ   # 400379
+          - Justice_Power   # 312014
+          - Punish_Hall   # 590045
+    Script: |
+      bonus2 bSkillAtk,"IQ_FIRST_BRAND",20;
+      bonus2 bSkillAtk,"IQ_THIRD_PUNISH",15;
+  - Combos:
+      - Combo:
+          - GoodnEvil_Circlet_IQ   # 400379
+          - Injustice_Power   # 312021
+          - Demonic_Claw   # 560036
+    Script: |
+      bonus2 bSkillAtk,"IQ_OLEUM_SANCTUM",20;
+      bonus2 bSkillAtk,"IQ_EXPOSION_BLASTER",15;
+  - Combos:
+      - Combo:
+          - GoodnEvil_Circlet_IQ   # 400379
+          - Demonic_Claw   # 560036
+    Script: |
+      .@r = getequiprefinerycnt(EQI_HAND_R)/3;
+      bonus2 bSkillAtk,"IQ_OLEUM_SANCTUM",5*.@r;
+      bonus2 bSkillAtk,"IQ_EXPOSION_BLASTER",4*.@r;
+      if (getenchantgrade(EQI_HAND_R)>=ENCHANTGRADE_B) {
+         bonus2 bSkillAtk,"IQ_EXPOSION_BLASTER",10;
+      }
+  - Combos:
+      - Combo:
+          - GoodnEvil_Circlet_IQ   # 400379
+          - Punish_Hall   # 590045
+    Script: |
+      .@r = getequiprefinerycnt(EQI_HAND_R)/3;
+      bonus2 bSkillAtk,"IQ_THIRD_PUNISH",4*.@r;
+      bonus2 bSkillAtk,"IQ_FIRST_BRAND",5*.@r;
+      if (getenchantgrade(EQI_HAND_R)>=ENCHANTGRADE_B) {
+         bonus2 bSkillAtk,"IQ_THIRD_PUNISH",10;
+      }
+  - Combos:
+      - Combo:
+          - GoodnEvil_Circlet_MT   # 400380
+          - Destruction_Axe   # 1341
+    Script: |
+      .@r = getequiprefinerycnt(EQI_HAND_R)/3;
+      bonus bCritAtkRate,10*.@r;
+      bonus2 bSkillAtk,"MT_TRIPLE_LASER",4*.@r;
+      if (getenchantgrade(EQI_HAND_R)>=ENCHANTGRADE_B) {
+         bonus2 bSkillAtk,"MT_TRIPLE_LASER",10;
+      }
+  - Combos:
+      - Combo:
+          - GoodnEvil_Circlet_MT   # 400380
+          - Destruction_Axe   # 1341
+          - Injustice_Power   # 312021
+    Script: |
+      bonus bCritAtkRate,25;
+      bonus2 bSkillAtk,"MT_TRIPLE_LASER",15;
+  - Combos:
+      - Combo:
+          - GoodnEvil_Circlet_MT   # 400380
+          - Justice_Power   # 312014
+          - Divine_Buster   # 620022
+    Script: |
+      bonus2 bSkillAtk,"MT_AXE_STOMP",20;
+      bonus2 bSkillAtk,"MT_MIGHTY_SMASH",15;
+  - Combos:
+      - Combo:
+          - GoodnEvil_Circlet_MT   # 400380
+          - Divine_Buster   # 620022
+    Script: |
+      .@r = getequiprefinerycnt(EQI_HAND_R)/3;
+      bonus2 bSkillAtk,"MT_MIGHTY_SMASH",4*.@r;
+      bonus2 bSkillAtk,"MT_AXE_STOMP",5*.@r;
+      if (getenchantgrade(EQI_HAND_R)>=ENCHANTGRADE_B) {
+         bonus2 bSkillAtk,"MT_MIGHTY_SMASH",10;
+      }
+  - Combos:
+      - Combo:
+          - GoodnEvil_Circlet_BO   # 400381
+          - Justice_Power   # 312014
+          - Victory_Sword   # 500066
+    Script: |
+      bonus bShortAtkRate,20;
+      bonus2 bSkillAtk,"BO_EXPLOSIVE_POWDER",15;
+  - Combos:
+      - Combo:
+          - GoodnEvil_Circlet_BO   # 400381
+          - Injustice_Power   # 312021
+          - Blood_Rapier   # 500065
+    Script: |
+      bonus bCritAtkRate,25;
+      bonus2 bSkillAtk,"BO_MAYHEMIC_THORNS",15;
+  - Combos:
+      - Combo:
+          - GoodnEvil_Circlet_BO   # 400381
+          - Blood_Rapier   # 500065
+    Script: |
+      .@r = getequiprefinerycnt(EQI_HAND_R)/3;
+      bonus bCritAtkRate,10*.@r;
+      bonus2 bSkillAtk,"BO_MAYHEMIC_THORNS",4*.@r;
+      if (getenchantgrade(EQI_HAND_R)>=ENCHANTGRADE_B) {
+         bonus2 bSkillAtk,"BO_MAYHEMIC_THORNS",10;
+      }
+  - Combos:
+      - Combo:
+          - GoodnEvil_Circlet_BO   # 400381
+          - Victory_Sword   # 500066
+    Script: |
+      .@r = getequiprefinerycnt(EQI_HAND_R)/3;
+      bonus bShortAtkRate,5*.@r;
+      bonus2 bSkillAtk,"BO_EXPLOSIVE_POWDER",4*.@r;
+      if (getenchantgrade(EQI_HAND_R)>=ENCHANTGRADE_B) {
+         bonus2 bSkillAtk,"BO_EXPLOSIVE_POWDER",10;
+      }
+  - Combos:
+      - Combo:
+          - GoodnEvil_Circlet_SHC   # 400382
+          - Justice_Power   # 312014
+          - Shining_Light_Katar   # 610045
+    Script: |
+      bonus2 bSkillAtk,"SHC_ETERNAL_SLASH",15;
+      bonus2 bSkillAtk,"SHC_SAVAGE_IMPACT",20;
+  - Combos:
+      - Combo:
+          - GoodnEvil_Circlet_SHC   # 400382
+          - Injustice_Power   # 312021
+          - The_Reaper   # 610044
+    Script: |
+      bonus bShortAtkRate,20;
+      bonus2 bSkillAtk,"SHC_IMPACT_CRATER",15;
+  - Combos:
+      - Combo:
+          - GoodnEvil_Circlet_SHC   # 400382
+          - The_Reaper   # 610044
+    Script: |
+      .@r = getequiprefinerycnt(EQI_HAND_R)/3;
+      bonus bShortAtkRate,5*.@r;
+      bonus2 bSkillAtk,"SHC_IMPACT_CRATER",4*.@r;
+      if (getenchantgrade(EQI_HAND_R)>=ENCHANTGRADE_B) {
+         bonus2 bSkillAtk,"SHC_IMPACT_CRATER",10;
+      }
+  - Combos:
+      - Combo:
+          - GoodnEvil_Circlet_SHC   # 400382
+          - Shining_Light_Katar   # 610045
+    Script: |
+      .@r = getequiprefinerycnt(EQI_HAND_R)/3;
+      bonus2 bSkillAtk,"SHC_ETERNAL_SLASH",4*.@r;
+      bonus2 bSkillAtk,"SHC_SAVAGE_IMPACT",5*.@r;
+      if (getenchantgrade(EQI_HAND_R)>=ENCHANTGRADE_B) {
+         bonus2 bSkillAtk,"SHC_ETERNAL_SLASH",10;
+      }
+  - Combos:
+      - Combo:
+          - GoodnEvil_Circlet_ABC   # 400383
+          - Justice_Power   # 312014
+          - Holy_Light_Dagger   # 510092
+    Script: |
+      bonus2 bSkillAtk,"ABC_DEFT_STAB",20;
+      bonus2 bSkillAtk,"ABC_ABYSS_DAGGER",15;
+  - Combos:
+      - Combo:
+          - GoodnEvil_Circlet_ABC   # 400383
+          - Injustice_Power   # 312021
+          - Dark_Angel_Ray_Bow   # 700066
+    Script: |
+      bonus2 bSkillAtk,"ABC_FRENZY_SHOT",20;
+      bonus2 bSkillAtk,"ABC_CHAIN_REACTION_SHOT_ATK",15;
+  - Combos:
+      - Combo:
+          - GoodnEvil_Circlet_ABC   # 400383
+          - Holy_Light_Dagger   # 510092
+    Script: |
+      .@r = getequiprefinerycnt(EQI_HAND_R)/3;
+      bonus2 bSkillAtk,"ABC_ABYSS_DAGGER",4*.@r;
+      bonus2 bSkillAtk,"ABC_DEFT_STAB",5*.@r;
+      if (getenchantgrade(EQI_HAND_R)>=ENCHANTGRADE_B) {
+         bonus2 bSkillAtk,"ABC_ABYSS_DAGGER",10;
+      }
+  - Combos:
+      - Combo:
+          - GoodnEvil_Circlet_ABC   # 400383
+          - Dark_Angel_Ray_Bow   # 700066
+    Script: |
+      .@r = getequiprefinerycnt(EQI_HAND_R)/3;
+      bonus2 bSkillAtk,"ABC_FRENZY_SHOT",5*.@r;
+      bonus2 bSkillAtk,"ABC_CHAIN_REACTION_SHOT_ATK",4*.@r;
+      if (getenchantgrade(EQI_HAND_R)>=ENCHANTGRADE_B) {
+         bonus2 bSkillAtk,"ABC_CHAIN_REACTION_SHOT_ATK",10;
+      }
+  - Combos:
+      - Combo:
+          - GoodnEvil_Circlet_WH   # 400384
+          - Justice_Power   # 312014
+          - Angel_Wing_Bow   # 700065
+    Script: |
+      bonus2 bSkillAtk,"WH_GALESTORM",20;
+      bonus2 bSkillAtk,"WH_CRESCIVE_BOLT",15;
+  - Combos:
+      - Combo:
+          - GoodnEvil_Circlet_WH   # 400384
+          - Injustice_Power   # 312021
+          - Underworld_Knife   # 510091
+    Script: |
+      bonus2 bSkillAtk,"WH_DEEPBLINDTRAP",20;
+      bonus2 bSkillAtk,"WH_SWIFTTRAP",20;
+      bonus2 bSkillAtk,"WH_SOLIDTRAP",15;
+      bonus2 bSkillAtk,"WH_FLAMETRAP",15;
+  - Combos:
+      - Combo:
+          - GoodnEvil_Circlet_WH   # 400384
+          - Underworld_Knife   # 510091
+    Script: |
+      .@r = getequiprefinerycnt(EQI_HAND_R)/3;
+      bonus2 bSkillAtk,"WH_DEEPBLINDTRAP",5*.@r;
+      bonus2 bSkillAtk,"WH_SWIFTTRAP",5*.@r;
+      bonus2 bSkillAtk,"WH_SOLIDTRAP",4*.@r;
+      bonus2 bSkillAtk,"WH_FLAMETRAP",4*.@r;
+      if (getenchantgrade(EQI_HAND_R)>=ENCHANTGRADE_B) {
+         bonus2 bSkillAtk,"WH_SOLIDTRAP",10;
+         bonus2 bSkillAtk,"WH_FLAMETRAP",10;
+      }
+  - Combos:
+      - Combo:
+          - GoodnEvil_Circlet_WH   # 400384
+          - Angel_Wing_Bow   # 700065
+    Script: |
+      .@r = getequiprefinerycnt(EQI_HAND_R)/3;
+      bonus2 bSkillAtk,"WH_CRESCIVE_BOLT",4*.@r;
+      bonus2 bSkillAtk,"WH_GALESTORM",5*.@r;
+      if (getenchantgrade(EQI_HAND_R)>=ENCHANTGRADE_B) {
+         bonus2 bSkillAtk,"WH_CRESCIVE_BOLT",10;
+      }
+  - Combos:
+      - Combo:
+          - GoodnEvil_Circlet_TR   # 400385
+          - Justice_Power   # 312014
+          - Light_Power_Harp   # 570037
+      - Combo:
+          - GoodnEvil_Circlet_TR   # 400385
+          - Justice_Power   # 312014
+          - Light_Power_Spark   # 580038
+    Script: |
+      bonus2 bSkillAtk,"TR_ROSEBLOSSOM_ATK",20;
+      bonus2 bSkillAtk,"TR_RHYTHMSHOOTING",15;
+  - Combos:
+      - Combo:
+          - GoodnEvil_Circlet_TR   # 400385
+          - Injustice_Power   # 312021
+          - Crime_Violine   # 570036
+      - Combo:
+          - GoodnEvil_Circlet_TR   # 400385
+          - Injustice_Power   # 312021
+          - Crime_Whip   # 580037
+    Script: |
+      bonus2 bSkillAtk,"TR_SOUNDBLEND",20;
+      bonus2 bSkillAtk,"TR_METALIC_FURY",15;
+  - Combos:
+      - Combo:
+          - GoodnEvil_Circlet_TR   # 400385
+          - Crime_Violine   # 570036
+      - Combo:
+          - GoodnEvil_Circlet_TR   # 400385
+          - Crime_Whip   # 580037
+    Script: |
+      .@r = getequiprefinerycnt(EQI_HAND_R)/3;
+      bonus2 bSkillAtk,"TR_SOUNDBLEND",5*.@r;
+      bonus2 bSkillAtk,"TR_METALIC_FURY",4*.@r;
+      if (getenchantgrade(EQI_HAND_R)>=ENCHANTGRADE_B) {
+         bonus2 bSkillAtk,"TR_METALIC_FURY",10;
+      }
+  - Combos:
+      - Combo:
+          - GoodnEvil_Circlet_TR   # 400385
+          - Light_Power_Harp   # 570037
+      - Combo:
+          - GoodnEvil_Circlet_TR   # 400385
+          - Light_Power_Spark   # 580038
+    Script: |
+      .@r = getequiprefinerycnt(EQI_HAND_R)/3;
+      bonus2 bSkillAtk,"TR_RHYTHMSHOOTING",4*.@r;
+      bonus2 bSkillAtk,"TR_ROSEBLOSSOM_ATK",5*.@r;
+      if (getenchantgrade(EQI_HAND_R)>=ENCHANTGRADE_B) {
+         bonus2 bSkillAtk,"TR_RHYTHMSHOOTING",10;
+      }
+  - Combos:
+      - Combo:
+          - GoodnEvil_Circlet_SS   # 400386
+          - Justice_Power   # 312014
+          - Humma_Brilliance   # 650034
+    Script: |
+      bonus2 bSkillAtk,"SS_FUUMASHOUAKU",20;
+      bonus2 bSkillAtk,"SS_FUUMAKOUCHIKU",15;
+  - Combos:
+      - Combo:
+          - GoodnEvil_Circlet_SS   # 400386
+          - Injustice_Power   # 312021
+          - Devil_Claw   # 650033
+    Script: |
+      bonus2 bSkillAtk,"SS_SEKIENHOU",20;
+      bonus2 bSkillAtk,"SS_ANTENPOU",15;
+  - Combos:
+      - Combo:
+          - GoodnEvil_Circlet_SS   # 400386
+          - Devil_Claw   # 650033
+    Script: |
+      .@r = getequiprefinerycnt(EQI_HAND_R)/3;
+      bonus2 bSkillAtk,"SS_SEKIENHOU",5*.@r;
+      bonus2 bSkillAtk,"SS_ANTENPOU",4*.@r;
+      if (getenchantgrade(EQI_HAND_R)>=ENCHANTGRADE_B) {
+         bonus2 bSkillAtk,"SS_ANTENPOU",10;
+      }
+  - Combos:
+      - Combo:
+          - GoodnEvil_Circlet_SS   # 400386
+          - Humma_Brilliance   # 650034
+    Script: |
+      .@r = getequiprefinerycnt(EQI_HAND_R)/3;
+      bonus2 bSkillAtk,"SS_FUUMAKOUCHIKU",4*.@r;
+      bonus2 bSkillAtk,"SS_FUUMASHOUAKU",5*.@r;
+      if (getenchantgrade(EQI_HAND_R)>=ENCHANTGRADE_B) {
+         bonus2 bSkillAtk,"SS_FUUMAKOUCHIKU",10;
+      }
+  - Combos:
+      - Combo:
+          - GoodnEvil_Circlet_SKE   # 400387
+          - Justice_Power   # 312014
+          - Orign_Of_Life   # 540055
+    Script: |
+      bonus2 bSkillAtk,"SKE_SUNSET_BLAST",20;
+      bonus2 bSkillAtk,"SKE_NOON_BLAST",15;
+  - Combos:
+      - Combo:
+          - GoodnEvil_Circlet_SKE   # 400387
+          - Injustice_Power   # 312021
+          - Darkness_Tablet   # 540054
+    Script: |
+      bonus2 bSkillAtk,"SKE_DAWN_BREAK",20;
+      bonus2 bSkillAtk,"SKE_MIDNIGHT_KICK",15;
+  - Combos:
+      - Combo:
+          - GoodnEvil_Circlet_SKE   # 400387
+          - Darkness_Tablet   # 540054
+    Script: |
+      .@r = getequiprefinerycnt(EQI_HAND_R)/3;
+      bonus2 bSkillAtk,"SKE_DAWN_BREAK",5*.@r;
+      bonus2 bSkillAtk,"SKE_MIDNIGHT_KICK",4*.@r;
+      if (getenchantgrade(EQI_HAND_R)>=ENCHANTGRADE_B) {
+         bonus2 bSkillAtk,"SKE_MIDNIGHT_KICK",10;
+      }
+  - Combos:
+      - Combo:
+          - GoodnEvil_Circlet_SKE   # 400387
+          - Orign_Of_Life   # 540055
+    Script: |
+      .@r = getequiprefinerycnt(EQI_HAND_R)/3;
+      bonus2 bSkillAtk,"SKE_NOON_BLAST",4*.@r;
+      bonus2 bSkillAtk,"SKE_SUNSET_BLAST",5*.@r;
+      if (getenchantgrade(EQI_HAND_R)>=ENCHANTGRADE_B) {
+         bonus2 bSkillAtk,"SKE_NOON_BLAST",10;
+      }
+  - Combos:
+      - Combo:
+          - GoodnEvil_Circlet_SOA   # 400388
+          - Justice_Power   # 312014
+          - Soul_Liberator   # 550094
+    Script: |
+      bonus2 bSkillAtk,"SOA_TALISMAN_OF_RED_PHOENIX",20;
+      bonus2 bSkillAtk,"SOA_TALISMAN_OF_FOUR_BEARING_GOD",15;
+  - Combos:
+      - Combo:
+          - GoodnEvil_Circlet_SOA   # 400388
+          - Injustice_Power   # 312021
+          - Soul_Harvest   # 550093
+    Script: |
+      bonus2 bSkillAtk,"SOA_TALISMAN_OF_SOUL_STEALING",20;
+      bonus2 bSkillAtk,"SOA_EXORCISM_OF_MALICIOUS_SOUL",15;
+  - Combos:
+      - Combo:
+          - GoodnEvil_Circlet_SOA   # 400388
+          - Soul_Harvest   # 550093
+    Script: |
+      .@r = getequiprefinerycnt(EQI_HAND_R)/3;
+      bonus2 bSkillAtk,"SOA_TALISMAN_OF_SOUL_STEALING",5*.@r;
+      bonus2 bSkillAtk,"SOA_EXORCISM_OF_MALICIOUS_SOUL",4*.@r;
+      if (getenchantgrade(EQI_HAND_R)>=ENCHANTGRADE_B) {
+         bonus2 bSkillAtk,"SOA_EXORCISM_OF_MALICIOUS_SOUL",10;
+      }
+  - Combos:
+      - Combo:
+          - GoodnEvil_Circlet_SOA   # 400388
+          - Soul_Liberator   # 550094
+    Script: |
+      .@r = getequiprefinerycnt(EQI_HAND_R)/3;
+      bonus2 bSkillAtk,"SOA_TALISMAN_OF_FOUR_BEARING_GOD",4*.@r;
+      bonus2 bSkillAtk,"SOA_TALISMAN_OF_RED_PHOENIX",5*.@r;
+      if (getenchantgrade(EQI_HAND_R)>=ENCHANTGRADE_B) {
+         bonus2 bSkillAtk,"SOA_TALISMAN_OF_FOUR_BEARING_GOD",10;
+      }
+  - Combos:
+      - Combo:
+          - GoodnEvil_Circlet_HN   # 400389
+          - Justice_Power   # 312014
+          - Guardian_Saber   # 500063
+    Script: |
+      bonus2 bSkillAtk,"HN_SPIRAL_PIERCE_MAX",20;
+      bonus2 bSkillAtk,"HN_SHIELD_CHAIN_RUSH",15;
+  - Combos:
+      - Combo:
+          - GoodnEvil_Circlet_HN   # 400389
+          - Injustice_Power   # 312021
+          - Devil_Cursed_Sword   # 500062
+    Script: |
+      bonus2 bSkillAtk,"HN_GROUND_GRAVITATION",20;
+      bonus2 bSkillAtk,"HN_NAPALM_VULCAN_STRIKE",15;
+  - Combos:
+      - Combo:
+          - GoodnEvil_Circlet_HN   # 400389
+          - Devil_Cursed_Sword   # 500062
+    Script: |
+      .@r = getequiprefinerycnt(EQI_HAND_R)/3;
+      bonus2 bSkillAtk,"HN_GROUND_GRAVITATION",5*.@r;
+      bonus2 bSkillAtk,"HN_NAPALM_VULCAN_STRIKE",4*.@r;
+      if (getenchantgrade(EQI_HAND_R)>=ENCHANTGRADE_B) {
+         bonus2 bSkillAtk,"HN_NAPALM_VULCAN_STRIKE",10;
+      }
+  - Combos:
+      - Combo:
+          - GoodnEvil_Circlet_HN   # 400389
+          - Guardian_Saber   # 500063
+    Script: |
+      .@r = getequiprefinerycnt(EQI_HAND_R)/3;
+      bonus2 bSkillAtk,"HN_SHIELD_CHAIN_RUSH",4*.@r;
+      bonus2 bSkillAtk,"HN_SPIRAL_PIERCE_MAX",5*.@r;
+      if (getenchantgrade(EQI_HAND_R)>=ENCHANTGRADE_B) {
+         bonus2 bSkillAtk,"HN_SHIELD_CHAIN_RUSH",10;
+      }
+  - Combos:
+      - Combo:
+          - GoodnEvil_Circlet_SH   # 400390
+          - Justice_Power   # 312014
+          - Lightforce_Foxtail_Wand   # 550116
+    Script: |
+      bonus2 bSkillAtk,"SH_HOGOGONG_STRIKE",20;
+      bonus2 bSkillAtk,"SH_CHUL_HO_SONIC_CLAW",15;
+  - Combos:
+      - Combo:
+          - GoodnEvil_Circlet_SH   # 400390
+          - Injustice_Power   # 312021
+          - Darkness_Foxtail_Model   # 550115
+    Script: |
+      bonus2 bSkillAtk,"SH_HYUN_ROKS_BREEZE",20;
+      bonus2 bSkillAtk,"SH_HYUN_ROK_CANNON",15;
+  - Combos:
+      - Combo:
+          - GoodnEvil_Circlet_SH   # 400390
+          - Darkness_Foxtail_Model   # 550115
+    Script: |
+      .@r = getequiprefinerycnt(EQI_HAND_R)/3;
+      bonus2 bSkillAtk,"SH_HYUN_ROKS_BREEZE",5*.@r;
+      bonus2 bSkillAtk,"SH_HYUN_ROK_CANNON",4*.@r;
+      if (getenchantgrade(EQI_HAND_R)>=ENCHANTGRADE_B) {
+         bonus2 bSkillAtk,"SH_HYUN_ROK_CANNON",10;
+      }
+  - Combos:
+      - Combo:
+          - GoodnEvil_Circlet_SH   # 400390
+          - Lightforce_Foxtail_Wand   # 550116
+    Script: |
+      .@r = getequiprefinerycnt(EQI_HAND_R)/3;
+      bonus2 bSkillAtk,"SH_CHUL_HO_SONIC_CLAW",4*.@r;
+      bonus2 bSkillAtk,"SH_HOGOGONG_STRIKE",5*.@r;
+      if (getenchantgrade(EQI_HAND_R)>=ENCHANTGRADE_B) {
+         bonus2 bSkillAtk,"SH_CHUL_HO_SONIC_CLAW",10;
+      }
+  - Combos:
+      - Combo:
+          - GoodnEvil_Circlet_NW   # 400391
+          - Justice_Power   # 312014
+          - Justice_Bomber   # 840021
+    Script: |
+      bonus bLongAtkRate,20;
+      bonus2 bSkillAtk,"NW_WILD_FIRE",15;
+  - Combos:
+      - Combo:
+          - GoodnEvil_Circlet_NW   # 400391
+          - Injustice_Power   # 312021
+          - Devil_L_Launcher   # 840020
+    Script: |
+      bonus bLongAtkRate,20;
+      bonus2 bSkillAtk,"NW_SPIRAL_SHOOTING",15;
+  - Combos:
+      - Combo:
+          - GoodnEvil_Circlet_NW   # 400391
+          - Devil_L_Launcher   # 840020
+    Script: |
+      .@r = getequiprefinerycnt(EQI_HAND_R)/3;
+      bonus bLongAtkRate,5*.@r;
+      bonus2 bSkillAtk,"NW_SPIRAL_SHOOTING",4*.@r;
+      if (getenchantgrade(EQI_HAND_R)>=ENCHANTGRADE_B) {
+         bonus2 bSkillAtk,"NW_SPIRAL_SHOOTING",10;
+      }
+  - Combos:
+      - Combo:
+          - GoodnEvil_Circlet_NW   # 400391
+          - Justice_Bomber   # 840021
+    Script: |
+      .@r = getequiprefinerycnt(EQI_HAND_R)/3;
+      bonus bLongAtkRate,5*.@r;
+      bonus2 bSkillAtk,"NW_WILD_FIRE",4*.@r;
+      if (getenchantgrade(EQI_HAND_R)>=ENCHANTGRADE_B) {
+         bonus2 bSkillAtk,"NW_WILD_FIRE",10;
+      }
+  - Combos:
+      - Combo:
+          - GoodnEvil_Circlet_NW2   # 400392
+          - Justice_Power   # 312014
+          - Devil_Hunter   # 800027
+    Script: |
+      bonus bCritAtkRate,25;
+      bonus2 bSkillAtk,"NW_MAGAZINE_FOR_ONE",15;
+  - Combos:
+      - Combo:
+          - GoodnEvil_Circlet_NW2   # 400392
+          - Injustice_Power   # 312021
+          - Devils_Bullet   # 800026
+    Script: |
+      bonus bLongAtkRate,20;
+      bonus2 bSkillAtk,"NW_ONLY_ONE_BULLET",15;
+  - Combos:
+      - Combo:
+          - GoodnEvil_Circlet_NW2   # 400392
+          - Devils_Bullet   # 800026
+    Script: |
+      .@r = getequiprefinerycnt(EQI_HAND_R)/3;
+      bonus bLongAtkRate,5*.@r;
+      bonus2 bSkillAtk,"NW_ONLY_ONE_BULLET",4*.@r;
+      if (getenchantgrade(EQI_HAND_R)>=ENCHANTGRADE_B) {
+         bonus2 bSkillAtk,"NW_ONLY_ONE_BULLET",10;
+      }
+  - Combos:
+      - Combo:
+          - GoodnEvil_Circlet_NW2   # 400392
+          - Devil_Hunter   # 800027
+    Script: |
+      .@r = getequiprefinerycnt(EQI_HAND_R)/3;
+      bonus bCritAtkRate,10*.@r;
+      bonus2 bSkillAtk,"NW_MAGAZINE_FOR_ONE",4*.@r;
+      if (getenchantgrade(EQI_HAND_R)>=ENCHANTGRADE_B) {
+         bonus2 bSkillAtk,"NW_MAGAZINE_FOR_ONE",10;
+      }
+  - Combos:
+      - Combo:
+          - GoodnEvil_Circlet_NW3   # 400393
+          - Justice_Power   # 312014
+          - Lighting_Splatter   # 830026
+    Script: |
+      bonus bLongAtkRate,20;
+      bonus2 bSkillAtk,"NW_MAGAZINE_FOR_ONE",15;
+  - Combos:
+      - Combo:
+          - GoodnEvil_Circlet_NW3   # 400393
+          - Injustice_Power   # 312021
+          - RG_5649   # 830025
+    Script: |
+      bonus bLongAtkRate,20;
+      bonus2 bSkillAtk,"NW_THE_VIGILANTE_AT_NIGHT",15;
+  - Combos:
+      - Combo:
+          - GoodnEvil_Circlet_NW3   # 400393
+          - RG_5649   # 830025
+    Script: |
+      .@r = getequiprefinerycnt(EQI_HAND_R)/3;
+      bonus bLongAtkRate,5*.@r;
+      bonus2 bSkillAtk,"NW_THE_VIGILANTE_AT_NIGHT",4*.@r;
+      if (getenchantgrade(EQI_HAND_R)>=ENCHANTGRADE_B) {
+         bonus2 bSkillAtk,"NW_THE_VIGILANTE_AT_NIGHT",10;
+      }
+  - Combos:
+      - Combo:
+          - GoodnEvil_Circlet_NW3   # 400393
+          - Lighting_Splatter   # 830026
+    Script: |
+      .@r = getequiprefinerycnt(EQI_HAND_R)/3;
+      bonus bLongAtkRate,5*.@r;
+      bonus2 bSkillAtk,"NW_MAGAZINE_FOR_ONE",4*.@r;
+      if (getenchantgrade(EQI_HAND_R)>=ENCHANTGRADE_B) {
+         bonus2 bSkillAtk,"NW_MAGAZINE_FOR_ONE",10;
+      }
+  - Combos:
+      - Combo:
+          - GoodnEvil_Circlet_NW4   # 400394
+          - Justice_Power   # 312014
+          - Road_Of_Glory   # 820021
+    Script: |
+      bonus bLongAtkRate,20;
+      bonus2 bSkillAtk,"NW_THE_VIGILANTE_AT_NIGHT",15;
+  - Combos:
+      - Combo:
+          - GoodnEvil_Circlet_NW4   # 400394
+          - Injustice_Power   # 312021
+          - Outlaw_Cursed_Shotgun   # 820020
+    Script: |
+      bonus bLongAtkRate,20;
+      bonus2 bSkillAtk,"NW_WILD_FIRE",15;
+  - Combos:
+      - Combo:
+          - GoodnEvil_Circlet_NW4   # 400394
+          - Outlaw_Cursed_Shotgun   # 820020
+    Script: |
+      .@r = getequiprefinerycnt(EQI_HAND_R)/3;
+      bonus bLongAtkRate,5*.@r;
+      bonus2 bSkillAtk,"NW_WILD_FIRE",4*.@r;
+      if (getenchantgrade(EQI_HAND_R)>=ENCHANTGRADE_B) {
+         bonus2 bSkillAtk,"NW_WILD_FIRE",10;
+      }
+  - Combos:
+      - Combo:
+          - GoodnEvil_Circlet_NW4   # 400394
+          - Road_Of_Glory   # 820021
+    Script: |
+      .@r = getequiprefinerycnt(EQI_HAND_R)/3;
+      bonus bLongAtkRate,5*.@r;
+      bonus2 bSkillAtk,"NW_THE_VIGILANTE_AT_NIGHT",4*.@r;
+      if (getenchantgrade(EQI_HAND_R)>=ENCHANTGRADE_B) {
+         bonus2 bSkillAtk,"NW_THE_VIGILANTE_AT_NIGHT",10;
+      }
+  - Combos:
+      - Combo:
+          - GoodnEvil_Circlet_NW5   # 400395
+          - Justice_Power   # 312014
+          - Last_Dawn   # 810027
+    Script: |
+      bonus2 bSkillAtk,"NW_ONLY_ONE_BULLET",20;
+      bonus2 bSkillAtk,"NW_SPIRAL_SHOOTING",15;
+  - Combos:
+      - Combo:
+          - GoodnEvil_Circlet_NW5   # 400395
+          - Injustice_Power   # 312021
+          - Screaming_Rifle   # 810026
+    Script: |
+      bonus2 bSkillAtk,"NW_GRENADES_DROPPING",20;
+      bonus2 bSkillAtk,"NW_HASTY_FIRE_IN_THE_HOLE",15;
+  - Combos:
+      - Combo:
+          - GoodnEvil_Circlet_NW5   # 400395
+          - Screaming_Rifle   # 810026
+    Script: |
+      .@r = getequiprefinerycnt(EQI_HAND_R)/3;
+      bonus2 bSkillAtk,"NW_GRENADES_DROPPING",5*.@r;
+      bonus2 bSkillAtk,"NW_HASTY_FIRE_IN_THE_HOLE",4*.@r;
+      if (getenchantgrade(EQI_HAND_R)>=ENCHANTGRADE_B) {
+         bonus2 bSkillAtk,"NW_HASTY_FIRE_IN_THE_HOLE",10;
+      }
+  - Combos:
+      - Combo:
+          - GoodnEvil_Circlet_NW5   # 400395
+          - Last_Dawn   # 810027
+    Script: |
+      .@r = getequiprefinerycnt(EQI_HAND_R)/3;
+      bonus2 bSkillAtk,"NW_ONLY_ONE_BULLET",5*.@r;
+      bonus2 bSkillAtk,"NW_SPIRAL_SHOOTING",4*.@r;
+      if (getenchantgrade(EQI_HAND_R)>=ENCHANTGRADE_B) {
+         bonus2 bSkillAtk,"NW_SPIRAL_SHOOTING",10;
+      }

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


+ 23 - 2
db/re/item_db_etc.yml

@@ -35602,7 +35602,7 @@ Body:
     Type: Etc
     Weight: 10
   - Id: 25298
-    AegisName: Spirit_Jewel
+    AegisName: SpritJewel
     Name: Spirit Jewel
     Type: Etc
     Weight: 10
@@ -35695,7 +35695,7 @@ Body:
     Type: Etc
     Weight: 10
   - Id: 25313
-    AegisName: Old_Shell
+    AegisName: OldShell
     Name: Old Shell
     Type: Etc
     Weight: 10
@@ -65517,6 +65517,16 @@ Body:
     SubType: Enchant
     Script: |
       bonus bWis,5;
+  - Id: 312014
+    AegisName: Justice_Power
+    Name: Good Spell
+    Type: Card
+    SubType: Enchant
+  - Id: 312021
+    AegisName: Injustice_Power
+    Name: Evil Spell
+    Type: Card
+    SubType: Enchant
   - Id: 1000000
     AegisName: IDTest_event
     Name: IDTest event
@@ -69997,6 +70007,17 @@ Body:
     Name: Stamina Wisdom Stone (Dual)
     Type: Etc
     Weight: 100
+  - Id: 1001173
+    AegisName: Rusty_Bottle_Cap
+    Name: Rusty Bottle Cap    # !todo check english name
+    Type: Etc
+    Trade:
+      NoDrop: true
+      NoTrade: true
+      NoCart: true
+      NoGuildStorage: true
+      NoMail: true
+      NoAuction: true
   - Id: 1001174
     AegisName: Ymir_Heart_TW
     Name: Imelo Heart Power Stone    # !todo check english name

File diff suppressed because it is too large
+ 86 - 174
db/re/item_enchant.yml


+ 2 - 2
db/re/laphine_synthesis.yml

@@ -1387,7 +1387,7 @@ Body:
         Amount: 10
       - Item: Frozen_Stone_Fragment
         Amount: 10
-      - Item: Spirit_Jewel
+      - Item: SpritJewel
         Amount: 10
       - Item: Snowball
         Amount: 10
@@ -1419,7 +1419,7 @@ Body:
         Amount: 10
       - Item: Fine_Old_Doll
         Amount: 10
-      - Item: Old_Shell
+      - Item: OldShell
         Amount: 10
       - Item: Ein_SOLIDDUST
         Amount: 10

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