Atolls map fixes / Extraction outpost edits / Option to hide objectives
This commit is contained in:
Binary file not shown.
Binary file not shown.
@@ -195,7 +195,7 @@ public class BuilderAI extends AIController{
|
|||||||
}
|
}
|
||||||
|
|
||||||
if(!unit.type.flying){
|
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());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1872,7 +1872,7 @@ public class UnitTypes{
|
|||||||
rotateSpeed = 5f;
|
rotateSpeed = 5f;
|
||||||
mirror = true;
|
mirror = true;
|
||||||
rotate = true;
|
rotate = true;
|
||||||
bullet = new LaserBoltBulletType(5.2f, 10){{
|
bullet = new LaserBoltBulletType(5.2f, 12){{
|
||||||
lifetime = 30f;
|
lifetime = 30f;
|
||||||
healPercent = 5.5f;
|
healPercent = 5.5f;
|
||||||
collidesTeam = true;
|
collidesTeam = true;
|
||||||
|
|||||||
@@ -95,7 +95,7 @@ public class Units{
|
|||||||
|
|
||||||
public static int getCap(Team team){
|
public static int getCap(Team team){
|
||||||
//wave team has no cap
|
//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 Integer.MAX_VALUE;
|
||||||
}
|
}
|
||||||
return Math.max(0, state.rules.unitCapVariable ? state.rules.unitCap + team.data().unitCap : state.rules.unitCap);
|
return Math.max(0, state.rules.unitCapVariable ? state.rules.unitCap + team.data().unitCap : state.rules.unitCap);
|
||||||
|
|||||||
@@ -164,6 +164,7 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
|
|||||||
|
|
||||||
/** Base abstract class for any in-map objective. */
|
/** Base abstract class for any in-map objective. */
|
||||||
public static abstract class MapObjective{
|
public static abstract class MapObjective{
|
||||||
|
public boolean hidden;
|
||||||
public @Nullable @Multiline String details;
|
public @Nullable @Multiline String details;
|
||||||
public @Unordered String[] flagsAdded = {};
|
public @Unordered String[] flagsAdded = {};
|
||||||
public @Unordered String[] flagsRemoved = {};
|
public @Unordered String[] flagsRemoved = {};
|
||||||
|
|||||||
@@ -135,6 +135,8 @@ public class Rules{
|
|||||||
public int winWave = 0;
|
public int winWave = 0;
|
||||||
/** Base unit cap. Can still be increased by blocks. */
|
/** Base unit cap. Can still be increased by blocks. */
|
||||||
public int unitCap = 0;
|
public int unitCap = 0;
|
||||||
|
/** If true, the unit cap is disabled. */
|
||||||
|
public boolean disableUnitCap;
|
||||||
/** Environment drag multiplier. */
|
/** Environment drag multiplier. */
|
||||||
public float dragMultiplier = 1f;
|
public float dragMultiplier = 1f;
|
||||||
/** Environmental flags that dictate visuals & how blocks function. */
|
/** Environmental flags that dictate visuals & how blocks function. */
|
||||||
|
|||||||
@@ -806,7 +806,7 @@ public class HudFragment{
|
|||||||
if(state.rules.objectives.any()){
|
if(state.rules.objectives.any()){
|
||||||
boolean first = true;
|
boolean first = true;
|
||||||
for(var obj : state.rules.objectives){
|
for(var obj : state.rules.objectives){
|
||||||
if(!obj.qualified()) continue;
|
if(!obj.qualified() || obj.hidden) continue;
|
||||||
|
|
||||||
String text = obj.text();
|
String text = obj.text();
|
||||||
if(text != null && !text.isEmpty()){
|
if(text != null && !text.isEmpty()){
|
||||||
|
|||||||
Reference in New Issue
Block a user