New damage & weapon system

Author: TCPHijinks

AttkType.cs

@@ -0,0 +1,8 @@
+public enum AttkType
+{
+    none,
+    slash,
+    crush, 
+    pierce
+
+}

Creatures/CreatureCurHpSpMpManager.cs

@@ -8,9 +8,11 @@
 public class CreatureModifyableProperties : MonoBehaviour
 {
     public Creature Creature { get; private set; }
+    public Health Health { get; private set; }
     private void Awake()
     {
         Creature = GetComponent<Creature>();
+        Health = GetComponent<Health>();       
     }
 
     /// <summary>

Creatures/CreatureModifyableProperties.cs

@@ -0,0 +1,26 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class Health : MonoBehaviour
+{
+    private Creature self;
+    public int CurHP { get; private set; }
+   
+    void Start()
+    {
+        self = GetComponent<Creature>();
+        CurHP = self.MaxHealth;
+    }
+
+
+    public void TakeDamage(int amount)
+    {      
+        if(amount > 0)
+        Debug.Log(gameObject.name + " was damaged! (" + amount + "). Remainder " + (CurHP - amount) + ".");
+        CurHP -= Mathf.Abs(amount);
+        if (CurHP <= 0) Destroy(gameObject);
+    }
+
+ 
+}

Creatures/Health.cs

@@ -4,8 +4,6 @@
 
 public class Humanoid : Creature
 {
-    public GameObject leftHandEquip, rightHandEquip;
-   
     #region Movement.
     /// <summary>
     /// Current acceleration/deceleration to 'dynamix max speed'.
@@ -45,17 +43,6 @@ void Update()
         SetCurSpdAccel(); // Calc and apply cur accel.       
 
         MoveHumanoid();
-
-        if(!InCombat)
-        {
-            leftHandEquip.SetActive(false);
-            rightHandEquip.SetActive(false);
-        }
-        else
-        {
-            leftHandEquip.SetActive(true);
-            rightHandEquip.SetActive(true);
-        }
     }
 
 

Creatures/Humanoid.cs

@@ -8,6 +8,8 @@ public class HumanoidAnim : MonoBehaviour
     private CharacterController cc;
     private Animator anim;
 
+    public AttkType CurValidAttk { get; private set; }
+
     private int combatRollState;
     private int jumpState;
     private int combatMoveState;
@@ -25,13 +27,14 @@ public class HumanoidAnim : MonoBehaviour
     private bool inRollState = false;
     private bool inSlideState = false;
     public bool InAttkState { get; private set; } = false;
-
+    private float defaultColliderHeight;
     // Start is called before the first frame update
     void Start()
     {
         cc = GetComponent<CharacterController>();
         anim = GetComponent<Animator>();
-       
+
+        defaultColliderHeight = cc.height;
 
         combatRollState = Animator.StringToHash("Base Layer.Combat_Roll");
         jumpState = Animator.StringToHash("Base Layer.Jump");
@@ -43,8 +46,7 @@ void Start()
 
     public float AttkRotationPenalty { get; private set; }
 
-    bool dd = false;
-    int attkVariant = 1;
+  
 
     AnimatorStateInfo prevState;
 
@@ -87,7 +89,7 @@ public void UpateAnimator(
         anim.SetFloat("Vertical", vertical, .045f, Time.deltaTime);
         anim.SetInteger("RollDir", rollDir);
         anim.SetBool("InAttkState", InAttkState);
-        cc.height = anim.GetFloat("Collider_Scale");
+        cc.height = anim.GetFloat("Collider_Scale") * defaultColliderHeight;
         if (cc.height == 0) cc.height = 1f;
         cc.center = new Vector3(cc.center.x, cc.height * .6f, cc.center.z);
 
@@ -126,8 +128,12 @@ void AttackAnim(AttkType requestedAttk)
             curAttk = AttkType.none;
 
         anim.SetInteger("attkType", (int)curAttk);
+
+        // Update last type of attack.
+        if (curAttk != AttkType.none)
+            CurValidAttk = curAttk;
     }
-    public enum AttkType { none, swing, overhead, lunge };    
+        
     private AttkType quedAttk = AttkType.none;
     private AttkType curAttk = AttkType.none;
     private bool newAttkQued = false;

Creatures/HumanoidAnim.cs

@@ -16,12 +16,26 @@ void Start()
         humanoid.InCombat = false;
     }
 
-    // Update is called once per frame
+
     void Update()
     {
         Vector3 MoveDir = target.transform.position - transform.position;
         humanoid.Rotate(MoveDir, 1);
         humanoid.SetMoveState(Humanoid.moveEnum.Walk);
-        anim.UpateAnimator(humanoid.Grounded, false, humanoid.InCombat, humanoid.CurSpeed, false, MoveDir.x, MoveDir.z, HumanoidAnim.AttkType.none, false, 0, false);
+        
+        AttkType attk = AttkType.none;
+        if (Vector3.Distance(transform.position, target.transform.position) < 2)
+        {
+            humanoid.InCombat = true;
+            attk = AttkType.crush;
+        }
+        else
+        {
+            humanoid.InCombat = false;
+        }
+            
+
+        anim.UpateAnimator(humanoid.Grounded, false, humanoid.InCombat, humanoid.CurSpeed, false, MoveDir.x, MoveDir.z, attk, false, 0, false);
     }
 }
+

Creatures/HumanoidBasicEnemy.cs

@@ -21,7 +21,7 @@ private void Start()
 
 
 
-    HumanoidAnim.AttkType RequestedAttack = HumanoidAnim.AttkType.none;
+    AttkType RequestedAttack = AttkType.none;
     RollDir rollDir = RollDir.None;
     void Update()
     {
@@ -42,17 +42,17 @@ void Update()
 
 
 
-        RequestedAttack = HumanoidAnim.AttkType.none;
+        RequestedAttack = AttkType.none;
         // Attack when attack button clicked. 
         if (Input.GetAxis("Mouse ScrollWheel") > 0)
-            RequestedAttack = HumanoidAnim.AttkType.lunge;        
+            RequestedAttack = AttkType.pierce;        
 
         // Attack when attack button clicked. 
         else if (Input.GetAxis("Mouse ScrollWheel") < 0)
-            RequestedAttack = HumanoidAnim.AttkType.overhead;
+            RequestedAttack = AttkType.crush;
 
         if (Input.GetButton("Fire1"))
-            RequestedAttack = HumanoidAnim.AttkType.swing;
+            RequestedAttack = AttkType.slash;