Pārlūkot izejas kodu

Merge remote-tracking branch 'upstream/master' into refactor/cmake

Vincent Stumpf 1 gadu atpakaļ
vecāks
revīzija
1b3357611b

+ 697 - 54
db/re/item_combos.yml

@@ -13495,7 +13495,7 @@ Body:
           - Warlock_Robe
           - Warlock_Bottom
     Script: |
-      bonus2 bMagicAtkEle,ELE_FIRE,5;
+      bonus2 bMagicAtkEle,Ele_Fire,5;
   - Combos:
       - Combo:
           - Shadowchaser_Robe
@@ -21003,7 +21003,7 @@ Body:
     Script: |
       bonus bDelayrate,-10;
       bonus bPAtk,3;
-      bonus bSmatk,3;
+      bonus bSMatk,3;
   - Combos:
       - Combo:
           - Range_Robe_D
@@ -22130,7 +22130,7 @@ Body:
           - ST_Orleans_Glove
     Script: |
       bonus bVariableCastrate,-5;
-      bonus bSmatk,2;
+      bonus bSMatk,2;
       if (getequiprefinerycnt(EQI_HAND_L) >= 9) {
          bonus bVariableCastrate,-5;
          bonus bSpl,1;
@@ -22348,7 +22348,7 @@ Body:
           - Star_Robe_Of_Spl
     Script: |
       bonus2 bMagicAtkEle,Ele_All,5;
-      bonus bSmatk,2;
+      bonus bSMatk,2;
   - Combos:
       - Combo:
           - Signet_Of_Wis_Star
@@ -22368,7 +22368,7 @@ Body:
          bonus2 bSkillAtk,"AG_ROCK_DOWN",10;
       }
       if (getenchantgrade(EQI_HAND_R) >= ENCHANTGRADE_C) {
-         bonus bSmatk,5;
+         bonus bSMatk,5;
          bonus bSpl,5;
          bonus2 bSkillAtk,"AG_CRIMSON_ARROW_ATK",10;
          bonus2 bSkillAtk,"AG_ROCK_DOWN",10;
@@ -22385,7 +22385,7 @@ Body:
          bonus2 bSkillAtk,"AG_FROZEN_SLASH",10;
       }
       if (getenchantgrade(EQI_HAND_R) >= ENCHANTGRADE_C) {
-         bonus bSmatk,5;
+         bonus bSMatk,5;
          bonus bSpl,5;
          bonus2 bSkillAtk,"AG_SOUL_VC_STRIKE",10;
          bonus2 bSkillAtk,"AG_FROZEN_SLASH",10;
@@ -22431,7 +22431,7 @@ Body:
          bonus2 bSkillAtk,"IG_CROSS_RAIN",10;
       }
       if (getenchantgrade(EQI_HAND_R) >= ENCHANTGRADE_C) {
-         bonus bSmatk,5;
+         bonus bSMatk,5;
          bonus bSpl,5;
          bonus2 bSkillAtk,"IG_CROSS_RAIN",10;
       }
@@ -22477,7 +22477,7 @@ Body:
          bonus2 bSkillAtk,"CD_FRAMEN",10;
       }
       if (getenchantgrade(EQI_HAND_R) >= ENCHANTGRADE_C) {
-         bonus bSmatk,5;
+         bonus bSMatk,5;
          bonus bSpl,5;
          bonus2 bSkillAtk,"CD_FRAMEN",10;
       }
@@ -22574,7 +22574,7 @@ Body:
          bonus2 bSkillAtk,"ABC_ABYSS_SQUARE",10;
       }
       if (getenchantgrade(EQI_HAND_R) >= ENCHANTGRADE_C) {
-         bonus bSmatk,5;
+         bonus bSMatk,5;
          bonus bSpl,5;
          bonus2 bSkillAtk,"ABC_ABYSS_SQUARE",10;
       }
@@ -22674,7 +22674,7 @@ Body:
          bonus2 bSkillAtk,"EM_VENOM_SWAMP",10;
       }
       if (getenchantgrade(EQI_HAND_R) >= ENCHANTGRADE_C) {
-         bonus bSmatk,5;
+         bonus bSMatk,5;
          bonus bSpl,5;
          bonus2 bSkillAtk,"EM_TERRA_DRIVE",10;
          bonus2 bSkillAtk,"EM_VENOM_SWAMP",10;
@@ -22691,7 +22691,7 @@ Body:
          bonus2 bSkillAtk,"EM_LIGHTNING_LAND",10;
       }
       if (getenchantgrade(EQI_HAND_R) >= ENCHANTGRADE_C) {
-         bonus bSmatk,5;
+         bonus bSMatk,5;
          bonus bSpl,5;
          bonus2 bSkillAtk,"EM_DIAMOND_STORM",10;
          bonus2 bSkillAtk,"EM_LIGHTNING_LAND",10;
@@ -22710,7 +22710,7 @@ Body:
          bonus2 bSkillAtk,"TR_METALIC_FURY",10;
       }
       if (getenchantgrade(EQI_HAND_R) >= ENCHANTGRADE_C) {
-         bonus bSmatk,5;
+         bonus bSMatk,5;
          bonus bSpl,5;
          bonus2 bSkillAtk,"TR_METALIC_FURY",10;
       }
@@ -22767,7 +22767,7 @@ Body:
           - Master_Soul_Rifle_LT   # 810009
           - Hero_Boots_LT   # 470094
     Script: |
-      bonus bSmatk,2;
+      bonus bSMatk,2;
       bonus bMatkRate,10;
   - Combos:
       - Combo:
@@ -23088,14 +23088,14 @@ Body:
           - S_M_Spell_Weapon
           - S_M_Spell_Shield
     Script: |
-      bonus bSmatk,3;
+      bonus bSMatk,3;
   - Combos:
       - Combo:
           - S_Concentration_Weapon
           - S_Concentration_Shield
     Script: |
       bonus bPAtk,2;
-      bonus bSmatk,2;
+      bonus bSMatk,2;
   - Combos:
       - Combo:
           - S_Wisdom_Weapon
@@ -23844,7 +23844,7 @@ Body:
          bonus2 bSkillAtk,"SOA_TALISMAN_OF_WHITE_TIGER",10;
       }
       if (getenchantgrade(EQI_HAND_R) >= ENCHANTGRADE_C) {
-         bonus bSmatk,5;
+         bonus bSMatk,5;
          bonus bSpl,5;
          bonus2 bSkillAtk,"SOA_TALISMAN_OF_BLUE_DRAGON",10;
          bonus2 bSkillAtk,"SOA_TALISMAN_OF_WHITE_TIGER",10;
@@ -23880,7 +23880,7 @@ Body:
          bonus2 bSkillAtk,"SH_HOGOGONG_STRIKE",10;
       }
       if (getenchantgrade(EQI_HAND_R) >= ENCHANTGRADE_C) {
-         bonus bSmatk,5;
+         bonus bSMatk,5;
          bonus bSpl,5;
          bonus2 bSkillAtk,"SH_HYUN_ROKS_BREEZE",10;
          bonus2 bSkillAtk,"SH_HOGOGONG_STRIKE",10;
@@ -23920,7 +23920,7 @@ Body:
           - MeawFoxtail_LT   # 550067
           - Hero_Boots_LT   # 470094
     Script: |
-      bonus bSmatk,2;
+      bonus bSMatk,2;
       bonus bAtkRate,10;
       bonus bMatkRate,10;
   - Combos:
@@ -28095,6 +28095,7 @@ Body:
           - 2021RTC_Headset_TW    # 400164
     Script: |
       .@r = getequiprefinerycnt(EQI_HEAD_TOP);
+      bonus2 bSubRace,RC_DemiHuman,1+2*(.@r/3);
       bonus2 bSubRace,RC_Player_Human,1+2*(.@r/3);
       bonus2 bSubRace,RC_Player_Doram,1+2*(.@r/3);
       bonus bDelayrate,-1-.@r/3;
@@ -35071,12 +35072,12 @@ Body:
       bonus2 bSkillAtk,"KN_BOWLINGBASH",50;
   - Combos:
       - Combo:
-          - aegis_400409    # 400409
+          - Wild_Beast    # 400409
           - Gray_W_Suits    # 450177
           - Gray_W_Manteau    # 480091
           - Gray_W_Boots    # 470087
       - Combo:
-          - aegis_400409    # 400409
+          - Wild_Beast    # 400409
           - Gray_W_Robe    # 450178
           - Gray_W_Muffler    # 480090
           - Gray_W_Shoes    # 470088
@@ -35085,165 +35086,165 @@ Body:
       bonus2 bResEff,Eff_Freeze,10000;
   - Combos:
       - Combo:
-          - aegis_400409    # 400409
+          - Wild_Beast    # 400409
           - Gray_W_Pendant    # 490106
       - Combo:
-          - aegis_400409    # 400409
+          - Wild_Beast    # 400409
           - Gray_W_Ring    # 490107
     Script: |
       bonus bAtkRate,15;
   - Combos:
       - Combo:
-          - aegis_400409    # 400409
+          - Wild_Beast    # 400409
           - Gray_W_Earing    # 490108
       - Combo:
-          - aegis_400409    # 400409
+          - Wild_Beast    # 400409
           - Gray_W_Necklace    # 490109
     Script: |
       bonus bMatkRate,15;
   - Combos:
       - Combo:
-          - aegis_400409    # 400409
+          - Wild_Beast    # 400409
           - Wolf_Orb_Str_1    # 310478
     Script: |
       bonus bStr,15;
   - Combos:
       - Combo:
-          - aegis_400409    # 400409
+          - Wild_Beast    # 400409
           - Wolf_Orb_Agi_1    # 310480
     Script: |
       bonus bAgi,15;
   - Combos:
       - Combo:
-          - aegis_400409    # 400409
+          - Wild_Beast    # 400409
           - Wolf_Orb_Vit_1    # 310482
     Script: |
       bonus bVit,15;
   - Combos:
       - Combo:
-          - aegis_400409    # 400409
+          - Wild_Beast    # 400409
           - Wolf_Orb_Int_1    # 310481
     Script: |
       bonus bInt,15;
   - Combos:
       - Combo:
-          - aegis_400409    # 400409
+          - Wild_Beast    # 400409
           - Wolf_Orb_Dex_1    # 310479
     Script: |
       bonus bDex,15;
   - Combos:
       - Combo:
-          - aegis_400409    # 400409
+          - Wild_Beast    # 400409
           - Wolf_Orb_luk_1    # 310483
     Script: |
       bonus bLuk,15;
   - Combos:
       - Combo:
-          - aegis_400409    # 400409
+          - Wild_Beast    # 400409
           - Wolf_Orb_Str_2    # 310484
     Script: |
       bonus bPow,15;
   - Combos:
       - Combo:
-          - aegis_400409    # 400409
+          - Wild_Beast    # 400409
           - Wolf_Orb_Vit_2    # 310488
     Script: |
       bonus bSta,15;
   - Combos:
       - Combo:
-          - aegis_400409    # 400409
+          - Wild_Beast    # 400409
           - Wolf_Orb_Agi_2    # 310486
     Script: |
       bonus bWis,15;
   - Combos:
       - Combo:
-          - aegis_400409    # 400409
+          - Wild_Beast    # 400409
           - Wolf_Orb_Int_2    # 310487
     Script: |
       bonus bSpl,15;
   - Combos:
       - Combo:
-          - aegis_400409    # 400409
+          - Wild_Beast    # 400409
           - Wolf_Orb_Dex_2    # 310485
     Script: |
       bonus bCon,15;
   - Combos:
       - Combo:
-          - aegis_400409    # 400409
+          - Wild_Beast    # 400409
           - Wolf_Orb_luk_2    # 310489
     Script: |
       bonus bCrt,15;
   - Combos:
       - Combo:
-          - aegis_400409    # 400409
+          - Wild_Beast    # 400409
           - Wolf_Orb_Def_1    # 310496
     Script: |
       bonus bDef,300;
   - Combos:
       - Combo:
-          - aegis_400409    # 400409
+          - Wild_Beast    # 400409
           - Wolf_Orb_Mdef_1    # 310497
     Script: |
       bonus bMdef,30;
   - Combos:
       - Combo:
-          - aegis_400409    # 400409
+          - Wild_Beast    # 400409
           - Wolf_Orb_Speed_2    # 310571
     Script: |
       bonus bMaxHPrate,10;
       bonus bMaxSPrate,10;
   - Combos:
       - Combo:
-          - aegis_400409    # 400409
+          - Wild_Beast    # 400409
           - Wolf_Orb_Speed_1    # 310567
     Script: |
       bonus bAspdRate,10;
   - Combos:
       - Combo:
-          - aegis_400409    # 400409
+          - Wild_Beast    # 400409
           - Wolf_Orb_Caster_1    # 310568
     Script: |
       bonus bVariableCastrate,-15;
   - Combos:
       - Combo:
-          - aegis_400409    # 400409
+          - Wild_Beast    # 400409
           - Wolf_Orb_S_Delay    # 310515
     Script: |
       bonus bDelayrate,-15;
   - Combos:
       - Combo:
-          - aegis_400409    # 400409
+          - Wild_Beast    # 400409
           - Wolf_Orb_Robust_1    # 310597
     Script: |
       bonus bBaseAtk,BaseLevel;
   - Combos:
       - Combo:
-          - aegis_400409    # 400409
+          - Wild_Beast    # 400409
           - Wolf_Orb_Robust_2    # 310598
     Script: |
       bonus bMatk,BaseLevel;
   - Combos:
       - Combo:
-          - aegis_400409    # 400409
+          - Wild_Beast    # 400409
           - Wolf_Orb_War_2    # 310506
     Script: |
       bonus2 bIgnoreDefRaceRate,RC_All,50;
   - Combos:
       - Combo:
-          - aegis_400409    # 400409
+          - Wild_Beast    # 400409
           - Wolf_Orb_Mag_2    # 310507
     Script: |
       bonus2 bIgnoreMdefRaceRate,RC_All,50;
   - Combos:
       - Combo:
-          - aegis_400409    # 400409
+          - Wild_Beast    # 400409
           - Wolf_Orb_Caster_2    # 310572
     Script: |
       bonus bMaxHPrate,10;
       bonus bMaxSPrate,10;
   - Combos:
       - Combo:
-          - aegis_400409    # 400409
+          - Wild_Beast    # 400409
           - Wolf_Orb_F_Cast_1    # 310600
     Script: |
       bonus bFixedCastrate,-70;
@@ -37013,40 +37014,40 @@ Body:
       bonus bAspdRate,4*(.@r_weapon/3);
   - Combos:
       - Combo:
-          - aegis_400109   # 400109
+          - Fletus_Tiara_SHC   # 400109
           - Boitata_Card   # 27126
     Script: |
       bonus2 bAddEle,Ele_Poison,40;
       bonus2 bAddEle,Ele_Water,40;
   - Combos:
       - Combo:
-          - aegis_400109   # 400109
+          - Fletus_Tiara_SHC   # 400109
           - SLD_Boitata_Card   # 300195
     Script: |
       bonus2 bAddEle,Ele_Poison,25;
       bonus2 bAddEle,Ele_Water,25;
   - Combos:
       - Combo:
-          - aegis_400110   # 400110
+          - Fletus_Tiara_ABC   # 400110
           - Berzebub_Card   # 4145
     Script: |
       bonus2 bAddClass,Class_Boss,16;
   - Combos:
       - Combo:
-          - aegis_400110   # 400110
+          - Fletus_Tiara_ABC   # 400110
           - Sealed_Berz_Card   # 4486
     Script: |
       bonus2 bAddClass,Class_Boss,8;
   - Combos:
       - Combo:
-          - aegis_400111   # 400111
+          - VesperHeadGear_   # 400111
           - Apocalips_H_Card   # 4374
     Script: |
       bonus2 bMagicAddClass,Class_Boss,10;
       bonus bVariableCastrate,-7;
   - Combos:
       - Combo:
-          - aegis_400111   # 400111
+          - VesperHeadGear_   # 400111
           - Sealed_Apocalips_H_Card   # 4503
     Script: |
       bonus2 bMagicAddClass,Class_Boss,5;
@@ -37518,3 +37519,645 @@ Body:
       bonus bHealPower,3*.@c;
       bonus bAspdRate,2*.@b;
       bonus bMaxHPrate,2*.@b;
+  - Combos:
+      - Combo:
+          - C_GreatDevilWing    # 20762
+          - aegis_480240    # 480240
+    Script: |
+      .@r = getequiprefinerycnt(EQI_GARMENT);
+      bonus bHPrecovRate,-5;
+      bonus bSPrecovRate,-5;
+      if (.@r>=5)
+         bonus2 bSubEle,Ele_Dark,15+(min(.@r,10)*5);
+  - Combos:
+      - Combo:
+          - C_GreatDevilWing    # 20762
+          - aegis_480240    # 480241
+    Script: |
+      .@r = getequiprefinerycnt(EQI_GARMENT);
+      bonus bHPrecovRate,-5;
+      bonus bSPrecovRate,-5;
+      if (.@r>=5)
+         bonus2 bSubEle,Ele_Dark,15+(min(.@r,10)*5);
+  - Combos:
+      - Combo:
+          - Ceila_Card    # 4568
+          - Tele_WG_Cape    # 480242
+    Script: |
+      .@r = getequiprefinerycnt(EQI_GARMENT);
+      bonus2 bMagicAtkEle,Ele_Wind,10+3*(.@r/2);
+      if (.@r>=12)
+         bonus5 bAutoSpell,"SA_VIOLENTGALE",3,10,BF_MAGIC,0;
+  - Combos:
+      - Combo:
+          - Katrinn_Card    # 4366
+          - Tele_WG_Cape    # 480242
+    Script: |
+      .@r = getequiprefinerycnt(EQI_HEAD_TOP);
+      bonus2 bMagicAtkEle,Ele_Ghost,10+3*(.@r/2);
+      if (.@r>=12)
+         bonus2 bMagicAddSize,Size_All,15;
+  - Combos:
+      - Combo:
+          - Sealed_M_Flower_Card    # 4490
+          - SLD_A_Moonlight_Card    # 300196
+    Script: |
+      autobonus "{ bonus bFlee2,5; }",20,5000,BF_WEAPON,"{ active_transform 1150,5000; }";
+  - Combos:
+      - Combo:
+          - 2018_RTC_Cape4_TW    # 20926
+          - 2019RTC_CeleAura_TW    # 400014
+    Script: |
+      .@r = getequiprefinerycnt(EQI_GARMENT);
+      bonus2 bHPDrainRate,30,10;
+      if (.@r>=10) {
+         bonus2 bAddItemSPHealRate,505,30;
+         bonus2 bAddItemSPHealRate,11572,30;
+         bonus2 bSPDrainRate,20,1;
+      }
+  - Combos:
+      - Combo:
+          - 2018_RTC_Cape4_TW    # 20926
+          - 2017RTCSymbole    # 19261
+          - 2019RTC_CeleAura_TW    # 400014
+    Script: |
+      .@r = (getequiprefinerycnt(EQI_HEAD_TOP)+getequiprefinerycnt(EQI_GARMENT))/3;
+      bonus bMaxHPrate,10;
+      bonus bDelayrate,-5;
+      bonus2 bSubRace,RC_Player_Human,.@r;
+      bonus2 bSubRace,RC_Player_Doram,.@r;
+  - Combos:
+      - Combo:
+          - 20th_Anniversary_Hat_TW    # 400368
+          - 20th_Anniversary_TW    # 420186
+    Script: |
+      bonus bPAtk,5;
+      bonus bSMatk,5;
+      bonus2 bExpAddRace,RC_All,10;
+  - Combos:
+      - Combo:
+          - Shadow_Booster_    # 19126
+          - TwinCannon_TW    # 420032
+    Script: |
+      bonus bDelayrate,-4;
+      bonus bAspdRate,5;
+      bonus bShortAtkRate,8;
+      bonus bLongAtkRate,8;
+  - Combos:
+      - Combo:
+          - XM_Celine_Kimi_Card    # 31023
+          - Bloody_Celine_Dress_TW    # 450135
+    Script: |
+      autobonus "{ bonus bDelayrate,-50; bonus bMatkRate,25; bonus5 bAutoSpell,\"AB_VITUPERATUM\",1,1000,BF_MAGIC,0; }",20,5000,BF_MAGIC,"{ active_transform 2996,5000; }";
+  - Combos:
+      - Combo:
+          - Evilspirit_Gloves    # 2980
+          - Bloody_Celine_Dress_TW    # 450135
+    Script: |
+      bonus bMatk,50;
+      bonus3 bAutoSpell,"WL_SOULEXPANSION",3,20;
+      bonus5 bAutoSpell,"WL_TELEKINESIS_INTENSE",1,20,BF_MAGIC,0;
+  - Combos:
+      - Combo:
+          - Celines_Ribbon    # 18849
+          - Bloody_Celine_Dress_TW    # 450135
+    Script: |
+      .@r = getequiprefinerycnt(EQI_HEAD_TOP);
+      bonus2 bSubRace,RC_Player_Human,7;
+      bonus2 bSubRace,RC_Player_Doram,7;
+      bonus2 bSubRace,RC_DemiHuman,7;
+      if (.@r>=12)
+         bonus2 bMagicAddClass,Class_Boss,15;
+  - Combos:
+      - Combo:
+          - Temporal_Armor_TW    # 450175
+          - Temporal_Cape_TW    # 480076
+    Script: |
+      .@r = getequiprefinerycnt(EQI_ARMOR)+getequiprefinerycnt(EQI_GARMENT);
+      if (.@r>=22) {
+         bonus bAtkRate,10;
+         bonus bMatkRate,10;
+         bonus bCritAtkRate,8;
+      }
+  - Combos:
+      - Combo:
+          - Temporal_Boots_TW    # 22202
+          - Temporal_Armor_TW    # 450175
+    Script: |
+      .@r = getequiprefinerycnt(EQI_ARMOR)+getequiprefinerycnt(EQI_SHOES);
+      bonus bBaseAtk,80;
+      bonus bMatk,80;
+      if (.@r>=22) {
+         bonus2 bIgnoreDefRaceRate,RC_Brute,20;
+         bonus2 bIgnoreDefRaceRate,RC_Demon,20;
+         bonus2 bIgnoreMdefRaceRate,RC_Brute,20;
+         bonus2 bIgnoreMdefRaceRate,RC_Demon,20;
+      }
+  - Combos:
+      - Combo:
+          - Temporal_Boots_TW    # 22202
+          - Temporal_Armor_TW    # 450175
+          - Temporal_Cape_TW    # 480076
+    Script: |
+      .@r = getequiprefinerycnt(EQI_ARMOR)+getequiprefinerycnt(EQI_GARMENT)+getequiprefinerycnt(EQI_SHOES);
+      if (.@r>=27)
+         bonus bDelayrate,-5;
+      if (.@r>=37)
+         bonus bDelayrate,-8;
+  - Combos:
+      - Combo:
+          - CannonConverter_TW    # 32259
+          - Scrap_Remodel_Shoes_TW    # 470120
+    Script: |
+      bonus bDelayrate,-8;
+      bonus2 bSkillAtk,"NC_ARMSCANNON",20;
+      bonus2 bSkillAtk,"GN_CARTCANNON",20;
+      autobonus3 "{ bonus bLongAtkRate,30; }",30,10000,"NC_ARMSCANNON";
+      autobonus3 "{ bonus bLongAtkRate,30; }",30,10000,"GN_CARTCANNON";
+  - Combos:
+      - Combo:
+          - Xylitol_2011    # 2912
+          - Lover_In_Mouth    # 18546
+    Script: |
+      bonus2 bAddItemHealRate,529,25;
+      bonus2 bAddItemHealRate,530,25;
+  - Combos:
+      - Combo:
+          - Lover_In_Mouth    # 18546
+          - Arquien's_Necklace    # 28429
+    Script: |
+      bonus2 bAddMonsterDropItem,529,-200;
+      bonus2 bAddMonsterDropItem,530,-200;
+      bonus2 bAddMonsterDropItem,11535,-50;
+      bonus2 bAddItemHealRate,529,-50;
+      bonus2 bAddItemHealRate,530,-50;
+  - Combos:
+      - Combo:
+          - Arquien's_Necklace    # 48429
+          - Scrap_Remodel_Shoes_TW    # 470120
+    Script: |
+      bonus bAtkRate,8;
+      bonus bDelayrate,-8;
+      autobonus3 "{ bonus bShortAtkRate,30; }",30,10000,"NC_AXETORNADO";
+      autobonus3 "{ bonus bShortAtkRate,30; }",30,10000,"GN_CART_TORNADO";
+  - Combos:
+      - Combo:
+          - Waste_Stove_Card    # 4332
+          - Scrap_Remodel_Shoes_TW    # 470120
+    Script: |
+      .@r = getequiprefinerycnt(EQI_ARMOR);
+      bonus bBaseAtk,50;
+      bonus2 bSubSize,Size_Medium,8;
+      bonus2 bSubSize,Size_Large,8;
+      bonus bLongAtkRate,4*(.@r/3);
+      bonus bShortAtkRate,4*(.@r/3);
+      if (BaseJob == Job_Merchant)
+         bonus bBaseAtk,80;
+  - Combos:
+      - Combo:
+          - Rsx_0806_Card    # 4342
+          - Scrap_Remodel_Shoes_TW    # 470120
+    Script: |
+      .@r = getequiprefinerycnt(EQI_ARMOR);
+      bonus bBaseAtk,100;
+      bonus2 bSubSize,Size_Medium,10;
+      bonus2 bSubSize,Size_Large,10;
+      bonus bLongAtkRate,4*(.@r/2);
+      bonus bShortAtkRate,4*(.@r/2);
+      if (BaseJob == Job_Merchant)
+         bonus bBaseAtk,120;
+  - Combos:
+      - Combo:
+          - Fake_Alloy_Pot    # 460030
+          - Scrap_Remodel_Shoes_TW    # 470120
+    Script: |
+      .@r = getequiprefinerycnt(EQI_HAND_L)+getequiprefinerycnt(EQI_SHOES);
+      if (eaclass()&EAJL_THIRD && BaseJob == Job_Alchemist) {
+         bonus2 bAddSize,Size_All,3*(.@r/4);
+         bonus bLongAtkRate,5*(.@r/6);
+         bonus bShortAtkRate,5*(.@r/6);
+         if (.@r>=23) {
+             bonus bNoWalkDelay;
+             bonus bMaxHPrate,-15;
+             bonus3 bAutoSpellWhenHit,"CR_ACIDDEMONSTRATION",max(getskilllv("CR_ACIDDEMONSTRATION"),1),400;
+             bonus3 bAutoSpellWhenHit,"GN_SPORE_EXPLOSION",max(getskilllv("GN_SPORE_EXPLOSION"),1),300;
+         }
+      }
+  - Combos:
+      - Combo:
+          - Temporal_Boots_LT_TW    # 470183
+          - Temporal_Cape_TW_LT    # 480312
+    Script: |
+      .@r = getequiprefinerycnt(EQI_GARMENT)+getequiprefinerycnt(EQI_SHOES);
+      bonus bMdef,5;
+      bonus bFixedCast,-200;
+      if (.@r>=25) {
+         if (readparam(bStr)>=108)
+             bonus bBaseAtk,120;
+         if (readparam(bAgi)>=108)
+             bonus bAspd,1;
+         if (readparam(bVit)>=108)
+             bonus bDelayrate,-8;
+         if (readparam(bInt)>=108)
+             bonus bMatk,120;
+         if (readparam(bDex)>=108)
+             bonus bLongAtkRate,15;
+         if (readparam(bLuk)>=108)
+             bonus bCritAtkRate,20;
+      }
+  - Combos:
+      - Combo:
+          - aegis_400344    # 400344
+          - C_Rainbow_Wing_Ears    # 20010
+      - Combo:
+          - aegis_400345    # 400345
+          - C_Rainbow_Wing_Ears    # 20010
+    Script: |
+      .@r = getequiprefinerycnt(EQI_HEAD_TOP);
+      bonus2 bSubRace,RC_DemiHuman,2*(min(10,.@r)/2);
+      bonus2 bSubRace,RC_Player_Human,2*(min(10,.@r)/2);
+      bonus2 bSubRace,RC_Player_Doram,2*(min(10,.@r)/2);
+  - Combos:
+      - Combo:
+          - aegis_400344    # 400344
+          - aegis_480226    # 480226
+      - Combo:
+          - aegis_400345    # 400345
+          - aegis_480226    # 480226
+      - Combo:
+          - aegis_400344    # 400344
+          - aegis_480227    # 480227
+      - Combo:
+          - aegis_400345    # 400345
+          - aegis_480227    # 480227
+    Script: |
+      .@r = getequiprefinerycnt(EQI_GARMENT);
+      bonus bHPrecovRate,5;
+      bonus bSPrecovRate,5;
+      if (.@r>=5)
+         bonus2 bSubEle,Ele_Holy,15+(min(10,.@r-5)*5);
+  - Combos:
+      - Combo:
+          - Menblatt_Card    # 4593
+          - aegis_480229    # 480229
+    Script: |
+      bonus bLongAtkRate,-(readparam(bDex)/10);
+  - Combos:
+      - Combo:
+          - Lapine_Shield    # 2198
+          - Lapine_Pray_Shoes    # 470086
+    Script: |
+      .@r = getequiprefinerycnt(EQI_SHOES);
+      bonus bDelayrate,-3;
+      bonus bAspdRate,10;
+      bonus bFixedCast,-100*(.@r/2);
+  - Combos:
+      - Combo:
+          - KarduiEar    # 5966
+          - Lapine_Pray_Shoes    # 470086
+    Script: |
+      bonus bMatk,30;
+      bonus2 bSkillCooldown,"WL_COMET",-20000;
+  - Combos:
+      - Combo:
+          - Tree_Of_Sprout_JP    # 19299
+          - Lapine_Pray_Shoes    # 470086
+    Script: |
+      autobonus "{ bonus bInt,150; bonus2 bSPLossRate,100,1000; }",10,1000,BF_MAGIC;
+  - Combos:
+      - Combo:
+          - Nidhogg_Shadow_Card    # 4456
+          - Lapine_Pray_Shoes    # 470086
+    Script: |
+      bonus2 bMagicAddClass,Class_Boss,40;
+      bonus2 bSubEle,Ele_All,20;
+  - Combos:
+      - Combo:
+          - Dark_Lord_Card    # 4168
+          - Destroy_World_Boots    # 470095
+    Script: |
+      bonus bMatk,50;
+      bonus2 bMagicAddClass,Class_Boss,30;
+      bonus3 bAutoSpellWhenHit,"WL_COMET",1,50;
+      autobonus "{ bonus bInt,30; bonus bMatkRate,20; }",50,10000,BF_MAGIC;
+  - Combos:
+      - Combo:
+          - Cursed_Devils_Mail_A    # 450188
+          - Cursed_Devils_Boots_A    # 470096
+          - Cursed_Devils_Manteau_A    # 480116
+    Script: |
+      bonus2 bSubEle,Ele_All,5;
+      bonus bLongAtkDef,5;
+      bonus bMaxHP,66*BaseLevel;
+      bonus bMaxSP,6*BaseLevel;
+  - Combos:
+      - Combo:
+          - Cursed_Devils_Mail_A    # 450188
+          - Cursed_Demon_Ring_A    # 490140
+    Script: |
+      bonus bMaxHPrate,30;
+  - Combos:
+      - Combo:
+          - Cursed_Devils_Manteau_A    # 480116
+          - Cursed_Demon_Ring_A    # 490140
+    Script: |
+      bonus2 bSubEle,Ele_Ghost,25;
+      bonus2 bSubEle,Ele_Wind,75;
+  - Combos:
+      - Combo:
+          - Cursed_Devils_Boots_A    # 470096
+          - Cursed_Demon_Ring_A    # 490140
+    Script: |
+      bonus bVariableCastrate,-70;
+      bonus bDelayrate,-70;
+  - Combos:
+      - Combo:
+          - Emerald_Ring    # 28573
+          - EC_Boots_TW    # 470098
+    Script: |
+      bonus2 bSkillCooldown,"WM_SEVERE_RAINSTORM",-1000;
+      bonus2 bSkillAtk,"WM_SEVERE_RAINSTORM",20;
+      bonus2 bSkillAtk,"RA_ARROWSTORM",40;
+  - Combos:
+      - Combo:
+          - Emerald_Earring_TW    # 28536
+          - EC_Boots_TW    # 470098
+    Script: |
+      bonus2 bSkillCooldown,"CG_ARROWVULCAN",-700;
+      bonus2 bSkillAtk,"CG_ARROWVULCAN",20;
+      bonus bBaseAtk,20*getskilllv("CG_ARROWVULCAN");
+  - Combos:
+      - Combo:
+          - Zombie_Slaughter_Card    # 4435
+          - Corruption_Boots    # 470129
+    Script: |
+      bonus bMatkRate,5;
+      bonus2 bMagicAddEle,Ele_All,5;
+  - Combos:
+      - Combo:
+          - Fallen_Bishop_Card    # 4441
+          - Corruption_Boots    # 470129
+    Script: |
+      bonus bSMatk,10;
+      bonus2 bMagicAddEle,Ele_All,10;
+      bonus2 bSkillAtk,"CD_FRAMEN",15;
+      bonus2 bSkillCooldown,"WL_TELEKINESIS_INTENSE",-120000;
+  - Combos:
+      - Combo:
+          - Ultio_Spes_OS    # 16089
+          - Ultio_Cape_TW    # 480088
+    Script: |
+      .@r = getequiprefinerycnt(EQI_HAND_R);
+      bonus bMatk,30;
+      if (.@r>=12) {
+         bonus2 bSkillCooldown,"AB_ADORAMUS",-500;
+         bonus2 bIgnoreMdefRaceRate,RC_Demon,15;
+         bonus2 bIgnoreMdefRaceRate,RC_Undead,15;
+      }
+  - Combos:
+      - Combo:
+          - Old_Blazing_Soul    # 18979
+          - Battle_Aura_Manteau_TW    # 480149
+    Script: |
+      .@r = getequiprefinerycnt(EQI_HEAD_TOP);
+      bonus2 bSkillAtk,"SR_EARTHSHAKER",2*.@r;
+      bonus2 bSkillAtk,"SR_RAMPAGEBLASTER",2*.@r;
+      bonus2 bSkillCooldown,"SR_EARTHSHAKER",-100*(.@r/2);
+      bonus2 bSkillCooldown,"SR_RAMPAGEBLASTER",-100*(.@r/2);
+  - Combos:
+      - Combo:
+          - Ifrit_Card    # 4430
+          - Battle_Aura_Manteau_TW    # 480149
+    Script: |
+      bonus2 bAddRace,RC_DemiHuman,30;
+      bonus2 bAddRace,RC_Player_Human,30;
+      bonus2 bAddRace,RC_Player_Doram,30;
+      bonus2 bAddRace,RC_Demon,40;
+      bonus2 bAddRace,RC_Angel,40;
+      bonus2 bSubEle,Ele_Fire,50;
+      bonus2 bSubEle,Ele_Water,-30;
+      skill "MO_EXPLOSIONSPIRITS",5;
+      bonus2 bSkillCooldown,"MO_EXPLOSIONSPIRITS",20000;
+      autobonus3 "{ bonus bBaseAtk,150; }",1000,10000,"MO_EXPLOSIONSPIRITS";
+  - Combos:
+      - Combo:
+          - Rutilus_Stick_OS    # 26151
+          - Devil_Flame_Manteau_TW    # 480154
+    Script: |
+      .@r = getequiprefinerycnt(EQI_HAND_R);
+      bonus2 bMagicAtkEle,Ele_Fire,10;
+      bonus2 bMagicAtkEle,Ele_Dark,10;
+      bonus2 bSkillAtk,"WL_HELLINFERNO",20*(.@r/4);
+      if (.@r>=12) {
+         bonus2 bSkillCooldown,"WL_HELLINFERNO",-1000;
+         bonus2 bSkillCooldown,"WL_CRIMSONROCK",-1000;
+      }
+  - Combos:
+      - Combo:
+          - Kukulkan_Head_TW    # 400017
+          - Kukulkan_Tooth_TW    # 490023
+    Script: |
+      .@r = getequiprefinerycnt(EQI_HEAD_TOP);
+      if (.@r>=9) {
+         bonus2 bSubRace,RC_All,8;
+         bonus2 bSubRace,RC_Player_Human,-8;
+         bonus2 bSubRace,RC_Player_Doram,-8;
+      }
+  - Combos:
+      - Combo:
+          - Kukulkan_Skin_TW    # 450017
+          - Kukulkan_Tooth_TW    # 490023
+    Script: |
+      .@r = getequiprefinerycnt(EQI_ARMOR);
+      if (.@r>=9)
+         bonus bLongAtkDef,8;
+  - Combos:
+      - Combo:
+          - Kukulkan_Feather_TW    # 480015
+          - Kukulkan_Tooth_TW    # 490023
+    Script: |
+      .@r = getequiprefinerycnt(EQI_GARMENT);
+      if (.@r>=9)
+         bonus bLongAtkRate,10;
+  - Combos:
+      - Combo:
+          - Kukulkan_Head_TW    # 400017
+          - Kukulkan_Skin_TW    # 450017
+          - Kukulkan_Feather_TW    # 480015
+          - Kukulkan_Tooth_TW    # 490023
+    Script: |
+      .@a = getequiprefinerycnt(EQI_HEAD_TOP);
+      .@b = getequiprefinerycnt(EQI_ARMOR);
+      .@c = getequiprefinerycnt(EQI_GARMENT);
+      if (.@a >= 9 && .@b >= 9 && .@c >= 9) {
+         bonus bVariableCastrate,-10;
+         bonus bDelayrate,-5;
+      }
+  - Combos:
+      - Combo:
+          - Matyr_Card    # 4097
+          - Diana_Suits    # 15430
+    Script: |
+      .@r = getequiprefinerycnt(EQI_ARMOR);
+      if (.@r>=10) {
+         bonus bAspdRate,10;
+         bonus2 bSkillCooldown,"SU_STOOP",-3000;
+      }
+  - Combos:
+      - Combo:
+          - Diana_Suits    # 15430
+          - Cutie_Card    # 27152
+    Script: |
+      bonus bAspdRate,10;
+      bonus2 bSkillCooldown,"SU_STOOP",-6000;
+      bonus2 bMagicAddRace,RC_All,40;
+  - Combos:
+      - Combo:
+          - Diana_Suits    # 15430
+          - Dictator_Ring_TW    # 490084
+    Script: |
+      bonus2 bVariableCastrate,"SU_PICKYPECK",-50;
+      bonus2 bVariableCastrate,"SU_SV_STEMSPEAR",-50;
+      bonus2 bSkillAtk,"SU_PICKYPECK",((readparam(bAgi)+readparam(bDex))/6)*getskilllv("SU_PICKYPECK");
+      bonus2 bSkillAtk,"SU_SV_STEMSPEAR",((readparam(bInt)+readparam(bLuk))/6)*getskilllv("SU_SV_STEMSPEAR");
+  - Combos:
+      - Combo:
+          - Mercury_Suits    # 15431
+          - Faceworm_L_Card    # 27167
+    Script: |
+      bonus2 bSkillAtk,"NJ_HYOUSENSOU",30;
+  - Combos:
+      - Combo:
+          - Gioia_Card    # 4576
+          - Mercury_Suits    # 15431
+    Script: |
+      bonus2 bSkillAtk,"NJ_HUUJIN",30;
+      bonus2 bSubEle,Ele_All,40;
+  - Combos:
+      - Combo:
+          - Assulter_Card    # 4246
+          - Mercury_Suits    # 15431
+    Script: |
+      bonus bLongAtkRate,8;
+      autobonus3 "{ bonus bDelayrate,-20; }",1000,3000,"NJ_ISSEN";
+  - Combos:
+      - Combo:
+          - Incant_Samurai_Card    # 4263
+          - Mercury_Suits    # 15431
+    Script: |
+      bonus bLongAtkRate,10;
+      bonus bDelayrate,-20;
+      autobonus3 "{ bonus bDelayrate,-30; }",1000,3000,"NJ_ISSEN";
+  - Combos:
+      - Combo:
+          - Mercury_Suits    # 15431
+          - Dictator_Ring_TW    # 490084
+    Script: |
+      bonus5 bAutoSpell,"WL_RECOGNIZEDSPELL",1,10,BF_MAGIC,0;
+      bonus bMaxHPrate,3*(getskilllv("NJ_ISSEN")/2);
+      bonus2 bSkillCooldown,"KO_ZANZOU",-7000;
+  - Combos:
+      - Combo:
+          - Bacchus_Armor    # 15432
+          - Heart_Hunter_Card    # 27149
+    Script: |
+      bonus2 bSkillAtk,"RL_FIREDANCE",30;
+      autobonus3 "{ bonus bFlee,100; }",1000,3000,"RL_FALLEN_ANGEL";
+  - Combos:
+      - Combo:
+          - Bacchus_Armor    # 15432
+          - Felock_Card    # 27182
+    Script: |
+      bonus2 bSkillAtk,"RL_D_TAIL",50;
+      bonus2 bSkillCooldown,"RL_D_TAIL",-2000;
+  - Combos:
+      - Combo:
+          - Bacchus_Armor    # 15432
+          - Dictator_Ring_TW    # 490084
+    Script: |
+      bonus bAspdRate,5;
+      bonus2 bAddRace,RC_All,8;
+  - Combos:
+      - Combo:
+          - Khaliz_Knightage_Card    # 4609
+          - Neptune_Uniform    # 15433
+    Script: |
+      bonus2 bSkillAtk,"SP_SWHOO",20;
+      bonus2 bSkillAtk,"SJ_FALLINGSTAR",20;
+  - Combos:
+      - Combo:
+          - Maya_Card    # 4146
+          - Neptune_Uniform    # 15433
+    Script: |
+      bonus2 bSubSize,Size_All,30;
+      bonus2 bSkillAtk,"SP_SWHOO",40;
+      bonus2 bSkillAtk,"SJ_FALLINGSTAR",40;
+  - Combos:
+      - Combo:
+          - Neptune_Uniform    # 15433
+          - Dictator_Ring_TW    # 490084
+    Script: |
+      bonus bMaxHPrate,8;
+      bonus bMatkRate,6;
+      bonus2 bSkillCooldown,"SJ_BOOKOFDIMENSION",-10000;
+      bonus2 bSkillCooldown,"SP_SOULREAPER",-30000;
+      bonus2 bSkillCooldown,"SP_SOULEXPLOSION",-30000;
+  - Combos:
+      - Combo:
+          - Wild_Rose_Card    # 4257
+          - Alice_Hug_Pillow_TW    # 490089
+    Script: |
+      bonus bAllStats,8;
+      bonus bMaxHPrate,5;
+      bonus bFlee2,8;
+  - Combos:
+      - Combo:
+          - Guardian_Mail    # 450211
+          - Guardian_Greave    # 470117
+          - Guardian_Manteau    # 480163
+          - Guardian_Ring    # 490194
+    Script: |
+      bonus bMaxHPrate,min(BaseLevel,100)/10;
+      bonus2 bSubClass,Class_Normal,min(BaseLevel,100)/10;
+      bonus bVit,2;
+      bonus bAllStats,1;
+      bonus2 bSubEle,Ele_Earth,2;
+      bonus2 bSubEle,Ele_Fire,2;
+      bonus2 bSubEle,Ele_Water,2;
+      bonus2 bSubEle,Ele_Wind,2;
+  - Combos:
+      - Combo:
+          - Hand_Of_Devil    # 19329
+          - Grisly_Soul    # 410124
+      - Combo:
+          - Hand_Of_Devil    # 19329
+          - Grisly_Soul_    # 410125
+    Script: |
+      .@r = getequiprefinerycnt(EQI_HEAD_TOP);
+      .@b = getskilllv("SR_EARTHSHAKER");
+      if (.@r>=10 && .@b == 5)
+         bonus2 bSkillCooldown,"SR_HOWLINGOFLION",9500;
+  - Combos:
+      - Combo:
+          - Archangel_Wing    # 2573
+          - Angeling_Balloon_TW    # 420065
+    Script: |
+      .@r = getequiprefinerycnt(EQI_GARMENT);
+      .@a = readparam(bStr);
+      .@b = readparam(bAgi);
+      .@c = readparam(bVit);
+      .@d = readparam(bInt);
+      .@e = readparam(bDex);
+      .@f = readparam(bLuk);
+      bonus2 bExpAddRace,RC_All,8;
+      if (.@r>=8) {
+         bonus bShortAtkRate,3*(.@a/20);
+         bonus bCritAtkRate,4*(.@b/20);
+         bonus2 bSubEle,Ele_Neutral,2*(.@c/20);
+         bonus bMaxHPrate,(.@c/20);
+         bonus2 bMagicAtkEle,Ele_All,(.@d/20);
+         bonus bDelayrate,-3*(.@e/20);
+         bonus bBaseAtk,5*(.@f/20);
+         bonus bMatk,5*(.@f/20);
+         bonus bCritical,2*(.@f/20);
+      }

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 623 - 52
db/re/item_db_equip.yml


+ 46 - 35
db/re/item_db_etc.yml

@@ -48530,7 +48530,7 @@ Body:
     Script: |
       bonus bDelayrate,-5;
       bonus bPAtk,1;
-      bonus bSmatk,1;
+      bonus bSMatk,1;
   - Id: 300193
     AegisName: Tiara_Card
     Name: Tiara Card
@@ -48582,6 +48582,17 @@ Body:
          bonus2 bAddEle,Ele_Earth,10;
          bonus2 bAddEle,Ele_Wind,10;
       }
+  - Id: 300196
+    AegisName: SLD_A_Moonlight_Card
+    Name: Sealed Angry Moonlight Flower Card
+    Type: Card
+    Weight: 10
+    Locations:
+      Armor: true
+    Flags:
+      DropEffect: CLIENT
+    Script: |
+      skill "PA_PRESSURE",((getrefine()>14)?3:2);
   - Id: 300197
     AegisName: SLD_Ill_Dracula_Card
     Name: Sealed Furious Dracula Card
@@ -58095,16 +58106,16 @@ Body:
       bonus bMatk,5*.@param;
       if (.@g >= ENCHANTGRADE_D) {
          bonus2 bMagicAtkEle,Ele_All,.@param;
-         bonus bSmatk,.@param;
+         bonus bSMatk,.@param;
          if (.@g >= ENCHANTGRADE_C) {
             bonus2 bMagicAtkEle,Ele_All,.@param;
-            bonus bSmatk,.@param;
+            bonus bSMatk,.@param;
             if (.@g >= ENCHANTGRADE_B) {
                bonus2 bMagicAtkEle,Ele_All,.@param;
-               bonus bSmatk,.@param;
+               bonus bSMatk,.@param;
                if (.@g >= ENCHANTGRADE_A) {
                   bonus2 bMagicAtkEle,Ele_All,.@param;
-                  bonus bSmatk,.@param;
+                  bonus bSMatk,.@param;
                }
             }
          }
@@ -58121,16 +58132,16 @@ Body:
       bonus bMatk,7*.@param;
       if (.@g >= ENCHANTGRADE_D) {
          bonus2 bMagicAtkEle,Ele_All,.@param;
-         bonus bSmatk,.@param;
+         bonus bSMatk,.@param;
          if (.@g >= ENCHANTGRADE_C) {
             bonus2 bMagicAtkEle,Ele_All,.@param;
-            bonus bSmatk,.@param;
+            bonus bSMatk,.@param;
             if (.@g >= ENCHANTGRADE_B) {
                bonus2 bMagicAtkEle,Ele_All,2*.@param;
-               bonus bSmatk,.@param;
+               bonus bSMatk,.@param;
                if (.@g >= ENCHANTGRADE_A) {
                   bonus2 bMagicAtkEle,Ele_All,2*.@param;
-                  bonus bSmatk,2*.@param;
+                  bonus bSMatk,2*.@param;
                }
             }
          }
@@ -58147,16 +58158,16 @@ Body:
       bonus bMatk,15*.@param;
       if (.@g >= ENCHANTGRADE_D) {
          bonus2 bMagicAtkEle,Ele_All,.@param;
-         bonus bSmatk,.@param;
+         bonus bSMatk,.@param;
          if (.@g >= ENCHANTGRADE_C) {
             bonus2 bMagicAtkEle,Ele_All,.@param;
-            bonus bSmatk,.@param;
+            bonus bSMatk,.@param;
             if (.@g >= ENCHANTGRADE_B) {
                bonus2 bMagicAtkEle,Ele_All,2*.@param;
-               bonus bSmatk,2*.@param;
+               bonus bSMatk,2*.@param;
                if (.@g >= ENCHANTGRADE_A) {
                   bonus2 bMagicAtkEle,Ele_All,3*.@param;
-                  bonus bSmatk,2*.@param;
+                  bonus bSMatk,2*.@param;
                }
             }
          }
@@ -58399,7 +58410,7 @@ Body:
     Script: |
       bonus bVariableCastrate,-7;
       bonus bMatk,11;
-      bonus bSmatk,1;
+      bonus bSMatk,1;
   - Id: 310710
     AegisName: Star_Of_Spell4
     Name: Star of Spell Lv4
@@ -58408,7 +58419,7 @@ Body:
     Script: |
       bonus bVariableCastrate,-10;
       bonus bMatk,17;
-      bonus bSmatk,2;
+      bonus bSMatk,2;
   - Id: 310711
     AegisName: Star_Of_Spell5
     Name: Star of Spell Lv5
@@ -58417,7 +58428,7 @@ Body:
     Script: |
       bonus bVariableCastrate,-15;
       bonus bMatk,25;
-      bonus bSmatk,4;
+      bonus bSMatk,4;
   - Id: 310712
     AegisName: Star_Of_Speed1
     Name: Star of Speed Lv1
@@ -58949,7 +58960,7 @@ Body:
     SubType: Enchant
     Script: |
       bonus bVariableCastrate,-10;
-      bonus bSmatk,1;
+      bonus bSMatk,1;
   - Id: 310861
     AegisName: Mad_Bunny_Enchant_4_1
     Name: Defense 1Lv
@@ -59320,16 +59331,16 @@ Body:
       .@param = (readparam(bSpl)/20);
       .@g = getenchantgrade();
       bonus bSpl,1;
-      bonus bSmatk,.@param;
+      bonus bSMatk,.@param;
       bonus bMatk,3*.@param;
       if (.@g >= ENCHANTGRADE_D) {
-         bonus bSmatk,.@param;
+         bonus bSMatk,.@param;
          if (.@g >= ENCHANTGRADE_C) {
-            bonus bSmatk,.@param;
+            bonus bSMatk,.@param;
             if (.@g >= ENCHANTGRADE_B) {
-               bonus bSmatk,.@param;
+               bonus bSMatk,.@param;
                if (.@g >= ENCHANTGRADE_A) {
-                  bonus bSmatk,.@param;
+                  bonus bSMatk,.@param;
                }
             }
          }
@@ -59343,16 +59354,16 @@ Body:
       .@param = (readparam(bSpl)/20);
       .@g = getenchantgrade();
       bonus bSpl,2;
-      bonus bSmatk,2*.@param;
+      bonus bSMatk,2*.@param;
       bonus bMatk,4*.@param;
       if (.@g >= ENCHANTGRADE_D) {
-         bonus bSmatk,.@param;
+         bonus bSMatk,.@param;
          if (.@g >= ENCHANTGRADE_C) {
-            bonus bSmatk,.@param;
+            bonus bSMatk,.@param;
             if (.@g >= ENCHANTGRADE_B) {
-               bonus bSmatk,.@param;
+               bonus bSMatk,.@param;
                if (.@g >= ENCHANTGRADE_A) {
-                  bonus bSmatk,2*.@param;
+                  bonus bSMatk,2*.@param;
                }
             }
          }
@@ -59366,16 +59377,16 @@ Body:
       .@param = (readparam(bSpl)/20);
       .@g = getenchantgrade();
       bonus bSpl,3;
-      bonus bSmatk,3*.@param;
+      bonus bSMatk,3*.@param;
       bonus bMatk,5*.@param;
       if (.@g >= ENCHANTGRADE_D) {
-         bonus bSmatk,.@param;
+         bonus bSMatk,.@param;
          if (.@g >= ENCHANTGRADE_C) {
-            bonus bSmatk,2*.@param;
+            bonus bSMatk,2*.@param;
             if (.@g >= ENCHANTGRADE_B) {
-               bonus bSmatk,2*.@param;
+               bonus bSMatk,2*.@param;
                if (.@g >= ENCHANTGRADE_A) {
-                  bonus bSmatk,2*.@param;
+                  bonus bSMatk,2*.@param;
                }
             }
          }
@@ -59717,14 +59728,14 @@ Body:
     Type: Card
     SubType: Enchant
     Script: |
-      bonus bSmatk,1;
+      bonus bSMatk,1;
   - Id: 310985
     AegisName: SMATK_2Lv
     Name: S.MATK 2Lv
     Type: Card
     SubType: Enchant
     Script: |
-      bonus bSmatk,2;
+      bonus bSMatk,2;
   - Id: 310986
     AegisName: ATK_1Lv
     Name: ATK 1Lv
@@ -60026,7 +60037,7 @@ Body:
     Type: Card
     SubType: Enchant
     Script: |
-      bonus bSmatk,3+getenchantgrade();
+      bonus bSMatk,3+getenchantgrade();
   - Id: 311029
     AegisName: Gear_DN1
     Name: Storm Slash Tuning Device

+ 1 - 1
db/re/item_db_usable.yml

@@ -8330,7 +8330,7 @@ Body:
     Flags:
       BuyingStore: true
     Script: |
-      getitem 7940,100;
+      getitem 7940,500;
   - Id: 12342
     AegisName: Manuk's_Opportunity
     Name: Manuk's Opportunity

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1006 - 578
db/re/item_group_db.yml


+ 768 - 0
db/re/mob_db.yml

@@ -105499,6 +105499,38 @@ Body:
 #    AegisName: HEROS_IN_ORB_4
 #  - Id: 21870
 #    AegisName: VR_MD_DEVIL
+#  - Id: 21871
+#    AegisName: SEASON_MOB_161
+#  - Id: 21872
+#    AegisName: SEASON_MOB_162
+#  - Id: 21873
+#    AegisName: SEASON_MOB_163
+#  - Id: 21874
+#    AegisName: SEASON_MOB_164
+#  - Id: 21875
+#    AegisName: SEASON_MOB_165
+#  - Id: 21876
+#    AegisName: SEASON_MOB_166
+#  - Id: 21877
+#    AegisName: SEASON_MOB_167
+#  - Id: 21878
+#    AegisName: SEASON_MOB_168
+#  - Id: 21879
+#    AegisName: SEASON_MOB_169
+#  - Id: 21880
+#    AegisName: SEASON_MOB_170
+#  - Id: 21881
+#    AegisName: SEASON_MOB_171
+#  - Id: 21882
+#    AegisName: SEASON_MOB_172
+#  - Id: 21883
+#    AegisName: SEASON_MOB_173
+#  - Id: 21884
+#    AegisName: SEASON_MOB_174
+#  - Id: 21885
+#    AegisName: SEASON_MOB_175
+#  - Id: 21886
+#    AegisName: SEASON_MOB_176
 #  - Id: 21887
 #    AegisName: HEROS_OUT_ORB
 #  - Id: 21888
@@ -105613,6 +105645,10 @@ Body:
 #    AegisName: ECO_ODIUM
 #  - Id: 21943
 #    AegisName: ECO_GLOOMUNDERNIGHT
+#  - Id: 21944
+#    AegisName: E_PORING_2023
+#  - Id: 21945
+#    AegisName: E_LUNATIC_2023
 #  - Id: 21946
 #    AegisName: BURNING_KNIGHT
 #  - Id: 21947
@@ -105637,8 +105673,426 @@ Body:
 #    AegisName: G_BURNING_KNIGHT
 #  - Id: 21957
 #    AegisName: G_TIMBERS
+#  - Id: 21958
+#    AegisName: SEASON_MOB_177
+#  - Id: 21959
+#    AegisName: SEASON_MOB_178
+#  - Id: 21960
+#    AegisName: SEASON_MOB_179
+#  - Id: 21961
+#    AegisName: SEASON_MOB_180
+#  - Id: 21962
+#    AegisName: SEASON_MOB_181
+#  - Id: 21963
+#    AegisName: SEASON_MOB_182
 #  - Id: 21964
 #    AegisName: 2301_EV_RICE_FLOUR
+#  - Id: 21965
+#    AegisName: EP20_COPO
+#  - Id: 21966
+#    AegisName: EP20_ICEWIND1
+#  - Id: 21967
+#    AegisName: EP20_ICEWIND2
+#  - Id: 21968
+#    AegisName: EP20_EGGCOPO
+#  - Id: 21969
+#    AegisName: EP20_RABBIT_ICESLUG
+#  - Id: 21970
+#    AegisName: EP20_MELIBE_ICESLUG
+#  - Id: 21971
+#    AegisName: EP20_ICEBEAR
+#  - Id: 21972
+#    AegisName: EP20_JORMUNGUARD1
+#  - Id: 21973
+#    AegisName: EP20_JORMUNGUARD2
+#  - Id: 21974
+#    AegisName: EP20_FAKE_IWIN_SN
+#  - Id: 21975
+#    AegisName: EP20_FAKE_IWIN_SY
+#  - Id: 21976
+#    AegisName: EP20_FAKE_IWIN_SB
+#  - Id: 21977
+#    AegisName: EP20_FAKE_IWIN_SG
+#  - Id: 21978
+#    AegisName: EP20_FAKE_IWIN_SR
+#  - Id: 21979
+#    AegisName: EP20_DEMIGOD_LASGAND
+#  - Id: 21980
+#    AegisName: EP20_BOSS_CLANER
+#  - Id: 21981
+#    AegisName: MD_EP20_BOSS_LASGAND
+#  - Id: 21982
+#    AegisName: MD_EP20_FALLENANGEL
+#  - Id: 21983
+#    AegisName: EP20_ANGEL_ICESLUG
+#  - Id: 21984
+#    AegisName: EP20_ICEEGG
+#  - Id: 21985
+#    AegisName: EP20_RGAN_WARLOCK
+#  - Id: 21986
+#    AegisName: EP20_RGAN_HEALER
+#  - Id: 21987
+#    AegisName: EP20_JORGAN_WARLOCK
+#  - Id: 21988
+#    AegisName: EP20_JORGAN_HEALER
+#  - Id: 21989
+#    AegisName: EP20_JORGAN_GUARDIAN
+#  - Id: 21990
+#    AegisName: EP20_JORGAN_CLEANER
+#  - Id: 21991
+#    AegisName: MD_EP20_JOR_G_P
+#  - Id: 21992
+#    AegisName: MD_EP20_JOR_G_Y
+#  - Id: 21993
+#    AegisName: MD_EP20_JOR_WARLOCK
+#  - Id: 21994
+#    AegisName: EP20_MD_HEARTHUNTER1
+#  - Id: 21995
+#    AegisName: EP20_NPC_COCOPO
+#  - Id: 21996
+#    AegisName: EP20_SNOW_ANGEL
+#  - Id: 21997
+#    AegisName: G_EP20_JORMUNGUARD1
+#  - Id: 21998
+#    AegisName: G_EP20_JORMUNGUARD2
+#  - Id: 21999
+#    AegisName: G_EP20_JORGAN_CLEANER
+#  - Id: 22000
+#    AegisName: G_EP20_ANGEL_ICESLUG
+#  - Id: 22001
+#    AegisName: G_EP20_RGAN_WARLOCK
+#  - Id: 22002
+#    AegisName: G_EP20_JORGAN_HEALER
+#  - Id: 22003
+#    AegisName: G_EP20_JORGAN_GUARDIAN
+#  - Id: 22004
+#    AegisName: EP20_MD_BOX1
+#  - Id: 22005
+#    AegisName: EP20_MD_BOX2
+#  - Id: 22006
+#    AegisName: EP20_NPC_NYAR
+#  - Id: 22007
+#    AegisName: EP20_NPC_LASGAND
+#  - Id: 22008
+#    AegisName: AB_YEMOB_001
+#  - Id: 22009
+#    AegisName: AB_YEMOB_002
+#  - Id: 22010
+#    AegisName: AB_YEMOB_003
+#  - Id: 22011
+#    AegisName: AB_YEMOB_004
+#  - Id: 22012
+#    AegisName: AB_YEMOB_005
+#  - Id: 22013
+#    AegisName: AB_YEMOB_006
+#  - Id: 22014
+#    AegisName: AB_YEMOB_007
+#  - Id: 22015
+#    AegisName: AB_YEMOB_008
+#  - Id: 22016
+#    AegisName: AB_YEMOB_009
+#  - Id: 22017
+#    AegisName: AB_YEMOB_010
+#  - Id: 22018
+#    AegisName: AB_YEMOB_011
+#  - Id: 22019
+#    AegisName: AB_YEMOB_012
+#  - Id: 22020
+#    AegisName: AB_YEMOB_013
+#  - Id: 22021
+#    AegisName: AB_YEMOB_014
+#  - Id: 22022
+#    AegisName: AB_YEMOB_015
+#  - Id: 22023
+#    AegisName: AB_YEMOB_016
+#  - Id: 22024
+#    AegisName: AB_YEMOB_017
+#  - Id: 22025
+#    AegisName: AB_YEMOB_018
+#  - Id: 22026
+#    AegisName: AB_YEMOB_019
+#  - Id: 22027
+#    AegisName: AB_YEMOB_020
+#  - Id: 22028
+#    AegisName: AB_YEMOB_021
+#  - Id: 22029
+#    AegisName: AB_YEMOB_022
+#  - Id: 22030
+#    AegisName: AB_YEMOB_023
+#  - Id: 22031
+#    AegisName: AB_YEMOB_024
+#  - Id: 22032
+#    AegisName: AB_YEMOB_025
+#  - Id: 22033
+#    AegisName: AB_YEMOB_026
+#  - Id: 22034
+#    AegisName: AB_YEMOB_027
+#  - Id: 22035
+#    AegisName: AB_YEMOB_028
+#  - Id: 22036
+#    AegisName: AB_YEMOB_029
+#  - Id: 22037
+#    AegisName: AB_YEMOB_030
+#  - Id: 22038
+#    AegisName: AB_YEMOB_031
+#  - Id: 22039
+#    AegisName: AB_YEMOB_032
+#  - Id: 22040
+#    AegisName: AB_YEMOB_033
+#  - Id: 22041
+#    AegisName: AB_YEMOB_034
+#  - Id: 22042
+#    AegisName: AB_YEMOB_035
+#  - Id: 22043
+#    AegisName: AB_YEMOB_036
+#  - Id: 22044
+#    AegisName: AB_YEMOB_037
+#  - Id: 22045
+#    AegisName: AB_YEMOB_038
+#  - Id: 22046
+#    AegisName: AB_YEMOB_039
+#  - Id: 22047
+#    AegisName: AB_YEMOB_040
+#  - Id: 22048
+#    AegisName: AB_YEMOB_041
+#  - Id: 22049
+#    AegisName: AB_YEMOB_042
+#  - Id: 22050
+#    AegisName: AB_YEMOB_043
+#  - Id: 22051
+#    AegisName: AB_YEMOB_044
+#  - Id: 22052
+#    AegisName: AB_YEMOB_045
+#  - Id: 22053
+#    AegisName: AB_YEMOB_046
+#  - Id: 22054
+#    AegisName: AB_YEMOB_047
+#  - Id: 22055
+#    AegisName: AB_YEMOB_048
+#  - Id: 22056
+#    AegisName: AB_YEMOB_049
+#  - Id: 22057
+#    AegisName: AB_YEMOB_050
+#  - Id: 22058
+#    AegisName: AB_YEMOB_051
+#  - Id: 22059
+#    AegisName: AB_YEMOB_052
+#  - Id: 22060
+#    AegisName: AB_YEMOB_053
+#  - Id: 22061
+#    AegisName: AB_YEMOB_054
+#  - Id: 22062
+#    AegisName: AB_YEMOB_055
+#  - Id: 22063
+#    AegisName: AB_YEMOB_056
+#  - Id: 22064
+#    AegisName: AB_YEMOB_057
+#  - Id: 22065
+#    AegisName: AB_YEMOB_058
+#  - Id: 22066
+#    AegisName: AB_YEMOB_059
+#  - Id: 22067
+#    AegisName: AB_YEMOB_060
+#  - Id: 22068
+#    AegisName: AB_YEMOB_061
+#  - Id: 22069
+#    AegisName: AB_YEMOB_062
+#  - Id: 22070
+#    AegisName: AB_YEMOB_063
+#  - Id: 22071
+#    AegisName: AB_YEMOB_064
+#  - Id: 22072
+#    AegisName: AB_YEMOB_065
+#  - Id: 22073
+#    AegisName: AB_YEMOB_066
+#  - Id: 22074
+#    AegisName: AB_YEMOB_067
+#  - Id: 22075
+#    AegisName: AB_YEMOB_068
+#  - Id: 22076
+#    AegisName: AB_YEMOB_069
+#  - Id: 22077
+#    AegisName: AB_YEMOB_070
+#  - Id: 22078
+#    AegisName: AB_YEMOB_071
+#  - Id: 22079
+#    AegisName: AB_YEMOB_072
+#  - Id: 22080
+#    AegisName: AB_YEMOB_073
+#  - Id: 22081
+#    AegisName: AB_YEMOB_074
+#  - Id: 22082
+#    AegisName: AB_YEMOB_075
+#  - Id: 22083
+#    AegisName: AB_YEMOB_076
+#  - Id: 22084
+#    AegisName: AB_YEMOB_077
+#  - Id: 22085
+#    AegisName: AB_YEMOB_078
+#  - Id: 22086
+#    AegisName: AB_YEMOB_079
+#  - Id: 22087
+#    AegisName: AB_YEMOB_080
+#  - Id: 22088
+#    AegisName: AB_YEMOB_081
+#  - Id: 22089
+#    AegisName: AB_YEMOB_082
+#  - Id: 22090
+#    AegisName: AB_YEMOB_083
+#  - Id: 22091
+#    AegisName: AB_YEMOB_084
+#  - Id: 22092
+#    AegisName: AB_YEMOB_085
+#  - Id: 22093
+#    AegisName: AB_YEMOB_086
+#  - Id: 22094
+#    AegisName: AB_YEMOB_087
+#  - Id: 22095
+#    AegisName: AB_YEMOB_088
+#  - Id: 22096
+#    AegisName: AB_YEMOB_089
+#  - Id: 22097
+#    AegisName: AB_YEMOB_090
+#  - Id: 22098
+#    AegisName: AB_YEMOB_091
+#  - Id: 22099
+#    AegisName: AB_YEMOB_092
+#  - Id: 22100
+#    AegisName: AB_YEMOB_093
+#  - Id: 22101
+#    AegisName: AB_YEMOB_094
+#  - Id: 22102
+#    AegisName: AB_YEMOB_095
+#  - Id: 22103
+#    AegisName: AB_YEMOB_096
+#  - Id: 22104
+#    AegisName: AB_YEMOB_097
+#  - Id: 22105
+#    AegisName: AB_YEMOB_098
+#  - Id: 22106
+#    AegisName: AB_YEMOB_099
+#  - Id: 22107
+#    AegisName: AB_YEMOB_100
+#  - Id: 22108
+#    AegisName: AB_YEMOB_101
+#  - Id: 22109
+#    AegisName: AB_YEMOB_102
+#  - Id: 22110
+#    AegisName: AB_YEMOB_103
+#  - Id: 22111
+#    AegisName: AB_YEMOB_104
+#  - Id: 22112
+#    AegisName: AB_YEMOB_105
+#  - Id: 22113
+#    AegisName: AB_YEMOB_106
+#  - Id: 22114
+#    AegisName: AB_YEMOB_107
+#  - Id: 22115
+#    AegisName: AB_YEMOB_108
+#  - Id: 22116
+#    AegisName: AB_YEMOB_109
+#  - Id: 22117
+#    AegisName: AB_YEMOB_110
+#  - Id: 22118
+#    AegisName: AB_YEMOB_111
+#  - Id: 22119
+#    AegisName: AB_YEMOB_112
+#  - Id: 22120
+#    AegisName: AB_YEMOB_113
+#  - Id: 22121
+#    AegisName: AB_YEMOB_114
+#  - Id: 22122
+#    AegisName: AB_YEMOB_115
+#  - Id: 22123
+#    AegisName: AB_YEMOB_116
+#  - Id: 22124
+#    AegisName: AB_YEMOB_117
+#  - Id: 22125
+#    AegisName: AB_YEMOB_118
+#  - Id: 22126
+#    AegisName: AB_YEMOB_119
+#  - Id: 22127
+#    AegisName: AB_YEMOB_120
+#  - Id: 22128
+#    AegisName: AB_YEMOB_121
+#  - Id: 22129
+#    AegisName: AB_YEMOB_122
+#  - Id: 22130
+#    AegisName: AB_YEMOB_123
+#  - Id: 22131
+#    AegisName: AB_YEMOB_124
+#  - Id: 22132
+#    AegisName: AB_YEMOB_125
+#  - Id: 22133
+#    AegisName: AB_YEMOB_126
+#  - Id: 22134
+#    AegisName: AB_YEMOB_127
+#  - Id: 22135
+#    AegisName: AB_YEMOB_128
+#  - Id: 22136
+#    AegisName: AB_YEMOB_129
+#  - Id: 22137
+#    AegisName: AB_YEMOB_130
+#  - Id: 22138
+#    AegisName: AB_YEMOB_131
+#  - Id: 22139
+#    AegisName: AB_YEMOB_132
+#  - Id: 22140
+#    AegisName: BIO_ANOLIAN
+#  - Id: 22141
+#    AegisName: BIO_SKEL_ARCHER
+#  - Id: 22142
+#    AegisName: BIO_DRAGON_TAIL
+#  - Id: 22143
+#    AegisName: BIO_LAVA_TOAD
+#  - Id: 22144
+#    AegisName: BIO_LITTLE_FATUM
+#  - Id: 22145
+#    AegisName: BIO_STING
+#  - Id: 22146
+#    AegisName: BIO_EMPATHIZER
+#  - Id: 22147
+#    AegisName: BIO_FIRE_FRILLDORA
+#  - Id: 22148
+#    AegisName: BIO_HOLY_FRUS
+#  - Id: 22149
+#    AegisName: BIO_HOLY_SKOGUL
+#  - Id: 22150
+#    AegisName: BIO_KAPHA
+#  - Id: 22151
+#    AegisName: BIO_SKEL_SOLDIER
+#  - Id: 22152
+#    AegisName: BIO_PINGUICULA_D
+#  - Id: 22153
+#    AegisName: BIO_POM_SPIDER
+#  - Id: 22154
+#    AegisName: BIO_PRAY_GIVER
+#  - Id: 22155
+#    AegisName: BIO_WOOD_GOBLIN
+#  - Id: 22156
+#    AegisName: VR_MD_LAKE
+#  - Id: 22157
+#    AegisName: VR_MD_DESSERT
+#  - Id: 22158
+#    AegisName: VR_MD_SNOW
+#  - Id: 22159
+#    AegisName: VR_MD_OCEAN
+#  - Id: 22160
+#    AegisName: VR_MD_FOREST
+#  - Id: 22161
+#    AegisName: VR_MD_TILBY
+#  - Id: 22162
+#    AegisName: VR_MD_POPE
+#  - Id: 22163
+#    AegisName: VR_MD_TILBY2
+#  - Id: 22164
+#    AegisName: VR_MD_RAINBOW
+#  - Id: 22171
+#    AegisName: MD_COMMON_BOSS
+#  - Id: 22172
+#    AegisName: E_MANANANGGAL
+#  - Id: 22173
+#    AegisName: E_WAKWAK
 #  - Id: 22328
 #    AegisName: DESERT_WOLF_RAC
 #  - Id: 22329
@@ -105709,6 +106163,294 @@ Body:
 #    AegisName: 20TH_EVENT_CO_CMDER
 #  - Id: 23009
 #    AegisName: PITAYA_R_PET
+#  - Id: 23010
+#    AegisName: JP_MAZEMOB_101
+#  - Id: 23011
+#    AegisName: JP_MAZEMOB_102
+#  - Id: 23012
+#    AegisName: JP_MAZEMOB_103
+#  - Id: 23013
+#    AegisName: JP_MAZEMOB_104
+#  - Id: 23014
+#    AegisName: JP_MAZEMOB_105
+#  - Id: 23015
+#    AegisName: JP_MAZEMOB_106
+#  - Id: 23016
+#    AegisName: JP_MAZEMOB_107
+#  - Id: 23017
+#    AegisName: JP_MAZEMOB_108
+#  - Id: 23018
+#    AegisName: JP_MAZEMOB_109
+#  - Id: 23019
+#    AegisName: JP_MAZEMOB_110
+#  - Id: 23020
+#    AegisName: JP_MAZEMOB_111
+#  - Id: 23021
+#    AegisName: JP_MAZEMOB_112
+#  - Id: 23022
+#    AegisName: JP_MAZEMOB_113
+#  - Id: 23023
+#    AegisName: JP_MAZEMOB_114
+#  - Id: 23024
+#    AegisName: JP_MAZEMOB_115
+#  - Id: 23025
+#    AegisName: JP_MAZEMOB_116
+#  - Id: 23026
+#    AegisName: JP_MAZEMOB_117
+#  - Id: 23027
+#    AegisName: JP_MAZEMOB_118
+#  - Id: 23028
+#    AegisName: JP_MAZEMOB_119
+#  - Id: 23029
+#    AegisName: JP_MAZEMOB_120
+#  - Id: 23030
+#    AegisName: JP_MAZEMOB_121
+#  - Id: 23031
+#    AegisName: JP_MAZEMOB_122
+#  - Id: 23032
+#    AegisName: JP_MAZEMOB_123
+#  - Id: 23033
+#    AegisName: JP_MAZEMOB_124
+#  - Id: 23034
+#    AegisName: JP_MAZEMOB_125
+#  - Id: 23035
+#    AegisName: JP_MAZEMOB_126
+#  - Id: 23036
+#    AegisName: JP_MAZEMOB_127
+#  - Id: 23037
+#    AegisName: JP_MAZEMOB_128
+#  - Id: 23038
+#    AegisName: JP_MAZEMOB_129
+#  - Id: 23039
+#    AegisName: JP_MAZEMOB_130
+#  - Id: 23040
+#    AegisName: JP_MAZEMOB_131
+#  - Id: 23041
+#    AegisName: JP_MAZEMOB_132
+#  - Id: 23042
+#    AegisName: JP_MAZEMOB_133
+#  - Id: 23043
+#    AegisName: JP_MAZEMOB_134
+#  - Id: 23044
+#    AegisName: JP_MAZEMOB_135
+#  - Id: 23045
+#    AegisName: JP_MAZEMOB_136
+#  - Id: 23046
+#    AegisName: JP_MAZEMOB_137
+#  - Id: 23047
+#    AegisName: JP_MAZEMOB_138
+#  - Id: 23048
+#    AegisName: JP_MAZEMOB_139
+#  - Id: 23049
+#    AegisName: JP_MAZEMOB_140
+#  - Id: 23050
+#    AegisName: JP_MAZEMOB_141
+#  - Id: 23051
+#    AegisName: JP_MAZEMOB_142
+#  - Id: 23052
+#    AegisName: JP_MAZEMOB_143
+#  - Id: 23053
+#    AegisName: JP_MAZEMOB_144
+#  - Id: 23054
+#    AegisName: JP_MAZEMOB_145
+#  - Id: 23055
+#    AegisName: JP_MAZEMOB_146
+#  - Id: 23056
+#    AegisName: JP_MAZEMOB_147
+#  - Id: 23057
+#    AegisName: JP_MAZEMOB_148
+#  - Id: 23058
+#    AegisName: JP_MAZEMOB_149
+#  - Id: 23059
+#    AegisName: JP_MAZEMOB_150
+#  - Id: 23060
+#    AegisName: EP20_ARMOERDCOPO
+#  - Id: 23061
+#    AegisName: MIN_ECLIPSE_TW
+#  - Id: 23062
+#    AegisName: E_GOLDEN_SAVAGE
+#  - Id: 23063
+#    AegisName: SEASON_MOB_183
+#  - Id: 23064
+#    AegisName: SEASON_MOB_184
+#  - Id: 23065
+#    AegisName: SEASON_MOB_185
+#  - Id: 23066
+#    AegisName: SEASON_MOB_186
+#  - Id: 23067
+#    AegisName: SEASON_MOB_187
+#  - Id: 23068
+#    AegisName: SEASON_MOB_188
+#  - Id: 23069
+#    AegisName: SEASON_MOB_189
+#  - Id: 23070
+#    AegisName: SEASON_MOB_190
+#  - Id: 23071
+#    AegisName: SEASON_MOB_191
+#  - Id: 23072
+#    AegisName: SEASON_MOB_192
+#  - Id: 23073
+#    AegisName: SEASON_MOB_193
+#  - Id: 23074
+#    AegisName: SAND_BAG_MAN01
+#  - Id: 23075
+#    AegisName: SAND_BAG_MAN02
+#  - Id: 23076
+#    AegisName: SAND_BAG_MAN03
+#  - Id: 23077
+#    AegisName: SAND_BAG_MAN04
+#  - Id: 23078
+#    AegisName: SAND_BAG_MAN05
+#  - Id: 23079
+#    AegisName: SAND_BAG_MAN06
+#  - Id: 23080
+#    AegisName: SAND_BAG_MAN07
+#  - Id: 23081
+#    AegisName: SAND_BAG_MAN08
+#  - Id: 23082
+#    AegisName: SAND_BAG_MAN09
+#  - Id: 23083
+#    AegisName: SAND_BAG_MAN10
+#  - Id: 23084
+#    AegisName: SAND_BAG_MAN11
+#  - Id: 23085
+#    AegisName: SAND_BAG_MAN12
+#  - Id: 23086
+#    AegisName: SAND_BAG_MAN13
+#  - Id: 23087
+#    AegisName: SAND_BAG_MAN14
+#  - Id: 23088
+#    AegisName: SAND_BAG_MAN15
+#  - Id: 23089
+#    AegisName: SAND_BAG_MAN16
+#  - Id: 23090
+#    AegisName: SAND_BAG_MAN17
+#  - Id: 23091
+#    AegisName: SAND_BAG_MAN18
+#  - Id: 23092
+#    AegisName: SAND_BAG_MAN19
+#  - Id: 23093
+#    AegisName: SAND_BAG_MAN20
+#  - Id: 23094
+#    AegisName: SAND_BAG_MAN21
+#  - Id: 23095
+#    AegisName: SAND_BAG_MAN22
+#  - Id: 23096
+#    AegisName: SAND_BAG_MAN23
+#  - Id: 23097
+#    AegisName: SAND_BAG_MAN24
+#  - Id: 23098
+#    AegisName: SAND_BAG_MAN25
+#  - Id: 23099
+#    AegisName: SAND_BAG_MAN26
+#  - Id: 23100
+#    AegisName: SAND_BAG_MAN27
+#  - Id: 23101
+#    AegisName: SAND_BAG_MAN28
+#  - Id: 23102
+#    AegisName: SAND_BAG_MAN29
+#  - Id: 23103
+#    AegisName: SAND_BAG_MAN30
+#  - Id: 23104
+#    AegisName: SAND_BAG_MAN31
+#  - Id: 23105
+#    AegisName: SAND_BAG_MAN32
+#  - Id: 23106
+#    AegisName: SAND_BAG_MAN33
+#  - Id: 23107
+#    AegisName: SAND_BAG_MAN34
+#  - Id: 23108
+#    AegisName: SAND_BAG_MAN35
+#  - Id: 23109
+#    AegisName: SAND_BAG_MAN36
+#  - Id: 23110
+#    AegisName: SAND_BAG_MAN37
+#  - Id: 23111
+#    AegisName: SAND_BAG_MAN38
+#  - Id: 23112
+#    AegisName: SAND_BAG_MAN39
+#  - Id: 23113
+#    AegisName: SAND_BAG_MAN40
+#  - Id: 23114
+#    AegisName: SAND_BAG_MAN41
+#  - Id: 23115
+#    AegisName: SAND_BAG_MAN42
+#  - Id: 23116
+#    AegisName: SAND_BAG_MAN43
+#  - Id: 23117
+#    AegisName: SAND_BAG_MAN44
+#  - Id: 23118
+#    AegisName: SAND_BAG_MAN45
+#  - Id: 23119
+#    AegisName: SAND_BAG_MAN46
+#  - Id: 23120
+#    AegisName: SAND_BAG_MAN47
+#  - Id: 23121
+#    AegisName: SAND_BAG_MAN48
+#  - Id: 23122
+#    AegisName: SAND_BAG_MAN49
+#  - Id: 23123
+#    AegisName: SAND_BAG_MAN50
+#  - Id: 23124
+#    AegisName: SAND_BAG_MAN51
+#  - Id: 23125
+#    AegisName: SAND_BAG_MAN52
+#  - Id: 23126
+#    AegisName: SAND_BAG_MAN53
+#  - Id: 23127
+#    AegisName: SAND_BAG_MAN54
+#  - Id: 23128
+#    AegisName: SAND_BAG_MAN55
+#  - Id: 23129
+#    AegisName: SAND_BAG_MAN56
+#  - Id: 23130
+#    AegisName: SAND_BAG_MAN57
+#  - Id: 23131
+#    AegisName: SAND_BAG_MAN58
+#  - Id: 23132
+#    AegisName: SAND_BAG_MAN59
+#  - Id: 23133
+#    AegisName: SAND_BAG_MAN60
+#  - Id: 23134
+#    AegisName: SAND_BAG_MAN61
+#  - Id: 23135
+#    AegisName: SAND_BAG_MAN62
+#  - Id: 23136
+#    AegisName: SAND_BAG_MAN63
+#  - Id: 23137
+#    AegisName: SAND_BAG_MAN64
+#  - Id: 23138
+#    AegisName: SAND_BAG_MAN65
+#  - Id: 23139
+#    AegisName: SAND_BAG_MAN66
+#  - Id: 23140
+#    AegisName: SAND_BAG_MAN67
+#  - Id: 23141
+#    AegisName: SAND_BAG_MAN68
+#  - Id: 23142
+#    AegisName: SAND_BAG_MAN69
+#  - Id: 23143
+#    AegisName: SAND_BAG_MAN70
+#  - Id: 23144
+#    AegisName: SAND_BAG_MAN71
+#  - Id: 23145
+#    AegisName: SAND_BAG_MAN72
+#  - Id: 23146
+#    AegisName: SAND_BAG_MAN73
+#  - Id: 23147
+#    AegisName: SAND_BAG_MAN74
+#  - Id: 23148
+#    AegisName: SAND_BAG_MAN75
+#  - Id: 23149
+#    AegisName: SAND_BAG_MAN76
+#  - Id: 23150
+#    AegisName: SAND_BAG_MAN77
+#  - Id: 23151
+#    AegisName: SAND_BAG_MAN78
+#  - Id: 23152
+#    AegisName: SAND_BAG_MAN79
+#  - Id: 23153
+#    AegisName: SAND_BAG_MAN80
 #  - Id: 25019
 #    AegisName: MQ_M_MOCLORD
 #  - Id: 25020
@@ -105751,6 +106493,20 @@ Body:
 #    AegisName: 06_EVENT_THIEF_FAIRY
 #  - Id: 25039
 #    AegisName: MD_MOROCC
+#  - Id: 25040
+#    AegisName: MQ_STALACTIC_GOLEM
+#  - Id: 25041
+#    AegisName: ILL_BLACK_MUSHROOM_H
+#  - Id: 25042
+#    AegisName: ILL_GHOUL_H
+#  - Id: 25043
+#    AegisName: ILL_NIGHTMARE_H
+#  - Id: 25044
+#    AegisName: ILL_DRAINLIAR_H
+#  - Id: 25045
+#    AegisName: ILL_ZOMBIE_H
+#  - Id: 25046
+#    AegisName: ILL_ZOMBIE_C_H
 #  - Id: 25047
 #    AegisName: ICE_TITAN_FV
 #  - Id: 25049
@@ -105777,6 +106533,18 @@ Body:
 #    AegisName: THA_HORROR_FV
 #  - Id: 25060
 #    AegisName: VOID_MIMIC_FV
+#  - Id: 25061
+#    AegisName: ILL_NINE_TAIL_H
+#  - Id: 25062
+#    AegisName: ILL_MUNAK_H
+#  - Id: 25063
+#    AegisName: ILL_BON_GUN_H
+#  - Id: 25064
+#    AegisName: ILL_SOHEE_H
+#  - Id: 25065
+#    AegisName: ILL_ARCHER_SKELETON_H
+#  - Id: 25066
+#    AegisName: ILL_FURY_HERO_H
 #  - Id: 25072
 #    AegisName: HOLY_FRUS_FV
 #  - Id: 25073

+ 2 - 2
npc/re/quests/quests_16_2_illusion.txt

@@ -9500,7 +9500,7 @@ iz_d04_i,127,228,4	script	Jerrymon#jerry3	1_M_01,{
 	}
 
 	// daily
-	if (checkquest(3414,PLAYTIME) == 2 && checkquest(3416,PLAYTIME) == 2) {
+	if ((checkquest(3414,PLAYTIME) == 0 || checkquest(3414,PLAYTIME) == 1) && (checkquest(3416,PLAYTIME) == 0 || checkquest(3416,PLAYTIME) == 1)) {
 		mes "[Jerrymon]";
 		mes "I have everything I need for today's survey, thank you!!";
 		next;
@@ -9909,7 +9909,7 @@ iz_d05_i,138,186,5	script	Kena#Kena	4_M_02,{
 		end;
 	if (ill_underwater < 5)
 		end;
-	if (checkquest(3418,PLAYTIME) == 2 && checkquest(3420,PLAYTIME) == 2) {
+	if ((checkquest(3418,PLAYTIME) == 0 || checkquest(3418,PLAYTIME) == 1) && (checkquest(3420,PLAYTIME) == 0 || checkquest(3420,PLAYTIME) == 1)) {
 		mes "[Kena]";
 		mes "Thank you for your hard work. Take a good rest today and visit us tomorrow.";
 		close;

+ 1 - 1
src/map/clif.cpp

@@ -23297,7 +23297,7 @@ void clif_parse_laphine_synthesis( int fd, map_session_data* sd ){
 			return;
 		}
 
-		if( sd->inventory_data[i] == nullptr ){
+		if( sd->inventory_data[index] == nullptr ){
 			return;
 		}
 

Daži faili netika attēloti, jo izmaiņu fails ir pārāk liels