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

Bundle update

Browse Source
This commit is contained in:
Anuken
2024-10-06 15:21:20 -04:00
parent 59936b84b9
commit ddc8f85396
4 changed files with 27 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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){{

36
core/src/mindustry/content/SerpuloTechTree.java
View File

@@ -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)
), () -> {
});
});
});
});

5
core/src/mindustry/entities/abilities/StatusFieldAbility.java
View File

@@ -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;
}