Add StockManager + Multiple minor Fix

Assets/Scripts/GameSystems/ClientManager.cs

@@ -43,7 +43,7 @@ public sealed class ClientManager : MonoBehaviour
     //TODO: Reputation
     public void clientReward(int money)
     {
-        GameSystem.Instance.gold+=money;
+        GameSystem.Instance.Gold+=money;
     }
 
     //Destroy a client
@@ -79,19 +79,17 @@ public sealed class ClientManager : MonoBehaviour
     }
 
     //Return a random order from available consummable
-    //TODO : Check stock before assignement
-    //TODO : Share available types w/ consummable
-    //TODO : Give sprite
+    //TODO : Check stock before assignement ?
     public string assignOrder()
     {
-        List<string> available_types = new List<string>(new [] {"beer", "vodka"});
+        List<string> available_types = new List<string>(Consumable.allowed_types);
 
         string order_type = available_types[Random.Range(0, available_types.Count)];
         return order_type;
     }
 
-    // Start is called before the first frame update
-    void Start()
+    //Awake is called when the script instance is being loaded.
+    void Awake()
     {
         ClientContainer = GameObject.Find("/GameSystem/ClientManager");
         if (ClientContainer is null)

Assets/Scripts/GameSystems/GameSystem.cs

@@ -1,7 +1,6 @@
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
-using System; //Exceptions
 
 //Define the global game system of the service. (Singleton)
 public sealed class GameSystem : MonoBehaviour
@@ -16,15 +15,13 @@ public sealed class GameSystem : MonoBehaviour
 
     //TODO : Effect on gold change
     //Money
-    private int _gold;
-    public int gold
+    private int gold;
+    public int Gold
     {
-        get{return _gold;}
+        get{return gold;}
         set{
-            if(value<0)
-                value=0;
-            _gold = value;
-            Debug.Log("Gold : "+_gold);
+            gold = Mathf.Abs(value);
+            Debug.Log("Gold : "+gold);
         }
     }
 
@@ -48,7 +45,7 @@ public sealed class GameSystem : MonoBehaviour
         else //Set to specific scale
         {
             if(newTimeScale<0.0f)
-                throw new Exception("Trying to set time scale to negative value (rewinding time...) :"+newTimeScale);
+                Debug.LogError("Trying to set time scale to negative value (rewinding time...) :"+newTimeScale);
             
             Time.timeScale = (float)newTimeScale;
         }

Assets/Scripts/GameSystems/StockManager.cs

@@ -0,0 +1,106 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+//Define the system managing the stock of goods. (Singleton)
+//TODO : Update check stock of registered workshops
+public class StockManager : MonoBehaviour
+{
+    //Consumable
+    Dictionary<string, Sprite> consumableSprites = new Dictionary<string, Sprite>(); //Sprite associated w/ types of consumable
+    HashSet<string> avail_consumable = new HashSet<string>(); //Available consumable
+    Dictionary<string, int> global_stock; //Stocks of all the active production workshops
+
+    List<Component> workshop_register = new List<Component>();
+
+    //Register a production workshop
+    public void registerWorkshop(Component workshop)
+    {
+        if(workshop!=null && !workshop_register.Contains(workshop))
+        {
+            string prod_name = ((Production_workshop)workshop).product_name;
+            Sprite prod_sprite = ((Production_workshop)workshop).product_sprite;
+            int stock = ((Production_workshop)workshop).Stock;
+
+            //Check if type is allowed for Consumables
+            if(!Consumable.allowed_types.Contains(prod_name))
+                Debug.LogError(workshop.gameObject.name+" :  "+prod_name+" isn't an allowed type of consumable.");
+            //Check if there's a different sprite registered for the same product
+            if(consumableSprites.ContainsKey(prod_name) && consumableSprites[prod_name]!=prod_sprite)
+                Debug.LogWarning("StockManager: Different sprites registered for "+prod_name+". Only one will be kept.");
+
+            consumableSprites[prod_name]=prod_sprite;
+            updateStock(prod_name, stock);
+            workshop_register.Add(workshop);
+            Debug.Log(workshop.gameObject.name+" registered by StockManager");
+        }
+    }
+
+    //Remove a workshop from the register
+    public void removeWorkshop(Component workshop)
+    {
+        if(workshop!=null && workshop_register.Contains(workshop))
+        {
+            //Update global stock
+            string prod_name = ((Production_workshop)workshop).product_name;
+            int stock = ((Production_workshop)workshop).Stock;
+            updateStock(prod_name, -stock);
+
+            //Remove workshop
+            workshop_register.Remove(workshop);
+            Debug.Log(workshop.gameObject.name+" unregistered by StockManager");
+        }
+    }
+
+    public Sprite consumableSprite(string consumable)
+    {
+        if(!consumableSprites.ContainsKey(consumable))
+            Debug.LogError("Stock Manager : no sprite registered for : "+consumable);
+        return consumableSprites[consumable];
+    }
+
+    public void updateStock(string consumable, int valueModif)
+    {
+        global_stock[consumable]= Mathf.Abs(global_stock[consumable]+valueModif);
+        if(global_stock[consumable]==0)
+            avail_consumable.Remove(consumable);
+        else
+            avail_consumable.Add(consumable);
+    }
+
+    //Awake is called when the script instance is being loaded.
+    void Awake()
+    {
+        //Initialize global stock
+        global_stock= new Dictionary<string, int>();
+        foreach(string cons in Consumable.allowed_types)
+        {
+            global_stock[cons]=0;
+        }
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        
+    }
+
+    //// Singleton Implementation (https://jlambert.developpez.com/tutoriels/dotnet/implementation-pattern-singleton-csharp/#LIII) ////
+    private StockManager()
+    {
+    }
+
+    public static StockManager Instance { get { return Nested.instance; } }
+        
+    private class Nested
+    {
+        // Explicit static constructor to tell C# compiler
+        // not to mark type as beforefieldinit
+        static Nested()
+        {
+        }
+
+        internal static readonly StockManager instance = new GameObject("StockManager").AddComponent<StockManager>();
+    }
+    ////
+}

Assets/Scripts/GameSystems/StockManager.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: f33c46360b013aa48a333f4be9bb3c09
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: