Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'maps_phase_2'

Browse Source
This commit is contained in:
Epowerj
2022-08-25 01:15:59 -04:00
parent 276a59b874 8bc05be30e
commit 9f7d2b180e
6 changed files with 37 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/assets/maps/basin.msav
View File

Binary file not shown.

BIN
core/assets/maps/marsh.msav Normal file
View File

Binary file not shown.

BIN
core/assets/maps/peaks.msav Normal file
View File

Binary file not shown.

9
core/src/mindustry/content/Blocks.java
View File

@@ -2463,7 +2463,8 @@ public class Blocks{
chemicalCombustionChamber = new ConsumeGenerator("chemical-combustion-chamber"){{ chemicalCombustionChamber = new ConsumeGenerator("chemical-combustion-chamber"){{
requirements(Category.power, with(Items.graphite, 40, Items.tungsten, 40, Items.oxide, 40f, Items.silicon, 30)); requirements(Category.power, with(Items.graphite, 40, Items.tungsten, 40, Items.oxide, 40f, Items.silicon, 30));
powerProduction = 8f; powerProduction = 10f;
researchCost = with(Items.graphite, 2000, Items.tungsten, 1000, Items.oxide, 10, Items.silicon, 1500);
consumeLiquids(LiquidStack.with(Liquids.ozone, 2f / 60f, Liquids.arkycite, 40f / 60f)); consumeLiquids(LiquidStack.with(Liquids.ozone, 2f / 60f, Liquids.arkycite, 40f / 60f));
size = 3; size = 3;
drawer = new DrawMulti(new DrawRegion("-bottom"), new DrawPistons(){{ drawer = new DrawMulti(new DrawRegion("-bottom"), new DrawPistons(){{
@@ -3890,7 +3891,7 @@ public class Blocks{
hitEffect = despawnEffect = Fx.hitBulletColor; hitEffect = despawnEffect = Fx.hitBulletColor;
buildingDamageMultiplier = 0.3f; buildingDamageMultiplier = 0.3f;
}}, }},
Items.tungsten, new BasicBulletType(8f, 165){{ Items.tungsten, new BasicBulletType(8f, 95){{
width = 13f; width = 13f;
height = 19f; height = 19f;
hitSize = 7f; hitSize = 7f;
@@ -4068,6 +4069,8 @@ public class Blocks{
scaledHealth = 210; scaledHealth = 210;
shootY = 7f; shootY = 7f;
size = 3; size = 3;
researchCost = with(Items.tungsten, 400, Items.silicon, 400, Items.oxide, 80, Items.beryllium, 800);
}}; }};
titan = new ItemTurret("titan"){{ titan = new ItemTurret("titan"){{
@@ -5408,6 +5411,8 @@ public class Blocks{
upgrades.addAll( upgrades.addAll(
new UnitType[]{UnitTypes.elude, UnitTypes.avert} new UnitType[]{UnitTypes.elude, UnitTypes.avert}
); );
researchCost = with(Items.beryllium, 500, Items.tungsten, 200, Items.silicon, 300, Items.oxide, 80);
}}; }};
//yes very silly name //yes very silly name

38
core/src/mindustry/content/ErekirTechTree.java
View File

@@ -114,12 +114,12 @@ public class ErekirTechTree{
}); });
node(constructor, Seq.with(new OnSector(split)), () -> { node(constructor, Seq.with(new OnSector(split)), () -> {
node(smallDeconstructor, () -> { node(smallDeconstructor, Seq.with(new OnSector(peaks)), () -> {
node(largeConstructor, () -> { node(largeConstructor, Seq.with(tmpNever), () -> {
}); });
node(deconstructor, () -> { node(deconstructor, Seq.with(tmpNever), () -> {
}); });
}); });
@@ -135,7 +135,7 @@ public class ErekirTechTree{
//TODO move into turbine condenser? //TODO move into turbine condenser?
node(plasmaBore, () -> { node(plasmaBore, () -> {
node(impactDrill, Seq.with(new OnSector(aegis)), () -> { node(impactDrill, Seq.with(new OnSector(aegis)), () -> {
node(largePlasmaBore, Seq.with(new OnSector(basin)), () -> { node(largePlasmaBore, Seq.with(tmpNever), () -> {
node(eruptionDrill, () -> { node(eruptionDrill, () -> {
}); });
@@ -153,14 +153,14 @@ public class ErekirTechTree{
}); });
}); });
node(beamTower, Seq.with(new OnSector(basin)), () -> { node(beamTower, Seq.with(new OnSector(peaks)), () -> {
}); });
node(regenProjector, () -> { node(regenProjector, Seq.with(new OnSector(peaks)), () -> {
//TODO more tiers of build tower or "support" structures like overdrive projectors //TODO more tiers of build tower or "support" structures like overdrive projectors
node(buildTower, Seq.with(new OnSector(basin)), () -> { node(buildTower, Seq.with(tmpNever), () -> {
node(shockwaveTower, () -> { node(shockwaveTower, () -> {
}); });
@@ -192,8 +192,8 @@ public class ErekirTechTree{
node(cliffCrusher, () -> { node(cliffCrusher, () -> {
node(siliconArcFurnace, () -> { node(siliconArcFurnace, () -> {
node(electrolyzer, Seq.with(new OnSector(atlas)), () -> { node(electrolyzer, Seq.with(new OnSector(atlas)), () -> {
node(oxidationChamber, Seq.with(new Research(tankRefabricator), new OnSector(basin)), () -> { node(oxidationChamber, Seq.with(new Research(tankRefabricator), new OnSector(marsh)), () -> {
node(electricHeater, Seq.with(new OnSector(basin)), () -> { node(electricHeater, Seq.with(tmpNever), () -> {
node(heatRedirector, () -> { node(heatRedirector, () -> {
node(surgeCrucible, () -> { node(surgeCrucible, () -> {
@@ -260,14 +260,14 @@ public class ErekirTechTree{
}); });
node(diffuse, Seq.with(new OnSector(lake)), () -> { node(diffuse, Seq.with(new OnSector(lake)), () -> {
node(sublimate, () -> { node(sublimate, Seq.with(new OnSector(marsh)), () -> {
node(titan, Seq.with(new OnSector(basin)), () -> { node(titan, Seq.with(new OnSector(marsh)), () -> {
node(afflict, Seq.with(new OnSector(basin)), () -> { node(afflict, Seq.with(new OnSector(marsh)), () -> {
}); });
}); });
node(disperse, Seq.with(new OnSector(basin)), () -> { node(disperse, Seq.with(new OnSector(marsh)), () -> {
}); });
}); });
@@ -279,7 +279,7 @@ public class ErekirTechTree{
}); });
}); });
node(coreCitadel, Seq.with(new SectorComplete(basin)), () -> { node(coreCitadel, Seq.with(new SectorComplete(peaks)), () -> {
node(coreAcropolis, () -> { node(coreAcropolis, () -> {
}); });
@@ -288,7 +288,7 @@ public class ErekirTechTree{
node(tankFabricator, Seq.with(new Research(siliconArcFurnace), new Research(plasmaBore), new Research(turbineCondenser)), () -> { node(tankFabricator, Seq.with(new Research(siliconArcFurnace), new Research(plasmaBore), new Research(turbineCondenser)), () -> {
node(UnitTypes.stell); node(UnitTypes.stell);
node(unitRepairTower, Seq.with(new OnSector(basin), new Research(mechRefabricator)), () -> { node(unitRepairTower, Seq.with(tmpNever, new Research(mechRefabricator)), () -> {
}); });
@@ -304,11 +304,11 @@ public class ErekirTechTree{
node(mechRefabricator, Seq.with(new OnSector(basin)), () -> { node(mechRefabricator, Seq.with(new OnSector(basin)), () -> {
node(UnitTypes.cleroi); node(UnitTypes.cleroi);
node(shipRefabricator, Seq.with(new OnSector(basin), tmpNever), () -> { node(shipRefabricator, Seq.with(new OnSector(peaks)), () -> {
node(UnitTypes.avert); node(UnitTypes.avert);
//TODO //TODO
node(primeRefabricator, () -> { node(primeRefabricator, Seq.with(tmpNever), () -> {
node(UnitTypes.precept); node(UnitTypes.precept);
node(UnitTypes.anthicus); node(UnitTypes.anthicus);
node(UnitTypes.obviate); node(UnitTypes.obviate);
@@ -358,7 +358,11 @@ public class ErekirTechTree{
}); });
node(basin, Seq.with(new SectorComplete(atlas)), () -> { node(basin, Seq.with(new SectorComplete(atlas)), () -> {
node(marsh, Seq.with(new SectorComplete(basin)), () ->{
node(peaks, Seq.with(new SectorComplete(marsh), new SectorComplete(split)), () ->{
});
});
}); });
}); });
}); });

10
core/src/mindustry/content/SectorPresets.java
View File

@@ -12,7 +12,7 @@ public class SectorPresets{
impact0078, desolateRift, nuclearComplex, planetaryTerminal, impact0078, desolateRift, nuclearComplex, planetaryTerminal,
coastline, navalFortress, coastline, navalFortress,
onset, aegis, lake, intersect, basin, atlas, split; onset, aegis, lake, intersect, basin, atlas, split, marsh, peaks;
public static void load(){ public static void load(){
//region serpulo //region serpulo
@@ -139,6 +139,14 @@ public class SectorPresets{
difficulty = 6; difficulty = 6;
}}; }};
marsh = new SectorPreset("marsh", erekir, 25){{
difficulty = 4;
}};
peaks = new SectorPreset("peaks", erekir, 30){{
difficulty = 3;
}};
//endregion //endregion
} }
} }