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

Minor "auto" mod fixes in the song menu.

Browse Source 
- Enable "auto" with ctrl+click (instead of just ctrl+enter).
- Always turn off "auto" after one game.

Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
This commit is contained in:
Jeffrey Han 2016-12-19 18:33:06 -05:00
parent 1b99795abd
commit 4af2d7bfcf
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/itdelatrisu/opsu/Opsu.java
View File

@ -243,9 +243,12 @@ public class Opsu extends StateBasedGame {
} else } else
songMenu.resetTrackOnLoad(); songMenu.resetTrackOnLoad();
} }
// reset game data
if (UI.getCursor().isBeatmapSkinned()) if (UI.getCursor().isBeatmapSkinned())
UI.getCursor().reset(); UI.getCursor().reset();
songMenu.resetGameDataOnLoad(); songMenu.resetGameDataOnLoad();
this.enterState(Opsu.STATE_SONGMENU, new EasedFadeOutTransition(), new FadeInTransition()); this.enterState(Opsu.STATE_SONGMENU, new EasedFadeOutTransition(), new FadeInTransition());
return false; return false;
} }

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

@ -1012,11 +1012,6 @@ public class SongMenu extends BasicGameState {
case Input.KEY_ENTER: case Input.KEY_ENTER:
if (focusNode == null) if (focusNode == null)
break; break;
if (input.isKeyDown(Input.KEY_RCONTROL) || input.isKeyDown(Input.KEY_LCONTROL)) {
// turn on "auto" mod
if (!GameMod.AUTO.isActive())
GameMod.AUTO.toggle(true);
}
startGame(); startGame();
break; break;
case Input.KEY_DOWN: case Input.KEY_DOWN:
@ -1203,6 +1198,10 @@ public class SongMenu extends BasicGameState {
focusScores = getScoreDataForNode(focusNode, true); focusScores = getScoreDataForNode(focusNode, true);
} }
// turn off "auto" mod
if (GameMod.AUTO.isActive())
GameMod.AUTO.toggle(false);
resetGame = false; resetGame = false;
} }
@ -1629,12 +1628,19 @@ public class SongMenu extends BasicGameState {
if (MusicController.isTrackLoading()) if (MusicController.isTrackLoading())
return; return;
SoundController.playSound(SoundEffect.MENUHIT);
Beatmap beatmap = MusicController.getBeatmap(); Beatmap beatmap = MusicController.getBeatmap();
if (focusNode == null || beatmap != focusNode.getSelectedBeatmap()) { if (focusNode == null || beatmap != focusNode.getSelectedBeatmap()) {
UI.sendBarNotification("Unable to load the beatmap audio."); UI.sendBarNotification("Unable to load the beatmap audio.");
return; return;
} }
// turn on "auto" mod if holding "ctrl" key
if (input.isKeyDown(Input.KEY_RCONTROL) || input.isKeyDown(Input.KEY_LCONTROL)) {
if (!GameMod.AUTO.isActive())
GameMod.AUTO.toggle(true);
}
SoundController.playSound(SoundEffect.MENUHIT);
MultiClip.destroyExtraClips(); MultiClip.destroyExtraClips();
Game gameState = (Game) game.getState(Opsu.STATE_GAME); Game gameState = (Game) game.getState(Opsu.STATE_GAME);
gameState.loadBeatmap(beatmap); gameState.loadBeatmap(beatmap);