src/Application/Application_MassViewer_Armour.cpp

@@ -86,7 +86,7 @@ Application::drawArmour() {
             ImGui::Text("Set name: %s", GameData::armour_sets.at(part.id).name.data());
         }
         else {
-            ImGui::Text("Set ID: %d", part.id);
+            ImGui::Text("Set ID: %u", part.id);
         }
 
         ImGui::SameLine();
@@ -96,27 +96,13 @@ Application::drawArmour() {
         }
         if(ImGui::BeginPopup("##ArmourPartPopup")) {
             if(ImGui::BeginListBox("##ChangePart")) {
-                for(const auto& [id, set] : GameData::armour_sets) {
+                for(auto& set : GameData::armour_sets) {
-                    if((part.slot == GameObjects::ArmourPart::Slot::Neck && !set.neck_compatible) ||
+                    if(part.slot != GameObjects::ArmourPart::Slot::Neck || set.second.neck_compatible) {
-                       (id == -2 &&
+                        if(ImGui::Selectable(set.second.name.data(), set.first == part.id,
-                           !(part.slot == GameObjects::ArmourPart::Slot::LeftFrontSkirt ||
-                             part.slot == GameObjects::ArmourPart::Slot::RightFrontSkirt ||
-                             part.slot == GameObjects::ArmourPart::Slot::LeftSideSkirt ||
-                             part.slot == GameObjects::ArmourPart::Slot::RightSideSkirt ||
-                             part.slot == GameObjects::ArmourPart::Slot::LeftBackSkirt ||
-                             part.slot == GameObjects::ArmourPart::Slot::RightBackSkirt ||
-                             part.slot == GameObjects::ArmourPart::Slot::LeftAnkle ||
-                             part.slot == GameObjects::ArmourPart::Slot::RightAnkle)
-                       )
-                      )
-                    {
-                        continue;
-                    }
-
-                    if(ImGui::Selectable(set.name.data(), id == part.id,
                                              ImGuiSelectableFlags_SpanAvailWidth))
                         {
-                        part.id = id;
+                            part.id = set.first;
+                        }
                     }
                 }
                 ImGui::EndListBox();

src/CMakeLists.txt

@@ -18,7 +18,7 @@ set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
-set(SAVETOOL_PROJECT_VERSION 1.5.2)
+set(SAVETOOL_PROJECT_VERSION 1.5.1)
 
 find_package(Corrade REQUIRED Containers Utility)
 if(CORRADE_TARGET_WINDOWS)
@@ -235,7 +235,7 @@ target_compile_definitions(MassBuilderSaveTool PRIVATE
     SAVETOOL_VERSION_STRING="${SAVETOOL_PROJECT_VERSION}"
     SAVETOOL_VERSION_MAJOR=1
     SAVETOOL_VERSION_MINOR=5
-    SAVETOOL_VERSION_PATCH=2
+    SAVETOOL_VERSION_PATCH=1
     SAVETOOL_VERSION_PRERELEASE=false
     SAVETOOL_CODENAME="Friendly Valkyrie"
     SAVETOOL_SUPPORTED_GAME_VERSION="0.11.x"

src/GameData/ArmourSets.h

@@ -33,7 +33,6 @@ struct ArmourSet {
 };
 
 static const std::map<std::int32_t, ArmourSet> armour_sets {
-    {-2, {"<hidden>"_s,          false}},
     {-1, {"<unequipped>"_s,      true}},
     {0,  {"Vanguard"_s,          true}},
     {1,  {"Assault Mk.I"_s,      true}},

third-party/efsw

@@ -1 +1 @@
-Subproject commit 0c70ed2cd069a18d534989e8ae1c25ee39cba1f1
+Subproject commit 341934765471e4074e90bb5205ff4a65c16499c6