Fixed DataViewer alignment and hid backing fields.

Pulsar4xDevs · Mar 1, 2024 · 61c3908 · 61c3908
1 parent b16943e
commit 61c3908
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 22 deletions.
diff --git a/...Engine/Data/basemod/DamageResistance.json → ...Engine/Data/basemod/damageResistance.json b/...Engine/Data/basemod/DamageResistance.json → ...Engine/Data/basemod/damageResistance.json
@@ -16,7 +16,7 @@
       "MaterialID": "plastic",
       "HitPoints": "255",
       "MeltingPoint": "170",
-      "Density": "1175f"
+      "Density": "1175"
     }
   },
   {
@@ -26,7 +26,7 @@
       "MaterialID": "aluminium",
       "HitPoints": "0",
       "MeltingPoint": "660",
-      "Density": "2700f"
+      "Density": "2700"
     }
   },
   {
@@ -36,7 +36,7 @@
       "MaterialID": "titanium",
       "HitPoints": "255",
       "MeltingPoint": "1668",
-      "Density": "4540f"
+      "Density": "4540"
     }
   },
   {

diff --git a/Pulsar4X/GameEngine/Data/basemod/modInfo.json b/Pulsar4X/GameEngine/Data/basemod/modInfo.json
@@ -21,6 +21,7 @@
         "systemGenSettings.json",
         "techCategories.json",
         "techs.json",
-        "weapons.json"
+        "weapons.json",
+        "damageResistance.json"
     ]
 }
diff --git a/Pulsar4X/GameEngine/FeatureSets/DamageComplex/DamageTools.cs b/Pulsar4X/GameEngine/FeatureSets/DamageComplex/DamageTools.cs
@@ -51,7 +51,10 @@ public DamageResistBlueprint(byte iDCode, int hitPoints, float density)
             //Heat = heat;
             //Kinetic = kinetic;
             Density = density; //kg/m^3
-            DamageTools.DamageResistsLookupTable.Add(IDCode, this);
+            if (DamageTools.DamageResistsLookupTable.ContainsKey(iDCode))
+                DamageTools.DamageResistsLookupTable[iDCode] = this;
+            else 
+                DamageTools.DamageResistsLookupTable.Add(IDCode, this);
         }
     }
 

diff --git a/Pulsar4X/GameEngine/Modding/ModInstruction.cs b/Pulsar4X/GameEngine/Modding/ModInstruction.cs
@@ -23,7 +23,7 @@ public enum DataType
             Tech,
             TechCategory,
             Theme,
-            DamageResist,
+            DamageResistance,
         }
         public enum OperationType { Default, Remove }
         public enum CollectionOperationType { Add, Remove, Overwrite }
@@ -98,8 +98,8 @@ public override bool CanConvert(Type objectType)
                 case ModInstruction.DataType.Theme:
                     instruction.Data = jObject["Payload"].ToObject<ThemeBlueprint>();
                     break;
-                case ModInstruction.DataType.DamageResist:
-                    instruction.Data = jObject["DamageResistance"].ToObject<DamageResistBlueprint>();
+                case ModInstruction.DataType.DamageResistance:
+                    instruction.Data = jObject["Payload"].ToObject<DamageResistBlueprint>();
                     break;
             }
 

diff --git a/Pulsar4X/GameEngine/Modding/ModLoader.cs b/Pulsar4X/GameEngine/Modding/ModLoader.cs
@@ -93,7 +93,7 @@ private void ApplyMod(ModDataStore baseData, ModInstruction mod, string modNames
                 case ModInstruction.DataType.Theme:
                     ApplyModGeneric<ThemeBlueprint>(baseData.Themes, mod, modNamespace);
                     break;
-                case ModInstruction.DataType.DamageResist:
+                case ModInstruction.DataType.DamageResistance:
                     ApplyModGeneric<DamageResistBlueprint>(baseData.DamageResists, mod, modNamespace);
                     break;
             }

diff --git a/Pulsar4X/Pulsar4X.Client/DebugAndPData/DataViewerWindow.cs b/Pulsar4X/Pulsar4X.Client/DebugAndPData/DataViewerWindow.cs
@@ -2,6 +2,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Reflection;
+using System.Runtime.CompilerServices;
 using ImGuiNET;
 using Pulsar4X.Engine;
 using Pulsar4X.Engine.Industry;
@@ -119,8 +120,11 @@ public static void DisplayDataObj(object dataObj)
 
                             if (ImGui.TreeNode(de.Key.ToString()))
                             {
+                                ImGui.NextColumn();
+                                ImGui.NextColumn();
                                 _numLines += itemsCount;
                                 RecursiveReflection(de.Value);
+                                ImGui.Unindent();
                                 ImGui.Separator();
                             }
                             else
@@ -249,7 +253,7 @@ static void RecursiveReflection(object obj)
                 if (typeof(FieldInfo).IsAssignableFrom(memberInfo.GetType()) || typeof(PropertyInfo).IsAssignableFrom(memberInfo.GetType()))
                 {
                     value = GetValue(memberInfo, obj);
-                    if(value == null)
+                    if(value == null || memberInfo.GetCustomAttribute<CompilerGeneratedAttribute>()!= null)
                         continue;
                     if (typeof(ICollection).IsAssignableFrom(value.GetType()))
                     {
@@ -438,24 +442,29 @@ static void RecursiveReflection(object obj)
 
     static object? GetValue(this MemberInfo memberInfo, object forObject)
     {
-        switch (memberInfo.MemberType)
-        {
-            case MemberTypes.Field:
-                return ((FieldInfo)memberInfo).GetValue(forObject);
-            case MemberTypes.Property:
+
+            switch (memberInfo.MemberType)
             {
-                try
+                case MemberTypes.Field:
                 {
-                    return ((PropertyInfo)memberInfo).GetValue(forObject);
+
+                    return ((FieldInfo)memberInfo).GetValue(forObject);
                 }
-                catch (Exception e)
+                case MemberTypes.Property:
                 {
-                    return "";
+                    try
+                    {
+                        return ((PropertyInfo)memberInfo).GetValue(forObject);
+                    }
+                    catch (Exception e)
+                    {
+                        return "";
+                    }
+
                 }
-
-            }
 
-        }
+            }
+
         return "";
     }
 }