Jelajahi Sumber

DB update - Aegis item name (#7661)

* Updated several Aegis item names DB
Atemo 2 tahun lalu
induk
melakukan
c06fed6b56

File diff ditekan karena terlalu besar
+ 161 - 161
db/re/item_combos.yml


File diff ditekan karena terlalu besar
+ 114 - 114
db/re/item_db_equip.yml


File diff ditekan karena terlalu besar
+ 115 - 115
db/re/item_db_etc.yml


File diff ditekan karena terlalu besar
+ 112 - 112
db/re/item_db_usable.yml


+ 53 - 53
db/re/item_group_db.yml

@@ -1172,7 +1172,7 @@ Body:
           - Item: Monkey_On_Fur_Hat
             Rate: 150
             Announced: true
-          - Item: Nabi_Hair_Pin
+          - Item: Butterfly_Hairpin
             Rate: 75
             Announced: true
           - Item: C_Hair_Of_The_Strong
@@ -3989,7 +3989,7 @@ Body:
           - Item: Improved_Tights
             Rate: 3
             UniqueId: true
-          - Item: Capricorn_Diadem_Box
+          - Item: Capricon_Diadem_Box
             Rate: 10
             UniqueId: true
           - Item: Sprint_Shoes
@@ -4048,7 +4048,7 @@ Body:
           - Item: Rainbow_Scarf_Box
             Rate: 5
             UniqueId: true
-          - Item: Capricorn_Crown_Box
+          - Item: Capricon_Crown_Box
             Rate: 10
             UniqueId: true
           - Item: Pizza_Hat_Box
@@ -6192,7 +6192,7 @@ Body:
             Rate: 70
           - Item: C_Foxtail
             Rate: 100
-          - Item: C_Chicken_Hat
+          - Item: C_Cock_Hat1
             Rate: 120
           - Item: C_Black_Cat_Ears_Beret
             Rate: 140
@@ -6493,10 +6493,10 @@ Body:
     SubGroups:
       - SubGroup: 1
         List:
-          - Item: Capricorn_Diadem
+          - Item: Capricon_Diadem
             Rate: 150
             Announced: true
-          - Item: Capricorn_Crown
+          - Item: Capricon_Crown
             Rate: 150
             Announced: true
           - Item: Virgo_Diadem
@@ -8391,7 +8391,7 @@ Body:
           - Item: Almighty
             Rate: 1
             Amount: 10
-          - Item: Sealed_Kiel-D-01_Scroll
+          - Item: Sealed_Kiel_Scroll
             Rate: 1
   - Group: EVENT_ALMIGHTY_BOX_100
     SubGroups:
@@ -8400,7 +8400,7 @@ Body:
           - Item: Almighty
             Rate: 1
             Amount: 100
-          - Item: Sealed_Kiel-D-01_Scroll
+          - Item: Sealed_Kiel_Scroll
             Rate: 1
             Amount: 11
   - Group: EVIL_INCARNATION
@@ -10787,7 +10787,7 @@ Body:
           - Item: Archangel_Wing
             Rate: 110
             Announced: true
-          - Item: Dep_Alice_Hat
+          - Item: Alicel_Drooping_Doll
             Rate: 150
             Announced: true
           - Item: Boitata_Armor
@@ -12040,7 +12040,7 @@ Body:
           - Item: Dark_Book
             Rate: 120
             Announced: true
-          - Item: Dep_Alice_Hat
+          - Item: Alicel_Drooping_Doll
             Rate: 50
             Announced: true
           - Item: Candy_Hat
@@ -12225,7 +12225,7 @@ Body:
           - Item: Job_Manual50
             Amount: 5
           - Item: Guarantee_Armor_6Up
-          - Item: Level_Up_Box130
+          - Item: 130LVUP
   - Group: LEVEL_UP_BOX130
     SubGroups:
       - SubGroup: 0
@@ -12239,7 +12239,7 @@ Body:
           - Item: Job_Manual50
             Amount: 5
           - Item: Guarantee_Weapon_7Up
-          - Item: Level_Up_Box140
+          - Item: 140LVUP
   - Group: LEVEL_UP_BOX140
     SubGroups:
       - SubGroup: 0
@@ -12253,7 +12253,7 @@ Body:
           - Item: Job_Manual50
             Amount: 5
           - Item: Guarantee_Armor_7Up
-          - Item: Level_Up_Box150
+          - Item: 150LVUP
   - Group: LEVEL_UP_BOX150
     SubGroups:
       - SubGroup: 0
@@ -12267,7 +12267,7 @@ Body:
           - Item: Job_Manual50
             Amount: 5
           - Item: Guarantee_Weapon_8Up
-          - Item: Level_Up_Box160
+          - Item: 160LVUP
   - Group: LEVEL_UP_BOX160
     SubGroups:
       - SubGroup: 0
@@ -13254,14 +13254,14 @@ Body:
         List:
           - Item: Silvervine
             Amount: 10
-          - Item: Sealed_Vesper_Scroll
+          - Item: Sealed_Apo_H_Scroll
   - Group: LUCKY_SILVERVINE_FRUIT_BOX_III110
     SubGroups:
       - SubGroup: 0
         List:
           - Item: Silvervine
             Amount: 110
-          - Item: Sealed_Vesper_Scroll
+          - Item: Sealed_Apo_H_Scroll
             Amount: 11
   - Group: MAGICCARDALBUM
     SubGroups:
@@ -15559,7 +15559,7 @@ Body:
           - Item: Spring_Rabbit_Ticket
             Rate: 10
             UniqueId: true
-          - Item: Zeny_Scroll_Box
+          - Item: Zeny_Card_Scroll_Box
             Rate: 10
             UniqueId: true
   - Group: PIERRE_TREASUREBOX
@@ -18867,7 +18867,7 @@ Body:
             Rate: 230
             Amount: 30
             UniqueId: true
-          - Item: Zeny_Scroll_Box
+          - Item: Zeny_Card_Scroll_Box
             Rate: 216
             Amount: 10
             UniqueId: true
@@ -18919,7 +18919,7 @@ Body:
             Rate: 230
             Amount: 30
             UniqueId: true
-          - Item: Zeny_Scroll_Box
+          - Item: Zeny_Card_Scroll_Box
             Rate: 226
             Amount: 10
             UniqueId: true
@@ -18971,7 +18971,7 @@ Body:
             Rate: 230
             Amount: 30
             UniqueId: true
-          - Item: Zeny_Scroll_Box
+          - Item: Zeny_Card_Scroll_Box
             Rate: 209
             Amount: 10
             UniqueId: true
@@ -19023,7 +19023,7 @@ Body:
             Rate: 230
             Amount: 30
             UniqueId: true
-          - Item: Zeny_Scroll_Box
+          - Item: Zeny_Card_Scroll_Box
             Rate: 217
             Amount: 10
             UniqueId: true
@@ -19043,7 +19043,7 @@ Body:
           - Item: Mental_Potion
             Rate: 1
             Amount: 2
-          - Item: Scroll_Sealed_Dark_Lord
+          - Item: Sealed_D_Lord_Scroll
             Rate: 1
   - Group: SUPPORT_PACKAGE_10
     SubGroups:
@@ -19061,7 +19061,7 @@ Body:
           - Item: Mental_Potion
             Rate: 1
             Amount: 20
-          - Item: Scroll_Sealed_Dark_Lord
+          - Item: Sealed_D_Lord_Scroll
             Rate: 1
             Amount: 11
   - Group: SUPPORT_PACKAGE_II
@@ -19565,7 +19565,7 @@ Body:
           - Item: Med_Life_Potion
             Rate: 1
             Amount: 20
-          - Item: Sealed_Moonlight_Flower_Scroll
+          - Item: Sealed_M_Flower_Scroll
             Rate: 1
   - Group: THREE_MASTER_PACKAGE_III_10
     SubGroups:
@@ -19577,7 +19577,7 @@ Body:
           - Item: Med_Life_Potion
             Rate: 1
             Amount: 200
-          - Item: Sealed_Moonlight_Flower_Scroll
+          - Item: Sealed_M_Flower_Scroll
             Rate: 1
             Amount: 11
   - Group: THROWABLE
@@ -20548,7 +20548,7 @@ Body:
           - Item: Noble_Mask
             Rate: 100
             Announced: true
-          - Item: Valkyrie_Hammer_
+          - Item: Valkyrie_Hammer
             Rate: 100
             Announced: true
           - Item: Guarantee_Weapon_8Up
@@ -22365,7 +22365,7 @@ Body:
             Rate: 7
           - Item: Spinx_Helm
             Rate: 1
-          - Item: Assassin_Mask
+          - Item: Popcorn_Hair
             Rate: 1
           - Item: Novice_Egg_Cap
             Rate: 7
@@ -23066,7 +23066,7 @@ Body:
     SubGroups:
       - SubGroup: 0
         List:
-          - Item: Fine_Sun
+          - Item: Clear_Sun
           - Item: Rainbow
           - Item: Rain_Cloud
           - Item: Lightning_Cloud
@@ -25482,7 +25482,7 @@ Body:
     SubGroups:
       - SubGroup: 0
         List:
-          - Item: Drooping_Rebellion_
+          - Item: Droop_Gunslinger
             RandomOptionGroup: GUNSLINGER_ENCHANT
   - Group: ENCHANTSTONE_RECIPE
     SubGroups:
@@ -25665,7 +25665,7 @@ Body:
             Rate: 140
           - Item: C_Pecopeco_Cap
             Rate: 400
-          - Item: C_Green_Hat
+          - Item: C_Woodie_Hat
             Rate: 400
           - Item: C_Little_Aquarium
             Rate: 400
@@ -25699,11 +25699,11 @@ Body:
             Rate: 1370
           - Item: C_Khalitzburg_KN_Helm
             Rate: 1370
-          - Item: C_Laser_of_Eagle
+          - Item: C_Laser_Of_Eagle
             Rate: 1370
           - Item: C_Devil_Wing
             Rate: 140
-          - Item: C_Tone_of_Gold
+          - Item: C_Tone_Of_Gold
             Rate: 140
           - Item: C_Dwarf_Beard
             Rate: 140
@@ -26026,21 +26026,21 @@ Body:
             Rate: 140
           - Item: C_Monochrome_Cap
             Rate: 140
-          - Item: C_Sky_of_Memory
+          - Item: C_Sky_Of_Memory
             Rate: 140
           - Item: C_Ice_Wing
             Rate: 140
-          - Item: C_Under_Rim_Glasses_Blue
+          - Item: C_Under_Rim_Glasses_Bu
             Rate: 140
           - Item: C_Gimmick_One_Feather
             Rate: 140
-          - Item: C_Pocketwatch_Hair_Ornament
+          - Item: C_PocketWatch_Hair_Orna
             Rate: 140
           - Item: C_Poring_Traffic_Light
             Rate: 140
           - Item: C_PGstone_Knit_Hat_PK
             Rate: 140
-          - Item: C_Lazy_Ninetail
+          - Item: C_Drooping_Nine_Tail
             Rate: 140
           - Item: C_Sakura_Wing
             Rate: 140
@@ -26146,13 +26146,13 @@ Body:
     SubGroups:
       - SubGroup: 0
         List:
-          - Item: Kafra_Uniform
+          - Item: Kafra_Suit
             RandomOptionGroup: SUIT_UPGRADE_KIT
   - Group: SCROLL_OF_FALLEN_ANGEL_WINGS
     SubGroups:
       - SubGroup: 0
         List:
-          - Item: Fallen_Angel_Wings_
+          - Item: K_Fallen_Angel_Wing
   # Source: https://ro.gnjoy.com/news/probability/View.asp?seq=3955662
   - Group: CLASS_SHADOW_BOX_WEAPON
     SubGroups:
@@ -26674,19 +26674,19 @@ Body:
     SubGroups:
       - SubGroup: 0
         List:
-          - Item: Bag_Of_Antonio_P
+          - Item: Bag_Of_Antonio_Melee
             RandomOptionGroup: CANDY_BAG_SCROLL_MELEE
   - Group: CANDY_BAG_SCROLL_RANGE
     SubGroups:
       - SubGroup: 0
         List:
-          - Item: Bag_Of_Antonio_S
+          - Item: Bag_Of_Antonio_Range
             RandomOptionGroup: CANDY_BAG_SCROLL_RANGE
   - Group: CANDY_BAG_SCROLL_MAGIC
     SubGroups:
       - SubGroup: 0
         List:
-          - Item: Bag_Of_Antonio_
+          - Item: Bag_Of_Antonio_Magic
             RandomOptionGroup: CANDY_BAG_SCROLL_MAGIC
   - Group: BOOSTER_AMPLIFIER
     SubGroups:
@@ -26890,11 +26890,11 @@ Body:
     SubGroups:
       - SubGroup: 1
         List:
-          - Item: Bag_Of_Antonio_
+          - Item: Bag_Of_Antonio_Magic
             Rate: 1
-          - Item: Bag_Of_Antonio_S
+          - Item: Bag_Of_Antonio_Range
             Rate: 1
-          - Item: Bag_Of_Antonio_P
+          - Item: Bag_Of_Antonio_Melee
             Rate: 1
   - Group: BS_ITEM_M_S_13
     SubGroups:
@@ -27251,7 +27251,7 @@ Body:
     SubGroups:
       - SubGroup: 0
         List:
-          - Item: Sigrun's_Wings_
+          - Item: Sigrun's_Wing_
   - Group: BS_ITEM_M_S_27
     SubGroups:
       - SubGroup: 0
@@ -48205,12 +48205,12 @@ Body:
     SubGroups:
       - SubGroup: 0
         List:
-          - Item: Trans_Scroll_Wind_Ghost
-          - Item: Trans_Scroll_Horn_Scaraba
-          - Item: Trans_Scroll_Wanderer
+          - Item: Trans_Scroll_Wghost
+          - Item: Trans_Scroll_Sca
+          - Item: Trans_Scroll_Wander
           - Item: Trans_Scroll_Gazeti
-          - Item: Trans_Scroll_Kobold_Archer
-          - Item: Trans_Scroll_Necromancer
+          - Item: Trans_Scroll_Karcher
+          - Item: Trans_Scroll_Necro
   - Group: S_W_BREATH_CUBE
     SubGroups:
       - SubGroup: 0
@@ -48960,8 +48960,8 @@ Body:
           - Item: E_Giant_Fly_Wing
           - Item: F_Giant_Fly_Wing
           - Item: C_Wing_Of_Fly
-          - Item: N_Fly_Wing_
-          - Item: Compressed_Wing_Of_Fly
+          - Item: N_Fly_Wing2
+          - Item: Cps_Fly_Wing
           - Item: Comp_Wing_Of_Fly
   - Group: MF_NORETURN
     SubGroups:
@@ -48971,7 +48971,7 @@ Body:
           - Item: N_Butterfly_Wing
           - Item: Dun_Tele_Scroll1
           - Item: Dun_Tele_Scroll2
-          - Item: Dun_Tele_Scroll3
+          - Item: Dun_Tele_Scroll3_fr
           - Item: E_Dun_Tele_Scroll1
           - Item: F_Dun_Tele_Scroll1
           - Item: WOB_Rune

+ 36 - 36
db/re/laphine_synthesis.yml

@@ -726,7 +726,7 @@ Body:
   - Item: Gunslinger_Enchant
     RewardGroup: GUNSLINGER_ENCHANT
     Requirements:
-      - Item: Drooping_Rebellion_
+      - Item: Droop_Gunslinger
   - Item: EnchantStone_Recipe
     RewardGroup: ENCHANTSTONE_RECIPE
     RequiredRequirementsCount: 3
@@ -814,10 +814,10 @@ Body:
       - Item: MaxHP_Stone
       - Item: ShrinkEffect_Bottom
       - Item: ElectricEffect_Top
-      - Item: SPAbsorb_Stone_Top
-      - Item: HPAbsorb_Stone_Top
-      - Item: SPAbsorb_Stone_Robe
-      - Item: HPAbsorb_Stone_Robe
+      - Item: Upg_SPdrainStone_Top
+      - Item: Upg_HPdrainStone_Top
+      - Item: Upg_SPdrainStone_Robe
+      - Item: Upg_HPdrainStone_Robe
       - Item: WaterFieldEffect_Bottom
       - Item: ExplodingEffect_Middle
       - Item: WhiteBodyEffect_Middle
@@ -1345,19 +1345,19 @@ Body:
         Amount: 10
       - Item: Shabby_Crown
         Amount: 10
-      - Item: Cold_Core
+      - Item: Stone_Of_Chill
         Amount: 10
-      - Item: Silicone_Shell
+      - Item: Soften_Skin
         Amount: 10
-      - Item: Hedgehog_Picks
+      - Item: Porcupine_Big_Spike
         Amount: 10
-      - Item: Old_Belt
+      - Item: Shabby_Old_Belt
         Amount: 10
-      - Item: Moving_Dark_Matter
+      - Item: Moving_Black_Things
         Amount: 10
-      - Item: Fragments_Valkyrie_Power
+      - Item: Valkyrie_Fragment
         Amount: 10
-      - Item: Will_Master
+      - Item: Will_Of_Owner
         Amount: 10
       - Item: Piece_Of_Chimera
         Amount: 10
@@ -1385,19 +1385,19 @@ Body:
         Amount: 10
       - Item: BrownRatTail
         Amount: 10
-      - Item: Frozen_Stone_Fragment
+      - Item: Frozen_PieceOfRock
         Amount: 10
       - Item: SpritJewel
         Amount: 10
       - Item: Snowball
         Amount: 10
-      - Item: Ktullanux_Eye
+      - Item: KTULLANUXsEye
         Amount: 10
-      - Item: Hazy_Dream_Fragment
+      - Item: HazyDream
         Amount: 10
-      - Item: Broken_Arrow
+      - Item: BrokenArrow
         Amount: 10
-      - Item: Recruitment_Leaflet
+      - Item: SubjugationFlyer
         Amount: 10
       - Item: IllusoryStone
         Amount: 10
@@ -1415,9 +1415,9 @@ Body:
         Amount: 10
       - Item: SuspiciousMagicCircle
         Amount: 10
-      - Item: Piece_of_Black_Horn
+      - Item: PieceOfBlackSpirit
         Amount: 10
-      - Item: Fine_Old_Doll
+      - Item: OldDoll
         Amount: 10
       - Item: OldShell
         Amount: 10
@@ -1573,7 +1573,7 @@ Body:
       - Item: C_Loose_Wave_Twin_BL
       - Item: C_Cupid_Wing_Pink
       - Item: C_Pecopeco_Cap
-      - Item: C_Green_Hat
+      - Item: C_Woodie_Hat
       - Item: C_Little_Aquarium
       - Item: C_Angel_Fluttering
       - Item: C_Niflheim_Bunny_Hat
@@ -1590,9 +1590,9 @@ Body:
       - Item: C_Morocc_Kid_Servant
       - Item: C_Monochrome_RibbonHat
       - Item: C_Khalitzburg_KN_Helm
-      - Item: C_Laser_of_Eagle
+      - Item: C_Laser_Of_Eagle
       - Item: C_Devil_Wing
-      - Item: C_Tone_of_Gold
+      - Item: C_Tone_Of_Gold
       - Item: C_Dwarf_Beard
       - Item: C_Mad_Hatter
       - Item: C_Cons_Of_Water
@@ -1753,14 +1753,14 @@ Body:
       - Item: C_Royalguard_Necklace
       - Item: C_Happy_Cat_TW
       - Item: C_Monochrome_Cap
-      - Item: C_Sky_of_Memory
+      - Item: C_Sky_Of_Memory
       - Item: C_Ice_Wing
-      - Item: C_Under_Rim_Glasses_Blue
+      - Item: C_Under_Rim_Glasses_Bu
       - Item: C_Gimmick_One_Feather
-      - Item: C_Pocketwatch_Hair_Ornament
+      - Item: C_PocketWatch_Hair_Orna
       - Item: C_Poring_Traffic_Light
       - Item: C_PGstone_Knit_Hat_PK
-      - Item: C_Lazy_Ninetail
+      - Item: C_Drooping_Nine_Tail
       - Item: C_Sakura_Wing
       - Item: C_Looking
       - Item: C_Wolf_Masquerade
@@ -1832,7 +1832,7 @@ Body:
       - Item: C_Triple_Ice_Cream
       - Item: C_Wrapping_Ribbon
       - Item: C_Bear_Head
-      - Item: C_Kindergarten_Hat
+      - Item: C_Preschool_Hat
       - Item: C_Poulet_TW
       - Item: C_Avenger
       - Item: C_WitchManteau
@@ -1840,16 +1840,16 @@ Body:
       - Item: C_Gothic_Pumpkin_Head
       - Item: C_Barrel_Helm
       - Item: C_White_Cat_On_Shoulder
-      - Item: C_Black_Rabbit_Ears
+      - Item: C_Rabbit_Hopping_BL
       - Item: C_G_DaeHyon_Sword_TW
       - Item: C_Cat_Ears_Cape_Red
-      - Item: C_Tare_W_Doll
-      - Item: C_Goat_Hat
+      - Item: C_Debril_Doll_Hat
+      - Item: C_Sheep_Hat
       - Item: C_Put_On_Coat
       - Item: C_Pink_Pajamas_Hat
       - Item: C_L_RibbonMuff_Black
       - Item: C_Black_Cat_Ears_Beret
-      - Item: C_Watery_Eyes
+      - Item: C_Teardrop
   - Item: Fan_Upgrade_Kit
     RewardGroup: FAN_UPGRADE_KIT
     Requirements:
@@ -1857,11 +1857,11 @@ Body:
   - Item: Suit_Upgrade_Kit
     RewardGroup: SUIT_UPGRADE_KIT
     Requirements:
-      - Item: Kafra_Uniform
+      - Item: Kafra_Suit
   - Item: FallenAngelWing_Reset
     RewardGroup: SCROLL_OF_FALLEN_ANGEL_WINGS
     Requirements:
-      - Item: Fallen_Angel_Wings_
+      - Item: K_Fallen_Angel_Wing
       - Item: Fallen_Angel_Wing
   - Item: JobShadow_Mix_Weapon
     RewardGroup: CLASS_SHADOW_BOX_WEAPON
@@ -2051,15 +2051,15 @@ Body:
   - Item: Candy_Bag_Scroll_Melee
     RewardGroup: CANDY_BAG_SCROLL_MELEE
     Requirements:
-      - Item: Bag_Of_Antonio_P
+      - Item: Bag_Of_Antonio_Melee
   - Item: Candy_Bag_Scroll_Range
     RewardGroup: CANDY_BAG_SCROLL_RANGE
     Requirements:
-      - Item: Bag_Of_Antonio_S
+      - Item: Bag_Of_Antonio_Range
   - Item: Candy_Bag_Scroll_Magic
     RewardGroup: CANDY_BAG_SCROLL_MAGIC
     Requirements:
-      - Item: Bag_Of_Antonio_
+      - Item: Bag_Of_Antonio_Magic
   - Item: Booster_Amplifier
     RewardGroup: BOOSTER_AMPLIFIER
     Requirements:

+ 115 - 115
db/re/laphine_upgrade.yml

@@ -124,7 +124,7 @@ Body:
       - Item: Huuma_Flutter_Snow_IL
       - Item: Combo_Battle_Glove_IL
       - Item: Cap_IL
-      - Item: Illusion_Survivor_Manteau
+      - Item: Clack_Of_Servival_IL
       - Item: Herald_Of_GOD_IL
   - Item: True_Hunting_9Refine
     ResultRefine: 9
@@ -155,18 +155,18 @@ Body:
     MaximumRefine: 9
     CardsAllowed: true
     TargetItems:
-      - Item: T1_Shadow_Armor
-      - Item: T1_Shadow_Weapon
-      - Item: T1_Shadow_Shield
-      - Item: T1_Shadow_Shoes
-      - Item: T1_Shadow_R_Accessory
-      - Item: T1_Shadow_L_Accessory
-      - Item: T2_Shadow_Armor
-      - Item: T2_Shadow_Weapon
-      - Item: T2_Shadow_Shield
-      - Item: T2_Shadow_Shoes
-      - Item: T2_Shadow_R_Accessory
-      - Item: T2_Shadow_L_Accessory
+      - Item: T_Str1_Armor_S
+      - Item: T_Dex1_Weapon_S
+      - Item: T_Luk1_Shield_S
+      - Item: T_Agi1_Shoes_S
+      - Item: T_Vit1_Acc_R_S
+      - Item: T_Int1_Acc_L_S
+      - Item: T_Str2_Armor_S
+      - Item: T_Dex2_Weapon_S
+      - Item: T_Luk2_Shield_S
+      - Item: T_Agi2_Shoes_S
+      - Item: T_Vit2_Acc_R_S
+      - Item: T_Int2_Acc_L_S
       - Item: S_Promotion_Weapon
       - Item: S_Promotion_Armor
       - Item: S_Promotion_Shoes
@@ -961,18 +961,18 @@ Body:
     MinimumRefine: 7
     MaximumRefine: 10
     TargetItems:
-      - Item: T1_Shadow_Armor
-      - Item: T1_Shadow_Weapon
-      - Item: T1_Shadow_Shield
-      - Item: T1_Shadow_Shoes
-      - Item: T1_Shadow_R_Accessory
-      - Item: T1_Shadow_L_Accessory
-      - Item: T2_Shadow_Armor
-      - Item: T2_Shadow_Weapon
-      - Item: T2_Shadow_Shield
-      - Item: T2_Shadow_Shoes
-      - Item: T2_Shadow_R_Accessory
-      - Item: T2_Shadow_L_Accessory
+      - Item: T_Str1_Armor_S
+      - Item: T_Dex1_Weapon_S
+      - Item: T_Luk1_Shield_S
+      - Item: T_Agi1_Shoes_S
+      - Item: T_Vit1_Acc_R_S
+      - Item: T_Int1_Acc_L_S
+      - Item: T_Str2_Armor_S
+      - Item: T_Dex2_Weapon_S
+      - Item: T_Luk2_Shield_S
+      - Item: T_Agi2_Shoes_S
+      - Item: T_Vit2_Acc_R_S
+      - Item: T_Int2_Acc_L_S
       - Item: S_Promotion_Weapon
       - Item: S_Promotion_Armor
       - Item: S_Promotion_Shoes
@@ -1690,25 +1690,25 @@ Body:
     RequiredRandomOptions: 2
     TargetItems:
       - Item: Lava_Leather_Armor
-      - Item: Lava_Leather_Suit
+      - Item: Lava_Leather_Suits
       - Item: Lava_Leather_Robe
   - Item: Shadow_9_Refine_Hammer
     ResultRefine: 9
     MaximumRefine: 8
     CardsAllowed: true
     TargetItems:
-      - Item: T1_Shadow_Armor
-      - Item: T1_Shadow_Weapon
-      - Item: T1_Shadow_Shield
-      - Item: T1_Shadow_Shoes
-      - Item: T1_Shadow_R_Accessory
-      - Item: T1_Shadow_L_Accessory
-      - Item: T2_Shadow_Armor
-      - Item: T2_Shadow_Weapon
-      - Item: T2_Shadow_Shield
-      - Item: T2_Shadow_Shoes
-      - Item: T2_Shadow_R_Accessory
-      - Item: T2_Shadow_L_Accessory
+      - Item: T_Str1_Armor_S
+      - Item: T_Dex1_Weapon_S
+      - Item: T_Luk1_Shield_S
+      - Item: T_Agi1_Shoes_S
+      - Item: T_Vit1_Acc_R_S
+      - Item: T_Int1_Acc_L_S
+      - Item: T_Str2_Armor_S
+      - Item: T_Dex2_Weapon_S
+      - Item: T_Luk2_Shield_S
+      - Item: T_Agi2_Shoes_S
+      - Item: T_Vit2_Acc_R_S
+      - Item: T_Int2_Acc_L_S
       - Item: S_Promotion_Weapon
       - Item: S_Promotion_Armor
       - Item: S_Promotion_Shoes
@@ -2408,9 +2408,9 @@ Body:
   - Item: ILL_Piece_A
     RandomOptionGroup: ILL_PIECE_A
     TargetItems:
-      - Item: Illusion_Bazerald
-      - Item: Illusion_Butcher
-      - Item: Illusion_Gold_Lux
+      - Item: Bazerald_IL
+      - Item: Butcher_IL
+      - Item: Gold_Lux_IL
       - Item: Infiltrator_IL
       - Item: War_Axe_IL
       - Item: Immaterial_Sword_IL
@@ -2426,12 +2426,12 @@ Body:
       - Item: Spectral_Spear_IL
       - Item: Staff_Of_Bordeaux_IL
       - Item: Moonlight_Sword_IL
-      - Item: Illusion_Hunter_Bow
-      - Item: Illusion_Tablet
-      - Item: Illusion_Gate_Keeper_DD
-      - Item: Illusion_Counter_Dagger
-      - Item: Illusion_Survivor's_Staff
-      - Item: Illusion_Tae_Goo_Lyeon
+      - Item: Hunter_Bow_IL
+      - Item: Tablet_IL
+      - Item: Gate_KeeperDD_IL
+      - Item: Counter_Dagger_IL
+      - Item: Survival_Staff_IL
+      - Item: Taegoolyeon_IL
       - Item: Death_Guidance_IL
       - Item: KatarOfCold_Icicle_IL
       - Item: Brionac_IL
@@ -2447,9 +2447,9 @@ Body:
   - Item: ILL_Piece_B
     RandomOptionGroup: ILL_PIECE_B
     TargetItems:
-      - Item: Illusion_Bazerald
-      - Item: Illusion_Butcher
-      - Item: Illusion_Gold_Lux
+      - Item: Bazerald_IL
+      - Item: Butcher_IL
+      - Item: Gold_Lux_IL
       - Item: Infiltrator_IL
       - Item: War_Axe_IL
       - Item: Immaterial_Sword_IL
@@ -2465,12 +2465,12 @@ Body:
       - Item: Spectral_Spear_IL
       - Item: Staff_Of_Bordeaux_IL
       - Item: Moonlight_Sword_IL
-      - Item: Illusion_Hunter_Bow
-      - Item: Illusion_Tablet
-      - Item: Illusion_Gate_Keeper_DD
-      - Item: Illusion_Counter_Dagger
-      - Item: Illusion_Survivor's_Staff
-      - Item: Illusion_Tae_Goo_Lyeon
+      - Item: Hunter_Bow_IL
+      - Item: Tablet_IL
+      - Item: Gate_KeeperDD_IL
+      - Item: Counter_Dagger_IL
+      - Item: Survival_Staff_IL
+      - Item: Taegoolyeon_IL
       - Item: Death_Guidance_IL
       - Item: KatarOfCold_Icicle_IL
       - Item: Brionac_IL
@@ -3986,25 +3986,25 @@ Body:
     MaximumRefine: 10
     CardsAllowed: true
     TargetItems:
-      - Item: Racing_Cap_MC
-      - Item: Racing_Cap_GN
-      - Item: Racing_Cap_GC
-      - Item: Racing_Cap_SC
-      - Item: Racing_Cap_WL
-      - Item: Racing_Cap_SO
-      - Item: Racing_Cap_RK
-      - Item: Racing_Cap_RG
-      - Item: Racing_Cap_AB
-      - Item: Racing_Cap_SR
-      - Item: Racing_Cap_RA
-      - Item: Racing_Cap_MI
-      - Item: Racing_Cap_WA
-      - Item: Racing_Cap_GS
-      - Item: Racing_Cap_NJ
-      - Item: Racing_Cap_SN
-      - Item: Racing_Cap_SU
-      - Item: Racing_Cap_SG
-      - Item: Racing_Cap_SL
+      - Item: Racing_C_Mecha
+      - Item: Racing_C_Gene
+      - Item: Racing_C_Cross
+      - Item: Racing_C_Chaser
+      - Item: Racing_C_Warlock
+      - Item: Racing_C_Sorcer
+      - Item: Racing_C_Rune
+      - Item: Racing_C_Royal
+      - Item: Racing_C_Bishop
+      - Item: Racing_C_Sura
+      - Item: Racing_C_Ranger
+      - Item: Racing_C_Mins
+      - Item: Racing_C_Wander
+      - Item: Racing_C_Gunner
+      - Item: Racing_C_Ninja
+      - Item: Racing_C_Super
+      - Item: Racing_C_Doram
+      - Item: Racing_C_Star
+      - Item: Racing_C_Soul
   - Item: Booster_W_Up_1
     ResultRefine: 9
     MaximumRefine: 8
@@ -4340,7 +4340,7 @@ Body:
       - Item: Huuma_Flutter_Snow_IL
       - Item: Combo_Battle_Glove_IL
       - Item: Cap_IL
-      - Item: Illusion_Survivor_Manteau
+      - Item: Clack_Of_Servival_IL
       - Item: Herald_Of_GOD_IL
   - Item: Turtle_Is_Box_IL
     ResultRefineMinimum: 7
@@ -4375,11 +4375,11 @@ Body:
     MaximumRefine: 9
     CardsAllowed: true
     TargetItems:
-      - Item: Illusion_Survivor's_Staff
-      - Item: Illusion_Gate_Keeper_DD
-      - Item: Illusion_Counter_Dagger
-      - Item: Illusion_Hot_blooded_Headband
-      - Item: Illusion_Boots
+      - Item: Survival_Staff_IL
+      - Item: Gate_KeeperDD_IL
+      - Item: Counter_Dagger_IL
+      - Item: Headband_Of_Power_IL
+      - Item: Boots_IL
   - Item: S_Teddy_Bear_Box_IL
     ResultRefineMinimum: 9
     ResultRefineMaximum: 12
@@ -4387,11 +4387,11 @@ Body:
     MaximumRefine: 11
     CardsAllowed: true
     TargetItems:
-      - Item: Illusion_Survivor's_Staff
-      - Item: Illusion_Gate_Keeper_DD
-      - Item: Illusion_Counter_Dagger
-      - Item: Illusion_Hot_blooded_Headband
-      - Item: Illusion_Boots
+      - Item: Survival_Staff_IL
+      - Item: Gate_KeeperDD_IL
+      - Item: Counter_Dagger_IL
+      - Item: Headband_Of_Power_IL
+      - Item: Boots_IL
   - Item: Luanda_Box_IL
     ResultRefineMinimum: 7
     ResultRefineMaximum: 10
@@ -4399,12 +4399,12 @@ Body:
     MaximumRefine: 9
     CardsAllowed: true
     TargetItems:
-      - Item: Illusion_Hunter_Bow
-      - Item: Illusion_Tablet
-      - Item: Illusion_Goibne_Armor
-      - Item: Illusion_Goibne_Helm
-      - Item: Illusion_Goibne_Spaulders
-      - Item: Illusion_Goibne's_Greaves
+      - Item: Hunter_Bow_IL
+      - Item: Tablet_IL
+      - Item: Goibne_Armor_IL
+      - Item: Goibne_Helmet_IL
+      - Item: Goibne_Shoulder_IL
+      - Item: Goibne_Boots_IL
   - Item: S_Luanda_Box_IL
     ResultRefineMinimum: 9
     ResultRefineMaximum: 12
@@ -4412,12 +4412,12 @@ Body:
     MaximumRefine: 11
     CardsAllowed: true
     TargetItems:
-      - Item: Illusion_Hunter_Bow
-      - Item: Illusion_Tablet
-      - Item: Illusion_Goibne_Armor
-      - Item: Illusion_Goibne_Helm
-      - Item: Illusion_Goibne_Spaulders
-      - Item: Illusion_Goibne's_Greaves
+      - Item: Hunter_Bow_IL
+      - Item: Tablet_IL
+      - Item: Goibne_Armor_IL
+      - Item: Goibne_Helmet_IL
+      - Item: Goibne_Shoulder_IL
+      - Item: Goibne_Boots_IL
   - Item: Labyrinth_Box_IL
     ResultRefineMinimum: 7
     ResultRefineMaximum: 10
@@ -4425,25 +4425,25 @@ Body:
     MaximumRefine: 9
     CardsAllowed: true
     TargetItems:
-      - Item: Illusion_Tae_Goo_Lyeon
-      - Item: Illusion_Butcher
-      - Item: Illusion_Gold_Lux
-      - Item: Illusion_Bazerald
-      - Item: Illusion_Morpheus's_Hood
-      - Item: Illusion_Morpheus's_Shawl
-  - Item: S_Labyrinth_Box_IL
+      - Item: Taegoolyeon_IL
+      - Item: Butcher_IL
+      - Item: Gold_Lux_IL
+      - Item: Bazerald_IL
+      - Item: Morpheus_Hood_IL
+      - Item: Morpheus_Shawl_IL
+  - Item: S_Teddy_Labyrinth_IL
     ResultRefineMinimum: 9
     ResultRefineMaximum: 12
     MinimumRefine: 4
     MaximumRefine: 11
     CardsAllowed: true
     TargetItems:
-      - Item: Illusion_Tae_Goo_Lyeon
-      - Item: Illusion_Butcher
-      - Item: Illusion_Gold_Lux
-      - Item: Illusion_Bazerald
-      - Item: Illusion_Morpheus's_Hood
-      - Item: Illusion_Morpheus's_Shawl
+      - Item: Taegoolyeon_IL
+      - Item: Butcher_IL
+      - Item: Gold_Lux_IL
+      - Item: Bazerald_IL
+      - Item: Morpheus_Hood_IL
+      - Item: Morpheus_Shawl_IL
   - Item: Underwater_Box_IL
     ResultRefineMinimum: 7
     ResultRefineMaximum: 10
@@ -4460,8 +4460,8 @@ Body:
       - Item: Saint_Robe_IL
       - Item: Water_Sprits_Armor_IL
       - Item: Chain_Mail_IL
-      - Item: Morrigane's_Helm_IL
-      - Item: Morrigane's_Manteau_IL
+      - Item: Morrigane_Helm_IL
+      - Item: Morrigane_Manyeau_IL
   - Item: S_Underwater_Box_IL
     ResultRefineMinimum: 9
     ResultRefineMaximum: 12
@@ -4478,8 +4478,8 @@ Body:
       - Item: Saint_Robe_IL
       - Item: Water_Sprits_Armor_IL
       - Item: Chain_Mail_IL
-      - Item: Morrigane's_Helm_IL
-      - Item: Morrigane's_Manteau_IL
+      - Item: Morrigane_Helm_IL
+      - Item: Morrigane_Manyeau_IL
   - Item: Circlet_Refine_Cube
     ResultRefine: 11
     MaximumRefine: 10

+ 118 - 118
db/re/mob_db.yml

@@ -25680,7 +25680,7 @@ Body:
         Rate: 1500
       - Item: Dragon_Killer
         Rate: 1
-      - Item: Unstable_Energy_Particle
+      - Item: Particles_Of_Energy3
         Rate: 1000
       - Item: Carnium
         Rate: 1
@@ -25734,7 +25734,7 @@ Body:
         Rate: 25
       - Item: Agent_Katar
         Rate: 10
-      - Item: Unstable_Energy_Particle
+      - Item: Particles_Of_Energy3
         Rate: 1000
       - Item: Various_Jur
         Rate: 15
@@ -25784,7 +25784,7 @@ Body:
         Rate: 1
       - Item: Vecer_Axe
         Rate: 200
-      - Item: Unstable_Energy_Particle
+      - Item: Particles_Of_Energy3
         Rate: 1000
       - Item: Will_Of_Warrior
         Rate: 200
@@ -25884,7 +25884,7 @@ Body:
         Rate: 55
       - Item: Big_CrossBow
         Rate: 10
-      - Item: Unstable_Energy_Particle
+      - Item: Particles_Of_Energy3
         Rate: 1000
       - Item: Will_Of_Warrior
         Rate: 200
@@ -25934,7 +25934,7 @@ Body:
         Rate: 1
       - Item: La'cryma_Stick
         Rate: 200
-      - Item: Unstable_Energy_Particle
+      - Item: Particles_Of_Energy3
         Rate: 1000
       - Item: Will_Of_Warrior
         Rate: 200
@@ -26576,9 +26576,9 @@ Body:
         Rate: 1
       - Item: Saber_
         Rate: 10
-      - Item: Silent_Energy_Particle
+      - Item: Particles_Of_Energy1
         Rate: 1000
-      - Item: Weak_Energy_Particle
+      - Item: Particles_Of_Energy2
         Rate: 250
       - Item: Plate_Armor_
         Rate: 1
@@ -26622,9 +26622,9 @@ Body:
         Rate: 1000
       - Item: Forturn_Sword
         Rate: 1
-      - Item: Silent_Energy_Particle
+      - Item: Particles_Of_Energy1
         Rate: 1000
-      - Item: Weak_Energy_Particle
+      - Item: Particles_Of_Energy2
         Rate: 250
       - Item: Goast_Chill
         Rate: 1
@@ -26674,9 +26674,9 @@ Body:
         Rate: 1
       - Item: Buster_
         Rate: 25
-      - Item: Silent_Energy_Particle
+      - Item: Particles_Of_Energy1
         Rate: 1000
-      - Item: Weak_Energy_Particle
+      - Item: Particles_Of_Energy2
         Rate: 250
       - Item: Goast_Chill
         Rate: 1
@@ -26724,9 +26724,9 @@ Body:
         Rate: 3
       - Item: Morning_Star_
         Rate: 25
-      - Item: Silent_Energy_Particle
+      - Item: Particles_Of_Energy1
         Rate: 1000
-      - Item: Weak_Energy_Particle
+      - Item: Particles_Of_Energy2
         Rate: 250
       - Item: Goast_Chill
         Rate: 1
@@ -26774,9 +26774,9 @@ Body:
         Rate: 1
       - Item: Steel_Arrow_Container
         Rate: 50
-      - Item: Silent_Energy_Particle
+      - Item: Particles_Of_Energy1
         Rate: 1000
-      - Item: Weak_Energy_Particle
+      - Item: Particles_Of_Energy2
         Rate: 250
       - Item: Goast_Chill
         Rate: 1
@@ -26824,9 +26824,9 @@ Body:
         Rate: 1
       - Item: Goast_Chill
         Rate: 1
-      - Item: Silent_Energy_Particle
+      - Item: Particles_Of_Energy1
         Rate: 1000
-      - Item: Weak_Energy_Particle
+      - Item: Particles_Of_Energy2
         Rate: 250
       - Item: Silver_Robe_
         Rate: 15
@@ -27799,9 +27799,9 @@ Body:
         Rate: 500
       - Item: Butcher_
         Rate: 3
-      - Item: Silent_Energy_Particle
+      - Item: Particles_Of_Energy1
         Rate: 1000
-      - Item: Weak_Energy_Particle
+      - Item: Particles_Of_Energy2
         Rate: 250
       - Item: Cookbook08
         Rate: 3
@@ -27841,13 +27841,13 @@ Body:
     DamageMotion: 1152
     Ai: 04
     Drops:
-      - Item: Silent_Energy_Particle
+      - Item: Particles_Of_Energy1
         Rate: 1000
       - Item: Old_Steel_Plate
         Rate: 2500
       - Item: Gas_Mask
         Rate: 5
-      - Item: Weak_Energy_Particle
+      - Item: Particles_Of_Energy2
         Rate: 250
       - Item: Detrimindexta
         Rate: 25
@@ -37016,9 +37016,9 @@ Body:
       IgnoreMisc: true
       IgnoreRanged: true
     Drops:
-      - Item: Pumpkin_Deco
+      - Item: Pumpkin_Decorations
         Rate: 3000
-      - Item: Dried_White_Stem
+      - Item: Dry_White_Stem
         Rate: 3000
       - Item: Pumpkin_Head_Crushed
         Rate: 2000
@@ -41518,7 +41518,7 @@ Body:
         Rate: 10000
       - Item: Poison_Bottle_Box2
         Rate: 10000
-      - Item: Briliant_Hat_Box
+      - Item: Brilliant_Hat_Box
         Rate: 1000
       - Item: Dark_Lord_Card
         Rate: 1
@@ -47829,7 +47829,7 @@ Body:
         Rate: 10000
       - Item: Poison_Bottle_Box2
         Rate: 10000
-      - Item: Briliant_Hat_Box
+      - Item: Brilliant_Hat_Box
         Rate: 1000
       - Item: Knight_Windstorm_Card
         Rate: 1
@@ -48131,7 +48131,7 @@ Body:
         Rate: 2000
       - Item: Goast_Chill
         Rate: 1
-      - Item: Sinister_Energy_Particle
+      - Item: Particles_Of_Energy4
         Rate: 1000
       - Item: Elunium
         Rate: 100
@@ -48180,7 +48180,7 @@ Body:
         Rate: 2000
       - Item: Goast_Chill
         Rate: 1
-      - Item: Sinister_Energy_Particle
+      - Item: Particles_Of_Energy4
         Rate: 1000
       - Item: Oridecon
         Rate: 100
@@ -48231,7 +48231,7 @@ Body:
         Rate: 1
       - Item: Telekinetic_Orb
         Rate: 20
-      - Item: Sinister_Energy_Particle
+      - Item: Particles_Of_Energy4
         Rate: 1000
       - Item: Creeper_Bow
         Rate: 10
@@ -48279,7 +48279,7 @@ Body:
         Rate: 1
       - Item: Lab_Staff_Record
         Rate: 2000
-      - Item: Sinister_Energy_Particle
+      - Item: Particles_Of_Energy4
         Rate: 1000
       - Item: Oridecon
         Rate: 100
@@ -48330,7 +48330,7 @@ Body:
         Rate: 1
       - Item: Lab_Staff_Record
         Rate: 2000
-      - Item: Sinister_Energy_Particle
+      - Item: Particles_Of_Energy4
         Rate: 1000
       - Item: Elunium
         Rate: 100
@@ -48379,7 +48379,7 @@ Body:
         Rate: 1
       - Item: Lab_Staff_Record
         Rate: 2000
-      - Item: Sinister_Energy_Particle
+      - Item: Particles_Of_Energy4
         Rate: 1000
       - Item: Oridecon
         Rate: 100
@@ -48430,7 +48430,7 @@ Body:
         Rate: 2000
       - Item: Dance_Shoes
         Rate: 20
-      - Item: Sinister_Energy_Particle
+      - Item: Particles_Of_Energy4
         Rate: 1000
       - Item: Assassin_Handcuffs
         Rate: 10
@@ -49330,7 +49330,7 @@ Body:
         Rate: 500
       - Item: Korea_Rice_Cake
         Rate: 5000
-      - Item: Honey_Songpyun_
+      - Item: Honey_Rice_Cake_
         Rate: 1000
         StealProtected: true
   - Id: 2249
@@ -63530,13 +63530,13 @@ Body:
     DamageMotion: 1152
     Ai: 04
     Drops:
-      - Item: Silent_Energy_Particle
+      - Item: Particles_Of_Energy1
         Rate: 1000
       - Item: Old_Steel_Plate
         Rate: 10000
       - Item: Gas_Mask
         Rate: 25
-      - Item: Weak_Energy_Particle
+      - Item: Particles_Of_Energy2
         Rate: 250
       - Item: Detrimindexta
         Rate: 125
@@ -75777,7 +75777,7 @@ Body:
         Rate: 100
       - Item: Bloody_Letter
         Rate: 50
-      - Item: Unsent_Letter
+      - Item: Unsent_Mail
         Rate: 50
       - Item: XM_Mystcase_Card
         Rate: 1
@@ -76015,7 +76015,7 @@ Body:
     Drops:
       - Item: Closedmind_Box
         Rate: 4000
-      - Item: Butterfly_Hair_Decoration
+      - Item: Butterfly_Hair_Clip
         Rate: 4000
       - Item: Bloody_Coin
         Rate: 4000
@@ -76057,7 +76057,7 @@ Body:
     Ai: 21
     Class: Boss
     Drops:
-      - Item: Dried_Flower
+      - Item: Thirsty_Flower
         Rate: 10000
   - Id: 2998
     AegisName: EP14_MORS_EVENT
@@ -77712,7 +77712,7 @@ Body:
         Rate: 100
       - Item: Bow_Of_Storm
         Rate: 200
-      - Item: Jitterbug's_Tooth
+      - Item: Tooth_Of_Jitterbug
         Rate: 7000
       - Item: Grand_Pere_Card
         Rate: 1
@@ -78554,7 +78554,7 @@ Body:
       CanMove: true
       Mvp: true
     Drops:
-      - Item: Demon_God's_Apostle_Ahat_Card
+      - Item: Ahat_Card
         Rate: 1
         StealProtected: true
   - Id: 3106
@@ -78589,7 +78589,7 @@ Body:
       CanMove: true
       Mvp: true
     Drops:
-      - Item: Demon_God's_Apostle_Shnaim_Card
+      - Item: Shnaim_Card
         Rate: 1
         StealProtected: true
 #  - Id: 3107
@@ -78659,9 +78659,9 @@ Body:
         Rate: 500
       - Item: Harden_Breastplate
         Rate: 500
-      - Item: Jitterbug's_Tooth
+      - Item: Tooth_Of_Jitterbug
         Rate: 5000
-      - Item: Jitterbug's_Tooth
+      - Item: Tooth_Of_Jitterbug
         Rate: 1000
       - Item: JitterbugCard
         Rate: 1
@@ -78703,9 +78703,9 @@ Body:
         Rate: 500
       - Item: Frozen_Breastplate
         Rate: 500
-      - Item: Jitterbug's_Tooth
+      - Item: Tooth_Of_Jitterbug
         Rate: 5000
-      - Item: Jitterbug's_Tooth
+      - Item: Tooth_Of_Jitterbug
         Rate: 1000
       - Item: JitterbugCard
         Rate: 1
@@ -79111,7 +79111,7 @@ Body:
     DamageMotion: 480
     Ai: 02
     Drops:
-      - Item: Crushed_Can_Iron_Plate
+      - Item: Distorted_Iron_Plate
         Rate: 1000
       - Item: Iron
         Rate: 150
@@ -79157,7 +79157,7 @@ Body:
     Modes:
       CanMove: true
     Drops:
-      - Item: Failed_Engine
+      - Item: Wrong_Engine
         Rate: 500
       - Item: Steel
         Rate: 350
@@ -79201,7 +79201,7 @@ Body:
     DamageMotion: 480
     Ai: 10
     Drops:
-      - Item: Failed_Engine
+      - Item: Wrong_Engine
         Rate: 400
       - Item: Steel
         Rate: 250
@@ -79247,7 +79247,7 @@ Body:
     Modes:
       CanMove: true
     Drops:
-      - Item: Crushed_Can_Iron_Plate
+      - Item: Distorted_Iron_Plate
         Rate: 500
       - Item: Iron
         Rate: 100
@@ -80226,7 +80226,7 @@ Body:
     Ai: 04
     Class: Boss
     Drops:
-      - Item: Fragments_Of_Gigan
+      - Item: Piece_Of_Gigantes
         Rate: 10000
       - Item: Gigantes_Card
         Rate: 1
@@ -80625,7 +80625,7 @@ Body:
         Rate: 500
       - Item: C_Circlet_Of_Bone
         Rate: 50
-      - Item: C_Silent_Executor
+      - Item: C_Silent_Executer
         Rate: 50
       - Item: Pieces_Of_Sentiment
         Rate: 600
@@ -80633,7 +80633,7 @@ Body:
         Rate: 400
       - Item: Pieces_Of_Grudge
         Rate: 200
-      - Item: Fallen_Energy_Particle
+      - Item: Particles_Of_Energy5
         Rate: 1000
       - Item: Real_Eremes_Card
         Rate: 1
@@ -80682,7 +80682,7 @@ Body:
         Rate: 400
       - Item: Pieces_Of_Grudge
         Rate: 200
-      - Item: Fallen_Energy_Particle
+      - Item: Particles_Of_Energy5
         Rate: 1000
       - Item: Real_Magaleta_Card
         Rate: 1
@@ -80731,7 +80731,7 @@ Body:
         Rate: 400
       - Item: Pieces_Of_Grudge
         Rate: 200
-      - Item: Fallen_Energy_Particle
+      - Item: Particles_Of_Energy5
         Rate: 1000
       - Item: Real_Katrinn_Card
         Rate: 1
@@ -80774,7 +80774,7 @@ Body:
         Rate: 500
       - Item: C_Camouflage_RabbitHood
         Rate: 50
-      - Item: C_Sniper_Google
+      - Item: C_Sniper_Goggle
         Rate: 50
       - Item: Pieces_Of_Grudge
         Rate: 400
@@ -80782,7 +80782,7 @@ Body:
         Rate: 600
       - Item: Pieces_Of_Grudge
         Rate: 200
-      - Item: Fallen_Energy_Particle
+      - Item: Particles_Of_Energy5
         Rate: 1000
       - Item: Real_Shecil_Card
         Rate: 1
@@ -80833,7 +80833,7 @@ Body:
         Rate: 400
       - Item: Pieces_Of_Grudge
         Rate: 200
-      - Item: Fallen_Energy_Particle
+      - Item: Particles_Of_Energy5
         Rate: 1000
       - Item: Real_Harword_Card
         Rate: 1
@@ -80882,7 +80882,7 @@ Body:
         Rate: 600
       - Item: Pieces_Of_Grudge
         Rate: 200
-      - Item: Fallen_Energy_Particle
+      - Item: Particles_Of_Energy5
         Rate: 1000
       - Item: Real_Seyren_Card
         Rate: 1
@@ -81266,7 +81266,7 @@ Body:
     Modes:
       Mvp: true
     Drops:
-      - Item: Cursed_Crystal
+      - Item: Crystal_Of_Grudge
         Rate: 3000
       - Item: Manteau_Of_Fallen
         Rate: 150
@@ -81371,7 +81371,7 @@ Body:
     Modes:
       Mvp: true
     Drops:
-      - Item: Cursed_Crystal
+      - Item: Crystal_Of_Grudge
         Rate: 3000
       - Item: Manteau_Of_Fallen
         Rate: 150
@@ -81426,7 +81426,7 @@ Body:
         Rate: 500
       - Item: C_Protect_Of_Crown
         Rate: 50
-      - Item: C_Schmitz_Helm
+      - Item: C_Schmidt_Helm
         Rate: 50
       - Item: Pieces_Of_Sentiment
         Rate: 600
@@ -81434,7 +81434,7 @@ Body:
         Rate: 400
       - Item: Pieces_Of_Grudge
         Rate: 200
-      - Item: Fallen_Energy_Particle
+      - Item: Particles_Of_Energy5
         Rate: 1000
       - Item: Real_Randel_Card
         Rate: 1
@@ -81485,7 +81485,7 @@ Body:
         Rate: 400
       - Item: Pieces_Of_Grudge
         Rate: 200
-      - Item: Fallen_Energy_Particle
+      - Item: Particles_Of_Energy5
         Rate: 1000
       - Item: Real_Flamel_Card
         Rate: 1
@@ -81536,7 +81536,7 @@ Body:
         Rate: 400
       - Item: Pieces_Of_Grudge
         Rate: 200
-      - Item: Fallen_Energy_Particle
+      - Item: Particles_Of_Energy5
         Rate: 1000
       - Item: Real_Ceila_Card
         Rate: 1
@@ -81587,7 +81587,7 @@ Body:
         Rate: 400
       - Item: Pieces_Of_Grudge
         Rate: 200
-      - Item: Fallen_Energy_Particle
+      - Item: Particles_Of_Energy5
         Rate: 1000
       - Item: Real_Chen_Card
         Rate: 1
@@ -81638,7 +81638,7 @@ Body:
         Rate: 400
       - Item: Pieces_Of_Grudge
         Rate: 200
-      - Item: Fallen_Energy_Particle
+      - Item: Particles_Of_Energy5
         Rate: 1000
       - Item: Real_Gertie_Card
         Rate: 1
@@ -81689,7 +81689,7 @@ Body:
         Rate: 400
       - Item: Pieces_Of_Grudge
         Rate: 200
-      - Item: Fallen_Energy_Particle
+      - Item: Particles_Of_Energy5
         Rate: 1000
       - Item: Real_Alphoccio_Card
         Rate: 1
@@ -81740,7 +81740,7 @@ Body:
         Rate: 400
       - Item: Pieces_Of_Grudge
         Rate: 200
-      - Item: Fallen_Energy_Particle
+      - Item: Particles_Of_Energy5
         Rate: 1000
       - Item: Real_Trentini_Card
         Rate: 1
@@ -81997,7 +81997,7 @@ Body:
     Modes:
       Mvp: true
     Drops:
-      - Item: Cursed_Crystal
+      - Item: Crystal_Of_Grudge
         Rate: 3000
       - Item: Manteau_Of_Fallen
         Rate: 150
@@ -82671,7 +82671,7 @@ Body:
       CanMove: true
       Mvp: true
     MvpDrops:
-      - Item: Questioned_Parts
+      - Item: Problematical_Part
         Rate: 5000
       - Item: Old_Violet_Box
         Rate: 5000
@@ -84847,7 +84847,7 @@ Body:
         Rate: 50
       - Item: Kiss_Of_Angel
         Rate: 500
-      - Item: Min_Toad_Card
+      - Item: IFN_Toad_Card
         Rate: 1
         StealProtected: true
   - Id: 3422
@@ -84897,7 +84897,7 @@ Body:
         Rate: 250
       - Item: Shattered_Rune
         Rate: 10000
-      - Item: Min_Vagabond_Wolf_Card
+      - Item: IFN_V_Wolf_Card
         Rate: 1
         StealProtected: true
   - Id: 3423
@@ -84947,7 +84947,7 @@ Body:
         Rate: 250
       - Item: Guitar_Of_Gentle_Breeze
         Rate: 5
-      - Item: Min_Vocal_Card
+      - Item: IFN_Vocal_Card
         Rate: 1
         StealProtected: true
   - Id: 3424
@@ -84997,7 +84997,7 @@ Body:
         Rate: 25
       - Item: Angel's_Protection
         Rate: 500
-      - Item: Min_Eclipse_Card
+      - Item: IFN_Eclipse_Card
         Rate: 1
         StealProtected: true
   - Id: 3425
@@ -85046,7 +85046,7 @@ Body:
         Rate: 1
       - Item: Oridecon
         Rate: 80
-      - Item: Min_Chimera_Card
+      - Item: IFN_Chimera_Card
         Rate: 1
         StealProtected: true
   - Id: 3426
@@ -85105,7 +85105,7 @@ Body:
         Rate: 1200
       - Item: Krieg
         Rate: 100
-      - Item: Min_Eddga_Card
+      - Item: IFN_Eddga_Card
         Rate: 1
         StealProtected: true
   - Id: 3427
@@ -85164,7 +85164,7 @@ Body:
         Rate: 75
       - Item: Cakram
         Rate: 50
-      - Item: Min_Osiris_Card
+      - Item: IFN_Osiris_Card
         Rate: 1
         StealProtected: true
   - Id: 3428
@@ -85223,7 +85223,7 @@ Body:
         Rate: 1450
       - Item: Weihna
         Rate: 50
-      - Item: Min_Phreeoni_Card
+      - Item: IFN_Phreeoni_Card
         Rate: 1
         StealProtected: true
   - Id: 3429
@@ -85284,7 +85284,7 @@ Body:
         Rate: 10000
       - Item: Giant_Axe
         Rate: 50
-      - Item: Min_Orc_Hero_Card
+      - Item: IFN_OrcHero_Card
         Rate: 1
         StealProtected: true
   - Id: 3430
@@ -85343,7 +85343,7 @@ Body:
         Rate: 100
       - Item: Gemmed_Sallet_
         Rate: 3
-      - Item: Min_Tao_Gunka_Card
+      - Item: IFN_Tao_Gunka_Card
         Rate: 1
         StealProtected: true
   - Id: 3431
@@ -85807,7 +85807,7 @@ Body:
     DamageMotion: 576
     Ai: 04
     Drops:
-      - Item: Will_Master
+      - Item: Will_Of_Owner
         Rate: 2000
       - Item: Skull
         Rate: 5000
@@ -85847,7 +85847,7 @@ Body:
     DamageMotion: 576
     Ai: 04
     Drops:
-      - Item: Will_Master
+      - Item: Will_Of_Owner
         Rate: 2000
       - Item: Skull
         Rate: 5000
@@ -85887,7 +85887,7 @@ Body:
     DamageMotion: 432
     Ai: 04
     Drops:
-      - Item: Will_Master
+      - Item: Will_Of_Owner
         Rate: 2000
       - Item: Skull
         Rate: 5000
@@ -85925,7 +85925,7 @@ Body:
     DamageMotion: 480
     Ai: 04
     Drops:
-      - Item: Will_Master
+      - Item: Will_Of_Owner
         Rate: 5000
       - Item: Black_Dyestuffs
         Rate: 1000
@@ -86006,7 +86006,7 @@ Body:
       - Item: White_Potion_Box
         Rate: 3000
     Drops:
-      - Item: Fragments_Valkyrie_Power
+      - Item: Valkyrie_Fragment
         Rate: 5000
       - Item: Black_Dyestuffs
         Rate: 5000
@@ -86014,7 +86014,7 @@ Body:
         Rate: 1000
       - Item: Berserk
         Rate: 500
-      - Item: C_Bijou_Hat
+      - Item: C_BIJOUHAT
         Rate: 10
       - Item: Bijou_Card
         Rate: 1
@@ -86051,7 +86051,7 @@ Body:
     Modes:
       Detector: true
     Drops:
-      - Item: Moving_Dark_Matter
+      - Item: Moving_Black_Things
         Rate: 4000
       - Item: Transparent_Cloth
         Rate: 1500
@@ -86098,7 +86098,7 @@ Body:
     DamageMotion: 480
     Ai: 04
     Drops:
-      - Item: Old_Belt
+      - Item: Shabby_Old_Belt
         Rate: 4000
       - Item: Clattering_Skull
         Rate: 1500
@@ -86786,7 +86786,7 @@ Body:
     DamageMotion: 300
     Ai: 04
     Drops:
-      - Item: Moving_Dark_Matter
+      - Item: Moving_Black_Things
         Rate: 4000
       - Item: Rusty_Cleaver
         Rate: 1000
@@ -86831,7 +86831,7 @@ Body:
     DamageMotion: 480
     Ai: 04
     Drops:
-      - Item: Moving_Dark_Matter
+      - Item: Moving_Black_Things
         Rate: 4000
       - Item: Rusty_Cleaver
         Rate: 1000
@@ -86876,7 +86876,7 @@ Body:
     DamageMotion: 480
     Ai: 04
     Drops:
-      - Item: Moving_Dark_Matter
+      - Item: Moving_Black_Things
         Rate: 4000
       - Item: Rusty_Cleaver
         Rate: 1000
@@ -86925,7 +86925,7 @@ Body:
     Modes:
       Detector: true
     Drops:
-      - Item: Moving_Dark_Matter
+      - Item: Moving_Black_Things
         Rate: 4000
       - Item: Rice_Ball
         Rate: 4000
@@ -90077,15 +90077,15 @@ Body:
       - Item: Magic_Card_Album
         Rate: 50
     Drops:
-      - Item: Royal_Guardian_Ring
+      - Item: ProtectRingofKing
         Rate: 70
-      - Item: Diamond_Dust_Scroll_1_5
+      - Item: DiamondDust5_Scroll
         Rate: 10
-      - Item: Crimson_Rock_Scroll_1_5
+      - Item: CrimsonRock_5_Scroll
         Rate: 10
-      - Item: Sienna_Execrate_Scroll_1_5
+      - Item: Sienna_5_Scroll
         Rate: 10
-      - Item: Varetyr_Spear_Scroll_1_5
+      - Item: Varetyr_5_Scroll
         Rate: 10
       - Item: Golden_Potion_RG
         Rate: 500
@@ -90135,15 +90135,15 @@ Body:
       - Item: Magic_Card_Album
         Rate: 50
     Drops:
-      - Item: Royal_Guardian_Ring
+      - Item: ProtectRingofKing
         Rate: 1000
-      - Item: Diamond_Dust_Scroll_1_5
+      - Item: DiamondDust5_Scroll
         Rate: 500
-      - Item: Crimson_Rock_Scroll_1_5
+      - Item: CrimsonRock_5_Scroll
         Rate: 500
-      - Item: Sienna_Execrate_Scroll_1_5
+      - Item: Sienna_5_Scroll
         Rate: 500
-      - Item: Varetyr_Spear_Scroll_1_5
+      - Item: Varetyr_5_Scroll
         Rate: 500
       - Item: Golden_Potion_RG
         Rate: 10000
@@ -91706,7 +91706,7 @@ Body:
     Drops:
       - Item: Bradium
         Rate: 5000
-      - Item: Hazy_Dream_Fragment
+      - Item: HazyDream
         Rate: 3000
       - Item: Spectral_Spear
         Rate: 500
@@ -91759,7 +91759,7 @@ Body:
         Rate: 100
       - Item: IllusoryStone
         Rate: 200
-      - Item: Hazy_Dream_Fragment
+      - Item: HazyDream
         Rate: 500
       - Item: AngerNineTail_Card
         Rate: 1
@@ -91884,7 +91884,7 @@ Body:
     DamageMotion: 576
     Ai: 19
     Drops:
-      - Item: Bloody_Love_Letter
+      - Item: Bloody_LoveLetter
         Rate: 2000
       - Item: Skirt_Of_Virgin
         Rate: 300
@@ -91931,7 +91931,7 @@ Body:
     DamageMotion: 576
     Ai: 19
     Drops:
-      - Item: Broken_Arrow
+      - Item: BrokenArrow
         Rate: 2000
       - Item: Carnium
         Rate: 10
@@ -92025,7 +92025,7 @@ Body:
     DamageMotion: 288
     Ai: 19
     Drops:
-      - Item: Recruitment_Leaflet
+      - Item: SubjugationFlyer
         Rate: 2000
       - Item: Light_Granule
         Rate: 200
@@ -92242,7 +92242,7 @@ Body:
     Modes:
       Detector: true
     Drops:
-      - Item: Frozen_Stone_Fragment
+      - Item: Frozen_PieceOfRock
         Rate: 1000
       - Item: Bradium
         Rate: 200
@@ -92368,28 +92368,28 @@ Body:
     WalkSpeed: 1000
     AttackDelay: 1344
     Drops:
-      - Item: Frozen_Stone_Fragment
+      - Item: Frozen_PieceOfRock
         Rate: 200
         Index: 0
-      - Item: Frozen_Stone_Fragment
+      - Item: Frozen_PieceOfRock
         Rate: 200
         Index: 1
-      - Item: Frozen_Stone_Fragment
+      - Item: Frozen_PieceOfRock
         Rate: 200
         Index: 2
-      - Item: Frozen_Stone_Fragment
+      - Item: Frozen_PieceOfRock
         Rate: 200
         Index: 3
-      - Item: Frozen_Stone_Fragment
+      - Item: Frozen_PieceOfRock
         Rate: 200
         Index: 4
-      - Item: Frozen_Stone_Fragment
+      - Item: Frozen_PieceOfRock
         Rate: 200
         Index: 5
-      - Item: Frozen_Stone_Fragment
+      - Item: Frozen_PieceOfRock
         Rate: 200
         Index: 6
-      - Item: Frozen_Stone_Fragment
+      - Item: Frozen_PieceOfRock
         Rate: 200
         Index: 7
         StealProtected: true
@@ -92435,7 +92435,7 @@ Body:
       - Item: IllusionStone
         Rate: 5000
     Drops:
-      - Item: Ktullanux_Eye
+      - Item: KTULLANUXsEye
         Rate: 4000
       - Item: Clack_Of_Servival
         Rate: 1000
@@ -93905,7 +93905,7 @@ Body:
         Rate: 100
       - Item: EP17_1_EVT39
         Rate: 1000
-      - Item: Crushed_Can_Iron_Plate
+      - Item: Distorted_Iron_Plate
         Rate: 1500
       - Item: EL_A17T_Card
         Rate: 1

+ 6 - 6
db/re/pet_db.yml

@@ -112,7 +112,7 @@ Body:
             Amount: 1
       - Target: SWEETS_DROPS
         ItemRequirements:
-          - Item: Sweets_Festival_Coin
+          - Item: Sweets_Coin
             Amount: 500
           - Item: Candy
             Amount: 50
@@ -1361,7 +1361,7 @@ Body:
   - Mob: TEDDY_BEAR
     TameItem: Little_Dall_Needle
     EggItem: Teddy_Bear_Egg
-    FoodItem: Cotton_Tufts
+    FoodItem: Wad_Of_Cotton
     Fullness: 3
     IntimacyFed: 50
     CaptureRate: 2000
@@ -1498,7 +1498,7 @@ Body:
       }
   - Mob: MOONLIGHT
     EggItem: Moonlight_Egg
-    FoodItem: Luxurious_Pet_Food
+    FoodItem: High_Class_Pet_food
     Fullness: 1
     HungryDelay: 120
     IntimacyFed: 15
@@ -1922,7 +1922,7 @@ Body:
         bonus bAspdRate,1;
       }
   - Mob: SWEETS_DROPS
-    EggItem: Sweet_Drops_Egg
+    EggItem: Sweets_Drops_Egg
     FoodItem: Candy
     Fullness: 2
     HungryDelay: 120
@@ -2060,7 +2060,7 @@ Body:
       }
 #  - Mob: BACSOJIN2
 #    EggItem: Bacsojin2_Egg_
-#    FoodItem: Luxurious_Pet_Food
+#    FoodItem: High_Class_Pet_food
 #    Fullness: 7
 #    IntimacyFed: 10
 #    CaptureRate: 0
@@ -2083,7 +2083,7 @@ Body:
 #      }
 #  - Mob: ORK_HERO2
 #    EggItem: Orc_Hero_Egg_
-#    FoodItem: Luxurious_Pet_Food
+#    FoodItem: High_Class_Pet_food
 #    Fullness: 2
 #    HungryDelay: 120
 #    IntimacyFed: 15

+ 8 - 8
db/re/quest_db.yml

@@ -4566,10 +4566,10 @@ Body:
     Title: Qualifications of the Guests
     Drops:
       - Mob: MM_GB_MOROCC_1
-        Item: Heart_of_Soul
+        Item: Soul_Of_Ahat
         Rate: 10000
       - Mob: MM_GB_MOROCC_4
-        Item: Sheenas_Soul
+        Item: Soul_Of_Shnaim
         Rate: 10000
   - Id: 7597
     Title: Fall of the False God
@@ -7430,7 +7430,7 @@ Body:
     Title: Vigilante Corp
     Drops:
       - Mob: DR_RODA_FROG
-        Item: Luxurious_Cloth
+        Item: High_Quality_Cloth
         Rate: 5000
   - Id: 11445
     Title: Vigilante Corp
@@ -9504,7 +9504,7 @@ Body:
     Title: An errand out of nowhere
     Drops:
       - Mob: DR_BASILISK1
-        Item: Basilac_Clam
+        Item: Basil_Rac
         Rate: 5000
   - Id: 14541
     Title: No news is not a good news
@@ -9555,7 +9555,7 @@ Body:
     Title: Dirty Creatures
     Drops:
       - Mob: DR_BASILISK2
-        Item: Basilac_Clam
+        Item: Basil_Rac
         Rate: 5000
   - Id: 14559
     Title: Charm Effect Duration
@@ -9564,19 +9564,19 @@ Body:
     Title: New Ingredient
     Drops:
       - Mob: DR_BASILISK2
-        Item: Basilac_Clam
+        Item: Basil_Rac
         Rate: 5000
   - Id: 14561
     Title: Dirty and Filty
     Drops:
       - Mob: DR_BASILISK2
-        Item: Basilac_Clam
+        Item: Basil_Rac
         Rate: 5000
   - Id: 14562
     Title: The basic are the best
     Drops:
       - Mob: DR_BASILISK2
-        Item: Basilac_Clam
+        Item: Basil_Rac
         Rate: 5000
   - Id: 14563
     Title: Free time

+ 2 - 2
db/re/skill_db.yml

@@ -37972,7 +37972,7 @@ Body:
         - Level: 5
           Amount: 70
       ItemCost:
-        - Item: Device_Creation_Guide
+        - Item: Device_M_Book
           Amount: 0
   - Id: 5298
     Name: MT_A_MACHINE
@@ -38776,7 +38776,7 @@ Body:
     Requires:
       SpCost: 5
       ItemCost:
-        - Item: Hawk_Flute
+        - Item: Hawk_Pipe
           Amount: 0
   - Id: 5328
     Name: WH_CALAMITYGALE

+ 2 - 2
db/re/stylist.yml

@@ -304,10 +304,10 @@ Body:
       - Index: 1
         Value: 0
         CostsHuman:
-            RequiredItem: Clothing_Dye_Coupon_II
+            RequiredItem: Clothing_Dye_Coupon2
             RequiredItemBox: CCloth_Dye_Coupon2_Box
         CostsDoram:
-            RequiredItem: Clothing_Dye_Coupon_II
+            RequiredItem: Clothing_Dye_Coupon2
             RequiredItemBox: CCloth_Dye_Coupon2_Box
       - Index: 2
         Value: 2

+ 6 - 6
npc/re/merchants/barters/Extended_Ammunition.yml

@@ -142,7 +142,7 @@ Body:
             Item: Hunting_Arrow
             Amount: 500
       - Index: 15
-        Item: Poison_Arrow_Container
+        Item: Poi_Arrow_Container
         RequiredItems:
           - Index: 0
             Item: Poison_Arrow
@@ -199,7 +199,7 @@ Body:
         Item: Bullet_Case_Lighting
         RequiredItems:
           - Index: 0
-            Item: Lightning_Bullet
+            Item: Lighting_Bullet
             Amount: 500
       - Index: 4
         Item: Bullet_Case_Ice
@@ -262,19 +262,19 @@ Body:
             Item: Sanctified_Bullet
             Amount: 500
       - Index: 14
-        Item: aegis_100195
+        Item: Bullet_Case_Full
         RequiredItems:
           - Index: 0
             Item: Full_Metal_Jacket
             Amount: 500
       - Index: 15
-        Item: aegis_100197
+        Item: Bullet_Case_Tail
         RequiredItems:
           - Index: 0
             Item: Dragon_Tail_Missile
             Amount: 500
       - Index: 16
-        Item: aegis_100196
+        Item: Bullet_Case_Mine
         RequiredItems:
           - Index: 0
             Item: Shooting_Mine
@@ -466,7 +466,7 @@ Body:
             Item: Holy_Cannon_Ball
             Amount: 500
       - Index: 5
-        Item: aegis_100178
+        Item: Cannon_Box_6
         RequiredItems:
           - Index: 0
             Item: Liquid_Condensed_Bullet

Beberapa file tidak ditampilkan karena terlalu banyak file yang berubah dalam diff ini