From c710d3c38ec3795e6c5889255e363e76a720962b Mon Sep 17 00:00:00 2001 From: Antoine H Date: Mon, 7 Dec 2020 16:04:11 +0100 Subject: [PATCH] Little cleaner code --- Assets/Scripts/Client_controller.cs | 2 +- Assets/Scripts/Mug.cs | 2 +- Assets/Scripts/Workshop.cs | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Assets/Scripts/Client_controller.cs b/Assets/Scripts/Client_controller.cs index e09562c..521b9bd 100644 --- a/Assets/Scripts/Client_controller.cs +++ b/Assets/Scripts/Client_controller.cs @@ -9,8 +9,8 @@ public class Client_controller : MonoBehaviour public float consumeTime = 3.0f; //Time to consume currentMug public float waitingTime = 10.0f; //Patience after ordering - GameObject currentMug = null; //Mug currently held by the client float consumeTimer; + GameObject currentMug = null; //Mug currently held by the client //Handle objects interactions w/ Workshop //Return wether the object is taken from tavernkeeper diff --git a/Assets/Scripts/Mug.cs b/Assets/Scripts/Mug.cs index 4a08a3e..8cad71d 100644 --- a/Assets/Scripts/Mug.cs +++ b/Assets/Scripts/Mug.cs @@ -8,7 +8,7 @@ public class Mug : MonoBehaviour, IGrabable { public int size = 1; //Size (1 or 2 hands) of the object public bool dirty = false; - public Consumable content= null; //new Consumable("beer",1,null); + public Consumable content{get; protected set;} = null; //new Consumable("beer",1,null); public void use() { diff --git a/Assets/Scripts/Workshop.cs b/Assets/Scripts/Workshop.cs index 80b6ee8..c9d5cb9 100644 --- a/Assets/Scripts/Workshop.cs +++ b/Assets/Scripts/Workshop.cs @@ -11,7 +11,6 @@ public class Workshop : MonoBehaviour public Sprite product_sprite; public float prepTime = 2.0f; //Time for preparation of product protected int _stock = 5; //Stock of product - GameObject currentMug = null; //Mug currently stocked in workshop //Handle objects interactions w/ Workshop