From 1de74138ac3c60bef35a9d61defbca49b19dd455 Mon Sep 17 00:00:00 2001 From: "sigonasr2, Sig, Sigo" Date: Mon, 27 Jun 2022 15:03:50 +0000 Subject: [PATCH] Implement new setter strategies for enemy-controlled characters. Co-authored-by: r3cp3ct <45179536+r3cp3ct@users.noreply.github.com> Co-authored-by: sigonasr2 --- src/sig/objects/Erinoah.java | 20 ++++++++++---------- src/sig/objects/enemies/BlueBun.java | 21 ++++++++++----------- src/sig/objects/enemies/GreenBun.java | 21 ++++++++++----------- src/sig/objects/enemies/RedBun.java | 21 ++++++++++----------- src/sig/objects/enemies/YellowBun.java | 21 ++++++++++----------- 5 files changed, 50 insertions(+), 54 deletions(-) diff --git a/src/sig/objects/Erinoah.java b/src/sig/objects/Erinoah.java index 601fa64..14c2ac1 100644 --- a/src/sig/objects/Erinoah.java +++ b/src/sig/objects/Erinoah.java @@ -17,16 +17,16 @@ public class Erinoah extends PhysicsObject{ super(Sprite.ERINOAH,6.5,RabiClone.p); setX(x); setY(y); - setAccelerationLimits(100, 100); - setVelocityLimits(500, 500); - setGroundDrag(2000); - setGroundFriction(PhysicsObject.GROUND_FRICTION); - setAirDrag(800); - setAirFriction(180); - setSlidingVelocity(164); - setSlidingAcceleration(120); - setJumpVelocity(PhysicsObject.JUMP_VELOCITY); - setGravity(450); + setAccelerationLimits_UseDefaultStrategy(); + setVelocityLimits_UseHalfStrategy(500, 500); + setGroundDrag_UseDefaultStrategy(); + setGroundFriction_UseDefaultStrategy(); + setAirDrag_UseCopyStrategy(800); + setAirFriction_UseDefaultStrategy(); + setSlidingVelocity_UseDefaultStrategy(); + setSlidingAcceleration_UseDefaultStrategy(); + setJumpVelocity_UseDefaultStrategy(); + setGravity_UseHalfStrategy(450); } @Override diff --git a/src/sig/objects/enemies/BlueBun.java b/src/sig/objects/enemies/BlueBun.java index d7e61d8..6b99827 100644 --- a/src/sig/objects/enemies/BlueBun.java +++ b/src/sig/objects/enemies/BlueBun.java @@ -3,7 +3,6 @@ package sig.objects.enemies; import sig.RabiClone; import sig.engine.Sprite; import sig.objects.BunnyGirls; -import sig.objects.actor.PhysicsObject; public class BlueBun extends BunnyGirls{ @@ -11,16 +10,16 @@ public class BlueBun extends BunnyGirls{ super(Sprite.BLUE_STAND,Sprite.BLUE_WALK, 6.5, RabiClone.p); setX(x); setY(y); - setAccelerationLimits(100, 100); - setVelocityLimits(500, 500); - setGroundDrag(2000); - setGroundFriction(PhysicsObject.GROUND_FRICTION); - setAirDrag(800); - setAirFriction(180); - setSlidingVelocity(164); - setSlidingAcceleration(120); - setJumpVelocity(PhysicsObject.JUMP_VELOCITY); - setGravity(950); + setAccelerationLimits_UseDefaultStrategy(); + setVelocityLimits_UseDefaultStrategy(); + setGroundDrag_UseDefaultStrategy(); + setGroundFriction_UseDefaultStrategy(); + setAirDrag_UseDefaultStrategy(); + setAirFriction_UseDefaultStrategy(); + setSlidingVelocity_UseDefaultStrategy(); + setSlidingAcceleration_UseDefaultStrategy(); + setJumpVelocity_UseDefaultStrategy(); + setGravity_UseHalfStrategy(950); } diff --git a/src/sig/objects/enemies/GreenBun.java b/src/sig/objects/enemies/GreenBun.java index fe63df3..5256a9d 100644 --- a/src/sig/objects/enemies/GreenBun.java +++ b/src/sig/objects/enemies/GreenBun.java @@ -3,7 +3,6 @@ package sig.objects.enemies; import sig.RabiClone; import sig.engine.Sprite; import sig.objects.BunnyGirls; -import sig.objects.actor.PhysicsObject; public class GreenBun extends BunnyGirls{ @@ -11,16 +10,16 @@ public class GreenBun extends BunnyGirls{ super(Sprite.GREEN_STAND,Sprite.GREEN_WALK, 6.5, RabiClone.p); setX(x); setY(y); - setAccelerationLimits(100, 100); - setVelocityLimits(500, 500); - setGroundDrag(2000); - setGroundFriction(PhysicsObject.GROUND_FRICTION); - setAirDrag(800); - setAirFriction(180); - setSlidingVelocity(164); - setSlidingAcceleration(120); - setJumpVelocity(PhysicsObject.JUMP_VELOCITY); - setGravity(1550); + setAccelerationLimits_UseDefaultStrategy(); + setVelocityLimits_UseDefaultStrategy(); + setGroundDrag_UseDefaultStrategy(); + setGroundFriction_UseDefaultStrategy(); + setAirDrag_UseDefaultStrategy(); + setAirFriction_UseDefaultStrategy(); + setSlidingVelocity_UseDefaultStrategy(); + setSlidingAcceleration_UseDefaultStrategy(); + setJumpVelocity_UseDefaultStrategy(); + setGravity_UseHalfStrategy(1550); } diff --git a/src/sig/objects/enemies/RedBun.java b/src/sig/objects/enemies/RedBun.java index 1626adf..1609aff 100644 --- a/src/sig/objects/enemies/RedBun.java +++ b/src/sig/objects/enemies/RedBun.java @@ -3,7 +3,6 @@ package sig.objects.enemies; import sig.RabiClone; import sig.engine.Sprite; import sig.objects.BunnyGirls; -import sig.objects.actor.PhysicsObject; public class RedBun extends BunnyGirls{ @@ -11,16 +10,16 @@ public class RedBun extends BunnyGirls{ super(Sprite.RED_STAND,Sprite.RED_WALK, 6.5, RabiClone.p); setX(x); setY(y); - setAccelerationLimits(100, 100); - setVelocityLimits(500, 500); - setGroundDrag(2000); - setGroundFriction(PhysicsObject.GROUND_FRICTION); - setAirDrag(800); - setAirFriction(180); - setSlidingVelocity(164); - setSlidingAcceleration(120); - setJumpVelocity(PhysicsObject.JUMP_VELOCITY); - setGravity(750); + setAccelerationLimits_UseDefaultStrategy(); + setVelocityLimits_UseDefaultStrategy(); + setGroundDrag_UseDefaultStrategy(); + setGroundFriction_UseDefaultStrategy(); + setAirDrag_UseDefaultStrategy(); + setAirFriction_UseDefaultStrategy(); + setSlidingVelocity_UseDefaultStrategy(); + setSlidingAcceleration_UseDefaultStrategy(); + setJumpVelocity_UseDefaultStrategy(); + setGravity_UseHalfStrategy(750); } } diff --git a/src/sig/objects/enemies/YellowBun.java b/src/sig/objects/enemies/YellowBun.java index 3823bd1..d056d78 100644 --- a/src/sig/objects/enemies/YellowBun.java +++ b/src/sig/objects/enemies/YellowBun.java @@ -3,7 +3,6 @@ package sig.objects.enemies; import sig.RabiClone; import sig.engine.Sprite; import sig.objects.BunnyGirls; -import sig.objects.actor.PhysicsObject; public class YellowBun extends BunnyGirls{ @@ -11,16 +10,16 @@ public class YellowBun extends BunnyGirls{ super(Sprite.YELLOW_STAND,Sprite.YELLOW_WALK, 6.5, RabiClone.p); setX(x); setY(y); - setAccelerationLimits(100, 100); - setVelocityLimits(500, 500); - setGroundDrag(2000); - setGroundFriction(PhysicsObject.GROUND_FRICTION); - setAirDrag(800); - setAirFriction(180); - setSlidingVelocity(164); - setSlidingAcceleration(120); - setJumpVelocity(PhysicsObject.JUMP_VELOCITY); - setGravity(150); + setAccelerationLimits_UseDefaultStrategy(); + setVelocityLimits_UseDefaultStrategy(); + setGroundDrag_UseDefaultStrategy(); + setGroundFriction_UseDefaultStrategy(); + setAirDrag_UseDefaultStrategy(); + setAirFriction_UseDefaultStrategy(); + setSlidingVelocity_UseDefaultStrategy(); + setSlidingAcceleration_UseDefaultStrategy(); + setJumpVelocity_UseDefaultStrategy(); + setGravity_UseHalfStrategy(150); }