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

BuildTurret fixes

Browse Source
This commit is contained in:
Anuken
2022-05-08 01:00:16 -04:00
parent 9da9fa82e5
commit aaccb36d93
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/mindustry/world/blocks/defense/BuildTurret.java
+9 -10
View File
@@ -24,7 +24,7 @@ import static mindustry.Vars.*;
public class BuildTurret extends BaseTurret{ public class BuildTurret extends BaseTurret{
public final int timerTarget = timers++, timerTarget2 = timers++; public final int timerTarget = timers++, timerTarget2 = timers++;
public int targetInterval = 30; public int targetInterval = 15;
public @Load(value = "@-base", fallback = "block-@size") TextureRegion baseRegion; public @Load(value = "@-base", fallback = "block-@size") TextureRegion baseRegion;
public @Load("@-glow") TextureRegion glowRegion; public @Load("@-glow") TextureRegion glowRegion;
@@ -107,10 +107,10 @@ public class BuildTurret extends BaseTurret{
checkSuppression(); checkSuppression();
unit.buildSpeedMultiplier(Math.max(efficiency * timeScale, 0.0001f)); unit.buildSpeedMultiplier(potentialEfficiency * timeScale);
unit.speedMultiplier(efficiency * timeScale); unit.speedMultiplier(potentialEfficiency * timeScale);
warmup = Mathf.lerpDelta(warmup, unit.activelyBuilding() ? 1f : 0f, 0.1f); warmup = Mathf.lerpDelta(warmup, unit.activelyBuilding() ? efficiency : 0f, 0.1f);
if(!isControlled()){ if(!isControlled()){
unit.updateBuilding(true); unit.updateBuilding(true);
@@ -164,8 +164,8 @@ public class BuildTurret extends BaseTurret{
BuildPlan req = unit.buildPlan(); BuildPlan req = unit.buildPlan();
//clear break plan if another player is breaking something //clear break plan if another player is breaking something
if(!req.breaking && timer.get(timerTarget2, 40f)){ if(!req.breaking && timer.get(timerTarget2, 30f)){
for(Player player : Groups.player){ for(Player player : team.data().players){
if(player.isBuilder() && player.unit().activelyBuilding() && player.unit().buildPlan().samePos(req) && player.unit().buildPlan().breaking){ if(player.isBuilder() && player.unit().activelyBuilding() && player.unit().buildPlan().samePos(req) && player.unit().buildPlan().breaking){
unit.plans().removeFirst(); unit.plans().removeFirst();
//remove from list of plans //remove from list of plans
@@ -197,9 +197,6 @@ public class BuildTurret extends BaseTurret{
unit.plans().remove(b -> b.build() == this); unit.plans().remove(b -> b.build() == this);
unit.updateBuildLogic(); unit.updateBuildLogic();
//at 0 build speed the unit thinks it can't build, so make it >0 after updating
unit.buildSpeedMultiplier(Math.max(unit.buildSpeedMultiplier(), 0.00001f));
} }
@Override @Override
@@ -223,7 +220,9 @@ public class BuildTurret extends BaseTurret{
Drawf.additive(glowRegion, heatColor, warmup, x, y, rotation - 90f, Layer.turretHeat); Drawf.additive(glowRegion, heatColor, warmup, x, y, rotation - 90f, Layer.turretHeat);
} }
unit.drawBuilding(); if(efficiency > 0){
unit.drawBuilding();
}
} }
@Override @Override