From ddc8f853967dc6eee0d97922917e003cd397dbf1 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sun, 6 Oct 2024 15:21:20 -0400 Subject: [PATCH] Bundle update --- core/assets/bundles/bundle.properties | 2 ++ core/src/mindustry/content/SectorPresets.java | 4 +-- .../mindustry/content/SerpuloTechTree.java | 36 ++++++++++--------- .../abilities/StatusFieldAbility.java | 5 ++- 4 files changed, 27 insertions(+), 20 deletions(-) diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 0cb818bbfc..3663cd506c 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -839,6 +839,7 @@ sector.polarAerodrome.name = Polar Aerodrome sector.atolls.name = Atolls sector.testingGrounds.name = Testing Grounds sector.seaPort.name = Sea Port +sector.weatheredChannels.name = Weathered Channels sector.groundZero.description = The optimal location to begin once more. Low enemy threat. Few resources.\nGather as much lead and copper as possible.\nMove on. sector.frozenForest.description = Even here, closer to mountains, the spores have spread. The frigid temperatures cannot contain them forever.\n\nBegin the venture into power. Build combustion generators. Learn to use menders. @@ -866,6 +867,7 @@ sector.infestedCanyons.description = WIP, map submission by Skeledragon sector.polarAerodrome.description = WIP, map submission by hhh i 17 sector.testingGrounds.description = WIP, map submission by dnx2019 sector.seaPort.description = WIP, map submission by inkognito626 +sector.weatheredChannels.description = WIP, map submission by Skeledragon sector.onset.name = The Onset sector.aegis.name = Aegis diff --git a/core/src/mindustry/content/SectorPresets.java b/core/src/mindustry/content/SectorPresets.java index d9e0cb20ad..2d099f35db 100644 --- a/core/src/mindustry/content/SectorPresets.java +++ b/core/src/mindustry/content/SectorPresets.java @@ -97,11 +97,11 @@ public class SectorPresets{ weatheredChannels = new SectorPreset("weatheredChannels", serpulo, 39){{ captureWave = 40; - difficulty = 7; + difficulty = 9; }}; navalFortress = new SectorPreset("navalFortress", serpulo, 216){{ - difficulty = 9; + difficulty = 8; }}; frontier = new SectorPreset("frontier", serpulo, 203){{ diff --git a/core/src/mindustry/content/SerpuloTechTree.java b/core/src/mindustry/content/SerpuloTechTree.java index 25a63a52cd..d16383e1b8 100644 --- a/core/src/mindustry/content/SerpuloTechTree.java +++ b/core/src/mindustry/content/SerpuloTechTree.java @@ -464,18 +464,6 @@ public class SerpuloTechTree{ new Research(kiln), new Research(mechanicalPump) ), () -> { - node(seaPort, Seq.with( - new SectorComplete(biomassFacility), - new Research(navalFactory), - new Research(risso), - new Research(retusa), - new Research(steamGenerator), - new Research(cultivator), - new Research(coalCentrifuge) - ), () -> { - - }); - node(windsweptIslands, Seq.with( new SectorComplete(ruinousShores), new Research(pneumaticDrill), @@ -483,6 +471,18 @@ public class SerpuloTechTree{ new Research(siliconSmelter), new Research(steamGenerator) ), () -> { + node(seaPort, Seq.with( + new SectorComplete(biomassFacility), + new Research(navalFactory), + new Research(risso), + new Research(retusa), + new Research(steamGenerator), + new Research(cultivator), + new Research(coalCentrifuge) + ), () -> { + + }); + node(tarFields, Seq.with( new SectorComplete(windsweptIslands), new Research(coalCentrifuge), @@ -577,11 +577,6 @@ public class SerpuloTechTree{ new Research(navalFactory), new Research(payloadConveyor) ), () -> { - node(weatheredChannels, Seq.with( - new SectorComplete(impact0078) - ), () -> { - - }); node(navalFortress, Seq.with( new SectorComplete(coastline), @@ -594,7 +589,14 @@ public class SerpuloTechTree{ new Research(cyclone), new Research(ripple) ), () -> { + node(weatheredChannels, Seq.with( + new SectorComplete(impact0078), + new Research(bryde), + new Research(surgeSmelter), + new Research(overdriveProjector) + ), () -> { + }); }); }); }); diff --git a/core/src/mindustry/entities/abilities/StatusFieldAbility.java b/core/src/mindustry/entities/abilities/StatusFieldAbility.java index c0ca12d381..a70a382bf0 100644 --- a/core/src/mindustry/entities/abilities/StatusFieldAbility.java +++ b/core/src/mindustry/entities/abilities/StatusFieldAbility.java @@ -1,12 +1,14 @@ package mindustry.entities.abilities; import arc.*; +import arc.graphics.*; import arc.math.*; import arc.scene.ui.layout.*; import arc.util.*; import mindustry.content.*; import mindustry.entities.*; import mindustry.gen.*; +import mindustry.graphics.*; import mindustry.type.*; import static mindustry.Vars.*; @@ -19,6 +21,7 @@ public class StatusFieldAbility extends Ability{ public Effect activeEffect = Fx.overdriveWave; public float effectX, effectY; public boolean parentizeEffects, effectSizeParam = true; + public Color color = Pal.accent; protected float timer; @@ -52,7 +55,7 @@ public class StatusFieldAbility extends Ability{ }); float x = unit.x + Angles.trnsx(unit.rotation, effectY, effectX), y = unit.y + Angles.trnsy(unit.rotation, effectY, effectX); - activeEffect.at(x, y, effectSizeParam ? range : unit.rotation, parentizeEffects ? unit : null); + activeEffect.at(x, y, effectSizeParam ? range : unit.rotation, color, parentizeEffects ? unit : null); timer = 0f; }