mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-29 00:50:06 +07:00
Code Issues Packages Projects Releases Wiki Activity

Atolls map fixes / Extraction outpost edits / Option to hide objectives

Browse Source
This commit is contained in:
Anuken 2024-09-16 16:05:03 -04:00
parent ac928593e3
commit 4e19a3c4d0
8 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.

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

Binary file not shown.

2
core/src/mindustry/ai/types/BuilderAI.java
View File

@ -195,7 +195,7 @@ public class BuilderAI extends AIController{
}
if(!unit.type.flying){
unit.updateBoosting(moving || unit.floorOn().isDuct || unit.floorOn().damageTaken > 0f);
unit.updateBoosting(moving || unit.floorOn().isDuct || unit.floorOn().damageTaken > 0f || unit.floorOn().isDeep());
}
}

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

@ -1872,7 +1872,7 @@ public class UnitTypes{
rotateSpeed = 5f;
mirror = true;
rotate = true;
bullet = new LaserBoltBulletType(5.2f, 10){{
bullet = new LaserBoltBulletType(5.2f, 12){{
lifetime = 30f;
healPercent = 5.5f;
collidesTeam = true;

2
core/src/mindustry/entities/Units.java
View File

@ -95,7 +95,7 @@ public class Units{
public static int getCap(Team team){
//wave team has no cap
if((team == state.rules.waveTeam && !state.rules.pvp) || (state.isCampaign() && team == state.rules.waveTeam)){
if((team == state.rules.waveTeam && !state.rules.pvp) || (state.isCampaign() && team == state.rules.waveTeam) || state.rules.disableUnitCap){
return Integer.MAX_VALUE;
}
return Math.max(0, state.rules.unitCapVariable ? state.rules.unitCap + team.data().unitCap : state.rules.unitCap);

1
core/src/mindustry/game/MapObjectives.java
View File

@ -164,6 +164,7 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
/** Base abstract class for any in-map objective. */
public static abstract class MapObjective{
public boolean hidden;
public @Nullable @Multiline String details;
public @Unordered String[] flagsAdded = {};
public @Unordered String[] flagsRemoved = {};

2
core/src/mindustry/game/Rules.java
View File

@ -135,6 +135,8 @@ public class Rules{
public int winWave = 0;
/** Base unit cap. Can still be increased by blocks. */
public int unitCap = 0;
/** If true, the unit cap is disabled. */
public boolean disableUnitCap;
/** Environment drag multiplier. */
public float dragMultiplier = 1f;
/** Environmental flags that dictate visuals & how blocks function. */

2
core/src/mindustry/ui/fragments/HudFragment.java
View File

@ -806,7 +806,7 @@ public class HudFragment{
if(state.rules.objectives.any()){
boolean first = true;
for(var obj : state.rules.objectives){
if(!obj.qualified()) continue;
if(!obj.qualified() || obj.hidden) continue;
String text = obj.text();
if(text != null && !text.isEmpty()){