Conjure/ludumdare50
4
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added Entity.beingPushed() state without actually using it

Browse Source
This commit is contained in:
Jason Durand 01 2022-04-02 11:02:29 -04:00
parent 54c1a142e4
commit fe334f8d15
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Assets/Scripts/Entity.cs
View File

@ -30,6 +30,14 @@ public class Entity : MonoBehaviour
attackTimer = attackCooldown; attackTimer = attackCooldown;
} }
protected virtual void FixedUpdate() {
//TODO sqrMagnitude?
if (beingPushed && rb.velocity.magnitude < stats.MinVelocityWhenPushed) {
rb.velocity = Vector2.zero;
beingPushed = false;
}
}
protected virtual void Attack(){ protected virtual void Attack(){
// jason: TODO Either have target be Entity instead of transform, or skip Attack when GetComponent<Entity>() is null // jason: TODO Either have target be Entity instead of transform, or skip Attack when GetComponent<Entity>() is null
Entity targetEntity = target.GetComponent<Entity>(); Entity targetEntity = target.GetComponent<Entity>();
@ -40,11 +48,11 @@ public class Entity : MonoBehaviour
} }
protected virtual void MoveToTarget(float deltaTime){ protected virtual void MoveToTarget(){
direction = Vector3.RotateTowards(direction, (target.position - transform.position), rotSpeed*deltaTime, 0.0f); direction = Vector3.RotateTowards(direction, (target.position - transform.position), rotSpeed*Time.fixedDeltaTime, 0.0f);
if(!IsInAttackRange()){ if(!IsInAttackRange()){
rb.MovePosition(transform.position + direction * movementSpeed * deltaTime); rb.MovePosition(transform.position + direction * movementSpeed * Time.fixedDeltaTime);
} }
} }

6
Assets/Scripts/Monster.cs
View File

@ -11,7 +11,11 @@ public class Monster : Entity
base.SetName("Monster"); base.SetName("Monster");
} }
void FixedUpdate() => MoveToTarget(Time.fixedDeltaTime); protected override void FixedUpdate() {
base.FixedUpdate();
MoveToTarget();
}
// Update is called once per frame // Update is called once per frame
void Update() void Update()