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

Fixed #7198

Browse Source
This commit is contained in:
Anuken
2022-07-19 07:38:34 -04:00
parent 1c2aca91e4
commit 606cdff17d
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/mindustry/type/weapons/RepairBeamWeapon.java
View File

@@ -166,9 +166,8 @@ public class RepairBeamWeapon extends Weapon{
float float
weaponRotation = unit.rotation - 90, weaponRotation = unit.rotation - 90,
wx = unit.x + Angles.trnsx(weaponRotation, x, y), wx = unit.x + Angles.trnsx(weaponRotation, x, y),
wy = unit.y + Angles.trnsy(weaponRotation, x, y); wy = unit.y + Angles.trnsy(weaponRotation, x, y),
z = Draw.z();
float z = Draw.z();
RepairTurret.drawBeam(wx, wy, unit.rotation + mount.rotation, shootY, unit.id, mount.target == null || controllable ? null : (Sized)mount.target, unit.team, heal.strength, RepairTurret.drawBeam(wx, wy, unit.rotation + mount.rotation, shootY, unit.id, mount.target == null || controllable ? null : (Sized)mount.target, unit.team, heal.strength,
pulseStroke, pulseRadius, beamWidth + Mathf.absin(widthSinScl, widthSinMag), heal.lastEnd, heal.offset, laserColor, laserTopColor, pulseStroke, pulseRadius, beamWidth + Mathf.absin(widthSinScl, widthSinMag), heal.lastEnd, heal.offset, laserColor, laserTopColor,
laser, laserEnd, laserTop, laserTopEnd); laser, laserEnd, laserTop, laserTopEnd);

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

@@ -358,12 +358,17 @@ public class PowerGraph{
@Deprecated @Deprecated
private boolean otherConsumersAreValid(Building build, Consume consumePower){ private boolean otherConsumersAreValid(Building build, Consume consumePower){
float f = build.efficiency;
//hack so liquids output positive efficiency values
build.efficiency = 1f;
for(Consume cons : build.block.nonOptionalConsumers){ for(Consume cons : build.block.nonOptionalConsumers){
//TODO fix this properly //TODO fix this properly
if(cons != consumePower && cons.efficiency(build) <= 0.0000001f){ if(cons != consumePower && cons.efficiency(build) <= 0.0000001f){
build.efficiency = f;
return false; return false;
} }
} }
build.efficiency = f;
return true; return true;
} }