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

Evoke repair weapon

Browse Source
This commit is contained in:
Anuken
2021-12-28 21:48:32 -05:00
parent 9c2618f2e8
commit acaec08781
17 changed files with 66 additions and 36 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

@@ -412,7 +412,7 @@ public class Turret extends ReloadTurret{
}
protected boolean canHeal(){
return targetHealing && hasAmmo() && peekAmmo().collidesTeam && peekAmmo().healPercent > 0;
return targetHealing && hasAmmo() && peekAmmo().collidesTeam && peekAmmo().heals();
}
protected void findTarget(){

4
core/src/mindustry/world/meta/StatValues.java
View File

@@ -329,6 +329,10 @@ public class StatValues{
sep(bt, Core.bundle.format("bullet.healpercent", Strings.autoFixed(type.healPercent, 2)));
}
if(type.healAmount > 0f){
sep(bt, Core.bundle.format("bullet.healamount", Strings.autoFixed(type.healAmount, 2)));
}
if(type.pierce || type.pierceCap != -1){
sep(bt, type.pierceCap == -1 ? "@bullet.infinitepierce" : Core.bundle.format("bullet.pierce", type.pierceCap));
}