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

Handle continuous interactions + Add Cleaning_workshop.prefab

Browse source
This commit is contained in:
Antoine H 2021-01-08 11:05:45 +01:00
parent 6cce785d2c
commit 363845b456
11 changed files with 726 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Assets/Scripts/Cleaning_workshop.cs
View file

@ -21,13 +21,24 @@ public class Cleaning_workshop : Workshop
if (mug!= null)
{
Debug.Log(userObject.name+ " stocked in "+gameObject.name);
if (mug.content != null)//Empty mug
if(mug.content != null)//Empty mug
{
mug.consume();
prepTimer=0.0f;
}
else if(!mug.dirty)//Mug already clean
prepTimer=prepTime;
stock.Add(userObject);
return true; //Object taken
}
}
else if(userObject.tag=="Player" && currentMug!=null) //Give clean mug
else if(userObject.tag=="Player" && prepTimer<prepTime && currentMug != null) //Prepare currentMug
{
continueUse(userObject);
}
else if(userObject.tag=="Player" && prepTimer>=prepTime) //Give tavernkeeper currentMug if cleaned
{
Tavernkeeper_controller player = userObject.GetComponent<Tavernkeeper_controller>();
Mug mug = currentMug.GetComponent<Mug>();
@ -39,6 +50,8 @@ public class Cleaning_workshop : Workshop
//Give mug
player.grab(currentMug);
currentMug=null;
UIPrepTimer.gameObject.SetActive(false); //Turn off UI prep timer
}
}
}
@ -53,6 +66,13 @@ public class Cleaning_workshop : Workshop
{
currentMug=stock[0];
stock.RemoveAt(0);
if(UIPrepTimer != null) //Display UI prep timer
{
UIPrepTimer.SetValue(prepTimer/prepTime);
UIPrepTimer.DisplayIcon(false);
UIPrepTimer.gameObject.SetActive(true);
}
}
}
}