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

Refactoring of status system to prevent bug w/ events

Browse source
This commit is contained in:
Antoine H 2021-01-27 15:31:18 +01:00
parent fd8306645b
commit e89483d612
13 changed files with 487 additions and 113 deletions
Download patch file Download diff file Expand all files Collapse all files

218
Assets/Scripts/Tavernkeeper_controller.cs
View file

@ -1,218 +0,0 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
[RequireComponent(typeof(Rigidbody2D))]
[RequireComponent(typeof(Animator))]
public class Tavernkeeper_controller : MonoBehaviour
{
public float mvt_speed = 5.0f; //Movement speed
public float action_dist = 1.5f; //Action distance
public float action_cd = 0.5f; //Action cooldown
Dictionary<string, GameObject> hand_container; //Objects (IGrabable) in hand
float actionTimer;
bool isInteracting;
// Last user inputs
float horizontal;
float vertical;
float hands;
string currentHand;
Vector2 lookDirection = new Vector2(1,0);
Rigidbody2D rigidbody2d;
Animator animator;
//Grab an Object (IGrabable) w/ a specific or w/ last hand used (hand=null).
public void grab(GameObject obj, string hand=null)
{
//Default hand
if(hand is null)
hand = currentHand;
//Test
if(!hand_container.ContainsKey(hand))
{
Debug.LogError("Invalid key for hands :"+hand);
}
IGrabable grabable_obj = obj.GetComponent<IGrabable>();
if(grabable_obj!=null && hand_container[hand] is null && grabable_obj.size==1) //Empty hand
{
// hit_object.transform.SetParent(transform);
// hit_object.transform.localPosition = new Vector2(-0.2f,0.2f);
Transform mugSlot = gameObject.transform.Find(hand+"MugSlot");
grabable_obj.take(mugSlot);
hand_container[hand]=obj;
}
else
{
Debug.Log(gameObject.name+" cannot grab (hand full): " + obj);
}
}
//Drop every objects in hands at tavernkeeper position.
public void emptyHands()
{
foreach(string hand in hand_container.Keys)
{
if(hand_container[hand]!=null)
{
IGrabable grabable_obj = hand_container[hand].GetComponent<IGrabable>();
grabable_obj.drop(transform);
}
}
hand_container["left"]=null;
hand_container["right"]=null;
}
// Start is called before the first frame update
void Start()
{
if(gameObject.tag != "Player")
Debug.LogWarning(gameObject.name+" tag should be set to 'Player' to work properly");
rigidbody2d = GetComponent<Rigidbody2D>();
animator = GetComponent<Animator>();
hand_container = new Dictionary<string, GameObject>(){
{"left", null},
{"right", null}
};
// GameSystem.Instance.startService();
}
// Update is called once per frame
void Update()
{
//Read inputs
horizontal = Input.GetAxis("Horizontal"); //See Edit/Project setting / Input Manager
vertical = Input.GetAxis("Vertical");
hands = Input.GetAxis("Hand");
//Movement action
movement(new Vector2(horizontal, vertical));
//Actions delay
if(isInteracting)
{
actionTimer -= Time.deltaTime;
if (actionTimer < 0)
isInteracting = false;
}
//Hands actions
if(!isInteracting && !Mathf.Approximately(hands, 0.0f))
{
actionTimer= action_cd;
isInteracting=true;
if(hands>0)
currentHand="left";
else
currentHand="right";
handAction(currentHand);
}
}
// Update used by the Physics engine
void FixedUpdate()
{
//Movement of a physic object
Vector2 position = rigidbody2d.position;
position.x = position.x + mvt_speed * horizontal * Time.deltaTime;
position.y = position.y + mvt_speed * vertical * Time.deltaTime;
rigidbody2d.MovePosition(position); //Movement processed by the phyisc engine for Collision, etc.
}
//Movement
void movement(Vector2 move)
{
//Update animation direction
if(move != Vector2.zero)//Movement requested ? //!Mathf.Approximately(move.x, 0.0f) || !Mathf.Approximately(move.y, 0.0f)
{
lookDirection.Set(move.x, move.y); //== lookDirection=move
lookDirection.Normalize();
}
animator.SetFloat("Look X", lookDirection.x);
animator.SetFloat("Look Y", lookDirection.y);
animator.SetFloat("Speed", move.magnitude);
}
//Handle action with hands ("left" or "right")
void handAction(string hand)
{
//Test
if(!hand_container.ContainsKey(hand))
{
Debug.LogError("Invalid key for hands :"+hand);
}
// Test collision of ray from tavernkeeper center (A verifier) at action_dist unit distance on Interactions layer
RaycastHit2D hit = Physics2D.Raycast(rigidbody2d.position + Vector2.up * 0.2f, lookDirection, action_dist, LayerMask.GetMask("Interactions"));
if (hit.collider != null)
{
GameObject hit_object = hit.collider.gameObject;
// Debug.Log("Raycast has hit the object " + hit_object.name+ hit_object.tag);
if (hit_object != null)
{
//Handle objects interactions by tags
//TODO : Factoriser actions des Clients/Workshop
//TODO : Gérer cas Grabable & Workshop
if(hit_object.tag == "Grabable")
{
grab(hit_object, hand);
}
else if(hit_object.tag == "Usable")
{
IUsable usable = hit_object.GetComponent<IUsable>();
if(usable!=null)
{
if(hand_container[hand] is null) //No object in hands
{
// Debug.Log(gameObject.name+" use "+hit_object.name);
usable.use(gameObject); //Tavernkeeper interacting directly w/ usable
}
else if(usable.use(hand_container[hand])) //Interactions w/ object in hands
{
//Object taken by usable
// Debug.Log("Give "+ hand_container[hand].name+" to "+hit_object.name);
hand_container[hand]=null;
}
}
}
else
{
Debug.Log(hit_object.tag+" tag not handled by "+gameObject.name);
}
}
}
else if (hand_container[hand] != null) //Hand full and no hits : use object
{
IGrabable obj = hand_container[hand].GetComponent<IGrabable>();
if(obj !=null)
{
if(obj.use(gameObject)) //Use object in hand
hand_container[hand]=null; //True = object dropped
}
}
}
//Returns set of free hands (keys)
// ISet<string> freeHands()
// {
// HashSet<string> res = new HashSet<string>();
// foreach ( KeyValuePair<string, GameObject> kvp in hand_container)
// {
// if(kvp.Value is null)
// {
// res.Add(kvp.Key);
// }
// }
// return res;
// }
}