Commit 4bbd1989 authored by Eby Komenan's avatar Eby Komenan

modified: Assets/Art/Kiwi/Kiwi.controller

	modified:   Assets/Scripts/Birb/Jump.cs
	modified:   Assets/Scripts/Util/Hazard.cs
	modified:   Assets/Scripts/Util/HazardSlow.cs
parent ffdd7759
......@@ -11,6 +11,7 @@ public class Jump : AbstractBehavior {
public float wallJumpHorizontalSpeed = 5;
bool jumpRequested;
bool jumpBlocked;
int airJumpsMade = 0;
Walk walk;
......@@ -46,6 +47,7 @@ public class Jump : AbstractBehavior {
public void Activate() {
if (collisionState.onGround) {
// ground jump
airJumpsMade = 0;
Vector2 vel = body.velocity;
vel.y = GetJumpVelocity(jumpHeight);
......
......@@ -8,11 +8,10 @@ public class Hazard : MonoBehaviour {
{
if (other.CompareTag("Player"))
{
<<<<<<< HEAD
other.GetComponent<Birb>().Die ();
=======
other.gameObject.SendMessage("Die", SendMessageOptions.DontRequireReceiver);
>>>>>>> 39c5a01ae3b7aa60f1687d601bceca7f4a87e3dc
}
}
}
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
using UnityEngine;
public class HazardSlow : AbstractBehavior {
//Remember to give prefabs that have this script a "slowHazard" tag.
float slowfactor;
public float slowedSpeed;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment