From 6246a1d39c481159659edc297f8527e56e731725 Mon Sep 17 00:00:00 2001 From: Matthew Peng <54301439+MEEPofFaith@users.noreply.github.com> Date: Mon, 9 Aug 2021 15:04:21 -0700 Subject: [PATCH 1/3] Option to make a unit not appear on the title screen. (#5728) --- core/src/mindustry/graphics/MenuRenderer.java | 2 +- core/src/mindustry/type/UnitType.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/core/src/mindustry/graphics/MenuRenderer.java b/core/src/mindustry/graphics/MenuRenderer.java index 3bb562bde1..1cd431c7e8 100644 --- a/core/src/mindustry/graphics/MenuRenderer.java +++ b/core/src/mindustry/graphics/MenuRenderer.java @@ -29,7 +29,7 @@ public class MenuRenderer implements Disposable{ private float time = 0f; private float flyerRot = 45f; 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(){ Time.mark(); diff --git a/core/src/mindustry/type/UnitType.java b/core/src/mindustry/type/UnitType.java index 0640400182..0aa8f45175 100644 --- a/core/src/mindustry/type/UnitType.java +++ b/core/src/mindustry/type/UnitType.java @@ -42,6 +42,8 @@ public class UnitType extends UnlockableContent{ /** If true, the unit is always at elevation 1. */ 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. */ public Prov constructor; /** The default AI controller to assign on creation. */ From 6d517396b3816f5b685253f6effd1f34bcd845a8 Mon Sep 17 00:00:00 2001 From: buthed010203 Date: Mon, 9 Aug 2021 18:05:19 -0400 Subject: [PATCH 2/3] ??? (#5727) --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index eae04d207f..2917c3abef 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,5 +10,5 @@ kotlin.stdlib.default.dependency=false android.useAndroidX=true #used for slow jitpack builds; TODO see if this actually works http.socketTimeout=80000 -http.connectionTimeout=80000archash=40c21b302ccc1e74f4c2a37f937c88acaec99254 +http.connectionTimeout=80000 archash=40c21b302ccc1e74f4c2a37f937c88acaec99254 From 6c963a2de7be2057007c4f3a76eea7b5aac9e152 Mon Sep 17 00:00:00 2001 From: JrTRinny <85090668+JrTRinny@users.noreply.github.com> Date: Tue, 10 Aug 2021 20:38:46 +0700 Subject: [PATCH 3/3] comment fix (#5730) * there is no mech pads * factories --- core/src/mindustry/game/Rules.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/mindustry/game/Rules.java b/core/src/mindustry/game/Rules.java index 515995d79c..ad70638368 100644 --- a/core/src/mindustry/game/Rules.java +++ b/core/src/mindustry/game/Rules.java @@ -50,7 +50,7 @@ public class Rules{ public boolean unitAmmo = false; /** Whether cores add to unit limit */ public boolean unitCapVariable = true; - /** How fast unit pads build units. */ + /** How fast unit factories build units. */ public float unitBuildSpeedMultiplier = 1f; /** How much damage any other units deal. */ public float unitDamageMultiplier = 1f;