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

Quick fix to Cleaning_workshop + working currentMug in Production_workshop + cleaner Logs

Browse source
This commit is contained in:
Antoine H 2020-12-10 14:58:15 +01:00
parent c8682b208a
commit 825de9e1b1
3 changed files with 33 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Assets/Scripts/Cleaning_workshop.cs
View file

@ -9,32 +9,36 @@ public class Cleaning_workshop : Workshop
//Handle objects interactions w/ Workshop
//Return wether the object is taken from tavernkeeper
public override bool use(GameObject object_used)
public override bool use(GameObject userObject)
{
if(object_used != null)
if(userObject != null)
{
//TODO : Gérer grabable autre que Mug
if(object_used.tag=="Grabable")
if(userObject.tag=="Grabable")
{
//Stock and empty mug
Mug mug = object_used.GetComponent<Mug>();
Mug mug = userObject.GetComponent<Mug>();
if (mug!= null)
{
Debug.Log(object_used.name+ " stocked in "+gameObject.name);
Debug.Log(userObject.name+ " stocked in "+gameObject.name);
if (mug.content != null)//Empty mug
mug.consume();
stock.Add(object_used);
stock.Add(userObject);
return true; //Object taken
}
}
else if(object_used.tag=="Player")
else if(userObject.tag=="Player" && currentMug!=null) //Give clean mug
{
Tavernkeeper_controller player = object_used.GetComponent<Tavernkeeper_controller>();
if(player!=null && currentMug!=null)
Tavernkeeper_controller player = userObject.GetComponent<Tavernkeeper_controller>();
Mug mug = currentMug.GetComponent<Mug>();
if(player!=null && mug !=null)
{
Mug mug = currentMug.GetComponent<Mug>();
Debug.Log(gameObject.name+" give "+currentMug.name+" to "+userObject.name);
//Clean mug
mug.dirty=false;
//Give mug
player.grab(currentMug);
currentMug=null;
}
}
}