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

Replaced concept of "turns" with raw seconds

Browse Source
This commit is contained in:
Anuken
2020-07-01 11:50:33 -04:00
parent 3cf5adc278
commit 5f6c71b9d3
24 changed files with 136 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/mindustry/ui/dialogs/PlanetDialog.java
View File

@@ -294,7 +294,7 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
t.left();
sector.save.meta.secinfo.exportRates().each(entry -> {
int total = (int)(entry.value * turnDuration / 60f);
int total = (int)(entry.value * eventRate / 60f);
if(total > 1){
t.image(entry.key.icon(Cicon.small)).padRight(3);
t.add(ui.formatAmount(total) + " /turn").color(Color.lightGray);
@@ -330,11 +330,13 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
}
//display how many turns this sector has been attacked
//TODO implement properly
/*
if(sector.getTurnsPassed() > 0 && sector.hasBase()){
stable.row();
stable.add("[scarlet]" + Iconc.warning + " " + sector.getTurnsPassed() + "x attacks");
}
}*/
stable.row();

5
core/src/mindustry/ui/fragments/HudFragment.java
View File

@@ -45,11 +45,6 @@ public class HudFragment extends Fragment{
@Override
public void build(Group parent){
Events.on(TurnEvent.class, e -> {
//TODO localize, clean up, etc
int attacked = universe.getSectorsAttacked();
showToast("New turn: [accent]" + universe.getTurn() + "[]" + (attacked > 0 ? "\n[scarlet]" + Iconc.warning + " " + attacked + " sectors attacked!": ""));
});
//TODO details and stuff
Events.on(SectorCaptureEvent.class, e ->{