[WIP] [ENHANCEMENT] Arbitrary Equipment Slots

mm/2s2h/BenGui/BenGui.cpp

@@ -19,6 +19,7 @@
 
 #include "include/global.h"
 #include "include/z64audio.h"
+#include "2s2h/Enhancements/ArbitraryEquipmentSlots/ArbitraryItemSlotsGUI.h"
 
 namespace BenGui {
 // MARK: - Delegates
@@ -89,6 +90,9 @@ void SetupGuiElements() {
 
     mEventLogWindow = std::make_shared<EventLogWindow>("gWindows.EventLog", "Event Log");
     gui->AddGuiWindow(mEventLogWindow);
+
+    arbItemSlotsWindow = std::shared_ptr<ArbitraryItemSlotsWindow>{ new ArbitraryItemSlotsWindow() };
+    gui->AddGuiWindow(arbItemSlotsWindow);
 }
 
 void Destroy() {

mm/2s2h/BenGui/BenMenuBar.cpp

@@ -14,6 +14,7 @@
 #include "2s2h/DeveloperTools/DeveloperTools.h"
 #include "2s2h/Enhancements/Cheats/Cheats.h"
 #include "2s2h/Enhancements/Player/Player.h"
+#include "2s2h/Enhancements/ArbitraryEquipmentSlots/ArbitraryItemSlotsGUI.h"
 #include "HudEditor.h"
 
 extern "C" {
@@ -507,6 +508,9 @@ void DrawEnhancementsMenu() {
         if (UIWidgets::BeginMenu("Equipment")) {
             UIWidgets::CVarCheckbox("Fast Magic Arrow Equip Animation", "gEnhancements.Equipment.MagicArrowEquipSpeed",
                                     { .tooltip = "Removes the animation for equipping Magic Arrows." });
+
+            UIWidgets::WindowButton("Arbitrary Item Slots", "gWindow.ArbitraryItemSlots", arbItemSlotsWindow);
+
             ImGui::EndMenu();
         }
 

mm/2s2h/BenJsonConversions.hpp

@@ -32,11 +32,27 @@ void from_json(const json& j, ShipSaveInfo& shipSaveInfo) {
     j.at("pauseSaveEntrance").get_to(shipSaveInfo.pauseSaveEntrance);
 }
 
+// void from_json(const json& j, );
+
 void to_json(json& j, const ItemEquips& itemEquips) {
+    std::vector<json> a;
+    if(itemEquips.equipsSlotGetter.getEquipSlots != nullptr){
+        FOREACH_SLOT(
+            itemEquips.equipsSlotGetter.getEquipSlots(&itemEquips.equipsSlotGetter, nullptr, nullptr), 
+            arbSlot, 
+            {
+                a.push_back(json{
+                    {"id", arbSlot->getID(arbSlot)},
+                    {"assignedItemSlot", arbSlot->getAssignedItemSlot(arbSlot)}
+                });
+            }
+        );
+    }
     j = json{
         { "buttonItems", itemEquips.buttonItems },
         { "cButtonSlots", itemEquips.cButtonSlots },
         { "equipment", itemEquips.equipment },
+        { "arbitraryEquipmentSlots", a },
     };
 }
 
@@ -47,6 +63,30 @@ void from_json(const json& j, ItemEquips& itemEquips) {
         j.at("buttonItems").at(i).get_to(itemEquips.buttonItems[i]);
         j.at("cButtonSlots").at(i).get_to(itemEquips.cButtonSlots[i]);
     }
+
+    size_t arbCount = 0;
+    if(j.contains("arbitraryEquipmentSlots")){
+        arbCount = j.at("arbitraryEquipmentSlots").size();
+    }
+
+    initItemEquips(&itemEquips);
+
+    ArbitraryItemEquipSet slots = itemEquips.equipsSlotGetter.getEquipSlots(&itemEquips.equipsSlotGetter, NULL, NULL);
+
+    for(int i = 0; i < slots.count; i++){
+        ArbitraryItemEquipButton& a = slots.equips[i];
+
+        for(size_t k = 0; k < arbCount ; k++){
+            std::string parsedId;
+            j.at("arbitraryEquipmentSlots").at(k).at("id").get_to(parsedId);
+
+            if(parsedId == a.getID(&a)){
+                InventorySlot itemSlot;
+                j.at("arbitraryEquipmentSlots").at(k).at("assignedItemSlot").get_to(itemSlot);
+                a.assignItemSlot(&a, itemSlot); // TODO
+            }
+        }
+    }
 }
 
 void to_json(json& j, const Inventory& inventory) {

mm/2s2h/BenPort.cpp

@@ -37,7 +37,7 @@
 #endif
 #include "Extractor/Extract.h"
 // OTRTODO
-//#include <functions.h>
+// #include <functions.h>
 #include "2s2h/Enhancements/FrameInterpolation/FrameInterpolation.h"
 
 #ifdef ENABLE_CROWD_CONTROL
@@ -340,11 +340,11 @@ void OTRAudio_Thread() {
 // AudioMgr_ThreadEntry(&gAudioMgr);
 //  528 and 544 relate to 60 fps at 32 kHz 32000/60 = 533.333..
 //  in an ideal world, one third of the calls should use num_samples=544 and two thirds num_samples=528
-//#define SAMPLES_HIGH 560
-//#define SAMPLES_LOW 528
+// #define SAMPLES_HIGH 560
+// #define SAMPLES_LOW 528
 //  PAL values
-//#define SAMPLES_HIGH 656
-//#define SAMPLES_LOW 624
+// #define SAMPLES_HIGH 656
+// #define SAMPLES_LOW 624
 
 // 44KHZ values
 #define SAMPLES_HIGH 752