Fixed Yorscalp combos (#8756)

Follow-up https://github.com/rathena/rathena/commit/c313602b06f6c64fc22da13b2f72079aafbcf103

db/re/item_combos.yml

@@ -52932,185 +52932,185 @@ Body:
           - aegis_300585   # 300585
           - Yorscalp_P_Circlet   # 400723
     Script: |
-      .@sum = getequiprefinerycnt(EQI_HAND_R)+getequiprefinerycnt(EQI_HEAD_TOP);
-      if (getenchantgrade(EQI_HEAD_TOP)>=ENCHANTGRADE_A && .@sum>=10) {
-         bonus2 bSkillAtk,"DK_HACKANDSLASHER",(.@sum-10)*12;
-         bonus2 bSkillAtk,"DK_STORMSLASH",(.@sum-10)*12;
+      .@r = getequiprefinerycnt(EQI_HEAD_TOP);
+      if (getenchantgrade(EQI_HEAD_TOP)>=ENCHANTGRADE_A && .@r>=10) {
+         bonus2 bSkillAtk,"DK_HACKANDSLASHER",(.@r-10)*12;
+         bonus2 bSkillAtk,"DK_STORMSLASH",(.@r-10)*12;
       }
   - Combos:
       - Combo:
           - aegis_300586   # 300586
           - Yorscalp_P_Circlet   # 400723
     Script: |
-      .@sum = getequiprefinerycnt(EQI_HAND_R)+getequiprefinerycnt(EQI_HEAD_TOP);
-      if (getenchantgrade(EQI_HEAD_TOP)>=ENCHANTGRADE_A && .@sum>=10) {
-         bonus2 bSkillAtk,"IG_IMPERIAL_CROSS",(.@sum-10)*12;
-         bonus2 bSkillAtk,"IG_OVERSLASH",(.@sum-10)*12;
+      .@r = getequiprefinerycnt(EQI_HEAD_TOP);
+      if (getenchantgrade(EQI_HEAD_TOP)>=ENCHANTGRADE_A && .@r>=10) {
+         bonus2 bSkillAtk,"IG_IMPERIAL_CROSS",(.@r-10)*12;
+         bonus2 bSkillAtk,"IG_OVERSLASH",(.@r-10)*12;
       }
   - Combos:
       - Combo:
           - aegis_300587   # 300587
           - Yorscalp_P_Circlet   # 400723
     Script: |
-      .@sum = getequiprefinerycnt(EQI_HAND_R)+getequiprefinerycnt(EQI_HEAD_TOP);
-      if (getenchantgrade(EQI_HEAD_TOP)>=ENCHANTGRADE_A && .@sum>=10) {
-         bonus2 bSkillAtk,"IQ_EXPOSION_BLASTER",(.@sum-10)*12;
-         bonus2 bSkillAtk,"IQ_BLAZING_FLAME_BLAST",(.@sum-10)*12;
+      .@r = getequiprefinerycnt(EQI_HEAD_TOP);
+      if (getenchantgrade(EQI_HEAD_TOP)>=ENCHANTGRADE_A && .@r>=10) {
+         bonus2 bSkillAtk,"IQ_EXPOSION_BLASTER",(.@r-10)*12;
+         bonus2 bSkillAtk,"IQ_BLAZING_FLAME_BLAST",(.@r-10)*12;
       }
   - Combos:
       - Combo:
           - aegis_300588   # 300588
           - Yorscalp_M_Circlet   # 400724
     Script: |
-      .@sum = getequiprefinerycnt(EQI_HAND_R)+getequiprefinerycnt(EQI_HEAD_TOP);
-      if (getenchantgrade(EQI_HEAD_TOP)>=ENCHANTGRADE_A && .@sum>=10) {
-         bonus2 bSkillAtk,"CD_ARBITRIUM",(.@sum-10)*12;
-         bonus2 bSkillAtk,"CD_ARBITRIUM_ATK",(.@sum-10)*12;
-         bonus2 bSkillAtk,"CD_DIVINUS_FLOS",(.@sum-10)*12;
+      .@r = getequiprefinerycnt(EQI_HEAD_TOP);
+      if (getenchantgrade(EQI_HEAD_TOP)>=ENCHANTGRADE_A && .@r>=10) {
+         bonus2 bSkillAtk,"CD_ARBITRIUM",(.@r-10)*12;
+         bonus2 bSkillAtk,"CD_ARBITRIUM_ATK",(.@r-10)*12;
+         bonus2 bSkillAtk,"CD_DIVINUS_FLOS",(.@r-10)*12;
       }
   - Combos:
       - Combo:
           - aegis_300589   # 300589
           - Yorscalp_P_Circlet   # 400723
     Script: |
-      .@sum = getequiprefinerycnt(EQI_HAND_R)+getequiprefinerycnt(EQI_HEAD_TOP);
-      if (getenchantgrade(EQI_HEAD_TOP)>=ENCHANTGRADE_A && .@sum>=10) {
-         bonus2 bSkillAtk,"MT_ENERGY_CANNONADE",(.@sum-10)*12;
-         bonus2 bSkillAtk,"MT_SPARK_BLASTER",(.@sum-10)*12;
+      .@r = getequiprefinerycnt(EQI_HEAD_TOP);
+      if (getenchantgrade(EQI_HEAD_TOP)>=ENCHANTGRADE_A && .@r>=10) {
+         bonus2 bSkillAtk,"MT_ENERGY_CANNONADE",(.@r-10)*12;
+         bonus2 bSkillAtk,"MT_SPARK_BLASTER",(.@r-10)*12;
       }
   - Combos:
       - Combo:
           - aegis_300590   # 300590
           - Yorscalp_P_Circlet   # 400723
     Script: |
-      .@sum = getequiprefinerycnt(EQI_HAND_R)+getequiprefinerycnt(EQI_HEAD_TOP);
-      if (getenchantgrade(EQI_HEAD_TOP)>=ENCHANTGRADE_A && .@sum>=10) {
-         bonus2 bSkillAtk,"BO_DUST_EXPLOSION",(.@sum-10)*12;
-         bonus2 bSkillAtk,"BO_MYSTERY_POWDER",(.@sum-10)*12;
+      .@r = getequiprefinerycnt(EQI_HEAD_TOP);
+      if (getenchantgrade(EQI_HEAD_TOP)>=ENCHANTGRADE_A && .@r>=10) {
+         bonus2 bSkillAtk,"BO_DUST_EXPLOSION",(.@r-10)*12;
+         bonus2 bSkillAtk,"BO_MYSTERY_POWDER",(.@r-10)*12;
       }
   - Combos:
       - Combo:
           - aegis_300591   # 300591
           - Yorscalp_P_Circlet   # 400723
     Script: |
-      .@sum = getequiprefinerycnt(EQI_HAND_R)+getequiprefinerycnt(EQI_HEAD_TOP);
-      if (getenchantgrade(EQI_HEAD_TOP)>=ENCHANTGRADE_A && .@sum>=10) {
-         bonus2 bSkillAtk,"SHC_ETERNAL_SLASH",(.@sum-10)*12;
-         bonus2 bSkillAtk,"SHC_CROSS_SLASH",(.@sum-10)*12;
+      .@r = getequiprefinerycnt(EQI_HEAD_TOP);
+      if (getenchantgrade(EQI_HEAD_TOP)>=ENCHANTGRADE_A && .@r>=10) {
+         bonus2 bSkillAtk,"SHC_ETERNAL_SLASH",(.@r-10)*12;
+         bonus2 bSkillAtk,"SHC_CROSS_SLASH",(.@r-10)*12;
       }
   - Combos:
       - Combo:
           - aegis_300592   # 300592
           - Yorscalp_M_Circlet   # 400724
     Script: |
-      .@sum = getequiprefinerycnt(EQI_HAND_R)+getequiprefinerycnt(EQI_HEAD_TOP);
-      if (getenchantgrade(EQI_HEAD_TOP)>=ENCHANTGRADE_A && .@sum>=10) {
-         bonus2 bSkillAtk,"ABC_ABYSS_SQUARE",(.@sum-10)*12;
-         bonus2 bSkillAtk,"ABC_ABYSS_FLAME",(.@sum-10)*12;
-         bonus2 bSkillAtk,"ABC_ABYSS_FLAME_ATK",(.@sum-10)*12;
+      .@r = getequiprefinerycnt(EQI_HEAD_TOP);
+      if (getenchantgrade(EQI_HEAD_TOP)>=ENCHANTGRADE_A && .@r>=10) {
+         bonus2 bSkillAtk,"ABC_ABYSS_SQUARE",(.@r-10)*12;
+         bonus2 bSkillAtk,"ABC_ABYSS_FLAME",(.@r-10)*12;
+         bonus2 bSkillAtk,"ABC_ABYSS_FLAME_ATK",(.@r-10)*12;
       }
   - Combos:
       - Combo:
           - aegis_300593   # 300593
           - Yorscalp_M_Circlet   # 400724
     Script: |
-      .@sum = getequiprefinerycnt(EQI_HAND_R)+getequiprefinerycnt(EQI_HEAD_TOP);
-      if (getenchantgrade(EQI_HEAD_TOP)>=ENCHANTGRADE_A && .@sum>=10) {
-         bonus2 bSkillAtk,"AG_ALL_BLOOM",(.@sum-10)*12;
-         bonus2 bSkillAtk,"AG_ALL_BLOOM_ATK",(.@sum-10)*12;
-         bonus2 bSkillAtk,"AG_ALL_BLOOM_ATK2",(.@sum-10)*12;
-         bonus2 bSkillAtk,"AG_DESTRUCTIVE_HURRICANE",(.@sum-10)*12;
+      .@r = getequiprefinerycnt(EQI_HEAD_TOP);
+      if (getenchantgrade(EQI_HEAD_TOP)>=ENCHANTGRADE_A && .@r>=10) {
+         bonus2 bSkillAtk,"AG_ALL_BLOOM",(.@r-10)*12;
+         bonus2 bSkillAtk,"AG_ALL_BLOOM_ATK",(.@r-10)*12;
+         bonus2 bSkillAtk,"AG_ALL_BLOOM_ATK2",(.@r-10)*12;
+         bonus2 bSkillAtk,"AG_DESTRUCTIVE_HURRICANE",(.@r-10)*12;
       }
   - Combos:
       - Combo:
           - aegis_300594   # 300594
           - Yorscalp_M_Circlet   # 400724
     Script: |
-      .@sum = getequiprefinerycnt(EQI_HAND_R)+getequiprefinerycnt(EQI_HEAD_TOP);
-      if (getenchantgrade(EQI_HEAD_TOP)>=ENCHANTGRADE_A && .@sum>=10) {
-         bonus2 bSkillAtk,"EM_LIGHTNING_LAND",(.@sum-10)*12;
-         bonus2 bSkillAtk,"EM_TERRA_DRIVE",(.@sum-10)*12;
+      .@r = getequiprefinerycnt(EQI_HEAD_TOP);
+      if (getenchantgrade(EQI_HEAD_TOP)>=ENCHANTGRADE_A && .@r>=10) {
+         bonus2 bSkillAtk,"EM_LIGHTNING_LAND",(.@r-10)*12;
+         bonus2 bSkillAtk,"EM_TERRA_DRIVE",(.@r-10)*12;
       }
   - Combos:
       - Combo:
           - aegis_300595   # 300595
           - Yorscalp_P_Circlet   # 400723
     Script: |
-      .@sum = getequiprefinerycnt(EQI_HAND_R)+getequiprefinerycnt(EQI_HEAD_TOP);
-      if (getenchantgrade(EQI_HEAD_TOP)>=ENCHANTGRADE_A && .@sum>=10) {
-         bonus2 bSkillAtk,"WH_CRESCIVE_BOLT",(.@sum-10)*12;
-         bonus2 bSkillAtk,"WH_WILD_WALK",(.@sum-10)*12;
+      .@r = getequiprefinerycnt(EQI_HEAD_TOP);
+      if (getenchantgrade(EQI_HEAD_TOP)>=ENCHANTGRADE_A && .@r>=10) {
+         bonus2 bSkillAtk,"WH_CRESCIVE_BOLT",(.@r-10)*12;
+         bonus2 bSkillAtk,"WH_WILD_WALK",(.@r-10)*12;
       }
   - Combos:
       - Combo:
           - aegis_300596   # 300596
           - Yorscalp_P_Circlet   # 400723
     Script: |
-      .@sum = getequiprefinerycnt(EQI_HAND_R)+getequiprefinerycnt(EQI_HEAD_TOP);
-      if (getenchantgrade(EQI_HEAD_TOP)>=ENCHANTGRADE_A && .@sum>=10) {
-         bonus2 bSkillAtk,"TR_RHYTHMSHOOTING",(.@sum-10)*12;
-         bonus2 bSkillAtk,"TR_ROSEBLOSSOM",(.@sum-10)*12;
-         bonus2 bSkillAtk,"TR_ROSEBLOSSOM_ATK",(.@sum-10)*12;
+      .@r = getequiprefinerycnt(EQI_HEAD_TOP);
+      if (getenchantgrade(EQI_HEAD_TOP)>=ENCHANTGRADE_A && .@r>=10) {
+         bonus2 bSkillAtk,"TR_RHYTHMSHOOTING",(.@r-10)*12;
+         bonus2 bSkillAtk,"TR_ROSEBLOSSOM",(.@r-10)*12;
+         bonus2 bSkillAtk,"TR_ROSEBLOSSOM_ATK",(.@r-10)*12;
       }
   - Combos:
       - Combo:
           - aegis_300597   # 300597
           - Yorscalp_P_Circlet   # 400723
     Script: |
-      .@sum = getequiprefinerycnt(EQI_HAND_R)+getequiprefinerycnt(EQI_HEAD_TOP);
-      if (getenchantgrade(EQI_HEAD_TOP)>=ENCHANTGRADE_A && .@sum>=10) {
-         bonus2 bSkillAtk,"SKE_NOON_BLAST",(.@sum-10)*12;
-         bonus2 bSkillAtk,"SKE_ALL_IN_THE_SKY",(.@sum-10)*12;
+      .@r = getequiprefinerycnt(EQI_HEAD_TOP);
+      if (getenchantgrade(EQI_HEAD_TOP)>=ENCHANTGRADE_A && .@r>=10) {
+         bonus2 bSkillAtk,"SKE_NOON_BLAST",(.@r-10)*12;
+         bonus2 bSkillAtk,"SKE_ALL_IN_THE_SKY",(.@r-10)*12;
       }
   - Combos:
       - Combo:
           - aegis_300598   # 300598
           - Yorscalp_P_Circlet   # 400723
     Script: |
-      .@sum = getequiprefinerycnt(EQI_HAND_R)+getequiprefinerycnt(EQI_HEAD_TOP);
-      if (getenchantgrade(EQI_HEAD_TOP)>=ENCHANTGRADE_A && .@sum>=10) {
-         bonus2 bSkillAtk,"NW_MAGAZINE_FOR_ONE",(.@sum-10)*12;
-         bonus2 bSkillAtk,"NW_WILD_SHOT",(.@sum-10)*12;
+      .@r = getequiprefinerycnt(EQI_HEAD_TOP);
+      if (getenchantgrade(EQI_HEAD_TOP)>=ENCHANTGRADE_A && .@r>=10) {
+         bonus2 bSkillAtk,"NW_MAGAZINE_FOR_ONE",(.@r-10)*12;
+         bonus2 bSkillAtk,"NW_WILD_SHOT",(.@r-10)*12;
       }
   - Combos:
       - Combo:
           - aegis_300599   # 300599
           - Yorscalp_M_Circlet   # 400724
     Script: |
-      .@sum = getequiprefinerycnt(EQI_HAND_R)+getequiprefinerycnt(EQI_HEAD_TOP);
-      if (getenchantgrade(EQI_HEAD_TOP)>=ENCHANTGRADE_A && .@sum>=10) {
-         bonus2 bSkillAtk,"SS_ANKOKURYUUAKUMU",(.@sum-10)*12;
-         bonus2 bSkillAtk,"SS_ANTENPOU",(.@sum-10)*12;
+      .@r = getequiprefinerycnt(EQI_HEAD_TOP);
+      if (getenchantgrade(EQI_HEAD_TOP)>=ENCHANTGRADE_A && .@r>=10) {
+         bonus2 bSkillAtk,"SS_ANKOKURYUUAKUMU",(.@r-10)*12;
+         bonus2 bSkillAtk,"SS_ANTENPOU",(.@r-10)*12;
       }
   - Combos:
       - Combo:
           - aegis_300600   # 300600
           - Yorscalp_M_Circlet   # 400724
     Script: |
-      .@sum = getequiprefinerycnt(EQI_HAND_R)+getequiprefinerycnt(EQI_HEAD_TOP);
-      if (getenchantgrade(EQI_HEAD_TOP)>=ENCHANTGRADE_A && .@sum>=10) {
-         bonus2 bSkillAtk,"SOA_TALISMAN_OF_FOUR_BEARING_GOD",(.@sum-10)*12;
-         bonus2 bSkillAtk,"SOA_TALISMAN_OF_RED_PHOENIX",(.@sum-10)*12;
+      .@r = getequiprefinerycnt(EQI_HEAD_TOP);
+      if (getenchantgrade(EQI_HEAD_TOP)>=ENCHANTGRADE_A && .@r>=10) {
+         bonus2 bSkillAtk,"SOA_TALISMAN_OF_FOUR_BEARING_GOD",(.@r-10)*12;
+         bonus2 bSkillAtk,"SOA_TALISMAN_OF_RED_PHOENIX",(.@r-10)*12;
       }
   - Combos:
       - Combo:
           - aegis_300601   # 300601
           - Yorscalp_M_Circlet   # 400724
     Script: |
-      .@sum = getequiprefinerycnt(EQI_HAND_R)+getequiprefinerycnt(EQI_HEAD_TOP);
-      if (getenchantgrade(EQI_HEAD_TOP)>=ENCHANTGRADE_A && .@sum>=10) {
-         bonus2 bSkillAtk,"HN_JUPITEL_THUNDER_STORM",(.@sum-10)*12;
-         bonus2 bSkillAtk,"HN_JACK_FROST_NOVA",(.@sum-10)*12;
+      .@r = getequiprefinerycnt(EQI_HEAD_TOP);
+      if (getenchantgrade(EQI_HEAD_TOP)>=ENCHANTGRADE_A && .@r>=10) {
+         bonus2 bSkillAtk,"HN_JUPITEL_THUNDER_STORM",(.@r-10)*12;
+         bonus2 bSkillAtk,"HN_JACK_FROST_NOVA",(.@r-10)*12;
       }
   - Combos:
       - Combo:
           - aegis_300602   # 300602
           - Yorscalp_M_Circlet   # 400724
     Script: |
-      .@sum = getequiprefinerycnt(EQI_HAND_R)+getequiprefinerycnt(EQI_HEAD_TOP);
-      if (getenchantgrade(EQI_HEAD_TOP)>=ENCHANTGRADE_A && .@sum>=10) {
-         bonus2 bSkillAtk,"SH_HYUN_ROK_SPIRIT_POWER",(.@sum-10)*12;
-         bonus2 bSkillAtk,"SH_HYUN_ROK_CANNON",(.@sum-10)*12;
+      .@r = getequiprefinerycnt(EQI_HEAD_TOP);
+      if (getenchantgrade(EQI_HEAD_TOP)>=ENCHANTGRADE_A && .@r>=10) {
+         bonus2 bSkillAtk,"SH_HYUN_ROK_SPIRIT_POWER",(.@r-10)*12;
+         bonus2 bSkillAtk,"SH_HYUN_ROK_CANNON",(.@r-10)*12;
       }
   - Combos:
       - Combo: