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

Modif utilisation générique des IGrabable quand action sans hit

Browse source
This commit is contained in:
Antoine H 2020-12-10 15:38:47 +01:00
parent 825de9e1b1
commit ed07f1332e
2 changed files with 11 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Assets/Scripts/Mug.cs
View file

@ -14,7 +14,12 @@ public class Mug : MonoBehaviour, IGrabable
//TODO: Gérer objets tavernier (drop) et autres
public bool use(GameObject userObject)
{
//Do nothing
if(userObject.tag=="Player")
{
// Debug.Log(gameObject.name+" dropped by "+userObject.name);
drop(userObject.transform.position);
return true; //Object taken (on the floor)
}
return false; //Return wether the object is taken from tavernkeeper
}
public void take() //Object taken

17
Assets/Scripts/Tavernkeeper_controller.cs
View file

@ -168,20 +168,13 @@ public class Tavernkeeper_controller : MonoBehaviour
}
}
}
else if (hand_container[hand] != null) //Hand full and no hits
else if (hand_container[hand] != null) //Hand full and no hits : use object
{
if (hand_container[hand].tag == "Grabable") //Drop obj carried on player position
IGrabable obj = hand_container[hand].GetComponent<IGrabable>();
if(obj !=null)
{
IGrabable obj = hand_container[hand].GetComponent<IGrabable>();
if(obj !=null)
{
obj.drop(rigidbody2d.position);
hand_container[hand]=null;
}
}
else
{
Debug.Log(gameObject+" doesn't handle Hand full with "+ hand_container[hand]);
if(obj.use(gameObject)) //Use object in hand
hand_container[hand]=null; //True = object dropped
}
}
}