AntoineH/ProjetPatate
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix bug Cleaning_workshop w/ consecutive cleaning

Browse source
This commit is contained in:
Antoine H 2021-02-09 10:09:21 +01:00
parent 5a32d3f4d1
commit 056e848a97
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Assets/Scripts/Workshops/Cleaning_workshop.cs
View file

@ -3,6 +3,7 @@ using System.Collections.Generic;
using UnityEngine; using UnityEngine;
//Define the behavior of a cleaning workshop //Define the behavior of a cleaning workshop
//BUG w/ consecutive mugs washed ?
public class Cleaning_workshop : Workshop public class Cleaning_workshop : Workshop
{ {
List<GameObject> stock = new List<GameObject>(); //List of mug in workshop List<GameObject> stock = new List<GameObject>(); //List of mug in workshop
@ -16,7 +17,7 @@ public class Cleaning_workshop : Workshop
//TODO : Gérer grabable autre que Mug //TODO : Gérer grabable autre que Mug
if(userObject.tag=="Grabable") if(userObject.tag=="Grabable")
{ {
//Stock and empty mug //Stock mug
Mug mug = userObject.GetComponent<Mug>(); Mug mug = userObject.GetComponent<Mug>();
if (mug!= null) if (mug!= null)
{ {
@ -31,13 +32,13 @@ public class Cleaning_workshop : Workshop
{ {
continueUse(userObject); continueUse(userObject);
} }
else if(userObject.tag=="Player" && prepTimer>=prepTime) //Give tavernkeeper currentMug if cleaned else if(userObject.tag=="Player" && prepTimer>=prepTime && currentMug != null) //Give tavernkeeper currentMug if cleaned
{ {
Tavernkeeper_controller player = userObject.GetComponent<Tavernkeeper_controller>(); Tavernkeeper_controller player = userObject.GetComponent<Tavernkeeper_controller>();
Mug mug = currentMug.GetComponent<Mug>(); Mug mug = currentMug.GetComponent<Mug>();
if(player!=null && mug !=null) if(player!=null && mug !=null)
{ {
Debug.Log(gameObject.name+" give "+currentMug.name+" to "+userObject.name); // Debug.Log(gameObject.name+" give "+currentMug.name+" to "+userObject.name);
//Clean mug //Clean mug
mug.dirty=false; mug.dirty=false;
//Give mug //Give mug
@ -54,8 +55,8 @@ public class Cleaning_workshop : Workshop
// Update is called once per frame // Update is called once per frame
void Update() void Update()
{ {
if(currentMug!=null) // if(currentMug!=null)
Debug.Log(stock.Count+ " - CurrentMug: "+currentMug.name+" "+currentMug.GetComponent<Mug>().dirty); // Debug.Log(gameObject.name+" stock: "+stock.Count+ " - CurrentMug: "+currentMug.name+" (Dirty: "+currentMug.GetComponent<Mug>().dirty+")");
//Set current mug if there's stock //Set current mug if there's stock
if(currentMug is null && stock.Count>0) if(currentMug is null && stock.Count>0)
{ {