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

Merge pull request #2915 from genNAowl/pierce-cap-info

Browse Source 
Add `pierceCap` Info
This commit is contained in:
Anuken
2020-10-13 10:53:17 -04:00
committed by GitHub
parent b40bbdad0e 24d295a924
commit d4c72b2a9c
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/assets/bundles/bundle.properties
View File

@@ -652,6 +652,8 @@ bullet.homing = [stat]homing
bullet.shock = [stat]shock bullet.shock = [stat]shock
bullet.frag = [stat]frag bullet.frag = [stat]frag
bullet.knockback = [stat]{0}[lightgray] knockback bullet.knockback = [stat]{0}[lightgray] knockback
bullet.pierce = [stat]{0}[lightgray] pierce
bullet.infinitepierce = [stat]pierce
bullet.freezing = [stat]freezing bullet.freezing = [stat]freezing
bullet.tarred = [stat]tarred bullet.tarred = [stat]tarred
bullet.multiplier = [stat]{0}[lightgray]x ammo multiplier bullet.multiplier = [stat]{0}[lightgray]x ammo multiplier

4
core/src/mindustry/world/meta/values/AmmoListValue.java
View File

@@ -50,6 +50,10 @@ public class AmmoListValue<T extends UnlockableContent> implements StatValue{
sep(bt, Core.bundle.format("bullet.knockback", Strings.fixed(type.knockback, 1))); sep(bt, Core.bundle.format("bullet.knockback", Strings.fixed(type.knockback, 1)));
} }
if(type.pierce || type.pierceCap != -1){
sep(bt, type.pierceCap == -1 ? "@bullet.infinitepierce" : Core.bundle.format("bullet.pierce", type.pierceCap));
}
if((type.status == StatusEffects.burning || type.status == StatusEffects.melting) || type.incendAmount > 0){ if((type.status == StatusEffects.burning || type.status == StatusEffects.melting) || type.incendAmount > 0){
sep(bt, "@bullet.incendiary"); sep(bt, "@bullet.incendiary");
} }