use ArrayIndex for property getter

Author: moritz-h

libsave/include/SatisfactorySave/GameTypes/Properties/Base/PropertyList.h

@@ -19,18 +19,19 @@ namespace SatisfactorySave {
 
         void serialize(Archive& ar);
 
-        [[nodiscard]] inline const std::shared_ptr<Property>& getPtr(const std::string& name) const {
+        [[nodiscard]] inline const std::shared_ptr<Property>& getPtr(const std::string& name,
+            int32_t arrayIndex = 0) const {
             for (const auto& p : *this) {
-                if (p->Name() == name) {
+                if (p->Name() == name && p->ArrayIndex() == arrayIndex) {
                     return p;
                 }
             }
-            throw std::runtime_error("Property name invalid: " + name);
+            throw std::runtime_error("Property not found: " + name + "[" + std::to_string(arrayIndex) + "]");
         }
 
         template<typename T>
-        inline T& get(const std::string& name) const {
-            T* property = dynamic_cast<T*>(getPtr(name).get());
+        inline T& get(const std::string& name, int32_t arrayIndex = 0) const {
+            T* property = dynamic_cast<T*>(getPtr(name, arrayIndex).get());
             if (property != nullptr) {
                 return *property;
             }

libsavepy/src/GameTypes/Properties.cpp

@@ -40,9 +40,10 @@ void init_GameTypes_Properties(py::module_& m) {
 
     py::bind_vector<s::PropertyList, py::smart_holder>(m, "PropertyList")
         .def("get",
-            [](s::PropertyList& l, const std::string& name) -> std::shared_ptr<s::Property> {
-                return l.getPtr(name);
-            });
+            [](s::PropertyList& l, const std::string& name, int32_t arrayIndex) -> std::shared_ptr<s::Property> {
+                return l.getPtr(name, arrayIndex);
+            },
+            py::arg("name"), py::arg("arrayIndex") = 0);
 
     py::classh<s::ArrayProperty, s::Property>(m, "ArrayProperty")
         .def(py::init<>())

map/src/MapWindow/UI/ObjectWidgets.cpp

@@ -358,7 +358,11 @@ bool Satisfactory3DMap::UI::EditorUniqueNetIdRepl(const char* label, s::FUniqueN
 }
 
 bool Satisfactory3DMap::UI::EditorProperty(s::Property& p, const EventContext& ctx) {
-    const bool open = EditorTreeNode(p.Name().toString().c_str(), ImGuiTreeNodeFlags_DefaultOpen);
+    std::string name = p.Name().toString();
+    if (p.ArrayIndex() > 0) {
+        name += "[" + std::to_string(p.ArrayIndex()) + "]";
+    }
+    const bool open = EditorTreeNode(name.c_str(), ImGuiTreeNodeFlags_DefaultOpen);
     ImGui::TableNextColumn();
     ImGui::TextDisabled("%s", p.Type().toString().c_str());
     if (open) {