feat: Rework utilitySystem to use Dictionaries

Author: Baptiste SUZON

Runtime/Stat.cs

@@ -20,6 +20,8 @@ public float Value
             set { this.value = Mathf.Clamp(value, 0, 1); }
         }
 
+        public float OneNegValue => 1 - value;
+
         public Stat(string name, float value)
         {
             Name = name;

Runtime/Utility.cs

@@ -18,6 +18,8 @@ public float Value
             set { this.value = Mathf.Clamp(value, 0, 1); }
         }
 
+        public float OneNegValue => 1 - value;
+
         [SerializeField]
         public List<StatImportance> statImportances;
 

Runtime/UtilitySystem.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
@@ -8,24 +9,28 @@ namespace UtilitySystemPackage
     [System.Serializable]
     public class UtilitySystem
     {
-        [SerializeField] private List<Stat> _inputs = new List<Stat>();
+        [SerializeField] private Dictionary<string, Stat> _inputs = new Dictionary<string, Stat>();
 
-        [SerializeField] private List<Utility> _outputs = new List<Utility>();
+        [SerializeField] private Dictionary<string, Utility> _outputs = new Dictionary<string, Utility>();
 
         public void Init(UtilitySystemData systemData)
         {
-            _inputs = new List<Stat>();
+            _inputs = new Dictionary<string, Stat>();
             for (int i = 0; i < systemData.inputs.Count; i++)
             {
-                _inputs.Add(new Stat(systemData.inputs[i], 0f));
+                _inputs.Add(systemData.inputs[i],new Stat(systemData.inputs[i], 0f));
             }
 
-            _outputs = systemData.utilities;
+            _outputs = new Dictionary<string, Utility>();
+            for (int i = 0; i < systemData.utilities.Count; i++)
+            {
+                _outputs.Add(systemData.utilities[i].Name, systemData.utilities[i]);
+            }
         }
 
         public void UpdateStats(Dictionary<string, float> inputs, bool allowPartialModifications = false)
         {
-            foreach (Stat input in _inputs)
+            foreach (Stat input in _inputs.Values)
             {
                 if (inputs.ContainsKey(input.Name))
                 {
@@ -40,40 +45,53 @@ public void UpdateStats(Dictionary<string, float> inputs, bool allowPartialModif
 
         public void Update()
         {
-            foreach (var output in _outputs)
+            foreach (var output in _outputs.Values)
             {
-                output.EvaluateUtility(_inputs);
+                output.EvaluateUtility(new List<Stat>(_inputs.Values));
             }
         }
 
         public Utility GetHighestUtility()
         {
             if (_outputs.Count == 0) return null;
 
-            Utility max = _outputs[0];
-            for (int i = 1; i < _outputs.Count; i++)
+            Utility max = null;
+
+            foreach (var utility in _outputs.Values)
             {
-                if (_outputs[i].Value > max.Value)
-                    max = _outputs[i];
+                if (max == null)
+                    max = utility;
+                else if (utility.Value > max.Value)
+                    max = utility;
             }
 
             return max;
         }
 
-        public List<Utility> GetUtilities()
+        public Dictionary<string, Utility> GetUtilities()
         {
-            List<Utility> retVal = new List<Utility>(_outputs);
-            return retVal;
+            return _outputs;
+        }
+
+        public Dictionary<string, float> GetUtilitiesAsFloat()
+        {
+            Dictionary<string, float> utilities = new Dictionary<string, float>();
+            foreach (KeyValuePair<string,Utility> kvp in _outputs)
+            {
+                utilities.Add(kvp.Key, kvp.Value.Value);
+            }
+
+            return utilities;
         }
 
         public List<Utility> GetUtilitiesSorted()
         {
-            List<Utility> retVal = new List<Utility>(_outputs);
+            List<Utility> retVal = new List<Utility>(_outputs.Values);
             retVal.Sort((lhs, rhs) => rhs.Value.CompareTo(lhs.Value));
             return retVal;
         }
 
-        public List<Stat> GetInputs()
+        public Dictionary<string, Stat> GetInputs()
         {
             return _inputs;
         }

Samples~/Demo/UtilitySystems.cs

@@ -3,13 +3,13 @@
 using System.Collections.Generic;
 using System.Linq;
 using UnityEngine;
-using UtilitySystem.Runtime;
+using UtilitySystemPackage;
 
 public class UtilitySystems : MonoBehaviour
 {
-    [SerializeField] public UtilitySystem.Runtime.UtilitySystem logicUtilitySystem;
+    [SerializeField] public UtilitySystem logicUtilitySystem;
     public UtilitySystemData logicData;
-    [SerializeField] public UtilitySystem.Runtime.UtilitySystem personalityUtilitySystem;
+    [SerializeField] public UtilitySystem personalityUtilitySystem;
     public UtilitySystemData personalityData;
 
     // Start is called before the first frame update
@@ -23,15 +23,9 @@ void Start()
     void Update()
     {
         logicUtilitySystem.Update();
-        var utilities = logicUtilitySystem.GetUtilities();
-        
-        var dict = new Dictionary<string, float>();
-        foreach (var utility in utilities)
-        {
-            dict[utility.Name] = utility.Value;
-        }
-        
-        personalityUtilitySystem.UpdateStats(dict, true);
+        var utilities = logicUtilitySystem.GetUtilitiesAsFloat();
+
+        personalityUtilitySystem.UpdateStats(utilities, true);
         personalityUtilitySystem.Update();
     }
 #if UNITY_EDITOR
@@ -43,12 +37,12 @@ private void OnGUI()
         GUILayout.EndVertical();
     }
 
-    private void DisplayUtilitySystem(UtilitySystem.Runtime.UtilitySystem system, string name)
+    private void DisplayUtilitySystem(UtilitySystem system, string name)
     {
         GUILayout.Label(name);
         GUILayout.BeginHorizontal();
         GUILayout.BeginVertical("box");
-        foreach (var stat in system.GetInputs())
+        foreach (var stat in system.GetInputs().Values)
         {
             GUILayout.BeginHorizontal();
             GUILayout.Label(stat.Name);
@@ -58,7 +52,7 @@ private void DisplayUtilitySystem(UtilitySystem.Runtime.UtilitySystem system, st
         GUILayout.EndVertical();
 
         GUILayout.BeginVertical("box");
-        foreach (var utility in system.GetUtilities())
+        foreach (var utility in system.GetUtilities().Values)
         {
             GUILayout.BeginHorizontal();
             GUILayout.Label(utility.Name);