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

Implemented mod shortcut keys in options menu.

Browse Source 
See for details: http://osu.ppy.sh/wiki/Shortcut_Key_Reference#Mods_screen

Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
This commit is contained in:
Jeffrey Han 2015-01-16 02:26:13 -05:00
parent 38b3621c29
commit bcf1fa301a
2 changed files with 38 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/itdelatrisu/opsu/GameMod.java
View File

@ -22,22 +22,23 @@ import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
import org.newdawn.slick.Image; import org.newdawn.slick.Image;
import org.newdawn.slick.Input;
import org.newdawn.slick.SlickException; import org.newdawn.slick.SlickException;
/** /**
* Game mods. * Game mods.
*/ */
public enum GameMod { public enum GameMod {
EASY (0, "selection-mod-easy.png", 0.5f), EASY (0, "selection-mod-easy.png", Input.KEY_Q, 0.5f),
NO_FAIL (1, "selection-mod-nofail.png", 0.5f), NO_FAIL (1, "selection-mod-nofail.png", Input.KEY_W, 0.5f),
HARD_ROCK (2, "selection-mod-hardrock.png", 1.06f), HARD_ROCK (2, "selection-mod-hardrock.png", Input.KEY_A, 1.06f),
SUDDEN_DEATH (3, "selection-mod-suddendeath.png"), SUDDEN_DEATH (3, "selection-mod-suddendeath.png", Input.KEY_S),
SPUN_OUT (4, "selection-mod-spunout.png", 0.9f), SPUN_OUT (4, "selection-mod-spunout.png", Input.KEY_V, 0.9f),
AUTO (5, "selection-mod-autoplay.png"); AUTO (5, "selection-mod-autoplay.png", Input.KEY_B);
// HALF_TIME (, "selection-mod-halftime.png", 0.3f), // HALF_TIME (, "selection-mod-halftime.png", Input.KEY_E, 0.3f),
// DOUBLE_TIME (, "selection-mod-doubletime.png", 1.12f), // DOUBLE_TIME (, "selection-mod-doubletime.png", Input.KEY_D, 1.12f),
// HIDDEN (, "selection-mod-hidden.png", 1.06f), // HIDDEN (, "selection-mod-hidden.png", Input.KEY_F, 1.06f),
// FLASHLIGHT (, "selection-mod-flashlight.png", 1.12f); // FLASHLIGHT (, "selection-mod-flashlight.png", Input.KEY_G, 1.12f);
/** /**
* The ID of the mod (used for positioning). * The ID of the mod (used for positioning).
@ -49,6 +50,11 @@ public enum GameMod {
*/ */
private String filename; private String filename;
/**
* The shortcut key associated with the mod.
*/
private int key;
/** /**
* Score multiplier. * Score multiplier.
*/ */
@ -89,10 +95,12 @@ public enum GameMod {
* Constructor. * Constructor.
* @param id the ID of the mod (for positioning). * @param id the ID of the mod (for positioning).
* @param filename the image file name * @param filename the image file name
* @param key the shortcut key
*/ */
GameMod(int id, String filename) { GameMod(int id, String filename, int key) {
this.id = id; this.id = id;
this.filename = filename; this.filename = filename;
this.key = key;
this.multiplier = 1f; this.multiplier = 1f;
} }
@ -100,11 +108,13 @@ public enum GameMod {
* Constructor. * Constructor.
* @param id the ID of the mod (for positioning). * @param id the ID of the mod (for positioning).
* @param filename the image file name * @param filename the image file name
* @param key the shortcut key
* @param multiplier the score multiplier * @param multiplier the score multiplier
*/ */
GameMod(int id, String filename, float multiplier) { GameMod(int id, String filename, int key, float multiplier) {
this.id = id; this.id = id;
this.filename = filename; this.filename = filename;
this.key = key;
this.multiplier = multiplier; this.multiplier = multiplier;
} }
@ -134,6 +144,13 @@ public enum GameMod {
} }
} }
/**
* Returns the shortcut key for the mod.
* @return the key
* @see org.newdawn.slick.Input
*/
public int getKey() { return key; }
/** /**
* Returns the score multiplier for the mod. * Returns the score multiplier for the mod.
* @return the multiplier * @return the multiplier

9
src/itdelatrisu/opsu/states/Options.java
View File

@ -947,6 +947,15 @@ public class Options extends BasicGameState {
currentTab = (currentTab + i) % TAB_MAX; currentTab = (currentTab + i) % TAB_MAX;
SoundController.playSound(SoundEffect.MENUCLICK); SoundController.playSound(SoundEffect.MENUCLICK);
break; break;
default:
// check mod shortcut keys
for (GameMod mod : GameMod.values()) {
if (key == mod.getKey()) {
mod.toggle(true);
break;
}
}
break;
} }
} }