From 2c3c1d3b54968aca5aa26212c05bbfd401a116f6 Mon Sep 17 00:00:00 2001 From: Atsuishio <842960157@qq.com> Date: Thu, 29 May 2025 21:13:31 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8C=BA=E5=88=86MP5=E5=BC=B9=E9=BC=93?= =?UTF-8?q?=E5=92=8C=E5=BC=B9=E5=8C=A3=E7=9A=84=E6=8D=A2=E5=BC=B9=E5=8A=A8?= =?UTF-8?q?=E7=94=BB=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=85=89=E6=A3=B1=E5=9D=A6?= =?UTF-8?q?=E5=85=8B=E6=B0=B4=E4=B8=8B=E9=98=BB=E5=8A=9B=EF=BC=8C=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E6=95=B0=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/projectile/RpgRocketEntity.java | 2 +- .../entity/vehicle/PrismTankEntity.java | 10 +- .../item/gun/launcher/RpgItem.java | 2 +- .../superbwarfare/item/gun/smg/Mp5Item.java | 13 +- .../animations/mp_5.animation.json | 1421 ++++++++++++++++- .../data/superbwarfare/guns/rpg.json | 2 +- 6 files changed, 1432 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/projectile/RpgRocketEntity.java b/src/main/java/com/atsuishio/superbwarfare/entity/projectile/RpgRocketEntity.java index a217fb1f1..1a3867555 100644 --- a/src/main/java/com/atsuishio/superbwarfare/entity/projectile/RpgRocketEntity.java +++ b/src/main/java/com/atsuishio/superbwarfare/entity/projectile/RpgRocketEntity.java @@ -165,7 +165,7 @@ public class RpgRocketEntity extends FastThrowableProjectile implements GeoEntit if (ExplosionConfig.EXPLOSION_DESTROY.get()) { float hardness = this.level().getBlockState(BlockPos.containing(x, y, z)).getBlock().defaultDestroyTime(); - if (hardness <= 50 && hardness != -1) { + if (hardness <= 10 && hardness != -1) { BlockPos blockPos = BlockPos.containing(x, y, z); Block.dropResources(this.level().getBlockState(blockPos), this.level(), BlockPos.containing(x, y, z), null); this.level().destroyBlock(blockPos, true); diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/PrismTankEntity.java b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/PrismTankEntity.java index f882c9835..70b24276c 100644 --- a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/PrismTankEntity.java +++ b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/PrismTankEntity.java @@ -178,14 +178,16 @@ public class PrismTankEntity extends ContainerMobileVehicleEntity implements Geo float f0 = 0.54f + 0.25f * Mth.abs(90 - (float) calculateAngle(this.getDeltaMovement(), this.getViewVector(1))) / 90; this.setDeltaMovement(this.getDeltaMovement().add(this.getViewVector(1).normalize().scale(0.05 * getDeltaMovement().dot(getViewVector(1))))); this.setDeltaMovement(this.getDeltaMovement().multiply(f0, 0.99, f0)); - } else if (this.isInWater()) { - float f1 = 0.61f + 0.08f * Mth.abs(90 - (float) calculateAngle(this.getDeltaMovement(), this.getViewVector(1))) / 90; - this.setDeltaMovement(this.getDeltaMovement().add(this.getViewVector(1).normalize().scale(0.04 * getDeltaMovement().dot(getViewVector(1))))); - this.setDeltaMovement(this.getDeltaMovement().multiply(f1, 0.85, f1)); } else { this.setDeltaMovement(this.getDeltaMovement().multiply(0.99, 0.99, 0.99)); } + if (this.isInWater()) { + float f1 = (float) (0.7f - (0.04f * Math.min(getSubmergedHeight(this), this.getBbHeight())) + 0.08f * Mth.abs(90 - (float) calculateAngle(this.getDeltaMovement(), this.getViewVector(1))) / 90); + this.setDeltaMovement(this.getDeltaMovement().add(this.getViewVector(1).normalize().scale(0.04 * getDeltaMovement().dot(getViewVector(1))))); + this.setDeltaMovement(this.getDeltaMovement().multiply(f1, 0.85, f1)); + } + if (this.level() instanceof ServerLevel serverLevel && this.isInWater() && this.getDeltaMovement().length() > 0.1) { sendParticle(serverLevel, ParticleTypes.CLOUD, this.getX() + 0.5 * this.getDeltaMovement().x, this.getY() + getSubmergedHeight(this) - 0.2, this.getZ() + 0.5 * this.getDeltaMovement().z, (int) (2 + 4 * this.getDeltaMovement().length()), 0.65, 0, 0.65, 0, true); sendParticle(serverLevel, ParticleTypes.BUBBLE_COLUMN_UP, this.getX() + 0.5 * this.getDeltaMovement().x, this.getY() + getSubmergedHeight(this) - 0.2, this.getZ() + 0.5 * this.getDeltaMovement().z, (int) (2 + 10 * this.getDeltaMovement().length()), 0.65, 0, 0.65, 0, true); diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/launcher/RpgItem.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/launcher/RpgItem.java index e67877748..1770744c7 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/launcher/RpgItem.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/launcher/RpgItem.java @@ -61,7 +61,7 @@ public class RpgItem extends GunItem implements GeoItem { var data = GunData.from(stack); if (data.reload.empty()) { - return event.setAndContinue(RawAnimation.begin().thenPlay("animation.rpg.reload")); + return event.setAndContinue(RawAnimation.begin().thenPlayAndHold("animation.rpg.reload")); } if (player.isSprinting() && player.onGround() && ClientEventHandler.cantSprint == 0 && ClientEventHandler.drawTime < 0.01) { diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/smg/Mp5Item.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/smg/Mp5Item.java index 8c43e4ec7..1f1c2f8ed 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/smg/Mp5Item.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/smg/Mp5Item.java @@ -46,13 +46,22 @@ public class Mp5Item extends GunItem implements GeoItem { if (player == null) return PlayState.STOP; ItemStack stack = player.getMainHandItem(); if (!(stack.getItem() instanceof GunItem)) return PlayState.STOP; + boolean drum = GunData.from(stack).attachment.get(AttachmentType.MAGAZINE) == 2; if (GunData.from(stack).reload.empty()) { - return event.setAndContinue(RawAnimation.begin().thenPlay("animation.mp5.reload_empty")); + if (drum) { + return event.setAndContinue(RawAnimation.begin().thenPlay("animation.mp5.reload_empty_drum")); + } else { + return event.setAndContinue(RawAnimation.begin().thenPlay("animation.mp5.reload_empty")); + } } if (GunData.from(stack).reload.normal()) { - return event.setAndContinue(RawAnimation.begin().thenPlay("animation.mp5.reload_normal")); + if (drum) { + return event.setAndContinue(RawAnimation.begin().thenPlay("animation.mp5.reload_normal_drum")); + } else { + return event.setAndContinue(RawAnimation.begin().thenPlay("animation.mp5.reload_normal")); + } } if (player.isSprinting() && player.onGround() && ClientEventHandler.cantSprint == 0 && ClientEventHandler.drawTime < 0.01) { diff --git a/src/main/resources/assets/superbwarfare/animations/mp_5.animation.json b/src/main/resources/assets/superbwarfare/animations/mp_5.animation.json index 8eee68f8e..1296e2fc9 100644 --- a/src/main/resources/assets/superbwarfare/animations/mp_5.animation.json +++ b/src/main/resources/assets/superbwarfare/animations/mp_5.animation.json @@ -753,10 +753,10 @@ "vector": [0, 0, 0] }, "0.3": { - "vector": [27.60979, 7.78364, -37.55981] + "vector": [46.02927, 25.76321, -73.77597] }, "1.25": { - "vector": [27.60979, 7.78364, -37.55981] + "vector": [46.02927, 25.76321, -73.77597] }, "1.4": { "vector": [62.31384, 14.82583, -46.79634] @@ -770,10 +770,10 @@ "vector": [0, 0, 0] }, "0.3": { - "vector": [-0.65, -4.45, 1.5] + "vector": [-0.3, -3.1, 2.85] }, "1.25": { - "vector": [-0.65, -4.45, 1.5] + "vector": [-0.3, -3.1, 2.85] }, "1.4": { "vector": [1.95, -1.3, 0.81] @@ -1347,13 +1347,13 @@ "vector": [80.99716, 41.69825, -108.05336] }, "0.875": { - "vector": [27.60979, 7.78364, -37.55981] + "vector": [46.02927, 25.76321, -73.77597] }, "1.825": { - "vector": [27.60979, 7.78364, -37.55981] + "vector": [46.02927, 25.76321, -73.77597] }, "1.925": { - "vector": [27.60979, 7.78364, -37.55981] + "vector": [47.11339, 28.25278, -77.08937] }, "2.175": { "vector": [93.02949, 21.76842, -94.8825] @@ -1397,10 +1397,1413 @@ "vector": [2.5, -0.78, 1] }, "0.875": { - "vector": [-0.65, -4.45, 1.5] + "vector": [-0.3, -3.1, 2.85] }, "1.825": { - "vector": [-0.65, -4.45, 1.5] + "vector": [-0.3, -3.1, 2.85] + }, + "1.925": { + "vector": [1.95, -3.05, 1.5] + }, + "2.05": { + "vector": [3.27, 2.87, 3.25] + }, + "2.175": { + "vector": [0.05427, 8.65239, 6.29915] + }, + "2.275": { + "vector": [1.9831, 4.4293, -1.9231] + }, + "2.325": { + "vector": [2.65, 1.75, -4.3] + }, + "2.475": { + "vector": [2.75, -1.83, -2.13] + }, + "2.75": { + "vector": [0, 0, 0] + } + } + }, + "magazine": { + "rotation": { + "0.0": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "1.025": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "1.075": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "1.125": { + "post": { + "vector": [0, 0, -24] + }, + "lerp_mode": "catmullrom" + }, + "1.2": { + "post": { + "vector": [-61.29955, 22.00636, -55.16179] + }, + "lerp_mode": "catmullrom" + }, + "1.45": { + "post": { + "vector": [-61.29955, 22.00636, -55.16179] + }, + "lerp_mode": "catmullrom" + }, + "1.575": { + "post": { + "vector": [-47.75682, -1.59869, -45.04013] + }, + "lerp_mode": "catmullrom" + }, + "1.65": { + "post": { + "vector": [-10, 0, -12] + }, + "lerp_mode": "catmullrom" + }, + "1.7": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "1.775": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "1.825": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "1.025": { + "post": { + "vector": [0, -2.42, 0.49] + }, + "lerp_mode": "catmullrom" + }, + "1.075": { + "post": { + "vector": [0, -4.85, 1.1] + }, + "lerp_mode": "catmullrom" + }, + "1.15": { + "post": { + "vector": [4.57954, -10.32343, 3.11785] + }, + "lerp_mode": "catmullrom" + }, + "1.275": { + "post": { + "vector": [5.93847, -14.6107, 9.16898] + }, + "lerp_mode": "catmullrom" + }, + "1.45": { + "post": { + "vector": [5.93847, -14.6107, 9.16898] + }, + "lerp_mode": "catmullrom" + }, + "1.575": { + "post": { + "vector": [3.96678, -8.96114, 4.27665] + }, + "lerp_mode": "catmullrom" + }, + "1.65": { + "post": { + "vector": [0.675, -2.775, -0.6625] + }, + "lerp_mode": "catmullrom" + }, + "1.7": { + "post": { + "vector": [0, -2.75, -0.305] + }, + "lerp_mode": "catmullrom" + }, + "1.75": { + "post": { + "vector": [0, -2.81, 0.095] + }, + "lerp_mode": "catmullrom" + }, + "1.775": { + "post": { + "vector": [0, -2.675, -0.15] + }, + "lerp_mode": "catmullrom" + }, + "1.825": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + } + } + }, + "lajibin": { + "rotation": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.475": { + "vector": [0, 0, 0] + }, + "0.55": { + "vector": [0, 0, -41] + }, + "2.2": { + "vector": [0, 0, -41] + }, + "2.225": { + "vector": [0, 0, 0] + }, + "2.25": { + "vector": [0, 0, 0] + } + }, + "position": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.375": { + "vector": [0, 0, 0] + }, + "0.475": { + "vector": [0, 0, 3.05] + }, + "0.55": { + "vector": [0, 0, 2.55] + }, + "2.2": { + "vector": [0, 0, 2.55] + }, + "2.225": { + "vector": [0, 0, 3.05] + }, + "2.25": { + "vector": [0, 0, 0] + } + } + }, + "camera": { + "rotation": { + "0.0": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.175": { + "post": { + "vector": [1.295, 0.3, -0.35] + }, + "lerp_mode": "catmullrom" + }, + "0.35": { + "post": { + "vector": [1.835, 0.29, 0.71] + }, + "lerp_mode": "catmullrom" + }, + "0.475": { + "post": { + "vector": [1.125, 0.25, -0.935] + }, + "lerp_mode": "catmullrom" + }, + "0.55": { + "post": { + "vector": [0.87, 0.225, 0.825] + }, + "lerp_mode": "catmullrom" + }, + "0.65": { + "post": { + "vector": [-0.05, 0, 0.125] + }, + "lerp_mode": "catmullrom" + }, + "0.725": { + "post": { + "vector": [0.05, 0, -0.125] + }, + "lerp_mode": "catmullrom" + }, + "0.825": { + "post": { + "vector": [1.2, 0.225, -0.275] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": { + "vector": [1.265, 0.29, -0.34] + }, + "lerp_mode": "catmullrom" + }, + "1.025": { + "post": { + "vector": [1.85, 0.3, 0.1] + }, + "lerp_mode": "catmullrom" + }, + "1.15": { + "post": { + "vector": [1.265, 0.24, -0.61] + }, + "lerp_mode": "catmullrom" + }, + "1.275": { + "post": { + "vector": [0.45, 0.15, -0.1] + }, + "lerp_mode": "catmullrom" + }, + "1.5": { + "post": { + "vector": [0.67, 0.15, -0.35] + }, + "lerp_mode": "catmullrom" + }, + "1.65": { + "post": { + "vector": [1.345, 0.3, -0.35] + }, + "lerp_mode": "catmullrom" + }, + "1.825": { + "post": { + "vector": [1.295, 0.3, -0.35] + }, + "lerp_mode": "catmullrom" + }, + "1.875": { + "post": { + "vector": [1.835, 0.29, 0.11] + }, + "lerp_mode": "catmullrom" + }, + "2.0": { + "post": { + "vector": [1.125, 0.25, -0.585] + }, + "lerp_mode": "catmullrom" + }, + "2.075": { + "post": { + "vector": [0.87, 0.225, -0.275] + }, + "lerp_mode": "catmullrom" + }, + "2.275": { + "post": { + "vector": [-0.05, 0, 0.125] + }, + "lerp_mode": "catmullrom" + }, + "2.4": { + "post": { + "vector": [0.4, -0.5, -0.975] + }, + "lerp_mode": "catmullrom" + }, + "2.5": { + "post": { + "vector": [-0.34, 0.65, 0.92] + }, + "lerp_mode": "catmullrom" + }, + "2.575": { + "post": { + "vector": [0.25, -0.1, -0.26] + }, + "lerp_mode": "catmullrom" + }, + "2.775": { + "post": { + "vector": [-0.06, 0, 0.16] + }, + "lerp_mode": "catmullrom" + }, + "2.975": { + "post": { + "vector": [0.03, 0, -0.11] + }, + "lerp_mode": "catmullrom" + }, + "3.325": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + } + } + } + } + }, + "animation.mp5.reload_normal_drum": { + "loop": "hold_on_last_frame", + "animation_length": 2.25, + "bones": { + "0": { + "rotation": { + "0.0": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.2": { + "post": { + "vector": [-3.74741, -0.11709, -14.23224] + }, + "lerp_mode": "catmullrom" + }, + "0.275": { + "post": { + "vector": [-14.8395, -10.71919, -18.60021] + }, + "lerp_mode": "catmullrom" + }, + "0.375": { + "post": { + "vector": [-11.55015, -13.25651, -17.01327] + }, + "lerp_mode": "catmullrom" + }, + "0.45": { + "post": { + "vector": [-15.29207, -10.29415, -16.78769] + }, + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": { + "vector": [-14.14594, -9.05533, -11.20614] + }, + "lerp_mode": "catmullrom" + }, + "0.575": { + "post": { + "vector": [-16.82379, -4.26859, -22.6651] + }, + "lerp_mode": "catmullrom" + }, + "0.675": { + "post": { + "vector": [-14.09224, -3.55714, -25.20414] + }, + "lerp_mode": "catmullrom" + }, + "0.75": { + "post": { + "vector": [-16.34, -2.3, -24.6] + }, + "lerp_mode": "catmullrom" + }, + "0.875": { + "post": { + "vector": [-15.27322, -3.58422, -25.07513] + }, + "lerp_mode": "catmullrom" + }, + "1.025": { + "post": { + "vector": [-15.77, -8.84, -27.78] + }, + "lerp_mode": "catmullrom" + }, + "1.075": { + "post": { + "vector": [-14.84112, -9.04448, -23.99555] + }, + "lerp_mode": "catmullrom" + }, + "1.175": { + "post": { + "vector": [-14.22663, -9.38736, -29.34819] + }, + "lerp_mode": "catmullrom" + }, + "1.2": { + "post": { + "vector": [-16.37968, -9.53337, -13.70728] + }, + "lerp_mode": "catmullrom" + }, + "1.275": { + "post": { + "vector": [-16.53252, -8.87124, -16.96848] + }, + "lerp_mode": "catmullrom" + }, + "1.425": { + "post": { + "vector": [-4.07586, -5.42847, -19.13412] + }, + "lerp_mode": "catmullrom" + }, + "1.5": { + "post": { + "vector": [-4.77271, -3.00166, -10.55267] + }, + "lerp_mode": "catmullrom" + }, + "1.575": { + "post": { + "vector": [-4.65061, 1.04736, -1.45592] + }, + "lerp_mode": "catmullrom" + }, + "1.7": { + "post": { + "vector": [-0.00144, -0.05997, 4.24935] + }, + "lerp_mode": "catmullrom" + }, + "1.8": { + "post": { + "vector": [0.4638, 0.14423, -1.6758] + }, + "lerp_mode": "catmullrom" + }, + "1.925": { + "post": { + "vector": [0, 0, 0.5] + }, + "lerp_mode": "catmullrom" + }, + "2.075": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.075": { + "post": { + "vector": [-0.255, 0.185, -0.34] + }, + "lerp_mode": "catmullrom" + }, + "0.2": { + "post": { + "vector": [-0.375, -0.325, 1.675] + }, + "lerp_mode": "catmullrom" + }, + "0.325": { + "post": { + "vector": [-0.33, 0.375, 1.155] + }, + "lerp_mode": "catmullrom" + }, + "0.45": { + "post": { + "vector": [-0.73, 1.33, 0.88] + }, + "lerp_mode": "catmullrom" + }, + "0.7": { + "post": { + "vector": [-0.73, 0.355, 0.685] + }, + "lerp_mode": "catmullrom" + }, + "0.9": { + "post": { + "vector": [-0.69, 0.285, 1.475] + }, + "lerp_mode": "catmullrom" + }, + "1.025": { + "post": { + "vector": [-0.56, 0.31, 0.725] + }, + "lerp_mode": "catmullrom" + }, + "1.15": { + "post": { + "vector": [-0.53, 0.285, 0.535] + }, + "lerp_mode": "catmullrom" + }, + "1.2": { + "post": { + "vector": [-0.455, 1.04, 0.085] + }, + "lerp_mode": "catmullrom" + }, + "1.275": { + "post": { + "vector": [-0.46, 0.23, 0.74] + }, + "lerp_mode": "catmullrom" + }, + "1.425": { + "post": { + "vector": [-0.55, 0.82, -0.115] + }, + "lerp_mode": "catmullrom" + }, + "1.55": { + "post": { + "vector": [-0.325, 0.75, -0.625] + }, + "lerp_mode": "catmullrom" + }, + "1.625": { + "post": { + "vector": [-0.07, -0.19, -1.27] + }, + "lerp_mode": "catmullrom" + }, + "1.75": { + "post": { + "vector": [0, 0.0925, 0.2875] + }, + "lerp_mode": "catmullrom" + }, + "1.925": { + "post": { + "vector": [0, -0.05625, -0.075] + }, + "lerp_mode": "catmullrom" + }, + "2.075": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + } + } + }, + "Righthand": { + "rotation": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.225": { + "vector": [-8.40064, -6.41826, 4.29876] + }, + "1.4": { + "vector": [-8.40064, -6.41826, 4.29876] + }, + "1.575": { + "vector": [0, 0, 0] + } + }, + "position": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.225": { + "vector": [-1.45, 0, -0.15] + }, + "1.4": { + "vector": [-1.45, 0, -0.15] + }, + "1.575": { + "vector": [0, 0, 0] + } + } + }, + "Lefthand": { + "rotation": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.3": { + "vector": [30.25954, 17.63314, -43.30453] + }, + "1.25": { + "vector": [30.25954, 17.63314, -43.30453] + }, + "1.4": { + "vector": [62.31384, 14.82583, -46.79634] + }, + "1.575": { + "vector": [0, 0, 0] + } + }, + "position": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.3": { + "vector": [1.4, -4.25, 2.35] + }, + "1.25": { + "vector": [1.4, -4.25, 2.35] + }, + "1.4": { + "vector": [1.95, -1.3, 0.81] + }, + "1.575": { + "vector": [0, 0, 0] + } + } + }, + "magazine": { + "rotation": { + "0.0": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.425": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.45": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.55": { + "post": { + "vector": [0, 0, -24] + }, + "lerp_mode": "catmullrom" + }, + "0.625": { + "post": { + "vector": [-61.29955, 22.00636, -55.16179] + }, + "lerp_mode": "catmullrom" + }, + "0.875": { + "post": { + "vector": [-61.29955, 22.00636, -55.16179] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": { + "vector": [-47.75682, -1.59869, -45.04013] + }, + "lerp_mode": "catmullrom" + }, + "1.075": { + "post": { + "vector": [-10, 0, -12] + }, + "lerp_mode": "catmullrom" + }, + "1.125": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "1.2": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "1.25": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.425": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.45": { + "post": { + "vector": [0, -2.42, 0.49] + }, + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": { + "vector": [0, -4.85, 1.1] + }, + "lerp_mode": "catmullrom" + }, + "0.575": { + "post": { + "vector": [4.57954, -10.32343, 3.11785] + }, + "lerp_mode": "catmullrom" + }, + "0.7": { + "post": { + "vector": [5.93847, -14.6107, 9.16898] + }, + "lerp_mode": "catmullrom" + }, + "0.875": { + "post": { + "vector": [5.93847, -14.6107, 9.16898] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": { + "vector": [3.96678, -8.96114, 4.27665] + }, + "lerp_mode": "catmullrom" + }, + "1.075": { + "post": { + "vector": [0.675, -2.775, -0.6625] + }, + "lerp_mode": "catmullrom" + }, + "1.125": { + "post": { + "vector": [0, -2.75, -0.305] + }, + "lerp_mode": "catmullrom" + }, + "1.175": { + "post": { + "vector": [0, -2.81, 0.095] + }, + "lerp_mode": "catmullrom" + }, + "1.2": { + "post": { + "vector": [0, -2.675, -0.15] + }, + "lerp_mode": "catmullrom" + }, + "1.25": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + } + } + }, + "camera": { + "rotation": { + "0.0": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.25": { + "post": { + "vector": [1.2, 0.225, -0.275] + }, + "lerp_mode": "catmullrom" + }, + "0.425": { + "post": { + "vector": [1.265, 0.29, -0.34] + }, + "lerp_mode": "catmullrom" + }, + "0.45": { + "post": { + "vector": [1.85, 0.3, 0.1] + }, + "lerp_mode": "catmullrom" + }, + "0.575": { + "post": { + "vector": [1.265, 0.24, -0.61] + }, + "lerp_mode": "catmullrom" + }, + "0.7": { + "post": { + "vector": [0.45, 0.15, -0.1] + }, + "lerp_mode": "catmullrom" + }, + "0.925": { + "post": { + "vector": [0.67, 0.15, -0.35] + }, + "lerp_mode": "catmullrom" + }, + "1.075": { + "post": { + "vector": [1.345, 0.3, -0.35] + }, + "lerp_mode": "catmullrom" + }, + "1.25": { + "post": { + "vector": [1.295, 0.3, -0.35] + }, + "lerp_mode": "catmullrom" + }, + "1.3": { + "post": { + "vector": [1.835, 0.29, 0.11] + }, + "lerp_mode": "catmullrom" + }, + "1.425": { + "post": { + "vector": [1.125, 0.25, -0.585] + }, + "lerp_mode": "catmullrom" + }, + "1.5": { + "post": { + "vector": [0.87, 0.225, -0.275] + }, + "lerp_mode": "catmullrom" + }, + "1.7": { + "post": { + "vector": [-0.05, 0, 0.125] + }, + "lerp_mode": "catmullrom" + }, + "1.825": { + "post": { + "vector": [0.05, 0, -0.125] + }, + "lerp_mode": "catmullrom" + }, + "2.075": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + } + } + } + } + }, + "animation.mp5.reload_empty_drum": { + "loop": "hold_on_last_frame", + "animation_length": 3.475, + "bones": { + "0": { + "rotation": { + "0.0": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.125": { + "post": { + "vector": [0.41, 0.53, -0.76] + }, + "lerp_mode": "catmullrom" + }, + "0.425": { + "post": { + "vector": [3.54, 0.12, 8.13] + }, + "lerp_mode": "catmullrom" + }, + "0.525": { + "post": { + "vector": [-1.01, -6.85, -3.13] + }, + "lerp_mode": "catmullrom" + }, + "0.625": { + "post": { + "vector": [-1.51, -3.86, 1.62] + }, + "lerp_mode": "catmullrom" + }, + "0.75": { + "post": { + "vector": [-0.68, -7.52, -13.64] + }, + "lerp_mode": "catmullrom" + }, + "0.925": { + "post": { + "vector": [-15.30015, -13.25651, -17.01327] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": { + "vector": [-19.04207, -10.29415, -16.78769] + }, + "lerp_mode": "catmullrom" + }, + "1.05": { + "post": { + "vector": [-17.89594, -9.05533, -11.20614] + }, + "lerp_mode": "catmullrom" + }, + "1.125": { + "post": { + "vector": [-20.57379, -4.26859, -22.6651] + }, + "lerp_mode": "catmullrom" + }, + "1.225": { + "post": { + "vector": [-17.84224, -3.55714, -25.20414] + }, + "lerp_mode": "catmullrom" + }, + "1.3": { + "post": { + "vector": [-20.09, -2.3, -24.6] + }, + "lerp_mode": "catmullrom" + }, + "1.425": { + "post": { + "vector": [-19.02322, -3.58422, -25.07513] + }, + "lerp_mode": "catmullrom" + }, + "1.575": { + "post": { + "vector": [-19.52, -8.84, -27.78] + }, + "lerp_mode": "catmullrom" + }, + "1.625": { + "post": { + "vector": [-18.59112, -9.04448, -23.99555] + }, + "lerp_mode": "catmullrom" + }, + "1.725": { + "post": { + "vector": [-17.97663, -9.38736, -29.34819] + }, + "lerp_mode": "catmullrom" + }, + "1.75": { + "post": { + "vector": [-20.12968, -9.53337, -13.70728] + }, + "lerp_mode": "catmullrom" + }, + "1.825": { + "post": { + "vector": [-20.28252, -8.87124, -16.96848] + }, + "lerp_mode": "catmullrom" + }, + "1.9": { + "post": { + "vector": [-15.68252, -4.42124, -7.06848] + }, + "lerp_mode": "catmullrom" + }, + "2.125": { + "post": { + "vector": [-5.82861, -8.1287, -0.86465] + }, + "lerp_mode": "catmullrom" + }, + "2.25": { + "post": { + "vector": [-5.00353, -10.04442, -2.95713] + }, + "lerp_mode": "catmullrom" + }, + "2.3": { + "post": { + "vector": [-0.6365, -4.80159, 10.73807] + }, + "lerp_mode": "catmullrom" + }, + "2.45": { + "post": { + "vector": [-0.62843, -1.57839, 0.55611] + }, + "lerp_mode": "catmullrom" + }, + "2.55": { + "post": { + "vector": [-2.42586, -1.87847, 2.46588] + }, + "lerp_mode": "catmullrom" + }, + "2.625": { + "post": { + "vector": [-3.12271, 0.54834, 2.14733] + }, + "lerp_mode": "catmullrom" + }, + "2.7": { + "post": { + "vector": [-3.00061, 1.49736, 4.54408] + }, + "lerp_mode": "catmullrom" + }, + "2.825": { + "post": { + "vector": [-0.00144, -0.05997, 1.24935] + }, + "lerp_mode": "catmullrom" + }, + "2.925": { + "post": { + "vector": [0.4638, 0.14423, -0.8758] + }, + "lerp_mode": "catmullrom" + }, + "3.05": { + "post": { + "vector": [0, 0, 0.5] + }, + "lerp_mode": "catmullrom" + }, + "3.2": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.1": { + "post": { + "vector": [-0.03, -0.05, -0.33] + }, + "lerp_mode": "catmullrom" + }, + "0.325": { + "post": { + "vector": [-0.11, -0.96, 3.26] + }, + "lerp_mode": "catmullrom" + }, + "0.525": { + "post": { + "vector": [-0.19, 0.15, 3.63] + }, + "lerp_mode": "catmullrom" + }, + "0.65": { + "post": { + "vector": [-0.255, -0.015, 3.26] + }, + "lerp_mode": "catmullrom" + }, + "0.75": { + "post": { + "vector": [-0.27, 0.84, 1.2] + }, + "lerp_mode": "catmullrom" + }, + "0.875": { + "post": { + "vector": [-0.33, 1.575, 0.805] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": { + "vector": [-0.73, 1.63, 0.53] + }, + "lerp_mode": "catmullrom" + }, + "1.25": { + "post": { + "vector": [-0.73, 0.655, 0.335] + }, + "lerp_mode": "catmullrom" + }, + "1.45": { + "post": { + "vector": [-0.69, 0.585, 1.125] + }, + "lerp_mode": "catmullrom" + }, + "1.575": { + "post": { + "vector": [-0.56, 0.61, 0.375] + }, + "lerp_mode": "catmullrom" + }, + "1.7": { + "post": { + "vector": [-0.53, 0.585, 0.185] + }, + "lerp_mode": "catmullrom" + }, + "1.75": { + "post": { + "vector": [-0.455, 1.34, -0.265] + }, + "lerp_mode": "catmullrom" + }, + "1.825": { + "post": { + "vector": [-0.46, 0.53, 0.39] + }, + "lerp_mode": "catmullrom" + }, + "1.95": { + "post": { + "vector": [-0.46, 0.63, 0.39] + }, + "lerp_mode": "catmullrom" + }, + "2.075": { + "post": { + "vector": [-0.48, -0.78, 3.06] + }, + "lerp_mode": "catmullrom" + }, + "2.15": { + "post": { + "vector": [-0.48, -0.85, 2.87] + }, + "lerp_mode": "catmullrom" + }, + "2.25": { + "post": { + "vector": [-0.5, -0.49, 3.28] + }, + "lerp_mode": "catmullrom" + }, + "2.3": { + "post": { + "vector": [-0.52, -0.64, 2.66] + }, + "lerp_mode": "catmullrom" + }, + "2.4": { + "post": { + "vector": [-0.54, -0.77, 3.26] + }, + "lerp_mode": "catmullrom" + }, + "2.55": { + "post": { + "vector": [-0.55, 0.32, 3.385] + }, + "lerp_mode": "catmullrom" + }, + "2.675": { + "post": { + "vector": [-0.325, -0.15, 2.875] + }, + "lerp_mode": "catmullrom" + }, + "2.75": { + "post": { + "vector": [-0.07, -0.39, -1.27] + }, + "lerp_mode": "catmullrom" + }, + "2.875": { + "post": { + "vector": [0, -0.2075, 0.2875] + }, + "lerp_mode": "catmullrom" + }, + "3.05": { + "post": { + "vector": [0, -0.05625, -0.075] + }, + "lerp_mode": "catmullrom" + }, + "3.2": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + } + } + }, + "Righthand": { + "rotation": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.65": { + "vector": [0, 0, 0] + }, + "0.925": { + "vector": [-8.40064, -6.41826, 4.29876] + }, + "1.775": { + "vector": [-8.40064, -6.41826, 4.29876] + }, + "1.9": { + "vector": [0, 0, 0] + } + }, + "position": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.65": { + "vector": [0, 0, 0] + }, + "0.925": { + "vector": [-1.45, 0, -0.15] + }, + "1.775": { + "vector": [-1.45, 0, -0.15] + }, + "1.9": { + "vector": [0, 0, 0] + } + } + }, + "Lefthand": { + "rotation": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.1": { + "vector": [49.98616, 18.3425, -51.23742] + }, + "0.25": { + "vector": [85.94379, 39.98374, -84.62362] + }, + "0.375": { + "vector": [85.94379, 39.98374, -84.62362] + }, + "0.475": { + "vector": [89.89335, 30.55107, -86.95534] + }, + "0.55": { + "vector": [80.99716, 41.69825, -108.05336] + }, + "0.625": { + "vector": [80.99716, 41.69825, -108.05336] + }, + "0.875": { + "vector": [30.25954, 17.63314, -43.30453] + }, + "1.825": { + "vector": [30.25954, 17.63314, -43.30453] + }, + "1.925": { + "vector": [47.11339, 28.25278, -77.08937] + }, + "2.175": { + "vector": [93.02949, 21.76842, -94.8825] + }, + "2.275": { + "vector": [82.68237, 60.46099, -115.95069] + }, + "2.325": { + "vector": [83.10998, 55.50198, -114.30514] + }, + "2.575": { + "vector": [46.27214, 28.37732, -28.16252] + }, + "2.75": { + "vector": [0, 0, 0] + } + }, + "position": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.1": { + "vector": [2.83, 1.75, -0.9] + }, + "0.25": { + "vector": [1.55, 3.5, -1.8] + }, + "0.375": { + "vector": [1.55, 3.5, -1.8] + }, + "0.475": { + "vector": [1.55, 3.5, 1.2] + }, + "0.55": { + "vector": [1, 4.9, 0.5] + }, + "0.625": { + "vector": [1, 4.9, 0.5] + }, + "0.75": { + "vector": [2.5, -0.78, 1] + }, + "0.875": { + "vector": [1.4, -4.25, 2.35] + }, + "1.825": { + "vector": [1.4, -4.25, 2.35] }, "1.925": { "vector": [1.95, -3.05, 1.5] diff --git a/src/main/resources/data/superbwarfare/guns/rpg.json b/src/main/resources/data/superbwarfare/guns/rpg.json index 2a509c719..2a2a4f5d8 100644 --- a/src/main/resources/data/superbwarfare/guns/rpg.json +++ b/src/main/resources/data/superbwarfare/guns/rpg.json @@ -12,7 +12,7 @@ "Velocity": 4, "Magazine": 1, "Weight": 7, - "EmptyReloadTime": 103, + "EmptyReloadTime": 107, "RPM": 120, "AmmoType": "superbwarfare:rocket", "AvailablePerks": [