From 28b2d5d6f70ee83a7e1e4a0dcd5d5c51e33dc4c6 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 5 Feb 2022 21:51:29 -0500 Subject: [PATCH] New WIP attack sectgor --- core/assets/maps/four.msav | Bin 0 -> 53304 bytes .../src/mindustry/content/ErekirTechTree.java | 20 +++++++++++------- core/src/mindustry/content/Fx.java | 2 +- core/src/mindustry/content/SectorPresets.java | 6 +++++- .../src/mindustry/entities/comp/FireComp.java | 1 - .../world/blocks/environment/SteamVent.java | 5 ++++- 6 files changed, 22 insertions(+), 12 deletions(-) create mode 100644 core/assets/maps/four.msav diff --git a/core/assets/maps/four.msav b/core/assets/maps/four.msav new file mode 100644 index 0000000000000000000000000000000000000000..e33f7e2c33044f4f944c405f1b4184b21f301370 GIT binary patch literal 53304 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 literal 0 HcmV?d00001 diff --git a/core/src/mindustry/content/ErekirTechTree.java b/core/src/mindustry/content/ErekirTechTree.java index 36980357ae..7de78f2c9a 100644 --- a/core/src/mindustry/content/ErekirTechTree.java +++ b/core/src/mindustry/content/ErekirTechTree.java @@ -19,7 +19,7 @@ public class ErekirTechTree{ costMultipliers.put(Items.surgeAlloy, 4); costMultipliers.put(Items.phaseFabric, 4); costMultipliers.put(Items.thorium, 9); - costMultipliers.put(Items.graphite, 10); + costMultipliers.put(Items.graphite, 9); //TODO gate behind capture @@ -54,7 +54,9 @@ public class ErekirTechTree{ }); //TODO should only be unlocked in unit sector - node(constructor, Seq.with(new Research(siliconArcFurnace), erekirSector.first()), () -> { + node(constructor, Seq.with(new Research(siliconArcFurnace), new OnSector(four)), () -> { + + //TODO further limitations node(payloadLoader, () -> { node(payloadUnloader, () -> { node(payloadPropulsionTower, () -> { @@ -78,7 +80,7 @@ public class ErekirTechTree{ //TODO move into turbine condenser? node(plasmaBore, () -> { node(impactDrill, Seq.with(new OnSector(aware)), () -> { - node(largePlasmaBore, () -> { + node(largePlasmaBore, Seq.with(new OnSector(four)), () -> { node(eruptionDrill, () -> { }); @@ -96,14 +98,14 @@ public class ErekirTechTree{ }); }); - node(beamTower, () -> { + node(beamTower, Seq.with(new OnSector(four)), () -> { }); node(regenProjector, () -> { //TODO more tiers of build tower or "support" structures like overdrive projectors - node(buildTower, () -> { + node(buildTower, Seq.with(new OnSector(four)), () -> { }); }); @@ -134,7 +136,7 @@ public class ErekirTechTree{ node(cliffCrusher, () -> { node(electrolyzer, Seq.with(new OnSector(three)), () -> { node(oxidationChamber, () -> { - node(electricHeater, () -> { + node(electricHeater, Seq.with(new OnSector(four)), () -> { node(heatRedirector, () -> { }); @@ -157,7 +159,7 @@ public class ErekirTechTree{ }); }); - node(slagIncinerator, () -> { + node(slagIncinerator, Seq.with(new OnSector(four)), () -> { node(slagCentrifuge, () -> { @@ -194,7 +196,7 @@ public class ErekirTechTree{ }); }); - node(coreCitadel, () -> { + node(coreCitadel, Seq.with(new SectorComplete(four)), () -> { node(coreAcropolis, () -> { }); @@ -204,7 +206,9 @@ public class ErekirTechTree{ node(onset, () -> { node(aware, Seq.with(new SectorComplete(onset), new Research(ductRouter)), () -> { node(three, Seq.with(new SectorComplete(aware), new Research(reinforcedContainer), new Research(ductUnloader), new Research(ventCondenser)), () -> { + node(four, Seq.with(new SectorComplete(three), new Research(electrolyzer), new Research(oxidationChamber), new Research(chemicalCombustionChamber)), () -> { + }); }); }); }); diff --git a/core/src/mindustry/content/Fx.java b/core/src/mindustry/content/Fx.java index eb82e01bf8..44f6514f44 100644 --- a/core/src/mindustry/content/Fx.java +++ b/core/src/mindustry/content/Fx.java @@ -1046,7 +1046,7 @@ public class Fx{ }), ventSteam = new Effect(140f, e -> { - color(Pal.vent, e.fslope() * 0.85f); + color(e.color, e.fslope() * 0.85f); float length = 3f + e.finpow() * 10f; rand.setSeed(e.id); diff --git a/core/src/mindustry/content/SectorPresets.java b/core/src/mindustry/content/SectorPresets.java index 359af7de91..d0483036ad 100644 --- a/core/src/mindustry/content/SectorPresets.java +++ b/core/src/mindustry/content/SectorPresets.java @@ -12,7 +12,7 @@ public class SectorPresets{ impact0078, desolateRift, nuclearComplex, planetaryTerminal, coastline, navalFortress, - onset, aware, three + onset, aware, three, four ; public static void load(){ @@ -128,6 +128,10 @@ public class SectorPresets{ difficulty = 5; }}; + four = new SectorPreset("four", erekir, 29){{ + difficulty = 6; + }}; + //endregion } } diff --git a/core/src/mindustry/entities/comp/FireComp.java b/core/src/mindustry/entities/comp/FireComp.java index 4ff123d1bb..33f6e3c4ae 100644 --- a/core/src/mindustry/entities/comp/FireComp.java +++ b/core/src/mindustry/entities/comp/FireComp.java @@ -28,7 +28,6 @@ abstract class FireComp implements Timedc, Posc, Syncc, Drawc{ public static final TextureRegion[] regions = new TextureRegion[frames]; @Import float time, lifetime, x, y; - @Import int id; Tile tile; private transient Block block; diff --git a/core/src/mindustry/world/blocks/environment/SteamVent.java b/core/src/mindustry/world/blocks/environment/SteamVent.java index 9daf441842..6ab3eccc75 100644 --- a/core/src/mindustry/world/blocks/environment/SteamVent.java +++ b/core/src/mindustry/world/blocks/environment/SteamVent.java @@ -1,5 +1,6 @@ package mindustry.world.blocks.environment; +import arc.graphics.*; import arc.graphics.g2d.*; import arc.math.*; import arc.math.geom.*; @@ -7,6 +8,7 @@ import arc.util.*; import mindustry.*; import mindustry.content.*; import mindustry.entities.*; +import mindustry.graphics.*; import mindustry.world.*; import static mindustry.Vars.*; @@ -27,6 +29,7 @@ public class SteamVent extends Floor{ public Block parent = Blocks.air; public Effect effect = Fx.ventSteam; + public Color effectColor = Pal.vent; public float effectSpacing = 15f; static{ @@ -58,7 +61,7 @@ public class SteamVent extends Floor{ @Override public void renderUpdate(UpdateRenderState state){ if(state.tile.block() == Blocks.air && (state.data += Time.delta) >= effectSpacing){ - effect.at(state.tile.x * tilesize - tilesize, state.tile.y * tilesize - tilesize); + effect.at(state.tile.x * tilesize - tilesize, state.tile.y * tilesize - tilesize, effectColor); state.data = 0f; } }