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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken
2021-03-25 12:51:31 -04:00
parent 7924d9b9ef 3336e6cdde
commit 1fc1efc410
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/entities/Units.java
View File

@@ -218,7 +218,7 @@ public class Units{
cdist = 0f;
nearbyEnemies(team, x - range, y - range, range*2f, range*2f, e -> {
if(e.dead() || !predicate.get(e) || !e.within(x, y, range + e.hitSize/2f)) return;
if(e.dead() || !predicate.get(e) || e.team == Team.derelict || !e.within(x, y, range + e.hitSize/2f)) return;
float cost = sort.cost(e, x, y);
if(result == null || cost < cdist){

4
core/src/mindustry/world/blocks/units/RepairPoint.java
View File

@@ -102,8 +102,8 @@ public class RepairPoint extends Block{
if(target != null && (target.dead() || target.dst(tile) - target.hitSize/2f > repairRadius || target.health() >= target.maxHealth())){
target = null;
}else if(target != null && consValid()){
target.heal(repairSpeed * Time.delta * strength * efficiency());
rotation = Mathf.slerpDelta(rotation, angleTo(target), 0.5f);
target.heal(repairSpeed * strength * edelta());
rotation = Mathf.slerpDelta(rotation, angleTo(target), 0.5f * efficiency() * timeScale);
targetIsBeingRepaired = true;
}