Enemies make warning sound when close to goal

hackerspace-ntnu · Feb 22, 2018 · a09717e · a09717e
1 parent d843e03
commit a09717e
Show file tree

Hide file tree

Showing 6 changed files with 197 additions and 168 deletions.
diff --git a/Assets/MagicBook/Scripts/Spells/Fireball/Fireball.cs b/Assets/MagicBook/Scripts/Spells/Fireball/Fireball.cs
@@ -47,7 +47,7 @@ protected override void FixedUpdate_Derived()
 			transform.Translate(direction * (speed * Time.deltaTime), Space.World);
 
 			if (!passedHead
-				&& (transform.position - Player.instance.headCollider.transform.position).magnitude >= towerDiameter)
+				&& Vector3.Distance(transform.position, Player.instance.headCollider.transform.position) >= towerDiameter)
 			{
 				GetComponent<SphereCollider>().radius = originalSphereColliderRadius;
 				passedHead = true;

diff --git a/Assets/Prefabs/Decorations/Butterfly_randomFlapping.cs b/Assets/Prefabs/Decorations/Butterfly_randomFlapping.cs
@@ -12,6 +12,6 @@ public override void OnStateEnter(Animator animator, AnimatorStateInfo stateInfo
 		float speedMultiplier_percentage = Random.value * (speedVariabilityPercentage * 2) - speedVariabilityPercentage;
 		// Translates to between 0.95 and 1.05
 		float speedMultiplier = 1f + speedMultiplier_percentage / 100f;
-		animator.SetFloat("SpeedMultiplier", speedMultiplier);
+		animator.SetFloat(speedMultiplierHash, speedMultiplier);
 	}
 }