diff --git a/backgrounds/water-overlay.gif b/backgrounds/water-overlay.gif index 0b6b980..321094a 100644 Binary files a/backgrounds/water-overlay.gif and b/backgrounds/water-overlay.gif differ diff --git a/src/sig/objects/LevelRenderer.java b/src/sig/objects/LevelRenderer.java index dcb08fc..3777e16 100644 --- a/src/sig/objects/LevelRenderer.java +++ b/src/sig/objects/LevelRenderer.java @@ -174,9 +174,10 @@ public class LevelRenderer extends Object{ for (int x=0;x0&&a==Action.JUMP&&state!=State.ATTACK2&&state!=State.ATTACK3) { + if (jumpCount>0&&a==Action.JUMP&&state!=State.ATTACK2&&state!=State.ATTACK3) { state = State.JUMP; jumpCount--; y_velocity = jump_velocity; spacebarPressed = RabiClone.TIME; - spacebarReleased=false; - System.out.println("Jump"); + //System.out.println("Jump"); } } if (state != State.SLIDE&&state!=State.BELLYSLIDE) { diff --git a/src/sig/objects/actor/PhysicsObject.java b/src/sig/objects/actor/PhysicsObject.java index 508e348..67db56b 100644 --- a/src/sig/objects/actor/PhysicsObject.java +++ b/src/sig/objects/actor/PhysicsObject.java @@ -50,8 +50,8 @@ public abstract class PhysicsObject extends AnimatedObject implements PhysicsObj protected double gravity = GRAVITY; protected double x_acceleration,y_acceleration; protected boolean groundCollision; - protected byte jumpCount=0; protected byte maxJumpCount=2; + protected byte jumpCount=maxJumpCount; protected double x_velocity_limit,y_velocity_limit; protected double x_acceleration_limit,y_acceleration_limit; protected double jump_velocity; diff --git a/src/sig/objects/enemies/BlueBun.java b/src/sig/objects/enemies/BlueBun.java index 6b99827..e89bd25 100644 --- a/src/sig/objects/enemies/BlueBun.java +++ b/src/sig/objects/enemies/BlueBun.java @@ -19,6 +19,7 @@ public class BlueBun extends BunnyGirls{ setSlidingVelocity_UseDefaultStrategy(); setSlidingAcceleration_UseDefaultStrategy(); setJumpVelocity_UseDefaultStrategy(); + setMaxJumpCount_UseDefaultStrategy(); setGravity_UseHalfStrategy(950); } diff --git a/src/sig/objects/enemies/GreenBun.java b/src/sig/objects/enemies/GreenBun.java index 5256a9d..46d6959 100644 --- a/src/sig/objects/enemies/GreenBun.java +++ b/src/sig/objects/enemies/GreenBun.java @@ -19,6 +19,7 @@ public class GreenBun extends BunnyGirls{ setSlidingVelocity_UseDefaultStrategy(); setSlidingAcceleration_UseDefaultStrategy(); setJumpVelocity_UseDefaultStrategy(); + setMaxJumpCount_UseDefaultStrategy(); setGravity_UseHalfStrategy(1550); } diff --git a/src/sig/objects/enemies/RedBun.java b/src/sig/objects/enemies/RedBun.java index 1609aff..137a98d 100644 --- a/src/sig/objects/enemies/RedBun.java +++ b/src/sig/objects/enemies/RedBun.java @@ -19,6 +19,7 @@ public class RedBun extends BunnyGirls{ setSlidingVelocity_UseDefaultStrategy(); setSlidingAcceleration_UseDefaultStrategy(); setJumpVelocity_UseDefaultStrategy(); + setMaxJumpCount_UseDefaultStrategy(); setGravity_UseHalfStrategy(750); } diff --git a/src/sig/objects/enemies/YellowBun.java b/src/sig/objects/enemies/YellowBun.java index d056d78..7528720 100644 --- a/src/sig/objects/enemies/YellowBun.java +++ b/src/sig/objects/enemies/YellowBun.java @@ -19,6 +19,7 @@ public class YellowBun extends BunnyGirls{ setSlidingVelocity_UseDefaultStrategy(); setSlidingAcceleration_UseDefaultStrategy(); setJumpVelocity_UseDefaultStrategy(); + setMaxJumpCount_UseDefaultStrategy(); setGravity_UseHalfStrategy(150); }