SaveTool: make the weapon part selector focus on the current item.

Also update formatting for better readability.

src/Maps/Accessories.h

@@ -40,42 +40,52 @@ struct AccessoryData{
 
 static const std::map<Int, AccessoryData> accessories {
     // region Primitives
-    {1,  {"Cube"_s, AccessorySize::S}},
+    {1,  {"Cube"_s,           AccessorySize::S}},
-    {2,  {"Pentagon"_s, AccessorySize::S}},
+    {2,  {"Pentagon"_s,       AccessorySize::S}},
-    {3,  {"Hexagon"_s, AccessorySize::S}},
+    {3,  {"Hexagon"_s,        AccessorySize::S}},
-    {4,  {"Cylinder"_s, AccessorySize::S}},
+    {4,  {"Cylinder"_s,       AccessorySize::S}},
-    {5,  {"Sphere"_s, AccessorySize::S}},
+    {5,  {"Sphere"_s,         AccessorySize::S}},
-    {6,  {"TriPyramid"_s, AccessorySize::S}},
+    {6,  {"TriPyramid"_s,     AccessorySize::S}},
-    {7,  {"SquPyramid"_s, AccessorySize::S}},
+    {7,  {"SquPyramid"_s,     AccessorySize::S}},
-    {8,  {"PenPyramid"_s, AccessorySize::S}},
+    {8,  {"PenPyramid"_s,     AccessorySize::S}},
-    {9,  {"HexPyramid"_s, AccessorySize::S}},
+    {9,  {"HexPyramid"_s,     AccessorySize::S}},
-    {10, {"Cone"_s, AccessorySize::S}},
+    {10, {"Cone"_s,           AccessorySize::S}},
-    {11, {"SquStick"_s, AccessorySize::S}},
+    {11, {"SquStick"_s,       AccessorySize::S}},
-    {12, {"PenStick"_s, AccessorySize::S}},
+    {12, {"PenStick"_s,       AccessorySize::S}},
-    {13, {"HexStick"_s, AccessorySize::S}},
+    {13, {"HexStick"_s,       AccessorySize::S}},
-    {14, {"CycStick"_s, AccessorySize::S}},
+    {14, {"CycStick"_s,       AccessorySize::S}},
-    {15, {"Capsule"_s, AccessorySize::S}},
+    {15, {"Capsule"_s,        AccessorySize::S}},
-    {16, {"Decal Pad 01"_s, AccessorySize::S}},
+    {16, {"Decal Pad 01"_s,   AccessorySize::S}},
-    {17, {"Decal Pad 02"_s, AccessorySize::S}},
+    {17, {"Decal Pad 02"_s,   AccessorySize::S}},
-    {18, {"Decal Pad 03"_s, AccessorySize::S}},
+    {18, {"Decal Pad 03"_s,   AccessorySize::S}},
-    {19, {"Decal Pad 04"_s, AccessorySize::S}},
+    {19, {"Decal Pad 04"_s,   AccessorySize::S}},
-    {20, {"Decal Pad 05"_s, AccessorySize::S}},
+    {20, {"Decal Pad 05"_s,   AccessorySize::S}},
-    {21, {"Triangle"_s, AccessorySize::S}},
+    {21, {"Triangle"_s,       AccessorySize::S}},
-    {22, {"ThinStar"_s, AccessorySize::S}},
+    {22, {"ThinStar"_s,       AccessorySize::S}},
-    {23, {"Star"_s, AccessorySize::S}},
+    {23, {"Star"_s,           AccessorySize::S}},
-    {24, {"SixSideStar"_s, AccessorySize::S}},
+    {24, {"SixSideStar"_s,    AccessorySize::S}},
-    {25, {"Asterisk"_s, AccessorySize::S}},
+    {25, {"Asterisk"_s,       AccessorySize::S}},
+    {26, {"Ring"_s,           AccessorySize::S}},
+    {27, {"SawedRing"_s,      AccessorySize::S}},
+    {28, {"HalfRing"_s,       AccessorySize::S}},
+    {29, {"Cresent"_s,        AccessorySize::S}},
+    {30, {"Donut"_s,          AccessorySize::S}},
+    {31, {"FiveCogWheel"_s,   AccessorySize::S}},
+    {32, {"SixCogWheel"_s,    AccessorySize::S}},
+    {33, {"SevenCogWheel"_s,  AccessorySize::S}},
+    {34, {"EightCogWheel"_s,  AccessorySize::S}},
+    {35, {"TwelveCogWheel"_s, AccessorySize::S}},
 
-    {51, {"SquBevel"_s, AccessorySize::S}},
+    {51, {"SquBevel"_s,  AccessorySize::S}},
-    {52, {"TriBevel"_s, AccessorySize::S}},
+    {52, {"TriBevel"_s,  AccessorySize::S}},
-    {53, {"PenBevel"_s, AccessorySize::S}},
+    {53, {"PenBevel"_s,  AccessorySize::S}},
-    {54, {"HexBevel"_s, AccessorySize::S}},
+    {54, {"HexBevel"_s,  AccessorySize::S}},
-    {55, {"CycBevel"_s, AccessorySize::S}},
+    {55, {"CycBevel"_s,  AccessorySize::S}},
-    {56, {"RecBevel"_s, AccessorySize::S}},
+    {56, {"RecBevel"_s,  AccessorySize::S}},
-    {57, {"DaiBevel"_s, AccessorySize::S}},
+    {57, {"DaiBevel"_s,  AccessorySize::S}},
-    {58, {"MonBevel"_s, AccessorySize::S}},
+    {58, {"MonBevel"_s,  AccessorySize::S}},
-    {59, {"CofBevel"_s, AccessorySize::S}},
+    {59, {"CofBevel"_s,  AccessorySize::S}},
-    {60, {"JevBevel"_s, AccessorySize::S}},
+    {60, {"JevBevel"_s,  AccessorySize::S}},
     {61, {"SquEmboss"_s, AccessorySize::S}},
     {62, {"TriEmboss"_s, AccessorySize::S}},
     {63, {"PenEmboss"_s, AccessorySize::S}},
@@ -87,32 +97,32 @@ static const std::map<Int, AccessoryData> accessories {
     {69, {"CofEmboss"_s, AccessorySize::S}},
     {70, {"JevEmboss"_s, AccessorySize::S}},
 
-    {101, {"Flat Hex Pin"_s, AccessorySize::S}},
+    {101, {"Flat Hex Pin"_s,      AccessorySize::S}},
-    {102, {"Cross Circle Pin"_s, AccessorySize::S}},
+    {102, {"Cross Circle Pin"_s,  AccessorySize::S}},
-    {103, {"Flat Circle Pin"_s, AccessorySize::S}},
+    {103, {"Flat Circle Pin"_s,   AccessorySize::S}},
-    {104, {"Hex Circle Pin"_s, AccessorySize::S}},
+    {104, {"Hex Circle Pin"_s,    AccessorySize::S}},
     {105, {"Circle Button Pin"_s, AccessorySize::S}},
-    {106, {"Hexagon Pin"_s, AccessorySize::S}},
+    {106, {"Hexagon Pin"_s,       AccessorySize::S}},
-    {107, {"Cross Square Pin"_s, AccessorySize::S}},
+    {107, {"Cross Square Pin"_s,  AccessorySize::S}},
-    {108, {"Flat Square Pin"_s, AccessorySize::S}},
+    {108, {"Flat Square Pin"_s,   AccessorySize::S}},
-    {109, {"Quad Corner Pin"_s, AccessorySize::S}},
+    {109, {"Quad Corner Pin"_s,   AccessorySize::S}},
-    {110, {"Bi Corner Pin"_s, AccessorySize::S}},
+    {110, {"Bi Corner Pin"_s,     AccessorySize::S}},
-    {111, {"Circle Pin"_s, AccessorySize::S}},
+    {111, {"Circle Pin"_s,        AccessorySize::S}},
-    {112, {"Flat End Pin"_s, AccessorySize::S}},
+    {112, {"Flat End Pin"_s,      AccessorySize::S}},
-    {113, {"Flat Cut Pin"_s, AccessorySize::S}},
+    {113, {"Flat Cut Pin"_s,      AccessorySize::S}},
-    {114, {"Radial Pin"_s, AccessorySize::S}},
+    {114, {"Radial Pin"_s,        AccessorySize::S}},
-    {115, {"Diamiter Pin"_s, AccessorySize::S}},
+    {115, {"Diamiter Pin"_s,      AccessorySize::S}},
 
-    {151, {"TriPoint"_s, AccessorySize::S}},
+    {151, {"TriPoint"_s,          AccessorySize::S}},
-    {152, {"SquPoint"_s, AccessorySize::S}},
+    {152, {"SquPoint"_s,          AccessorySize::S}},
-    {153, {"PenPoint"_s, AccessorySize::S}},
+    {153, {"PenPoint"_s,          AccessorySize::S}},
-    {154, {"HexPoint"_s, AccessorySize::S}},
+    {154, {"HexPoint"_s,          AccessorySize::S}},
-    {155, {"CycPoint"_s, AccessorySize::S}},
+    {155, {"CycPoint"_s,          AccessorySize::S}},
     {156, {"Bevel SquCutPoint"_s, AccessorySize::S}},
     {157, {"Bevel HexCutPoint"_s, AccessorySize::S}},
-    {158, {"Bevel HexPoint"_s, AccessorySize::S}},
+    {158, {"Bevel HexPoint"_s,    AccessorySize::S}},
     {159, {"Bevel CycCutPoint"_s, AccessorySize::S}},
-    {160, {"Bevel CycPoint"_s, AccessorySize::S}},
+    {160, {"Bevel CycPoint"_s,    AccessorySize::S}},
 
     {201, {"Shaped Edge 01"_s, AccessorySize::M}},
     {202, {"Shaped Edge 02"_s, AccessorySize::M}},
@@ -135,11 +145,11 @@ static const std::map<Int, AccessoryData> accessories {
     {219, {"Shaped Edge 19"_s, AccessorySize::M}},
     {220, {"Shaped Edge 20"_s, AccessorySize::M}},
 
-    {251, {"Fish Tail 01"_s, AccessorySize::M}},
+    {251, {"Fish Tail 01"_s,       AccessorySize::M}},
-    {252, {"Fish Tail 02"_s, AccessorySize::M}},
+    {252, {"Fish Tail 02"_s,       AccessorySize::M}},
-    {253, {"Fish Tail 03"_s, AccessorySize::M}},
+    {253, {"Fish Tail 03"_s,       AccessorySize::M}},
-    {254, {"Fish Tail 04"_s, AccessorySize::M}},
+    {254, {"Fish Tail 04"_s,       AccessorySize::M}},
-    {255, {"Fish Tail 05"_s, AccessorySize::M}},
+    {255, {"Fish Tail 05"_s,       AccessorySize::M}},
     {256, {"Based Separator 01"_s, AccessorySize::M}},
     {257, {"Based Separator 02"_s, AccessorySize::M}},
     {258, {"Based Separator 03"_s, AccessorySize::M}},
@@ -156,39 +166,39 @@ static const std::map<Int, AccessoryData> accessories {
     {303, {"Rectangular Box 03"_s, AccessorySize::M}},
     {304, {"Rectangular Box 04"_s, AccessorySize::M}},
     {305, {"Rectangular Box 05"_s, AccessorySize::M}},
-    {306, {"CofBox 01"_s, AccessorySize::M}},
+    {306, {"CofBox 01"_s,          AccessorySize::M}},
-    {307, {"CofBox 02"_s, AccessorySize::M}},
+    {307, {"CofBox 02"_s,          AccessorySize::M}},
-    {308, {"CofBox 03"_s, AccessorySize::M}},
+    {308, {"CofBox 03"_s,          AccessorySize::M}},
-    {309, {"CofBox 04"_s, AccessorySize::M}},
+    {309, {"CofBox 04"_s,          AccessorySize::M}},
-    {310, {"CofBox 05"_s, AccessorySize::M}},
+    {310, {"CofBox 05"_s,          AccessorySize::M}},
-    {311, {"Triangular Box 01"_s, AccessorySize::M}},
+    {311, {"Triangular Box 01"_s,  AccessorySize::M}},
-    {312, {"Triangular Box 02"_s, AccessorySize::M}},
+    {312, {"Triangular Box 02"_s,  AccessorySize::M}},
-    {313, {"Triangular Box 03"_s, AccessorySize::M}},
+    {313, {"Triangular Box 03"_s,  AccessorySize::M}},
-    {314, {"Triangular Box 04"_s, AccessorySize::M}},
+    {314, {"Triangular Box 04"_s,  AccessorySize::M}},
-    {315, {"Triangular Box 05"_s, AccessorySize::M}},
+    {315, {"Triangular Box 05"_s,  AccessorySize::M}},
-    {316, {"Diagonal Box A01"_s, AccessorySize::M}},
+    {316, {"Diagonal Box A01"_s,   AccessorySize::M}},
-    {317, {"Diagonal Box A02"_s, AccessorySize::M}},
+    {317, {"Diagonal Box A02"_s,   AccessorySize::M}},
-    {318, {"Diagonal Box A03"_s, AccessorySize::M}},
+    {318, {"Diagonal Box A03"_s,   AccessorySize::M}},
-    {319, {"Diagonal Box A04"_s, AccessorySize::M}},
+    {319, {"Diagonal Box A04"_s,   AccessorySize::M}},
-    {320, {"Diagonal Box A05"_s, AccessorySize::M}},
+    {320, {"Diagonal Box A05"_s,   AccessorySize::M}},
-    {321, {"Diagonal Box B01"_s, AccessorySize::M}},
+    {321, {"Diagonal Box B01"_s,   AccessorySize::M}},
-    {322, {"Diagonal Box B02"_s, AccessorySize::M}},
+    {322, {"Diagonal Box B02"_s,   AccessorySize::M}},
-    {323, {"Diagonal Box B03"_s, AccessorySize::M}},
+    {323, {"Diagonal Box B03"_s,   AccessorySize::M}},
-    {324, {"Diagonal Box B04"_s, AccessorySize::M}},
+    {324, {"Diagonal Box B04"_s,   AccessorySize::M}},
-    {325, {"Diagonal Box B05"_s, AccessorySize::M}},
+    {325, {"Diagonal Box B05"_s,   AccessorySize::M}},
     // endregion
 
     // region Armours
-    {1001, {"Short Layer 01"_s, AccessorySize::M}},
+    {1001, {"Short Layer 01"_s,         AccessorySize::M}},
-    {1002, {"Short Layer 02"_s, AccessorySize::M}},
+    {1002, {"Short Layer 02"_s,         AccessorySize::M}},
-    {1003, {"Short Layer 03"_s, AccessorySize::M}},
+    {1003, {"Short Layer 03"_s,         AccessorySize::M}},
-    {1004, {"Short Layer 04"_s, AccessorySize::M}},
+    {1004, {"Short Layer 04"_s,         AccessorySize::M}},
-    {1005, {"Short Layer 05"_s, AccessorySize::M}},
+    {1005, {"Short Layer 05"_s,         AccessorySize::M}},
-    {1006, {"Long Layer 01"_s, AccessorySize::M}},
+    {1006, {"Long Layer 01"_s,          AccessorySize::M}},
-    {1007, {"Long Layer 02"_s, AccessorySize::M}},
+    {1007, {"Long Layer 02"_s,          AccessorySize::M}},
-    {1008, {"Long Layer 03"_s, AccessorySize::M}},
+    {1008, {"Long Layer 03"_s,          AccessorySize::M}},
-    {1009, {"Long Layer 04"_s, AccessorySize::M}},
+    {1009, {"Long Layer 04"_s,          AccessorySize::M}},
-    {1010, {"Long Layer 05"_s, AccessorySize::M}},
+    {1010, {"Long Layer 05"_s,          AccessorySize::M}},
     {1011, {"Diagonal Long Layer 01"_s, AccessorySize::M}},
     {1012, {"Diagonal Long Layer 02"_s, AccessorySize::M}},
     {1013, {"Diagonal Long Layer 03"_s, AccessorySize::M}},
@@ -216,16 +226,16 @@ static const std::map<Int, AccessoryData> accessories {
     {1103, {"Raised Center 03"_s, AccessorySize::M}},
     {1104, {"Raised Center 04"_s, AccessorySize::M}},
     {1105, {"Raised Center 05"_s, AccessorySize::M}},
-    {1106, {"Raised Block 01"_s, AccessorySize::M}},
+    {1106, {"Raised Block 01"_s,  AccessorySize::M}},
-    {1107, {"Raised Block 02"_s, AccessorySize::M}},
+    {1107, {"Raised Block 02"_s,  AccessorySize::M}},
-    {1108, {"Raised Block 03"_s, AccessorySize::M}},
+    {1108, {"Raised Block 03"_s,  AccessorySize::M}},
-    {1109, {"Raised Pointed"_s, AccessorySize::M}},
+    {1109, {"Raised Pointed"_s,   AccessorySize::M}},
-    {1110, {"Raised Cover"_s, AccessorySize::M}},
+    {1110, {"Raised Cover"_s,     AccessorySize::M}},
-    {1111, {"Raised Slant 01"_s, AccessorySize::M}},
+    {1111, {"Raised Slant 01"_s,  AccessorySize::M}},
-    {1112, {"Raised Slant 02"_s, AccessorySize::M}},
+    {1112, {"Raised Slant 02"_s,  AccessorySize::M}},
-    {1113, {"Raised Slant 03"_s, AccessorySize::M}},
+    {1113, {"Raised Slant 03"_s,  AccessorySize::M}},
-    {1114, {"Raised Slant 04"_s, AccessorySize::M}},
+    {1114, {"Raised Slant 04"_s,  AccessorySize::M}},
-    {1115, {"Raised Slant 05"_s, AccessorySize::M}},
+    {1115, {"Raised Slant 05"_s,  AccessorySize::M}},
 
     {1151, {"Wide Patch 01"_s, AccessorySize::L}},
     {1152, {"Wide Patch 02"_s, AccessorySize::L}},
@@ -311,16 +321,16 @@ static const std::map<Int, AccessoryData> accessories {
     // endregion
 
     // region Components
-    {2001, {"Disc Padding 01"_s, AccessorySize::M}},
+    {2001, {"Disc Padding 01"_s,  AccessorySize::M}},
-    {2002, {"Disc Padding 02"_s, AccessorySize::M}},
+    {2002, {"Disc Padding 02"_s,  AccessorySize::M}},
-    {2003, {"Disc Padding 03"_s, AccessorySize::M}},
+    {2003, {"Disc Padding 03"_s,  AccessorySize::M}},
-    {2004, {"Disc Padding 04"_s, AccessorySize::M}},
+    {2004, {"Disc Padding 04"_s,  AccessorySize::M}},
-    {2005, {"Disc Padding 05"_s, AccessorySize::M}},
+    {2005, {"Disc Padding 05"_s,  AccessorySize::M}},
-    {2006, {"Thin Padding 01"_s, AccessorySize::M}},
+    {2006, {"Thin Padding 01"_s,  AccessorySize::M}},
-    {2007, {"Thin Padding 02"_s, AccessorySize::M}},
+    {2007, {"Thin Padding 02"_s,  AccessorySize::M}},
-    {2008, {"Thin Padding 03"_s, AccessorySize::M}},
+    {2008, {"Thin Padding 03"_s,  AccessorySize::M}},
-    {2009, {"Thin Padding 04"_s, AccessorySize::M}},
+    {2009, {"Thin Padding 04"_s,  AccessorySize::M}},
-    {2010, {"Thin Padding 05"_s, AccessorySize::M}},
+    {2010, {"Thin Padding 05"_s,  AccessorySize::M}},
     {2011, {"Thick Padding 01"_s, AccessorySize::M}},
     {2012, {"Thick Padding 02"_s, AccessorySize::M}},
     {2013, {"Thick Padding 03"_s, AccessorySize::M}},
@@ -414,12 +424,22 @@ static const std::map<Int, AccessoryData> accessories {
     {2408, {"Blade 08"_s, AccessorySize::XL}},
     {2409, {"Blade 09"_s, AccessorySize::XL}},
     {2410, {"Blade 10"_s, AccessorySize::XL}},
+    {2411, {"Blade 11"_s, AccessorySize::XL}},
+    {2412, {"Blade 12"_s, AccessorySize::XL}},
+    {2413, {"Blade 13"_s, AccessorySize::XL}},
+    {2414, {"Blade 14"_s, AccessorySize::XL}},
+    {2415, {"Blade 15"_s, AccessorySize::XL}},
 
     {2426, {"Curved Blade 01"_s, AccessorySize::XL}},
     {2427, {"Curved Blade 02"_s, AccessorySize::XL}},
     {2428, {"Curved Blade 03"_s, AccessorySize::XL}},
     {2429, {"Curved Blade 04"_s, AccessorySize::XL}},
     {2430, {"Curved Blade 05"_s, AccessorySize::XL}},
+    {2431, {"Axe Head 01"_s,     AccessorySize::XL}},
+    {2432, {"Axe Head 02"_s,     AccessorySize::XL}},
+    {2433, {"Axe Head 03"_s,     AccessorySize::XL}},
+    {2434, {"Axe Head 04"_s,     AccessorySize::XL}},
+    {2435, {"Axe Head 05"_s,     AccessorySize::XL}},
 
     {2451, {"Horn 01"_s, AccessorySize::M}},
     {2452, {"Horn 02"_s, AccessorySize::M}},
@@ -437,11 +457,11 @@ static const std::map<Int, AccessoryData> accessories {
     {2464, {"Horn 14"_s, AccessorySize::M}},
     {2465, {"Horn 15"_s, AccessorySize::M}},
 
-    {2471, {"Mask"_s, AccessorySize::M}},
+    {2471, {"Mask"_s,     AccessorySize::M}},
-    {2472, {"Droplet"_s, AccessorySize::M}},
+    {2472, {"Droplet"_s,  AccessorySize::M}},
-    {2473, {"Thigh"_s, AccessorySize::M}},
+    {2473, {"Thigh"_s,    AccessorySize::M}},
-    {2474, {"LegS"_s, AccessorySize::M}},
+    {2474, {"LegS"_s,     AccessorySize::M}},
-    {2475, {"LegTH"_s, AccessorySize::M}},
+    {2475, {"LegTH"_s,    AccessorySize::M}},
     {2476, {"Plume 01"_s, AccessorySize::M}},
     {2477, {"Plume 02"_s, AccessorySize::M}},
     {2478, {"Plume 03"_s, AccessorySize::M}},
@@ -460,6 +480,12 @@ static const std::map<Int, AccessoryData> accessories {
     {2504, {"Finger 04"_s, AccessorySize::M}},
     {2505, {"Finger 05"_s, AccessorySize::M}},
 
+    {2510, {"Clamp 01"_s, AccessorySize::M}},
+    {2511, {"Clamp 02"_s, AccessorySize::M}},
+    {2512, {"Clamp 03"_s, AccessorySize::M}},
+    {2513, {"Clamp 04"_s, AccessorySize::M}},
+    {2514, {"Clamp 05"_s, AccessorySize::M}},
+
     {2521, {"Fabric 01"_s, AccessorySize::XL}},
     {2522, {"Fabric 02"_s, AccessorySize::XL}},
     {2523, {"Fabric 03"_s, AccessorySize::XL}},
@@ -482,34 +508,44 @@ static const std::map<Int, AccessoryData> accessories {
     {2608, {"S Bullet Barrel 03"_s, AccessorySize::XL}},
     {2609, {"S Bullet Barrel 04"_s, AccessorySize::XL}},
     {2610, {"S Bullet Barrel 05"_s, AccessorySize::XL}},
+    {2611, {"B Bullet Barrel 01"_s, AccessorySize::XL}},
+    {2612, {"B Bullet Barrel 02"_s, AccessorySize::XL}},
+    {2613, {"B Bullet Barrel 03"_s, AccessorySize::XL}},
+    {2614, {"B Bullet Barrel 04"_s, AccessorySize::XL}},
+    {2615, {"B Bullet Barrel 05"_s, AccessorySize::XL}},
+    {2616, {"B Bullet Barrel 06"_s, AccessorySize::XL}},
+    {2617, {"B Bullet Barrel 07"_s, AccessorySize::XL}},
+    {2618, {"B Bullet Barrel 08"_s, AccessorySize::XL}},
+    {2619, {"B Bullet Barrel 09"_s, AccessorySize::XL}},
+    {2620, {"B Bullet Barrel 10"_s, AccessorySize::XL}},
 
     {2651, {"Cylinder Scope 01"_s, AccessorySize::M}},
     {2652, {"Cylinder Scope 02"_s, AccessorySize::M}},
     {2653, {"Cylinder Scope 03"_s, AccessorySize::M}},
     {2654, {"Cylinder Scope 04"_s, AccessorySize::M}},
     {2655, {"Cylinder Scope 05"_s, AccessorySize::M}},
-    {2656, {"Elec Scope 01"_s, AccessorySize::M}},
+    {2656, {"Elec Scope 01"_s,     AccessorySize::M}},
-    {2657, {"Elec Scope 02"_s, AccessorySize::M}},
+    {2657, {"Elec Scope 02"_s,     AccessorySize::M}},
-    {2658, {"Elec Scope 03"_s, AccessorySize::M}},
+    {2658, {"Elec Scope 03"_s,     AccessorySize::M}},
-    {2659, {"Elec Scope 04"_s, AccessorySize::M}},
+    {2659, {"Elec Scope 04"_s,     AccessorySize::M}},
-    {2660, {"Elec Scope 05"_s, AccessorySize::M}},
+    {2660, {"Elec Scope 05"_s,     AccessorySize::M}},
-    {2661, {"Mark Scope 01"_s, AccessorySize::S}},
+    {2661, {"Mark Scope 01"_s,     AccessorySize::S}},
-    {2662, {"Mark Scope 02"_s, AccessorySize::S}},
+    {2662, {"Mark Scope 02"_s,     AccessorySize::S}},
-    {2663, {"Mark Scope 03"_s, AccessorySize::S}},
+    {2663, {"Mark Scope 03"_s,     AccessorySize::S}},
-    {2664, {"Mark Scope 04"_s, AccessorySize::S}},
+    {2664, {"Mark Scope 04"_s,     AccessorySize::S}},
-    {2665, {"Mark Scope 05"_s, AccessorySize::S}},
+    {2665, {"Mark Scope 05"_s,     AccessorySize::S}},
 
-    {2701, {"S Single Weaponry"_s, AccessorySize::M}},
+    {2701, {"S Single Weaponry"_s,      AccessorySize::M}},
-    {2702, {"S Packed Weaponry 01"_s, AccessorySize::M}},
+    {2702, {"S Packed Weaponry 01"_s,   AccessorySize::M}},
-    {2703, {"S Packed Weaponry 02"_s, AccessorySize::M}},
+    {2703, {"S Packed Weaponry 02"_s,   AccessorySize::M}},
-    {2704, {"S Packed Weaponry 03"_s, AccessorySize::M}},
+    {2704, {"S Packed Weaponry 03"_s,   AccessorySize::M}},
-    {2705, {"S Packed Weaponry 04"_s, AccessorySize::M}},
+    {2705, {"S Packed Weaponry 04"_s,   AccessorySize::M}},
-    {2706, {"L Single Weaponry"_s, AccessorySize::XL}},
+    {2706, {"L Single Weaponry"_s,      AccessorySize::XL}},
-    {2707, {"L Packed Weaponry 01"_s, AccessorySize::XL}},
+    {2707, {"L Packed Weaponry 01"_s,   AccessorySize::XL}},
-    {2708, {"L Packed Weaponry 02"_s, AccessorySize::XL}},
+    {2708, {"L Packed Weaponry 02"_s,   AccessorySize::XL}},
-    {2709, {"L Packed Weaponry 03"_s, AccessorySize::XL}},
+    {2709, {"L Packed Weaponry 03"_s,   AccessorySize::XL}},
-    {2710, {"L Packed Weaponry 04"_s, AccessorySize::XL}},
+    {2710, {"L Packed Weaponry 04"_s,   AccessorySize::XL}},
-    {2711, {"Atk Single Weaponry"_s, AccessorySize::XL}},
+    {2711, {"Atk Single Weaponry"_s,    AccessorySize::XL}},
     {2712, {"Atk Packed Weaponry 01"_s, AccessorySize::XL}},
     {2713, {"Atk Packed Weaponry 02"_s, AccessorySize::XL}},
     {2714, {"Atk Packed Weaponry 03"_s, AccessorySize::XL}},
@@ -531,6 +567,12 @@ static const std::map<Int, AccessoryData> accessories {
     {2903, {"Complex Construct 03"_s, AccessorySize::L}},
     {2904, {"Complex Construct 04"_s, AccessorySize::L}},
     {2905, {"Complex Construct 05"_s, AccessorySize::L}},
+
+    {2950, {"Q Mask 01"_s, AccessorySize::M}},
+    {2951, {"Q Mask 02"_s, AccessorySize::M}},
+    {2952, {"Q Mask 03"_s, AccessorySize::M}},
+    {2953, {"Q Mask 04"_s, AccessorySize::M}},
+    {2954, {"Q Mask 05"_s, AccessorySize::M}},
     // endregion
 
     // region Connectors
@@ -583,11 +625,11 @@ static const std::map<Int, AccessoryData> accessories {
     {3203, {"Short Connector 03"_s, AccessorySize::M}},
     {3204, {"Short Connector 04"_s, AccessorySize::M}},
     {3205, {"Short Connector 05"_s, AccessorySize::M}},
-    {3206, {"Antenna 01"_s, AccessorySize::S}},
+    {3206, {"Antenna 01"_s,         AccessorySize::S}},
-    {3207, {"Antenna 02"_s, AccessorySize::S}},
+    {3207, {"Antenna 02"_s,         AccessorySize::S}},
-    {3208, {"Antenna 03"_s, AccessorySize::S}},
+    {3208, {"Antenna 03"_s,         AccessorySize::S}},
-    {3209, {"Antenna 04"_s, AccessorySize::S}},
+    {3209, {"Antenna 04"_s,         AccessorySize::S}},
-    {3210, {"Antenna 05"_s, AccessorySize::S}},
+    {3210, {"Antenna 05"_s,         AccessorySize::S}},
 
     {3226, {"Long Connector 01"_s, AccessorySize::XL}},
     {3227, {"Long Connector 02"_s, AccessorySize::XL}},
@@ -622,17 +664,17 @@ static const std::map<Int, AccessoryData> accessories {
     {3353, {"Radar Plate 03"_s, AccessorySize::M}},
     {3354, {"Radar Plate 04"_s, AccessorySize::M}},
     {3355, {"Radar Plate 05"_s, AccessorySize::M}},
-    {3356, {"Radar Pod 01"_s, AccessorySize::M}},
+    {3356, {"Radar Pod 01"_s,   AccessorySize::M}},
-    {3357, {"Radar Pod 02"_s, AccessorySize::M}},
+    {3357, {"Radar Pod 02"_s,   AccessorySize::M}},
-    {3358, {"Radar Pod 03"_s, AccessorySize::M}},
+    {3358, {"Radar Pod 03"_s,   AccessorySize::M}},
-    {3359, {"Radar Pod 04"_s, AccessorySize::M}},
+    {3359, {"Radar Pod 04"_s,   AccessorySize::M}},
-    {3360, {"Radar Pod 05"_s, AccessorySize::M}},
+    {3360, {"Radar Pod 05"_s,   AccessorySize::M}},
 
-    {3401, {"Tri Pod 01"_s, AccessorySize::M}},
+    {3401, {"Tri Pod 01"_s,    AccessorySize::M}},
-    {3402, {"Tri Pod 02"_s, AccessorySize::M}},
+    {3402, {"Tri Pod 02"_s,    AccessorySize::M}},
-    {3403, {"Tri Pod 03"_s, AccessorySize::M}},
+    {3403, {"Tri Pod 03"_s,    AccessorySize::M}},
-    {3404, {"Tri Pod 04"_s, AccessorySize::M}},
+    {3404, {"Tri Pod 04"_s,    AccessorySize::M}},
-    {3405, {"Tri Pod 05"_s, AccessorySize::M}},
+    {3405, {"Tri Pod 05"_s,    AccessorySize::M}},
     {3406, {"Signal Pod 01"_s, AccessorySize::M}},
     {3407, {"Signal Pod 02"_s, AccessorySize::M}},
     {3408, {"Signal Pod 03"_s, AccessorySize::M}},

src/Mass/Mass.cpp

@@ -18,6 +18,7 @@
 
 #include <Corrade/Containers/Array.h>
 #include <Corrade/Containers/Pair.h>
+#include <Corrade/Containers/ScopeGuard.h>
 #include <Corrade/Utility/Path.h>
 
 #include "PropertyNames.h"
@@ -78,6 +79,16 @@ auto Mass::getNameFromFile(Containers::StringView path) -> Containers::Optional<
 void Mass::refreshValues() {
     LOG_INFO_FORMAT("Refreshing values for {}.", _filename);
 
+    logger().lockMutex();
+    logger().indent();
+    logger().unlockMutex();
+
+    Containers::ScopeGuard indent_guard{[]{
+        logger().lockMutex();
+        logger().unindent();
+        logger().unlockMutex();
+    }};
+
     LOG_INFO("Checking if file exists.");
     if(!Utility::Path::exists(Utility::Path::join(_folder, _filename))) {
         LOG_WARNING_FORMAT("{} doesn't exist in {}.", _filename, _folder);

src/SaveTool/SaveTool_MassViewer_Weapons.cpp

@@ -479,6 +479,9 @@ void SaveTool::drawWeaponEditor(Weapon& weapon) {
                         if(ImGui::Selectable(mapped_part.second.data(), mapped_part.first == part.id)) {
                             part.id = mapped_part.first;
                         }
+                        if(mapped_part.first == part.id) {
+                            ImGui::SetItemDefaultFocus();
+                        }
                     }
 
                     ImGui::EndListBox();