Merge remote-tracking branch 'origin/master'

Update surrealment to v6

build.gradle

@@ -253,18 +253,22 @@ project(":ios"){
 
     task incrementConfig{
         def vfile = file('robovm.properties')
+        def bversion = getBuildVersion()
         def props = new Properties()
         if(vfile.exists()){
             props.load(new FileInputStream(vfile))
         }else{
             props['app.id'] = 'io.anuke.mindustry'
-            props['app.version'] = '5.0'
+            props['app.version'] = '6.0'
             props['app.mainclass'] = 'mindustry.IOSLauncher'
             props['app.executable'] = 'IOSLauncher'
             props['app.name'] = 'Mindustry'
         }
         
         props['app.build'] = (!props.containsKey("app.build") ? 40 : props['app.build'].toInteger() + 1) + ""
+        if(bversion != "custom build"){
+            props['app.version'] = versionNumber + "." + bversion + (bversion.contains(".") ? "" : ".0")
+        }
         props.store(vfile.newWriter(), null)
     }
 

core/assets/bundles/bundle.properties

@@ -196,6 +196,7 @@ servers.local = Local Servers
 servers.remote = Remote Servers
 servers.global = Community Servers
 
+servers.disclaimer = Community servers are [accent]not[] owned or controlled by the developer.\n\nServers may contain user-generated content that is not appropriate for all ages.
 servers.showhidden = Show Hidden Servers
 server.shown = Shown
 server.hidden = Hidden
@@ -1279,6 +1280,8 @@ hint.payloadDrop.mobile = [accent]Tap and hold[] an empty location to drop a pay
 hint.waveFire = [accent]Wave[] turrets with water as ammunition will automatically put out nearby fires.
 hint.generator = \uf879 [accent]Combustion Generators[] burn coal and transmit power to adjacent blocks.\n\nPower transmission range can be extended with \uf87f [accent]Power Nodes[].
 hint.guardian = [accent]Guardian[] units are armored. Weak ammo such as [accent]Copper[] and [accent]Lead[] is [scarlet]not effective[].\n\nUse higher tier turrets or \uf835 [accent]Graphite[] \uf861Duo/\uf859Salvo ammunition to take Guardians down.
+hint.coreUpgrade = Cores can be upgraded by [accent]placing higher-tier cores over them[].\n\nPlace a  [accent]Foundation[] core over the  [accent]Shard[] core. Make sure it is free from nearby obstructions.
+hint.presetLaunch = Gray [accent]landing zone sectors[], such as [accent]Frozen Forest[], can be launched to from anywhere. They do not require capture of nearby territory.\n\n[accent]Numbered sectors[], such as this one, are [accent]optional[].
 
 item.copper.description = Used in all types of construction and ammunition.
 item.copper.details = Copper. Abnormally abundant metal on Serpulo. Structurally weak unless reinforced.
@@ -1473,7 +1476,7 @@ unit.zenith.description = Fires salvos of missiles at all nearby enemies.
 unit.antumbra.description = Fires a barrage of bullets at all nearby enemies.
 unit.eclipse.description = Fires two piercing lasers and a barrage of flak at all nearby enemies.
 unit.mono.description = Automatically mines copper and lead, depositing it into the core.
-unit.poly.description = Automatically rebuilds damaged structures and assists other units in construction.
+unit.poly.description = Automatically rebuilds destroyed structures and assists other units in construction.
 unit.mega.description = Automatically repairs damaged structures. Capable of carrying blocks and small ground units.
 unit.quad.description = Drops large bombs on ground targets, repairing allied structures and damaging enemies. Capable of carrying medium-sized ground units.
 unit.oct.description = Protects nearby allies with its regenerating shield. Capable of carrying most ground units.

core/src/mindustry/content/Liquids.java

@@ -12,6 +12,7 @@ public class Liquids implements ContentList{
 
         water = new Liquid("water", Color.valueOf("596ab8")){{
             heatCapacity = 0.4f;
+            alwaysUnlocked = true;
             effect = StatusEffects.wet;
         }};
 

core/src/mindustry/content/TechTree.java

@@ -714,8 +714,14 @@ public class TechTree implements ContentList{
                 finishedRequirements[i] = new ItemStack(requirements[i].item, Core.settings == null ? 0 : Core.settings.getInt("req-" + content.name + "-" + requirements[i].item.name));
             }
 
+            var used = new ObjectSet<Content>();
+
             //add dependencies as objectives.
-            content.getDependencies(d -> objectives.add(new Research(d)));
+            content.getDependencies(d -> {
+                if(used.add(d)){
+                    objectives.add(new Research(d));
+                }
+            });
 
             map.put(content, this);
             all.add(this);

core/src/mindustry/content/Weathers.java

@@ -75,7 +75,7 @@ public class Weathers implements ContentList{
             attrs.set(Attribute.spores, 1f);
             attrs.set(Attribute.light, -0.15f);
             status = StatusEffects.sporeSlowed;
-            opacityMultiplier = 0.75f;
+            opacityMultiplier = 0.5f;
             force = 0.1f;
             sound = Sounds.wind;
             soundVol = 0.7f;

core/src/mindustry/core/UI.java

@@ -92,6 +92,12 @@ public class UI implements ApplicationListener, Loadable{
         Core.scene = new Scene();
         Core.input.addProcessor(Core.scene);
 
+        int[] insets = Core.graphics.getSafeInsets();
+        Core.scene.marginLeft = insets[0];
+        Core.scene.marginRight = insets[1];
+        Core.scene.marginTop = insets[2];
+        Core.scene.marginBottom = insets[3];
+
         Tex.load();
         Icon.load();
         Styles.load();

core/src/mindustry/entities/bullet/LaserBoltBulletType.java

@@ -6,7 +6,7 @@ import mindustry.gen.*;
 import mindustry.content.*;
 
 public class LaserBoltBulletType extends BasicBulletType{
-    protected float height = 7f, width = 2f;
+    public float width = 2f, height = 7f;
 
     public LaserBoltBulletType(float speed, float damage){
         super(speed, damage);

core/src/mindustry/entities/comp/BuilderComp.java

@@ -91,7 +91,7 @@ abstract class BuilderComp implements Posc, Teamc, Rotc{
                 plans.removeFirst();
                 return;
             }
-        }else if(tile.team() != team){
+        }else if(tile.team() != team && tile.team() != Team.derelict){
             plans.removeFirst();
             return;
         }

core/src/mindustry/game/Schematics.java

@@ -68,13 +68,12 @@ public class Schematics implements Loadable{
             shadowBuffer.dispose();
             if(errorTexture != null){
                 errorTexture.dispose();
+                errorTexture = null;
             }
         });
 
         Events.on(ClientLoadEvent.class, event -> {
-            Pixmap pixmap = Core.atlas.getPixmap("error").crop();
+            errorTexture = new Texture("sprites/error.png");
-            errorTexture = new Texture(pixmap);
-            pixmap.dispose();
         });
     }
 

core/src/mindustry/game/Waves.java

@@ -10,7 +10,7 @@ import mindustry.type.*;
 import static mindustry.content.UnitTypes.*;
 
 public class Waves{
-    public static final int waveVersion = 4;
+    public static final int waveVersion = 5;
 
     private Seq<SpawnGroup> spawns;
 
@@ -277,7 +277,7 @@ public class Waves{
         int cap = 150;
 
         float shieldStart = 30, shieldsPerWave = 20 + difficulty*30f;
-        float[] scaling = {1, 1.5f, 3f, 4f, 5f};
+        float[] scaling = {1, 2f, 3f, 4f, 5f};
 
         Intc createProgression = start -> {
             //main sequence

core/src/mindustry/io/JsonIO.java

@@ -83,8 +83,9 @@ public class JsonIO{
 
             @Override
             public Sector read(Json json, JsonValue jsonData, Class type){
-                String[] split = jsonData.asString().split("-");
+                String name = jsonData.asString();
-                return Vars.content.<Planet>getByName(ContentType.planet, split[0]).sectors.get(Integer.parseInt(split[1]));
+                int idx = name.lastIndexOf('-');
+                return Vars.content.<Planet>getByName(ContentType.planet, name.substring(0, idx)).sectors.get(Integer.parseInt(name.substring(idx + 1)));
             }
         });
 

core/src/mindustry/ui/dialogs/JoinDialog.java

@@ -402,7 +402,16 @@ public class JoinDialog extends BaseDialog{
 
         container.button(b -> buildServer(host, b), Styles.cleart, () -> {
             Events.fire(new ClientPreConnectEvent(host));
+            if(!Core.settings.getBool("server-disclaimer", false)){
+                ui.showCustomConfirm("@warning", "@servers.disclaimer", "@ok", "@back", () -> {
+                    Core.settings.put("server-disclaimer", true);
                     safeConnect(host.address, host.port, host.version);
+                }, () -> {
+                    Core.settings.put("server-disclaimer", false);
+                });
+            }else{
+                safeConnect(host.address, host.port, host.version);
+            }
         }).width(w).row();
     }
 

core/src/mindustry/ui/dialogs/PlanetDialog.java

@@ -144,7 +144,10 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
         //load legacy research
         if(Core.settings.has("unlocks") && !Core.settings.has("junction-unlocked")){
             Core.app.post(() -> {
-                ui.showCustomConfirm("@research", "@research.legacy", "@research.load", "@research.discard", LegacyIO::readResearch, () -> Core.settings.remove("unlocks"));
+                ui.showCustomConfirm("@research", "@research.legacy", "@research.load", "@research.discard", () -> {
+                    LegacyIO.readResearch();
+                    Core.settings.remove("unlocks");
+                }, () -> Core.settings.remove("unlocks"));
             });
         }
 
@@ -490,7 +493,7 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
             hoverLabel.touchable = Touchable.disabled;
 
             Vec3 pos = planets.cam.project(Tmp.v31.set(hovered.tile.v).setLength(PlanetRenderer.outlineRad).rotate(Vec3.Y, -planets.planet.getRotation()).add(planets.planet.position));
-            hoverLabel.setPosition(pos.x, pos.y, Align.center);
+            hoverLabel.setPosition(pos.x, pos.y - Core.scene.marginBottom, Align.center);
 
             hoverLabel.getText().setLength(0);
             if(hovered != null){

core/src/mindustry/ui/fragments/ChatFragment.java

@@ -124,7 +124,7 @@ public class ChatFragment extends Table{
         Draw.color(shadowColor);
 
         if(shown){
-            Fill.crect(offsetx, chatfield.y, chatfield.getWidth() + 15f, chatfield.getHeight() - 1);
+            Fill.crect(offsetx, chatfield.y + scene.marginBottom, chatfield.getWidth() + 15f, chatfield.getHeight() - 1);
         }
 
         super.draw();
@@ -137,7 +137,7 @@ public class ChatFragment extends Table{
         Draw.color(shadowColor);
         Draw.alpha(shadowColor.a * opacity);
 
-        float theight = offsety + spacing + getMarginBottom();
+        float theight = offsety + spacing + getMarginBottom() + scene.marginBottom;
         for(int i = scrollPos; i < messages.size && i < messagesShown + scrollPos && (i < fadetime || shown); i++){
 
             layout.setText(font, messages.get(i).formattedMessage, Color.white, textWidth, Align.bottomLeft, true);

core/src/mindustry/ui/fragments/HintsFragment.java

@@ -162,6 +162,16 @@ public class HintsFragment extends Fragment{
         waveFire(() -> Groups.fire.size() > 0 && Blocks.wave.unlockedNow(), () -> indexer.getAllied(state.rules.defaultTeam, BlockFlag.extinguisher).size() > 0),
         generator(() -> control.input.block == Blocks.combustionGenerator, () -> ui.hints.placedBlocks.contains(Blocks.combustionGenerator)),
         guardian(() -> state.boss() != null && state.boss().armor >= 4, () -> state.boss() == null),
+        coreUpgrade(() -> state.isCampaign() && Blocks.coreFoundation.unlocked()
+            && state.rules.defaultTeam.core() != null
+            && state.rules.defaultTeam.core().block == Blocks.coreShard
+            && state.rules.defaultTeam.core().items.has(Blocks.coreFoundation.requirements),
+            () -> ui.hints.placedBlocks.contains(Blocks.coreFoundation)),
+        presetLaunch(() -> state.isCampaign()
+            && state.getSector().preset == null
+            && SectorPresets.frozenForest.unlocked()
+            && SectorPresets.frozenForest.sector.save == null,
+            () -> state.isCampaign() && state.getSector().preset == SectorPresets.frozenForest),
         ;
 
         @Nullable

core/src/mindustry/ui/fragments/LoadingFragment.java

@@ -1,7 +1,9 @@
 package mindustry.ui.fragments;
 
+import arc.*;
 import arc.func.*;
 import arc.graphics.*;
+import arc.graphics.g2d.*;
 import arc.scene.*;
 import arc.scene.actions.*;
 import arc.scene.event.*;
@@ -18,7 +20,12 @@ public class LoadingFragment extends Fragment{
 
     @Override
     public void build(Group parent){
-        parent.fill(Styles.black8, t -> {
+        parent.fill(t -> {
+            //rect must fill screen completely.
+            t.rect((x, y, w, h) -> {
+                Draw.alpha(t.color.a);
+                Styles.black8.draw(0, 0, Core.graphics.getWidth(), Core.graphics.getHeight());
+            });
             t.visible = false;
             t.touchable = Touchable.enabled;
             t.add().height(133f).row();

core/src/mindustry/ui/fragments/MenuFragment.java

@@ -77,12 +77,13 @@ public class MenuFragment extends Fragment{
         String versionText = ((Version.build == -1) ? "[#fc8140aa]" : "[#ffffffba]") + Version.combined();
         parent.fill((x, y, w, h) -> {
             TextureRegion logo = Core.atlas.find("logo");
+            float width = Core.graphics.getWidth(), height = Core.graphics.getHeight() - Core.scene.marginTop;
             float logoscl = Scl.scl(1);
             float logow = Math.min(logo.width * logoscl, Core.graphics.getWidth() - Scl.scl(20));
             float logoh = logow * (float)logo.height / logo.width;
 
-            float fx = (int)(Core.graphics.getWidth() / 2f);
+            float fx = (int)(width / 2f);
-            float fy = (int)(Core.graphics.getHeight() - 6 - logoh) + logoh / 2 - (Core.graphics.isPortrait() ? Scl.scl(30f) : 0f);
+            float fy = (int)(height - 6 - logoh) + logoh / 2 - (Core.graphics.isPortrait() ? Scl.scl(30f) : 0f);
 
             Draw.color();
             Draw.rect(logo, fx, fy, logow, logoh);
@@ -230,7 +231,7 @@ public class MenuFragment extends Fragment{
                         submenu.clearChildren();
                         fadeInMenu();
                         //correctly offset the button
-                        submenu.add().height((Core.graphics.getHeight() - out[0].getY(Align.topLeft)) / Scl.scl(1f));
+                        submenu.add().height((Core.graphics.getHeight() - Core.scene.marginTop - Core.scene.marginBottom - out[0].getY(Align.topLeft)) / Scl.scl(1f));
                         submenu.row();
                         buttons(submenu, b.submenu);
                     }else{

core/src/mindustry/ui/fragments/MinimapFragment.java

@@ -28,7 +28,7 @@ public class MinimapFragment extends Fragment{
             float size = baseSize * zoom * world.width();
 
             Draw.color(Color.black);
-            Fill.crect(x, y, w, h);
+            Fill.crect(0, 0, w, h);
 
             if(renderer.minimap.getTexture() != null){
                 Draw.color();

core/src/mindustry/ui/fragments/ScriptConsoleFragment.java

@@ -112,7 +112,7 @@ public class ScriptConsoleFragment extends Table{
         Draw.color(shadowColor);
 
         if(open){
-            Fill.crect(offsetx, chatfield.y, chatfield.getWidth() + 15f, chatfield.getHeight() - 1);
+            Fill.crect(offsetx, chatfield.y + scene.marginBottom, chatfield.getWidth() + 15f, chatfield.getHeight() - 1);
         }
 
         super.draw();
@@ -125,7 +125,7 @@ public class ScriptConsoleFragment extends Table{
         Draw.color(shadowColor);
         Draw.alpha(shadowColor.a * opacity);
 
-        float theight = offsety + spacing + getMarginBottom();
+        float theight = offsety + spacing + getMarginBottom() + scene.marginBottom;
         for(int i = scrollPos; i < messages.size && i < messagesShown + scrollPos; i++){
 
             layout.setText(font, messages.get(i), Color.white, textWidth, Align.bottomLeft, true);

core/src/mindustry/world/Block.java

@@ -193,6 +193,8 @@ public class Block extends UnlockableContent{
     public BuildVisibility buildVisibility = BuildVisibility.hidden;
     /** Multiplier for speed of building this block. */
     public float buildCostMultiplier = 1f;
+    /** Build completion at which deconstruction finishes. */
+    public float deconstructThreshold = 0f;
     /** Multiplier for cost of research in tech tree. */
     public float researchCostMultiplier = 1;
     /** Whether this block has instant transfer.*/

core/src/mindustry/world/Build.java

@@ -37,8 +37,12 @@ public class Build{
         Block previous = tile.block();
         Block sub = ConstructBlock.get(previous.size);
 
+        Seq<Building> prevBuild = new Seq<>(1);
+        if(tile.build != null) prevBuild.add(tile.build);
+
         tile.setBlock(sub, team, rotation);
         tile.<ConstructBuild>bc().setDeconstruct(previous);
+        tile.<ConstructBuild>bc().prevBuild = prevBuild;
         tile.build.health = tile.build.maxHealth * prevPercent;
         if(unit != null && unit.isPlayer()) tile.build.lastAccessed = unit.getPlayer().name;
 

core/src/mindustry/world/blocks/ConstructBlock.java

@@ -289,7 +289,7 @@ public class ConstructBlock extends Block{
 
             progress = Mathf.clamp(progress - amount);
 
-            if(progress <= 0 || state.rules.infiniteResources){
+            if(progress <= (previous == null ? 0 : previous.deconstructThreshold) || state.rules.infiniteResources){
                 if(lastBuilder == null) lastBuilder = builder;
                 Call.deconstructFinish(tile, this.cblock == null ? previous : this.cblock, lastBuilder);
             }

core/src/mindustry/world/blocks/distribution/MassDriver.java

@@ -242,7 +242,7 @@ public class MassDriver extends Block{
 
         @Override
         public boolean acceptItem(Building source, Item item){
-            //mass drivers that ouput only cannot accept items
+            //mass drivers that output only cannot accept items
             return items.total() < itemCapacity && linkValid();
         }
 

core/src/mindustry/world/blocks/environment/Boulder.java

@@ -12,6 +12,8 @@ public class Boulder extends Block{
         super(name);
         breakable = true;
         alwaysReplace = true;
+        
+        deconstructThreshold = 0.35f;
     }
 
     @Override

core/src/mindustry/world/blocks/units/Reconstructor.java

@@ -114,6 +114,13 @@ public class Reconstructor extends UnitBlock{
             return capacities[item.id];
         }
 
+        @Override
+        public void overwrote(Seq<Building> builds){
+            if(builds.first().block == block){
+                items.add(builds.first().items);
+            }
+        }
+
         @Override
         public void draw(){
             Draw.rect(region, x, y);

fastlane/metadata/android/en-US/changelogs/29744.txt

@@ -0,0 +1,5 @@
+[This is a truncated changelog, see Github for full notes]
+Yeah, it's another hotfix. I missed these during earlier testing.
+
+- Fixed research deadlock caused by blocks requiring optional inputs as research
+- Possible fix for "Unsupported combination of formats" startup error

fastlane/metadata/steam/english/achievements.vdf

@@ -56,21 +56,21 @@
 		"NEW_ACHIEVEMENT_21_3_NAME"	"Swarm"
 		"NEW_ACHIEVEMENT_21_3_DESC"	"Have 100 units active at once."
 		"NEW_ACHIEVEMENT_21_4_NAME"	"Flock"
-		"NEW_ACHIEVEMENT_21_4_DESC"	"Have 10 Phantom Poly drones active at once."
+		"NEW_ACHIEVEMENT_21_4_DESC"	"Have 10 Poly drones active at once."
 		"NEW_ACHIEVEMENT_21_5_NAME"	"Roboticist"
 		"NEW_ACHIEVEMENT_21_5_DESC"	"Build every type of unit."
 		"NEW_ACHIEVEMENT_21_6_NAME"	"Legions"
 		"NEW_ACHIEVEMENT_21_6_DESC"	"Build 1000 units total."
 		"NEW_ACHIEVEMENT_21_9_NAME"	"You Should've Listened"
 		"NEW_ACHIEVEMENT_21_9_DESC"	"Die in the drop point exclusion zone."
-		"NEW_ACHIEVEMENT_21_10_NAME"	"There are naval units for that."
+		"NEW_ACHIEVEMENT_21_10_NAME"	"There Are Naval Units For That"
 		"NEW_ACHIEVEMENT_21_10_DESC"	"Drown."
 		"NEW_ACHIEVEMENT_21_11_NAME"	"Collector"
 		"NEW_ACHIEVEMENT_21_11_DESC"	"Fill the core to maximum capacity with every type of material."
 		"NEW_ACHIEVEMENT_21_12_NAME"	"Crowd"
 		"NEW_ACHIEVEMENT_21_12_DESC"	"Host a server with 10 players on it."
 		"NEW_ACHIEVEMENT_21_13_NAME"	"Invulnerable"
-		"NEW_ACHIEVEMENT_21_13_DESC"	"Build the Meltdown and, Spectre and Foreshadow.."
+		"NEW_ACHIEVEMENT_21_13_DESC"	"Build the Meltdown, Spectre and Foreshadow."
 		"NEW_ACHIEVEMENT_21_14_NAME"	"Liftoff"
 		"NEW_ACHIEVEMENT_21_14_DESC"	"Use the Launch Pad."
 		"NEW_ACHIEVEMENT_21_16_NAME"	"Heresy"
@@ -90,7 +90,7 @@
 		"NEW_ACHIEVEMENT_21_23_NAME"	"Ignition"
 		"NEW_ACHIEVEMENT_21_23_DESC"	"Power up an Impact Reactor."
 		"NEW_ACHIEVEMENT_21_24_NAME"	"Acceleration"
-		"NEW_ACHIEVEMENT_21_24_DESC"	"Activate the Interplanteary Accelerator."
+		"NEW_ACHIEVEMENT_21_24_DESC"	"Activate the Interplanetary Accelerator."
 		"NEW_ACHIEVEMENT_21_25_NAME"	"The Spiral"
 		"NEW_ACHIEVEMENT_21_25_DESC"	"Round and round it goes..."
 		"NEW_ACHIEVEMENT_21_26_NAME"	"Escalation"

fastlane/metadata/steam/english/description.txt

@@ -43,7 +43,7 @@
 
 [list]
 [*] 16 built in maps for custom games, in addition to campaign
-[*] Play Co-op, PvP or sandbox
+[*] Play co-op, PvP or sandbox
 [*] Join a public dedicated server, or invite friends to your own private session
 [*] Customizable game rules: Change block costs, enemy stats, starting items, wave timing and more
 [*] Mix & match gamemodes: Combine PvP and PvE gamemodes together

gradle.properties

@@ -1,3 +1,3 @@
 org.gradle.daemon=true
 org.gradle.jvmargs=-Xms256m -Xmx1024m
-archash=e13f9a192be0bad00766ff15a6bf7d2897ba00d1
+archash=3ed298e35dafc98667875c397c7cb0d0f1fcbc07

servers_be.json

@@ -5,9 +5,6 @@
   {
     "address": "nydustry.nydus.app:6060"
   },
-  {
-    "address": "md.surrealment.com"
-  },
   {
     "address": "routerchain.ddns.net:6568"
   },

servers_v6.json

@@ -5,7 +5,7 @@
   },
   {
     "name": "{AA}",
-    "address": ["aamindustry.play.ai:6571", "aamindustry.play.ai:6572"]
+    "address": ["aamindustry.play.ai", "aamindustry.play.ai:6571", "aamindustry.play.ai:6572", "aamindustry.play.ai:6573"]
   },
    {
     "name": "Atanner",
@@ -42,5 +42,9 @@
   {
     "name": "Gearblock",
     "address": ["attack.gearblock.app"]
+  },
+  {
+    "name": "Surrealment",
+    "address": ["md.surrealment.com"]
   }
 ]