diff --git a/src/main/java/net/mcreator/target/block/JumpPadBlock.java b/src/main/java/net/mcreator/target/block/JumpPadBlock.java index b80f55975..7597ebbb1 100644 --- a/src/main/java/net/mcreator/target/block/JumpPadBlock.java +++ b/src/main/java/net/mcreator/target/block/JumpPadBlock.java @@ -91,7 +91,9 @@ public class JumpPadBlock extends Block { entity.setDeltaMovement(new Vec3(0.7 * entity.getDeltaMovement().x(), 1.7, 0.7 * entity.getDeltaMovement().z())); } - + if (!zooming) { + entity.getPersistentData().putDouble("vy", 0.8); + } if (!level.isClientSide()) { level.playSound(null, BlockPos.containing(pos.getX(), pos.getY(), pos.getZ()), TargetModSounds.JUMP.get(), SoundSource.BLOCKS, 1, 1); diff --git a/src/main/java/net/mcreator/target/client/model/item/SksItemModel.java b/src/main/java/net/mcreator/target/client/model/item/SksItemModel.java index 959140da4..ef1ebb4e6 100644 --- a/src/main/java/net/mcreator/target/client/model/item/SksItemModel.java +++ b/src/main/java/net/mcreator/target/client/model/item/SksItemModel.java @@ -48,11 +48,11 @@ public class SksItemModel extends GeoModel { double zp = 0; zp = player.getPersistentData().getDouble("zoom_pos_z"); - gun.setPosX(2.09f * (float) p); + gun.setPosX(1.53f * (float) p); - gun.setPosY(0.83f * (float) p - (float) (0.6f * zp)); + gun.setPosY(0.34f * (float) p - (float) (0.6f * zp)); - gun.setPosZ(4f * (float) p + (float) (0.5f * zp)); + gun.setPosZ(2.5f * (float) p + (float) (0.5f * zp)); gun.setRotZ((float) (0.05f * zp)); diff --git a/src/main/java/net/mcreator/target/enchantment/SuperRechargeEnchantment.java b/src/main/java/net/mcreator/target/enchantment/SuperRechargeEnchantment.java index bab7625fc..0307901c8 100644 --- a/src/main/java/net/mcreator/target/enchantment/SuperRechargeEnchantment.java +++ b/src/main/java/net/mcreator/target/enchantment/SuperRechargeEnchantment.java @@ -25,7 +25,7 @@ public class SuperRechargeEnchantment extends Enchantment { @Override public int getMaxLevel() { - return 3; + return 5; } @Override diff --git a/src/main/java/net/mcreator/target/entity/TaserBulletProjectileEntity.java b/src/main/java/net/mcreator/target/entity/TaserBulletProjectileEntity.java index 6e2d18d73..573106d1d 100644 --- a/src/main/java/net/mcreator/target/entity/TaserBulletProjectileEntity.java +++ b/src/main/java/net/mcreator/target/entity/TaserBulletProjectileEntity.java @@ -1,43 +1,43 @@ + package net.mcreator.target.entity; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.player.Player; +import net.mcreator.target.init.TargetModEntities; +import net.minecraftforge.network.PlayMessages; +import net.minecraftforge.network.NetworkHooks; +import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraft.world.phys.EntityHitResult; +import net.minecraft.world.level.Level; +import net.minecraft.world.entity.projectile.ItemSupplier; +import net.minecraft.world.entity.projectile.AbstractArrow; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.EntityType; +import net.minecraft.world.item.ItemStack; +import net.minecraft.sounds.SoundSource; +import net.minecraft.network.protocol.game.ClientGamePacketListener; +import net.minecraft.network.protocol.Packet; +import net.minecraft.world.effect.MobEffectInstance; +import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.phys.Vec3; +import net.minecraftforge.network.PacketDistributor; + import net.mcreator.target.TargetMod; -import net.mcreator.target.headshot.BoundingBoxManager; -import net.mcreator.target.headshot.IHeadshotBox; import net.mcreator.target.init.*; import net.mcreator.target.network.message.ClientIndicatorMessage; -import net.minecraft.network.protocol.Packet; -import net.minecraft.network.protocol.game.ClientGamePacketListener; -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.sounds.SoundSource; -import net.minecraft.world.effect.MobEffectInstance; -import net.minecraft.world.entity.Entity; -import net.minecraft.world.entity.EntityType; -import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.entity.projectile.ThrowableItemProjectile; -import net.minecraft.world.item.Item; -import net.minecraft.world.level.Level; -import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.BlockHitResult; -import net.minecraft.world.phys.EntityHitResult; -import net.minecraft.world.phys.Vec3; -import net.minecraftforge.network.NetworkHooks; -import net.minecraftforge.network.PacketDistributor; -import net.minecraftforge.network.PlayMessages; -import java.util.Optional; - -public class TaserBulletProjectileEntity extends ThrowableItemProjectile { +@OnlyIn(value = Dist.CLIENT, _interface = ItemSupplier.class) +public class TaserBulletProjectileEntity extends AbstractArrow implements ItemSupplier { private float damage = 1f; private int volt = 0; private int wire_length = 0; + private boolean stop = false; + public static final ItemStack PROJECTILE_ITEM = new ItemStack(Blocks.AIR); - public TaserBulletProjectileEntity(EntityType type, Level world) { - super(type, world); - } - - public TaserBulletProjectileEntity(EntityType type, LivingEntity entity, Level world) { - super(type, entity, world); + public TaserBulletProjectileEntity(PlayMessages.SpawnEntity packet, Level world) { + super(TargetModEntities.TASER_BULLET_PROJECTILE.get(), world); } public TaserBulletProjectileEntity(LivingEntity entity, Level level, float damage, int volt, int wire_length) { @@ -47,8 +47,8 @@ public class TaserBulletProjectileEntity extends ThrowableItemProjectile { this.wire_length = wire_length; } - public TaserBulletProjectileEntity(PlayMessages.SpawnEntity packet, Level level) { - this(TargetModEntities.TASER_BULLET_PROJECTILE.get(), level); + public TaserBulletProjectileEntity(EntityType type, Level world) { + super(type, world); } @Override @@ -57,8 +57,20 @@ public class TaserBulletProjectileEntity extends ThrowableItemProjectile { } @Override - protected Item getDefaultItem() { - return TargetModItems.TASER_ELECTRODE.get(); + @OnlyIn(Dist.CLIENT) + public ItemStack getItem() { + return PROJECTILE_ITEM; + } + + @Override + protected ItemStack getPickupItem() { + return PROJECTILE_ITEM; + } + + @Override + protected void doPostHurtEffects(LivingEntity entity) { + super.doPostHurtEffects(entity); + entity.setArrowCount(entity.getArrowCount() - 1); } @Override @@ -71,41 +83,9 @@ public class TaserBulletProjectileEntity extends ThrowableItemProjectile { TargetMod.PACKET_HANDLER.send(PacketDistributor.PLAYER.with(() -> player), new ClientIndicatorMessage(0, 5)); } } - if (entity instanceof LivingEntity) { - entity.invulnerableTime = 0; - } - AABB boundingBox = entity.getBoundingBox(); - Vec3 startVec = this.position(); - Vec3 endVec = startVec.add(this.getDeltaMovement()); - Vec3 hitPos = boundingBox.clip(startVec, endVec).orElse(null); - /* Check for headshot */ - boolean headshot = false; - if (entity instanceof LivingEntity) { - IHeadshotBox headshotBox = (IHeadshotBox) BoundingBoxManager.getHeadshotBoxes(entity.getType()); - if (headshotBox != null) { - AABB box = headshotBox.getHeadshotBox((LivingEntity) entity); - if (box != null) { - box = box.move(boundingBox.getCenter().x, boundingBox.minY, boundingBox.getCenter().z); - Optional headshotHitPos = box.clip(startVec, endVec); - if (headshotHitPos.isEmpty()) { - box = box.inflate(0.2, 0.2, 0.2); - headshotHitPos = box.clip(startVec, endVec); - } - if (headshotHitPos.isPresent() && (hitPos == null || headshotHitPos.get().distanceTo(hitPos) < 0.55)) { - headshot = true; - } - if (headshot && this.getOwner() instanceof LivingEntity living) { - if (!living.level().isClientSide() && living instanceof ServerPlayer player) { - living.level().playSound(null, living.blockPosition(), TargetModSounds.HEADSHOT.get(), SoundSource.VOICE, 1, 1); - - TargetMod.PACKET_HANDLER.send(PacketDistributor.PLAYER.with(() -> player), new ClientIndicatorMessage(1, 5)); - } - } - } - } - } - if (entity instanceof LivingEntity living) { + entity.invulnerableTime = 0; + entity.hurt(TargetModDamageTypes.causeShockDamage(this.level().registryAccess(), this.getOwner()), this.damage); if (living instanceof Player player && player.isCreative()) { return; } @@ -113,13 +93,6 @@ public class TaserBulletProjectileEntity extends ThrowableItemProjectile { living.addEffect(new MobEffectInstance(TargetModMobEffects.SHOCK.get(), 100, volt), this.getOwner()); } } - - if (headshot) { - entity.hurt(TargetModDamageTypes.causeShockDamage(this.level().registryAccess(), this.getOwner()), this.damage * 1.5f); - } else { - entity.hurt(TargetModDamageTypes.causeShockDamage(this.level().registryAccess(), this.getOwner()), this.damage); - } - this.discard(); } @@ -127,7 +100,8 @@ public class TaserBulletProjectileEntity extends ThrowableItemProjectile { public void tick() { super.tick(); - if (this.tickCount == 5 + wire_length) { + if (this.getOwner() != null && this.position().distanceTo(this.getOwner().position()) > 10 + 4 * wire_length && !stop) { + stop = true; this.setDeltaMovement(new Vec3(0, 0, 0)); } @@ -135,11 +109,5 @@ public class TaserBulletProjectileEntity extends ThrowableItemProjectile { this.discard(); } } - - @Override - protected void onHitBlock(BlockHitResult result) { - if (!level().isClientSide) { - this.setDeltaMovement(new Vec3(0, 0, 0)); - } - } } + diff --git a/src/main/java/net/mcreator/target/event/GunEventHandler.java b/src/main/java/net/mcreator/target/event/GunEventHandler.java index ae5dda2df..fb6678866 100644 --- a/src/main/java/net/mcreator/target/event/GunEventHandler.java +++ b/src/main/java/net/mcreator/target/event/GunEventHandler.java @@ -343,8 +343,8 @@ public class GunEventHandler { projectile.beast(); } - projectile.setPos(player.getX() - 0.1 * player.getLookAngle().x, player.getEyeY() - 0.02 - 0.1 * player.getLookAngle().y, player.getZ() + -0.1 * player.getLookAngle().z); - projectile.shoot(player.getLookAngle().x, player.getLookAngle().y + 0.0015f , player.getLookAngle().z, 1 * (float) heldItem.getOrCreateTag().getDouble("velocity"), + projectile.setPos(player.getX() - 0.1 * player.getLookAngle().x, player.getEyeY() - 0.1 - 0.1 * player.getLookAngle().y, player.getZ() + -0.1 * player.getLookAngle().z); + projectile.shoot(player.getLookAngle().x, player.getLookAngle().y + 0.0005f , player.getLookAngle().z, 1 * (float) heldItem.getOrCreateTag().getDouble("velocity"), (float) player.getAttributeBaseValue(TargetModAttributes.SPREAD.get())); player.level().addFreshEntity(projectile); } diff --git a/src/main/java/net/mcreator/target/init/TargetModEntities.java b/src/main/java/net/mcreator/target/init/TargetModEntities.java index c2ef2f4c4..4f3805cc6 100644 --- a/src/main/java/net/mcreator/target/init/TargetModEntities.java +++ b/src/main/java/net/mcreator/target/init/TargetModEntities.java @@ -27,7 +27,7 @@ public class TargetModEntities { public static final RegistryObject> CLAYMORE = register("claymore", EntityType.Builder.of(ClaymoreEntity::new, MobCategory.CREATURE).setShouldReceiveVelocityUpdates(true).setTrackingRange(64).setUpdateInterval(3).setCustomClientFactory(ClaymoreEntity::new).fireImmune().sized(0.5f, 0.5f)); public static final RegistryObject> TASER_BULLET_PROJECTILE = register("projectile_taser_bullet_projectile", - EntityType.Builder.of(TaserBulletProjectileEntity::new, MobCategory.MISC).setShouldReceiveVelocityUpdates(true).setTrackingRange(64).setCustomClientFactory(TaserBulletProjectileEntity::new) + EntityType.Builder.of(TaserBulletProjectileEntity::new, MobCategory.MISC).setCustomClientFactory(TaserBulletProjectileEntity::new).setShouldReceiveVelocityUpdates(true).setTrackingRange(64) .setUpdateInterval(1).sized(0.5f, 0.5f)); public static final RegistryObject> GUN_GRENADE = register("projectile_gun_grenade", EntityType.Builder.of(GunGrenadeEntity::new, MobCategory.MISC).setShouldReceiveVelocityUpdates(true).setTrackingRange(64).setUpdateInterval(1).setCustomClientFactory(GunGrenadeEntity::new).sized(0.5f, 0.5f)); diff --git a/src/main/java/net/mcreator/target/item/gun/M79Item.java b/src/main/java/net/mcreator/target/item/gun/M79Item.java index c40f12864..9fe925033 100644 --- a/src/main/java/net/mcreator/target/item/gun/M79Item.java +++ b/src/main/java/net/mcreator/target/item/gun/M79Item.java @@ -184,7 +184,7 @@ public class M79Item extends GunItem implements GeoItem, AnimatedItem { tag.putDouble("reload_time", 0); } if (tag.getBoolean("reloading")) { - if (tag.getDouble("reload_time") == 86) { + if (tag.getDouble("reload_time") == 61) { entity.getPersistentData().putDouble("id", id); if (entity instanceof ServerPlayer serverPlayer) { SoundTool.playLocalSound(serverPlayer, TargetModSounds.M_79_RELOAD.get(), 100, 1); diff --git a/src/main/java/net/mcreator/target/procedures/M79fireProcedure.java b/src/main/java/net/mcreator/target/procedures/M79fireProcedure.java index 72173e534..e9542d410 100644 --- a/src/main/java/net/mcreator/target/procedures/M79fireProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/M79fireProcedure.java @@ -48,7 +48,7 @@ public class M79fireProcedure { ("particle minecraft:cloud" + (" " + (entity.getX() + 1.8 * entity.getLookAngle().x)) + (" " + (entity.getY() + entity.getBbHeight() - 0.1 + 1.8 * entity.getLookAngle().y)) + (" " + (entity.getZ() + 1.8 * entity.getLookAngle().z)) + " 0.1 0.1 0.1 0.002 4 force @s")); } - player.getCooldowns().addCooldown(stack.getItem(), 15); + player.getCooldowns().addCooldown(stack.getItem(), 2); if (entity instanceof ServerPlayer) { SoundTool.playLocalSound(player, TargetModSounds.M_79_FIRE_1P.get(), 2, 1); diff --git a/src/main/java/net/mcreator/target/procedures/PlayerReloadProcedure.java b/src/main/java/net/mcreator/target/procedures/PlayerReloadProcedure.java index ecf944699..abd67f732 100644 --- a/src/main/java/net/mcreator/target/procedures/PlayerReloadProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/PlayerReloadProcedure.java @@ -55,7 +55,7 @@ public class PlayerReloadProcedure { tag.putBoolean("reloading", true); tag.putDouble("empty_reload", 1); tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); - tag.putDouble("reload_time", 86); + tag.putDouble("reload_time", 61); } if (player.getMainHandItem().getItem() == TargetModItems.RPG.get() && !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem())) diff --git a/src/main/resources/assets/target/animations/m79.animation.json b/src/main/resources/assets/target/animations/m79.animation.json index ceb517e47..343de8b7b 100644 --- a/src/main/resources/assets/target/animations/m79.animation.json +++ b/src/main/resources/assets/target/animations/m79.animation.json @@ -68,44 +68,42 @@ "0": { "rotation": { "0.0": { - "vector": [-24.82442, -57.81517, 38.62375] + "vector": [-37.25621, -59.83725, 41.46537] }, "0.2": { - "vector": [-21.82442, -57.81517, 38.62375], + "vector": [-34.07587, -59.91354, 41.25356], "easing": "easeInSine" }, "0.4": { - "vector": [-24.82442, -57.81517, 38.62375], + "vector": [-37.25621, -59.83725, 41.46537], "easing": "easeOutSine" }, "0.6": { - "vector": [-27.82442, -57.81517, 38.62375], + "vector": [-40.42843, -59.75519, 41.66794], "easing": "easeInSine" }, "0.8": { - "vector": [-24.82442, -57.81517, 38.62375], - "easing": "easeOutSine" + "vector": [-37.25621, -59.83725, 41.46537] } }, "position": { "0.0": { - "vector": [6.5, -3, 1] + "vector": [-2.5, -3, -2] }, "0.2": { - "vector": [4.75, -2, 1], + "vector": [-4.25, -2, -2], "easing": "easeInSine" }, "0.4": { - "vector": [3.5, -3, 1], + "vector": [-5.5, -3, -2], "easing": "easeOutSine" }, "0.6": { - "vector": [4.75, -2, 1], + "vector": [-4.25, -2, -2], "easing": "easeInSine" }, "0.8": { - "vector": [6.5, -3, 1], - "easing": "easeOutSine" + "vector": [-2.5, -3, -2] } } }, @@ -127,6 +125,14 @@ "vector": [-0.3, -0.3, 0.3] } } + }, + "Righthand": { + "rotation": { + "vector": [-4.35095, -10.7278, -39.53455] + }, + "position": { + "vector": [2.4, -4, 0.2] + } } } }, @@ -144,7 +150,8 @@ } }, "animation.m79.reload": { - "animation_length": 4.1, + "loop": "hold_on_last_frame", + "animation_length": 3.2, "bones": { "0": { "rotation": { @@ -152,69 +159,74 @@ "vector": [0, 0, 0] }, "0.1": { - "vector": [2, 0, 0] + "vector": [-0.45, -0.01, 0.08] }, - "0.2": { - "vector": [-3.05811, -0.51478, 3.38445], + "0.175": { + "vector": [-5.86371, -0.02086, 0.1524] + }, + "0.25": { + "vector": [-9.60484, -0.05343, 0.36959], "easing": "easeInOutSine" }, - "0.4": { - "vector": [1.91283, -0.77217, 5.07667], - "easing": "easeOutQuad" + "0.3": { + "vector": [-13.16, -0.77, -3.09] }, - "0.5": { - "vector": [1.99535, -0.85991, -11.03239] + "0.375": { + "vector": [-19.93914, -1.50547, -8.34083] }, - "0.7": { - "vector": [-5.092, 0.85585, 5.2355] + "0.475": { + "vector": [1.77223, -1.82395, -7.21675], + "easing": "easeInOutSine" }, - "1.0": { - "vector": [-8.10549, 0.93517, 2.03111], - "easing": "easeOutSine" + "0.55": { + "vector": [-21.21199, -1.82114, -7.20561] + }, + "0.625": { + "vector": [-14.1962, -1.81833, -7.19448] + }, + "0.775": { + "vector": [-17.00782, -1.80417, -7.13846] }, "1.1": { - "vector": [19.9302, 0.10919, 5.9451], - "easing": "easeOutQuad" - }, - "1.2": { - "vector": [4.36381, 0.82628, 0.03385], - "easing": "easeInOutSine" + "vector": [-16.81, 2.42, 4.07] }, "1.4": { - "vector": [-17.05, 0.79, 6.78] + "vector": [-27.09, 10.86, 10.25] }, - "1.8": { - "vector": [-12.92, 0.78, 9.64] + "1.7": { + "vector": [-38.79559, 21.05151, 17.19463], + "easing": "easeInOutSine" }, - "2.2": { - "vector": [-12.79, 0.77, 14.16] - }, - "2.7": { - "vector": [-12.62, 0.76, 35.57], + "1.75": { + "vector": [-38.79559, 21.05151, 17.19463], "easing": "easeInElastic" }, - "3.0": { - "vector": [-18.22, 0.68, 40.62] + "1.825": { + "vector": [-39.23373, 18.28492, 14.12009] }, - "3.1": { - "vector": [-7.71, 0.66, 39.49] + "1.9": { + "vector": [-36.17, 15.89, 10.81] }, - "3.2": { - "vector": [-31.63, 0.65, 31.1] + "2.0": { + "vector": [-36.14461, 11.96649, 5.37452] }, - "3.5": { - "vector": [-23.14, 0.58, 12.2] + "2.425": { + "vector": [-8.6549, 5.12178, -4.1079], + "easing": "easeInElastic" }, - "3.7": { - "vector": [-16.46, 0.52, -8.16] + "2.475": { + "vector": [-28.47987, -1.24916, -2.48672] }, - "3.8": { - "vector": [-22.93, 0.49, -7.65] + "2.575": { + "vector": [-14.34067, -1.19919, -2.38725] }, - "3.9": { - "vector": [-7.38, 0.44, -6.8] + "2.75": { + "vector": [2.73845, -0.85809, -1.70821] }, - "4.1": { + "2.95": { + "vector": [-0.42526, -0.18009, -0.35851] + }, + "2.975": { "vector": [0, 0, 0], "easing": "easeInQuad" } @@ -224,75 +236,59 @@ "vector": [0, 0, 0] }, "0.1": { - "vector": [0, 0, 0] + "vector": [0, 0.1, 0.6] }, - "0.2": { - "vector": [0, -0.1, 0.7], + "0.175": { + "vector": [0, -0.5, 0.5], "easing": "easeInOutSine" }, - "0.3": { - "vector": [0, -0.03, -0.57] + "0.25": { + "vector": [0, 1.3, 1.63] }, - "0.5": { - "vector": [0, 0, 0] + "0.325": { + "vector": [-0.27, 1.18, 0.69] }, - "1.0": { - "vector": [0, 0.75, 0], - "easing": "easeOutSine" + "0.425": { + "vector": [-0.26, -0.43, 0.37] }, - "1.1": { - "vector": [0, -3.86, -0.08], - "easing": "easeInOutSine" + "0.525": { + "vector": [-0.26, 0.37, 2.47] }, - "1.2": { - "vector": [0, -1.27, 1.29] + "0.675": { + "vector": [-0.26, -0.83, 1.56] }, - "1.4": { - "vector": [0, -2.27, 0.13], - "easing": "easeInSine" + "0.925": { + "vector": [0.16, -3.29, 1.46] }, - "1.6": { - "vector": [0, -1.83422, 0.13], - "easing": "easeOutSine" + "1.7": { + "vector": [0.57, -5.49, 0.41], + "easing": "easeInElastic" + }, + "1.75": { + "vector": [0.57, -5.49, 0.41], + "easing": "easeInElastic" + }, + "1.9": { + "vector": [0.44, -5.5, -1.06] }, "2.0": { - "vector": [0, -2.01, 0.53], - "easing": "easeInSine" + "vector": [0.56846, -5.50785, -0.18936] }, - "2.5": { - "vector": [0, -2.24, 0.13], - "easing": "easeOutSine" + "2.425": { + "vector": [0.15, -2.92, -2.26] }, - "2.7": { - "vector": [0, -2.42, 0.12] + "2.475": { + "vector": [0.14, -3.84, -0.63] }, - "3.0": { - "vector": [0.4, -1.65, 0.11] + "2.725": { + "vector": [0.08175, 0.07965, -0.28201] }, - "3.1": { - "vector": [-1.2, -3.53, -0.69] + "2.8": { + "vector": [0.00643, -0.01504, 0.5] }, - "3.2": { - "vector": [0.21, -1.29, 0.32] - }, - "3.4": { - "vector": [0.04797, -1.17359, 0.3] - }, - "3.7": { - "vector": [-0.3, -1.52, 0.24] - }, - "3.8": { - "vector": [-0.22, 0.96, 0.18] - }, - "3.9": { - "vector": [-0.2, 0.52578, 0.16] - }, - "4.0": { - "vector": [-0.15, -0.18422, 0.12] - }, - "4.1": { + "2.975": { "vector": [0, 0, 0], - "easing": "easeInQuad" + "easing": "easeInElastic" } } }, @@ -304,16 +300,16 @@ "0.1": { "vector": [-8, 0, 0] }, - "0.2": { + "0.175": { "vector": [0, 0, 0] }, - "0.4": { + "0.275": { "vector": [-7, 0, 0] }, - "0.5": { + "0.375": { "vector": [-6.2031, 8.44204, -3.2225] }, - "0.7": { + "0.45": { "vector": [0, 0, 0], "easing": "easeInOutSine" } @@ -325,128 +321,101 @@ "0.1": { "vector": [0, 0, -0.5] }, - "0.2": { + "0.175": { "vector": [-0.4, 0, 0.2] }, - "0.4": { + "0.275": { "vector": [-0.4, -0.6, -1.8] }, - "0.7": { + "0.45": { "vector": [0, 0, 0] } } }, "Lefthand": { "rotation": { - "0.7": { + "0.075": { "vector": [0, 0, 0] }, - "0.9": { - "vector": [53.36, -63.89, -154.5] + "0.175": { + "vector": [0.59411, 0.24806, 1.64028] }, - "1.0": { - "vector": [62.36118, -63.89476, -154.50372], - "easing": "easeInOutSine" + "0.25": { + "vector": [-5.8983, -0.43815, -7.78752] }, - "1.2": { - "vector": [66.09822, -55.45013, -113.71528], - "easing": "easeInOutSine" + "0.7": { + "vector": [-5.8983, -0.43815, -7.78752] }, - "1.6": { - "vector": [49.61411, 15.49657, -108.71822] + "1.075": { + "vector": [-7.17022, 7.39113, -12.40813] }, - "2.4": { - "vector": [49.61411, 15.49657, -108.71822] + "1.525": { + "vector": [17.52364, 27.40977, -23.09622] }, - "2.5": { - "vector": [120.59755, -22.51435, -223.82213] - }, - "2.6": { - "vector": [139.59755, -22.51435, -223.82213] - }, - "2.8": { - "vector": [136.99755, -22.51435, -223.82213] - }, - "3.0": { - "vector": [120.94063, -12.60947, -222.43886] - }, - "3.1": { - "vector": [117.59755, -22.51435, -223.82213] - }, - "3.2": { - "vector": [120.59755, -22.51435, -223.82213] - }, - "3.4": { - "vector": [98.72578, -80.50309, -203.38201], + "1.8": { + "vector": [-29.63645, 18.5572, -26.67534], "easing": "easeInSine" }, - "3.6": { - "vector": [-31.98021, -3.88059, -34.35359], + "1.85": { + "vector": [-37.49787, -5.03762, -44.74418], "easing": "easeOutSine" }, - "3.7": { - "vector": [-50, 0, 0] + "1.925": { + "vector": [-37.49787, -5.03762, -44.74418], + "easing": "easeOutSine" }, - "3.9": { + "2.05": { + "vector": [2.06124, -10.12643, -14.23199], + "easing": "easeInSine" + }, + "2.325": { + "vector": [22.33333, 0, 7.55556] + }, + "2.425": { "vector": [0, 0, 0] }, - "4.1": { + "2.975": { "vector": [0, 0, 0] } }, "position": { - "0.7": { + "0.075": { "vector": [0, 0, 0] }, - "0.9": { - "vector": [4.4, 0.6, -3.9] + "0.25": { + "vector": [0.67, -1.16, 4.29] }, - "1.0": { - "vector": [2.8, 0, -3.9], - "easing": "easeInOutSine" + "0.7": { + "vector": [0.67, -1.16, 4.29] }, - "1.2": { - "vector": [2.8, 0, -14.7], - "easing": "easeInOutSine" + "1.075": { + "vector": [8.29483, -6.00713, 14.83785] }, - "1.6": { - "vector": [2.8, 0, -12.9] + "1.525": { + "vector": [16.37697, 16.6495, 16.81009] }, - "2.4": { - "vector": [2.8, 0, -12.9] - }, - "2.5": { - "vector": [12.9, -9.9, -0.7] - }, - "2.6": { - "vector": [10.5, -5.22, -2.86] - }, - "2.7": { - "vector": [9.1, -2.33, -0.23] - }, - "2.8": { - "vector": [5.8, -1.1, -1.1] - }, - "2.9": { - "vector": [5.4, 0.37, -1.87] - }, - "3.1": { - "vector": [5.5, 0, -1] - }, - "3.2": { - "vector": [5.5, 0, -1] - }, - "3.4": { - "vector": [9.84, -8.41, -1.41], + "1.8": { + "vector": [6.05921, 6.23262, -0.16518], "easing": "easeInSine" }, - "3.7": { - "vector": [-1, -6.4, -6.8] + "1.85": { + "vector": [5.88792, 5.535, -1.06208], + "easing": "easeOutSine" }, - "3.9": { + "1.925": { + "vector": [5.88792, 5.535, -1.06208], + "easing": "easeOutSine" + }, + "2.175": { + "vector": [1.80684, -1.72207, 0.78728] + }, + "2.325": { + "vector": [0.49873, 0.55192, 2.15561] + }, + "2.425": { "vector": [0, 0, 0] }, - "4.1": { + "2.975": { "vector": [0, 0, 0] } } @@ -456,17 +425,26 @@ "0.0": { "vector": [0, 0, 0] }, - "1.0": { + "0.375": { "vector": [0, 0, 0] }, - "1.1": { + "0.425": { "vector": [65, 0, 0], "easing": "easeInQuart" }, - "3.6": { - "vector": [65, 0, 0] + "0.5": { + "vector": [55, 0, 0], + "easing": "easeOutSine" }, - "3.8": { + "0.575": { + "vector": [65, 0, 0], + "easing": "linear" + }, + "2.3": { + "vector": [54.45, 0, 0], + "easing": "easeInElastic" + }, + "2.425": { "vector": [0, 0, 0], "easing": "easeInSine" } @@ -477,43 +455,20 @@ "0.0": { "vector": [0, 0, 0] }, - "1.0": { + "0.525": { "vector": [0, 0, 0] }, - "1.1": { - "vector": [0, 0, 0] + "1.35": { + "vector": [-23, 50, 0] }, - "2.0": { - "vector": [705, 0, 0] + "1.525": { + "vector": [-23, 50, 0] }, - "2.1": { - "vector": [0, 0, 0] + "1.8": { + "vector": [0, 0, 0], + "easing": "easeInSine" }, - "2.2": { - "vector": [0, 0, 0] - }, - "2.4": { - "vector": [0, 0, 0] - }, - "2.5": { - "vector": [-1.29242, 6.94533, 12.31094] - }, - "2.6": { - "vector": [-1.29242, 6.94533, 12.31094] - }, - "2.7": { - "vector": [-1.4149, 24.9404, 11.87052] - }, - "2.8": { - "vector": [-5.77459, 7.53542, 7.06657] - }, - "2.9": { - "vector": [0, 0, 0] - }, - "3.0": { - "vector": [0, 0, 0] - }, - "4.1": { + "2.95": { "vector": [0, 0, 0] } }, @@ -521,71 +476,96 @@ "0.0": { "vector": [0, 0, 0] }, - "1.0": { + "0.5": { "vector": [0, 0, 0] }, + "0.525": { + "vector": [0, 0, 2], + "easing": "easeInSine" + }, + "0.575": { + "vector": [0.5553, 5.66292, 3.26201] + }, + "0.625": { + "vector": [0.92367, 10.62579, 3.20391] + }, + "0.675": { + "vector": [1.05295, 13.89744, 2.49726] + }, + "0.7": { + "vector": [1.04481, 16.11923, 1.30045] + }, + "0.725": { + "vector": [0.9355, 18.34587, -0.81635] + }, + "0.75": { + "vector": [0.83218, 20.10103, -2.66047] + }, + "0.775": { + "vector": [0.60803, 21.18849, -5.25043] + }, + "0.825": { + "vector": [0.30899, 22.10409, -10.6078] + }, + "0.875": { + "vector": [-0.06704, 21.51668, -15.3093] + }, + "0.9": { + "vector": [-0.11094, 20.64838, -18.12569] + }, + "0.925": { + "vector": [-0.13506, 19.48257, -20.38455] + }, + "0.95": { + "vector": [-0.12422, 18.06817, -22.75406] + }, + "0.975": { + "vector": [-0.13483, 15.96007, -25.4115] + }, + "1.0": { + "vector": [0.36357, 13.86601, -27.85132] + }, + "1.025": { + "vector": [0.59404, 11.40735, -30.64647] + }, + "1.05": { + "vector": [1.09508, 8.07792, -33.96118] + }, + "1.075": { + "vector": [1.75558, 4.38487, -37.45208] + }, "1.1": { - "vector": [0, 0, 2.9], - "easing": "easeInQuad" + "vector": [2.56204, 0.51974, -40.82502] + }, + "1.125": { + "vector": [3.59665, -4.19158, -44.30519] + }, + "1.15": { + "vector": [4.92529, -9.99504, -48.26734] + }, + "1.175": { + "vector": [6.39934, -16.76542, -52.47004] }, "1.2": { - "vector": [0, 6.52, 7.97] + "vector": [8.02542, -24.1479, -56.75329] }, - "1.3": { - "vector": [0, 15.38, 5.88] + "1.225": { + "vector": [9.74933, -33.04885, -61.62866] }, - "1.4": { - "vector": [0.5, 21.14, -0.16] + "1.35": { + "vector": [12.36312, -8.2, 10.04981] }, - "1.5": { - "vector": [0, 25.3, -5.2] - }, - "1.6": { - "vector": [0, 27.1, -12.1] - }, - "1.7": { - "vector": [0, 27.2, -18.7] + "1.525": { + "vector": [12.36312, -8.2, 10.04981] }, "1.8": { - "vector": [0, 26, -27.1] + "vector": [0, 0, 2], + "easing": "easeInSine" }, - "1.9": { - "vector": [0, 23.8, -37.3] - }, - "2.0": { - "vector": [0, 19.9, -51] - }, - "2.1": { - "vector": [0, 0, -168.8], - "easing": "easeInQuad" - }, - "2.2": { - "vector": [0, 0, -168.8], - "easing": "easeInQuad" - }, - "2.4": { - "vector": [0, 0, -168.8], - "easing": "easeInQuad" - }, - "2.5": { - "vector": [7.6, -9.3, 0.8] - }, - "2.6": { - "vector": [6.3, -5.7, 2] - }, - "2.7": { - "vector": [3.6, -2.7, 4.2] - }, - "2.8": { - "vector": [1, -0.4, 3.3] - }, - "2.9": { - "vector": [0, 0, 2] - }, - "3.0": { + "1.85": { "vector": [0, 0, 0] }, - "4.1": { + "2.95": { "vector": [0, 0, 0] } } @@ -595,133 +575,118 @@ "0.0": { "vector": [1, 1, 1] }, - "0.9": { + "0.225": { "vector": [1, 1, 1] }, - "1.0": { + "0.325": { "vector": [0, 0, 0] }, - "2.0": { + "1.3": { "vector": [0, 0, 0] }, - "2.1": { + "1.35": { "vector": [1, 1, 1] } } }, "switch": { "rotation": { - "0.0": { + "0.275": { "vector": [0, 0, 0] }, - "0.4": { - "vector": [0, 0, 0] - }, - "0.5": { + "0.375": { "vector": [0, -47.5, 0] }, - "3.7": { + "2.475": { "vector": [0, -47.5, 0] }, - "3.8": { + "2.5": { "vector": [0, 0, 0], "easing": "easeInQuint" - }, - "4.1": { - "vector": [0, 0, 0] } } }, "button": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "4.1": { - "vector": [0, 0, 0] - } - }, "position": { - "0.0": { - "vector": [0, 0, 0] - }, "0.1": { "vector": [0, 0, 0] }, - "0.2": { + "0.175": { "vector": [0, -0.2, 0.3] }, - "3.7": { + "2.475": { "vector": [0, -0.2, 0.3] }, - "3.8": { + "2.5": { "vector": [0, 0, 0], "easing": "easeInQuint" - }, - "4.1": { - "vector": [0, 0, 0] } } }, "camera": { "rotation": { - "0.1": { + "0.025": { "vector": [0, 0, 0] }, + "0.325": { + "vector": [0, 0, -2] + }, "0.4": { - "vector": [0, 0.5, -0.5] + "vector": [0, 1, -1] }, - "0.5": { - "vector": [0.5, -0.5, 1.5] + "0.475": { + "vector": [1, -0.5, -2] }, - "0.6": { - "vector": [0, 0.5, -0.7] + "0.55": { + "vector": [-0.5, 1, 1.5] }, - "0.8": { - "vector": [0, -0.3, 0.4] + "0.725": { + "vector": [0.95, -0.2, -1.3] }, - "1.0": { - "vector": [0.75, 0.4, -2] + "1.025": { + "vector": [0.77, -0.16, 0.5] }, - "1.1": { - "vector": [-2.5, 0.3, 1.5] + "1.55": { + "vector": [0.64, -0.13, -0.88] }, - "1.2": { - "vector": [1.5, 0.3, -1.5] + "1.825": { + "vector": [0.5, -0.1, -2] }, - "1.5": { - "vector": [0.5, 0.12, -0.2], + "1.9": { + "vector": [0, 1, -1] + }, + "1.975": { + "vector": [1, -0.5, -2] + }, + "2.05": { + "vector": [0.75, 1, 1.5] + }, + "2.2": { + "vector": [0.64, -0.13, -0.88] + }, + "2.375": { + "vector": [1.5, -2, -2] + }, + "2.475": { + "vector": [0.25, 2, 2] + }, + "2.55": { + "vector": [1.2, -0.7, -1.5] + }, + "2.65": { + "vector": [0.5, 0.5, 1] + }, + "2.925": { + "vector": [0, 0, 0], "easing": "easeInElastic" - }, - "2.7": { - "vector": [0.15, 0.09, 0] - }, - "3.0": { - "vector": [-0.25, 0.4, -0.5] - }, - "3.1": { - "vector": [0.25, -0.4, 0.25] - }, - "3.2": { - "vector": [-0.5, 0.25, -0.125] - }, - "3.4": { - "vector": [0.25, 0.125, -0.1] - }, - "3.7": { - "vector": [0.12, 0.25, -0.25] - }, - "3.8": { - "vector": [3, 0.17, 1.5] - }, - "3.9": { - "vector": [1, 0.11, -1] - }, - "4.1": { - "vector": [0, 0, 0] } } } + }, + "sound_effects": { + "0.0": { + "effect": "m_79_reload" + } } } }, diff --git a/src/main/resources/assets/target/animations/sks.animation.json b/src/main/resources/assets/target/animations/sks.animation.json index 2670debe0..b796e1753 100644 --- a/src/main/resources/assets/target/animations/sks.animation.json +++ b/src/main/resources/assets/target/animations/sks.animation.json @@ -233,18 +233,15 @@ "vector": [-2.92699, -0.19157, 5.75781], "easing": "easeInSine" }, - "3.1333": { + "3.0667": { "vector": [-1.41605, -0.20305, 1.02159], "easing": "easeInOutSine" }, - "3.2833": { + "3.2167": { "vector": [-0.38814, -0.04302, 1.5098], "easing": "easeInSine" }, - "3.35": { - "vector": [2, 0, 1] - }, - "3.4333": { + "3.3667": { "vector": [0, 0, 0] } }, @@ -323,95 +320,91 @@ "2.9": { "vector": [-0.17, 0.01, -0.66] }, - "3.15": { + "3.0833": { "vector": [-0.11, 0.01, -0.23] }, - "3.35": { - "vector": [0.00031, 0.02116, 0.4598] + "3.2": { + "vector": [0.00031, 0.02116, 0.75] }, - "3.4333": { + "3.3667": { "vector": [0, 0, 0] } } }, "Lefthand": { "rotation": { - "0.0333": { + "0.0167": { "vector": [0, 0, 0] }, - "0.5333": { + "0.5167": { "vector": [-10.23301, -10.25955, 3.51854], "easing": "easeOutQuad" }, - "0.9": { - "vector": [-10.23301, -10.25955, 3.51854], + "0.8833": { + "vector": [2.20817, -18.39622, 7.06347], "easing": "easeOutSine" }, - "1.1333": { + "1.1167": { "vector": [-25.86792, -14.68451, 0.99936], "easing": "easeInOutQuad" }, - "1.3167": { + "1.3": { "vector": [-26.48047, -21.39686, -3.31204] }, - "1.4833": { - "vector": [-20.31753, -15.08281, -6.04184], - "easing": "easeOutSine" - }, - "1.5667": { + "1.4667": { "vector": [-14.31753, -15.08281, -6.04184], "easing": "easeOutSine" }, - "1.6167": { + "1.55": { "vector": [-14.31753, -15.08281, -6.04184], "easing": "easeOutSine" }, - "1.7833": { - "vector": [-10.4978, -22.90313, 5.97238] + "1.75": { + "vector": [-0.4978, -22.90313, 5.97238] }, - "2.0167": { - "vector": [0, 0, 0], + "1.9333": { + "vector": [0, 0, 18], "easing": "linear" + }, + "2.0667": { + "vector": [0, 0, 0] } }, "position": { - "0.0333": { + "0.0167": { "vector": [0, 0, 0] }, - "0.5333": { + "0.5167": { "vector": [3.6298, -9.6674, 10.35934], "easing": "easeOutQuad" }, - "0.9": { - "vector": [-1.59069, -3.13326, 3.41688], + "0.8833": { + "vector": [-3.39069, -1.13326, 6.51688], "easing": "easeOutSine" }, - "1.1333": { - "vector": [-1.69069, -8.33326, 0.31688], + "1.1167": { + "vector": [-2.09069, -8.33326, 0.61688], "easing": "easeInOutQuad" }, - "1.3167": { - "vector": [-2.44156, -5.77141, 0.42] + "1.3": { + "vector": [-2.47072, -5.39475, 1.12518] }, - "1.4833": { - "vector": [-1.82116, -5.06841, 2.47626], + "1.4667": { + "vector": [-1.86832, -4.26796, 3.33709], "easing": "easeOutSine" }, - "1.5667": { - "vector": [-1.82116, -3.56841, 3.27626], + "1.55": { + "vector": [-1.86832, -4.26796, 3.33709], "easing": "easeOutSine" }, - "1.6167": { - "vector": [-1.82116, -3.56841, 3.27626], - "easing": "easeOutSine" + "1.75": { + "vector": [-3.09, -4.56, 4.55] }, - "1.8167": { - "vector": [-3.12116, -4.56841, 0.27626], - "easing": "easeOutSine" + "1.9333": { + "vector": [-2.78, -1, 0.7] }, - "2.05": { - "vector": [0, 0, 0], - "easing": "linear" + "2.0667": { + "vector": [0, 0, 0] } } }, @@ -420,10 +413,10 @@ "0.9": { "vector": [0, 0, 0] }, - "0.9667": { - "vector": [-2.44, -0.21, -0.79] + "1.0667": { + "vector": [-32.44, -0.21, -0.79] }, - "1.4167": { + "1.3333": { "vector": [174.55748, -9.79803, -303.10512], "easing": "easeInSine" }, @@ -446,21 +439,21 @@ "0.9667": { "vector": [0, -0.57, -0.16] }, - "1.1167": { + "1.0667": { "vector": [-2.73421, -6.54466, -0.04218], "easing": "easeInSine" }, - "1.2": { + "1.15": { "vector": [-6.47567, -11.70155, 0.40835], "easing": "linear" }, - "1.2667": { + "1.2167": { "vector": [-10.83066, -16.63611, 1.48246] }, - "1.3": { + "1.25": { "vector": [-13.95441, -19.57235, 2.2025] }, - "1.4167": { + "1.3167": { "vector": [-22.66857, -29.11451, 4.97341] }, "1.8": { @@ -485,15 +478,18 @@ "vector": [-28.89091, 15.98616, -5.02589] }, "0.9": { - "vector": [-32.57163, 10.15543, -2.42658], + "vector": [-30.60596, 2.22509, 3.64702], "easing": "easeOutSine" }, "1.1333": { - "vector": [-22.5, 0, -1], + "vector": [-49.39159, -0.84313, -4.26447], "easing": "easeInOutQuad" }, + "1.25": { + "vector": [-38.8485, -4.58973, -7.26182] + }, "1.3167": { - "vector": [-22.05592, -4.56353, -7.11018] + "vector": [-33.05592, -4.56353, -7.11018] }, "1.4833": { "vector": [-16.75, 0, 0] @@ -519,18 +515,24 @@ "vector": [0.02827, -3.34634, -4.77029] }, "0.9": { - "vector": [-5.17435, 3.25868, -12.0845], + "vector": [-5.87435, 3.25868, -12.0845], "easing": "easeOutSine" }, "1.1333": { - "vector": [-5.40838, 0.1135, -12.65133], + "vector": [-5.80723, -0.81624, -13.25722], "easing": "easeInOutQuad" }, + "1.25": { + "vector": [-6.21664, 1.4022, -12.36401] + }, "1.3167": { - "vector": [-6.395, 2.89641, -12.42] + "vector": [-6.22, 2.69, -12.46] + }, + "1.3833": { + "vector": [-6.33, 2.73, -12.56] }, "1.4833": { - "vector": [-6.49844, 2.78672, -11.71562] + "vector": [-6.49844, 2.78672, -12.21562] }, "1.5667": { "vector": [-6.49844, 3.38672, -11.71562] @@ -589,10 +591,10 @@ "2.7167": { "vector": [4.38543, 15.49955, 7.21206] }, - "2.9333": { + "3.0": { "vector": [1.25248, 18.45031, -0.01712] }, - "3.0833": { + "3.2167": { "vector": [0, 0, 0] } }, @@ -611,11 +613,11 @@ "vector": [0.42, 2.24, -3.25], "easing": "easeInSine" }, - "2.8167": { + "2.8833": { "vector": [0.42, 2.24, -6.45], "easing": "easeOutSine" }, - "3.0833": { + "3.2167": { "vector": [0, 0, 0] } } @@ -766,7 +768,7 @@ "2.3": { "vector": [2, 0, 2] }, - "2.3833": { + "2.45": { "vector": [0, 0, 0] } }, @@ -826,9 +828,9 @@ "vector": [0, 0, -1.07] }, "2.3": { - "vector": [0.00031, 0.02116, 0.2598] + "vector": [0.00031, 0.02116, 0.75] }, - "2.3833": { + "2.45": { "vector": [0, 0, 0] } } @@ -843,7 +845,7 @@ "easing": "easeOutQuad" }, "0.9": { - "vector": [-10.23301, -10.25955, 3.51854], + "vector": [2.20817, -18.39622, 7.06347], "easing": "easeOutSine" }, "1.1333": { @@ -854,7 +856,7 @@ "vector": [-26.48047, -21.39686, -3.31204] }, "1.4833": { - "vector": [-20.31753, -15.08281, -6.04184], + "vector": [-14.31753, -15.08281, -6.04184], "easing": "easeOutSine" }, "1.5667": { @@ -862,11 +864,11 @@ "easing": "easeOutSine" }, "1.7333": { - "vector": [-21.16455, -11.71775, -9.83624], + "vector": [4.67258, -14.84218, -5.84346], "easing": "easeOutSine" }, "2.05": { - "vector": [-21.16455, -11.71775, -9.83624], + "vector": [16.33545, -11.71775, -9.83624], "easing": "easeOutSine" }, "2.3": { @@ -883,34 +885,34 @@ "easing": "easeOutQuad" }, "0.9": { - "vector": [-1.59069, -3.13326, 3.41688], + "vector": [-3.39069, -1.13326, 6.51688], "easing": "easeOutSine" }, "1.1333": { - "vector": [-1.69069, -8.33326, 0.31688], + "vector": [-2.09069, -8.33326, 0.61688], "easing": "easeInOutQuad" }, "1.3167": { - "vector": [-2.44156, -5.77141, 0.42] + "vector": [-2.47072, -5.39475, 1.12518] }, "1.4833": { - "vector": [-1.82116, -5.06841, 2.47626], + "vector": [-1.86832, -4.26796, 3.33709], "easing": "easeOutSine" }, "1.5667": { - "vector": [-1.82116, -3.56841, 3.27626], + "vector": [-1.86832, -4.26796, 3.33709], "easing": "easeOutSine" }, "1.7333": { - "vector": [-0.52116, -7.96841, -1.82374], + "vector": [-0.52116, -4.96841, 5.17626], "easing": "easeOutSine" }, "1.8833": { - "vector": [2.48, -11.97, 0.18], + "vector": [2.48, -7.67, 9.38], "easing": "easeInOutSine" }, "2.05": { - "vector": [2.48, -13.97, 7.18], + "vector": [1.38, -8.87, 13.28], "easing": "easeInOutSine" }, "2.3": { @@ -925,23 +927,29 @@ "vector": [0, 0, 0] }, "1.1333": { - "vector": [-14.94548, -1.29256, -4.83045], + "vector": [-27.94548, -1.29256, -4.83045], "easing": "easeInOutQuad" }, "1.3167": { - "vector": [-19.13843, -5.6156, -7.36216] + "vector": [-41.13843, -5.6156, -7.36216] + }, + "1.4167": { + "vector": [-36.75775, 3.05345, -9.28858] }, "1.5167": { - "vector": [-17.61544, 13.20666, -14.8872] + "vector": [-32.63293, 9.86019, -19.97079] + }, + "1.5333": { + "vector": [-32.12306, 10.44423, -11.82156] }, "1.5667": { - "vector": [-17.61544, 13.20666, -14.8872] + "vector": [-31.17573, 8.76408, -6.98182] }, "1.7333": { - "vector": [-18.9503, 6.8669, -18.83787] + "vector": [-24.9503, 6.8669, -18.83787] }, "1.8833": { - "vector": [-18.49011, 4.54769, -15.0214], + "vector": [-21.16455, 11.04079, -24.83338], "easing": "easeInOutSine" }, "2.05": { @@ -961,26 +969,29 @@ "vector": [0, 0, 0] }, "1.1333": { - "vector": [0, -3.5, -1], + "vector": [0, -3.8, -1], "easing": "easeInOutQuad" }, "1.3167": { - "vector": [-0.94062, -0.55391, -1.16875] + "vector": [-0.356, -1.52871, -1.4029] }, "1.4167": { "vector": [-0.68, -1.51156, -0.72141] }, "1.5167": { - "vector": [-1.21703, -0.18281, -0.31156] + "vector": [-1.16192, -1.13767, -0.45512] + }, + "1.5333": { + "vector": [-0.95749, -0.95971, -0.52626] }, "1.5667": { - "vector": [-1.21703, -0.18281, -0.31156] + "vector": [-0.84091, -0.6899, -0.61412] }, "1.7333": { - "vector": [-0.56, -3.87891, -3.60484] + "vector": [0.46707, -4.13785, -0.60988] }, "1.8833": { - "vector": [2.74469, -8.21484, -1.15172], + "vector": [3.25692, -8.57392, 2.41693], "easing": "easeInOutSine" }, "2.05": { @@ -1005,15 +1016,18 @@ "vector": [-28.89091, 15.98616, -5.02589] }, "0.9": { - "vector": [-32.57163, 10.15543, -2.42658], + "vector": [-30.60596, 2.22509, 3.64702], "easing": "easeOutSine" }, "1.1333": { - "vector": [-22.5, 0, -1], + "vector": [-49.39159, -0.84313, -4.26447], "easing": "easeInOutQuad" }, + "1.25": { + "vector": [-38.8485, -4.58973, -7.26182] + }, "1.3167": { - "vector": [-22.05592, -4.56353, -7.11018] + "vector": [-33.05592, -4.56353, -7.11018] }, "1.4833": { "vector": [-16.75, 0, 0] @@ -1039,18 +1053,24 @@ "vector": [0.02827, -3.34634, -4.77029] }, "0.9": { - "vector": [-5.17435, 3.25868, -12.0845], + "vector": [-5.87435, 3.25868, -12.0845], "easing": "easeOutSine" }, "1.1333": { - "vector": [-5.40838, 0.1135, -12.65133], + "vector": [-5.80723, -0.81624, -13.25722], "easing": "easeInOutQuad" }, + "1.25": { + "vector": [-6.21664, 1.4022, -12.36401] + }, "1.3167": { - "vector": [-6.395, 2.89641, -12.42] + "vector": [-6.22, 2.69, -12.46] + }, + "1.3833": { + "vector": [-6.33, 2.73, -12.56] }, "1.4833": { - "vector": [-6.49844, 2.78672, -11.71562] + "vector": [-6.49844, 2.78672, -12.21562] }, "1.5667": { "vector": [-6.49844, 3.38672, -11.71562] diff --git a/src/main/resources/assets/target/geo/m79.geo.json b/src/main/resources/assets/target/geo/m79.geo.json index b02d24145..43b25d91e 100644 --- a/src/main/resources/assets/target/geo/m79.geo.json +++ b/src/main/resources/assets/target/geo/m79.geo.json @@ -28,7 +28,7 @@ { "name": "0", "parent": "bone", - "pivot": [0, 0, 0] + "pivot": [0, 0, 10] }, { "name": "gun", @@ -74,14 +74,9 @@ } ] }, - { - "name": "qian", - "parent": "gun", - "pivot": [0, -0.0083, 1.6901] - }, { "name": "Lefthand", - "parent": "qian", + "parent": "gun", "pivot": [3, -5.5, 8.2], "rotation": [66.92679, 12.45515, -5.24927], "cubes": [ @@ -99,6 +94,11 @@ } ] }, + { + "name": "qian", + "parent": "gun", + "pivot": [0, -0.0083, 1.6901] + }, { "name": "bullet", "parent": "qian", diff --git a/src/main/resources/assets/target/models/displaysettings/sks.item.json b/src/main/resources/assets/target/models/displaysettings/sks.item.json index 26f658106..de333fd8a 100644 --- a/src/main/resources/assets/target/models/displaysettings/sks.item.json +++ b/src/main/resources/assets/target/models/displaysettings/sks.item.json @@ -8,9 +8,9 @@ "display": { "firstperson_righthand": { "translation": [ - 0, - -12, - -19.75 + -2.25, + -10, + -10.75 ], "scale": [ 4, diff --git a/src/main/resources/assets/target/sounds/m_79/m_79_reload.ogg b/src/main/resources/assets/target/sounds/m_79/m_79_reload.ogg index cecf7e536..1c5abe5e6 100644 Binary files a/src/main/resources/assets/target/sounds/m_79/m_79_reload.ogg and b/src/main/resources/assets/target/sounds/m_79/m_79_reload.ogg differ diff --git a/src/main/resources/data/target/guns/sks.json b/src/main/resources/data/target/guns/sks.json index ee28a4eaa..ded3ca0dd 100644 --- a/src/main/resources/data/target/guns/sks.json +++ b/src/main/resources/data/target/guns/sks.json @@ -4,7 +4,7 @@ "dev": 5, "recoil_x": 0.004, "recoil_y": 0.015, - "damage": 9.5, + "damage": 11, "headshot": 1.75, "velocity": 36.5, "mag": 20,