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

Fixed crux units being deactivated in sandbox

Browse Source
This commit is contained in:
Anuken
2020-08-16 10:13:33 -04:00
parent 2526224820
commit 8234eec7fc
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -727,7 +727,7 @@ public class UnitTypes implements ContentList{
weapons.add(new Weapon("heal-weapon-mount"){{ weapons.add(new Weapon("heal-weapon-mount"){{
y = -2.5f; y = -2.5f;
x = 3.5f; x = 3.5f;
reload = 34f; reload = 30f;
ejectEffect = Fx.none; ejectEffect = Fx.none;
recoil = 2f; recoil = 2f;
shootSound = Sounds.pew; shootSound = Sounds.pew;
@@ -736,11 +736,11 @@ public class UnitTypes implements ContentList{
inaccuracy = 15f; inaccuracy = 15f;
alternate = true; alternate = true;
bullet = new MissileBulletType(4f, 10){{ bullet = new MissileBulletType(4f, 12){{
homingPower = 0.08f; homingPower = 0.08f;
weaveMag = 4; weaveMag = 4;
weaveScale = 4; weaveScale = 4;
lifetime = 50f; lifetime = 56f;
keepVelocity = false; keepVelocity = false;
shootEffect = Fx.shootHeal; shootEffect = Fx.shootHeal;
smokeEffect = Fx.hitLaser; smokeEffect = Fx.hitLaser;

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

@@ -36,7 +36,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.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 Integer.MAX_VALUE;
} }
return state.rules.unitCap + indexer.getExtraUnits(team); return state.rules.unitCap + indexer.getExtraUnits(team);

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists 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 zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists