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

Fixed #4393 / Fixed #4398

Browse Source
This commit is contained in:
Anuken
2021-01-21 08:48:36 -05:00
parent 0cc9b0b0a3
commit 75d2b0fb69
8 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -111,7 +111,7 @@ public class Turret extends ReloadTurret{
super.setStats();
stats.add(Stat.inaccuracy, (int)inaccuracy, StatUnit.degrees);
stats.add(Stat.reload, 60f / reloadTime * (alternate ? 1 : shots), StatUnit.none);
stats.add(Stat.reload, 60f / (reloadTime + 1) * (alternate ? 1 : shots), StatUnit.none);
stats.add(Stat.targetsAir, targetAir);
stats.add(Stat.targetsGround, targetGround);
if(ammoPerShot != 1) stats.add(Stat.ammoUse, ammoPerShot, StatUnit.perShot);

2
core/src/mindustry/world/blocks/power/PowerGraph.java
View File

@@ -224,7 +224,7 @@ public class PowerGraph{
lastPowerNeeded = powerNeeded;
lastPowerProduced = powerProduced;
lastScaledPowerIn = powerProduced / Time.delta;
lastScaledPowerIn = (powerProduced + energyDelta) / Time.delta;
lastScaledPowerOut = powerNeeded / Time.delta;
lastCapacity = getTotalBatteryCapacity();
lastPowerStored = getBatteryStored();

2
core/src/mindustry/world/blocks/power/PowerNode.java
View File

@@ -226,7 +226,7 @@ public class PowerNode extends PowerBlock{
for(Point2 point : (Point2[])req.config){
otherReq = null;
list.each(other -> {
if((other.x == req.x + point.x && other.y == req.y + point.y) && other != req){
if((other.x == req.x + point.x && other.y == req.y + point.y) && other != req && other.block != null && other.block.hasPower){
otherReq = other;
}
});