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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken
2021-08-10 10:16:20 -04:00
parent be38bba0e4 6c963a2de7
commit 78dc94b0ed
4 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/game/Rules.java
View File

@@ -50,7 +50,7 @@ public class Rules{
public boolean unitAmmo = false; public boolean unitAmmo = false;
/** Whether cores add to unit limit */ /** Whether cores add to unit limit */
public boolean unitCapVariable = true; public boolean unitCapVariable = true;
/** How fast unit pads build units. */ /** How fast unit factories build units. */
public float unitBuildSpeedMultiplier = 1f; public float unitBuildSpeedMultiplier = 1f;
/** How much damage any other units deal. */ /** How much damage any other units deal. */
public float unitDamageMultiplier = 1f; public float unitDamageMultiplier = 1f;

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

@@ -29,7 +29,7 @@ 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.hitSize <= 20f && u.flying && u.region.found()).random(); private UnitType flyerType = content.units().select(u -> u.hitSize <= 20f && u.flying && u.onTitleScreen && u.region.found()).random();
public MenuRenderer(){ public MenuRenderer(){
Time.mark(); Time.mark();

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

@@ -42,6 +42,8 @@ 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 */
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. */

2
gradle.properties
View File

@@ -10,5 +10,5 @@ kotlin.stdlib.default.dependency=false
android.useAndroidX=true android.useAndroidX=true
#used for slow jitpack builds; TODO see if this actually works #used for slow jitpack builds; TODO see if this actually works
http.socketTimeout=80000 http.socketTimeout=80000
http.connectionTimeout=80000archash=40c21b302ccc1e74f4c2a37f937c88acaec99254 http.connectionTimeout=80000
archash=40c21b302ccc1e74f4c2a37f937c88acaec99254 archash=40c21b302ccc1e74f4c2a37f937c88acaec99254