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
2026-02-25 22:32:36 -05:00
parent 4d8ebbcc15 3fd0d817e7
commit 0d112fd655
36 changed files with 243 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -733,11 +733,11 @@ public class StatValues{
sep(bt, "@bullet.armorpierce");
}
if(type.armorMultiplier != 1f){
if(type.armorMultiplier != 1f && !type.pierceArmor){
if(type.armorMultiplier > 1f){
sep(bt, Core.bundle.format("bullet.armorweakness", (int)(type.armorMultiplier * 100)));
sep(bt, Core.bundle.format("bullet.armorweakness", (type.armorMultiplier)));
}else if(Mathf.sign(type.armorMultiplier) == 1){
sep(bt, Core.bundle.format("bullet.armorpiercing", (int)((1 - type.armorMultiplier) * 100)));
sep(bt, Core.bundle.format("bullet.partialarmorpierce", (int)((1 - type.armorMultiplier) * 100)));
}else{
sep(bt, Core.bundle.format("bullet.antiarmor", (-type.armorMultiplier)));
}