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

Implemented drone sprite, basic AI

Browse Source
This commit is contained in:
Anuken
2018-05-03 22:54:21 -04:00
parent 3a3c23d2f1
commit c1066e94f2
23 changed files with 545 additions and 448 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/io/anuke/mindustry/ui/PressGroup.java
-16
View File
@@ -1,16 +0,0 @@
package io.anuke.mindustry.ui;
import com.badlogic.gdx.utils.Array;
import io.anuke.ucore.scene.ui.Button;
public class PressGroup{
private Array<Button> buttons = new Array<>();
private boolean active = true;
public void add(Button button){
//TODO make only one button in the group be clickable, add implementation
buttons.add(button);
}
}
core/src/io/anuke/mindustry/ui/dialogs/PausedDialog.java
-11
View File
@@ -3,12 +3,9 @@ package io.anuke.mindustry.ui.dialogs;
import com.badlogic.gdx.utils.reflect.ClassReflection;
import io.anuke.mindustry.core.GameState.State;
import io.anuke.mindustry.net.Net;
import io.anuke.mindustry.ui.PressGroup;
import io.anuke.ucore.core.Timers;
import io.anuke.ucore.scene.Element;
import io.anuke.ucore.scene.builders.build;
import io.anuke.ucore.scene.builders.imagebutton;
import io.anuke.ucore.scene.ui.ImageButton;
import io.anuke.ucore.util.Bundles;
import static io.anuke.mindustry.Vars.*;
@@ -78,8 +75,6 @@ public class PausedDialog extends FloatingDialog{
}else{
build.begin(content());
PressGroup group = new PressGroup();
content().defaults().size(120f).pad(5);
float isize = 14f*4;
@@ -114,12 +109,6 @@ public class PausedDialog extends FloatingDialog{
});
}).text("Quit").padTop(4f);
for(Element e : content().getChildren()){
if(e instanceof ImageButton){
group.add((ImageButton)e);
}
}
build.end();
}
}
core/src/io/anuke/mindustry/ui/fragments/ChatFragment.java
-1
View File
@@ -51,7 +51,6 @@ public class ChatFragment extends Table implements Fragment{
setVisible(() -> !state.is(State.menu) && Net.active());
//TODO put it in input?
update(() -> {
if(!Net.active() && chatOpen){
hide();
core/src/io/anuke/mindustry/ui/fragments/DebugFragment.java
+2 -2
View File
@@ -67,9 +67,9 @@ public class DebugFragment implements Fragment {
row();
new button("death", () -> player.damage(99999, false));
row();
new button("spawn1", () -> new BaseUnit(UnitTypes.vtol, Team.red).set(player.x, player.y).add());
new button("spawnf", () -> new BaseUnit(UnitTypes.drone, player.team).set(player.x, player.y).add());
row();
new button("spawn2", () -> new BaseUnit(UnitTypes.scout, Team.red).set(player.x, player.y).add());
new button("spawng", () -> new BaseUnit(UnitTypes.scout, player.team).set(player.x, player.y).add());
row();
}}.end();