diff --git a/core/assets/maps/atolls.msav b/core/assets/maps/atolls.msav index 6f608eb951..83931ae31d 100644 Binary files a/core/assets/maps/atolls.msav and b/core/assets/maps/atolls.msav differ diff --git a/core/assets/maps/extractionOutpost.msav b/core/assets/maps/extractionOutpost.msav index 3896db8252..6ea0ae63dd 100644 Binary files a/core/assets/maps/extractionOutpost.msav and b/core/assets/maps/extractionOutpost.msav differ diff --git a/core/src/mindustry/ai/types/BuilderAI.java b/core/src/mindustry/ai/types/BuilderAI.java index ccbe64b7c6..09f8e082ab 100644 --- a/core/src/mindustry/ai/types/BuilderAI.java +++ b/core/src/mindustry/ai/types/BuilderAI.java @@ -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()); } } diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java index d50ea28261..c1d6274c47 100644 --- a/core/src/mindustry/content/UnitTypes.java +++ b/core/src/mindustry/content/UnitTypes.java @@ -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; diff --git a/core/src/mindustry/entities/Units.java b/core/src/mindustry/entities/Units.java index 5cdf7547b5..d74b41dad5 100644 --- a/core/src/mindustry/entities/Units.java +++ b/core/src/mindustry/entities/Units.java @@ -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); diff --git a/core/src/mindustry/game/MapObjectives.java b/core/src/mindustry/game/MapObjectives.java index d1ba8ffbc6..aacfbafa5e 100644 --- a/core/src/mindustry/game/MapObjectives.java +++ b/core/src/mindustry/game/MapObjectives.java @@ -164,6 +164,7 @@ public class MapObjectives implements Iterable, Eachable