MiauRizius/JGame2D
1
0
Fork 0
Code Issues 7 Pull Requests Actions Packages Projects Releases Wiki Activity

make the other buttons in the options menu work

Browse Source
This commit is contained in:
Maurice
2025-12-11 19:05:35 +01:00
parent eba67d7cf8
commit 21f4acf6b1
2 changed files with 36 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/de/miaurizius/jgame2d/core/UI.java
View File

@@ -235,6 +235,7 @@ public class UI {
switch(optionState) { switch(optionState) {
case OVERVIEW -> optionsTop(frameX, frameY); case OVERVIEW -> optionsTop(frameX, frameY);
case SCREENNF -> optionsFSNotify(frameX, frameY); case SCREENNF -> optionsFSNotify(frameX, frameY);
case CONTROLS -> optionsControls(frameX, frameY);
} }
panel.keyH.spacePressed = false; panel.keyH.spacePressed = false;
} }
@@ -358,17 +359,29 @@ public class UI {
// CONTROL // CONTROL
textY += panel.tileSize; textY += panel.tileSize;
graphics2d.drawString("Controls", textX, textY); graphics2d.drawString("Controls", textX, textY);
if(commandNum == 3) graphics2d.drawString(">", textX-25, textY); if(commandNum == 3) {
graphics2d.drawString(">", textX-25, textY);
if(panel.keyH.spacePressed) {
optionState = OptionState.CONTROLS;
commandNum = 0;
}
}
// END GAME // END GAME
textY += panel.tileSize; textY += panel.tileSize;
graphics2d.drawString("Quit Game", textX, textY); graphics2d.drawString("Quit Game", textX, textY);
if(commandNum == 4) graphics2d.drawString(">", textX-25, textY); if(commandNum == 4) {
graphics2d.drawString(">", textX-25, textY);
if(panel.keyH.spacePressed) System.exit(0);
}
// BACK // BACK
textY += panel.tileSize*2; textY += panel.tileSize*2;
graphics2d.drawString("Back to Game", textX, textY); graphics2d.drawString("Back to Game", textX, textY);
if(commandNum == 5) graphics2d.drawString(">", textX-25, textY); if(commandNum == 5) {
graphics2d.drawString(">", textX-25, textY);
if(panel.keyH.spacePressed) panel.gameState = GameState.PLAY;
}
// FULL SCREEN CHECKBOX // FULL SCREEN CHECKBOX
textX = frameX + (int)(panel.tileSize*4.5); textX = frameX + (int)(panel.tileSize*4.5);
@@ -408,12 +421,28 @@ public class UI {
} }
} }
public void optionsControls(int frameX, int frameY) {
int textX;
int textY;
// TITLE
String text = "Controls";
textX = getCenteredX(text);
textY = frameY + panel.tileSize;
graphics2d.drawString(text, textX, textY);
textX = frameX + panel.tileSize;
textY +=panel.tileSize;
String[] options = {"Move", "Confirm/Attack", "Shoot/Cast", "Inventory", "Pause/Settings"};
for(String option : options) {
graphics2d.drawString(option, textX, textY);
textY += panel.tileSize;
}
}
public enum OptionState { public enum OptionState {
OVERVIEW, OVERVIEW,
SCREENNF, SCREENNF,
MUSIC,
SFX,
CONTROLS, CONTROLS,
} }

3
src/de/miaurizius/jgame2d/core/handlers/KeyHandler.java
View File

@@ -111,7 +111,8 @@ public class KeyHandler implements KeyListener {
} }
// EXIT STATE // EXIT STATE
if(code == KeyEvent.VK_ESCAPE) panel.gameState = GameState.PLAY; if(code == KeyEvent.VK_ESCAPE)
if(panel.ui.optionState == UI.OptionState.OVERVIEW) panel.gameState = GameState.PLAY; else panel.ui.optionState = UI.OptionState.OVERVIEW;
} }
public void handleDialogue(int code) { public void handleDialogue(int code) {
// EXIT STATE // EXIT STATE