diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index b8955f6162..2d64b94e18 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -2805,9 +2805,7 @@ public class Blocks{ }} ); - shoot = new ShootAlternate(){{ - spread = 3.5f; - }}; + shoot = new ShootAlternate(3.5f); shootY = 3f; reload = 20f; @@ -3624,9 +3622,7 @@ public class Blocks{ range = 260f; inaccuracy = 3f; recoil = 3f; - shoot = new ShootAlternate(){{ - spread = 8f; - }}; + shoot = new ShootAlternate(8f); shake = 2f; size = 4; shootCone = 24f; diff --git a/core/src/mindustry/content/Planets.java b/core/src/mindustry/content/Planets.java index f7c4c1392b..409c41ff2e 100644 --- a/core/src/mindustry/content/Planets.java +++ b/core/src/mindustry/content/Planets.java @@ -50,7 +50,6 @@ public class Planets{ new HexSkyMesh(this, 2, 0.15f, 0.14f, 5, Color.valueOf("eba768").a(0.75f), 2, 0.42f, 1f, 0.43f), new HexSkyMesh(this, 3, 0.6f, 0.15f, 5, Color.valueOf("eea293").a(0.75f), 2, 0.42f, 1.2f, 0.45f) ); - sectorSeed = 1; alwaysUnlocked = true; landCloudColor = Color.valueOf("ed6542"); atmosphereColor = Color.valueOf("f07218"); @@ -122,6 +121,7 @@ public class Planets{ new HexSkyMesh(this, 1, 0.6f, 0.16f, 5, Color.white.cpy().lerp(Pal.spore, 0.55f).a(0.75f), 2, 0.45f, 1f, 0.41f) ); + sectorSeed = 2; allowWaves = true; allowWaveSimulation = true; allowSectorInvasion = true; diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java index 58390ecb37..6f1a34abc0 100644 --- a/core/src/mindustry/content/UnitTypes.java +++ b/core/src/mindustry/content/UnitTypes.java @@ -2518,9 +2518,7 @@ public class UnitTypes{ heatColor = Color.valueOf("f9350f"); cooldownTime = 30f; - shoot = new ShootAlternate(){{ - spread = 3.5f; - }}; + shoot = new ShootAlternate(3.5f); bullet = new RailBulletType(){{ length = 160f; @@ -4156,7 +4154,7 @@ public class UnitTypes{ }}; manifold = new ErekirUnitType("manifold"){{ - aiController = CargoAI::new; + controller = u -> new CargoAI(); isEnemy = false; allowedInPayloads = false; logicControllable = false; @@ -4183,7 +4181,7 @@ public class UnitTypes{ }}; assemblyDrone = new ErekirUnitType("assembly-drone"){{ - aiController = AssemblerAI::new; + controller = u -> new AssemblerAI(); flying = true; drag = 0.06f; diff --git a/core/src/mindustry/entities/pattern/ShootAlternate.java b/core/src/mindustry/entities/pattern/ShootAlternate.java index 22ac5b61ed..0e64e43423 100644 --- a/core/src/mindustry/entities/pattern/ShootAlternate.java +++ b/core/src/mindustry/entities/pattern/ShootAlternate.java @@ -8,6 +8,13 @@ public class ShootAlternate extends ShootPattern{ /** offset of barrel to start on */ public int barrelOffset = 0; + public ShootAlternate(float spread){ + this.spread = spread; + } + + public ShootAlternate(){ + } + @Override public void shoot(int totalShots, BulletHandler handler){ for(int i = 0; i < shots; i++){ diff --git a/core/src/mindustry/maps/planet/SerpuloPlanetGenerator.java b/core/src/mindustry/maps/planet/SerpuloPlanetGenerator.java index 8dc0312489..1959b552ef 100644 --- a/core/src/mindustry/maps/planet/SerpuloPlanetGenerator.java +++ b/core/src/mindustry/maps/planet/SerpuloPlanetGenerator.java @@ -82,13 +82,13 @@ public class SerpuloPlanetGenerator extends PlanetGenerator{ any = true; } - if(Structs.contains(tile.tiles, s -> sector.planet.getSector(s).id == sector.planet.startSector)) return; - if(noise < 0.16){ for(Ptile other : tile.tiles){ var osec = sector.planet.getSector(other); + //no sectors near start sector! if( + osec.id == sector.planet.startSector || //near starting sector osec.generateEnemyBase && poles < 0.85 || //near other base (sector.preset != null && noise < 0.11) //near preset ){ diff --git a/tools/src/mindustry/tools/Generators.java b/tools/src/mindustry/tools/Generators.java index 2ffe36e4a6..ff4dc97211 100644 --- a/tools/src/mindustry/tools/Generators.java +++ b/tools/src/mindustry/tools/Generators.java @@ -601,7 +601,8 @@ public class Generators{ //draw treads if(sample instanceof Tankc){ - image.draw(outline.get(get(type.treadRegion)), true); + Pixmap treads = outline.get(get(type.treadRegion)); + image.draw(treads, image.width / 2 - treads.width / 2, image.height / 2 - treads.height / 2, true); image.draw(get(type.previewRegion), true); }