mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-31 01:44:22 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed #10296

Browse Source
This commit is contained in:
Anuken 2024-11-01 13:59:45 -04:00
parent 8e6010ad8c
commit b56819fcd0
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/mindustry/content/Blocks.java
View File

@ -4518,6 +4518,7 @@ public class Blocks{
}}); }});
}}; }};
scaleDamageEfficiency = true;
shootSound = Sounds.none; shootSound = Sounds.none;
loopSoundVolume = 1f; loopSoundVolume = 1f;
loopSound = Sounds.laserbeam; loopSound = Sounds.laserbeam;

4
core/src/mindustry/world/blocks/defense/turrets/ContinuousTurret.java
View File

@ -15,6 +15,7 @@ public class ContinuousTurret extends Turret{
public BulletType shootType = Bullets.placeholder; public BulletType shootType = Bullets.placeholder;
/** Speed at which the turret can change its bullet "aim" distance. This is only used for point laser bullets. */ /** Speed at which the turret can change its bullet "aim" distance. This is only used for point laser bullets. */
public float aimChangeSpeed = Float.POSITIVE_INFINITY; public float aimChangeSpeed = Float.POSITIVE_INFINITY;
public boolean scaleDamageEfficiency = false;
public ContinuousTurret(String name){ public ContinuousTurret(String name){
super(name); super(name);
@ -115,6 +116,9 @@ 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){
entry.bullet.damage = entry.bullet.type.damage * Math.min(efficiency, 1f);
}
if(isShooting() && hasAmmo()){ if(isShooting() && hasAmmo()){
entry.bullet.time = entry.bullet.lifetime * entry.bullet.type.optimalLifeFract * Math.min(shootWarmup, efficiency); entry.bullet.time = entry.bullet.lifetime * entry.bullet.type.optimalLifeFract * Math.min(shootWarmup, efficiency);