feat(charms): added new ones and associated items

Author: CarlosFdez

mhdata/binary/load/equipment_bload.py

@@ -441,4 +441,5 @@ def __init__(self):
         armor_sets.sort(key=lambda a: (a.rank_order, a.order))
 
         self.charms = list(charm_map.values())
+        self.charms.sort(key=lambda c: c.parent.order if c.parent else c.order)
         self.armor = { aset.name['en']:aset for aset in armor_sets }

mhdata/merge/binary/armor.py

@@ -185,7 +185,7 @@ def get_charm_raw(c):
             'name_en': c.name['en'],
             'parent': c.parent and c.parent.name['en']
         }
-    artifacts.write_dicts_artifact('charms_raw.txt', [get_charm_raw(c) for c in armor_collection.charms])
+    artifacts.write_dicts_artifact('charms_raw.csv', [get_charm_raw(c) for c in armor_collection.charms])
 
     skill_text_handler = SkillTextHandler()
     charm_by_name = { c.name['en']:c for c in armor_collection.charms }
@@ -200,6 +200,7 @@ def get_charm_raw(c):
             new_charm_map.insert(new_charm_entry)
             continue
 
+        new_charm_entry['name'] = data.name
         new_charm_entry['previous_en'] = data.parent and data.parent.name['en']
         new_charm_entry['rarity'] = data.rarity
 

source_data/charms/charm_base.csv

@@ -5,9 +5,12 @@ id,name_en,previous_en,rarity,skill1_name,skill1_level,skill2_name,skill2_level
 4,Attack Charm I,,3,Attack Boost,1,,
 5,Attack Charm II,Attack Charm I,5,Attack Boost,2,,
 6,Attack Charm III,Attack Charm II,7,Attack Boost,3,,
+235,Attack Charm IV,Attack Charm III,11,Attack Boost,4,,
 7,Defense Charm I,,3,Defense Boost,1,,
 8,Defense Charm II,Defense Charm I,5,Defense Boost,2,,
 9,Defense Charm III,Defense Charm II,6,Defense Boost,3,,
+236,Defense Charm IV,Defense Charm III,9,Defense Boost,4,,
+237,Defense Charm V,Defense Charm IV,11,Defense Boost,5,,
 10,Paralysis Charm I,,3,Paralysis Resistance,1,,
 11,Paralysis Charm II,Paralysis Charm I,5,Paralysis Resistance,2,,
 12,Paralysis Charm III,Paralysis Charm II,7,Paralysis Resistance,3,,
@@ -20,6 +23,7 @@ id,name_en,previous_en,rarity,skill1_name,skill1_level,skill2_name,skill2_level
 19,Windproof Charm I,,3,Windproof,1,,
 20,Windproof Charm II,Windproof Charm I,5,Windproof,2,,
 21,Windproof Charm III,Windproof Charm II,6,Windproof,3,,
+238,Windproof Charm IV,Windproof Charm III,11,Windproof,4,,
 22,Health Charm I,,3,Health Boost,1,,
 23,Health Charm II,Health Charm I,5,Health Boost,2,,
 24,Health Charm III,Health Charm II,7,Health Boost,3,,
@@ -38,21 +42,30 @@ id,name_en,previous_en,rarity,skill1_name,skill1_level,skill2_name,skill2_level
 37,Blaze Charm I,,3,Fire Attack,1,,
 38,Blaze Charm II,Blaze Charm I,6,Fire Attack,2,,
 39,Blaze Charm III,Blaze Charm II,7,Fire Attack,3,,
+239,Blaze Charm IV,Blaze Charm III,10,Fire Attack,4,,
+240,Blaze Charm V,Blaze Charm IV,11,Fire Attack,5,,
 40,Flood Charm I,,3,Water Attack,1,,
 41,Flood Charm II,Flood Charm I,5,Water Attack,2,,
 42,Flood Charm III,Flood Charm II,7,Water Attack,3,,
+241,Flood Charm IV,Flood Charm III,10,Water Attack,4,,
+242,Flood Charm V,Flood Charm IV,11,Water Attack,5,,
 43,Shock Charm I,,3,Thunder Attack,1,,
 44,Shock Charm II,Shock Charm I,5,Thunder Attack,2,,
 45,Shock Charm III,Shock Charm II,7,Thunder Attack,3,,
+243,Shock Charm IV,Shock Charm III,10,Thunder Attack,4,,
+244,Shock Charm V,Shock Charm IV,11,Thunder Attack,5,,
 46,Venom Charm I,,3,Poison Attack,1,,
 47,Venom Charm II,Venom Charm I,6,Poison Attack,2,,
 48,Venom Charm III,Venom Charm II,7,Poison Attack,3,,
+245,Venom Charm IV,Venom Charm III,11,Poison Attack,4,,
 49,Immobilize Charm I,,3,Paralysis Attack,1,,
 50,Immobilize Charm II,Immobilize Charm I,5,Paralysis Attack,2,,
 51,Immobilize Charm III,Immobilize Charm II,7,Paralysis Attack,3,,
+246,Immobilize Charm IV,Immobilize Charm III,11,Paralysis Attack,4,,
 52,Tranq Charm I,,3,Sleep Attack,1,,
 53,Tranq Charm II,Tranq Charm I,5,Sleep Attack,2,,
 54,Tranq Charm III,Tranq Charm II,7,Sleep Attack,3,,
+247,Tranq Charm IV,Tranq Charm III,11,Sleep Attack,4,,
 55,KO Charm I,,3,Slugger,1,,
 56,KO Charm II,KO Charm I,5,Slugger,2,,
 57,KO Charm III,KO Charm II,7,Slugger,3,,
@@ -68,9 +81,13 @@ id,name_en,previous_en,rarity,skill1_name,skill1_level,skill2_name,skill2_level
 67,Ironside Charm I,,3,Guard,1,,
 68,Ironside Charm II,Ironside Charm I,5,Guard,2,,
 69,Ironside Charm III,Ironside Charm II,7,Guard,3,,
+248,Ironside Charm IV,Ironside Charm III,11,Guard,4,,
+249,Ironside Charm V,Ironside Charm IV,12,Guard,5,,
 70,Friendship Charm I,,3,Wide-Range,1,,
 71,Friendship Charm II,Friendship Charm I,5,Wide-Range,2,,
 72,Friendship Charm III,Friendship Charm II,7,Wide-Range,3,,
+250,Friendship Charm IV,Friendship Charm III,11,Wide-Range,4,,
+251,Friendship Charm V,Friendship Charm IV,12,Wide-Range,5,,
 73,Extension Charm I,,3,Item Prolonger,1,,
 74,Extension Charm II,Extension Charm I,6,Item Prolonger,2,,
 75,Extension Charm III,Extension Charm II,7,Item Prolonger,3,,
@@ -83,9 +100,12 @@ id,name_en,previous_en,rarity,skill1_name,skill1_level,skill2_name,skill2_level
 82,Rally Charm I,,3,Palico Rally,1,,
 83,Rally Charm II,Rally Charm I,5,Palico Rally,2,,
 84,Rally Charm III,Rally Charm II,7,Palico Rally,3,,
+252,Rally Charm IV,Rally Charm III,9,Palico Rally,4,,
+253,Rally Charm V,Rally Charm IV,10,Palico Rally,5,,
 85,Botany Charm I,,3,Botanist,1,,
 86,Botany Charm II,Botany Charm I,5,Botanist,2,,
 87,Botany Charm III,Botany Charm II,7,Botanist,3,,
+254,Botany Charm IV,Botany Charm III,9,Botanist,4,,
 88,Geology Charm I,,3,Geologist,1,,
 89,Geology Charm II,Geology Charm I,5,Geologist,2,,
 90,Geology Charm III,Geology Charm II,7,Geologist,3,,
@@ -113,6 +133,7 @@ id,name_en,previous_en,rarity,skill1_name,skill1_level,skill2_name,skill2_level
 112,Tracker Charm,,3,Scenthound,1,,
 113,Fortification Charm,,3,Fortify,1,,
 114,Performer's Charm,,3,Horn Maestro,1,,
+255,Performer's Charm II,Performer's Charm,9,Horn Maestro,2,,
 115,Capacity Charm,,3,Capacity Boost,1,,
 116,Bleed Charm I,,4,Bleeding Resistance,1,,
 117,Bleed Charm II,Bleed Charm I,6,Bleeding Resistance,2,,
@@ -129,12 +150,16 @@ id,name_en,previous_en,rarity,skill1_name,skill1_level,skill2_name,skill2_level
 128,Frost Charm I,,4,Ice Attack,1,,
 129,Frost Charm II,Frost Charm I,6,Ice Attack,2,,
 130,Frost Charm III,Frost Charm II,7,Ice Attack,3,,
+256,Frost Charm IV,Frost Charm III,11,Ice Attack,4,,
+257,Frost Charm V,Frost Charm IV,12,Ice Attack,5,,
 131,Master's Charm I,,4,Critical Eye,1,,
 132,Master's Charm II,Master's Charm I,6,Critical Eye,2,,
 133,Master's Charm III,Master's Charm II,7,Critical Eye,3,,
+258,Master's Charm IV,Master's Charm III,11,Critical Eye,4,,
 134,Evasion Charm I,,4,Evade Window,1,,
 135,Evasion Charm II,Evasion Charm I,6,Evade Window,2,,
 136,Evasion Charm III,Evasion Charm II,7,Evade Window,3,,
+259,Evasion Charm IV,Evasion Charm III,12,Evade Window,4,,
 137,Sheath Charm I,,4,Quick Sheath,1,,
 138,Sheath Charm II,Sheath Charm I,6,Quick Sheath,2,,
 139,Sheath Charm III,Sheath Charm II,8,Quick Sheath,3,,
@@ -150,32 +175,42 @@ id,name_en,previous_en,rarity,skill1_name,skill1_level,skill2_name,skill2_level
 149,Wyrmsbane Charm I,,5,Dragon Attack,1,,
 150,Wyrmsbane Charm II,Wyrmsbane Charm I,7,Dragon Attack,2,,
 151,Wyrmsbane Charm III,Wyrmsbane Charm II,8,Dragon Attack,3,,
+260,Wyrmsbane Charm IV,Wyrmsbane Charm III,11,Dragon Attack,4,,
+261,Wyrmsbane Charm V,Wyrmsbane Charm IV,12,Dragon Attack,5,,
 152,Demolition Charm I,,5,Blast Attack,1,,
 153,Demolition Charm II,Demolition Charm I,6,Blast Attack,2,,
 154,Demolition Charm III,Demolition Charm II,8,Blast Attack,3,,
+262,Demolition Charm IV,Demolition Charm III,11,Blast Attack,4,,
 155,Draw Charm I,,5,Critical Draw,1,,
 156,Draw Charm II,Draw Charm I,7,Critical Draw,2,,
 157,Special Shot Charm I,,5,Special Ammo Boost,1,,
 158,Special Shot Charm II,Special Shot Charm I,8,Special Ammo Boost,2,,
 159,Marathon Charm I,,5,Marathon Runner,1,,
 160,Marathon Charm II,Marathon Charm I,8,Marathon Runner,2,,
+263,Marathon Charm III,Marathon Charm II,12,Marathon Runner,3,,
 161,Fitness Charm I,,5,Constitution,1,,
 162,Fitness Charm II,Fitness Charm I,6,Constitution,2,,
 163,Fitness Charm III,Fitness Charm II,7,Constitution,3,,
+264,Fitness Charm IV,Fitness Charm III,11,Constitution,4,,
 164,Surge Charm I,,5,Stamina Surge,1,,
 165,Surge Charm II,Surge Charm I,7,Stamina Surge,2,,
+265,Surge Charm III,Surge Charm II,12,Stamina Surge,3,,
 166,Leaping Charm I,,5,Evade Extender,1,,
 167,Leaping Charm II,Leaping Charm I,7,Evade Extender,2,,
+266,Leaping Charm III,Leaping Charm II,12,Evade Extender,3,,
 168,Bombardier Charm I,,5,Bombardier,1,,
 169,Bombardier Charm II,Bombardier Charm I,6,Bombardier,2,,
 170,Bombardier Charm III,Bombardier Charm II,7,Bombardier,3,,
 171,Mushroom Charm I,,5,Mushroomancer,1,,
 172,Mushroom Charm II,Mushroom Charm I,8,Mushroomancer,2,,
+267,Mushroom Charm III,Mushroom Charm II,11,Mushroomancer,3,,
 173,Awakening Charm I,,5,Free Elem/Ammo Up,1,,
 174,Awakening Charm II,Awakening Charm I,7,Free Elem/Ammo Up,2,,
+268,Awakening Charm III,Awakening Charm II,12,Free Elem/Ammo Up,3,,
 175,Handicraft Charm I,,5,Handicraft,1,,
 176,Handicraft Charm II,Handicraft Charm I,7,Handicraft,2,,
 177,Handicraft Charm III,Handicraft Charm II,8,Handicraft,3,,
+269,Handicraft Charm IV,Handicraft Charm III,12,Handicraft,4,,
 178,Mud Puppy Charm,,5,Muck Resistance,1,Leap of Faith,1
 179,Trickshot Charm,,5,Dungmaster,1,Blindsider,1
 180,Hunter's Life Charm,,5,BBQ Master,1,Master Fisher,1
@@ -187,43 +222,61 @@ id,name_en,previous_en,rarity,skill1_name,skill1_level,skill2_name,skill2_level
 186,Earplugs Charm I,,6,Earplugs,1,,
 187,Earplugs Charm II,Earplugs Charm I,6,Earplugs,2,,
 188,Earplugs Charm III,Earplugs Charm II,8,Earplugs,3,,
+270,Earplugs Charm IV,Earplugs Charm III,12,Earplugs,4,,
 189,Tremor Charm I,,6,Tremor Resistance,1,,
 190,Tremor Charm II,Tremor Charm I,7,Tremor Resistance,2,,
+271,Tremor Charm III,Tremor Charm II,12,Tremor Resistance,3,,
 191,Exploiter Charm I,,6,Weakness Exploit,1,,
 192,Exploiter Charm II,Exploiter Charm I,8,Weakness Exploit,2,,
 193,Focus Charm I,,6,Focus,1,,
 194,Focus Charm II,Focus Charm I,7,Focus,2,,
+272,Focus Charm III,Focus Charm II,12,Focus,3,,
 195,Breaker Charm I,,6,Partbreaker,1,,
 196,Breaker Charm II,Breaker Charm I,8,Partbreaker,2,,
+273,Breaker Charm III,Breaker Charm II,11,Partbreaker,3,,
 197,Fury Charm I,,6,Resentment,1,,
 198,Fury Charm II,Fury Charm I,8,Resentment,2,,
+274,Fury Charm III,Fury Charm II,11,Resentment,3,,
+275,Fury Charm IV,Fury Charm III,12,Resentment,4,,
 199,Grit Charm I,,6,Heroics,1,,
 200,Grit Charm II,Grit Charm I,7,Heroics,2,,
+276,Grit Charm III,Grit Charm II,11,Heroics,3,,
+277,Grit Charm IV,Grit Charm III,12,Heroics,4,,
 201,Maintenance Charm I,,6,Tool Specialist,1,,
 202,Maintenance Charm II,Maintenance Charm I,7,Tool Specialist,2,,
 203,Maintenance Charm III,Maintenance Charm II,8,Tool Specialist,3,,
 204,Power Charm I,,7,Latent Power,1,,
 205,Power Charm II,Power Charm I,8,Latent Power,2,,
+278,Power Charm III,Power Charm II,11,Latent Power,3,,
+279,Power Charm IV,Power Charm III,12,Latent Power,4,,
 206,Challenger Charm I,,7,Agitator,1,,
 207,Challenger Charm II,Challenger Charm I,8,Agitator,2,,
+280,Challenger Charm III,Challenger Charm II,11,Agitator,3,,
+281,Challenger Charm IV,Challenger Charm III,12,Agitator,4,,
 208,Unscathed Charm I,,7,Peak Performance,1,,
 209,Unscathed Charm II,Unscathed Charm I,8,Peak Performance,2,,
 210,Mighty Charm I,,7,Maximum Might,1,,
 211,Mighty Charm II,Mighty Charm I,8,Maximum Might,2,,
 212,Impact Charm I,,7,Flinch Free,1,,
 213,Impact Charm II,Impact Charm I,8,Flinch Free,2,,
+282,Impact Charm III,Impact Charm II,11,Flinch Free,3,,
 214,Miasma Charm I,,7,Effluvia Resistance,1,,
 215,Miasma Charm II,Miasma Charm I,7,Effluvia Resistance,2,,
 216,Miasma Charm III,Miasma Charm II,8,Effluvia Resistance,3,,
 217,Normal Shots Charm,,7,Normal Shots,1,,
+283,Normal Shots Charm II,Normal Shots Charm,11,Normal Shots,2,,
 218,Clearmind Charm,,7,Heat Guard,1,Effluvial Expert,1
 219,Rider's Charm,,7,Master Mounter,1,Jump Master,1
 220,Surveyor's Charm,,7,Scoutfly Range Up,1,Scholar,1
 221,Critical Charm I,,8,Critical Boost,1,,
+284,Critical Charm II,Critical Charm I,12,Critical Boost,2,,
 222,Invigorate Charm I,,8,Power Prolonger,1,,
 223,Invigorate Charm II,Invigorate Charm I,8,Power Prolonger,2,,
+285,Invigorate Charm III,Invigorate Charm II,11,Power Prolonger,3,,
 224,Penetration Charm,,8,Piercing Shots,1,,
+286,Penetration Charm II,Penetration Charm,11,Piercing Shots,2,,
 225,Dispersal Charm,,8,Spread/Power Shots,1,,
+287,Dispersal Charm II,Dispersal Charm,11,Spread/Power Shots,2,,
 226,Poison Coating Charm,,8,Poison Functionality,1,,
 227,Para Coating Charm,,8,Para Functionality,1,,
 228,Sleep Coating Charm,,8,Sleep Functionality,1,,
@@ -232,4 +285,13 @@ id,name_en,previous_en,rarity,skill1_name,skill1_level,skill2_name,skill2_level
 231,Gale Charm,,8,Affinity Sliding,1,Airborne,1
 232,Wyrmslayer Charm,,8,Elderseal Boost,1,Dragon Attack,1
 233,Bulwark Charm,,8,Guard Up,1,Resuscitate,1
+288,Guardian Charm I,,9,Offensive Guard,1,,
+289,Guardian Charm II,Guardian Charm I,10,Offensive Guard,2,,
+290,Guardian Charm III,Guardian Charm II,12,Offensive Guard,3,,
+291,Phoenix Charm I,,11,Coalescence,1,,
+292,Phoenix Charm II,Phoenix Charm I,12,Coalescence,2,,
+293,Adamantine Charm,,11,Non-elemental Boost,1,Bludgeoner,1
+294,Razor Sharp Charm,,11,Razor Sharp/Spare Shot,1,,
+295,Sealer's Charm,,11,Elderseal Boost,1,Adrenaline,1
+296,Gutsy Charm,,11,Guts,1,,
 234,Fair Wind Charm,,3,Attack Boost,1,Divine Blessing,1