diff --git a/core/assets-raw/sprites/blocks/walls/tungsten-wall-large.png b/core/assets-raw/sprites/blocks/walls/tungsten-wall-large.png index d5a14f7432..92c9c839a5 100644 Binary files a/core/assets-raw/sprites/blocks/walls/tungsten-wall-large.png and b/core/assets-raw/sprites/blocks/walls/tungsten-wall-large.png differ diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index aab855be8c..5fae9c8e86 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -1125,7 +1125,7 @@ public class Blocks{ size = 3; itemCapacity = 20; hasPower = hasItems = true; - drawer = new DrawMulti(new DrawRegion("-bottom"), new DrawCrucible(), new DrawBlock(), new DrawHeatInput()); + drawer = new DrawMulti(new DrawRegion("-bottom"), new DrawCrucibleFlame(), new DrawBlock(), new DrawHeatInput()); drawer.iconOverride = new String[]{"-bottom", ""}; ambientSound = Sounds.smelter; ambientSoundVolume = 0.07f; @@ -1677,17 +1677,17 @@ public class Blocks{ //erekir transport blocks duct = new Duct("duct"){{ - requirements(Category.distribution, with(Items.graphite, 2)); + requirements(Category.distribution, with(Items.graphite, 1)); speed = 4f; }}; ductRouter = new DuctRouter("duct-router"){{ - requirements(Category.distribution, with(Items.graphite, 10)); + requirements(Category.distribution, with(Items.graphite, 8)); speed = 4f; }}; overflowDuct = new OverflowDuct("overflow-duct"){{ - requirements(Category.distribution, with(Items.graphite, 10)); + requirements(Category.distribution, with(Items.graphite, 8)); speed = 4f; }}; diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java index dd2cbbbe43..662faa746b 100644 --- a/core/src/mindustry/content/UnitTypes.java +++ b/core/src/mindustry/content/UnitTypes.java @@ -2494,6 +2494,37 @@ public class UnitTypes{ } }}; + //endregion + //region erekir - mech + + //TODO + + //endregion + //region erekir - flying + + //TODO + + //endregion + //region erekir - neoplasm + + if(false) + scuttler = new NeoplasmUnitType("scuttler"){{ + health = 20000; + armor = 17; + hitSize = 48f; + omniMovement = false; + rotateSpeed = 1.7f; + drownTimeMultiplier = 4f; + drawCell = false; + segments = 4; + drawBody = false; + crawlDamage = 2f; + + segmentScl = 4f; + segmentPhase = 5f; + speed = 1f; + }}; + //endregion //region erekir - core @@ -2748,27 +2779,6 @@ public class UnitTypes{ //}}; - //endregion - //region neoplasm - - if(false) - scuttler = new NeoplasmUnitType("scuttler"){{ - health = 20000; - armor = 17; - hitSize = 48f; - omniMovement = false; - rotateSpeed = 1.7f; - drownTimeMultiplier = 4f; - drawCell = false; - segments = 4; - drawBody = false; - crawlDamage = 2f; - - segmentScl = 4f; - segmentPhase = 5f; - speed = 1f; - }}; - //endregion } } diff --git a/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java b/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java index 261ed2b7b5..8d4040724b 100644 --- a/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java +++ b/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java @@ -249,7 +249,7 @@ public class ErekirPlanetGenerator extends PlanetGenerator{ Schematics.placeLaunchLoadout(spawnX, spawnY); //TODO this is only for testing - state.rules.defaultTeam.items().add(Seq.with(ItemStack.with(Items.beryllium, 300, Items.graphite, 300))); + state.rules.defaultTeam.items().add(Seq.with(ItemStack.with(Items.beryllium, 1000, Items.graphite, 1000))); //TODO proper waves state.rules.waves = true; diff --git a/core/src/mindustry/ui/dialogs/ModsDialog.java b/core/src/mindustry/ui/dialogs/ModsDialog.java index 5a7bf4d692..1377dc3abe 100644 --- a/core/src/mindustry/ui/dialogs/ModsDialog.java +++ b/core/src/mindustry/ui/dialogs/ModsDialog.java @@ -101,7 +101,7 @@ public class ModsDialog extends BaseDialog{ void modError(Throwable error){ ui.loadfrag.hide(); - if(Strings.getCauses(error).contains(t -> t.getMessage() != null && (t.getMessage().contains("trust anchor") || t.getMessage().contains("SSL") || t.getMessage().contains("protocol")))){ + if(error instanceof NoSuchMethodError || Strings.getCauses(error).contains(t -> t.getMessage() != null && (t.getMessage().contains("trust anchor") || t.getMessage().contains("SSL") || t.getMessage().contains("protocol")))){ ui.showErrorMessage("@feature.unsupported"); }else if(error instanceof HttpStatusException st){ ui.showErrorMessage(Core.bundle.format("connectfail", Strings.capitalize(st.status.toString().toLowerCase()))); diff --git a/core/src/mindustry/world/draw/DrawCrucible.java b/core/src/mindustry/world/draw/DrawCrucibleFlame.java similarity index 97% rename from core/src/mindustry/world/draw/DrawCrucible.java rename to core/src/mindustry/world/draw/DrawCrucibleFlame.java index 70ce737095..5b56341706 100644 --- a/core/src/mindustry/world/draw/DrawCrucible.java +++ b/core/src/mindustry/world/draw/DrawCrucibleFlame.java @@ -7,7 +7,7 @@ import arc.math.Interp.*; import arc.util.*; import mindustry.gen.*; -public class DrawCrucible extends DrawPartial{ +public class DrawCrucibleFlame extends DrawPartial{ public Color flameColor = Color.valueOf("f58349"), midColor = Color.valueOf("f2d585"); public float flameRad = 1f, circleSpace = 2f, flameRadiusScl = 10f, flameRadiusMag = 0.6f, circleStroke = 1.5f;