From df637104a26a9b04eb82f688560bcf541a41c6f1 Mon Sep 17 00:00:00 2001 From: unknown <45179536+r3cp3ct@users.noreply.github.com> Date: Sat, 18 Jun 2022 11:24:43 +0300 Subject: [PATCH] Bonk the buns now Co-authored-by: r3cp3ct <45179536+r3cp3ct@users.noreply.github.com> Co-authored-by: sigonasr2 --- src/sig/engine/Action.java | 2 +- src/sig/objects/ConfigureControls.java | 1 + src/sig/objects/Player.java | 1 - src/sig/objects/actor/PhysicsObject.java | 3 +-- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/sig/engine/Action.java b/src/sig/engine/Action.java index 757e084..a52dc7f 100644 --- a/src/sig/engine/Action.java +++ b/src/sig/engine/Action.java @@ -9,7 +9,7 @@ import net.java.games.input.Component.Identifier; public enum Action { MOVE_RIGHT(new KeyBind(KeyEvent.VK_RIGHT),new KeyBind(KeyEvent.VK_D)), MOVE_LEFT(new KeyBind(KeyEvent.VK_LEFT),new KeyBind(KeyEvent.VK_A)), - JUMP(new KeyBind(KeyEvent.VK_SPACE),new KeyBind(KeyEvent.VK_W)), + JUMP(new KeyBind(KeyEvent.VK_SPACE),new KeyBind(KeyEvent.VK_W),new KeyBind(KeyEvent.VK_UP)), FALL(new KeyBind(KeyEvent.VK_DOWN),new KeyBind(KeyEvent.VK_S)), ATTACK(new KeyBind(KeyEvent.VK_Z)), SLIDE(new KeyBind(KeyEvent.VK_CONTROL)), diff --git a/src/sig/objects/ConfigureControls.java b/src/sig/objects/ConfigureControls.java index 43b2a2b..c45d999 100644 --- a/src/sig/objects/ConfigureControls.java +++ b/src/sig/objects/ConfigureControls.java @@ -154,6 +154,7 @@ public class ConfigureControls extends Object{ case PLAY_GAME:{ RabiClone.OBJ.clear(); RabiClone.ResetGame(); + Map.LoadMap(RabiClone.CURRENT_MAP); RabiClone.OBJ.add(RabiClone.level_renderer = new LevelRenderer(RabiClone.p)); RabiClone.StartGame(); }break; diff --git a/src/sig/objects/Player.java b/src/sig/objects/Player.java index 62f3278..a11a94c 100644 --- a/src/sig/objects/Player.java +++ b/src/sig/objects/Player.java @@ -6,7 +6,6 @@ import sig.engine.Panel; import sig.engine.Rectangle; import sig.engine.Sprite; import sig.engine.Transform; -import sig.engine.objects.AnimatedObject; import sig.map.Map; import sig.map.Tile; import sig.map.View; diff --git a/src/sig/objects/actor/PhysicsObject.java b/src/sig/objects/actor/PhysicsObject.java index 4f50cc3..140d7bc 100644 --- a/src/sig/objects/actor/PhysicsObject.java +++ b/src/sig/objects/actor/PhysicsObject.java @@ -1,7 +1,6 @@ package sig.objects.actor; import sig.RabiClone; -import sig.engine.Action; import sig.engine.AnimatedSprite; import sig.engine.Panel; import sig.engine.Rectangle; @@ -115,7 +114,7 @@ public abstract class PhysicsObject extends AnimatedObject implements PhysicsObj displacement_y=0; //groundCollision = true; break; - } + } } } }