java/rogue-savage-rats
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

externalized some keys

Browse Source
This commit is contained in:
ondra
2014-05-19 12:45:24 +02:00
parent bf5c1a5b93
commit d2b83a89b4
6 changed files with 53 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mightypork/rogue/RogueKeys.java
+18 -4
View File
@@ -15,10 +15,24 @@ public class RogueKeys implements Config.KeySetup {
keys.add("global.menu", "CTRL+M"); keys.add("global.menu", "CTRL+M");
keys.add("global.screenshot", "F2"); keys.add("global.screenshot", "F2");
keys.add("global.fullscreen", "F11"); keys.add("global.fullscreen", "F11");
keys.add("global.fps_meter", "F3");
keys.add("general.cancel", "ESC"); keys.add("general.back", "ESC"); // leave a dialog / screen
keys.add("general.confirm", "ENTER"); keys.add("general.cancel", "ESC"); // cancel operation
keys.add("general.yes", "Y"); keys.add("general.confirm", "ENTER"); // confirm default option
keys.add("general.no", "N"); keys.add("general.yes", "Y"); // answer YES
keys.add("general.no", "N"); // answer NO
keys.add("game.quit", "ESC");
keys.add("game.save", "CTRL+S");
keys.add("game.load", "CTRL+L");
keys.add("game.zoom", "Z");
keys.add("game.minimap", "M");
keys.add("game.eat", "E");
keys.add("game.drop", "D");
keys.add("game.inventory", "I");
keys.add("game.pause", "P");
keys.add("game.pause2", "SPACE");
keys.add("game.cheat.xray", "CTRL+SHIFT+X");
} }
} }
src/mightypork/rogue/screens/FpsOverlay.java
+2 -1
View File
@@ -1,6 +1,7 @@
package mightypork.rogue.screens; package mightypork.rogue.screens;
import mightypork.gamecore.Config;
import mightypork.gamecore.core.AppAccess; import mightypork.gamecore.core.AppAccess;
import mightypork.gamecore.gui.Action; import mightypork.gamecore.gui.Action;
import mightypork.gamecore.gui.AlignX; import mightypork.gamecore.gui.AlignX;
@@ -35,7 +36,7 @@ public class FpsOverlay extends Overlay {
/* /*
* Toggle key: F3 * Toggle key: F3
*/ */
bindKey(new KeyStroke(Keys.F3), Edge.RISING, new Action() { bindKey(Config.getKey("global.fps_meter"), Edge.RISING, new Action() {
@Override @Override
public void execute() public void execute()
src/mightypork/rogue/screens/game/AskSaveLayer.java
+14 -5
View File
@@ -3,6 +3,7 @@ package mightypork.rogue.screens.game;
import java.io.IOException; import java.io.IOException;
import mightypork.gamecore.Config;
import mightypork.gamecore.gui.Action; import mightypork.gamecore.gui.Action;
import mightypork.gamecore.gui.AlignX; import mightypork.gamecore.gui.AlignX;
import mightypork.gamecore.gui.components.input.TextButton; import mightypork.gamecore.gui.components.input.TextButton;
@@ -103,7 +104,7 @@ public class AskSaveLayer extends ScreenLayer {
} }
}; };
btn1.setAction(new Action() { final Action save = new Action() {
@Override @Override
protected void execute() protected void execute()
@@ -115,20 +116,28 @@ public class AskSaveLayer extends ScreenLayer {
Log.e(e); Log.e(e);
} }
} }
}); };
btn2.setAction(new Action() { final Action discard = new Action() {
@Override @Override
protected void execute() protected void execute()
{ {
if (task != null) task.run(); if (task != null) task.run();
} }
}); };
btn1.setAction(save);
btn2.setAction(discard);
btn3.setAction(cancel); btn3.setAction(cancel);
bindKey(new KeyStroke(Keys.ESCAPE), Edge.RISING, cancel); bindKey(Config.getKey("general.back"), Edge.RISING, cancel);
bindKey(Config.getKey("general.cancel"), Edge.RISING, cancel);
bindKey(Config.getKey("general.yes"), Edge.RISING, save);
bindKey(Config.getKey("general.confirm"), Edge.RISING, save);
bindKey(Config.getKey("general.no"), Edge.RISING, discard);
updated.add(numa); updated.add(numa);
updated.add(hideTT); updated.add(hideTT);
src/mightypork/rogue/screens/game/ScreenGame.java
+12 -12
View File
@@ -3,6 +3,7 @@ package mightypork.rogue.screens.game;
import java.io.File; import java.io.File;
import mightypork.gamecore.Config;
import mightypork.gamecore.core.AppAccess; import mightypork.gamecore.core.AppAccess;
import mightypork.gamecore.core.events.UserQuitRequest; import mightypork.gamecore.core.events.UserQuitRequest;
import mightypork.gamecore.gui.Action; import mightypork.gamecore.gui.Action;
@@ -242,19 +243,18 @@ public class ScreenGame extends RogueScreen implements PlayerDeathHandler {
addLayer(askSaveLayer = new AskSaveLayer(this)); addLayer(askSaveLayer = new AskSaveLayer(this));
//pause key //pause key
bindKey(new KeyStroke(Keys.P), Edge.RISING, actionTogglePause); bindKey(Config.getKey("game.pause2"), Edge.RISING, actionTogglePause);
bindKey(new KeyStroke(Keys.PAUSE), Edge.RISING, actionTogglePause); bindKey(Config.getKey("game.pause"), Edge.RISING, actionTogglePause);
bindKey(new KeyStroke(Keys.SPACE), Edge.RISING, actionTogglePause);
bindKey(new KeyStroke(Keys.I), Edge.RISING, actionToggleInv); bindKey(Config.getKey("game.inventory"), Edge.RISING, actionToggleInv);
bindKey(new KeyStroke(Keys.D), Edge.RISING, actionDropLastPickedItem); bindKey(Config.getKey("game.drop"), Edge.RISING, actionDropLastPickedItem);
bindKey(new KeyStroke(Keys.E), Edge.RISING, actionEat); bindKey(Config.getKey("game.eat"), Edge.RISING, actionEat);
bindKey(new KeyStroke(Keys.M), Edge.RISING, actionToggleMinimap); bindKey(Config.getKey("game.minimap"), Edge.RISING, actionToggleMinimap);
bindKey(new KeyStroke(Keys.Z), Edge.RISING, actionToggleZoom); bindKey(Config.getKey("game.zoom"), Edge.RISING, actionToggleZoom);
bindKey(new KeyStroke(Keys.L, Keys.MOD_CONTROL), Edge.RISING, actionLoad); bindKey(Config.getKey("game.load"), Edge.RISING, actionLoad);
bindKey(new KeyStroke(Keys.S, Keys.MOD_CONTROL), Edge.RISING, actionSave); bindKey(Config.getKey("game.save"), Edge.RISING, actionSave);
bindKey(new KeyStroke(Keys.ESCAPE), Edge.RISING, actionMenu); bindKey(Config.getKey("game.quit"), Edge.RISING, actionMenu);
// add as actions - enableables. // add as actions - enableables.
worldActions.add(worldLayer); worldActions.add(worldLayer);
@@ -274,7 +274,7 @@ public class ScreenGame extends RogueScreen implements PlayerDeathHandler {
worldActions.setEnabled(true); worldActions.setEnabled(true);
// CHEAT - X-ray // CHEAT - X-ray
bindKey(new KeyStroke(Keys.NUMPAD_MULTIPLY, Keys.MOD_CONTROL), Edge.RISING, new Runnable() { bindKey(Config.getKey("game.cheat.xray"), Edge.RISING, new Runnable() {
@Override @Override
public void run() public void run()
src/mightypork/rogue/screens/menu/ScreenMainMenu.java
+5 -3
View File
@@ -1,7 +1,9 @@
package mightypork.rogue.screens.menu; package mightypork.rogue.screens.menu;
import mightypork.gamecore.Config;
import mightypork.gamecore.core.AppAccess; import mightypork.gamecore.core.AppAccess;
import mightypork.gamecore.core.events.UserQuitRequest;
import mightypork.gamecore.gui.Action; import mightypork.gamecore.gui.Action;
import mightypork.gamecore.gui.AlignX; import mightypork.gamecore.gui.AlignX;
import mightypork.gamecore.gui.components.input.TextButton; import mightypork.gamecore.gui.components.input.TextButton;
@@ -113,18 +115,18 @@ public class ScreenMainMenu extends RogueScreen {
@Override @Override
protected void execute() protected void execute()
{ {
getEventBus().send(new RogueStateRequest(RogueState.EXIT)); getEventBus().send(new UserQuitRequest());
} }
}); });
rows.add(btn, 2); rows.add(btn, 2);
bindKey(new KeyStroke(Keys.ESCAPE), Edge.RISING, new Runnable() { bindKey(Config.getKey("general.back"), Edge.RISING, new Runnable() {
@Override @Override
public void run() public void run()
{ {
getEventBus().send(new RogueStateRequest(RogueState.EXIT)); getEventBus().send(new UserQuitRequest());
} }
}); });
} }
src/mightypork/rogue/screens/select_world/ScreenSelectWorld.java
+2 -10
View File
@@ -1,6 +1,7 @@
package mightypork.rogue.screens.select_world; package mightypork.rogue.screens.select_world;
import mightypork.gamecore.Config;
import mightypork.gamecore.WorkDir; import mightypork.gamecore.WorkDir;
import mightypork.gamecore.core.AppAccess; import mightypork.gamecore.core.AppAccess;
import mightypork.gamecore.gui.AlignX; import mightypork.gamecore.gui.AlignX;
@@ -83,7 +84,7 @@ public class ScreenSelectWorld extends RogueScreen {
rows.add(slot3); rows.add(slot3);
// escape to quitn from here // escape to quitn from here
bindKey(new KeyStroke(Keys.ESCAPE), Edge.RISING, new Runnable() { bindKey(Config.getKey("general.back"), Edge.RISING, new Runnable() {
@Override @Override
public void run() public void run()
@@ -91,15 +92,6 @@ public class ScreenSelectWorld extends RogueScreen {
getEventBus().send(new RogueStateRequest(RogueState.MAIN_MENU)); getEventBus().send(new RogueStateRequest(RogueState.MAIN_MENU));
} }
}); });
bindKey(new KeyStroke(Keys.Q, Keys.MOD_CONTROL), Edge.RISING, new Runnable() {
@Override
public void run()
{
getEventBus().send(new RogueStateRequest(RogueState.EXIT));
}
});
} }