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

Cleanup

Browse Source
This commit is contained in:
Anuken
2020-06-22 23:08:59 -04:00
parent 7dfd20d020
commit 7b7e803011
7 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,6 +22,8 @@ import mindustry.graphics.g3d.PlanetRenderer.*;
import mindustry.type.*;
import mindustry.type.Sector.*;
import mindustry.ui.*;
import mindustry.world.blocks.storage.*;
import mindustry.world.blocks.storage.CoreBlock.*;
import static mindustry.Vars.*;
import static mindustry.graphics.g3d.PlanetRenderer.*;
@@ -35,7 +37,7 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
private int launchRange;
private float zoom = 1f, selectAlpha = 1f;
private @Nullable Sector selected, hovered, launchSector;
private Tilec launcher;
private CoreEntity launcher;
private Mode mode = look;
public PlanetDialog(){
@@ -97,7 +99,7 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
return super.show();
}
public void show(Sector sector, int range, Tilec launcher){
public void show(Sector sector, CoreEntity launcher){
this.launcher = launcher;
selected = null;
hovered = null;
@@ -107,7 +109,7 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
zoom = 1f;
planets.zoom = 2f;
selectAlpha = 0f;
launchRange = range;
launchRange = ((CoreBlock)launcher.block).launchRange;
launchSector = sector;
mode = launch;

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

@@ -24,7 +24,6 @@ import mindustry.net.Packets.*;
import mindustry.type.*;
import mindustry.ui.*;
import mindustry.ui.dialogs.*;
import mindustry.world.blocks.storage.*;
import static mindustry.Vars.*;
@@ -365,9 +364,9 @@ public class HudFragment extends Fragment{
t.bottom().visible(() -> state.isCampaign() && player.team().core() != null);
t.button("test launch", Icon.warning, () -> {
ui.planet.show(state.getSector(), ((CoreBlock)player.team().core().block).launchRange, player.team().core());
ui.planet.show(state.getSector(), player.team().core());
}).width(150f)
.disabled(!player.team().core().items.has(player.team().core().block.requirements)); //disable core when missing resources for launch
.disabled(b -> player.team().core() == null || !player.team().core().items.has(player.team().core().block.requirements)); //disable core when missing resources for launch
});
blockfrag.build(parent);