Skip to content

Commit c26c917

Browse files
committed
Move to root motion
1 parent 16640b8 commit c26c917

File tree

11 files changed

+425
-300
lines changed

11 files changed

+425
-300
lines changed

CameraOrbit.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ public class CameraOrbit : MonoBehaviour
66
{
77
private const float Y_ANGLE_MIN = 10.0F;
88
private const float Y_ANGLE_MAX = 50.0f;
9-
private const float CAM_DISTANCE_MIN = 2f;
10-
private const float CAM_DISTANCE_MAX = 5f;
9+
// private const float CAM_DISTANCE_MIN = 2f;
10+
// private const float CAM_DISTANCE_MAX = 5f;
1111

1212
public Transform player;
1313
public Transform _camera;
1414

15-
private float distance = 10.0f;
15+
[SerializeField] private float distance = 3.0f;
1616
private float currentX = 0f;
1717
private float currentY = 0f;
1818
private float sensitivityX = 4f;
@@ -36,10 +36,10 @@ private void Update()
3636
{
3737
currentX += Input.GetAxis("Mouse X") * sensitivityX;
3838
currentY -= Input.GetAxis("Mouse Y") * sensitivityY;
39-
distance -= Input.GetAxis("Mouse ScrollWheel") * 5;
39+
// distance -= Input.GetAxis("Mouse ScrollWheel") * 5;
4040

4141
currentY = Mathf.Clamp(currentY, Y_ANGLE_MIN, Y_ANGLE_MAX);
42-
distance = Mathf.Clamp(distance, CAM_DISTANCE_MIN, CAM_DISTANCE_MAX);
42+
// distance = Mathf.Clamp(distance, CAM_DISTANCE_MIN, CAM_DISTANCE_MAX);
4343
}
4444

4545

Creatures/Creature.cs

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,9 @@ protected void Awake()
2626

2727

2828

29-
protected void Update()
29+
protected void LateUpdate()
3030
{
31+
//Debug.Log(gndCheck.AmGrounded);
3132
Grounded = gndCheck.Grounded;
3233
ApplyGravity();
3334
}
@@ -47,17 +48,24 @@ protected float JmpMoveSpd
4748
return (DynamicMaxSpd * 4 + HorizontalVel) * 8f;
4849
}
4950
}
50-
[SerializeField] protected float defaultMoveSpd = 2.5f, runMoveSpd = 4f;
5151

52+
public float SneakMoveSpd { get { return sneakSpeed; } protected set { sneakSpeed = value; } }
53+
[SerializeField] private float sneakSpeed = 2f;
5254

55+
public float WalkMoveSpd { get { return walkSpeed; } protected set { walkSpeed = value; } }
56+
[SerializeField] private float walkSpeed = 4f;
5357

58+
public float RunMoveSpd { get { return runSpeed; } protected set { runSpeed = value; } }
59+
[SerializeField] private float runSpeed = 12f;
60+
61+
5462

5563

5664
#region Health, Magica, Stamina
5765
/// <summary>
5866
/// Base health points. Calculated using minimum HP and stat points.
5967
/// </summary>
60-
private int _baseMaxHp = 0;
68+
private int _baseMaxHp = 10;
6169
/// <summary>
6270
/// Maximum health. Calculated using base HP and 'effect modifiers' (e.g. armor).
6371
/// </summary>
@@ -114,9 +122,8 @@ protected float DynamicMaxSpd
114122
{
115123
float maxSpdBaseNMod = modifyableProperties.MaxSpdEffectMod + BaseMoveStateMaxSpd;
116124

117-
if (BaseMoveStateMaxSpd == 0) return 0; // No dynamic movement if not moving legs.
118-
if (Blocking && BaseMoveStateMaxSpd != runMoveSpd) return Mathf.Clamp(maxSpdBaseNMod * .75f + terrainMaxSpdMod / 2, 0, 99);
119-
return Mathf.Clamp(maxSpdBaseNMod + terrainMaxSpdMod, 0, 99);
125+
if (BaseMoveStateMaxSpd == 0) return 0; // No dynamic movement if not moving legs.
126+
return Mathf.Clamp(maxSpdBaseNMod + terrainMaxSpdMod, 0, 99) * .75f;
120127
}
121128
}
122129
#endregion
@@ -138,7 +145,7 @@ protected float DynamicMaxSpd
138145
public int RotationSpeed
139146
{
140147
get
141-
{
148+
{
142149
return Mathf.Clamp(BaseRotSpd + modifyableProperties.RotSpdEffectsMod, 0, 99);
143150
}
144151
}
@@ -152,11 +159,7 @@ public int RotationSpeed
152159
/// <summary>
153160
/// If the humanoid is in a combat stance (i.e. weapon drawn).
154161
/// </summary>
155-
public bool InCombat { get; set; } = false;
156-
/// <summary>
157-
/// If the humanoid is currently blocking.
158-
/// </summary>
159-
public bool Blocking { get; set; } = false;
162+
public bool InCombat { get; set; } = false;
160163
/// <summary>
161164
/// Attacks can have combos in the animator. When Attack(), it increases to continue the combo.
162165
/// </summary>

Creatures/CreatureCurHpSpMpManager.cs

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,19 @@
22
using System.Collections.Generic;
33
using UnityEngine;
44

5-
public class CreatureHpSpMpManager : MonoBehaviour
5+
public class CreatureCurHpSpMpManager : MonoBehaviour
66
{
77
Creature creature;
88
private int stamina, health, magica;
9+
910
// Start is called before the first frame update
1011
void Start()
1112
{
12-
creature.GetComponent<Creature>();
13+
creature = GetComponent<Creature>();
1314
stamina = creature.MaxStamina;
1415
health = creature.MaxHealth;
1516
magica = creature.MaxMagica;
17+
Debug.Log(health);
1618
}
1719

1820

@@ -21,6 +23,18 @@ public void UseStamina(int amount)
2123

2224
}
2325

26+
public void TakeDamage(int amount)
27+
{
28+
health -= amount;
29+
if (health <= 0)
30+
Destroy(this);
31+
}
32+
33+
public void HealDamage(int amount)
34+
{
35+
36+
}
37+
2438

2539

2640
// Update is called once per frame

0 commit comments

Comments
 (0)