mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-22 04:28:27 +07:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken 2022-08-25 15:09:26 -04:00
commit 3f8d4c5459
7 changed files with 42 additions and 26 deletions
Show Stats 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

@ -2466,7 +2466,8 @@ public class Blocks{
chemicalCombustionChamber = new ConsumeGenerator("chemical-combustion-chamber"){{
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));
size = 3;
drawer = new DrawMulti(new DrawRegion("-bottom"), new DrawPistons(){{
@ -3894,7 +3895,7 @@ public class Blocks{
hitEffect = despawnEffect = Fx.hitBulletColor;
buildingDamageMultiplier = 0.3f;
}},
Items.tungsten, new BasicBulletType(8f, 165){{
Items.tungsten, new BasicBulletType(8f, 95){{
width = 13f;
height = 19f;
hitSize = 7f;
@ -4072,6 +4073,8 @@ public class Blocks{
scaledHealth = 210;
shootY = 7f;
size = 3;
researchCost = with(Items.tungsten, 400, Items.silicon, 400, Items.oxide, 80, Items.beryllium, 800);
}};
titan = new ItemTurret("titan"){{
@ -5412,6 +5415,8 @@ public class Blocks{
upgrades.addAll(
new UnitType[]{UnitTypes.elude, UnitTypes.avert}
);
researchCost = with(Items.beryllium, 500, Items.tungsten, 200, Items.silicon, 300, Items.oxide, 80);
}};
//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(smallDeconstructor, () -> {
node(largeConstructor, () -> {
node(smallDeconstructor, Seq.with(new OnSector(peaks)), () -> {
node(largeConstructor, Seq.with(tmpNever), () -> {
});
node(deconstructor, () -> {
node(deconstructor, Seq.with(tmpNever), () -> {
});
});
@ -135,7 +135,7 @@ public class ErekirTechTree{
//TODO move into turbine condenser?
node(plasmaBore, () -> {
node(impactDrill, Seq.with(new OnSector(aegis)), () -> {
node(largePlasmaBore, Seq.with(new OnSector(basin)), () -> {
node(largePlasmaBore, Seq.with(tmpNever), () -> {
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
node(buildTower, Seq.with(new OnSector(basin)), () -> {
node(buildTower, Seq.with(tmpNever), () -> {
node(shockwaveTower, () -> {
});
@ -192,8 +192,8 @@ public class ErekirTechTree{
node(cliffCrusher, () -> {
node(siliconArcFurnace, () -> {
node(electrolyzer, Seq.with(new OnSector(atlas)), () -> {
node(oxidationChamber, Seq.with(new Research(tankRefabricator), new OnSector(basin)), () -> {
node(electricHeater, Seq.with(new OnSector(basin)), () -> {
node(oxidationChamber, Seq.with(new Research(tankRefabricator), new OnSector(marsh)), () -> {
node(electricHeater, Seq.with(tmpNever), () -> {
node(heatRedirector, () -> {
node(surgeCrucible, () -> {
@ -260,14 +260,14 @@ public class ErekirTechTree{
});
node(diffuse, Seq.with(new OnSector(lake)), () -> {
node(sublimate, () -> {
node(titan, Seq.with(new OnSector(basin)), () -> {
node(afflict, Seq.with(new OnSector(basin)), () -> {
node(sublimate, Seq.with(new OnSector(marsh)), () -> {
node(titan, Seq.with(new OnSector(marsh)), () -> {
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, () -> {
});
@ -288,7 +288,7 @@ public class ErekirTechTree{
node(tankFabricator, Seq.with(new Research(siliconArcFurnace), new Research(plasmaBore), new Research(turbineCondenser)), () -> {
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(UnitTypes.cleroi);
node(shipRefabricator, Seq.with(new OnSector(basin), tmpNever), () -> {
node(shipRefabricator, Seq.with(new OnSector(peaks)), () -> {
node(UnitTypes.avert);
//TODO
node(primeRefabricator, () -> {
node(primeRefabricator, Seq.with(tmpNever), () -> {
node(UnitTypes.precept);
node(UnitTypes.anthicus);
node(UnitTypes.obviate);
@ -358,7 +358,11 @@ public class ErekirTechTree{
});
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,
coastline, navalFortress,
onset, aegis, lake, intersect, basin, atlas, split;
onset, aegis, lake, intersect, basin, atlas, split, marsh, peaks;
public static void load(){
//region serpulo
@ -139,6 +139,14 @@ public class SectorPresets{
difficulty = 6;
}};
marsh = new SectorPreset("marsh", erekir, 25){{
difficulty = 4;
}};
peaks = new SectorPreset("peaks", erekir, 30){{
difficulty = 3;
}};
//endregion
}
}

11
core/src/mindustry/ui/dialogs/DiscordDialog.java
View File

@ -29,20 +29,19 @@ public class DiscordDialog extends Dialog{
}).expandY();
t.table(i -> {
i.background(Tex.button);
i.image(Icon.discord);
}).size(h).left();
t.add("@discord").color(Pal.accent).growX().padLeft(10f);
}).size(440f, h).pad(10f);
}).size(520f, h).pad(10f);
buttons.defaults().size(150f, 50);
buttons.defaults().size(170f, 50);
buttons.button("@back", this::hide);
buttons.button("@copylink", () -> {
buttons.button("@back", Icon.left, this::hide);
buttons.button("@copylink", Icon.copy, () -> {
Core.app.setClipboardText(discordURL);
});
buttons.button("@openlink", () -> {
buttons.button("@openlink", Icon.discord, () -> {
if(!Core.app.openURI(discordURL)){
ui.showErrorMessage("@linkfail");
Core.app.setClipboardText(discordURL);