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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken
2021-11-08 08:56:32 -05:00
parent 656bb34b68 1dd0f67daf
commit af7c11c4b7
4 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/mindustry/entities/bullet/EmpBulletType.java
View File

@@ -21,9 +21,7 @@ public class EmpBulletType extends BasicBulletType{
Vars.indexer.allBuildings(x, y, radius, other -> {
if(other.team == b.team){
if(other.block.hasPower && other.block.canOverdrive && other.timeScale < timeIncrease){
if(timeIncrease >= other.timeScale){
other.timeScale = Math.max(other.timeScale, timeIncrease);
}
other.timeScale = Math.max(other.timeScale, timeIncrease);
other.timeScaleDuration = Math.max(other.timeScaleDuration, timeDuration);
chainEffect.at(x, y, 0, hitColor, other);
applyEffect.at(other, other.block.size * 7f);

5
core/src/mindustry/world/blocks/defense/turrets/Turret.java
View File

@@ -419,9 +419,6 @@ public class Turret extends ReloadTurret{
int ii = i;
Time.run(burstSpacing * i, () -> {
if(dead || !hasAmmo()) return;
recoil = recoilAmount;
tr.trns(rotation, shootLength, Mathf.range(xRand));
bullet(type, rotation + Mathf.range(inaccuracy + type.inaccuracy) + (ii - (int)(shots / 2f)) * spread);
effects();
@@ -508,4 +505,4 @@ public class Turret extends ReloadTurret{
return 1;
}
}
}
}