From 410bed0f45d283db6364b0b90f64b2d0e8549085 Mon Sep 17 00:00:00 2001 From: Atsuihsio <842960157@qq.com> Date: Sat, 3 Aug 2024 17:45:27 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=AD=A6=E5=99=A8=E5=9F=BA?= =?UTF-8?q?=E7=A1=80=E4=BC=A4=E5=AE=B3=E4=B8=8D=E7=A9=BF=E9=80=8F=E6=8A=A4?= =?UTF-8?q?=E7=94=B2=EF=BC=8C=E8=AE=BE=E7=BD=AE=E6=AD=A6=E5=99=A8=E7=A9=BF?= =?UTF-8?q?=E7=94=B2=E4=BC=A4=E5=AE=B3=E6=AF=94=E4=BE=8B=EF=BC=8C=E6=B3=A8?= =?UTF-8?q?=E5=86=8C4=E7=A7=8D=E7=A9=BF=E7=94=B2=E4=BC=A4=E5=AE=B3?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../superbwarfare/init/ModDamageTypes.java | 24 ++++++++++++++++++- .../superbwarfare/tools/RarityTool.java | 2 -- .../tags/damage_type/bypasses_armor.json | 8 +++---- .../tags/damage_type/bypasses_effects.json | 11 ++++----- .../damage_type/bypasses_enchantments.json | 8 +++---- .../tags/damage_type/bypasses_resistance.json | 8 +++---- .../damage_type/arrow_in_brain_bypass.json | 5 ++++ .../damage_type/arrow_in_knee_bypass.json | 5 ++++ .../damage_type/gunfire_bypass.json | 5 ++++ .../damage_type/gunfire_headshot_bypass.json | 5 ++++ .../data/superbwarfare/guns/aa_12.json | 3 ++- .../data/superbwarfare/guns/abekiri.json | 3 ++- .../data/superbwarfare/guns/ak_47.json | 3 ++- .../data/superbwarfare/guns/bocek.json | 3 ++- .../data/superbwarfare/guns/devotion.json | 3 ++- .../data/superbwarfare/guns/glock_17.json | 3 ++- .../data/superbwarfare/guns/glock_18.json | 3 ++- .../data/superbwarfare/guns/hk_416.json | 3 ++- .../superbwarfare/guns/hunting_rifle.json | 3 ++- .../data/superbwarfare/guns/m_4.json | 3 ++- .../data/superbwarfare/guns/m_60.json | 3 ++- .../data/superbwarfare/guns/m_870.json | 3 ++- .../data/superbwarfare/guns/m_98b.json | 3 ++- .../data/superbwarfare/guns/marlin.json | 3 ++- .../data/superbwarfare/guns/minigun.json | 3 ++- .../data/superbwarfare/guns/mk_14.json | 3 ++- .../data/superbwarfare/guns/ntw_20.json | 3 ++- .../data/superbwarfare/guns/rpk.json | 3 ++- .../data/superbwarfare/guns/sentinel.json | 3 ++- .../data/superbwarfare/guns/sks.json | 3 ++- .../data/superbwarfare/guns/svd.json | 3 ++- .../data/superbwarfare/guns/trachelium.json | 3 ++- .../data/superbwarfare/guns/vector.json | 3 ++- 33 files changed, 106 insertions(+), 44 deletions(-) create mode 100644 src/main/resources/data/superbwarfare/damage_type/arrow_in_brain_bypass.json create mode 100644 src/main/resources/data/superbwarfare/damage_type/arrow_in_knee_bypass.json create mode 100644 src/main/resources/data/superbwarfare/damage_type/gunfire_bypass.json create mode 100644 src/main/resources/data/superbwarfare/damage_type/gunfire_headshot_bypass.json diff --git a/src/main/java/net/mcreator/superbwarfare/init/ModDamageTypes.java b/src/main/java/net/mcreator/superbwarfare/init/ModDamageTypes.java index e8948cad6..569ae9024 100644 --- a/src/main/java/net/mcreator/superbwarfare/init/ModDamageTypes.java +++ b/src/main/java/net/mcreator/superbwarfare/init/ModDamageTypes.java @@ -17,7 +17,7 @@ import javax.annotation.Nullable; @SuppressWarnings("OptionalGetWithoutIsPresent") public class ModDamageTypes { public static final ResourceKey GUN_FIRE = ResourceKey.create(Registries.DAMAGE_TYPE, new ResourceLocation(ModUtils.MODID, "gunfire")); - public static final ResourceKey GUN_FIRE_HEADSHOT = ResourceKey.create(Registries.DAMAGE_TYPE, new ResourceLocation(ModUtils.MODID, "gunfire_headshot")); + public static final ResourceKey GUN_FIRE_BYPASS = ResourceKey.create(Registries.DAMAGE_TYPE, new ResourceLocation(ModUtils.MODID, "gunfire_bypass")); public static final ResourceKey ARROW_IN_KNEE = ResourceKey.create(Registries.DAMAGE_TYPE, new ResourceLocation(ModUtils.MODID, "arrow_in_knee")); public static final ResourceKey ARROW_IN_BRAIN = ResourceKey.create(Registries.DAMAGE_TYPE, new ResourceLocation(ModUtils.MODID, "arrow_in_brain")); public static final ResourceKey MINE = ResourceKey.create(Registries.DAMAGE_TYPE, new ResourceLocation(ModUtils.MODID, "mine")); @@ -26,6 +26,12 @@ public class ModDamageTypes { public static final ResourceKey PROJECTILE_BOOM = ResourceKey.create(Registries.DAMAGE_TYPE, new ResourceLocation(ModUtils.MODID, "projectile_boom")); public static final ResourceKey CANNON_FIRE = ResourceKey.create(Registries.DAMAGE_TYPE, new ResourceLocation(ModUtils.MODID, "cannon_fire")); + + public static final ResourceKey GUN_FIRE_HEADSHOT = ResourceKey.create(Registries.DAMAGE_TYPE, new ResourceLocation(ModUtils.MODID, "gunfire_headshot")); + public static final ResourceKey GUN_FIRE_HEADSHOT_BYPASS = ResourceKey.create(Registries.DAMAGE_TYPE, new ResourceLocation(ModUtils.MODID, "gunfire_headshot_bypass")); + public static final ResourceKey ARROW_IN_KNEE_BYPASS = ResourceKey.create(Registries.DAMAGE_TYPE, new ResourceLocation(ModUtils.MODID, "arrow_in_knee_bypass")); + public static final ResourceKey ARROW_IN_BRAIN_BYPASS = ResourceKey.create(Registries.DAMAGE_TYPE, new ResourceLocation(ModUtils.MODID, "arrow_in_brain_bypass")); + public static DamageSource causeGunFireDamage(RegistryAccess registryAccess, @Nullable Entity directEntity, @Nullable Entity attacker) { return new DamageMessages(registryAccess.registry(Registries.DAMAGE_TYPE).get().getHolderOrThrow(GUN_FIRE), directEntity, attacker); } @@ -58,6 +64,22 @@ public class ModDamageTypes { return new DamageMessages(registryAccess.registry(Registries.DAMAGE_TYPE).get().getHolderOrThrow(CANNON_FIRE), directEntity, attacker); } + public static DamageSource causeGunFireDamageBypass(RegistryAccess registryAccess, @Nullable Entity directEntity, @Nullable Entity attacker) { + return new DamageMessages(registryAccess.registry(Registries.DAMAGE_TYPE).get().getHolderOrThrow(GUN_FIRE_BYPASS), directEntity, attacker); + } + + public static DamageSource causeGunFireHeadshotDamageBypass(RegistryAccess registryAccess, @Nullable Entity directEntity, @Nullable Entity attacker) { + return new DamageMessages(registryAccess.registry(Registries.DAMAGE_TYPE).get().getHolderOrThrow(GUN_FIRE_HEADSHOT_BYPASS), directEntity, attacker); + } + + public static DamageSource causeArrowInKneeDamageBypass(RegistryAccess registryAccess, @Nullable Entity directEntity, @Nullable Entity attacker) { + return new DamageMessages(registryAccess.registry(Registries.DAMAGE_TYPE).get().getHolderOrThrow(ARROW_IN_KNEE_BYPASS), directEntity, attacker); + } + + public static DamageSource causeArrowInBrainDamageBypass(RegistryAccess registryAccess, @Nullable Entity directEntity, @Nullable Entity attacker) { + return new DamageMessages(registryAccess.registry(Registries.DAMAGE_TYPE).get().getHolderOrThrow(ARROW_IN_BRAIN_BYPASS), directEntity, attacker); + } + private static class DamageMessages extends DamageSource { public DamageMessages(Holder.Reference typeReference) { super(typeReference); diff --git a/src/main/java/net/mcreator/superbwarfare/tools/RarityTool.java b/src/main/java/net/mcreator/superbwarfare/tools/RarityTool.java index b81028c8b..26d8f43fa 100644 --- a/src/main/java/net/mcreator/superbwarfare/tools/RarityTool.java +++ b/src/main/java/net/mcreator/superbwarfare/tools/RarityTool.java @@ -7,6 +7,4 @@ public class RarityTool { public static final Rarity LEGENDARY = Rarity.create("target_legendary", ChatFormatting.GOLD); - public static final Rarity SPECIAL = Rarity.create("target_special", ChatFormatting.RED); - } diff --git a/src/main/resources/data/minecraft/tags/damage_type/bypasses_armor.json b/src/main/resources/data/minecraft/tags/damage_type/bypasses_armor.json index 5a76295e5..95a3cfd46 100644 --- a/src/main/resources/data/minecraft/tags/damage_type/bypasses_armor.json +++ b/src/main/resources/data/minecraft/tags/damage_type/bypasses_armor.json @@ -1,10 +1,10 @@ { "replace": false, "values": [ - "superbwarfare:gunfire", - "superbwarfare:gunfire_headshot", - "superbwarfare:arrow_in_knee", - "superbwarfare:arrow_in_brain", + "superbwarfare:gunfire_bypass", + "superbwarfare:gunfire_headshot_bypass", + "superbwarfare:arrow_in_knee_bypass", + "superbwarfare:arrow_in_brain_bypass", "superbwarfare:shock", "superbwarfare:cannon_fire" ] diff --git a/src/main/resources/data/minecraft/tags/damage_type/bypasses_effects.json b/src/main/resources/data/minecraft/tags/damage_type/bypasses_effects.json index 5a76295e5..829842e29 100644 --- a/src/main/resources/data/minecraft/tags/damage_type/bypasses_effects.json +++ b/src/main/resources/data/minecraft/tags/damage_type/bypasses_effects.json @@ -1,11 +1,10 @@ { "replace": false, "values": [ - "superbwarfare:gunfire", - "superbwarfare:gunfire_headshot", - "superbwarfare:arrow_in_knee", - "superbwarfare:arrow_in_brain", - "superbwarfare:shock", - "superbwarfare:cannon_fire" + "superbwarfare:gunfire_bypass", + "superbwarfare:gunfire_headshot_bypass", + "superbwarfare:arrow_in_knee_bypass", + "superbwarfare:arrow_in_brain_bypass", + "superbwarfare:shock" ] } \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/damage_type/bypasses_enchantments.json b/src/main/resources/data/minecraft/tags/damage_type/bypasses_enchantments.json index 5a76295e5..95a3cfd46 100644 --- a/src/main/resources/data/minecraft/tags/damage_type/bypasses_enchantments.json +++ b/src/main/resources/data/minecraft/tags/damage_type/bypasses_enchantments.json @@ -1,10 +1,10 @@ { "replace": false, "values": [ - "superbwarfare:gunfire", - "superbwarfare:gunfire_headshot", - "superbwarfare:arrow_in_knee", - "superbwarfare:arrow_in_brain", + "superbwarfare:gunfire_bypass", + "superbwarfare:gunfire_headshot_bypass", + "superbwarfare:arrow_in_knee_bypass", + "superbwarfare:arrow_in_brain_bypass", "superbwarfare:shock", "superbwarfare:cannon_fire" ] diff --git a/src/main/resources/data/minecraft/tags/damage_type/bypasses_resistance.json b/src/main/resources/data/minecraft/tags/damage_type/bypasses_resistance.json index 5a76295e5..95a3cfd46 100644 --- a/src/main/resources/data/minecraft/tags/damage_type/bypasses_resistance.json +++ b/src/main/resources/data/minecraft/tags/damage_type/bypasses_resistance.json @@ -1,10 +1,10 @@ { "replace": false, "values": [ - "superbwarfare:gunfire", - "superbwarfare:gunfire_headshot", - "superbwarfare:arrow_in_knee", - "superbwarfare:arrow_in_brain", + "superbwarfare:gunfire_bypass", + "superbwarfare:gunfire_headshot_bypass", + "superbwarfare:arrow_in_knee_bypass", + "superbwarfare:arrow_in_brain_bypass", "superbwarfare:shock", "superbwarfare:cannon_fire" ] diff --git a/src/main/resources/data/superbwarfare/damage_type/arrow_in_brain_bypass.json b/src/main/resources/data/superbwarfare/damage_type/arrow_in_brain_bypass.json new file mode 100644 index 000000000..96e19bdbd --- /dev/null +++ b/src/main/resources/data/superbwarfare/damage_type/arrow_in_brain_bypass.json @@ -0,0 +1,5 @@ +{ + "exhaustion": 0, + "message_id": "arrow_in_brain", + "scaling": "never" +} \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/damage_type/arrow_in_knee_bypass.json b/src/main/resources/data/superbwarfare/damage_type/arrow_in_knee_bypass.json new file mode 100644 index 000000000..be67c887a --- /dev/null +++ b/src/main/resources/data/superbwarfare/damage_type/arrow_in_knee_bypass.json @@ -0,0 +1,5 @@ +{ + "exhaustion": 0, + "message_id": "arrow_in_knee", + "scaling": "never" +} \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/damage_type/gunfire_bypass.json b/src/main/resources/data/superbwarfare/damage_type/gunfire_bypass.json new file mode 100644 index 000000000..0e37796da --- /dev/null +++ b/src/main/resources/data/superbwarfare/damage_type/gunfire_bypass.json @@ -0,0 +1,5 @@ +{ + "exhaustion": 0, + "message_id": "gunfire", + "scaling": "never" +} \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/damage_type/gunfire_headshot_bypass.json b/src/main/resources/data/superbwarfare/damage_type/gunfire_headshot_bypass.json new file mode 100644 index 000000000..fca347410 --- /dev/null +++ b/src/main/resources/data/superbwarfare/damage_type/gunfire_headshot_bypass.json @@ -0,0 +1,5 @@ +{ + "exhaustion": 0, + "message_id": "gunfire_headshot", + "scaling": "never" +} \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/guns/aa_12.json b/src/main/resources/data/superbwarfare/guns/aa_12.json index 18cc0a349..837876936 100644 --- a/src/main/resources/data/superbwarfare/guns/aa_12.json +++ b/src/main/resources/data/superbwarfare/guns/aa_12.json @@ -17,5 +17,6 @@ "auto": 1, "burst_size": 1, "normal_reload_time": 64, - "empty_reload_time": 85 + "empty_reload_time": 85, + "BypassesArmor": 0.1 } diff --git a/src/main/resources/data/superbwarfare/guns/abekiri.json b/src/main/resources/data/superbwarfare/guns/abekiri.json index f81f580f9..183966a0c 100644 --- a/src/main/resources/data/superbwarfare/guns/abekiri.json +++ b/src/main/resources/data/superbwarfare/guns/abekiri.json @@ -17,5 +17,6 @@ "auto": 0, "burst_size": 1, "normal_reload_time": 66, - "empty_reload_time": 83 + "empty_reload_time": 83, + "BypassesArmor": 0 } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/guns/ak_47.json b/src/main/resources/data/superbwarfare/guns/ak_47.json index 4d1d54bb7..7116e423d 100644 --- a/src/main/resources/data/superbwarfare/guns/ak_47.json +++ b/src/main/resources/data/superbwarfare/guns/ak_47.json @@ -17,5 +17,6 @@ "auto": 1, "burst_size": 1, "normal_reload_time": 54, - "empty_reload_time": 69 + "empty_reload_time": 69, + "BypassesArmor": 0.3 } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/guns/bocek.json b/src/main/resources/data/superbwarfare/guns/bocek.json index a8b490182..5847cac48 100644 --- a/src/main/resources/data/superbwarfare/guns/bocek.json +++ b/src/main/resources/data/superbwarfare/guns/bocek.json @@ -6,5 +6,6 @@ "recoil_y": 0.003, "headshot": 1.5, "damage": 24, - "weight": 1 + "weight": 1, + "BypassesArmor": 0.25 } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/guns/devotion.json b/src/main/resources/data/superbwarfare/guns/devotion.json index 5d55fd889..03e42b710 100644 --- a/src/main/resources/data/superbwarfare/guns/devotion.json +++ b/src/main/resources/data/superbwarfare/guns/devotion.json @@ -18,5 +18,6 @@ "auto": 1, "burst_size": 1, "normal_reload_time": 73, - "empty_reload_time": 95 + "empty_reload_time": 95, + "BypassesArmor": 0.4 } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/guns/glock_17.json b/src/main/resources/data/superbwarfare/guns/glock_17.json index 73759b462..6deed53de 100644 --- a/src/main/resources/data/superbwarfare/guns/glock_17.json +++ b/src/main/resources/data/superbwarfare/guns/glock_17.json @@ -17,5 +17,6 @@ "auto": 0, "burst_size": 1, "normal_reload_time": 30, - "empty_reload_time": 35 + "empty_reload_time": 35, + "BypassesArmor": 0.15 } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/guns/glock_18.json b/src/main/resources/data/superbwarfare/guns/glock_18.json index 2a1c7e4c3..d88be6143 100644 --- a/src/main/resources/data/superbwarfare/guns/glock_18.json +++ b/src/main/resources/data/superbwarfare/guns/glock_18.json @@ -17,5 +17,6 @@ "auto": 1, "burst_size": 1, "normal_reload_time": 30, - "empty_reload_time": 35 + "empty_reload_time": 35, + "BypassesArmor": 0.15 } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/guns/hk_416.json b/src/main/resources/data/superbwarfare/guns/hk_416.json index 66c48ea39..9d0fb83ce 100644 --- a/src/main/resources/data/superbwarfare/guns/hk_416.json +++ b/src/main/resources/data/superbwarfare/guns/hk_416.json @@ -17,5 +17,6 @@ "auto": 1, "burst_size": 1, "normal_reload_time": 56, - "empty_reload_time": 64 + "empty_reload_time": 64, + "BypassesArmor": 0.4 } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/guns/hunting_rifle.json b/src/main/resources/data/superbwarfare/guns/hunting_rifle.json index 360eeabdf..21dee6e68 100644 --- a/src/main/resources/data/superbwarfare/guns/hunting_rifle.json +++ b/src/main/resources/data/superbwarfare/guns/hunting_rifle.json @@ -15,5 +15,6 @@ "burst": 0, "auto": 0, "burst_size": 1, - "empty_reload_time": 64 + "empty_reload_time": 64, + "BypassesArmor": 0.5 } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/guns/m_4.json b/src/main/resources/data/superbwarfare/guns/m_4.json index 6c9cd1697..9f83aefa7 100644 --- a/src/main/resources/data/superbwarfare/guns/m_4.json +++ b/src/main/resources/data/superbwarfare/guns/m_4.json @@ -17,5 +17,6 @@ "auto": 1, "burst_size": 1, "normal_reload_time": 56, - "empty_reload_time": 64 + "empty_reload_time": 64, + "BypassesArmor": 0.4 } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/guns/m_60.json b/src/main/resources/data/superbwarfare/guns/m_60.json index 600179fca..d8d13c6e6 100644 --- a/src/main/resources/data/superbwarfare/guns/m_60.json +++ b/src/main/resources/data/superbwarfare/guns/m_60.json @@ -18,5 +18,6 @@ "auto": 1, "burst_size": 1, "normal_reload_time": 114, - "empty_reload_time": 133 + "empty_reload_time": 133, + "BypassesArmor": 0.4 } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/guns/m_870.json b/src/main/resources/data/superbwarfare/guns/m_870.json index ef608d8f1..4d41eaa12 100644 --- a/src/main/resources/data/superbwarfare/guns/m_870.json +++ b/src/main/resources/data/superbwarfare/guns/m_870.json @@ -20,5 +20,6 @@ "prepare_time": 7, "prepare_load_time": 36, "iterative_time": 16, - "finish_time": 12 + "finish_time": 12, + "BypassesArmor": 0.1 } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/guns/m_98b.json b/src/main/resources/data/superbwarfare/guns/m_98b.json index c2a664f99..bd1cbdf33 100644 --- a/src/main/resources/data/superbwarfare/guns/m_98b.json +++ b/src/main/resources/data/superbwarfare/guns/m_98b.json @@ -20,5 +20,6 @@ "auto": 0, "burst_size": 1, "normal_reload_time": 64, - "empty_reload_time": 86 + "empty_reload_time": 86, + "BypassesArmor": 0.6 } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/guns/marlin.json b/src/main/resources/data/superbwarfare/guns/marlin.json index a58555a6f..a1ffc3da8 100644 --- a/src/main/resources/data/superbwarfare/guns/marlin.json +++ b/src/main/resources/data/superbwarfare/guns/marlin.json @@ -19,5 +19,6 @@ "burst_size": 1, "prepare_time": 8, "iterative_time": 16, - "finish_time": 19 + "finish_time": 19, + "BypassesArmor": 0.3 } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/guns/minigun.json b/src/main/resources/data/superbwarfare/guns/minigun.json index 9472ed648..91b8bf932 100644 --- a/src/main/resources/data/superbwarfare/guns/minigun.json +++ b/src/main/resources/data/superbwarfare/guns/minigun.json @@ -9,5 +9,6 @@ "fire_interval": 1, "weight": 2, "fire_mode": 2, - "projectile_amount": 1 + "projectile_amount": 1, + "BypassesArmor": 0.35 } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/guns/mk_14.json b/src/main/resources/data/superbwarfare/guns/mk_14.json index 709cf6533..851d0cb93 100644 --- a/src/main/resources/data/superbwarfare/guns/mk_14.json +++ b/src/main/resources/data/superbwarfare/guns/mk_14.json @@ -20,5 +20,6 @@ "auto": 1, "burst_size": 1, "normal_reload_time": 58, - "empty_reload_time": 81 + "empty_reload_time": 81, + "BypassesArmor": 0.55 } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/guns/ntw_20.json b/src/main/resources/data/superbwarfare/guns/ntw_20.json index 744a6cfb3..ba4cca47e 100644 --- a/src/main/resources/data/superbwarfare/guns/ntw_20.json +++ b/src/main/resources/data/superbwarfare/guns/ntw_20.json @@ -21,5 +21,6 @@ "auto": 0, "burst_size": 1, "normal_reload_time": 64, - "empty_reload_time": 87 + "empty_reload_time": 87, + "BypassesArmor": 1 } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/guns/rpk.json b/src/main/resources/data/superbwarfare/guns/rpk.json index 7a5816eb2..e3795d6e2 100644 --- a/src/main/resources/data/superbwarfare/guns/rpk.json +++ b/src/main/resources/data/superbwarfare/guns/rpk.json @@ -18,5 +18,6 @@ "auto": 1, "burst_size": 1, "normal_reload_time": 73, - "empty_reload_time": 95 + "empty_reload_time": 95, + "BypassesArmor": 0.35 } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/guns/sentinel.json b/src/main/resources/data/superbwarfare/guns/sentinel.json index e5803af26..0014d25fd 100644 --- a/src/main/resources/data/superbwarfare/guns/sentinel.json +++ b/src/main/resources/data/superbwarfare/guns/sentinel.json @@ -18,5 +18,6 @@ "auto": 0, "burst_size": 1, "normal_reload_time": 59, - "empty_reload_time": 89 + "empty_reload_time": 89, + "BypassesArmor": 0.7 } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/guns/sks.json b/src/main/resources/data/superbwarfare/guns/sks.json index bfcee3a3a..100950582 100644 --- a/src/main/resources/data/superbwarfare/guns/sks.json +++ b/src/main/resources/data/superbwarfare/guns/sks.json @@ -17,5 +17,6 @@ "auto": 0, "burst_size": 1, "normal_reload_time": 54, - "empty_reload_time": 75 + "empty_reload_time": 75, + "BypassesArmor": 0.35 } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/guns/svd.json b/src/main/resources/data/superbwarfare/guns/svd.json index a10e35491..bb5c4ff63 100644 --- a/src/main/resources/data/superbwarfare/guns/svd.json +++ b/src/main/resources/data/superbwarfare/guns/svd.json @@ -17,5 +17,6 @@ "auto": 0, "burst_size": 1, "normal_reload_time": 56, - "empty_reload_time": 70 + "empty_reload_time": 70, + "BypassesArmor": 0.6 } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/guns/trachelium.json b/src/main/resources/data/superbwarfare/guns/trachelium.json index 498e796af..3d66e3cef 100644 --- a/src/main/resources/data/superbwarfare/guns/trachelium.json +++ b/src/main/resources/data/superbwarfare/guns/trachelium.json @@ -16,5 +16,6 @@ "burst": 0, "auto": 0, "burst_size": 1, - "empty_reload_time": 65 + "empty_reload_time": 65, + "BypassesArmor": 0.25 } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/guns/vector.json b/src/main/resources/data/superbwarfare/guns/vector.json index d8da187b0..b9a272c06 100644 --- a/src/main/resources/data/superbwarfare/guns/vector.json +++ b/src/main/resources/data/superbwarfare/guns/vector.json @@ -17,5 +17,6 @@ "auto": 1, "burst_size": 3, "normal_reload_time": 46, - "empty_reload_time": 64 + "empty_reload_time": 64, + "BypassesArmor": 0.15 } \ No newline at end of file