diff --git a/src/main/java/net/mcreator/target/client/model/item/DevotionItemModel.java b/src/main/java/net/mcreator/target/client/model/item/DevotionItemModel.java index 4e6c043e6..500ac60a2 100644 --- a/src/main/java/net/mcreator/target/client/model/item/DevotionItemModel.java +++ b/src/main/java/net/mcreator/target/client/model/item/DevotionItemModel.java @@ -4,6 +4,7 @@ import net.mcreator.target.item.gun.Devotion; import net.mcreator.target.network.TargetModVariables; import net.minecraft.client.Minecraft; import net.minecraft.resources.ResourceLocation; +import net.minecraft.util.Mth; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; import software.bernie.geckolib.core.animatable.model.CoreGeoBone; @@ -672,5 +673,13 @@ public class DevotionItemModel extends GeoModel { l.setRotX(1.5f); r.setRotX(1.5f); } + + CoreGeoBone camera = getAnimationProcessor().getBone("camera"); + + player.getPersistentData().putDouble("camera_rot_x", Mth.RAD_TO_DEG * camera.getRotX()); + + player.getPersistentData().putDouble("camera_rot_y", Mth.RAD_TO_DEG * camera.getRotY()); + + player.getPersistentData().putDouble("camera_rot_z", Mth.RAD_TO_DEG * camera.getRotZ()); } } diff --git a/src/main/java/net/mcreator/target/entity/ProjectileEntity.java b/src/main/java/net/mcreator/target/entity/ProjectileEntity.java index ee0911145..23bd27141 100644 --- a/src/main/java/net/mcreator/target/entity/ProjectileEntity.java +++ b/src/main/java/net/mcreator/target/entity/ProjectileEntity.java @@ -243,6 +243,8 @@ public class ProjectileEntity extends Entity implements IEntityAdditionalSpawnDa this.setPosRaw(this.getX() + vec.x, this.getY() + vec.y, this.getZ() + vec.z); } + this.setDeltaMovement(new Vec3((this.getDeltaMovement().x()), (this.getDeltaMovement().y() - 0.1), (this.getDeltaMovement().z()))); + this.tickCount++; if (this.tickCount > 30) { this.discard(); diff --git a/src/main/java/net/mcreator/target/event/GunEventHandler.java b/src/main/java/net/mcreator/target/event/GunEventHandler.java index 9a9096b79..1a803030d 100644 --- a/src/main/java/net/mcreator/target/event/GunEventHandler.java +++ b/src/main/java/net/mcreator/target/event/GunEventHandler.java @@ -356,7 +356,22 @@ public class GunEventHandler { public static void gunShoot(Player player) { ItemStack heldItem = player.getMainHandItem(); player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> { - capability.recoilHorizon = Math.random() < 0.5 ? -1 : 1; + if (Math.random() < 0.2) { + capability.recoilHorizon = -1; + } + if (Math.random() >= 0.2 && Math.random() < 0.4) { + capability.recoilHorizon = -0.5; + } + if (Math.random() >= 0.4 && Math.random() < 0.6) { + capability.recoilHorizon = 0; + } + if (Math.random() >= 0.6 && Math.random() < 0.8) { + capability.recoilHorizon = 0.5; + } + if (Math.random() > 0.8) { + capability.recoilHorizon = 1; + } + capability.recoil = 0.1; capability.firing = 1; capability.syncPlayerVariables(player); diff --git a/src/main/java/net/mcreator/target/event/PlayerEventHandler.java b/src/main/java/net/mcreator/target/event/PlayerEventHandler.java index b85c750b4..c7f0d3986 100644 --- a/src/main/java/net/mcreator/target/event/PlayerEventHandler.java +++ b/src/main/java/net/mcreator/target/event/PlayerEventHandler.java @@ -327,13 +327,20 @@ public class PlayerEventHandler { if (recoil > 0) { recoil += 0.01; - double sinRes = Math.sin(2 * Math.PI * (1.03f * recoil - 0.032047110911)) + 0.2; + double sinRes = 0; + + if (0 < recoil && recoil < 0.2) { + sinRes = (-18.34) * Math.pow(recoil, 2) + 8.58 * recoil; + } + if (0.2 <= recoil && recoil < 1) { + sinRes = 2.6 * Math.pow(recoil, 2) - 5.5 * recoil + 2.167; + } float newPitch = ((float) (player.getXRot() - 7.5f * recoilY * ry * sinRes)); player.setXRot(newPitch); player.xRotO = player.getXRot(); - float newYaw = ((float) (player.getYRot() - 5f * recoilYaw * recoilX * rx * sinRes)); + float newYaw = ((float) (player.getYRot() - 7.5f * recoilYaw * recoilX * rx * sinRes)); player.setYRot(newYaw); player.yRotO = player.getYRot(); } diff --git a/src/main/java/net/mcreator/target/item/gun/Devotion.java b/src/main/java/net/mcreator/target/item/gun/Devotion.java index 6d6355317..de5dcee3a 100644 --- a/src/main/java/net/mcreator/target/item/gun/Devotion.java +++ b/src/main/java/net/mcreator/target/item/gun/Devotion.java @@ -87,11 +87,11 @@ public class Devotion extends GunItem implements GeoItem, AnimatedItem { } if (stack.getOrCreateTag().getBoolean("reloading") && stack.getOrCreateTag().getBoolean("empty_reload")) { - return event.setAndContinue(RawAnimation.begin().thenPlay("animation.devotion.reload")); + return event.setAndContinue(RawAnimation.begin().thenPlay("animation.devotion.reload_empty")); } if (stack.getOrCreateTag().getBoolean("reloading") && !stack.getOrCreateTag().getBoolean("empty_reload")) { - return event.setAndContinue(RawAnimation.begin().thenPlay("animation.devotion.reload2")); + return event.setAndContinue(RawAnimation.begin().thenPlay("animation.devotion.reload_normal")); } if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("noRun") == 0) { @@ -171,7 +171,7 @@ public class Devotion extends GunItem implements GeoItem, AnimatedItem { itemTag.putDouble("reload_time", 0); } if (itemTag.getBoolean("reloading") && itemTag.getInt("ammo") == 0) { - if (itemTag.getDouble("reload_time") == 71) { + if (itemTag.getDouble("reload_time") == 92) { entity.getPersistentData().putDouble("id", id); if (entity instanceof ServerPlayer player) { SoundTool.playLocalSound(player, TargetModSounds.DEVOTION_RELOAD_EMPTY.get(), 100, 1); @@ -191,7 +191,7 @@ public class Devotion extends GunItem implements GeoItem, AnimatedItem { GunReload.reload(entity, GunInfo.Type.RIFLE); } } else if (itemTag.getBoolean("reloading") && itemTag.getInt("ammo") > 0) { - if (itemTag.getDouble("reload_time") == 51) { + if (itemTag.getDouble("reload_time") == 70) { entity.getPersistentData().putDouble("id", id); if (entity instanceof ServerPlayer player) { SoundTool.playLocalSound(player, TargetModSounds.DEVOTION_RELOAD_NORMAL.get(), 100, 1); diff --git a/src/main/java/net/mcreator/target/procedures/PlayerReloadProcedure.java b/src/main/java/net/mcreator/target/procedures/PlayerReloadProcedure.java index 1425ce127..6096c3080 100644 --- a/src/main/java/net/mcreator/target/procedures/PlayerReloadProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/PlayerReloadProcedure.java @@ -230,12 +230,12 @@ public class PlayerReloadProcedure { tag.putBoolean("reloading", true); tag.putBoolean("empty_reload", false); tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); - tag.putDouble("reload_time", 51); + tag.putDouble("reload_time", 70); } else if (tag.getInt("ammo") == 0) { tag.putBoolean("reloading", true); tag.putDouble("empty_reload", 1); tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); - tag.putDouble("reload_time", 71); + tag.putDouble("reload_time", 92); } } if (player.getMainHandItem().getItem() == TargetModItems.RPK.get() diff --git a/src/main/resources/assets/target/animations/devotion.animation.json b/src/main/resources/assets/target/animations/devotion.animation.json index 49c3045c6..2fe2543fb 100644 --- a/src/main/resources/assets/target/animations/devotion.animation.json +++ b/src/main/resources/assets/target/animations/devotion.animation.json @@ -40,6 +40,24 @@ "vector": [0, 0, 0] } } + }, + "camera": { + "rotation": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.4": { + "vector": [0, 0, 0] + }, + "0.5": { + "vector": [0.25, -0.5, 0.5], + "easing": "easeInSine" + }, + "0.6": { + "vector": [0, 0, 0], + "easing": "easeOutSine" + } + } } } }, @@ -90,82 +108,293 @@ "easing": "easeOutSine" } } + }, + "camera": { + "rotation": { + "0.0": { + "vector": [-0.3, -0.3, 0.3] + }, + "0.2": { + "vector": [0.3, 0, -0.3] + }, + "0.4": { + "vector": [-0.3, 0.3, 0.3] + }, + "0.6": { + "vector": [0.3, 0, -0.3] + }, + "0.8": { + "vector": [-0.3, -0.3, 0.3] + } + } } } }, "animation.devotion.fire": { "animation_length": 0.0404 }, - "animation.devotion.hit": { - "animation_length": 0.6, + "animation.devotion.reload_empty": { + "loop": "hold_on_last_frame", + "animation_length": 4.75, "bones": { "0": { "rotation": { - "0.0": { + "0.05": { "vector": [0, 0, 0] }, - "0.1": { - "vector": [-109.99624, -5.6423, 87.09082] + "0.15": { + "vector": [2.2309, 1.32745, 5.98455] }, - "0.2": { - "vector": [-120.64214, 12.53737, 76.51478], - "easing": "easeInOutCubic" + "0.4667": { + "vector": [-14.01, 2.98, -9.37], + "easing": "easeInElastic" }, - "0.3": { - "vector": [-95.64214, 12.53737, 76.51478] + "0.55": { + "vector": [-12.25012, 1.71575, -15.23679] }, - "0.4": { - "vector": [-30.75893, -0.13762, 69.59462], - "easing": "easeInCirc" + "0.6333": { + "vector": [-13.67625, 0.53753, -20.43357] }, - "0.5": { - "vector": [-15.85338, -1.67489, 10.01029], - "easing": "easeInOutCirc" + "0.75": { + "vector": [-17.27359, 1.63911, -16.2464] }, - "0.6": { - "vector": [0, 0, 0], - "easing": "easeOutSine" + "0.9": { + "vector": [-15.02119, 0.16741, -19.71243] + }, + "1.0": { + "vector": [-12.36586, -0.75486, -21.85957] + }, + "1.0833": { + "vector": [-3.42984, -0.39385, -15.87027] + }, + "1.25": { + "vector": [-12.35117, -0.9689, -22.83651] + }, + "1.4167": { + "vector": [-16.3817, -0.19101, -19.94063] + }, + "1.5833": { + "vector": [-11.33329, -1.14849, -23.82073] + }, + "1.8833": { + "vector": [-10.66408, -4.02619, -38.55877], + "easing": "easeInSine" + }, + "1.9667": { + "vector": [-13.44223, -4.57576, -41.51634] + }, + "2.05": { + "vector": [-10.27854, -4.93547, -43.49053] + }, + "2.15": { + "vector": [-9.91402, -5.63696, -47.44539] + }, + "2.2167": { + "vector": [-11.91402, -5.63696, -47.44539] + }, + "2.3": { + "vector": [-18.26205, -7.61546, -53.1428] + }, + "2.45": { + "vector": [-17.01373, -1.99374, -36.83067] + }, + "2.5667": { + "vector": [-18.47706, -3.15515, -37.51576] + }, + "2.6333": { + "vector": [-22.58725, -5.90434, -44.71539] + }, + "2.7833": { + "vector": [-15.52787, -3.69401, -35.14493] + }, + "2.9333": { + "vector": [-18.5999, -5.3487, -37.88973] + }, + "3.2167": { + "vector": [-16.39, -4.21, -33.23] + }, + "3.3167": { + "vector": [-16.58032, -3.35852, -30.34706] + }, + "3.6667": { + "vector": [-18.6837, -2.68117, -15.26852], + "easing": "easeInExpo" + }, + "3.8167": { + "vector": [-14.01142, -0.81273, -33.12589], + "easing": "easeInOutSine" + }, + "4.0": { + "vector": [-10.76676, -2.21042, -26.51077] + }, + "4.2": { + "vector": [-3.8135, -0.9118, -6.85724] + }, + "4.3667": { + "vector": [0, 0, -2] + }, + "4.5": { + "vector": [0, 0, 0] } }, "position": { - "0.0": { + "0.05": { "vector": [0, 0, 0] }, - "0.1": { - "vector": [0, 0, -0.6] + "0.4167": { + "vector": [-1.1, 0.3, 1.9], + "easing": "easeInQuad" }, - "0.2": { - "vector": [-0.1, 2.7, -14.9], - "easing": "easeInOutCubic" - }, - "0.4": { - "vector": [0, 0, 1.4], - "easing": "easeInCirc" - }, - "0.5": { - "vector": [0, -0.3, 0.41] - }, - "0.6": { - "vector": [0, 0, 0], + "0.55": { + "vector": [-1.1, 0, 1.2], "easing": "easeOutSine" + }, + "0.6833": { + "vector": [-1.13656, 0.11648, 1.43653] + }, + "0.8333": { + "vector": [-1.11162, 0.03023, 1.28738] + }, + "1.0": { + "vector": [-0.96981, -0.32115, 1.20478] + }, + "1.0833": { + "vector": [-0.75494, -0.64671, 0.87721] + }, + "1.1667": { + "vector": [-1.1, 0, 1.3] + }, + "1.3333": { + "vector": [-0.95347, -0.36221, 1.21435] + }, + "1.5": { + "vector": [-0.84854, -0.60732, 1.04107] + }, + "1.6667": { + "vector": [-0.88449, -0.56099, 1.25543] + }, + "1.8833": { + "vector": [-0.89507, -0.06932, 1.3549] + }, + "1.9667": { + "vector": [-1.16342, 0.21638, 1.44269] + }, + "2.05": { + "vector": [-1.03823, 0.0689, 1.38061] + }, + "2.15": { + "vector": [-0.91462, 0.05514, 1.36807] + }, + "2.2167": { + "vector": [-0.68888, -0.13612, 1.3186] + }, + "2.3": { + "vector": [-1.27235, 0.41208, 1.43655], + "easing": "easeInSine" + }, + "2.4167": { + "vector": [-0.8044, 0.0239, 1.36148], + "easing": "easeOutSine" + }, + "2.5": { + "vector": [-0.55391, 0.01857, 1.28596], + "easing": "easeInSine" + }, + "2.5667": { + "vector": [-0.53, 0.02, 1.27] + }, + "2.7": { + "vector": [-0.73155, 0.42427, 1.66866] + }, + "2.85": { + "vector": [-0.07114, -0.36547, 1.29091] + }, + "3.0": { + "vector": [-0.27874, -0.05921, 1.2782] + }, + "3.1667": { + "vector": [-0.33, 0.01, 1.14] + }, + "3.25": { + "vector": [-0.58027, -0.15396, 1.11798] + }, + "3.3167": { + "vector": [-0.47658, -0.08535, 1.12734] + }, + "3.5667": { + "vector": [-0.27646, -0.46182, 2.5652], + "easing": "easeInQuart" + }, + "3.6667": { + "vector": [-0.27646, -0.46182, 2.5652], + "easing": "easeInQuart" + }, + "3.8833": { + "vector": [-0.33, 0.01, 1.14] + }, + "4.2833": { + "vector": [0, 0, 0.93] + }, + "4.4167": { + "vector": [0, 0, -0.3] + }, + "4.5": { + "vector": [0, 0, 0] } } }, - "Righthand": { + "bolt": { + "position": { + "3.25": { + "vector": [0, 0, 0] + }, + "3.3167": { + "vector": [0, 0, 0] + }, + "3.5667": { + "vector": [0, 0, 2], + "easing": "easeInCirc" + }, + "3.6667": { + "vector": [0, 0, 2], + "easing": "easeInCirc" + }, + "3.85": { + "vector": [0, 0, 0], + "easing": "easeInElastic" + } + } + }, + "magazine": { "rotation": { "0.0": { "vector": [0, 0, 0] }, - "0.1": { - "vector": [115.09874, -2.71949, 20.40737] + "0.9667": { + "vector": [0, 0, 0] }, - "0.3": { - "vector": [117.68159, -1.57214, 10.14378] + "1.0333": { + "vector": [0, 0, 0] }, - "0.4": { - "vector": [80.64562, -5.59257, -1.31049] + "1.4333": { + "vector": [0, 0, 0], + "easing": "easeInElastic" }, - "0.6": { + "1.55": { + "vector": [0, 0, 0], + "easing": "easeInElastic" + }, + "1.9": { + "vector": [-21, 0, -11] + }, + "2.0667": { + "vector": [-14, 0, -5.83], + "easing": "easeInSine" + }, + "2.2667": { + "vector": [0, 0, 0] + }, + "2.4": { "vector": [0, 0, 0] } }, @@ -173,19 +402,36 @@ "0.0": { "vector": [0, 0, 0] }, - "0.1": { - "vector": [5.4, 15, -7.9] + "0.9667": { + "vector": [0, 0, 0] }, - "0.3": { - "vector": [2.9, 16.6, -8] + "1.0333": { + "vector": [0, -2.85, 0] }, - "0.4": { - "vector": [-0.27, 15.07, -1.33] + "1.4333": { + "vector": [8, -15, 0], + "easing": "easeInElastic" }, - "0.5": { - "vector": [0.6, 8.23, 2.91] + "1.55": { + "vector": [0, -15, 0], + "easing": "easeInElastic" }, - "0.6": { + "1.9": { + "vector": [0.21094, -3.16719, -0.98516], + "easing": "easeInSine" + }, + "2.0667": { + "vector": [0.14, -2.94422, -0.47], + "easing": "easeInSine" + }, + "2.1833": { + "vector": [0.07, -3.12625, -0.09719], + "easing": "easeInSine" + }, + "2.2667": { + "vector": [0, 0, 0] + }, + "2.4": { "vector": [0, 0, 0] } } @@ -195,19 +441,66 @@ "0.0": { "vector": [0, 0, 0] }, - "0.1": { - "vector": [160.00784, 26.63928, 97.85625] + "0.3333": { + "vector": [0, 0, 0] }, - "0.3": { - "vector": [119.73392, 26.4069, 30.49799] + "0.8167": { + "vector": [14.12373, -11.09281, 25.14677] }, - "0.4": { - "vector": [32.51143, 12.91572, -13.61421] + "0.9667": { + "vector": [14.12373, -11.09281, 25.14677] }, - "0.5": { - "vector": [4.26641, -22.39453, -18.39143] + "1.3": { + "vector": [14.12373, -11.09281, 25.14677] }, - "0.6": { + "1.3833": { + "vector": [14.12373, -11.09281, 25.14677] + }, + "2.3": { + "vector": [14.12373, -11.09281, 25.14677] + }, + "2.3833": { + "vector": [26.69687, -23.84553, 18.95298] + }, + "2.5333": { + "vector": [39.4566, -33.52813, 36.0472] + }, + "2.6167": { + "vector": [21.75908, -21.54018, 13.02377], + "easing": "easeInElastic" + }, + "2.7167": { + "vector": [21.75908, -21.54018, 13.02377] + }, + "2.8167": { + "vector": [25.48833, -18.43638, 18.90018] + }, + "3.25": { + "vector": [-14.24732, -18.35244, 9.21488], + "easing": "easeInOutSine" + }, + "3.3167": { + "vector": [-14.24732, -18.35244, 9.21488] + }, + "3.5667": { + "vector": [-18.21952, -18.95565, 10.00632], + "easing": "easeInCirc" + }, + "3.6667": { + "vector": [-18.21952, -18.95565, 10.00632], + "easing": "easeInCirc" + }, + "3.85": { + "vector": [-14.1857, -20.99269, 12.22062] + }, + "3.9333": { + "vector": [-4.31893, -23.2528, 13.61203], + "easing": "easeOutSine" + }, + "4.15": { + "vector": [8.3734, -16.00221, -1.42197] + }, + "4.2333": { "vector": [0, 0, 0] } }, @@ -215,420 +508,411 @@ "0.0": { "vector": [0, 0, 0] }, - "0.1": { - "vector": [0.5, 14.6, -13.1] - }, - "0.3": { - "vector": [-4.7, 17.1, -9.8] - }, - "0.4": { - "vector": [-1.77, 11.77, -0.53] - }, - "0.5": { - "vector": [-0.98, 3.54, -2.56] - }, - "0.6": { - "vector": [0, 0, 0] - } - } - } - } - }, - "animation.devotion.reload": { - "animation_length": 3.5, - "override_previous_animation": true, - "bones": { - "0": { - "rotation": { - "0.0": { + "0.45": { "vector": [0, 0, 0] }, - "0.2": { - "vector": [-3.8068, -3.68161, -49.3174] + "0.5833": { + "vector": [1.89205, -2.68839, 4.36626] }, - "0.4": { - "vector": [-9.88149, -3.80736, -52.7153], - "easing": "easeInOutSine" + "0.7333": { + "vector": [-0.5508, -0.59701, 8.13945] }, - "0.5": { - "vector": [0.9865, -6.2834, -55.88983] + "0.9667": { + "vector": [-0.5508, -0.59701, 8.13945] }, - "0.7": { - "vector": [-9.11094, -4.50546, -48.09955], - "easing": "easeInOutSine" + "1.3": { + "vector": [-0.5508, -0.59701, 8.13945] }, - "1.0": { - "vector": [-5.60131, -4.10942, -45.45269], + "1.3833": { + "vector": [-1.48252, -1.3276, 8.07688] + }, + "2.3": { + "vector": [-1.48252, -1.3276, 8.07688] + }, + "2.5333": { + "vector": [-2.72279, -0.4342, 9.52345], + "easing": "easeInElastic" + }, + "2.6167": { + "vector": [-2.86, -1.59, 7.89], + "easing": "easeInElastic" + }, + "2.7167": { + "vector": [-2.86, -1.59, 7.89], + "easing": "easeInElastic" + }, + "2.8833": { + "vector": [-2.4903, -3.40685, 9.67182] + }, + "3.0333": { + "vector": [-1.20916, -3.21314, 12.74723], + "easing": "easeInSine" + }, + "3.25": { + "vector": [-0.68102, -0.85271, 7.46243], "easing": "easeOutSine" }, - "1.2": { - "vector": [-5.01842, -3.48082, -42.74174], - "easing": "easeInOutSine" + "3.3167": { + "vector": [-0.68102, -0.85271, 7.46243] }, - "1.7": { - "vector": [-3.17289, -4.84164, -60.47235] + "3.5667": { + "vector": [-0.68102, -1.35271, 9.26243], + "easing": "easeInCirc" }, - "1.9": { - "vector": [-10.17416, -4.79447, -49.0149] + "3.6667": { + "vector": [-0.68102, -1.35271, 9.26243], + "easing": "easeInCirc" }, - "2.0": { - "vector": [-4.39069, -5.19979, -48.93215] + "3.85": { + "vector": [-0.68102, -0.85271, 6.46243], + "easing": "easeInElastic" }, - "2.2": { - "vector": [-3.68248, -0.65633, -32.38851] - }, - "2.5": { - "vector": [-1.23018, 2.1696, -4.56346] - }, - "2.7": { - "vector": [-8.49672, 1.61061, -3.16214], - "easing": "easeInOutSine" - }, - "2.8": { - "vector": [-4.08885, 0.52055, -2.22942] - }, - "3.1": { - "vector": [-0.76655, 1.96863, -2.04322] - }, - "3.5": { + "4.2333": { "vector": [0, 0, 0], "easing": "easeInOutQuad" } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.1": { - "vector": [0.07, 0.53, -0.7], - "easing": "easeInOutSine" - }, - "0.2": { - "vector": [0.2, 0.7, 0.8], - "easing": "easeInOutSine" - }, - "0.4": { - "vector": [0.19, 0.66, 0.75] - }, - "0.5": { - "vector": [0.38, 0.32, 0.7] - }, - "0.6": { - "vector": [0.15, 0.6, 0.65] - }, - "1.1": { - "vector": [0.13, 0.42, 0.55], - "easing": "easeInOutSine" - }, - "1.7": { - "vector": [0.11, 0.63, 0.46] - }, - "1.9": { - "vector": [-0.1, 0.86, 0.41] - }, - "2.0": { - "vector": [0.11, 0.56, 0.36] - }, - "2.5": { - "vector": [0.38, 0.71, 0.26] - }, - "2.6": { - "vector": [0.31, 0.88, 1.71], - "easing": "easeInOutSine" - }, - "2.8": { - "vector": [0.28, 0.48, 0.29] - }, - "3.1": { - "vector": [0.14, 0.17, -0.37] - }, - "3.3": { - "vector": [0.06, -0.03, -0.15], - "easing": "easeInOutSine" - }, - "3.5": { - "vector": [0, 0, 0] - } } }, - "Lefthand": { + "camera": { "rotation": { "0.0": { "vector": [0, 0, 0] }, - "0.1": { - "vector": [24.28979, -18.48993, 32.61649] + "0.2167": { + "vector": [0, 0, 1.5], + "easing": "easeInElastic" }, - "0.3": { - "vector": [16.17807, -21.07257, 6.46449] - }, - "0.4": { - "vector": [16.17807, -21.07257, 6.46449] - }, - "0.9": { - "vector": [16.18, -21.07, 6.46] - }, - "1.0": { - "vector": [16.75727, -19.25626, 21.64407] - }, - "2.1": { - "vector": [16.75727, -19.25626, 21.64407] - }, - "2.3": { - "vector": [2.06854, -25.18111, 22.33291] - }, - "2.4": { - "vector": [-5.57894, -13.88343, 17.14291] - }, - "2.5": { - "vector": [-5.57894, -13.88343, 17.14291] - }, - "2.6": { - "vector": [-19.57894, -13.88343, 17.14291] - }, - "2.7": { - "vector": [-19.57894, -13.88343, 17.14291] - }, - "2.8": { - "vector": [-5.57894, -13.88343, 17.14291] - }, - "2.9": { - "vector": [-2.96413, -19.55997, 18.514] - }, - "3.2": { - "vector": [0, 0, 0] - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.3": { - "vector": [-2.3, -1.3, 9.5] - }, - "0.4": { - "vector": [-2.3, -1.3, 9.5] - }, - "0.9": { - "vector": [-2.3, -1.3, 9.5] - }, - "1.0": { - "vector": [-1.5, 0.1, 9.5] - }, - "2.1": { - "vector": [-1.5, 0.1, 9.5] - }, - "2.4": { - "vector": [-1.2, 0.1, 8.8] - }, - "2.5": { - "vector": [-1.2, 0.1, 8.8] - }, - "2.6": { - "vector": [-1.2, -1.3, 9.3] - }, - "2.7": { - "vector": [-1.2, -1.3, 9.3] - }, - "2.8": { - "vector": [-1.2, 0.1, 8.8] - }, - "3.2": { - "vector": [0, 0, 0] - } - } - }, - "gun": { - "position": { - "vector": [0, 0, 0] - } - }, - "bolt": { - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "2.5": { - "vector": [0, 0, 0] - }, - "2.6": { - "vector": [0, 0, 2.2], - "easing": "easeInSine" - }, - "2.7": { - "vector": [0, 0, 2.2], - "easing": "easeInSine" - }, - "2.8": { - "vector": [0, 0, 0], - "easing": "easeInSine" - }, - "2.9": { - "vector": [0, 0, 0.12891], - "easing": "easeOutSine" - }, - "3.0": { - "vector": [0, 0, 0], - "easing": "easeInSine" - } - } - }, - "magazine": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.4": { - "vector": [0, 0, 0] - }, - "0.5": { - "vector": [0, 0, -11], - "easing": "easeInSine" + "0.4333": { + "vector": [0, 0, -0.5] }, "0.6": { - "vector": [18.96011, -11.75644, -38.32737] + "vector": [0, 0, 1] }, - "0.8": { - "vector": [30.00232, -41.2743, -36.46204], - "easing": "easeOutQuad" + "1.0": { + "vector": [0, 0, 1.5], + "easing": "easeInElastic" }, - "0.9": { - "vector": [44.42602, -24.30548, -62.4873] + "1.05": { + "vector": [2, 1, -2], + "easing": "easeInSine" }, - "1.2": { - "vector": [26.78281, -9.69881, -26.48185] + "1.1667": { + "vector": [-1, -0.5, 1.5] }, - "1.6": { - "vector": [-10.5908, -12.36895, -9.98842], + "1.3": { + "vector": [0.5, 0, 1.2], "easing": "easeOutSine" }, - "1.7": { - "vector": [0, 0, -11], + "1.6833": { + "vector": [-0.1, 0, -0.5] + }, + "2.0167": { + "vector": [0.5, 0, 2], + "easing": "easeInElastic" + }, + "2.1833": { + "vector": [-0.5, 0, 2.2], + "easing": "linear" + }, + "2.2667": { + "vector": [1.5, -0.7, 1.2], "easing": "easeInSine" }, - "1.8": { - "vector": [0, 0, 0] - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.4": { - "vector": [0, 0, 0] - }, - "0.5": { - "vector": [0.40625, -3.9, 0], - "easing": "easeInSine" - }, - "0.8": { - "vector": [5, -12.1, 5.6], - "easing": "easeOutQuad" - }, - "0.9": { - "vector": [10, -7.1, 5.6] - }, - "1.2": { - "vector": [4, -7.04, 3.1] - }, - "1.6": { - "vector": [0.82031, -3.24266, -0.89922], + "2.3667": { + "vector": [-0.4, 0.4, -0.2], "easing": "easeOutSine" }, - "1.7": { - "vector": [0, -2.4625, 0], + "2.55": { + "vector": [0, 0, 1.5], + "easing": "easeInElastic" + }, + "2.6": { + "vector": [2, 1, -2], "easing": "easeInSine" }, - "1.8": { - "vector": [0, 0, 0], - "easing": "easeInSine" + "2.7167": { + "vector": [-1, -0.5, 1.5] + }, + "2.85": { + "vector": [0.5, 0, 1.2], + "easing": "easeOutSine" + }, + "3.4": { + "vector": [0.2, 0, 2] + }, + "3.5167": { + "vector": [1, 2, 1.8] + }, + "3.5667": { + "vector": [-1.5, -3, -1.5] + }, + "3.6833": { + "vector": [0.2, 1.5, 1.5] + }, + "3.8167": { + "vector": [0, 0, -0.5], + "easing": "easeInElastic" + }, + "3.9833": { + "vector": [0, 0, 1] + }, + "4.15": { + "vector": [0, 0, 0] + }, + "4.3167": { + "vector": [0, 0, 1.5], + "easing": "easeInElastic" + }, + "4.4833": { + "vector": [0, 0, 0] } } } + }, + "sound_effects": { + "0.0": { + "effect": "devotion_reload_empty" + } } }, - "animation.devotion.reload2": { - "animation_length": 2.5, - "override_previous_animation": true, + "animation.devotion.reload_normal": { + "loop": "hold_on_last_frame", + "animation_length": 3.5, "bones": { "0": { + "rotation": { + "0.05": { + "vector": [0, 0, 0] + }, + "0.15": { + "vector": [2.2309, 1.32745, 5.98455] + }, + "0.4667": { + "vector": [-14.01, 2.98, -9.37], + "easing": "easeInElastic" + }, + "0.55": { + "vector": [-12.25012, 1.71575, -15.23679] + }, + "0.6333": { + "vector": [-13.67625, 0.53753, -20.43357] + }, + "0.75": { + "vector": [-17.27359, 1.63911, -16.2464] + }, + "0.9": { + "vector": [-15.02119, 0.16741, -19.71243] + }, + "1.0": { + "vector": [-12.36586, -0.75486, -21.85957] + }, + "1.0833": { + "vector": [-3.42984, -0.39385, -15.87027] + }, + "1.25": { + "vector": [-12.35117, -0.9689, -22.83651] + }, + "1.4167": { + "vector": [-16.3817, -0.19101, -19.94063] + }, + "1.5833": { + "vector": [-11.33329, -1.14849, -23.82073] + }, + "1.8833": { + "vector": [-10.66408, -4.02619, -38.55877], + "easing": "easeInSine" + }, + "1.9667": { + "vector": [-13.44223, -4.57576, -41.51634] + }, + "2.05": { + "vector": [-10.27854, -4.93547, -43.49053] + }, + "2.15": { + "vector": [-9.91402, -5.63696, -47.44539] + }, + "2.2167": { + "vector": [-11.91402, -5.63696, -47.44539] + }, + "2.3": { + "vector": [-18.26205, -7.61546, -53.1428] + }, + "2.45": { + "vector": [-17.01373, -1.99374, -36.83067] + }, + "2.5667": { + "vector": [-18.47706, -3.15515, -37.51576] + }, + "2.6333": { + "vector": [-22.58725, -5.90434, -44.71539] + }, + "2.7833": { + "vector": [-15.86609, -1.66219, -27.91711] + }, + "2.9833": { + "vector": [-3.8135, -0.9118, -6.85724] + }, + "3.2333": { + "vector": [0, 0, -2] + }, + "3.3667": { + "vector": [0, 0, 0] + } + }, + "position": { + "0.05": { + "vector": [0, 0, 0] + }, + "0.4167": { + "vector": [-1.1, 0.3, 1.9], + "easing": "easeInQuad" + }, + "0.55": { + "vector": [-1.1, 0, 1.2], + "easing": "easeOutSine" + }, + "0.6833": { + "vector": [-1.13656, 0.11648, 1.43653] + }, + "0.8333": { + "vector": [-1.11162, 0.03023, 1.28738] + }, + "1.0": { + "vector": [-0.96981, -0.32115, 1.20478] + }, + "1.0833": { + "vector": [-0.75494, -0.64671, 0.87721] + }, + "1.1667": { + "vector": [-1.1, 0, 1.3] + }, + "1.3333": { + "vector": [-0.95347, -0.36221, 1.21435] + }, + "1.5": { + "vector": [-0.84854, -0.60732, 1.04107] + }, + "1.6667": { + "vector": [-0.88449, -0.56099, 1.25543] + }, + "1.8833": { + "vector": [-0.89507, -0.06932, 1.3549] + }, + "1.9667": { + "vector": [-1.16342, 0.21638, 1.44269] + }, + "2.05": { + "vector": [-1.03823, 0.0689, 1.38061] + }, + "2.15": { + "vector": [-0.91462, 0.05514, 1.36807] + }, + "2.2167": { + "vector": [-0.68888, -0.13612, 1.3186] + }, + "2.3": { + "vector": [-1.27235, 0.41208, 1.43655], + "easing": "easeInSine" + }, + "2.4167": { + "vector": [-0.8044, 0.0239, 1.36148], + "easing": "easeOutSine" + }, + "2.5": { + "vector": [-0.55391, 0.01857, 1.28596], + "easing": "easeInSine" + }, + "2.5667": { + "vector": [-0.53, 0.02, 1.27] + }, + "2.7": { + "vector": [-0.73155, 0.42427, 1.66866] + }, + "2.85": { + "vector": [-0.07114, -0.36547, 1.29091] + }, + "3.0": { + "vector": [-0.27874, -0.05921, 1.2782] + }, + "3.15": { + "vector": [0, 0, 0.93] + }, + "3.2833": { + "vector": [0, 0, -0.3] + }, + "3.3667": { + "vector": [0, 0, 0] + } + } + }, + "magazine": { "rotation": { "0.0": { "vector": [0, 0, 0] }, - "0.2": { - "vector": [-3.8068, -3.68161, -49.3174] + "0.9667": { + "vector": [0, 0, 0] }, - "0.4": { - "vector": [-9.88149, -3.80736, -52.7153], - "easing": "easeInOutSine" + "1.0333": { + "vector": [0, 0, 0] }, - "0.5": { - "vector": [0.9865, -6.2834, -55.88983] + "1.4333": { + "vector": [0, 0, 0], + "easing": "easeInElastic" }, - "0.7": { - "vector": [-9.11094, -4.50546, -48.09955], - "easing": "easeInOutSine" - }, - "1.0": { - "vector": [-5.60131, -4.10942, -45.45269], - "easing": "easeOutSine" - }, - "1.2": { - "vector": [-5.01842, -3.48082, -42.74174], - "easing": "easeInOutSine" - }, - "1.7": { - "vector": [-3.17289, -4.84164, -60.47235] + "1.55": { + "vector": [0, 0, 0], + "easing": "easeInElastic" }, "1.9": { - "vector": [-10.17416, -4.79447, -49.0149] + "vector": [-21, 0, -11] }, - "2.0": { - "vector": [-4.39069, -5.19979, -48.93215] + "2.0667": { + "vector": [-14, 0, -5.83], + "easing": "easeInSine" }, - "2.5": { - "vector": [0, 0, 0], - "easing": "easeOutQuad" + "2.2667": { + "vector": [0, 0, 0] + }, + "2.4": { + "vector": [0, 0, 0] } }, "position": { "0.0": { "vector": [0, 0, 0] }, - "0.1": { - "vector": [0.07, 0.53, -0.7], - "easing": "easeInOutSine" + "0.9667": { + "vector": [0, 0, 0] }, - "0.2": { - "vector": [0.2, 0.7, 0.8], - "easing": "easeInOutSine" + "1.0333": { + "vector": [0, -2.85, 0] }, - "0.4": { - "vector": [0.19, 0.66, 0.75] + "1.4333": { + "vector": [8, -15, 0], + "easing": "easeInElastic" }, - "0.5": { - "vector": [0.38, 0.32, 0.7] - }, - "0.6": { - "vector": [0.15, 0.6, 0.65] - }, - "1.1": { - "vector": [0.13, 0.42, 0.55], - "easing": "easeInOutSine" - }, - "1.7": { - "vector": [0.11, 0.63, 0.46] + "1.55": { + "vector": [0, -15, 0], + "easing": "easeInElastic" }, "1.9": { - "vector": [-0.1, 0.86, 0.41] + "vector": [0.21094, -3.16719, -0.98516], + "easing": "easeInSine" }, - "2.0": { - "vector": [0.11, 0.56, 0.36] + "2.0667": { + "vector": [0.14, -2.94422, -0.47], + "easing": "easeInSine" }, - "2.5": { - "vector": [0, 0, 0], - "easing": "easeInOutSine" + "2.1833": { + "vector": [0.07, -3.12625, -0.09719], + "easing": "easeInSine" + }, + "2.2667": { + "vector": [0, 0, 0] + }, + "2.4": { + "vector": [0, 0, 0] } } }, @@ -637,28 +921,41 @@ "0.0": { "vector": [0, 0, 0] }, - "0.1": { - "vector": [24.28979, -18.48993, 32.61649] + "0.3333": { + "vector": [0, 0, 0] }, - "0.3": { - "vector": [16.17807, -21.07257, 6.46449] + "0.8167": { + "vector": [14.12373, -11.09281, 25.14677] }, - "0.4": { - "vector": [16.17807, -21.07257, 6.46449] + "0.9667": { + "vector": [14.12373, -11.09281, 25.14677] }, - "0.9": { - "vector": [16.18, -21.07, 6.46] + "1.3": { + "vector": [14.12373, -11.09281, 25.14677] }, - "1.0": { - "vector": [16.75727, -19.25626, 21.64407] + "1.3833": { + "vector": [14.12373, -11.09281, 25.14677] }, - "1.9": { - "vector": [16.75727, -19.25626, 21.64407] + "2.3": { + "vector": [14.12373, -11.09281, 25.14677] }, - "2.2": { - "vector": [24.28979, -18.48993, 32.61649] + "2.3833": { + "vector": [26.69687, -23.84553, 18.95298] }, - "2.5": { + "2.5333": { + "vector": [39.4566, -33.52813, 36.0472] + }, + "2.6167": { + "vector": [21.75908, -21.54018, 13.02377], + "easing": "easeInElastic" + }, + "2.7167": { + "vector": [21.75908, -21.54018, 13.02377] + }, + "3.0333": { + "vector": [8.3734, -16.00221, -1.42197] + }, + "3.1167": { "vector": [0, 0, 0] } }, @@ -666,108 +963,119 @@ "0.0": { "vector": [0, 0, 0] }, - "0.3": { - "vector": [-2.3, -1.3, 9.5] - }, - "0.4": { - "vector": [-2.3, -1.3, 9.5] - }, - "0.9": { - "vector": [-2.3, -1.3, 9.5] - }, - "1.0": { - "vector": [-1.5, 0.1, 9.5] - }, - "1.9": { - "vector": [-1.5, 0.1, 9.5] - }, - "2.5": { + "0.45": { "vector": [0, 0, 0] + }, + "0.5833": { + "vector": [1.89205, -2.68839, 4.36626] + }, + "0.7333": { + "vector": [-0.5508, -0.59701, 8.13945] + }, + "0.9667": { + "vector": [-0.5508, -0.59701, 8.13945] + }, + "1.3": { + "vector": [-0.5508, -0.59701, 8.13945] + }, + "1.3833": { + "vector": [-1.48252, -1.3276, 8.07688] + }, + "2.3": { + "vector": [-1.48252, -1.3276, 8.07688] + }, + "2.5333": { + "vector": [-2.72279, -0.4342, 9.52345], + "easing": "easeInElastic" + }, + "2.6167": { + "vector": [-2.86, -1.59, 7.89], + "easing": "easeInElastic" + }, + "2.7167": { + "vector": [-2.86, -1.59, 7.89], + "easing": "easeInElastic" + }, + "3.1167": { + "vector": [0, 0, 0], + "easing": "easeInOutQuad" } } }, - "gun": { - "position": { - "vector": [0, 0, 0] - } - }, - "bolt": { - "position": { - "vector": [0, 0, 0] - } - }, - "magazine": { + "camera": { "rotation": { "0.0": { "vector": [0, 0, 0] }, - "0.4": { - "vector": [0, 0, 0] + "0.2167": { + "vector": [0, 0, 1.5], + "easing": "easeInElastic" }, - "0.5": { - "vector": [0, 0, -11], - "easing": "easeInSine" + "0.4333": { + "vector": [0, 0, -0.5] }, "0.6": { - "vector": [18.96011, -11.75644, -38.32737] + "vector": [0, 0, 1] }, - "0.8": { - "vector": [30.00232, -41.2743, -36.46204], - "easing": "easeOutQuad" + "1.0": { + "vector": [0, 0, 1.5], + "easing": "easeInElastic" }, - "0.9": { - "vector": [44.42602, -24.30548, -62.4873] + "1.05": { + "vector": [2, 1, -2], + "easing": "easeInSine" }, - "1.2": { - "vector": [26.78281, -9.69881, -26.48185] + "1.1667": { + "vector": [-1, -0.5, 1.5] }, - "1.6": { - "vector": [-10.5908, -12.36895, -9.98842], + "1.3": { + "vector": [0.5, 0, 1.2], "easing": "easeOutSine" }, - "1.7": { - "vector": [0, 0, -11], + "1.6833": { + "vector": [-0.1, 0, -0.5] + }, + "2.0167": { + "vector": [0.5, 0, 2], + "easing": "easeInElastic" + }, + "2.1833": { + "vector": [-0.5, 0, 2.2], + "easing": "linear" + }, + "2.2667": { + "vector": [1.5, -0.7, 1.2], "easing": "easeInSine" }, - "1.8": { - "vector": [0, 0, 0] - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.4": { - "vector": [0, 0, 0] - }, - "0.5": { - "vector": [0.40625, -3.9, 0], - "easing": "easeInSine" - }, - "0.8": { - "vector": [5, -12.1, 5.6], - "easing": "easeOutQuad" - }, - "0.9": { - "vector": [10, -7.1, 5.6] - }, - "1.2": { - "vector": [4, -7.04, 3.1] - }, - "1.6": { - "vector": [0.82031, -3.24266, -0.89922], + "2.3667": { + "vector": [-0.4, 0.4, -0.2], "easing": "easeOutSine" }, - "1.7": { - "vector": [0, -2.4625, 0], + "2.55": { + "vector": [0, 0, 1.5], + "easing": "easeInElastic" + }, + "2.6": { + "vector": [2, 1, -2], "easing": "easeInSine" }, - "1.8": { - "vector": [0, 0, 0], - "easing": "easeInSine" + "2.7167": { + "vector": [-1, -0.5, 1.5] + }, + "2.85": { + "vector": [0.5, 0, 1.2], + "easing": "easeOutSine" + }, + "3.0": { + "vector": [0, 0, 0] } } } + }, + "sound_effects": { + "0.0": { + "effect": "devotion_reload_empty" + } } } }, diff --git a/src/main/resources/assets/target/geo/devotion.geo.json b/src/main/resources/assets/target/geo/devotion.geo.json index 4fd69e099..8ec283f61 100644 --- a/src/main/resources/assets/target/geo/devotion.geo.json +++ b/src/main/resources/assets/target/geo/devotion.geo.json @@ -11,6 +11,10 @@ "visible_bounds_offset": [0, 2, 0] }, "bones": [ + { + "name": "camera", + "pivot": [2.57141, 4.16276, 7.17702] + }, { "name": "root", "pivot": [0, 0, 0] @@ -14206,11 +14210,11 @@ { "name": "holo", "parent": "0", - "pivot": [0, 3.85547, -80.5], + "pivot": [0, 3.67891, -4.5], "cubes": [ { - "origin": [-1.1934, 1.56032, -80.5], - "size": [2.3868, 2.3868, 0], + "origin": [-0.19125, 3.48766, -4.5], + "size": [0.3825, 0.3825, 0], "uv": { "north": {"uv": [59.53906, 60.625], "uv_size": [3.125, 2.625]}, "east": {"uv": [3.16406, 110.30469], "uv_size": [8, 8]}, diff --git a/src/main/resources/assets/target/sounds/devotion/devotion_reload_empty.ogg b/src/main/resources/assets/target/sounds/devotion/devotion_reload_empty.ogg index be6c31be3..d19018da5 100644 Binary files a/src/main/resources/assets/target/sounds/devotion/devotion_reload_empty.ogg and b/src/main/resources/assets/target/sounds/devotion/devotion_reload_empty.ogg differ diff --git a/src/main/resources/assets/target/sounds/devotion/devotion_reload_normal.ogg b/src/main/resources/assets/target/sounds/devotion/devotion_reload_normal.ogg index 9ec2f3200..d8385307a 100644 Binary files a/src/main/resources/assets/target/sounds/devotion/devotion_reload_normal.ogg and b/src/main/resources/assets/target/sounds/devotion/devotion_reload_normal.ogg differ diff --git a/src/main/resources/assets/target/sounds/targetdown.ogg b/src/main/resources/assets/target/sounds/targetdown.ogg index 21c99a040..34a573ac1 100644 Binary files a/src/main/resources/assets/target/sounds/targetdown.ogg and b/src/main/resources/assets/target/sounds/targetdown.ogg differ