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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken
2022-08-30 21:17:44 -04:00
parent 4cd78aad91 a0cc74891a
commit 8f4251db3a
40 changed files with 70 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1662,6 +1662,7 @@ public class Blocks{
lightningChance = 0.05f;
lightningDamage = 30f;
armor = 20f;
researchCost = with(Items.surgeAlloy, 20, Items.tungsten, 100);
}};
reinforcedSurgeWallLarge = new Wall("reinforced-surge-wall-large"){{
@@ -1671,6 +1672,7 @@ public class Blocks{
lightningDamage = 30f;
armor = 20f;
size = 2;
researchCost = with(Items.surgeAlloy, 40, Items.tungsten, 200);
}};
carbideWall = new Wall("carbide-wall"){{
@@ -2045,6 +2047,7 @@ public class Blocks{
underBullets = true;
baseEfficiency = 1f;
consumePower(1f / 60f);
researchCost = with(Items.surgeAlloy, 30, Items.tungsten, 80);
}};
surgeRouter = new StackRouter("surge-router"){{
@@ -4359,7 +4362,7 @@ public class Blocks{
shootCone = 20f;
scaledHealth = 220;
rotateSpeed = 1.5f;
researchCostMultiplier = 0.05f;
researchCostMultiplier = 0.04f;
limitRange(9f);
}};

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

@@ -193,27 +193,27 @@ public class ErekirTechTree{
node(siliconArcFurnace, () -> {
node(electrolyzer, Seq.with(new OnSector(atlas)), () -> {
node(oxidationChamber, Seq.with(new Research(tankRefabricator), new OnSector(marsh)), () -> {
node(electricHeater, Seq.with(tmpNever), () -> {
node(heatRedirector, () -> {
node(surgeCrucible, () -> {
node(surgeCrucible, Seq.with(new OnSector(ravine)), () -> {
});
node(heatRedirector, Seq.with(new OnSector(ravine)), () -> {
node(electricHeater, Seq.with(new OnSector(ravine), new Research(afflict)), () -> {
node(slagHeater, Seq.with(tmpNever), () -> {
});
});
node(slagHeater, () -> {
});
node(atmosphericConcentrator, Seq.with(new OnSector(basin)), () -> {
node(cyanogenSynthesizer, Seq.with(new OnSector(basin)), () -> {
node(atmosphericConcentrator, Seq.with(tmpNever), () -> {
node(cyanogenSynthesizer, Seq.with(tmpNever), () -> {
});
});
});
node(carbideCrucible, Seq.with(tmpNever), () -> {
node(phaseSynthesizer, () -> {
node(phaseHeater, () -> {
node(carbideCrucible, Seq.with(tmpNever), () -> {
node(phaseSynthesizer, () -> {
node(phaseHeater, () -> {
});
});
});
});
@@ -261,15 +261,15 @@ public class ErekirTechTree{
node(diffuse, Seq.with(new OnSector(lake)), () -> {
node(sublimate, Seq.with(new OnSector(marsh)), () -> {
node(titan, Seq.with(new OnSector(marsh)), () -> {
node(afflict, Seq.with(new OnSector(marsh)), () -> {
node(afflict, Seq.with(new OnSector(ravine)), () -> {
node(titan, Seq.with(new OnSector(marsh)), () -> {
});
});
});
node(disperse, Seq.with(new OnSector(marsh)), () -> {
node(disperse, Seq.with(new OnSector(marsh)), () -> {
});
});
});
@@ -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(tmpNever, new Research(mechRefabricator)), () -> {
node(unitRepairTower, Seq.with(new OnSector(ravine), new Research(mechRefabricator)), () -> {
});
@@ -359,6 +359,10 @@ public class ErekirTechTree{
node(basin, Seq.with(new SectorComplete(atlas)), () -> {
node(marsh, Seq.with(new SectorComplete(basin)), () ->{
node(ravine, Seq.with(new SectorComplete(marsh), new Research(Liquids.slag)), () ->{
});
node(peaks, Seq.with(new SectorComplete(marsh), new SectorComplete(split)), () ->{
});

7
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, marsh, peaks;
onset, aegis, lake, intersect, basin, atlas, split, marsh, peaks, ravine;
public static void load(){
//region serpulo
@@ -147,6 +147,11 @@ public class SectorPresets{
difficulty = 3;
}};
ravine = new SectorPreset("ravine", erekir, 39){{
difficulty = 4;
captureWave = 24;
}};
//endregion
}
}