Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Formatting cleanup / Bugfix

Browse Source
This commit is contained in:
Anuken
2018-12-11 17:29:13 -05:00
parent 2056d5e350
commit 65e65ba308
4 changed files with 69 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/io/anuke/mindustry/input/DefaultKeybinds.java
+43 -43
View File
@@ -16,52 +16,52 @@ public class DefaultKeybinds{
for(String section : sections){ for(String section : sections){
KeyBinds.defaultSection(section, DeviceType.keyboard, KeyBinds.defaultSection(section, DeviceType.keyboard,
new Category("general"), new Category("general"),
"move_x", new Axis(Input.A, Input.D), "move_x", new Axis(Input.A, Input.D),
"move_y", new Axis(Input.S, Input.W), "move_y", new Axis(Input.S, Input.W),
"select", Input.MOUSE_LEFT, "select", Input.MOUSE_LEFT,
"deselect", Input.MOUSE_RIGHT, "deselect", Input.MOUSE_RIGHT,
"break", Input.MOUSE_RIGHT, "break", Input.MOUSE_RIGHT,
"rotate", new Axis(Input.SCROLL), "rotate", new Axis(Input.SCROLL),
"dash", Input.SHIFT_LEFT, "dash", Input.SHIFT_LEFT,
"drop_unit", Input.SHIFT_LEFT, "drop_unit", Input.SHIFT_LEFT,
"gridMode", Input.ALT_LEFT, "gridMode", Input.ALT_LEFT,
"gridModeShift", Input.SHIFT_LEFT, "gridModeShift", Input.SHIFT_LEFT,
new Category("view"), new Category("view"),
"zoom_hold", Input.CONTROL_LEFT, "zoom_hold", Input.CONTROL_LEFT,
"zoom", new Axis(Input.SCROLL), "zoom", new Axis(Input.SCROLL),
"zoom_minimap", new Axis(Input.MINUS, Input.PLUS), "zoom_minimap", new Axis(Input.MINUS, Input.PLUS),
"menu", Gdx.app.getType() == ApplicationType.Android ? Input.BACK : Input.ESCAPE, "menu", Gdx.app.getType() == ApplicationType.Android ? Input.BACK : Input.ESCAPE,
"pause", Input.SPACE, "pause", Input.SPACE,
"toggle_menus", Input.C, "toggle_menus", Input.C,
"screenshot", Input.P, "screenshot", Input.P,
new Category("multiplayer"), new Category("multiplayer"),
"player_list", Input.TAB, "player_list", Input.TAB,
"chat", Input.ENTER, "chat", Input.ENTER,
"chat_history_prev", Input.UP, "chat_history_prev", Input.UP,
"chat_history_next", Input.DOWN, "chat_history_next", Input.DOWN,
"chat_scroll", new Axis(Input.SCROLL) "chat_scroll", new Axis(Input.SCROLL)
); );
KeyBinds.defaultSection(section, DeviceType.controller, KeyBinds.defaultSection(section, DeviceType.controller,
new Category("general"), new Category("general"),
"move_x", new Axis(Input.CONTROLLER_L_STICK_HORIZONTAL_AXIS), "move_x", new Axis(Input.CONTROLLER_L_STICK_HORIZONTAL_AXIS),
"move_y", new Axis(Input.CONTROLLER_L_STICK_VERTICAL_AXIS), "move_y", new Axis(Input.CONTROLLER_L_STICK_VERTICAL_AXIS),
"cursor_x", new Axis(Input.CONTROLLER_R_STICK_HORIZONTAL_AXIS), "cursor_x", new Axis(Input.CONTROLLER_R_STICK_HORIZONTAL_AXIS),
"cursor_y", new Axis(Input.CONTROLLER_R_STICK_VERTICAL_AXIS), "cursor_y", new Axis(Input.CONTROLLER_R_STICK_VERTICAL_AXIS),
//"select", Input.CONTROLLER_R_BUMPER, //"select", Input.CONTROLLER_R_BUMPER,
//"break", Input.CONTROLLER_L_BUMPER, //"break", Input.CONTROLLER_L_BUMPER,
//"shoot", Input.CONTROLLER_R_TRIGGER, //"shoot", Input.CONTROLLER_R_TRIGGER,
"dash", Input.CONTROLLER_Y, "dash", Input.CONTROLLER_Y,
"rotate_alt", new Axis(Input.CONTROLLER_DPAD_RIGHT, Input.CONTROLLER_DPAD_LEFT), "rotate_alt", new Axis(Input.CONTROLLER_DPAD_RIGHT, Input.CONTROLLER_DPAD_LEFT),
"rotate", new Axis(Input.CONTROLLER_A, Input.CONTROLLER_B), "rotate", new Axis(Input.CONTROLLER_A, Input.CONTROLLER_B),
new Category("view"), new Category("view"),
"zoom_hold", Input.ANY_KEY, "zoom_hold", Input.ANY_KEY,
"zoom", new Axis(Input.CONTROLLER_DPAD_DOWN, Input.CONTROLLER_DPAD_UP), "zoom", new Axis(Input.CONTROLLER_DPAD_DOWN, Input.CONTROLLER_DPAD_UP),
"menu", Input.CONTROLLER_X, "menu", Input.CONTROLLER_X,
"pause", Input.CONTROLLER_L_TRIGGER, "pause", Input.CONTROLLER_L_TRIGGER,
new Category("multiplayer"), new Category("multiplayer"),
"player_list", Input.CONTROLLER_START "player_list", Input.CONTROLLER_START
); );
} }
core/src/io/anuke/mindustry/ui/ItemImage.java
+2 -2
View File
@@ -11,7 +11,7 @@ public class ItemImage extends Stack{
public ItemImage(TextureRegion region, Supplier<CharSequence> text){ public ItemImage(TextureRegion region, Supplier<CharSequence> text){
Table t = new Table().left().bottom(); Table t = new Table().left().bottom();
t.label(text); t.label(text).name("item-label");
add(new Image(region)); add(new Image(region));
add(t); add(t);
@@ -22,7 +22,7 @@ public class ItemImage extends Stack{
if(stack.amount != 0){ if(stack.amount != 0){
Table t = new Table().left().bottom(); Table t = new Table().left().bottom();
t.add(stack.amount + ""); t.add(stack.amount + "").name("item-label");
add(t); add(t);
} }
} }
core/src/io/anuke/mindustry/ui/fragments/HudFragment.java
+11 -11
View File
@@ -198,7 +198,7 @@ public class HudFragment extends Fragment{
return coreAttackOpacity > 0; return coreAttackOpacity > 0;
}); });
t.table("button", top -> top.add("$text.coreattack").pad(2) t.table("button", top -> top.add("$text.coreattack").pad(2)
.update(label -> label.setColor(Hue.mix(Color.ORANGE, Color.SCARLET, Mathf.absin(Timers.time(), 2f, 1f))))); .update(label -> label.setColor(Hue.mix(Color.ORANGE, Color.SCARLET, Mathf.absin(Timers.time(), 2f, 1f)))));
}); });
//'saving' indicator //'saving' indicator
@@ -371,16 +371,16 @@ public class HudFragment extends Fragment{
table.setTouchable(Touchable.enabled); table.setTouchable(Touchable.enabled);
table.labelWrap(() -> table.labelWrap(() ->
world.getSector() == null ? world.getSector() == null ?
(state.enemies() > 0 && state.mode.disableWaveTimer ? (state.enemies() > 0 && state.mode.disableWaveTimer ?
wavef.get(state.wave) + "\n" + (state.enemies() == 1 ? wavef.get(state.wave) + "\n" + (state.enemies() == 1 ?
enemyf.get(state.enemies()) : enemyf.get(state.enemies()) :
enemiesf.get(state.enemies())) : enemiesf.get(state.enemies())) :
wavef.get(state.wave) + "\n" + wavef.get(state.wave) + "\n" +
(!state.mode.disableWaveTimer ? (!state.mode.disableWaveTimer ?
Bundles.format("text.wave.waiting", (int) (state.wavetime / 60)) : Bundles.format("text.wave.waiting", (int)(state.wavetime/60)) :
Bundles.get("text.waiting"))) : Bundles.get("text.waiting"))) :
Bundles.format("text.mission.display", world.getSector().currentMission().displayString())).growX().pad(8f); Bundles.format("text.mission.display", world.getSector().currentMission().displayString())).growX().pad(8f);
table.clicked(() -> { table.clicked(() -> {
if(world.getSector() != null && world.getSector().currentMission().hasMessage()){ if(world.getSector() != null && world.getSector().currentMission().hasMessage()){
core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java
+13 -11
View File
@@ -42,15 +42,15 @@ public class PlacementFragment extends Fragment{
boolean lastGround; boolean lastGround;
final Input[] inputGrid = { final Input[] inputGrid = {
Input.NUM_1, Input.NUM_2, Input.NUM_3, Input.NUM_4, Input.NUM_1, Input.NUM_2, Input.NUM_3, Input.NUM_4,
Input.Q, Input.W, Input.E, Input.R, Input.Q, Input.W, Input.E, Input.R,
Input.A, Input.S, Input.D, Input.F, Input.A, Input.S, Input.D, Input.F,
Input.Z, Input.X, Input.C, Input.V Input.Z, Input.X, Input.C, Input.V
}, inputCatGrid = { }, inputCatGrid = {
Input.NUM_1, Input.NUM_2, Input.NUM_1, Input.NUM_2,
Input.Q, Input.W, Input.Q, Input.W,
Input.A, Input.S, Input.A, Input.S,
Input.Z, Input.X, Input.C, Input.V Input.Z, Input.X, Input.C, Input.V
}; };
public PlacementFragment(){ public PlacementFragment(){
@@ -75,10 +75,12 @@ public class PlacementFragment extends Fragment{
} }
return true; return true;
}else if(Inputs.keyDown("select")){ // Mouse eyedropper select }else if(Inputs.keyDown("select")){ // Mouse eyedropper select
Tile tile = world.tileWorld(Graphics.mouseWorld().x, Graphics.mouseWorld().y).target(); Tile tile = world.tileWorld(Graphics.mouseWorld().x, Graphics.mouseWorld().y);
if(tile.block() != null){
if(tile != null){
tile = tile.target();
Recipe tryRecipe = Recipe.getByResult(tile.block()); Recipe tryRecipe = Recipe.getByResult(tile.block());
if((tryRecipe != null) && control.unlocks.isUnlocked(tryRecipe)){ if(tryRecipe != null && control.unlocks.isUnlocked(tryRecipe)){
input.recipe = tryRecipe; input.recipe = tryRecipe;
currentCategory = input.recipe.category; currentCategory = input.recipe.category;
return true; return true;