Merge remote-tracking branch 'origin/master'

This commit is contained in:
Anuken
2024-11-03 11:26:37 -05:00
@@ -117,7 +117,7 @@ public class ContinuousTurret extends Turret{
entry.bullet.aimX = Tmp.v1.x; entry.bullet.aimX = Tmp.v1.x;
entry.bullet.aimY = Tmp.v1.y; entry.bullet.aimY = Tmp.v1.y;
if(scaleDamageEfficiency){ if(scaleDamageEfficiency){
entry.bullet.damage = entry.bullet.type.damage * Math.min(efficiency, 1f); entry.bullet.damage = entry.bullet.type.damage * Math.min(efficiency, 1f) * entry.bullet.damageMultiplier();
} }
if(isShooting() && hasAmmo()){ if(isShooting() && hasAmmo()){