diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java index ca2cff1ca8..3d0bdaa0cb 100644 --- a/core/src/mindustry/content/UnitTypes.java +++ b/core/src/mindustry/content/UnitTypes.java @@ -727,7 +727,7 @@ public class UnitTypes implements ContentList{ weapons.add(new Weapon("heal-weapon-mount"){{ y = -2.5f; x = 3.5f; - reload = 34f; + reload = 30f; ejectEffect = Fx.none; recoil = 2f; shootSound = Sounds.pew; @@ -736,11 +736,11 @@ public class UnitTypes implements ContentList{ inaccuracy = 15f; alternate = true; - bullet = new MissileBulletType(4f, 10){{ + bullet = new MissileBulletType(4f, 12){{ homingPower = 0.08f; weaveMag = 4; weaveScale = 4; - lifetime = 50f; + lifetime = 56f; keepVelocity = false; shootEffect = Fx.shootHeal; smokeEffect = Fx.hitLaser; diff --git a/core/src/mindustry/entities/Units.java b/core/src/mindustry/entities/Units.java index d32030775f..35143817c7 100644 --- a/core/src/mindustry/entities/Units.java +++ b/core/src/mindustry/entities/Units.java @@ -36,7 +36,7 @@ public class Units{ public static int getCap(Team team){ //wave team has no cap - if((team == state.rules.waveTeam && state.rules.waves) || (state.isCampaign() && team == state.rules.waveTeam)){ + if((team == state.rules.waveTeam && !state.rules.pvp) || (state.isCampaign() && team == state.rules.waveTeam)){ return Integer.MAX_VALUE; } return state.rules.unitCap + indexer.getExtraUnits(team); diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 622ab64a3c..6c9a224775 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists