Procházet zdrojové kódy

Corrected script for some item #15 (#7566)

Thanks to @Atemo
idk-whoami před 2 roky
rodič
revize
56af701ade

+ 870 - 18
db/re/item_combos.yml

@@ -1048,7 +1048,7 @@ Body:
           - Ancient_Hero_Boots
           - Freezing_Rod
       - Combo:
-          - aegis_2064
+          - Comp_Iron_Staff
           - Ancient_Hero_Boots
       - Combo:
           - Iron_Staff
@@ -1064,7 +1064,7 @@ Body:
           - Freezing_Rod
       - Combo:
           - aegis_470181
-          - aegis_2064
+          - Comp_Iron_Staff
     Script: |
       autobonus "{ bonus bInt,20; bonus bMatkRate,15; }",30,7000,BF_MAGIC;
   - Combos:
@@ -2664,7 +2664,7 @@ Body:
           - Demon_Hunting_Bible_K
       - Combo:
           - Spiritual_Ring
-          - aegis_28646
+          - Comp_D_Hunt_Bible_K
     Script: |
       bonus2 bVariableCastrate,"PR_MAGNUS",-25;
       bonus bHealPower,10;
@@ -3729,6 +3729,9 @@ Body:
       - Combo:
           - RingOfDevil
           - Swiftness3
+      - Combo:
+          - aegis_15947
+          - Bag_Of_Antonio_P
     Script: |
       bonus bAspdRate,5;
   - Combos:
@@ -3771,6 +3774,9 @@ Body:
       - Combo:
           - RingOfDevil
           - Artful3
+      - Combo:
+          - aegis_15947
+          - Bag_Of_Antonio_
     Script: |
       bonus bVariableCastrate,-5;
   - Combos:
@@ -10741,13 +10747,13 @@ Body:
           - Comp_Undine_Spear_K
       - Combo:
           - Ancient_Hero_Boots
-          - aegis_1873
+          - Comp_Iron_Nail_K
       - Combo:
           - Ancient_Hero_Boots
           - Comp_Oriental_Sword
       - Combo:
           - Ancient_Hero_Boots
-          - aegis_1350
+          - Comp_Avenger
       - Combo:
           - aegis_470181
           - Iron_Nail_K
@@ -10774,13 +10780,13 @@ Body:
           - Comp_Undine_Spear_K
       - Combo:
           - aegis_470181
-          - aegis_1873
+          - Comp_Iron_Nail_K
       - Combo:
           - aegis_470181
           - Comp_Oriental_Sword
       - Combo:
           - aegis_470181
-          - aegis_1350
+          - Comp_Avenger
     Script: |
       autobonus "{ bonus bStr,20; bonus bAtkRate,15; }",30,7000;
   - Combos:
@@ -10822,7 +10828,7 @@ Body:
           - Comp_Magic_Sword
       - Combo:
           - Ancient_Hero_Boots
-          - aegis_28646
+          - Comp_D_Hunt_Bible_K
       - Combo:
           - Ancient_Hero_Boots
           - Comp_Light_Blade
@@ -10855,7 +10861,7 @@ Body:
           - Comp_Magic_Sword
       - Combo:
           - aegis_470181
-          - aegis_28646
+          - Comp_D_Hunt_Bible_K
       - Combo:
           - aegis_470181
           - Comp_Light_Blade
@@ -10986,13 +10992,13 @@ Body:
           - Dragonic_Slayer
       - Combo:
           - Ancient_Hero_Boots
-          - aegis_21066
+          - Comp_Dragonic_Slayer
       - Combo:
           - aegis_470181
           - Dragonic_Slayer
       - Combo:
           - aegis_470181
-          - aegis_21066
+          - Comp_Dragonic_Slayer
     Script: |
       autobonus "{ bonus bVit,20; bonus bLongAtkRate,10; }",30,7000;
   - Combos:
@@ -13923,13 +13929,13 @@ Body:
           - Narcis_Bow
       - Combo:
           - Ancient_Hero_Boots
-          - aegis_18202
+          - Comp_Narcis_Bow
       - Combo:
           - aegis_470181
           - Narcis_Bow
       - Combo:
           - aegis_470181
-          - aegis_18202
+          - Comp_Narcis_Bow
     Script: |
       autobonus "{ bonus bDex,20; bonus bLongAtkRate,15; }",30,7000,BF_WEAPON;
   - Combos:
@@ -17015,6 +17021,9 @@ Body:
       - Combo:
           - Blue_Rear_Ribbon
           - Bag_Of_Antonio_S
+      - Combo:
+          - aegis_15947
+          - Bag_Of_Antonio_S
     Script: |
       bonus bAtkRate,4;
       if (getequiprefinerycnt(EQI_GARMENT) >= 12) {
@@ -17274,6 +17283,10 @@ Body:
           - Chrismas_Tree
           - Red_Lantern
           - Evilspirit_Gloves
+      - Combo:
+          - aegis_480277
+          - Red_Lantern
+          - Evilspirit_Gloves
     Script: |
       bonus bAspdRate,10;
       bonus bMatkRate,10;
@@ -17286,6 +17299,10 @@ Body:
           - Chrismas_Tree
           - Hurt_Mind
           - KindHeart
+      - Combo:
+          - aegis_480277
+          - Hurt_Mind
+          - KindHeart
     Script: |
       bonus bLongAtkRate,10;
       bonus bAspdRate,10;
@@ -17299,6 +17316,10 @@ Body:
           - Chrismas_Tree
           - Hurt_Mind
           - Noble_Cross
+      - Combo:
+          - aegis_480277
+          - Hurt_Mind
+          - Noble_Cross
     Script: |
       bonus bMatk,30;
       bonus2 bSkillAtk,"AB_DUPLELIGHT",40;
@@ -17310,6 +17331,10 @@ Body:
           - Chrismas_Tree
           - KindHeart
           - Noble_Cross
+      - Combo:
+          - aegis_480277
+          - KindHeart
+          - Noble_Cross
     Script: |
       bonus bBaseAtk,30;
       bonus2 bSkillAtk,"SR_KNUCKLEARROW",40;
@@ -17321,6 +17346,10 @@ Body:
           - Chrismas_Tree
           - Evilspirit_Gloves
           - Old_Parasol
+      - Combo:
+          - aegis_480277
+          - Evilspirit_Gloves
+          - Old_Parasol
     Script: |
       bonus3 bAutoSpell,"MG_SOULSTRIKE",10,1;
       bonus bMatk,80;
@@ -17979,6 +18008,9 @@ Body:
       - Combo:
           - CD_In_MouthK
           - Old_Parasol
+      - Combo:
+          - aegis_15970
+          - Old_Parasol
     Script: |
       bonus bMatk,50;
       bonus5 bAutoSpell,"HW_GRAVITATION",3,100,BF_SHORT|BF_WEAPON,1;
@@ -24992,7 +25024,7 @@ Body:
       - Combo:
           - Orcish_Hero_Of_Anger     # 29140
           - Orcish_Axe     # 1304
-          - Orcish_Sword     # 1124        
+          - Orcish_Sword     # 1124
       - Combo:
           - Orcish_Hero_Of_Anger     # 29140
           - Orcish_Axe     # 1304
@@ -25038,7 +25070,7 @@ Body:
       bonus2 bAddSize,Size_All,10;
   - Combos:
       - Combo:
-          - aegis_490182     # 490182
+          - Immortal_Dog_Tag_IN     # 490182
           - Katar_170     # 28010
     Script: |
       .@r = getequiprefinerycnt(EQI_HAND_R);
@@ -25051,7 +25083,7 @@ Body:
       }
   - Combos:
       - Combo:
-          - aegis_490182     # 490182
+          - Immortal_Dog_Tag_IN     # 490182
           - Staff_170     # 2027
     Script: |
       .@r = getequiprefinerycnt(EQI_HAND_R);
@@ -25065,7 +25097,7 @@ Body:
       }
   - Combos:
       - Combo:
-          - aegis_490182     # 490182
+          - Immortal_Dog_Tag_IN     # 490182
           - Two_Hand_Spear_170     # 21018
     Script: |
       .@r = getequiprefinerycnt(EQI_HAND_R);
@@ -32194,7 +32226,7 @@ Body:
           - Racing_Cap_MI    # 19200
       - Combo:
           - aegis_22257    # 22257
-          - Racing_Cap_WA    # 19201          
+          - Racing_Cap_WA    # 19201
     Script: |
       if (getequiprefinerycnt(EQI_SHOES)+getequiprefinerycnt(EQI_HEAD_TOP) >= 21)
          autobonus "{ bonus bBaseAtk,200; bonus bMatk,200; }",15,10000,BF_WEAPON|BF_MAGIC;
@@ -32236,3 +32268,823 @@ Body:
       bonus bDelayrate,-30;
       if (eaclass()&EAJL_THIRD && BaseJob == Job_Crusader)
          bonus2 bSkillCooldown,"LG_EARTHDRIVE",-3000;
+  - Combos:
+      - Combo:
+          - Haurvatat    # 28962
+          - S_Str    # 4853
+    Script: |
+      bonus bAtkRate,15;
+  - Combos:
+      - Combo:
+          - Haurvatat    # 28962
+          - S_Agi    # 4854
+    Script: |
+      bonus bAspdRate,15;
+  - Combos:
+      - Combo:
+          - Haurvatat    # 28962
+          - S_Vital    # 4855
+    Script: |
+      bonus bMaxHPrate,15;
+      bonus bMaxSPrate,15;
+  - Combos:
+      - Combo:
+          - Haurvatat    # 28962
+          - S_Int    # 4856
+    Script: |
+      bonus bMatkRate,15;
+  - Combos:
+      - Combo:
+          - Haurvatat    # 28962
+          - S_Dex    # 4857
+    Script: |
+      bonus bLongAtkRate,15;
+  - Combos:
+      - Combo:
+          - Haurvatat    # 28962
+          - S_Luck    # 4858
+    Script: |
+      bonus bDelayrate,-15;
+  - Combos:
+      - Combo:
+          - aegis_300420    # 300420
+          - aegis_490285    # 490285
+    Script: |
+      bonus bAllTraitStats,3;
+      bonus bVariableCastrate,-30;
+  - Combos:
+      - Combo:
+          - Evilspirit_Gloves    # 2980
+          - XM_Celine_Kimi_Card_J    # 27007
+    Script: |
+      bonus bMaxHP,500;
+      bonus bMaxSP,250;
+      bonus3 bAutoSpell,"NPC_DARKSTRIKE",5,50;
+  - Combos:
+      - Combo:
+          - Celines_Ribbon    # 18849
+          - XM_Celine_Kimi_Card_J    # 27007
+    Script: |
+      .@r = getequiprefinerycnt(EQI_HEAD_TOP);
+      bonus bMatk,7*.@r;
+  - Combos:
+      - Combo:
+          - Noble_Cross    # 16029
+          - XM_Celine_Kimi_Card_J    # 27007
+    Script: |
+      .@r = getequiprefinerycnt(EQI_HAND_R);
+      bonus bLuk,3*.@r;
+      bonus bAspdRate,2*.@r;
+  - Combos:
+      - Combo:
+          - Ein_1HAXE    # 1334
+          - Ein_SAFETY_PENDR    # 32248
+          - Ein_SAFETY_EPAULR    # 32250
+      - Combo:
+          - Ein_1HAXE    # 1334
+          - Ein_SAFETY_PENDL    # 32249
+          - Ein_SAFETY_EPAULL    # 32251
+      - Combo:
+          - Ein_1HKNUCK    # 1867
+          - Ein_SAFETY_PENDR    # 32248
+          - Ein_SAFETY_EPAULR    # 32250
+      - Combo:
+          - Ein_1HKNUCK    # 1867
+          - Ein_SAFETY_PENDR    # 32248
+          - Ein_SAFETY_EPAULL    # 32251
+      - Combo:
+          - Ein_1HKNUCK    # 1867
+          - Ein_SAFETY_PENDL    # 32249
+          - Ein_SAFETY_EPAULR    # 32250
+      - Combo:
+          - Ein_1HKNUCK    # 1867
+          - Ein_SAFETY_PENDL    # 32249
+          - Ein_SAFETY_EPAULL    # 32251
+      - Combo:
+          - Ein_BHSTAFF    # 2058
+          - Ein_SAFETY_PENDR    # 32248
+          - Ein_SAFETY_EPAULR    # 32250
+      - Combo:
+          - Ein_BHSTAFF    # 2058
+          - Ein_SAFETY_PENDR    # 32248
+          - Ein_SAFETY_EPAULL    # 32251
+      - Combo:
+          - Ein_BHSTAFF    # 2058
+          - Ein_SAFETY_PENDL    # 32249
+          - Ein_SAFETY_EPAULR    # 32250
+      - Combo:
+          - Ein_BHSTAFF    # 2058
+          - Ein_SAFETY_PENDL    # 32249
+          - Ein_SAFETY_EPAULL    # 32251
+      - Combo:
+          - Ein_BHHuuma    # 13346
+          - Ein_SAFETY_PENDR    # 32248
+          - Ein_SAFETY_EPAULR    # 32250
+      - Combo:
+          - Ein_BHHuuma    # 13346
+          - Ein_SAFETY_PENDR    # 32248
+          - Ein_SAFETY_EPAULL    # 32251
+      - Combo:
+          - Ein_BHHuuma    # 13346
+          - Ein_SAFETY_PENDL    # 32249
+          - Ein_SAFETY_EPAULR    # 32250
+      - Combo:
+          - Ein_BHHuuma    # 13346
+          - Ein_SAFETY_PENDL    # 32249
+          - Ein_SAFETY_EPAULL    # 32251
+      - Combo:
+          - Ein_1HHAMMER    # 16099
+          - Ein_SAFETY_PENDR    # 32248
+          - Ein_SAFETY_EPAULR    # 32250
+      - Combo:
+          - Ein_1HHAMMER    # 16099
+          - Ein_SAFETY_PENDR    # 32248
+          - Ein_SAFETY_EPAULL    # 32251
+      - Combo:
+          - Ein_1HHAMMER    # 16099
+          - Ein_SAFETY_PENDL    # 32249
+          - Ein_SAFETY_EPAULR    # 32250
+      - Combo:
+          - Ein_1HHAMMER    # 16099
+          - Ein_SAFETY_PENDL    # 32249
+          - Ein_SAFETY_EPAULL    # 32251
+      - Combo:
+          - Ein_BHBOW    # 18190
+          - Ein_SAFETY_PENDR    # 32248
+          - Ein_SAFETY_EPAULR    # 32250
+      - Combo:
+          - Ein_BHBOW    # 18190
+          - Ein_SAFETY_PENDR    # 32248
+          - Ein_SAFETY_EPAULL    # 32251
+      - Combo:
+          - Ein_BHBOW    # 18190
+          - Ein_SAFETY_PENDL    # 32249
+          - Ein_SAFETY_EPAULR    # 32250
+      - Combo:
+          - Ein_BHBOW    # 18190
+          - Ein_SAFETY_PENDL    # 32249
+          - Ein_SAFETY_EPAULL    # 32251
+      - Combo:
+          - Ein_BHSWORD    # 21054
+          - Ein_SAFETY_PENDR    # 32248
+          - Ein_SAFETY_EPAULR    # 32250
+      - Combo:
+          - Ein_BHSWORD    # 21054
+          - Ein_SAFETY_PENDR    # 32248
+          - Ein_SAFETY_EPAULL    # 32251
+      - Combo:
+          - Ein_BHSWORD    # 21054
+          - Ein_SAFETY_PENDL    # 32249
+          - Ein_SAFETY_EPAULR    # 32250
+      - Combo:
+          - Ein_BHSWORD    # 21054
+          - Ein_SAFETY_PENDL    # 32249
+          - Ein_SAFETY_EPAULL    # 32251
+      - Combo:
+          - Ein_BHSPEAR    # 26024
+          - Ein_SAFETY_PENDR    # 32248
+          - Ein_SAFETY_EPAULR    # 32250
+      - Combo:
+          - Ein_BHSPEAR    # 26024
+          - Ein_SAFETY_PENDL    # 32249
+          - Ein_SAFETY_EPAULL    # 32251
+      - Combo:
+          - Ein_1HWAND    # 26162
+          - Ein_SAFETY_PENDR    # 32248
+          - Ein_SAFETY_EPAULR    # 32250
+      - Combo:
+          - Ein_1HWAND    # 26162
+          - Ein_SAFETY_PENDR    # 32248
+          - Ein_SAFETY_EPAULL    # 32251
+      - Combo:
+          - Ein_1HWAND    # 26162
+          - Ein_SAFETY_PENDL    # 32249
+          - Ein_SAFETY_EPAULR    # 32250
+      - Combo:
+          - Ein_1HWAND    # 26162
+          - Ein_SAFETY_PENDL    # 32249
+          - Ein_SAFETY_EPAULL    # 32251
+      - Combo:
+          - Ein_1HWHIP    # 26215
+          - Ein_SAFETY_PENDR    # 32248
+          - Ein_SAFETY_EPAULR    # 32250
+      - Combo:
+          - Ein_1HWHIP    # 26215
+          - Ein_SAFETY_PENDR    # 32248
+          - Ein_SAFETY_EPAULL    # 32251
+      - Combo:
+          - Ein_1HWHIP    # 26215
+          - Ein_SAFETY_PENDL    # 32249
+          - Ein_SAFETY_EPAULR    # 32250
+      - Combo:
+          - Ein_1HWHIP    # 26215
+          - Ein_SAFETY_PENDL    # 32249
+          - Ein_SAFETY_EPAULL    # 32251
+      - Combo:
+          - Ein_BHKATAR    # 28045
+          - Ein_SAFETY_PENDR    # 32248
+          - Ein_SAFETY_EPAULR    # 32250
+      - Combo:
+          - Ein_BHKATAR    # 28045
+          - Ein_SAFETY_PENDR    # 32248
+          - Ein_SAFETY_EPAULL    # 32251
+      - Combo:
+          - Ein_BHKATAR    # 28045
+          - Ein_SAFETY_PENDL    # 32249
+          - Ein_SAFETY_EPAULR    # 32250
+      - Combo:
+          - Ein_BHKATAR    # 28045
+          - Ein_SAFETY_PENDL    # 32249
+          - Ein_SAFETY_EPAULL    # 32251
+      - Combo:
+          - Ein_BHAXE    # 28140
+          - Ein_SAFETY_PENDR    # 32248
+          - Ein_SAFETY_EPAULR    # 32250
+      - Combo:
+          - Ein_BHAXE    # 28140
+          - Ein_SAFETY_PENDR    # 32248
+          - Ein_SAFETY_EPAULL    # 32251
+      - Combo:
+          - Ein_BHAXE    # 28140
+          - Ein_SAFETY_PENDL    # 32249
+          - Ein_SAFETY_EPAULR    # 32250
+      - Combo:
+          - Ein_BHAXE    # 28140
+          - Ein_SAFETY_PENDL    # 32249
+          - Ein_SAFETY_EPAULL    # 32251
+      - Combo:
+          - Ein_1HBOOK    # 28635
+          - Ein_SAFETY_PENDR    # 32248
+          - Ein_SAFETY_EPAULR    # 32250
+      - Combo:
+          - Ein_1HBOOK    # 28635
+          - Ein_SAFETY_PENDR    # 32248
+          - Ein_SAFETY_EPAULL    # 32251
+      - Combo:
+          - Ein_1HBOOK    # 28635
+          - Ein_SAFETY_PENDL    # 32249
+          - Ein_SAFETY_EPAULR    # 32250
+      - Combo:
+          - Ein_1HBOOK    # 28635
+          - Ein_SAFETY_PENDL    # 32249
+          - Ein_SAFETY_EPAULL    # 32251
+      - Combo:
+          - Ein_1HDAGGER    # 28771
+          - Ein_SAFETY_PENDR    # 32248
+          - Ein_SAFETY_EPAULR    # 32250
+      - Combo:
+          - Ein_1HDAGGER    # 28771
+          - Ein_SAFETY_PENDR    # 32248
+          - Ein_SAFETY_EPAULL    # 32251
+      - Combo:
+          - Ein_1HDAGGER    # 28771
+          - Ein_SAFETY_PENDL    # 32249
+          - Ein_SAFETY_EPAULR    # 32250
+      - Combo:
+          - Ein_1HDAGGER    # 28771
+          - Ein_SAFETY_PENDL    # 32249
+          - Ein_SAFETY_EPAULL    # 32251
+      - Combo:
+          - Ein_1HMAGGER    # 28772
+          - Ein_SAFETY_PENDR    # 32248
+          - Ein_SAFETY_EPAULR    # 32250
+      - Combo:
+          - Ein_1HMAGGER    # 28772
+          - Ein_SAFETY_PENDR    # 32248
+          - Ein_SAFETY_EPAULL    # 32251
+      - Combo:
+          - Ein_1HMAGGER    # 28772
+          - Ein_SAFETY_PENDL    # 32249
+          - Ein_SAFETY_EPAULR    # 32250
+      - Combo:
+          - Ein_1HMAGGER    # 28772
+          - Ein_SAFETY_PENDL    # 32249
+          - Ein_SAFETY_EPAULL    # 32251
+      - Combo:
+          - Ein_1HSPEAR    # 32026
+          - Ein_SAFETY_PENDR    # 32248
+          - Ein_SAFETY_EPAULR    # 32250
+      - Combo:
+          - Ein_1HSPEAR    # 32026
+          - Ein_SAFETY_PENDR    # 32248
+          - Ein_SAFETY_EPAULL    # 32251
+      - Combo:
+          - Ein_1HSPEAR    # 32026
+          - Ein_SAFETY_PENDL    # 32249
+          - Ein_SAFETY_EPAULR    # 32250
+      - Combo:
+          - Ein_1HSPEAR    # 32026
+          - Ein_SAFETY_PENDL    # 32249
+          - Ein_SAFETY_EPAULL    # 32251
+      - Combo:
+          - Ein_1HLUTE    # 32110
+          - Ein_SAFETY_PENDR    # 32248
+          - Ein_SAFETY_EPAULR    # 32250
+      - Combo:
+          - Ein_1HLUTE    # 32110
+          - Ein_SAFETY_PENDR    # 32248
+          - Ein_SAFETY_EPAULL    # 32251
+      - Combo:
+          - Ein_1HLUTE    # 32110
+          - Ein_SAFETY_PENDL    # 32249
+          - Ein_SAFETY_EPAULR    # 32250
+      - Combo:
+          - Ein_1HLUTE    # 32110
+          - Ein_SAFETY_PENDL    # 32249
+          - Ein_SAFETY_EPAULL    # 32251
+      - Combo:
+          - Ein_1HSWORD    # 32352
+          - Ein_SAFETY_PENDR    # 32248
+          - Ein_SAFETY_EPAULR    # 32250
+      - Combo:
+          - Ein_1HSWORD    # 32352
+          - Ein_SAFETY_PENDR    # 32248
+          - Ein_SAFETY_EPAULL    # 32251
+      - Combo:
+          - Ein_1HSWORD    # 32352
+          - Ein_SAFETY_PENDL    # 32249
+          - Ein_SAFETY_EPAULR    # 32250
+      - Combo:
+          - Ein_1HSWORD    # 32352
+          - Ein_SAFETY_PENDL    # 32249
+          - Ein_SAFETY_EPAULL    # 32251
+      - Combo:
+          - Ein_1H_Foxtail    # 550006
+          - Ein_SAFETY_PENDR    # 32248
+          - Ein_SAFETY_EPAULR    # 32250
+      - Combo:
+          - Ein_1H_Foxtail    # 550006
+          - Ein_SAFETY_PENDR    # 32248
+          - Ein_SAFETY_EPAULL    # 32251
+      - Combo:
+          - Ein_1H_Foxtail    # 550006
+          - Ein_SAFETY_PENDL    # 32249
+          - Ein_SAFETY_EPAULR    # 32250
+      - Combo:
+          - Ein_1H_Foxtail    # 550006
+          - Ein_SAFETY_PENDL    # 32249
+          - Ein_SAFETY_EPAULL    # 32251
+      - Combo:
+          - Ein_1HGUN    # 32303
+          - Ein_SAFETY_PENDR    # 32248
+          - Ein_SAFETY_EPAULR    # 32250
+      - Combo:
+          - Ein_1HGUN    # 32303
+          - Ein_SAFETY_PENDR    # 32248
+          - Ein_SAFETY_EPAULL    # 32251
+      - Combo:
+          - Ein_1HGUN    # 32303
+          - Ein_SAFETY_PENDL    # 32249
+          - Ein_SAFETY_EPAULR    # 32250
+      - Combo:
+          - Ein_1HGUN    # 32303
+          - Ein_SAFETY_PENDL    # 32249
+          - Ein_SAFETY_EPAULL    # 32251
+    Script: |
+      bonus bFixedCastrate,-300;
+      bonus bDelayrate,-7;
+      bonus2 bSubSize,Size_All,3;
+  - Combos:
+      - Combo:
+          - Runaway_Accelerator    # 400047
+          - Improve_Orb_Atk    # 29534
+    Script: |
+      bonus bBaseAtk,15;
+  - Combos:
+      - Combo:
+          - Runaway_Accelerator    # 400047
+          - Improve_Orb_Def    # 29527
+    Script: |
+      bonus bDef,500;
+  - Combos:
+      - Combo:
+          - Runaway_Accelerator    # 400047
+          - Improve_Orb_HealHP    # 29529
+    Script: |
+      bonus bHPrecovRate,350;
+  - Combos:
+      - Combo:
+          - Runaway_Accelerator    # 400047
+          - Improve_Orb_Matk    # 29535
+    Script: |
+      bonus bMatk,15;
+  - Combos:
+      - Combo:
+          - Runaway_Accelerator    # 400047
+          - Improve_Orb_Health    # 29531
+    Script: |
+      bonus bMaxHP,7500;
+  - Combos:
+      - Combo:
+          - Runaway_Accelerator    # 400047
+          - Improve_Orb_Spirit    # 29530
+    Script: |
+      bonus bMaxSP,150;
+  - Combos:
+      - Combo:
+          - Runaway_Accelerator    # 400047
+          - Improve_Orb_Mdef    # 29528
+    Script: |
+      bonus bMdef,20;
+  - Combos:
+      - Combo:
+          - Runaway_Accelerator    # 400047
+          - Improve_Orb_HealSP    # 29532
+    Script: |
+      bonus bSPrecovRate,50;
+  - Combos:
+      - Combo:
+          - Runaway_Accelerator    # 400047
+          - Improve_Orb_Life    # 29543
+    Script: |
+      bonus bUnbreakableArmor;
+  - Combos:
+      - Combo:
+          - Runaway_Accelerator    # 400047
+          - Improve_Orb_Soul    # 29544
+    Script: |
+      bonus bUnbreakableArmor;
+  - Combos:
+      - Combo:
+          - Runaway_Accelerator    # 400047
+          - Improve_Orb_M_Heal    # 29545
+    Script: |
+      bonus2 bHPRegenRate,1500,5000;
+  - Combos:
+      - Combo:
+          - Runaway_Accelerator    # 400047
+          - Improve_Orb_M_Soul    # 29546
+    Script: |
+      bonus2 bSPRegenRate,25,5000;
+  - Combos:
+      - Combo:
+          - Runaway_Accelerator    # 400047
+          - Improve_Orb_Above    # 29542
+    Script: |
+      bonus2 bAddEle,Ele_All,5;
+      bonus2 bMagicAddEle,Ele_All,5;
+  - Combos:
+      - Combo:
+          - Runaway_Accelerator    # 400047
+          - Improve_Orb_Fix    # 29541
+    Script: |
+      bonus bSpeedAddRate,25;
+  - Combos:
+      - Combo:
+          - Runaway_Accelerator    # 400047
+          - Improve_Orb_Cast    # 29538
+    Script: |
+      bonus bVit,10;
+  - Combos:
+      - Combo:
+          - Runaway_Accelerator    # 400047
+          - Improve_Orb_Delay    # 29540
+    Script: |
+      bonus bStr,10;
+  - Combos:
+      - Combo:
+          - Runaway_Accelerator    # 400047
+          - Improve_Orb_Cri    # 29539
+    Script: |
+      bonus bLuk,10;
+  - Combos:
+      - Combo:
+          - Runaway_Accelerator    # 400047
+          - Improve_Orb_Heal    # 29533
+    Script: |
+      bonus bInt,10;
+  - Combos:
+      - Combo:
+          - Runaway_Accelerator    # 400047
+          - Reactor_A_Player    # 29511
+    Script: |
+      .@r = getequiprefinerycnt(EQI_HEAD_TOP);
+      bonus2 bSubRace,RC_Player_Human,3+.@r;
+      bonus2 bSubRace,RC_Player_Doram,3+.@r;
+  - Combos:
+      - Combo:
+          - Runaway_Accelerator    # 400047
+          - Improve_Orb_Archer    # 29536
+    Script: |
+      bonus bDex,10;
+  - Combos:
+      - Combo:
+          - Runaway_Accelerator    # 400047
+          - Improve_Orb_Speed    # 29537
+    Script: |
+      bonus bAgi,10;
+  - Combos:
+      - Combo:
+          - Runaway_Accelerator    # 400047
+          - Improve_Orb_L_AGI    # 29551
+    Script: |
+      bonus bDelayrate,-20;
+  - Combos:
+      - Combo:
+          - Runaway_Accelerator    # 400047
+          - Improve_Orb_L_DEX    # 29549
+    Script: |
+      bonus bPerfectHitAddRate,20;
+  - Combos:
+      - Combo:
+          - Runaway_Accelerator    # 400047
+          - Improve_Orb_L_LUK    # 29552
+    Script: |
+      bonus bFlee2,20;
+  - Combos:
+      - Combo:
+          - Runaway_Accelerator    # 400047
+          - Improve_Orb_L_STR    # 29550
+    Script: |
+      bonus bMaxHPrate,20;
+  - Combos:
+      - Combo:
+          - Runaway_Accelerator    # 400047
+          - Improve_Orb_L_INT    # 29548
+    Script: |
+      bonus bMaxSPrate,20;
+  - Combos:
+      - Combo:
+          - Runaway_Accelerator    # 400047
+          - Improve_Orb_L_Vit    # 29547
+    Script: |
+      bonus bVariableCastrate,-20;
+  - Combos:
+      - Combo:
+          - Runaway_Accelerator    # 400047
+          - Automatic_Orb2    # 310083
+    Script: |
+      bonus2 bAddClass,Class_Boss,10;
+      bonus2 bMagicAddClass,Class_Boss,10;
+  - Combos:
+      - Combo:
+          - Runaway_Accelerator    # 400047
+          - Automatic_Orb1    # 310082
+    Script: |
+      bonus2 bAddClass,Class_Normal,10;
+      bonus2 bMagicAddClass,Class_Normal,10;
+  - Combos:
+      - Combo:
+          - Runaway_Accelerator    # 400047
+          - Automatic_Orb9    # 310009
+    Script: |
+      bonus bShortWeaponDamageReturn,10;
+  - Combos:
+      - Combo:
+          - Runaway_Accelerator    # 400047
+          - Automatic_Orb10    # 310091
+    Script: |
+      bonus bUseSPrate,-20;
+  - Combos:
+      - Combo:
+          - Runaway_Accelerator    # 400047
+          - Automatic_Orb6    # 310087
+    Script: |
+      bonus bAgi,6;
+  - Combos:
+      - Combo:
+          - Runaway_Accelerator    # 400047
+          - Automatic_Orb8    # 310089
+    Script: |
+       bonus bDex,6;
+  - Combos:
+      - Combo:
+          - Runaway_Accelerator    # 400047
+          - Automatic_Orb7    # 310088
+    Script: |
+      bonus bInt,6;
+  - Combos:
+      - Combo:
+          - Runaway_Accelerator    # 400047
+          - Automatic_Orb4    # 310085
+    Script: |
+      bonus bLuk,6;
+  - Combos:
+      - Combo:
+          - Runaway_Accelerator    # 400047
+          - Automatic_Orb5    # 310086
+    Script: |
+      bonus bStr,6;
+  - Combos:
+      - Combo:
+          - Runaway_Accelerator    # 400047
+          - Automatic_Orb3    # 310084
+    Script: |
+      bonus bVit,6;
+  - Combos:
+      - Combo:
+          - Runaway_Accelerator    # 400047
+          - Automatic_Orb24    # 310105
+    Script: |
+      bonus2 bAddEle,Ele_Dark,10;
+      bonus2 bMagicAddEle,Ele_Dark,10;
+  - Combos:
+      - Combo:
+          - Runaway_Accelerator    # 400047
+          - Automatic_Orb25    # 310106
+    Script: |
+      bonus2 bAddEle,Ele_Poison,10;
+      bonus2 bMagicAddEle,Ele_Poison,10;
+  - Combos:
+      - Combo:
+          - Runaway_Accelerator    # 400047
+          - Automatic_Orb22    # 310103
+    Script: |
+      bonus2 bAddEle,Ele_Holy,10;
+      bonus2 bMagicAddEle,Ele_Holy,10;
+  - Combos:
+      - Combo:
+          - Runaway_Accelerator    # 400047
+          - Automatic_Orb23    # 310104
+    Script: |
+      bonus2 bAddEle,Ele_Undead,10;
+      bonus2 bMagicAddEle,Ele_Undead,10;
+  - Combos:
+      - Combo:
+          - Runaway_Accelerator    # 400047
+          - Automatic_Orb27    # 310108
+    Script: |
+      bonus bCritical,20;
+  - Combos:
+      - Combo:
+          - Runaway_Accelerator    # 400047
+          - Automatic_Orb26    # 310107
+    Script: |
+      bonus bPerfectHitAddRate,20;
+  - Combos:
+      - Combo:
+          - Runaway_Accelerator    # 400047
+          - Automatic_Orb12    # 310093
+    Script: |
+      bonus bMaxHP,1000;
+  - Combos:
+      - Combo:
+          - Runaway_Accelerator    # 400047
+          - Automatic_Orb14    # 310095
+    Script: |
+      bonus bMaxHP,1000;
+  - Combos:
+      - Combo:
+          - Runaway_Accelerator    # 400047
+          - Automatic_Orb16    # 310097
+    Script: |
+      bonus bMaxHP,1000;
+  - Combos:
+      - Combo:
+          - Runaway_Accelerator    # 400047
+          - Automatic_Orb17    # 310098
+    Script: |
+      bonus bMaxHP,1000;
+  - Combos:
+      - Combo:
+          - Runaway_Accelerator    # 400047
+          - Automatic_Orb11    # 310092
+    Script: |
+      bonus bMaxHP,1000;
+  - Combos:
+      - Combo:
+          - Runaway_Accelerator    # 400047
+          - Automatic_Orb15    # 310096
+    Script: |
+      bonus bMaxHP,1000;
+  - Combos:
+      - Combo:
+          - Runaway_Accelerator    # 400047
+          - Automatic_Orb13    # 310094
+    Script: |
+      bonus bMaxHP,1000;
+  - Combos:
+      - Combo:
+          - Runaway_Accelerator    # 400047
+          - Automatic_Orb44    # 310125
+    Script: |
+      bonus bDelayrate,-20;
+  - Combos:
+      - Combo:
+          - Runaway_Accelerator    # 400047
+          - Automatic_Orb42    # 310123
+    Script: |
+      bonus bPerfectHitAddRate,20;
+  - Combos:
+      - Combo:
+          - Runaway_Accelerator    # 400047
+          - Automatic_Orb45    # 310126
+    Script: |
+      bonus bFlee2,10;
+  - Combos:
+      - Combo:
+          - Runaway_Accelerator    # 400047
+          - Automatic_Orb43    # 310124
+    Script: |
+      bonus bMaxHPrate,20;
+  - Combos:
+      - Combo:
+          - Runaway_Accelerator    # 400047
+          - Automatic_Orb41    # 310122
+    Script: |
+      bonus bMaxSPrate,20;
+  - Combos:
+      - Combo:
+          - Runaway_Accelerator    # 400047
+          - Automatic_Orb40    # 310121
+    Script: |
+      bonus bVariableCastrate,-20;
+  - Combos:
+      - Combo:
+          - Runaway_Accelerator    # 400047
+          - Automatic_Orb_J01    # 310653
+    Script: |
+      bonus bLongAtkDef,-10;
+  - Combos:
+      - Combo:
+          - Runaway_Accelerator    # 400047 
+          - Improve_Orb_T_ATK    # 310270
+    Script: |
+      .@r = getequiprefinerycnt(EQI_HEAD_TOP);
+      bonus bBaseAtk,10*.@r;
+  - Combos:
+      - Combo:
+          - Runaway_Accelerator    # 400047 
+          - Improve_Orb_T_MATK    # 310271
+    Script: |
+      .@r = getequiprefinerycnt(EQI_HEAD_TOP);
+      bonus bBaseAtk,10*.@r;
+  - Combos:
+      - Combo:
+          - Runaway_Accelerator    # 400047 
+          - Improve_Orb_T_CRI    # 310272
+    Script: |
+      .@r = getequiprefinerycnt(EQI_HEAD_TOP);
+      bonus bCritical,3*.@r;
+  - Combos:
+      - Combo:
+          - Runaway_Accelerator    # 400047 
+          - Improve_Orb_T_WIND    # 310273
+    Script: |
+      .@r = getequiprefinerycnt(EQI_HEAD_TOP);
+      bonus2 bMagicAtkEle,Ele_Wind,3*.@r;
+  - Combos:
+      - Combo:
+          - Golden_Scarf_J    # 20900
+          - Imuke_Upper_Shield    # 28910
+    Script: |
+      if (eaclass()&EAJL_THIRD && (BaseJob == Job_Kagerou || BaseJob == Job_Oboro))
+         bonus bLongAtkDef,-35;
+  - Combos:
+      - Combo:
+          - Golden_Scarf_J    # 20900
+          - Horn_Card    # 4045
+    Script: |
+      if (eaclass()&EAJL_THIRD && (BaseJob == Job_Kagerou || BaseJob == Job_Oboro))
+         bonus bLongAtkDef,-35;
+  - Combos:
+      - Combo:
+          - Golden_Scarf_J    # 20900
+          - Automatic_Orb_J01    # 310653
+    Script: |
+      if (eaclass()&EAJL_THIRD && (BaseJob == Job_Kagerou || BaseJob == Job_Oboro))
+         bonus bLongAtkDef,-35;
+  - Combos:
+      - Combo:
+          - Enforcer_cape    # 20800
+          - Automatic_Orb_J01    # 310653
+    Script: |
+      if (eaclass()&EAJL_THIRD && BaseJob == Job_Assassin)
+         bonus bLongAtkDef,-35;
+  - Combos:
+      - Combo:
+          - Yoichi_Muffler    # 20816
+          - Automatic_Orb_J01    # 310653
+    Script: |
+      if (eaclass()&EAJL_THIRD && BaseJob == Job_Hunter)
+         bonus bLongAtkDef,-35;
+  - Combos:
+      - Combo:
+          - Muffler_IL    # 20838
+          - Automatic_Orb_J01    # 310653
+    Script: |
+      bonus bLongAtkDef,-35;
+  - Combos:
+      - Combo:
+          - VeilCoyote    # 20857
+          - Automatic_Orb_J01    # 310653
+    Script: |
+      bonus bLongAtkDef,-35;
+  - Combos:
+      - Combo:
+          - Horn_Card    # 4045
+          - Automatic_Orb_J01    # 310653
+    Script: |
+      bonus bLongAtkDef,-35;
+  - Combos:
+      - Combo:
+          - VeilCoyote    # 20857
+          - Imuke_Upper_Shield    # 28910
+    Script: |
+      bonus bLongAtkDef,-35;
+  - Combos:
+      - Combo:
+          - VeilCoyote    # 20857
+          - Horn_Card    # 4045
+    Script: |
+      bonus bLongAtkDef,-35;

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 680 - 20
db/re/item_db_equip.yml


+ 113 - 0
db/re/item_db_etc.yml

@@ -44414,6 +44414,15 @@ Body:
     Script: |
       autobonus "{ bonus bFlee2,100; bonus2 bAddClass,Class_Boss,100; }",50,10000,BF_WEAPON;
       /*Unknow Rate*/
+  - Id: 29511
+    AegisName: Reactor_A_Player
+    Name: Q-Player
+    Type: Card
+    SubType: Enchant
+    Script: |
+      .@r = getrefine();
+      bonus2 bSubRace,RC_Player_Human,1+(.@r/3);
+      bonus2 bSubRace,RC_Player_Doram,1+(.@r/3);
   - Id: 29513
     AegisName: Highpriest_Top
     Name: High Priest Stone (Upper)
@@ -50218,6 +50227,18 @@ Body:
     Script: |
       .@r = getrefine();
       bonus bMatk,10*.@r;
+  - Id: 300420
+    AegisName: aegis_300420
+    Name: Labyrinth Berzebub Card
+    Type: Card
+    Buy: 20
+    Weight: 10
+    Locations:
+      Both_Accessory: true
+    Flags:
+      DropEffect: CLIENT
+    Script: |
+      bonus bAllStats,3;
   - Id: 300421
     AegisName: aegis_300421
     Name: Catherine Card
@@ -52628,6 +52649,90 @@ Body:
     Script: |
       bonus2 bSkillAtk,"BA_MUSICALSTRIKE",15;
       bonus2 bSkillAtk,"DC_THROWARROW",15;
+  - Id: 310270
+    AegisName: Improve_Orb_T_ATK
+    Name: T-PowerBoost
+    Type: Card
+    SubType: Enchant
+    Script: |
+      .@r = getrefine();
+      bonus bBaseAtk,50;
+      if (.@r>=7) {
+         .@c = 35;
+         .@t = 3000;
+         if (.@r>=8) {
+             .@c = 49;
+             .@t += 1000;
+         }
+         if (.@r>=9) {
+             .@c = 70;
+             .@t += 1000;
+         }
+         autobonus "{ bonus bBaseAtk,100; }",.@c,.@t,BF_WEAPON;
+      }
+  - Id: 310271
+    AegisName: Improve_Orb_T_MATK
+    Name: T-MagicBoost
+    Type: Card
+    SubType: Enchant
+    Script: |
+      .@r = getrefine();
+      bonus bMatk,50;
+      if (.@r>=7) {
+         .@c = 25;
+         .@t = 3000;
+         if (.@r>=8) {
+             .@c = 35;
+             .@t += 1000;
+         }
+         if (.@r>=9) {
+             .@c = 50;
+             .@t += 1000;
+         }
+         autobonus "{ bonus bMatk,100; }",.@c,.@t,BF_MAGIC;
+      }
+  - Id: 310272
+    AegisName: Improve_Orb_T_CRI
+    Name: T-Assault
+    Type: Card
+    SubType: Enchant
+    Script: |
+      .@r = getrefine();
+      bonus bCritAtkRate,10;
+      if (.@r>=7) {
+         .@c = 25;
+         .@t = 3000;
+         if (.@r>=8) {
+             .@c = 35;
+             .@t += 1000;
+         }
+         if (.@r>=9) {
+             .@c = 50;
+             .@t += 1000;
+         }
+         autobonus "{ bonus bCritAtkRate,40; }",.@c,.@t,BF_WEAPON;
+      }
+  - Id: 310273
+    AegisName: Improve_Orb_T_WIND
+    Name: T-Electricity
+    Type: Card
+    SubType: Enchant
+    Script: |
+      .@r = getrefine();
+      bonus3 bAutoSpell,"MG_THUNDERSTORM",6,50;
+      if (.@r>=7) {
+         .@c = 30;
+         .@t = 10000;
+         if (.@r>=8) {
+             .@c = 40;
+             .@t += 1000;
+         }
+         if (.@r>=9) {
+             .@c = 50;
+             .@t += 1000;
+         }
+         autobonus "{ bonus3 bAutoSpell,\"SO_VARETYR_SPEAR\",3,1000; }",.@c,.@t,BF_WEAPON;
+      }
   - Id: 310321
     AegisName: Enchant_Groza
     Name: Abyssal King
@@ -55470,6 +55575,14 @@ Body:
       bonus2 bMagicAtkEle,Ele_All,7;
       bonus bLongAtkRate,7;
       bonus bShortAtkRate,7;
+  - Id: 310653
+    AegisName: Automatic_Orb_J01
+    Name: Q-Range
+    Type: Card
+    SubType: Enchant
+    Script: |
+      .@r = getrefine();
+      bonus bLongAtkDef,5+(10*(.@r/3));      
   - Id: 310654
     AegisName: ASPD_Robe_D
     Name: ASPD+1(Dual)

+ 58 - 8
db/re/item_db_usable.yml

@@ -2866,6 +2866,23 @@ Body:
       getitem 12796,10;
       getitem 12684,5;
       getitembound 23919,1,Bound_Account;
+  - Id: 9991
+    AegisName: Boarding_Halter_Box_7d
+    Name: "[Not for Sale] Boarding Halter 7D Box"
+    Type: Cash
+    Weight: 10
+    Flags:
+      Container: true
+    Trade:
+      NoDrop: true
+      NoTrade: true
+      NoSell: true
+      NoCart: true
+      NoGuildStorage: true
+      NoMail: true
+      NoAuction: true
+    Script: |
+      getgroupitem(IG_Boarding_Halter_Box);
   - Id: 9999
     AegisName: Season_Evt_Reward_2
     Name: Sweets Snack Pack
@@ -40363,6 +40380,13 @@ Body:
       Container: true
     Script: |
       getgroupitem(IG_Libra_Scroll);
+  - Id: 16674
+    AegisName: New_Insurance_Box
+    Name: 10 New Life Insurance Box
+    Type: Usable
+    Weight: 10
+    Script: |
+      getitem 6413,10;
   - Id: 16675
     AegisName: Splash_Scroll
     Name: Splash Scroll
@@ -61610,7 +61634,7 @@ Body:
     Script: |
       getgroupitem(IG_MD_AIRBOAT_REWARD);
   - Id: 100465
-    AegisName: aegis_100465
+    AegisName: Stone_Robe_Box
     Name: 3rd/Expanded Stone (Garment) Box
     Type: Usable
     Weight: 10
@@ -61739,7 +61763,7 @@ Body:
     Script: |
       laphine_upgrade();
   - Id: 100495
-    AegisName: aegis_100495
+    AegisName: Stone_Robe2_Box
     Name: 3rd/Expanded Stone II (Garment) Box
     Type: Usable
     Weight: 10
@@ -61748,7 +61772,7 @@ Body:
     Script: |
       getgroupitem(IG_THIRD_JOB_STONE_GARMENT_BOX2);
   - Id: 100496
-    AegisName: aegis_100496
+    AegisName: Stone_Top_Box
     Name: Rebirth/Expanded Stone (Top) Box
     Type: Usable
     Weight: 10
@@ -61757,7 +61781,7 @@ Body:
     Script: |
       getgroupitem(IG_THIRD_JOB_STONE_TOP_BOX);
   - Id: 100497
-    AegisName: aegis_100497
+    AegisName: Stone_Top2_Box
     Name: Rebirth/Expanded Stone II (Top) Box
     Type: Usable
     Weight: 10
@@ -61766,7 +61790,7 @@ Body:
     Script: |
       getgroupitem(IG_THIRD_JOB_STONE_TOP_BOX2);
   - Id: 100498
-    AegisName: aegis_100498
+    AegisName: Stone_Middle_Box
     Name: Rebirth/Expanded Stone (Middle) Box
     Type: Usable
     Weight: 10
@@ -61775,7 +61799,7 @@ Body:
     Script: |
       getgroupitem(IG_THIRD_JOB_STONE_MIDDLE_BOX);
   - Id: 100499
-    AegisName: aegis_100499
+    AegisName: Stone_Middle2_Box
     Name: Rebirth/Expanded Stone II (Middle) Box
     Type: Usable
     Weight: 10
@@ -61784,7 +61808,7 @@ Body:
     Script: |
       getgroupitem(IG_THIRD_JOB_STONE_MIDDLE_BOX2);
   - Id: 100500
-    AegisName: aegis_100500
+    AegisName: Stone_Bottom_Box
     Name: Rebirth/Expanded Stone (Bottom) Box
     Type: Usable
     Weight: 10
@@ -61793,7 +61817,7 @@ Body:
     Script: |
       getgroupitem(IG_THIRD_JOB_STONE_BOTTOM_BOX);
   - Id: 100501
-    AegisName: aegis_100501
+    AegisName: Stone_Bottom2_Box
     Name: Rebirth/Expanded Stone II (Bottom) Box
     Type: Usable
     Weight: 10
@@ -65363,6 +65387,23 @@ Body:
       BuyingStore: true
     Script: |
       laphine_synthesis();
+  - Id: 101352
+    AegisName: E_Bubble_Gum_Box10
+    Name: "[Not For Sale] Bubble Gum Box"
+    Type: Cash
+    Weight: 100
+    Flags:
+      UniqueId: true
+    Trade:
+      NoDrop: true
+      NoTrade: true
+      NoSell: true
+      NoCart: true
+      NoGuildStorage: true
+      NoMail: true
+      NoAuction: true
+    Script: |
+      getitem 12264,10;
   - Id: 101355
     AegisName: OS_Weapon_Reform
     Name: OS Weapon Modification Box
@@ -66034,6 +66075,15 @@ Body:
       Container: true
     Script: |
       getgroupitem(IG_Enchant_Stone_Box29);
+  - Id: 102193
+    AegisName: aegis_102193
+    Name: Costume Enchant Stone Box 30
+    Type: Usable
+    Weight: 10
+    Flags:
+      Container: true
+    Script: |
+      getgroupitem(IG_Enchant_Stone_Box30);
   - Id: 200003
     AegisName: LI_HD_Oridecon_Box2
     Name: (Limited) HD Oridecon Box(Blacksmith)(30)

+ 256 - 64
db/re/item_group_db.yml

@@ -24036,9 +24036,9 @@ Body:
             Rate: 160
           - Item: ElectricEffect_Middle
             Rate: 160
-          - Item: aegis_100465
+          - Item: Stone_Robe_Box
             Rate: 160
-          - Item: aegis_100495
+          - Item: Stone_Robe2_Box
             Rate: 160
           - Item: ReloadStone_Top
             Rate: 240
@@ -24058,17 +24058,17 @@ Body:
             Rate: 360
           - Item: Critical_Stone_Bottom
             Rate: 360
-          - Item: aegis_100496
+          - Item: Stone_Top_Box
             Rate: 360
-          - Item: aegis_100497
+          - Item: Stone_Top2_Box
             Rate: 360
-          - Item: aegis_100498
+          - Item: Stone_Middle_Box
             Rate: 360
-          - Item: aegis_100499
+          - Item: Stone_Middle2_Box
             Rate: 360
-          - Item: aegis_100500
+          - Item: Stone_Bottom_Box
             Rate: 360
-          - Item: aegis_100501
+          - Item: Stone_Bottom2_Box
             Rate: 360
   - Group: THIRD_JOB_STONE_GARMENT_BOX
     SubGroups:
@@ -30431,9 +30431,9 @@ Body:
             Rate: 250
           - Item: CastingStone_Bottom
             Rate: 250
-          - Item: aegis_100465
+          - Item: Stone_Robe_Box
             Rate: 250
-          - Item: aegis_100495
+          - Item: Stone_Robe2_Box
             Rate: 250
           - Item: Range_Stone_Top
             Rate: 250
@@ -30457,17 +30457,17 @@ Body:
             Rate: 380
           - Item: Critical_Stone_Bottom
             Rate: 380
-          - Item: aegis_100496
+          - Item: Stone_Top_Box
             Rate: 560
-          - Item: aegis_100497
+          - Item: Stone_Top2_Box
             Rate: 560
-          - Item: aegis_100498
+          - Item: Stone_Middle_Box
             Rate: 560
-          - Item: aegis_100499
+          - Item: Stone_Middle2_Box
             Rate: 560
-          - Item: aegis_100500
+          - Item: Stone_Bottom_Box
             Rate: 560
-          - Item: aegis_100501
+          - Item: Stone_Bottom2_Box
             Rate: 560
   - Group: ENCHANT_STONE_BOX23
     SubGroups:
@@ -30527,9 +30527,9 @@ Body:
             Rate: 140
           - Item: ASPDStone_Top
             Rate: 160
-          - Item: aegis_100465
+          - Item: Stone_Robe_Box
             Rate: 160
-          - Item: aegis_100495
+          - Item: Stone_Robe2_Box
             Rate: 160
           - Item: Range_Stone
             Rate: 240
@@ -30567,17 +30567,17 @@ Body:
             Rate: 360
           - Item: Critical_Stone_Bottom
             Rate: 360
-          - Item: aegis_100496
+          - Item: Stone_Top_Box
             Rate: 360
-          - Item: aegis_100497
+          - Item: Stone_Top2_Box
             Rate: 360
-          - Item: aegis_100498
+          - Item: Stone_Middle_Box
             Rate: 360
-          - Item: aegis_100499
+          - Item: Stone_Middle2_Box
             Rate: 360
-          - Item: aegis_100500
+          - Item: Stone_Bottom_Box
             Rate: 360
-          - Item: aegis_100501
+          - Item: Stone_Bottom2_Box
             Rate: 360
   - Group: ENCHANT_STONE_BOX24
     SubGroups:
@@ -30671,9 +30671,9 @@ Body:
             Rate: 160
           - Item: WaterFieldEffect_Bottom
             Rate: 160
-          - Item: aegis_100465
+          - Item: Stone_Robe_Box
             Rate: 160
-          - Item: aegis_100495
+          - Item: Stone_Robe2_Box
             Rate: 160
           - Item: Range_Stone
             Rate: 240
@@ -30693,17 +30693,17 @@ Body:
             Rate: 360
           - Item: Critical_Stone_Bottom
             Rate: 360
-          - Item: aegis_100496
+          - Item: Stone_Top_Box
             Rate: 360
-          - Item: aegis_100497
+          - Item: Stone_Top2_Box
             Rate: 360
-          - Item: aegis_100498
+          - Item: Stone_Middle_Box
             Rate: 360
-          - Item: aegis_100499
+          - Item: Stone_Middle2_Box
             Rate: 360
-          - Item: aegis_100500
+          - Item: Stone_Bottom_Box
             Rate: 360
-          - Item: aegis_100501
+          - Item: Stone_Bottom2_Box
             Rate: 360
   - Group: ENCHANT_STONE_BOX25
     SubGroups:
@@ -30797,9 +30797,9 @@ Body:
             Rate: 160
           - Item: WaterFieldEffect_Bottom
             Rate: 160
-          - Item: aegis_100465
+          - Item: Stone_Robe_Box
             Rate: 160
-          - Item: aegis_100495
+          - Item: Stone_Robe2_Box
             Rate: 160
           - Item: ReloadStone_Top
             Rate: 240
@@ -30819,17 +30819,17 @@ Body:
             Rate: 360
           - Item: Critical_Stone_Bottom
             Rate: 360
-          - Item: aegis_100496
+          - Item: Stone_Top_Box
             Rate: 360
-          - Item: aegis_100497
+          - Item: Stone_Top2_Box
             Rate: 360
-          - Item: aegis_100498
+          - Item: Stone_Middle_Box
             Rate: 360
-          - Item: aegis_100499
+          - Item: Stone_Middle2_Box
             Rate: 360
-          - Item: aegis_100500
+          - Item: Stone_Bottom_Box
             Rate: 360
-          - Item: aegis_100501
+          - Item: Stone_Bottom2_Box
             Rate: 360
   - Group: ENCHANT_STONE_BOX27
     SubGroups:
@@ -30887,9 +30887,9 @@ Body:
             Rate: 80
           - Item: GuillcrossStone_Bottom3
             Rate: 80
-          - Item: aegis_100465
+          - Item: Stone_Robe_Box
             Rate: 160
-          - Item: aegis_100495
+          - Item: Stone_Robe2_Box
             Rate: 160
           - Item: Magic_Stone_Top
             Rate: 240
@@ -30933,17 +30933,17 @@ Body:
             Rate: 150
           - Item: AssacrossStone_Bottom2
             Rate: 150
-          - Item: aegis_100496
+          - Item: Stone_Top_Box
             Rate: 360
-          - Item: aegis_100497
+          - Item: Stone_Top2_Box
             Rate: 360
-          - Item: aegis_100498
+          - Item: Stone_Middle_Box
             Rate: 360
-          - Item: aegis_100499
+          - Item: Stone_Middle2_Box
             Rate: 360
-          - Item: aegis_100500
+          - Item: Stone_Bottom_Box
             Rate: 360
-          - Item: aegis_100501
+          - Item: Stone_Bottom2_Box
             Rate: 360
           - Item: CastingStone_Top
             Rate: 360
@@ -31102,9 +31102,9 @@ Body:
             Rate: 80
           - Item: ReaperStone_Bottom3
             Rate: 80
-          - Item: aegis_100465
+          - Item: Stone_Robe_Box
             Rate: 160
-          - Item: aegis_100495
+          - Item: Stone_Robe2_Box
             Rate: 160
           - Item: Magic_Stone_Top
             Rate: 240
@@ -31142,17 +31142,17 @@ Body:
             Rate: 240
           - Item: Range_Stone_Bottom
             Rate: 240
-          - Item: aegis_100496
+          - Item: Stone_Top_Box
             Rate: 360
-          - Item: aegis_100497
+          - Item: Stone_Top2_Box
             Rate: 360
-          - Item: aegis_100498
+          - Item: Stone_Middle_Box
             Rate: 360
-          - Item: aegis_100499
+          - Item: Stone_Middle2_Box
             Rate: 360
-          - Item: aegis_100500
+          - Item: Stone_Bottom_Box
             Rate: 360
-          - Item: aegis_100501
+          - Item: Stone_Bottom2_Box
             Rate: 360
           - Item: CastingStone_Top
             Rate: 360
@@ -31442,9 +31442,9 @@ Body:
             Rate: 80
           - Item: DoramStone_Bottom3
             Rate: 80
-          - Item: aegis_100465
+          - Item: Stone_Robe_Box
             Rate: 160
-          - Item: aegis_100495
+          - Item: Stone_Robe2_Box
             Rate: 160
           - Item: Magic_Stone_Top
             Rate: 240
@@ -31482,17 +31482,17 @@ Body:
             Rate: 240
           - Item: EXPStone_Top
             Rate: 240
-          - Item: aegis_100496
+          - Item: Stone_Top_Box
             Rate: 360
-          - Item: aegis_100497
+          - Item: Stone_Top2_Box
             Rate: 360
-          - Item: aegis_100498
+          - Item: Stone_Middle_Box
             Rate: 360
-          - Item: aegis_100499
+          - Item: Stone_Middle2_Box
             Rate: 360
-          - Item: aegis_100500
+          - Item: Stone_Bottom_Box
             Rate: 360
-          - Item: aegis_100501
+          - Item: Stone_Bottom2_Box
             Rate: 360
           - Item: CastingStone_Top
             Rate: 360
@@ -49192,3 +49192,195 @@ Body:
             Rate: 1667
           - Item: S_Archer_earring
             Rate: 1667
+  - Group: ENCHANT_STONE_BOX30
+    SubGroups:
+      - SubGroup: 1
+        List:
+          - Item: Range_Stone_Robe_D
+            Rate: 10
+          - Item: Melee_Stone_Robe_D
+            Rate: 10
+          - Item: Magic_Stone_Robe_D
+            Rate: 10
+          - Item: SmatkStone_Robe
+            Rate: 10
+          - Item: M_PATKStone_Robe
+            Rate: 10
+          - Item: R_PATKStone_Robe
+            Rate: 10
+          - Item: ReloadStone_Robe_D
+            Rate: 10
+          - Item: CriticalStone_Robe_D
+            Rate: 10
+          - Item: Critical_Stone_Robe
+            Rate: 20
+          - Item: CastStone_Robe_D
+            Rate: 40
+          - Item: CastStone_Robe
+            Rate: 80
+          - Item: KagerouStone_Top3
+            Rate: 30
+          - Item: KagerouStone_Middle3
+            Rate: 30
+          - Item: KagerouStone_Bottom3
+            Rate: 30
+          - Item: OboroStone_Top3
+            Rate: 30
+          - Item: OboroStone_Middle3
+            Rate: 30
+          - Item: OboroStone_Bottom3
+            Rate: 30
+          - Item: DoramStone_Top3
+            Rate: 30
+          - Item: DoramStone_Middle3
+            Rate: 30
+          - Item: DoramStone_Bottom3
+            Rate: 30
+          - Item: StarStone_Top3
+            Rate: 30
+          - Item: StarStone_Middle3
+            Rate: 30
+          - Item: StarStone_Bottom3
+            Rate: 30
+          - Item: RebelStone_Top3
+            Rate: 30
+          - Item: RebelStone_Middle3
+            Rate: 30
+          - Item: RebelStone_Bottom3
+            Rate: 30
+          - Item: ReaperStone_Top3
+            Rate: 30
+          - Item: ReaperStone_Middle3
+            Rate: 30
+          - Item: ReaperStone_Bottom3
+            Rate: 30
+          - Item: SuraStone_Top3
+            Rate: 30
+          - Item: SuraStone_Middle3
+            Rate: 30
+          - Item: SuraStone_Bottom3
+            Rate: 30
+          - Item: MechanicStone_Top3
+            Rate: 30
+          - Item: MechanicStone_Middle3
+            Rate: 30
+          - Item: MechanicStone_Bottom3
+            Rate: 30
+          - Item: GuillcrossStone_Top3
+            Rate: 30
+          - Item: GuillcrossStone_Middle3
+            Rate: 30
+          - Item: GuillcrossStone_Bottom3
+            Rate: 30
+          - Item: ArchbishopStone_Top3
+            Rate: 30
+          - Item: ArchbishopStone_Middle3
+            Rate: 30
+          - Item: ArchbishopStone_Bottom3
+            Rate: 30
+          - Item: RangerStone_Top3
+            Rate: 30
+          - Item: RangerStone_Middle3
+            Rate: 30
+          - Item: RangerStone_Bottom3
+            Rate: 30
+          - Item: ShadowchasStone_Top3
+            Rate: 30
+          - Item: ShadowchasStone_Middle3
+            Rate: 30
+          - Item: ShadowchasStone_Bottom3
+            Rate: 30
+          - Item: WanderMinsStone_Top3
+            Rate: 30
+          - Item: WanderMinsStone_Middle3
+            Rate: 30
+          - Item: WanderMinsStone_Bottom3
+            Rate: 30
+          - Item: GeneticStone_Top3
+            Rate: 30
+          - Item: GeneticStone_Middle3
+            Rate: 30
+          - Item: GeneticStone_Bottom3
+            Rate: 30
+          - Item: SorcererStone_Top3
+            Rate: 30
+          - Item: SorcererStone_Middle3
+            Rate: 30
+          - Item: SorcererStone_Bottom3
+            Rate: 30
+          - Item: RuneknightStone_Top3
+            Rate: 30
+          - Item: RuneknightStone_Middle3
+            Rate: 30
+          - Item: RuneknightStone_Bottom3
+            Rate: 30
+          - Item: WarlockStone_Top3
+            Rate: 30
+          - Item: WarlockStone_Middle3
+            Rate: 30
+          - Item: WarlockStone_Bottom3
+            Rate: 30
+          - Item: RoyalguardStone_Top3
+            Rate: 30
+          - Item: RoyalguardStone_Middle3
+            Rate: 30
+          - Item: RoyalguardStone_Bottom3
+            Rate: 30
+          - Item: Stone_Robe_Box
+            Rate: 180
+          - Item: Stone_Robe2_Box
+            Rate: 180
+          - Item: Magic_Stone_Top
+            Rate: 200
+          - Item: Magic_Stone_Middle
+            Rate: 200
+          - Item: Magic_Stone_Bottom
+            Rate: 200
+          - Item: Range_Stone_Top
+            Rate: 200
+          - Item: Range_Stone
+            Rate: 200
+          - Item: Range_Stone_Bottom
+            Rate: 200
+          - Item: Melee_Stone_Top
+            Rate: 200
+          - Item: Melee_Stone_Middle
+            Rate: 200
+          - Item: Melee_Stone_Bottom
+            Rate: 200
+          - Item: ReloadStone_Top
+            Rate: 200
+          - Item: ReloadStone_Middle
+            Rate: 200
+          - Item: ReloadStone_Bottom
+            Rate: 200
+          - Item: EXPStone_Middle
+            Rate: 200
+          - Item: EXPStone_Bottom
+            Rate: 200
+          - Item: EXPStone_Top
+            Rate: 200
+          - Item: Stone_Top_Box
+            Rate: 400
+          - Item: Stone_Top2_Box
+            Rate: 400
+          - Item: Stone_Middle_Box
+            Rate: 400
+          - Item: Stone_Middle2_Box
+            Rate: 400
+          - Item: Stone_Bottom_Box
+            Rate: 400
+          - Item: Stone_Bottom2_Box
+            Rate: 400
+          - Item: CastingStone_Top
+            Rate: 400
+          - Item: CastingStone_Middle
+            Rate: 400
+          - Item: CastingStone_Bottom
+            Rate: 400
+          - Item: Critical_Stone
+            Rate: 400
+          - Item: Critical_Stone_Top
+            Rate: 400
+          - Item: Critical_Stone_Bottom
+            Rate: 400

+ 12 - 12
db/re/laphine_upgrade.yml

@@ -2560,17 +2560,17 @@ Body:
       - Item: Up_Crimson_Rose
       - Item: Up_OneSkyOneSun
       - Item: Up_SoulWeight
-      - Item: aegis_2064
+      - Item: Comp_Iron_Staff
       - Item: Comp_Undine_Spear_K
       - Item: Comp_Royal_Bow_K
       - Item: Comp_Shadow_Staff_K
-      - Item: aegis_1873
+      - Item: Comp_Iron_Nail_K
       - Item: Comp_Sword_Of_Bluefire
       - Item: Comp_Oriental_Sword
-      - Item: aegis_18202
-      - Item: aegis_1350
+      - Item: Comp_Narcis_Bow
+      - Item: Comp_Avenger
       - Item: Comp_Magic_Sword
-      - Item: aegis_28646
+      - Item: Comp_D_Hunt_Bible_K
       - Item: Comp_Shiver_Katar_K_TH
       - Item: Comp_Demon_S_Shot
       - Item: Comp_Sharp_Wind_Sword
@@ -2578,7 +2578,7 @@ Body:
       - Item: Comp_Crimson_Rose
       - Item: Comp_The_Black_Gatling
       - Item: Comp_MeawFoxtail
-      - Item: aegis_21066
+      - Item: Comp_Dragonic_Slayer
       - Item: Comp_Fatalist
       - Item: Comp_Light_Blade
       - Item: Comp_Scalet_DragonL_Bow
@@ -2656,17 +2656,17 @@ Body:
       - Item: Up_Crimson_Rose
       - Item: Up_OneSkyOneSun
       - Item: Up_SoulWeight
-      - Item: aegis_2064
+      - Item: Comp_Iron_Staff
       - Item: Comp_Undine_Spear_K
       - Item: Comp_Royal_Bow_K
       - Item: Comp_Shadow_Staff_K
-      - Item: aegis_1873
+      - Item: Comp_Iron_Nail_K
       - Item: Comp_Sword_Of_Bluefire
       - Item: Comp_Oriental_Sword
-      - Item: aegis_18202
-      - Item: aegis_1350
+      - Item: Comp_Narcis_Bow
+      - Item: Comp_Avenger
       - Item: Comp_Magic_Sword
-      - Item: aegis_28646
+      - Item: Comp_D_Hunt_Bible_K
       - Item: Comp_Shiver_Katar_K_TH
       - Item: Comp_Demon_S_Shot
       - Item: Comp_Sharp_Wind_Sword
@@ -2674,7 +2674,7 @@ Body:
       - Item: Comp_Crimson_Rose
       - Item: Comp_The_Black_Gatling
       - Item: Comp_MeawFoxtail
-      - Item: aegis_21066
+      - Item: Comp_Dragonic_Slayer
       - Item: Comp_Fatalist
       - Item: Comp_Light_Blade
       - Item: Comp_Scalet_DragonL_Bow

+ 1 - 0
src/map/itemdb.hpp

@@ -1832,6 +1832,7 @@ enum e_random_item_group {
 	IG_CLASS_SHADOW_SD_CUBE,
 	IG_CLASS_SHADOW_PD_CUBE,
 	IG_CLASS_SHADOW_EA_CUBE,
+	IG_ENCHANT_STONE_BOX30,
 
 	IG_MAX,
 };

+ 1 - 0
src/map/script_constants.hpp

@@ -6746,6 +6746,7 @@
 	export_constant(IG_CLASS_SHADOW_SD_CUBE);
 	export_constant(IG_CLASS_SHADOW_PD_CUBE);
 	export_constant(IG_CLASS_SHADOW_EA_CUBE);
+	export_constant(IG_ENCHANT_STONE_BOX30);
 
 	/* unit stop walking */
 	export_constant(USW_NONE);

Některé soubory nejsou zobrazeny, neboť je v těchto rozdílových datech změněno mnoho souborů