diff --git a/src/main/java/com/atsuishio/superbwarfare/event/GunEventHandler.java b/src/main/java/com/atsuishio/superbwarfare/event/GunEventHandler.java index 48d1691b4..d849cfafe 100644 --- a/src/main/java/com/atsuishio/superbwarfare/event/GunEventHandler.java +++ b/src/main/java/com/atsuishio/superbwarfare/event/GunEventHandler.java @@ -187,7 +187,7 @@ public class GunEventHandler { if (!player.level().isClientSide()) { 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)); + float velocity = (float) ((GunsTool.getGunDoubleTag(heldItem, "Velocity", 0) + heldItem.getOrCreateTag().getDouble("CustomVelocity")) * perkSpeed(heldItem)); int projectileAmount = GunsTool.getGunIntTag(heldItem, "ProjectileAmount", 1); float bypassArmorRate = (float) heldItem.getOrCreateTag().getDouble("BypassesArmor"); boolean zoom = player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables()).zoom; 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 f1490040a..99c3aef54 100644 --- a/src/main/java/com/atsuishio/superbwarfare/network/message/FireMessage.java +++ b/src/main/java/com/atsuishio/superbwarfare/network/message/FireMessage.java @@ -340,7 +340,7 @@ public class FireMessage { TaserBulletProjectileEntity taserBulletProjectile = new TaserBulletProjectileEntity(player, level, (float) stack.getOrCreateTag().getDouble("damage"), volt, wireLength); taserBulletProjectile.setPos(player.getX(), player.getEyeY() - 0.1, player.getZ()); - taserBulletProjectile.shoot(player.getLookAngle().x, player.getLookAngle().y, player.getLookAngle().z, (float) stack.getOrCreateTag().getDouble("velocity"), + taserBulletProjectile.shoot(player.getLookAngle().x, player.getLookAngle().y, player.getLookAngle().z, (float) GunsTool.getGunDoubleTag(stack, "Velocity", 0), (float) (zoom ? 0.1 : spread)); level.addFreshEntity(taserBulletProjectile); } @@ -380,7 +380,7 @@ public class FireMessage { } gunGrenadeEntity.setPos(player.getX(), player.getEyeY() - 0.1, player.getZ()); - gunGrenadeEntity.shoot(player.getLookAngle().x, player.getLookAngle().y, player.getLookAngle().z, (float) stack.getOrCreateTag().getDouble("velocity"), + gunGrenadeEntity.shoot(player.getLookAngle().x, player.getLookAngle().y, player.getLookAngle().z, (float) GunsTool.getGunDoubleTag(stack, "Velocity", 0), (float) (zoom ? 0.1 : spread)); level.addFreshEntity(gunGrenadeEntity); } @@ -431,7 +431,7 @@ public class FireMessage { } rocketEntity.setPos(player.getX(), player.getEyeY() - 0.1, player.getZ()); - rocketEntity.shoot(player.getLookAngle().x, player.getLookAngle().y, player.getLookAngle().z, (float) tag.getDouble("velocity"), + rocketEntity.shoot(player.getLookAngle().x, player.getLookAngle().y, player.getLookAngle().z, (float) GunsTool.getGunDoubleTag(stack, "Velocity", 0), (float) (zoom ? 0.1 : spread)); level.addFreshEntity(rocketEntity); } diff --git a/src/main/java/com/atsuishio/superbwarfare/tools/GunsTool.java b/src/main/java/com/atsuishio/superbwarfare/tools/GunsTool.java index aa3b64cf3..a7438361c 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", "Headshot", "Semi", "Burst", "Auto", "RecoilX", "RecoilY"); + "Spread", "NormalReloadTime", "Headshot", "Semi", "Burst", "Auto", "RecoilX", "RecoilY", "Velocity"); 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 d6b51f83e..df5f142c1 100644 --- a/src/main/resources/data/superbwarfare/guns/aa_12.json +++ b/src/main/resources/data/superbwarfare/guns/aa_12.json @@ -4,7 +4,7 @@ "RecoilY": 0.018, "damage": 2.5, "Headshot": 1.5, - "velocity": 17, + "Velocity": 17, "mag": 25, "ProjectileAmount": 12, "Weight": 7, diff --git a/src/main/resources/data/superbwarfare/guns/abekiri.json b/src/main/resources/data/superbwarfare/guns/abekiri.json index e4e7b1a89..37b2aa78e 100644 --- a/src/main/resources/data/superbwarfare/guns/abekiri.json +++ b/src/main/resources/data/superbwarfare/guns/abekiri.json @@ -4,7 +4,7 @@ "RecoilY": 0.026, "damage": 5, "Headshot": 1.5, - "velocity": 15, + "Velocity": 15, "mag": 2, "ProjectileAmount": 12, "Weight": 1, diff --git a/src/main/resources/data/superbwarfare/guns/ak_12.json b/src/main/resources/data/superbwarfare/guns/ak_12.json index 9cca56677..94dc4fdb5 100644 --- a/src/main/resources/data/superbwarfare/guns/ak_12.json +++ b/src/main/resources/data/superbwarfare/guns/ak_12.json @@ -6,7 +6,7 @@ "RecoilY": 0.01, "damage": 7.7, "Headshot": 2, - "velocity": 44.5, + "Velocity": 44.5, "mag": 30, "Weight": 4, "FireMode": 2, diff --git a/src/main/resources/data/superbwarfare/guns/ak_47.json b/src/main/resources/data/superbwarfare/guns/ak_47.json index 4fa040635..d31809724 100644 --- a/src/main/resources/data/superbwarfare/guns/ak_47.json +++ b/src/main/resources/data/superbwarfare/guns/ak_47.json @@ -6,7 +6,7 @@ "RecoilY": 0.012, "damage": 8.5, "Headshot": 2, - "velocity": 36, + "Velocity": 36, "mag": 30, "Weight": 5, "FireMode": 2, diff --git a/src/main/resources/data/superbwarfare/guns/devotion.json b/src/main/resources/data/superbwarfare/guns/devotion.json index 0f34ab5f0..6678124ef 100644 --- a/src/main/resources/data/superbwarfare/guns/devotion.json +++ b/src/main/resources/data/superbwarfare/guns/devotion.json @@ -5,7 +5,7 @@ "RecoilY": 0.01, "damage": 9.5, "Headshot": 2, - "velocity": 40, + "Velocity": 40, "mag": 55, "Weight": 6, "FireMode": 2, diff --git a/src/main/resources/data/superbwarfare/guns/glock_17.json b/src/main/resources/data/superbwarfare/guns/glock_17.json index a0dcb0362..f0173a916 100644 --- a/src/main/resources/data/superbwarfare/guns/glock_17.json +++ b/src/main/resources/data/superbwarfare/guns/glock_17.json @@ -4,7 +4,7 @@ "RecoilY": 0.013, "damage": 5.5, "Headshot": 1.5, - "velocity": 17, + "Velocity": 17, "mag": 17, "Weight": 1, "FireMode": 0, diff --git a/src/main/resources/data/superbwarfare/guns/glock_18.json b/src/main/resources/data/superbwarfare/guns/glock_18.json index 9c90e2be2..1574d6eca 100644 --- a/src/main/resources/data/superbwarfare/guns/glock_18.json +++ b/src/main/resources/data/superbwarfare/guns/glock_18.json @@ -4,7 +4,7 @@ "RecoilY": 0.013, "damage": 5.5, "Headshot": 1.5, - "velocity": 17, + "Velocity": 17, "mag": 17, "Weight": 1, "FireMode": 2, diff --git a/src/main/resources/data/superbwarfare/guns/hk_416.json b/src/main/resources/data/superbwarfare/guns/hk_416.json index ddc43843d..e32f2cff7 100644 --- a/src/main/resources/data/superbwarfare/guns/hk_416.json +++ b/src/main/resources/data/superbwarfare/guns/hk_416.json @@ -6,7 +6,7 @@ "RecoilY": 0.009, "damage": 7.5, "Headshot": 2, - "velocity": 44, + "Velocity": 44, "mag": 30, "Weight": 4, "FireMode": 2, diff --git a/src/main/resources/data/superbwarfare/guns/hunting_rifle.json b/src/main/resources/data/superbwarfare/guns/hunting_rifle.json index 0ce7b58cd..f4289877c 100644 --- a/src/main/resources/data/superbwarfare/guns/hunting_rifle.json +++ b/src/main/resources/data/superbwarfare/guns/hunting_rifle.json @@ -4,7 +4,7 @@ "RecoilY": 0.04, "damage": 65, "Headshot": 3, - "velocity": 38, + "Velocity": 38, "mag": 1, "Weight": 5, "FireMode": 0, diff --git a/src/main/resources/data/superbwarfare/guns/k_98.json b/src/main/resources/data/superbwarfare/guns/k_98.json index 4e30a78ed..be039e64d 100644 --- a/src/main/resources/data/superbwarfare/guns/k_98.json +++ b/src/main/resources/data/superbwarfare/guns/k_98.json @@ -4,7 +4,7 @@ "RecoilY": 0.063, "damage": 35, "Headshot": 3, - "velocity": 37.75, + "Velocity": 37.75, "mag": 5, "bolt_action_time": 22, "Weight": 5, diff --git a/src/main/resources/data/superbwarfare/guns/m_1911.json b/src/main/resources/data/superbwarfare/guns/m_1911.json index d8ed2ab39..0b5ece08e 100644 --- a/src/main/resources/data/superbwarfare/guns/m_1911.json +++ b/src/main/resources/data/superbwarfare/guns/m_1911.json @@ -4,7 +4,7 @@ "RecoilY": 0.018, "damage": 9.5, "Headshot": 1.5, - "velocity": 15, + "Velocity": 15, "mag": 7, "Weight": 2, "FireMode": 0, diff --git a/src/main/resources/data/superbwarfare/guns/m_4.json b/src/main/resources/data/superbwarfare/guns/m_4.json index e1b6dc4d6..a51b41445 100644 --- a/src/main/resources/data/superbwarfare/guns/m_4.json +++ b/src/main/resources/data/superbwarfare/guns/m_4.json @@ -6,7 +6,7 @@ "RecoilY": 0.011, "damage": 7, "Headshot": 2, - "velocity": 44, + "Velocity": 44, "mag": 30, "Weight": 4, "FireMode": 2, diff --git a/src/main/resources/data/superbwarfare/guns/m_60.json b/src/main/resources/data/superbwarfare/guns/m_60.json index cb4d4f9bc..cdc1ec923 100644 --- a/src/main/resources/data/superbwarfare/guns/m_60.json +++ b/src/main/resources/data/superbwarfare/guns/m_60.json @@ -4,7 +4,7 @@ "RecoilY": 0.014, "damage": 9, "Headshot": 2, - "velocity": 43, + "Velocity": 43, "mag": 100, "Weight": 8, "FireMode": 2, diff --git a/src/main/resources/data/superbwarfare/guns/m_79.json b/src/main/resources/data/superbwarfare/guns/m_79.json index f099a2ea9..0c98ba571 100644 --- a/src/main/resources/data/superbwarfare/guns/m_79.json +++ b/src/main/resources/data/superbwarfare/guns/m_79.json @@ -5,7 +5,7 @@ "damage": 40, "ExplosionDamage": 80, "ExplosionRadius": 5, - "velocity": 3.75, + "Velocity": 3.75, "mag": 1, "Weight": 4, "EmptyReloadTime": 64 diff --git a/src/main/resources/data/superbwarfare/guns/m_870.json b/src/main/resources/data/superbwarfare/guns/m_870.json index a879f58c7..14233160b 100644 --- a/src/main/resources/data/superbwarfare/guns/m_870.json +++ b/src/main/resources/data/superbwarfare/guns/m_870.json @@ -4,7 +4,7 @@ "RecoilY": 0.04, "damage": 3, "Headshot": 1.5, - "velocity": 17, + "Velocity": 17, "mag": 8, "force_stop_reloading": 1, "ProjectileAmount": 12, diff --git a/src/main/resources/data/superbwarfare/guns/m_98b.json b/src/main/resources/data/superbwarfare/guns/m_98b.json index 5a870c62d..dc11728ab 100644 --- a/src/main/resources/data/superbwarfare/guns/m_98b.json +++ b/src/main/resources/data/superbwarfare/guns/m_98b.json @@ -7,7 +7,7 @@ "RecoilY": 0.013, "damage": 38, "Headshot": 3, - "velocity": 47.2, + "Velocity": 47.2, "mag": 5, "bolt_action_time": 18, "Weight": 7, diff --git a/src/main/resources/data/superbwarfare/guns/marlin.json b/src/main/resources/data/superbwarfare/guns/marlin.json index e6ea3a2b1..6bdad0620 100644 --- a/src/main/resources/data/superbwarfare/guns/marlin.json +++ b/src/main/resources/data/superbwarfare/guns/marlin.json @@ -4,7 +4,7 @@ "RecoilY": 0.031, "damage": 16, "Headshot": 2.5, - "velocity": 38, + "Velocity": 38, "mag": 8, "force_stop_reloading": 1, "Weight": 3, diff --git a/src/main/resources/data/superbwarfare/guns/minigun.json b/src/main/resources/data/superbwarfare/guns/minigun.json index 349014693..166bba744 100644 --- a/src/main/resources/data/superbwarfare/guns/minigun.json +++ b/src/main/resources/data/superbwarfare/guns/minigun.json @@ -4,7 +4,7 @@ "RecoilY": 0.02, "damage": 8, "Headshot": 2, - "velocity": 46, + "Velocity": 46, "Weight": 10, "FireMode": 2, "BypassesArmor": 0.3, diff --git a/src/main/resources/data/superbwarfare/guns/mk_14.json b/src/main/resources/data/superbwarfare/guns/mk_14.json index 0fc0e53c3..b6e6538c2 100644 --- a/src/main/resources/data/superbwarfare/guns/mk_14.json +++ b/src/main/resources/data/superbwarfare/guns/mk_14.json @@ -6,7 +6,7 @@ "RecoilY": 0.014, "damage": 12, "Headshot": 2.5, - "velocity": 42.5, + "Velocity": 42.5, "mag": 20, "Weight": 5, "FireMode": 0, diff --git a/src/main/resources/data/superbwarfare/guns/mosin_nagant.json b/src/main/resources/data/superbwarfare/guns/mosin_nagant.json index 9d4f69714..93d23e027 100644 --- a/src/main/resources/data/superbwarfare/guns/mosin_nagant.json +++ b/src/main/resources/data/superbwarfare/guns/mosin_nagant.json @@ -5,7 +5,7 @@ "RecoilY": 0.063, "damage": 33, "Headshot": 3, - "velocity": 42, + "Velocity": 42, "mag": 5, "bolt_action_time": 22, "Weight": 5, diff --git a/src/main/resources/data/superbwarfare/guns/ntw_20.json b/src/main/resources/data/superbwarfare/guns/ntw_20.json index cdf26a638..17452f18a 100644 --- a/src/main/resources/data/superbwarfare/guns/ntw_20.json +++ b/src/main/resources/data/superbwarfare/guns/ntw_20.json @@ -5,7 +5,7 @@ "RecoilY": 0.038, "damage": 140, "Headshot": 3, - "velocity": 36, + "Velocity": 36, "mag": 3, "bolt_action_time": 37, "Weight": 10, diff --git a/src/main/resources/data/superbwarfare/guns/qbz_95.json b/src/main/resources/data/superbwarfare/guns/qbz_95.json index bdc63c228..54209eb4d 100644 --- a/src/main/resources/data/superbwarfare/guns/qbz_95.json +++ b/src/main/resources/data/superbwarfare/guns/qbz_95.json @@ -6,7 +6,7 @@ "RecoilY": 0.009, "damage": 8.25, "Headshot": 2, - "velocity": 46, + "Velocity": 46, "mag": 30, "Weight": 4, "FireMode": 2, diff --git a/src/main/resources/data/superbwarfare/guns/rpg.json b/src/main/resources/data/superbwarfare/guns/rpg.json index ead575a5c..ac4439e8a 100644 --- a/src/main/resources/data/superbwarfare/guns/rpg.json +++ b/src/main/resources/data/superbwarfare/guns/rpg.json @@ -5,7 +5,7 @@ "damage": 200, "ExplosionDamage": 150, "ExplosionRadius": 10, - "velocity": 4, + "Velocity": 4, "mag": 1, "Weight": 7, "EmptyReloadTime": 103 diff --git a/src/main/resources/data/superbwarfare/guns/rpk.json b/src/main/resources/data/superbwarfare/guns/rpk.json index 213ad9a1e..d0fcb44d0 100644 --- a/src/main/resources/data/superbwarfare/guns/rpk.json +++ b/src/main/resources/data/superbwarfare/guns/rpk.json @@ -4,7 +4,7 @@ "RecoilY": 0.012, "damage": 8.75, "Headshot": 2, - "velocity": 38, + "Velocity": 38, "mag": 75, "Weight": 6, "FireMode": 2, diff --git a/src/main/resources/data/superbwarfare/guns/sentinel.json b/src/main/resources/data/superbwarfare/guns/sentinel.json index 1df3a690d..698017fc7 100644 --- a/src/main/resources/data/superbwarfare/guns/sentinel.json +++ b/src/main/resources/data/superbwarfare/guns/sentinel.json @@ -6,7 +6,7 @@ "damage": 35, "mag": 5, "Headshot": 3, - "velocity": 70, + "Velocity": 70, "bolt_action_time": 22, "Weight": 7, "FireMode": 0, diff --git a/src/main/resources/data/superbwarfare/guns/sks.json b/src/main/resources/data/superbwarfare/guns/sks.json index 388aae5ce..55f92652d 100644 --- a/src/main/resources/data/superbwarfare/guns/sks.json +++ b/src/main/resources/data/superbwarfare/guns/sks.json @@ -4,7 +4,7 @@ "RecoilY": 0.015, "damage": 9.5, "Headshot": 2, - "velocity": 36, + "Velocity": 36, "mag": 20, "Weight": 4, "FireMode": 0, diff --git a/src/main/resources/data/superbwarfare/guns/svd.json b/src/main/resources/data/superbwarfare/guns/svd.json index 6d8be0de9..bc2eeb931 100644 --- a/src/main/resources/data/superbwarfare/guns/svd.json +++ b/src/main/resources/data/superbwarfare/guns/svd.json @@ -5,7 +5,7 @@ "RecoilY": 0.009, "damage": 18, "Headshot": 2, - "velocity": 42, + "Velocity": 42, "mag": 10, "Weight": 5, "FireMode": 0, diff --git a/src/main/resources/data/superbwarfare/guns/taser.json b/src/main/resources/data/superbwarfare/guns/taser.json index 1d83af780..9b6052cfb 100644 --- a/src/main/resources/data/superbwarfare/guns/taser.json +++ b/src/main/resources/data/superbwarfare/guns/taser.json @@ -3,7 +3,7 @@ "RecoilX": 0.0001, "RecoilY": 0.002, "damage": 5, - "velocity": 3, + "Velocity": 3, "mag": 1, "Weight": 1, "EmptyReloadTime": 58 diff --git a/src/main/resources/data/superbwarfare/guns/trachelium.json b/src/main/resources/data/superbwarfare/guns/trachelium.json index 758bfbb7f..accfab99f 100644 --- a/src/main/resources/data/superbwarfare/guns/trachelium.json +++ b/src/main/resources/data/superbwarfare/guns/trachelium.json @@ -4,7 +4,7 @@ "RecoilY": 0.032, "damage": 19, "Headshot": 2, - "velocity": 24, + "Velocity": 24, "mag": 6, "Weight": 2, "FireMode": 0, diff --git a/src/main/resources/data/superbwarfare/guns/vector.json b/src/main/resources/data/superbwarfare/guns/vector.json index 9638f7e44..9ca91f5e5 100644 --- a/src/main/resources/data/superbwarfare/guns/vector.json +++ b/src/main/resources/data/superbwarfare/guns/vector.json @@ -4,7 +4,7 @@ "RecoilY": 0.007, "damage": 6, "Headshot": 1.5, - "velocity": 16, + "Velocity": 16, "mag": 13, "Weight": 3, "FireMode": 2,