Added properties to the player to control head bob

Interrupt · Dec 19, 2018 · 5beea46 · 5beea46
1 parent 62cb6f8
commit 5beea46
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/Dungeoneer/src/com/interrupt/dungeoneer/entities/Player.java b/Dungeoneer/src/com/interrupt/dungeoneer/entities/Player.java
@@ -59,6 +59,8 @@ public class Player extends Actor {
 
 	public float jumpHeight = 0.05f;
 	public float eyeHeight = 0.12f;
+	public float headBobSpeed = 0.319f;
+	public float headBobHeight = 0.3f;
 
 	public boolean hasAttacked;
 
@@ -524,7 +526,7 @@ else if (za < 0) {
 		}
 
 		// headbob
-		headbob = (float)Math.sin(tickcount * 0.319f) * Math.min((Math.abs(xa) + Math.abs(ya)), 0.15f) * 0.3f; //TODO: Add an option to disable bob
+		headbob = (float)Math.sin(tickcount * headBobSpeed) * Math.min((Math.abs(xa) + Math.abs(ya)), (headBobHeight * 0.5f)) * headBobHeight;
         if(floating) headbob = 0;
 
 		// water movement
@@ -565,7 +567,7 @@ else if (za < 0) {
 			// let the player climb up out of the water
 			stepHeight = 0.3499f + (waterTile.floorHeight + 0.5f - z);
 
-			headbob = (float)Math.sin(tickcount / 24.0f) * 0.02f;
+			headbob = (float)Math.sin(tickcount / 24.0f) * (headBobHeight * 0.067f);
 			inwater = true;
 		}
 		else {