From 6f578f8d65dfeb0dca80819c3c39ccd9b627bb4e Mon Sep 17 00:00:00 2001 From: 17146 <1714673995@qq.com> Date: Tue, 24 Dec 2024 15:03:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96NBT#Headshot?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../client/tooltip/ClientGunImageTooltip.java | 7 ++++--- .../superbwarfare/event/GunEventHandler.java | 4 ++-- .../item/gun/handgun/Trachelium.java | 16 ++++++++-------- .../network/message/FireMessage.java | 2 +- .../atsuishio/superbwarfare/tools/GunsTool.java | 2 +- .../resources/data/superbwarfare/guns/aa_12.json | 2 +- .../data/superbwarfare/guns/abekiri.json | 2 +- .../resources/data/superbwarfare/guns/ak_12.json | 2 +- .../resources/data/superbwarfare/guns/ak_47.json | 2 +- .../resources/data/superbwarfare/guns/bocek.json | 2 +- .../data/superbwarfare/guns/devotion.json | 2 +- .../data/superbwarfare/guns/glock_17.json | 2 +- .../data/superbwarfare/guns/glock_18.json | 2 +- .../data/superbwarfare/guns/hk_416.json | 2 +- .../data/superbwarfare/guns/hunting_rifle.json | 2 +- .../resources/data/superbwarfare/guns/k_98.json | 2 +- .../data/superbwarfare/guns/m_1911.json | 2 +- .../resources/data/superbwarfare/guns/m_4.json | 2 +- .../resources/data/superbwarfare/guns/m_60.json | 2 +- .../resources/data/superbwarfare/guns/m_870.json | 2 +- .../resources/data/superbwarfare/guns/m_98b.json | 2 +- .../data/superbwarfare/guns/marlin.json | 2 +- .../data/superbwarfare/guns/minigun.json | 2 +- .../resources/data/superbwarfare/guns/mk_14.json | 2 +- .../data/superbwarfare/guns/mosin_nagant.json | 2 +- .../data/superbwarfare/guns/ntw_20.json | 2 +- .../data/superbwarfare/guns/qbz_95.json | 2 +- .../resources/data/superbwarfare/guns/rpk.json | 2 +- .../data/superbwarfare/guns/sentinel.json | 2 +- .../resources/data/superbwarfare/guns/sks.json | 2 +- .../resources/data/superbwarfare/guns/svd.json | 2 +- .../data/superbwarfare/guns/trachelium.json | 2 +- .../data/superbwarfare/guns/vector.json | 2 +- 33 files changed, 44 insertions(+), 43 deletions(-) diff --git a/src/main/java/com/atsuishio/superbwarfare/client/tooltip/ClientGunImageTooltip.java b/src/main/java/com/atsuishio/superbwarfare/client/tooltip/ClientGunImageTooltip.java index f64691dec..83067e2e3 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/tooltip/ClientGunImageTooltip.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/tooltip/ClientGunImageTooltip.java @@ -1,14 +1,15 @@ package com.atsuishio.superbwarfare.client.tooltip; +import com.atsuishio.superbwarfare.client.tooltip.component.GunImageComponent; import com.atsuishio.superbwarfare.init.ModKeyMappings; import com.atsuishio.superbwarfare.init.ModPerks; import com.atsuishio.superbwarfare.init.ModTags; import com.atsuishio.superbwarfare.perk.AmmoPerk; import com.atsuishio.superbwarfare.perk.Perk; import com.atsuishio.superbwarfare.perk.PerkHelper; +import com.atsuishio.superbwarfare.tools.GunsTool; import com.atsuishio.superbwarfare.tools.ItemNBTTool; import com.atsuishio.superbwarfare.tools.TooltipTool; -import com.atsuishio.superbwarfare.client.tooltip.component.GunImageComponent; import net.minecraft.ChatFormatting; import net.minecraft.client.gui.Font; import net.minecraft.client.gui.GuiGraphics; @@ -64,7 +65,7 @@ public class ClientGunImageTooltip implements ClientTooltipComponent { } protected boolean shouldRenderBypassAndHeadshotTooltip() { - return ItemNBTTool.getDouble(stack, "BypassesArmor", 0) > 0 || ItemNBTTool.getDouble(stack, "headshot", 0) > 0; + return ItemNBTTool.getDouble(stack, "BypassesArmor", 0) > 0 || GunsTool.getGunDoubleTag(stack, "Headshot", 0) > 0; } protected boolean shouldRenderEditTooltip() { @@ -186,7 +187,7 @@ public class ClientGunImageTooltip implements ClientTooltipComponent { * 获取武器爆头倍率文本组件 */ protected Component getHeadshotComponent() { - double headshot = ItemNBTTool.getDouble(stack, "headshot", 0); + double headshot = GunsTool.getGunDoubleTag(stack, "Headshot", 0); return Component.translatable("des.superbwarfare.tips.headshot").withStyle(ChatFormatting.GRAY) .append(Component.literal("").withStyle(ChatFormatting.RESET)) .append(Component.literal(new DecimalFormat("##.#").format(headshot) + "x").withStyle(ChatFormatting.AQUA)); diff --git a/src/main/java/com/atsuishio/superbwarfare/event/GunEventHandler.java b/src/main/java/com/atsuishio/superbwarfare/event/GunEventHandler.java index d37e0b1c7..48d1691b4 100644 --- a/src/main/java/com/atsuishio/superbwarfare/event/GunEventHandler.java +++ b/src/main/java/com/atsuishio/superbwarfare/event/GunEventHandler.java @@ -185,7 +185,7 @@ public class GunEventHandler { ItemStack heldItem = player.getMainHandItem(); if (!player.level().isClientSide()) { - float headshot = (float) heldItem.getOrCreateTag().getDouble("headshot"); + float headshot = (float) GunsTool.getGunDoubleTag(heldItem, "Headshot", 0); float damage = (float) (heldItem.getOrCreateTag().getDouble("damage") + heldItem.getOrCreateTag().getDouble("sentinelChargeDamage")) * (float) perkDamage(heldItem); float velocity = (float) ((heldItem.getOrCreateTag().getDouble("velocity") + heldItem.getOrCreateTag().getDouble("CustomVelocity")) * perkSpeed(heldItem)); int projectileAmount = GunsTool.getGunIntTag(heldItem, "ProjectileAmount", 1); @@ -322,7 +322,7 @@ public class GunEventHandler { stack.getOrCreateTag().putBoolean("is_empty_reloading", true); playGunEmptyReloadSounds(player); } else { - data.putInt("ReloadTime", GunsTool.getGunIntTag(stack, "NormalReloadTime") + 1); + data.putInt("ReloadTime", data.getInt("NormalReloadTime") + 1); stack.getOrCreateTag().putBoolean("is_normal_reloading", true); playGunNormalReloadSounds(player); } diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/Trachelium.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/Trachelium.java index 1fab5884f..a5e70000e 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/Trachelium.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/Trachelium.java @@ -1,19 +1,19 @@ package com.atsuishio.superbwarfare.item.gun.handgun; import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.client.PoseTool; import com.atsuishio.superbwarfare.client.renderer.item.TracheliumItemRenderer; import com.atsuishio.superbwarfare.event.ClientEventHandler; -import com.atsuishio.superbwarfare.network.ModVariables; -import com.atsuishio.superbwarfare.perk.Perk; -import com.atsuishio.superbwarfare.perk.PerkHelper; -import com.atsuishio.superbwarfare.tools.GunsTool; -import com.atsuishio.superbwarfare.tools.TooltipTool; -import com.atsuishio.superbwarfare.client.PoseTool; import com.atsuishio.superbwarfare.init.ModItems; import com.atsuishio.superbwarfare.init.ModSounds; import com.atsuishio.superbwarfare.init.ModTags; import com.atsuishio.superbwarfare.item.AnimatedItem; import com.atsuishio.superbwarfare.item.gun.GunItem; +import com.atsuishio.superbwarfare.network.ModVariables; +import com.atsuishio.superbwarfare.perk.Perk; +import com.atsuishio.superbwarfare.perk.PerkHelper; +import com.atsuishio.superbwarfare.tools.GunsTool; +import com.atsuishio.superbwarfare.tools.TooltipTool; import net.minecraft.ChatFormatting; import net.minecraft.client.Minecraft; import net.minecraft.client.model.HumanoidModel; @@ -278,12 +278,12 @@ public class Trachelium extends GunItem implements GeoItem, AnimatedItem { tag.putDouble("CustomVelocity", 15); tag.putDouble("BypassesArmor", 0.4); tag.putDouble("damage", 21); - tag.putDouble("headshot", 2.5); + GunsTool.setGunDoubleTag(stack, "Headshot", 2.5); } else { tag.putDouble("CustomVelocity", 0); tag.putDouble("BypassesArmor", 0.3); tag.putDouble("damage", 19); - tag.putDouble("headshot", 2); + GunsTool.setGunDoubleTag(stack, "Headshot", 2); } double customZoom = switch (scopeType) { diff --git a/src/main/java/com/atsuishio/superbwarfare/network/message/FireMessage.java b/src/main/java/com/atsuishio/superbwarfare/network/message/FireMessage.java index bdb049c6d..f1490040a 100644 --- a/src/main/java/com/atsuishio/superbwarfare/network/message/FireMessage.java +++ b/src/main/java/com/atsuishio/superbwarfare/network/message/FireMessage.java @@ -238,7 +238,7 @@ public class FireMessage { CompoundTag tag = heldItem.getOrCreateTag(); var perk = PerkHelper.getPerkByType(heldItem, Perk.Type.AMMO); - float headshot = (float) tag.getDouble("headshot"); + float headshot = (float) GunsTool.getGunDoubleTag(heldItem, "Headshot", 0); float velocity = 2 * (float) tag.getDouble("speed") * (float) perkSpeed(heldItem); float bypassArmorRate = (float) heldItem.getOrCreateTag().getDouble("BypassesArmor"); double damage; diff --git a/src/main/java/com/atsuishio/superbwarfare/tools/GunsTool.java b/src/main/java/com/atsuishio/superbwarfare/tools/GunsTool.java index fa8fd52e5..e6f1ab937 100644 --- a/src/main/java/com/atsuishio/superbwarfare/tools/GunsTool.java +++ b/src/main/java/com/atsuishio/superbwarfare/tools/GunsTool.java @@ -55,7 +55,7 @@ public class GunsTool { // TODO 临时使用,移植完毕后删除 private static final Set STRING_SET = Set.of("EmptyReloadTime", "FireMode", "Weight", "SoundRadius", "BurstSize", "ProjectileAmount", - "Spread", "NormalReloadTime"); + "Spread", "NormalReloadTime", "Headshot"); public static void initGun(Level level, ItemStack stack, String location) { if (level.getServer() == null) return; diff --git a/src/main/resources/data/superbwarfare/guns/aa_12.json b/src/main/resources/data/superbwarfare/guns/aa_12.json index a64e8b06a..d607fc474 100644 --- a/src/main/resources/data/superbwarfare/guns/aa_12.json +++ b/src/main/resources/data/superbwarfare/guns/aa_12.json @@ -3,7 +3,7 @@ "recoil_x": 0.006, "recoil_y": 0.018, "damage": 2.5, - "headshot": 1.5, + "Headshot": 1.5, "velocity": 17, "mag": 25, "ProjectileAmount": 12, diff --git a/src/main/resources/data/superbwarfare/guns/abekiri.json b/src/main/resources/data/superbwarfare/guns/abekiri.json index d4de840b7..c557ea6a2 100644 --- a/src/main/resources/data/superbwarfare/guns/abekiri.json +++ b/src/main/resources/data/superbwarfare/guns/abekiri.json @@ -3,7 +3,7 @@ "recoil_x": 0.005, "recoil_y": 0.026, "damage": 5, - "headshot": 1.5, + "Headshot": 1.5, "velocity": 15, "mag": 2, "ProjectileAmount": 12, diff --git a/src/main/resources/data/superbwarfare/guns/ak_12.json b/src/main/resources/data/superbwarfare/guns/ak_12.json index 1420a632c..904414668 100644 --- a/src/main/resources/data/superbwarfare/guns/ak_12.json +++ b/src/main/resources/data/superbwarfare/guns/ak_12.json @@ -5,7 +5,7 @@ "recoil_x": 0.0015, "recoil_y": 0.01, "damage": 7.7, - "headshot": 2, + "Headshot": 2, "velocity": 44.5, "mag": 30, "Weight": 4, diff --git a/src/main/resources/data/superbwarfare/guns/ak_47.json b/src/main/resources/data/superbwarfare/guns/ak_47.json index ace6b1dd4..6290ca08a 100644 --- a/src/main/resources/data/superbwarfare/guns/ak_47.json +++ b/src/main/resources/data/superbwarfare/guns/ak_47.json @@ -5,7 +5,7 @@ "recoil_x": 0.002, "recoil_y": 0.012, "damage": 8.5, - "headshot": 2, + "Headshot": 2, "velocity": 36, "mag": 30, "Weight": 5, diff --git a/src/main/resources/data/superbwarfare/guns/bocek.json b/src/main/resources/data/superbwarfare/guns/bocek.json index 62db67a15..ac4e66597 100644 --- a/src/main/resources/data/superbwarfare/guns/bocek.json +++ b/src/main/resources/data/superbwarfare/guns/bocek.json @@ -1,7 +1,7 @@ { "CustomZoom": 0.75, "Spread": 4, - "headshot": 2.5, + "Headshot": 2.5, "damage": 48, "Weight": 3, "BypassesArmor": 0.25 diff --git a/src/main/resources/data/superbwarfare/guns/devotion.json b/src/main/resources/data/superbwarfare/guns/devotion.json index 162c43da1..b42d001e6 100644 --- a/src/main/resources/data/superbwarfare/guns/devotion.json +++ b/src/main/resources/data/superbwarfare/guns/devotion.json @@ -4,7 +4,7 @@ "recoil_x": 0.0018, "recoil_y": 0.01, "damage": 9.5, - "headshot": 2, + "Headshot": 2, "velocity": 40, "mag": 55, "Weight": 6, diff --git a/src/main/resources/data/superbwarfare/guns/glock_17.json b/src/main/resources/data/superbwarfare/guns/glock_17.json index 3c0ae94ce..7ea902f22 100644 --- a/src/main/resources/data/superbwarfare/guns/glock_17.json +++ b/src/main/resources/data/superbwarfare/guns/glock_17.json @@ -3,7 +3,7 @@ "recoil_x": 0.004, "recoil_y": 0.013, "damage": 5.5, - "headshot": 1.5, + "Headshot": 1.5, "velocity": 17, "mag": 17, "Weight": 1, diff --git a/src/main/resources/data/superbwarfare/guns/glock_18.json b/src/main/resources/data/superbwarfare/guns/glock_18.json index 837cf9747..df28baa82 100644 --- a/src/main/resources/data/superbwarfare/guns/glock_18.json +++ b/src/main/resources/data/superbwarfare/guns/glock_18.json @@ -3,7 +3,7 @@ "recoil_x": 0.004, "recoil_y": 0.013, "damage": 5.5, - "headshot": 1.5, + "Headshot": 1.5, "velocity": 17, "mag": 17, "Weight": 1, diff --git a/src/main/resources/data/superbwarfare/guns/hk_416.json b/src/main/resources/data/superbwarfare/guns/hk_416.json index b5a46a2a2..9e141aa37 100644 --- a/src/main/resources/data/superbwarfare/guns/hk_416.json +++ b/src/main/resources/data/superbwarfare/guns/hk_416.json @@ -5,7 +5,7 @@ "recoil_x": 0.0016, "recoil_y": 0.009, "damage": 7.5, - "headshot": 2, + "Headshot": 2, "velocity": 44, "mag": 30, "Weight": 4, diff --git a/src/main/resources/data/superbwarfare/guns/hunting_rifle.json b/src/main/resources/data/superbwarfare/guns/hunting_rifle.json index a9105f5b5..77669507d 100644 --- a/src/main/resources/data/superbwarfare/guns/hunting_rifle.json +++ b/src/main/resources/data/superbwarfare/guns/hunting_rifle.json @@ -3,7 +3,7 @@ "recoil_x": 0.004, "recoil_y": 0.04, "damage": 65, - "headshot": 3, + "Headshot": 3, "velocity": 38, "mag": 1, "Weight": 5, diff --git a/src/main/resources/data/superbwarfare/guns/k_98.json b/src/main/resources/data/superbwarfare/guns/k_98.json index 6a262814e..f9d482723 100644 --- a/src/main/resources/data/superbwarfare/guns/k_98.json +++ b/src/main/resources/data/superbwarfare/guns/k_98.json @@ -3,7 +3,7 @@ "recoil_x": 0.002, "recoil_y": 0.063, "damage": 35, - "headshot": 3, + "Headshot": 3, "velocity": 37.75, "mag": 5, "bolt_action_time": 22, diff --git a/src/main/resources/data/superbwarfare/guns/m_1911.json b/src/main/resources/data/superbwarfare/guns/m_1911.json index a0a6b7d54..c64b105cb 100644 --- a/src/main/resources/data/superbwarfare/guns/m_1911.json +++ b/src/main/resources/data/superbwarfare/guns/m_1911.json @@ -3,7 +3,7 @@ "recoil_x": 0.006, "recoil_y": 0.018, "damage": 9.5, - "headshot": 1.5, + "Headshot": 1.5, "velocity": 15, "mag": 7, "Weight": 2, diff --git a/src/main/resources/data/superbwarfare/guns/m_4.json b/src/main/resources/data/superbwarfare/guns/m_4.json index 06adc6f9f..cd2f18d9c 100644 --- a/src/main/resources/data/superbwarfare/guns/m_4.json +++ b/src/main/resources/data/superbwarfare/guns/m_4.json @@ -5,7 +5,7 @@ "recoil_x": 0.0015, "recoil_y": 0.011, "damage": 7, - "headshot": 2, + "Headshot": 2, "velocity": 44, "mag": 30, "Weight": 4, diff --git a/src/main/resources/data/superbwarfare/guns/m_60.json b/src/main/resources/data/superbwarfare/guns/m_60.json index 1c79be99d..ec0f7f663 100644 --- a/src/main/resources/data/superbwarfare/guns/m_60.json +++ b/src/main/resources/data/superbwarfare/guns/m_60.json @@ -3,7 +3,7 @@ "recoil_x": 0.004, "recoil_y": 0.014, "damage": 9, - "headshot": 2, + "Headshot": 2, "velocity": 43, "mag": 100, "Weight": 8, diff --git a/src/main/resources/data/superbwarfare/guns/m_870.json b/src/main/resources/data/superbwarfare/guns/m_870.json index 1d37ddfed..9b782d4c1 100644 --- a/src/main/resources/data/superbwarfare/guns/m_870.json +++ b/src/main/resources/data/superbwarfare/guns/m_870.json @@ -3,7 +3,7 @@ "recoil_x": 0.009, "recoil_y": 0.04, "damage": 3, - "headshot": 1.5, + "Headshot": 1.5, "velocity": 17, "mag": 8, "force_stop_reloading": 1, diff --git a/src/main/resources/data/superbwarfare/guns/m_98b.json b/src/main/resources/data/superbwarfare/guns/m_98b.json index 24f00d52d..547caaab7 100644 --- a/src/main/resources/data/superbwarfare/guns/m_98b.json +++ b/src/main/resources/data/superbwarfare/guns/m_98b.json @@ -6,7 +6,7 @@ "recoil_x": 0.007, "recoil_y": 0.013, "damage": 38, - "headshot": 3, + "Headshot": 3, "velocity": 47.2, "mag": 5, "bolt_action_time": 18, diff --git a/src/main/resources/data/superbwarfare/guns/marlin.json b/src/main/resources/data/superbwarfare/guns/marlin.json index 3b28a03b3..a701e9745 100644 --- a/src/main/resources/data/superbwarfare/guns/marlin.json +++ b/src/main/resources/data/superbwarfare/guns/marlin.json @@ -3,7 +3,7 @@ "recoil_x": 0.004, "recoil_y": 0.031, "damage": 16, - "headshot": 2.5, + "Headshot": 2.5, "velocity": 38, "mag": 8, "force_stop_reloading": 1, diff --git a/src/main/resources/data/superbwarfare/guns/minigun.json b/src/main/resources/data/superbwarfare/guns/minigun.json index 036a87479..fd6bb2421 100644 --- a/src/main/resources/data/superbwarfare/guns/minigun.json +++ b/src/main/resources/data/superbwarfare/guns/minigun.json @@ -3,7 +3,7 @@ "recoil_x": 0.003, "recoil_y": 0.02, "damage": 8, - "headshot": 2, + "Headshot": 2, "velocity": 46, "Weight": 10, "FireMode": 2, diff --git a/src/main/resources/data/superbwarfare/guns/mk_14.json b/src/main/resources/data/superbwarfare/guns/mk_14.json index 014062a17..be9530d43 100644 --- a/src/main/resources/data/superbwarfare/guns/mk_14.json +++ b/src/main/resources/data/superbwarfare/guns/mk_14.json @@ -5,7 +5,7 @@ "recoil_x": 0.006, "recoil_y": 0.014, "damage": 12, - "headshot": 2.5, + "Headshot": 2.5, "velocity": 42.5, "mag": 20, "Weight": 5, diff --git a/src/main/resources/data/superbwarfare/guns/mosin_nagant.json b/src/main/resources/data/superbwarfare/guns/mosin_nagant.json index 875c7d613..fd3fabfd0 100644 --- a/src/main/resources/data/superbwarfare/guns/mosin_nagant.json +++ b/src/main/resources/data/superbwarfare/guns/mosin_nagant.json @@ -4,7 +4,7 @@ "recoil_x": 0.002, "recoil_y": 0.063, "damage": 33, - "headshot": 3, + "Headshot": 3, "velocity": 42, "mag": 5, "bolt_action_time": 22, diff --git a/src/main/resources/data/superbwarfare/guns/ntw_20.json b/src/main/resources/data/superbwarfare/guns/ntw_20.json index 379c4f6b3..91fd6422e 100644 --- a/src/main/resources/data/superbwarfare/guns/ntw_20.json +++ b/src/main/resources/data/superbwarfare/guns/ntw_20.json @@ -4,7 +4,7 @@ "recoil_x": 0.01, "recoil_y": 0.038, "damage": 140, - "headshot": 3, + "Headshot": 3, "velocity": 36, "mag": 3, "bolt_action_time": 37, diff --git a/src/main/resources/data/superbwarfare/guns/qbz_95.json b/src/main/resources/data/superbwarfare/guns/qbz_95.json index 70923e76b..d2b028cb6 100644 --- a/src/main/resources/data/superbwarfare/guns/qbz_95.json +++ b/src/main/resources/data/superbwarfare/guns/qbz_95.json @@ -5,7 +5,7 @@ "recoil_x": 0.0013, "recoil_y": 0.009, "damage": 8.25, - "headshot": 2, + "Headshot": 2, "velocity": 46, "mag": 30, "Weight": 4, diff --git a/src/main/resources/data/superbwarfare/guns/rpk.json b/src/main/resources/data/superbwarfare/guns/rpk.json index 1fa2bd6bc..09dd40b20 100644 --- a/src/main/resources/data/superbwarfare/guns/rpk.json +++ b/src/main/resources/data/superbwarfare/guns/rpk.json @@ -3,7 +3,7 @@ "recoil_x": 0.0018, "recoil_y": 0.012, "damage": 8.75, - "headshot": 2, + "Headshot": 2, "velocity": 38, "mag": 75, "Weight": 6, diff --git a/src/main/resources/data/superbwarfare/guns/sentinel.json b/src/main/resources/data/superbwarfare/guns/sentinel.json index ea0c360a2..9357010a5 100644 --- a/src/main/resources/data/superbwarfare/guns/sentinel.json +++ b/src/main/resources/data/superbwarfare/guns/sentinel.json @@ -5,7 +5,7 @@ "recoil_y": 0.018, "damage": 35, "mag": 5, - "headshot": 3, + "Headshot": 3, "velocity": 70, "bolt_action_time": 22, "Weight": 7, diff --git a/src/main/resources/data/superbwarfare/guns/sks.json b/src/main/resources/data/superbwarfare/guns/sks.json index e095b74d8..dcceba4f8 100644 --- a/src/main/resources/data/superbwarfare/guns/sks.json +++ b/src/main/resources/data/superbwarfare/guns/sks.json @@ -3,7 +3,7 @@ "recoil_x": 0.004, "recoil_y": 0.015, "damage": 9.5, - "headshot": 2, + "Headshot": 2, "velocity": 36, "mag": 20, "Weight": 4, diff --git a/src/main/resources/data/superbwarfare/guns/svd.json b/src/main/resources/data/superbwarfare/guns/svd.json index 388956fc4..834e9fffa 100644 --- a/src/main/resources/data/superbwarfare/guns/svd.json +++ b/src/main/resources/data/superbwarfare/guns/svd.json @@ -4,7 +4,7 @@ "recoil_x": 0.004, "recoil_y": 0.009, "damage": 18, - "headshot": 2, + "Headshot": 2, "velocity": 42, "mag": 10, "Weight": 5, diff --git a/src/main/resources/data/superbwarfare/guns/trachelium.json b/src/main/resources/data/superbwarfare/guns/trachelium.json index e9e7d0892..e79a050d8 100644 --- a/src/main/resources/data/superbwarfare/guns/trachelium.json +++ b/src/main/resources/data/superbwarfare/guns/trachelium.json @@ -3,7 +3,7 @@ "recoil_x": 0.005, "recoil_y": 0.032, "damage": 19, - "headshot": 2, + "Headshot": 2, "velocity": 24, "mag": 6, "Weight": 2, diff --git a/src/main/resources/data/superbwarfare/guns/vector.json b/src/main/resources/data/superbwarfare/guns/vector.json index 89785d8bd..18f574c9d 100644 --- a/src/main/resources/data/superbwarfare/guns/vector.json +++ b/src/main/resources/data/superbwarfare/guns/vector.json @@ -3,7 +3,7 @@ "recoil_x": 0.002, "recoil_y": 0.007, "damage": 6, - "headshot": 1.5, + "Headshot": 1.5, "velocity": 16, "mag": 13, "Weight": 3,