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

add infinitepierce + bugfixes

Browse Source
This commit is contained in:
Leonwang4234
2020-10-12 17:57:00 -07:00
parent 7f5561f037
commit 24d295a924
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/assets/bundles/bundle.properties
+1
View File
@@ -653,6 +653,7 @@ 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.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
core/src/mindustry/world/meta/values/AmmoListValue.java
+2 -2
View File
@@ -50,8 +50,8 @@ 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){ if(type.pierce || type.pierceCap != -1){
sep(bt, Core.bundle.format("bullet.pierce", type.pierceCap == -1 ? "infinite" : type.pierceCap)); 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){