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

Rebalancing of drills to slow down progression

Browse Source
This commit is contained in:
Anuken
2018-01-04 12:12:31 -05:00
parent 9e7eaaaf41
commit 2939c30d8d
14 changed files with 287 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/io/anuke/mindustry/ui/fragments/ChatFragment.java
View File

@@ -8,6 +8,8 @@ import com.badlogic.gdx.graphics.g2d.GlyphLayout;
import com.badlogic.gdx.utils.Align;
import com.badlogic.gdx.utils.Array;
import io.anuke.mindustry.Vars;
import io.anuke.mindustry.core.GameState;
import io.anuke.mindustry.core.GameState.State;
import io.anuke.mindustry.net.Net;
import io.anuke.ucore.core.Core;
import io.anuke.ucore.core.Inputs;
@@ -44,6 +46,8 @@ public class ChatFragment extends Table implements Fragment{
setFillParent(true);
font = Core.skin.getFont("default-font");
setVisible(() -> !GameState.is(State.menu) && Net.active());
//TODO put it input
update(() -> {
if(Net.active() && Inputs.keyTap("chat")){

19
core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java
View File

@@ -2,6 +2,7 @@ package io.anuke.mindustry.ui.fragments;
import com.badlogic.gdx.Gdx;
import io.anuke.mindustry.Mindustry;
import io.anuke.mindustry.Vars;
import io.anuke.mindustry.core.GameState;
import io.anuke.mindustry.core.GameState.State;
import io.anuke.mindustry.ui.MenuButton;
@@ -65,14 +66,16 @@ public class MenuFragment implements Fragment{
new imagebutton("icon-tutorial", isize, () -> control.playMap(world.maps().getMap("tutorial"))).text("$text.tutorial").padTop(4f);
new imagebutton("icon-load", isize, () -> ui.showLoadGame()).text("$text.load").padTop(4f);
new imagebutton("icon-add", isize, () -> ui.showJoinGame()).text("$text.joingame").padTop(4f);
row();
new imagebutton("icon-editor", isize, () -> ui.showEditor()).text("$text.editor").padTop(4f);
new imagebutton("icon-tools", isize, () -> ui.showPrefs()).text("$text.settings").padTop(4f);
new imagebutton("icon-add", isize, () -> ui.showJoinGame()).text("$text.joingame").padTop(4f);
new imagebutton("icon-info", isize, () -> ui.showAbout()).text("$text.about.button").padTop(4f);
new imagebutton("icon-donate", isize, () -> {
Mindustry.platforms.openDonations();
@@ -81,9 +84,9 @@ public class MenuFragment implements Fragment{
visible(()->GameState.is(State.menu));
}}.end();
}}.end();
}
}
//settings icon
//extra icons in top right
new table(){{
atop().aright();
if(Mindustry.hasDiscord){
@@ -91,9 +94,11 @@ public class MenuFragment implements Fragment{
ui.showDiscord();
}).margin(14);
}
new imagebutton("icon-info", 30f, ()->{
ui.showAbout();
}).margin(14);
if(!Vars.android) {
new imagebutton("icon-info", 30f, () -> {
ui.showAbout();
}).margin(14);
}
}}.end().visible(()->GameState.is(State.menu));
}
}

4
core/src/io/anuke/mindustry/ui/fragments/PlayerListFragment.java
View File

@@ -1,6 +1,8 @@
package io.anuke.mindustry.ui.fragments;
import io.anuke.mindustry.Vars;
import io.anuke.mindustry.core.GameState;
import io.anuke.mindustry.core.GameState.State;
import io.anuke.mindustry.entities.Player;
import io.anuke.mindustry.net.Net;
import io.anuke.mindustry.ui.BorderImage;
@@ -33,7 +35,7 @@ public class PlayerListFragment implements Fragment{
}
});
visible(() -> Inputs.keyDown("player_list") && Net.active()); //TODO move elsewhere?
visible(() -> Inputs.keyDown("player_list") && Net.active() && !GameState.is(State.menu)); //TODO move elsewhere?
}}.end();
rebuild();