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

Menu cleanup

Browse Source
This commit is contained in:
Anuken
2022-01-21 17:04:35 -05:00
parent cfb01063c0
commit 8f4f51c122
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/mindustry/graphics/MenuRenderer.java
View File

@@ -13,7 +13,6 @@ import arc.util.noise.*;
import mindustry.content.*; import mindustry.content.*;
import mindustry.type.*; import mindustry.type.*;
import mindustry.world.*; import mindustry.world.*;
import mindustry.world.blocks.environment.*;
import static mindustry.Vars.*; import static mindustry.Vars.*;
@@ -29,7 +28,8 @@ public class MenuRenderer implements Disposable{
private float time = 0f; private float time = 0f;
private float flyerRot = 45f; private float flyerRot = 45f;
private int flyers = Mathf.chance(0.2) ? Mathf.random(35) : Mathf.random(15); private int flyers = Mathf.chance(0.2) ? Mathf.random(35) : Mathf.random(15);
private UnitType flyerType = content.units().select(u -> !u.isHidden() && u.hitSize <= 20f && u.flying && u.onTitleScreen && u.region.found()).random(); //no longer random or "dynamic", mod units in the menu look jarring, and it's not worth the configuration effort
private UnitType flyerType = Seq.with(UnitTypes.flare, UnitTypes.horizon, UnitTypes.zenith, UnitTypes.mono, UnitTypes.poly, UnitTypes.mega, UnitTypes.alpha, UnitTypes.beta, UnitTypes.gamma).random();
public MenuRenderer(){ public MenuRenderer(){
Time.mark(); Time.mark();
@@ -41,7 +41,8 @@ public class MenuRenderer implements Disposable{
private void generate(){ private void generate(){
world.beginMapLoad(); world.beginMapLoad();
Tiles tiles = world.resize(width, height); Tiles tiles = world.resize(width, height);
Seq<Block> ores = content.blocks().select(b -> b instanceof OreBlock ore && !ore.wallOre); //only uses base game ores now, mod ones usually contrast too much with the floor
Seq<Block> ores = Seq.with(Blocks.oreCopper, Blocks.oreLead, Blocks.oreScrap, Blocks.oreCoal, Blocks.oreTitanium, Blocks.oreThorium);
shadows = new FrameBuffer(width, height); shadows = new FrameBuffer(width, height);
int offset = Mathf.random(100000); int offset = Mathf.random(100000);
int s1 = offset, s2 = offset + 1, s3 = offset + 2; int s1 = offset, s2 = offset + 1, s3 = offset + 2;

2
core/src/mindustry/type/UnitType.java
View File

@@ -44,8 +44,6 @@ public class UnitType extends UnlockableContent{
/** If true, the unit is always at elevation 1. */ /** If true, the unit is always at elevation 1. */
public boolean flying; public boolean flying;
/** If `flying` and this is true, the unit can appear on the title screen. TODO remove with new menu*/
public boolean onTitleScreen = true;
/** Creates a new instance of this unit class. */ /** Creates a new instance of this unit class. */
public Prov<? extends Unit> constructor; public Prov<? extends Unit> constructor;
/** The default AI controller to assign on creation. */ /** The default AI controller to assign on creation. */

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

@@ -170,6 +170,12 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
return this; return this;
} }
//view current planet by default
if(Vars.state.rules.sector != null){
state.planet = Vars.state.rules.sector.planet;
settings.put("lastplanet", state.planet.name);
}
rebuildButtons(); rebuildButtons();
mode = look; mode = look;
state.otherCamPos = null; state.otherCamPos = null;