Sunpy/opsu-dance
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added a few missing keyboard shortcuts.

Browse Source 
- Main Menu: "P" (play), "Q" (quit)
- Game: Ctrl + "R" (restart)

Other changes:
- Song Menu search textfield no longer retains focus in different states.
This commit is contained in:
Jeffrey Han 2014-07-05 14:29:48 -04:00
parent 83f13a8879
commit 0dbfd18c5f
3 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/itdelatrisu/opsu/states/Game.java
View File

@ -559,6 +559,17 @@ public class Game extends BasicGameState {
// skip // skip
skipIntro(); skipIntro();
break; break;
case Input.KEY_R:
if (input.isKeyDown(Input.KEY_RCONTROL) || input.isKeyDown(Input.KEY_LCONTROL)) {
try {
restart = RESTART_MANUAL;
enter(container, game);
skipIntro();
} catch (SlickException e) {
Log.error("Failed to restart game.", e);
}
}
break;
case Input.KEY_Z: case Input.KEY_Z:
// left-click // left-click
if (!Keyboard.isRepeatEvent()) if (!Keyboard.isRepeatEvent())

15
src/itdelatrisu/opsu/states/MainMenu.java
View File

@ -341,6 +341,21 @@ public class MainMenu extends BasicGameState {
else else
game.enterState(Opsu.STATE_MAINMENUEXIT); game.enterState(Opsu.STATE_MAINMENUEXIT);
break; break;
case Input.KEY_Q:
game.enterState(Opsu.STATE_MAINMENUEXIT);
break;
case Input.KEY_P:
if (!logoClicked) {
logoClicked = true;
logoTimer = 0;
playButton.getImage().setAlpha(0f);
exitButton.getImage().setAlpha(0f);
SoundController.playSound(SoundController.SOUND_MENUHIT);
} else {
SoundController.playSound(SoundController.SOUND_MENUHIT);
game.enterState(Opsu.STATE_SONGMENU, new FadeOutTransition(Color.black), new FadeInTransition(Color.black));
}
break;
case Input.KEY_F12: case Input.KEY_F12:
Utils.takeScreenShot(); Utils.takeScreenShot();
break; break;

8
src/itdelatrisu/opsu/states/SongMenu.java
View File

@ -281,7 +281,6 @@ public class SongMenu extends BasicGameState {
public void update(GameContainer container, StateBasedGame game, int delta) public void update(GameContainer container, StateBasedGame game, int delta)
throws SlickException { throws SlickException {
// search // search
search.setFocus(true);
searchTimer += delta; searchTimer += delta;
if (searchTimer >= SEARCH_DELAY) { if (searchTimer >= SEARCH_DELAY) {
searchTimer = 0; searchTimer = 0;
@ -524,6 +523,13 @@ public class SongMenu extends BasicGameState {
public void enter(GameContainer container, StateBasedGame game) public void enter(GameContainer container, StateBasedGame game)
throws SlickException { throws SlickException {
Display.setTitle(game.getTitle()); Display.setTitle(game.getTitle());
search.setFocus(true);
}
@Override
public void leave(GameContainer container, StateBasedGame game)
throws SlickException {
search.setFocus(false);
} }
/** /**