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

Faction color changes again

Browse Source
This commit is contained in:
Anuken
2022-04-24 12:50:33 -04:00
parent ac5a14c18c
commit 14dcd71819
11 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -187,7 +187,7 @@ public class ErekirTechTree{
node(cliffCrusher, () -> {
node(siliconArcFurnace, () -> {
node(electrolyzer, Seq.with(new OnSector(two)), () -> {
node(electrolyzer, Seq.with(new OnSector(three)), () -> {
node(oxidationChamber, () -> {
node(electricHeater, Seq.with(new OnSector(four)), () -> {
node(heatRedirector, () -> {

2
core/src/mindustry/content/Planets.java
View File

@@ -6,6 +6,7 @@ import arc.math.*;
import arc.math.geom.*;
import arc.struct.*;
import arc.util.*;
import mindustry.game.*;
import mindustry.graphics.*;
import mindustry.graphics.g3d.*;
import mindustry.graphics.g3d.PlanetGrid.*;
@@ -68,6 +69,7 @@ public class Planets{
updateLighting = false;
ruleSetter = r -> {
r.waveTeam = Team.malis;
r.placeRangeCheck = false; //TODO true or false?
r.attributes.set(Attribute.heat, 0.8f);
r.showSpawns = true;

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

@@ -187,16 +187,16 @@ public class SectorPresets{
rules = r -> {
r.objectives.addAll(
new TimerObjective("[lightgray]Enemy detection:[] [accent]{0}", 5 * 60 * 60).withMarkers(
new TextMarker("The enemy will begin constructing units in 5 minutes.", 276f * 8f, 164f * 8f)
).withFlags("beginBuilding"),
new ProduceObjective(Items.tungsten).withMarkers(
new ShapeTextMarker("Tungsten can be mined using an [accent]impact drill[].\nThis structure requires [accent]water[] and [accent]power[].", 220f * 8f, 181f * 8f)
),
new DestroyBlockObjective(Blocks.largeShieldProjector, 210, 278, Team.malis).withMarkers(
new TextMarker("The enemy is protected by shields.\nAn experimental shield breaker module has been detected in this sector.\nFind and activate it using tungsten.", 276f * 8f, 164f * 8f),
new MinimapMarker(23f, 137f, Pal.accent)
)
new TimerObjective("[lightgray]Enemy detection:[] [accent]{0}", 5 * 60 * 60).withMarkers(
new TextMarker("The enemy will begin constructing units in 5 minutes.", 276f * 8f, 164f * 8f)
).withFlags("beginBuilding"),
new ProduceObjective(Items.tungsten).withMarkers(
new ShapeTextMarker("Tungsten can be mined using an [accent]impact drill[].\nThis structure requires [accent]water[] and [accent]power[].", 220f * 8f, 181f * 8f)
),
new DestroyBlockObjective(Blocks.largeShieldProjector, 210, 278, Team.malis).withMarkers(
new TextMarker("The enemy is protected by shields.\nAn experimental shield breaker module has been detected in this sector.\nFind and activate it using tungsten.", 276f * 8f, 164f * 8f),
new MinimapMarker(23f, 137f, Pal.accent)
)
);
};
}};

2
core/src/mindustry/content/StatusEffects.java
View File

@@ -161,7 +161,7 @@ public class StatusEffects{
}};
boss = new StatusEffect("boss"){{
color = Team.malis.color;
color = Team.crux.color;
permanent = true;
damageMultiplier = 1.3f;
healthMultiplier = 1.5f;