From 840ac5f9132295a5cba39f4e9567969bd80dfc47 Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 26 Sep 2025 23:59:25 -0400 Subject: [PATCH] Map submission for 0 / 218 thorium removed / Fixed turrets rotating in editor --- core/assets/maps/hidden-serpulo/0.msav | Bin 0 -> 22812 bytes core/src/mindustry/editor/EditorRenderer.java | 2 +- .../src/mindustry/maps/SectorSubmissions.java | 19 +++++++++++++----- .../maps/planet/SerpuloPlanetGenerator.java | 3 ++- core/src/mindustry/world/Block.java | 2 ++ .../world/blocks/defense/turrets/Turret.java | 1 + 6 files changed, 20 insertions(+), 7 deletions(-) create mode 100644 core/assets/maps/hidden-serpulo/0.msav diff --git a/core/assets/maps/hidden-serpulo/0.msav b/core/assets/maps/hidden-serpulo/0.msav new file mode 100644 index 0000000000000000000000000000000000000000..6dec7ac8008075c74f213e53894b1d86ffa356d3 GIT binary patch literal 22812 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 0){ + preset.captureWave = captureWave; + }else{ + sector.generateEnemyBase = true; + } } static void registerThread(int id, String link){ diff --git a/core/src/mindustry/maps/planet/SerpuloPlanetGenerator.java b/core/src/mindustry/maps/planet/SerpuloPlanetGenerator.java index 1e760976eb..ee1d97202a 100644 --- a/core/src/mindustry/maps/planet/SerpuloPlanetGenerator.java +++ b/core/src/mindustry/maps/planet/SerpuloPlanetGenerator.java @@ -507,7 +507,8 @@ public class SerpuloPlanetGenerator extends PlanetGenerator{ ores.add(Blocks.oreTitanium); } - if(Simplex.noise3d(seed, 2, 0.5, scl, sector.tile.v.x + 2, sector.tile.v.y, sector.tile.v.z)*nmag + poles > 0.7f*addscl){ + //218 doesn't have thorium generation due to proximity (TODO remove the special case and replace with hidden preset) + if(Simplex.noise3d(seed, 2, 0.5, scl, sector.tile.v.x + 2, sector.tile.v.y, sector.tile.v.z)*nmag + poles > 0.7f*addscl && sector.id != 218){ ores.add(Blocks.oreThorium); } diff --git a/core/src/mindustry/world/Block.java b/core/src/mindustry/world/Block.java index 7841f9fbbc..3d49162912 100644 --- a/core/src/mindustry/world/Block.java +++ b/core/src/mindustry/world/Block.java @@ -112,6 +112,8 @@ public class Block extends UnlockableContent implements Senseable{ public boolean rotate; /** if rotate is true and this is false, the region won't rotate when drawing */ public boolean rotateDraw = true; + /** if rotate is true and this is false, the region won't rotate when drawing in the editor */ + public boolean rotateDrawEditor = true; /** if rotate = false and this is true, rotation will be locked at 0 when placing (default); advanced use only */ public boolean lockRotation = true; /** if true, schematic flips with this block are inverted. */ diff --git a/core/src/mindustry/world/blocks/defense/turrets/Turret.java b/core/src/mindustry/world/blocks/defense/turrets/Turret.java index 2bf9e2c756..87ab79bf8a 100644 --- a/core/src/mindustry/world/blocks/defense/turrets/Turret.java +++ b/core/src/mindustry/world/blocks/defense/turrets/Turret.java @@ -159,6 +159,7 @@ public class Turret extends ReloadTurret{ rotate = true; quickRotate = false; drawArrow = false; + rotateDrawEditor = false; } @Override