Skip to content

Commit

Permalink
Level 3 fixed
Browse files Browse the repository at this point in the history
  • Loading branch information
mp3skater committed May 19, 2024
1 parent 33c307b commit 9712cee
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 8 deletions.
8 changes: 3 additions & 5 deletions src/net/mp3skater/main/obj/Obj_player.java
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public void movement() {
if(KeyHandler.dPressed) this.addVec(0.5, 0);
// Jump
if(KeyHandler.spacePressed && onGround) {
KeyHandler.spacePressed = false;
if(GamePanel.level == 3) KeyHandler.spacePressed = false;
if(GamePanel.level == 3) reverseGravity = !reverseGravity;
else this.addVec(0, -15);
Sound_Utils.playSE(4);
Expand Down Expand Up @@ -104,8 +104,7 @@ protected void collisionBool() {
// Vertically
if(vec[1] != 0)
if(collides(w.getX(), w.getY()-Misc_Utils.absRound(vec[1]), (int)w.getSX(), (int)w.getSY())) {
if(vec[1]>0)
onGround = true;
if(GamePanel.level==3? reverseGravity? vec[1]<0 : vec[1]>0 : vec[1]>0) onGround = true;
nearY = nearY==null? w : getNearestY(nearY, w, vec[1] > 0);
}
// Both
Expand All @@ -132,8 +131,7 @@ protected void collisionBool() {
// Vertically
if(vec[1] != 0)
if(collides(p.getX(), p.getY()-Misc_Utils.absRound(vec[1]), (int)p.getSX(), (int)p.getSY())) {
if(vec[1]>0)
onGround = true;
if(GamePanel.level==3? reverseGravity? vec[1]<0 : vec[1]>0 : vec[1]>0) onGround = true;
nearY = nearY==null? p : getNearestY(nearY, p, vec[1] > 0);
}
// Both
Expand Down
6 changes: 3 additions & 3 deletions src/net/mp3skater/main/utils/Menu_Utils.java
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ public static void update() {
// Confirm choice
if (enterPressed) {
enterPressed = false;
playSE(9);
if (comandNum == 0) titleState = false; // Start game
if (titleNum == 1) comandNum = 0; // In future: open highscore file
if (titleNum == 2) System.exit(0); // Close Game
playSE(9);
if (titleNum == 0) titleState = false; // Start game
//else if (titleNum == 1) // In future: open highscore file
}
}

Expand Down

0 comments on commit 9712cee

Please sign in to comment.