From 7f5561f03718a814cc665ac2f96d54dfa065b856 Mon Sep 17 00:00:00 2001
From: Leonwang4234 <62972692+Leonwang4234@users.noreply.github.com>
Date: Sun, 11 Oct 2020 17:03:48 -0700
Subject: [PATCH 1/2] add...

---
 core/assets/bundles/bundle.properties                   | 1 +
 core/src/mindustry/world/meta/values/AmmoListValue.java | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
index 70d7430557..cb365c3528 100644
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -652,6 +652,7 @@ bullet.homing = [stat]homing
 bullet.shock = [stat]shock
 bullet.frag = [stat]frag
 bullet.knockback = [stat]{0}[lightgray] knockback
+bullet.pierce = [stat]{0}[lightgray] pierce
 bullet.freezing = [stat]freezing
 bullet.tarred = [stat]tarred
 bullet.multiplier = [stat]{0}[lightgray]x ammo multiplier
diff --git a/core/src/mindustry/world/meta/values/AmmoListValue.java b/core/src/mindustry/world/meta/values/AmmoListValue.java
index d0d8624ea9..457bcca57b 100644
--- a/core/src/mindustry/world/meta/values/AmmoListValue.java
+++ b/core/src/mindustry/world/meta/values/AmmoListValue.java
@@ -50,6 +50,10 @@ public class AmmoListValue<T extends UnlockableContent> implements StatValue{
                     sep(bt, Core.bundle.format("bullet.knockback", Strings.fixed(type.knockback, 1)));
                 }
 
+                if(type.pierce){
+                    sep(bt, Core.bundle.format("bullet.pierce", type.pierceCap == -1 ? "infinite" : type.pierceCap));
+                }
+
                 if((type.status == StatusEffects.burning || type.status == StatusEffects.melting) || type.incendAmount > 0){
                     sep(bt, "@bullet.incendiary");
                 }

From 24d295a924a9c90beb3351100db392d1bc00e7d1 Mon Sep 17 00:00:00 2001
From: Leonwang4234 <62972692+Leonwang4234@users.noreply.github.com>
Date: Mon, 12 Oct 2020 17:57:00 -0700
Subject: [PATCH 2/2] add infinitepierce + bugfixes

---
 core/assets/bundles/bundle.properties                   | 1 +
 core/src/mindustry/world/meta/values/AmmoListValue.java | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
index cb365c3528..b001ad4cd4 100644
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -653,6 +653,7 @@ bullet.shock = [stat]shock
 bullet.frag = [stat]frag
 bullet.knockback = [stat]{0}[lightgray] knockback
 bullet.pierce = [stat]{0}[lightgray] pierce
+bullet.infinitepierce = [stat]pierce
 bullet.freezing = [stat]freezing
 bullet.tarred = [stat]tarred
 bullet.multiplier = [stat]{0}[lightgray]x ammo multiplier
diff --git a/core/src/mindustry/world/meta/values/AmmoListValue.java b/core/src/mindustry/world/meta/values/AmmoListValue.java
index 457bcca57b..359b958a96 100644
--- a/core/src/mindustry/world/meta/values/AmmoListValue.java
+++ b/core/src/mindustry/world/meta/values/AmmoListValue.java
@@ -50,8 +50,8 @@ public class AmmoListValue<T extends UnlockableContent> implements StatValue{
                     sep(bt, Core.bundle.format("bullet.knockback", Strings.fixed(type.knockback, 1)));
                 }
 
-                if(type.pierce){
-                    sep(bt, Core.bundle.format("bullet.pierce", type.pierceCap == -1 ? "infinite" : type.pierceCap));
+                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){