Some Items Fixes (#6758)

db/re/item_combos.yml

@@ -1163,7 +1163,7 @@ Body:
           - Sprint_Glove_IL
           - Sprint_Mail_IL
       - Combo:
-          - aegis_310881
+          - Runeknight_Top3
           - RuneknightStone_Robe_
     Script: |
       bonus bVariableCastrate,-10;
@@ -4791,7 +4791,7 @@ Body:
           - RingOfDevil
           - Fortune3
       - Combo:
-          - aegis_410094
+          - Chain_Of_Seal_
           - Vassalage_Necklace
     Script: |
       bonus bCritAtkRate,5;
@@ -13146,7 +13146,7 @@ Body:
           - SorcererStone_Robe_
           - SorcererStone_Top_
       - Combo:
-          - aegis_311012
+          - Sorcerer_Middle3
           - SorcererStone_Robe_
     Script: |
       bonus2 bSkillAtk,"SO_PSYCHIC_WAVE",15;
@@ -13181,7 +13181,7 @@ Body:
           - GeneticStone_Robe_
           - GeneticStone_Top_
       - Combo:
-          - aegis_311009
+          - Genetic_Middle3
           - GeneticStone_Robe_
     Script: |
       bonus2 bSkillAtk,"GN_CARTCANNON",15;
@@ -13196,7 +13196,7 @@ Body:
           - WarlockStone_Robe_
           - WarlockStone_Top_
       - Combo:
-          - aegis_310885
+          - Warlock_Middle3
           - WarlockStone_Robe_
     Script: |
       bonus2 bSkillAtk,"WL_CRIMSONROCK",15;
@@ -13235,7 +13235,7 @@ Body:
           - GuillcrossStone_Robe_
           - AssacrossStone_Top_
       - Combo:
-          - aegis_311005
+          - WanderMins_Top3
           - WanderMinstrelStone_Robe_
     Script: |
       bonus2 bSPDrainRate,20,1;
@@ -13256,7 +13256,7 @@ Body:
           - WanderMinstrelStone_Robe_
           - WanderMinstrelStone_Top_
       - Combo:
-          - aegis_311007
+          - WanderMins_Bottom3
           - WanderMinstrelStone_Robe_
     Script: |
       bonus2 bSkillAtk,"WM_SEVERE_RAINSTORM",15;
@@ -13307,10 +13307,10 @@ Body:
           - RoyalguardStone_Robe_
           - PaladinStone_Bottom_
       - Combo:
-          - aegis_310888
+          - Royalguard_Middle3
           - RoyalguardStone_Robe_
       - Combo:
-          - aegis_310888
+          - Royalguard_Middle3
           - RoyalGuard_Robe2
     Script: |
       bonus2 bSkillAtk,"LG_BANISHINGPOINT",15;
@@ -14979,7 +14979,7 @@ Body:
           - Warlock_Robe2
           - Warlock_Top2
       - Combo:
-          - aegis_310886
+          - Warlock_Bottom3
           - Warlock_Robe2
     Script: |
       bonus2 bSkillAtk,"WL_COMET",15;
@@ -15599,7 +15599,7 @@ Body:
           - HeroInsignia_INT
           - HeroBoots_INT
       - Combo:
-          - aegis_311006
+          - WanderMins_Middle3
           - WandMinst_Robe2
     Script: |
       bonus2 bMagicAtkEle,Ele_All,15;
@@ -20672,7 +20672,7 @@ Body:
       bonus2 bMagicAtkEle,Ele_All,6;
   - Combos:
       - Combo:
-          - aegis_310881
+          - Runeknight_Top3
           - Runeknight_Robe2
     Script: |
       bonus2 bSkillAtk,"RK_HUNDREDSPEAR",15;
@@ -20697,43 +20697,43 @@ Body:
       bonus2 bSkillAtk,"RK_IGNITIONBREAK",15;
   - Combos:
       - Combo:
-          - aegis_310884
+          - Warlock_Top3
           - WarlockStone_Robe_
     Script: |
       bonus2 bSkillAtk,"WL_SOULEXPANSION",15;
   - Combos:
       - Combo:
-          - aegis_310884
+          - Warlock_Top3
           - Warlock_Robe2
       - Combo:
-          - aegis_310885
+          - Warlock_Middle3
           - Warlock_Robe2
     Script: |
       bonus2 bSkillAtk,"WL_JACKFROST",15;
   - Combos:
       - Combo:
-          - aegis_310886
+          - Warlock_Bottom3
           - WarlockStone_Robe_
     Script: |
       bonus2 bSkillAtk,"WL_CHAINLIGHTNING",15;
   - Combos:
       - Combo:
-          - aegis_310887
+          - Royalguard_Top3
           - RoyalguardStone_Robe_
       - Combo:
-          - aegis_310889
+          - Royalguard_Bottom3
           - RoyalguardStone_Robe_
     Script: |
       bonus2 bSkillAtk,"LG_CANNONSPEAR",15;
   - Combos:
       - Combo:
-          - aegis_310887
+          - Royalguard_Top3
           - RoyalGuard_Robe2
     Script: |
       bonus2 bSkillUseSPrate,"LG_RAYOFGENESIS",15;
   - Combos:
       - Combo:
-          - aegis_310889
+          - Royalguard_Bottom3
           - RoyalGuard_Robe2
     Script: |
       bonus2 bMagicAddSize,Size_All,15;
@@ -20765,73 +20765,73 @@ Body:
       bonus2 bAddClass,Class_All,15;
   - Combos:
       - Combo:
-          - aegis_311005
+          - WanderMins_Top3
           - WandMinst_Robe2
     Script: |
       bonus2 bSkillAtk,"WM_METALICSOUND",15;
   - Combos:
       - Combo:
-          - aegis_311006
+          - WanderMins_Middle3
           - WanderMinstrelStone_Robe_
     Script: |
       bonus2 bAddSize,Size_All,15;
   - Combos:
       - Combo:
-          - aegis_311007
+          - WanderMins_Bottom3
           - WandMinst_Robe2
     Script: |
       bonus2 bSkillAtk,"WM_REVERBERATION",15;
   - Combos:
       - Combo:
-          - aegis_311008
+          - Genetic_Top3
           - GeneticStone_Robe_
       - Combo:
-          - aegis_311010
+          - Genetic_Bottom3
           - GeneticStone_Robe_
     Script: |
       bonus2 bSkillAtk,"CR_ACIDDEMONSTRATION",15;
   - Combos:
       - Combo:
-          - aegis_311008
+          - Genetic_Top3
           - Genetic_Robe2
     Script: |
       bonus2 bSkillAtk,"GN_SPORE_EXPLOSION",15;
   - Combos:
       - Combo:
-          - aegis_311009
+          - Genetic_Middle3
           - Genetic_Robe2
       - Combo:
-          - aegis_311010
+          - Genetic_Bottom3
           - Genetic_Robe2
     Script: |
       bonus2 bSkillAtk,"GN_CART_TORNADO",15;
   - Combos:
       - Combo:
-          - aegis_311011
+          - Sorcerer_Top3
           - SorcererStone_Robe_
     Script: |
       bonus2 bSkillCooldown,"SO_CLOUD_KILL",-2000;
   - Combos:
       - Combo:
-          - aegis_311011
+          - Sorcerer_Top3
           - SorcererStone_Robe2_
     Script: |
       bonus2 bSkillAtk,"SO_EARTHGRAVE",15;
   - Combos:
       - Combo:
-          - aegis_311012
+          - Sorcerer_Middle3
           - SorcererStone_Robe2_
     Script: |
       bonus2 bSkillAtk,"SO_VARETYR_SPEAR",15;
   - Combos:
       - Combo:
-          - aegis_311013
+          - Sorcerer_Bottom3
           - SorcererStone_Robe_
     Script: |
       bonus2 bSkillAtk,"SO_POISON_BUSTER",15;
   - Combos:
       - Combo:
-          - aegis_311013
+          - Sorcerer_Bottom3
           - SorcererStone_Robe2_
     Script: |
       bonus2 bSkillAtk,"SO_DIAMONDDUST",15;
@@ -23768,7 +23768,7 @@ Body:
       bonus2 bAddEle,Ele_Fire,5*.@r;
   - Combos:
       - Combo:
-          - aegis_450163     # 450163
+          - White_Lily_Robe_     # 450163
           - Grave_Amon_Ra_Card     # 4652
     Script: |
       bonus2 bMagicAtkEle,Ele_Holy,15;
@@ -23776,15 +23776,15 @@ Body:
       skill "AB_JUDEX",3;
   - Combos:
       - Combo:
-          - aegis_450163     # 450163
-          - aegis_300348     # 300348
+          - White_Lily_Robe_     # 450163
+          - SLD_G_Amon_Ra_Card_J     # 300348
     Script: |
       bonus2 bMagicAtkEle,Ele_Holy,5;
       bonus2 bResEff,Eff_Freeze,10000;
       skill "AB_JUDEX",1;
   - Combos:
       - Combo:
-          - aegis_450181     # 450181
+          - White_Lily_Robe__     # 450181
           - Grave_Amon_Ra_Card     # 4652
     Script: |
       .@r = min(10,getequiprefinerycnt(EQI_ARMOR));
@@ -23793,8 +23793,8 @@ Body:
       skill "AB_JUDEX",.@r;
   - Combos:
       - Combo:
-          - aegis_450181     # 450181
-          - aegis_300348     # 300348
+          - White_Lily_Robe__     # 450181
+          - SLD_G_Amon_Ra_Card_J     # 300348
     Script: |
       .@r = min(10,getequiprefinerycnt(EQI_ARMOR));
       bonus2 bMagicAtkEle,Ele_Holy,15;
@@ -23858,34 +23858,34 @@ Body:
       }
   - Combos:
       - Combo:
-          - aegis_32295     # 32295
+          - Crystal_Blade_Necklace     # 32295
           - Strong_Blow1     # 29366
       - Combo:
-          - aegis_32295     # 32295
+          - Crystal_Blade_Necklace     # 32295
           - Strong_Blow2     # 29367
       - Combo:
-          - aegis_32295     # 32295
+          - Crystal_Blade_Necklace     # 32295
           - Strong_Blow3     # 29368
       - Combo:
-          - aegis_32295     # 32295
+          - Crystal_Blade_Necklace     # 32295
           - Strong_Blow4     # 29369
       - Combo:
-          - aegis_32295     # 32295
+          - Crystal_Blade_Necklace     # 32295
           - Strong_Blow5     # 29370
       - Combo:
-          - aegis_32296     # 32296
+          - Crystal_Blade_Necklace_     # 32296
           - Strong_Blow1     # 29366
       - Combo:
-          - aegis_32296     # 32296
+          - Crystal_Blade_Necklace_     # 32296
           - Strong_Blow2     # 29367
       - Combo:
-          - aegis_32296     # 32296
+          - Crystal_Blade_Necklace_     # 32296
           - Strong_Blow3     # 29368
       - Combo:
-          - aegis_32296     # 32296
+          - Crystal_Blade_Necklace_     # 32296
           - Strong_Blow4     # 29369
       - Combo:
-          - aegis_32296     # 32296
+          - Crystal_Blade_Necklace_     # 32296
           - Strong_Blow5     # 29370
     Script: |
       if (BaseClass == Job_Novice || BaseClass == Job_Swordman || BaseClass == Job_Mage || BaseClass == Job_Acolyte || BaseClass == Job_Archer || BaseClass == Job_Merchant || BaseClass == Job_Taekwon || BaseClass == Job_Gunslinger || BaseClass == Job_Summoner) {

db/re/item_db_equip.yml

@@ -133971,16 +133971,16 @@ Body:
     ArmorLevel: 1
     View: 973
   - Id: 31889
-    AegisName: aegis_31889
-    Name: Costume Gemini Crown    # !todo check english name
+    AegisName: C_Gemini_Crown
+    Name: Costume Gemini Crown
     Type: Armor
     Locations:
       Costume_Head_Top: true
     ArmorLevel: 1
     View: 551
   - Id: 31890
-    AegisName: aegis_31890
-    Name: Costume Sagittarius Diadem    # !todo check english name
+    AegisName: C_Sagittarius_Diadem
+    Name: Costume Sagittarius Diadem
     Type: Armor
     Locations:
       Costume_Head_Top: true
@@ -135919,7 +135919,7 @@ Body:
          bonus2 bSkillUseSP,"LG_EARTHDRIVE",25;
       }
   - Id: 32295
-    AegisName: aegis_32295
+    AegisName: Crystal_Blade_Necklace
     Name: Crystal Blade Necklace
     Type: Armor
     Weight: 500
@@ -135935,7 +135935,7 @@ Body:
       autobonus3 "{ bonus2 bAddEle,Ele_All,15; }",10,10000,"LK_AURABLADE";
       /*Unknow Rate*/
   - Id: 32296
-    AegisName: aegis_32296
+    AegisName: Crystal_Blade_Necklace_
     Name: Crystal Blade Necklace
     Type: Armor
     Weight: 500
@@ -140079,7 +140079,7 @@ Body:
       bonus bShortAtkRate,8;
       bonus bCritical,8;
   - Id: 410094
-    AegisName: aegis_410094
+    AegisName: Chain_Of_Seal_
     Name: Sealed Chain
     Type: Armor
     Weight: 100
@@ -140149,6 +140149,9 @@ Body:
     AegisName: C_Avenger
     Name: Costume Avengers    # !todo check english name
     Type: Armor
+    Jobs:
+      All: true
+      Summoner: false
     Locations:
       Costume_Head_Mid: true
     ArmorLevel: 1
@@ -145041,7 +145044,7 @@ Body:
       if (.@r>=9)
          bonus2 bAddSize,Size_All,20;
   - Id: 450163
-    AegisName: aegis_450163
+    AegisName: White_Lily_Robe_
     Name: White Lily Robe
     Type: Armor
     Weight: 900
@@ -145562,7 +145565,7 @@ Body:
          bonus bMdef,15;
       }
   - Id: 450181
-    AegisName: aegis_450181
+    AegisName: White_Lily_Robe__
     Name: Awakened White Lily Robe
     Type: Armor
     Weight: 900

db/re/item_db_etc.yml

@@ -47368,7 +47368,7 @@ Body:
       bonus bVariableCastrate,-10;
       bonus bDelayrate,-10;
   - Id: 300348
-    AegisName: aegis_300348
+    AegisName: SLD_G_Amon_Ra_Card_J
     Name: Sealed Nightmare Amon Ra Card
     Type: Card
     Weight: 10
@@ -54217,7 +54217,7 @@ Body:
       bonus bVariableCastrate,-5;
       bonus bMatk,3;
   - Id: 310881
-    AegisName: aegis_310881
+    AegisName: Runeknight_Top3
     Name: Rune Knight Stone(Upper)
     Type: Card
     SubType: Enchant
@@ -54239,44 +54239,44 @@ Body:
     Script: |
       bonus2 bSkillAtk,"RK_WINDCUTTER",5*getskilllv("RK_ENCHANTBLADE");
   - Id: 310884
-    AegisName: aegis_310884
-    Name: Warlock Stone(Upper)
+    AegisName: Warlock_Top3
+    Name: Warlock Stone (Upper)
     Type: Card
     SubType: Enchant
     Script: |
       bonus2 bMagicAtkEle,Ele_All,2*getskilllv("WL_SOULEXPANSION");
   - Id: 310885
-    AegisName: aegis_310885
-    Name: Warlock Stone(Mid)
+    AegisName: Warlock_Middle3
+    Name: Warlock Stone (Middle)
     Type: Card
     SubType: Enchant
     Script: |
       bonus bFixedCast,-100*getskilllv("WL_COMET");
   - Id: 310886
-    AegisName: aegis_310886
-    Name: Warlock Stone(Lower)
+    AegisName: Warlock_Bottom3
+    Name: Warlock Stone (Lower)
     Type: Card
     SubType: Enchant
     Script: |
       bonus bDelayrate,-getskilllv("WL_CHAINLIGHTNING");
   - Id: 310887
-    AegisName: aegis_310887
-    Name: Royal Guard Stone(Upper)
+    AegisName: Royalguard_Top3
+    Name: Royal Guard Stone (Upper)
     Type: Card
     SubType: Enchant
     Script: |
       bonus bFixedCast,-100*getskilllv("LG_INSPIRATION");
   - Id: 310888
-    AegisName: aegis_310888
-    Name: Royal Guard Stone(Mid)
+    AegisName: Royalguard_Middle3
+    Name: Royal Guard Stone (Middle)
     Type: Card
     SubType: Enchant
     Script: |
       bonus bLongAtkRate,2*getskilllv("LG_PIETY");
       bonus2 bMagicAtkEle,Ele_All,2*getskilllv("LG_PIETY");
   - Id: 310889
-    AegisName: aegis_310889
-    Name: Royal Guard Stone(Lower)
+    AegisName: Royalguard_Bottom3
+    Name: Royal Guard Stone (Lower)
     Type: Card
     SubType: Enchant
     Script: |
@@ -54968,65 +54968,65 @@ Body:
     Script: |
       bonus2 bExpAddRace,RC_All,5;
   - Id: 311005
-    AegisName: aegis_311005
-    Name: Wondermins Stone (top)    # !todo check english name
+    AegisName: WanderMins_Top3
+    Name: Wander Mins Stone (Upper)
     Type: Card
     SubType: Enchant
     Script: |
       bonus bVariableCastrate,-getskilllv("WM_LESSON");
   - Id: 311006
-    AegisName: aegis_311006
-    Name: Wondermin's Stone (Discontinued)    # !todo check english name
+    AegisName: WanderMins_Middle3
+    Name: Wander Mins Stone (Middle)
     Type: Card
     SubType: Enchant
     Script: |
       bonus2 bSkillCooldown,"WM_SEVERE_RAINSTORM",-(100*getskilllv("WM_SIRCLEOFNATURE"));
       bonus2 bSkillCooldown,"WM_METALICSOUND",-(100*getskilllv("WM_SIRCLEOFNATURE"));
   - Id: 311007
-    AegisName: aegis_311007
-    Name: Wondermin's Stone (bottom)    # !todo check english name
+    AegisName: WanderMins_Bottom3
+    Name: Wander Mins Stone (Lower)
     Type: Card
     SubType: Enchant
     Script: |
       bonus bFixedCast,-100*getskilllv("WM_FRIGG_SONG");
   - Id: 311008
-    AegisName: aegis_311008
-    Name: Generic Stone (top)    # !todo check english name
+    AegisName: Genetic_Top3
+    Name: Genetic Stone (Upper)
     Type: Card
     SubType: Enchant
     Script: |
       bonus bLongAtkRate,2*getskilllv("GN_CARTCANNON");
   - Id: 311009
-    AegisName: aegis_311009
-    Name: Generic Stone (Discontinued)    # !todo check english name
+    AegisName: Genetic_Middle3
+    Name: Generic Stone (Middle)
     Type: Card
     SubType: Enchant
     Script: |
       bonus bVariableCastrate,-2*getskilllv("GN_REMODELING_CART");
   - Id: 311010
-    AegisName: aegis_311010
-    Name: Generic Stone (Bottom)    # !todo check english name
+    AegisName: Genetic_Bottom3
+    Name: Genetic Stone (Lower)
     Type: Card
     SubType: Enchant
     Script: |
       bonus bFixedCast,-100*getskilllv("GN_TRAINING_SWORD");
   - Id: 311011
-    AegisName: aegis_311011
-    Name: Sorcerer Stone (top)    # !todo check english name
+    AegisName: Sorcerer_Top3
+    Name: Sorcerer Stone (Upper)
     Type: Card
     SubType: Enchant
     Script: |
       bonus bFixedCast,-100*getskilllv("SO_STRIKING");
   - Id: 311012
-    AegisName: aegis_311012
-    Name: Sorcerer Stone (Discontinued)    # !todo check english name
+    AegisName: Sorcerer_Middle3
+    Name: Sorcerer Stone (Middle)
     Type: Card
     SubType: Enchant
     Script: |
       bonus bVariableCastrate,-2*getskilllv("SO_DIAMONDDUST");
   - Id: 311013
-    AegisName: aegis_311013
-    Name: Sorcerer Stone (bottom)    # !todo check english name
+    AegisName: Sorcerer_Bottom3
+    Name: Sorcerer Stone (Lower)
     Type: Card
     SubType: Enchant
     Script: |