diff --git a/src/main/java/net/mcreator/target/client/model/item/AbekiriItemModel.java b/src/main/java/net/mcreator/target/client/model/item/AbekiriItemModel.java index adf537a54..b33f8c8bc 100644 --- a/src/main/java/net/mcreator/target/client/model/item/AbekiriItemModel.java +++ b/src/main/java/net/mcreator/target/client/model/item/AbekiriItemModel.java @@ -44,7 +44,7 @@ public class AbekiriItemModel extends GeoModel { double zp = 0; zp = player.getPersistentData().getDouble("zoom_pos_z"); - gun.setPosX(2.5f * (float) p); + gun.setPosX(2.45f * (float) p); gun.setPosY(1.7f * (float) p - (float) (0.4f * zp)); @@ -117,5 +117,13 @@ public class AbekiriItemModel extends GeoModel { move.setRotY(Mth.DEG_TO_RAD * (float) yRot); move.setRotZ(2.7f * (float) m + Mth.DEG_TO_RAD * (float) zRot); + + 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/client/model/item/Ntw20Model.java b/src/main/java/net/mcreator/target/client/model/item/Ntw20Model.java index efb179fd2..ffab5cb40 100644 --- a/src/main/java/net/mcreator/target/client/model/item/Ntw20Model.java +++ b/src/main/java/net/mcreator/target/client/model/item/Ntw20Model.java @@ -40,7 +40,6 @@ public class Ntw20Model extends GeoModel { CoreGeoBone body = getAnimationProcessor().getBone("body"); CoreGeoBone jing = getAnimationProcessor().getBone("jing"); CoreGeoBone base = getAnimationProcessor().getBone("base"); - CoreGeoBone lh = getAnimationProcessor().getBone("lh"); CoreGeoBone rex = getAnimationProcessor().getBone("rex"); Player player = Minecraft.getInstance().player; @@ -68,9 +67,6 @@ public class Ntw20Model extends GeoModel { shen.setRotZ(-0.01f * (float) (fp + 1.3 * fr)); } - action.setPosZ(3 * (float) fp); - lh.setPosZ(-3 * (float) fp); - shen.setPosX(0.5f * (float)fr * (float)((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).recoilHorizon * fp)); double p = player.getPersistentData().getDouble("zoom_pos"); diff --git a/src/main/java/net/mcreator/target/client/model/item/SentinelItemModel.java b/src/main/java/net/mcreator/target/client/model/item/SentinelItemModel.java index e0f21c7b8..c40295266 100644 --- a/src/main/java/net/mcreator/target/client/model/item/SentinelItemModel.java +++ b/src/main/java/net/mcreator/target/client/model/item/SentinelItemModel.java @@ -66,7 +66,7 @@ public class SentinelItemModel extends GeoModel { } float times = 250f / fps; - cb.setRotZ(cb.getRotZ() + times * 0.03f * (float) (stack.getOrCreateTag().getDouble("crot"))); + cb.setRotZ(cb.getRotZ() + times * 0.03f * (float) (stack.getOrCreateTag().getDouble("chamber_rot"))); CoreGeoBone holo = getAnimationProcessor().getBone("holo"); if (gun.getPosX() > 1.8) { diff --git a/src/main/java/net/mcreator/target/entity/RpgRocketEntity.java b/src/main/java/net/mcreator/target/entity/RpgRocketEntity.java index ad12a3d56..af3d95923 100644 --- a/src/main/java/net/mcreator/target/entity/RpgRocketEntity.java +++ b/src/main/java/net/mcreator/target/entity/RpgRocketEntity.java @@ -168,7 +168,7 @@ public class RpgRocketEntity extends ThrowableItemProjectile { } } if (this.tickCount > 1) { - this.setDeltaMovement(new Vec3((1.03 * this.getDeltaMovement().x()), (1.03 * this.getDeltaMovement().y() - 0.05), (1.03 * this.getDeltaMovement().z()))); + this.setDeltaMovement(new Vec3((1.03 * this.getDeltaMovement().x()), (1.03 * this.getDeltaMovement().y() - 0.02), (1.03 * this.getDeltaMovement().z()))); if (!this.level().isClientSide() && this.level() instanceof ServerLevel serverLevel) { ParticleTool.sendParticle(serverLevel, ParticleTypes.SMOKE, this.getX(), this.getY(), this.getZ(), 2, 0, 0, 0, 0, true); diff --git a/src/main/java/net/mcreator/target/event/GunEventHandler.java b/src/main/java/net/mcreator/target/event/GunEventHandler.java index 3ef28532f..e43bc7c37 100644 --- a/src/main/java/net/mcreator/target/event/GunEventHandler.java +++ b/src/main/java/net/mcreator/target/event/GunEventHandler.java @@ -137,18 +137,10 @@ public class GunEventHandler { } if (stack.getItem() == TargetModItems.SENTINEL.get()) { - stack.getOrCreateTag().putBoolean("zoom_fire", (player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zooming); - stack.getCapability(ForgeCapabilities.ENERGY).ifPresent( iEnergyStorage -> iEnergyStorage.extractEnergy(3000, false) ); - -// if (stack.getOrCreateTag().getDouble("power") > 3000) { -// stack.getOrCreateTag().putDouble("power", stack.getOrCreateTag().getDouble("power") - 3000); -// } else { -// stack.getOrCreateTag().putDouble("power", 0); -// } - stack.getOrCreateTag().putDouble("crot", 20); + stack.getOrCreateTag().putDouble("chamber_rot", 20); } int zoom_add_cooldown = 0; diff --git a/src/main/java/net/mcreator/target/item/gun/AK47Item.java b/src/main/java/net/mcreator/target/item/gun/AK47Item.java index 10f5d72ba..1042b56e8 100644 --- a/src/main/java/net/mcreator/target/item/gun/AK47Item.java +++ b/src/main/java/net/mcreator/target/item/gun/AK47Item.java @@ -151,16 +151,6 @@ public class AK47Item extends GunItem implements GeoItem, AnimatedItem { TooltipTool.addGunTips(list, stack); } - @Override - public boolean onEntitySwing(ItemStack stack, LivingEntity entity) { - return true; - } - - @Override - public boolean shouldCauseReequipAnimation(ItemStack oldStack, ItemStack newStack, boolean slotChanged) { - return false; - } - @Override public Multimap getAttributeModifiers(EquipmentSlot slot, ItemStack stack) { Multimap map = super.getAttributeModifiers(slot, stack); diff --git a/src/main/java/net/mcreator/target/item/gun/Aa12Item.java b/src/main/java/net/mcreator/target/item/gun/Aa12Item.java index a061250f9..730ff7f63 100644 --- a/src/main/java/net/mcreator/target/item/gun/Aa12Item.java +++ b/src/main/java/net/mcreator/target/item/gun/Aa12Item.java @@ -146,16 +146,6 @@ public class Aa12Item extends GunItem implements GeoItem, AnimatedItem { return this.cache; } - @Override - public boolean onEntitySwing(ItemStack stack, LivingEntity entity) { - return true; - } - - @Override - public boolean shouldCauseReequipAnimation(ItemStack oldStack, ItemStack newStack, boolean slotChanged) { - return false; - } - @Override public Multimap getAttributeModifiers(EquipmentSlot slot, ItemStack stack) { Multimap map = super.getAttributeModifiers(slot, stack); diff --git a/src/main/java/net/mcreator/target/item/gun/Abekiri.java b/src/main/java/net/mcreator/target/item/gun/Abekiri.java index 79faa7282..4c7aa653e 100644 --- a/src/main/java/net/mcreator/target/item/gun/Abekiri.java +++ b/src/main/java/net/mcreator/target/item/gun/Abekiri.java @@ -95,11 +95,11 @@ public class Abekiri extends GunItem implements GeoItem, AnimatedItem { } if (stack.getOrCreateTag().getBoolean("is_empty_reloading")) { - return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ab.reload2")); + return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ab.reload_empty")); } if (stack.getOrCreateTag().getBoolean("is_normal_reloading")) { - return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ab.reload")); + return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ab.reload_normal")); } if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("noRun") == 0) { @@ -137,16 +137,6 @@ public class Abekiri extends GunItem implements GeoItem, AnimatedItem { return this.cache; } - @Override - public boolean onEntitySwing(ItemStack stack, LivingEntity entity) { - return true; - } - - @Override - public boolean shouldCauseReequipAnimation(ItemStack oldStack, ItemStack newStack, boolean slotChanged) { - return false; - } - @Override public Multimap getAttributeModifiers(EquipmentSlot slot, ItemStack stack) { Multimap map = super.getAttributeModifiers(slot, stack); diff --git a/src/main/java/net/mcreator/target/item/gun/BocekItem.java b/src/main/java/net/mcreator/target/item/gun/BocekItem.java index 9d92e52ab..2bae3f52c 100644 --- a/src/main/java/net/mcreator/target/item/gun/BocekItem.java +++ b/src/main/java/net/mcreator/target/item/gun/BocekItem.java @@ -113,16 +113,6 @@ public class BocekItem extends GunItem implements GeoItem, AnimatedItem { data.add(idleController); } - @Override - public boolean onEntitySwing(ItemStack stack, LivingEntity entity) { - return true; - } - - @Override - public boolean shouldCauseReequipAnimation(ItemStack oldStack, ItemStack newStack, boolean slotChanged) { - return false; - } - @Override public Multimap getAttributeModifiers(EquipmentSlot slot, ItemStack stack) { Multimap map = super.getAttributeModifiers(slot, stack); 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 2e9e8a4bf..4fb711dc4 100644 --- a/src/main/java/net/mcreator/target/item/gun/Devotion.java +++ b/src/main/java/net/mcreator/target/item/gun/Devotion.java @@ -132,16 +132,6 @@ public class Devotion extends GunItem implements GeoItem, AnimatedItem { return this.cache; } - @Override - public boolean onEntitySwing(ItemStack stack, LivingEntity entity) { - return true; - } - - @Override - public boolean shouldCauseReequipAnimation(ItemStack oldStack, ItemStack newStack, boolean slotChanged) { - return false; - } - @Override public Multimap getAttributeModifiers(EquipmentSlot slot, ItemStack stack) { Multimap map = super.getAttributeModifiers(slot, stack); diff --git a/src/main/java/net/mcreator/target/item/gun/GunItem.java b/src/main/java/net/mcreator/target/item/gun/GunItem.java index 4e4909277..bd1d01c22 100644 --- a/src/main/java/net/mcreator/target/item/gun/GunItem.java +++ b/src/main/java/net/mcreator/target/item/gun/GunItem.java @@ -7,7 +7,9 @@ import net.mcreator.target.network.TargetModVariables; import net.mcreator.target.tools.EnchantmentCategoryTool; import net.mcreator.target.tools.GunsTool; import net.mcreator.target.tools.ItemNBTTool; +import net.mcreator.target.tools.TooltipTool; import net.minecraft.core.BlockPos; +import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.sounds.SoundEvent; import net.minecraft.world.entity.Entity; @@ -15,6 +17,7 @@ import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.TooltipFlag; import net.minecraft.world.item.enchantment.Enchantment; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.state.BlockState; @@ -22,6 +25,7 @@ import net.minecraftforge.event.entity.player.EntityItemPickupEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; +import java.util.List; import java.util.Set; @Mod.EventBusSubscriber @@ -83,6 +87,21 @@ public abstract class GunItem extends Item { } } + @Override + public boolean onEntitySwing(ItemStack stack, LivingEntity entity) { + return false; + } + + @Override + public boolean shouldCauseReequipAnimation(ItemStack oldStack, ItemStack newStack, boolean slotChanged) { + return false; + } + + @Override + public void appendHoverText(ItemStack stack, Level world, List list, TooltipFlag flag) { + TooltipTool.addGunTips(list, stack); + } + public Set getReloadSound() { return Set.of(); } diff --git a/src/main/java/net/mcreator/target/item/gun/Hk416Item.java b/src/main/java/net/mcreator/target/item/gun/Hk416Item.java index 1f30b001d..e03ea0581 100644 --- a/src/main/java/net/mcreator/target/item/gun/Hk416Item.java +++ b/src/main/java/net/mcreator/target/item/gun/Hk416Item.java @@ -142,16 +142,6 @@ public class Hk416Item extends GunItem implements GeoItem, AnimatedItem { return this.cache; } - @Override - public boolean onEntitySwing(ItemStack stack, LivingEntity entity) { - return true; - } - - @Override - public boolean shouldCauseReequipAnimation(ItemStack oldStack, ItemStack newStack, boolean slotChanged) { - return false; - } - @Override public Multimap getAttributeModifiers(EquipmentSlot slot, ItemStack stack) { Multimap map = super.getAttributeModifiers(slot, stack); diff --git a/src/main/java/net/mcreator/target/item/gun/HuntingRifle.java b/src/main/java/net/mcreator/target/item/gun/HuntingRifle.java index 0453398bd..667e8ebce 100644 --- a/src/main/java/net/mcreator/target/item/gun/HuntingRifle.java +++ b/src/main/java/net/mcreator/target/item/gun/HuntingRifle.java @@ -132,16 +132,6 @@ public class HuntingRifle extends GunItem implements GeoItem, AnimatedItem { } - @Override - public boolean onEntitySwing(ItemStack stack, LivingEntity entity) { - return true; - } - - @Override - public boolean shouldCauseReequipAnimation(ItemStack oldStack, ItemStack newStack, boolean slotChanged) { - return false; - } - @Override public Multimap getAttributeModifiers(EquipmentSlot slot, ItemStack stack) { Multimap map = super.getAttributeModifiers(slot, stack); diff --git a/src/main/java/net/mcreator/target/item/gun/M4Item.java b/src/main/java/net/mcreator/target/item/gun/M4Item.java index 75973ccd4..b66463e0b 100644 --- a/src/main/java/net/mcreator/target/item/gun/M4Item.java +++ b/src/main/java/net/mcreator/target/item/gun/M4Item.java @@ -142,16 +142,6 @@ public class M4Item extends GunItem implements GeoItem, AnimatedItem { return this.cache; } - @Override - public boolean onEntitySwing(ItemStack stack, LivingEntity entity) { - return true; - } - - @Override - public boolean shouldCauseReequipAnimation(ItemStack oldStack, ItemStack newStack, boolean slotChanged) { - return false; - } - @Override public Multimap getAttributeModifiers(EquipmentSlot slot, ItemStack stack) { Multimap map = super.getAttributeModifiers(slot, stack); diff --git a/src/main/java/net/mcreator/target/item/gun/M60Item.java b/src/main/java/net/mcreator/target/item/gun/M60Item.java index 946cb553d..3aab4cb0d 100644 --- a/src/main/java/net/mcreator/target/item/gun/M60Item.java +++ b/src/main/java/net/mcreator/target/item/gun/M60Item.java @@ -156,16 +156,6 @@ public class M60Item extends GunItem implements GeoItem, AnimatedItem { return Set.of(TargetModSounds.M_60_RELOAD_EMPTY.get(), TargetModSounds.M_60_RELOAD_NORMAL.get()); } - @Override - public boolean onEntitySwing(ItemStack stack, LivingEntity entity) { - return true; - } - - @Override - public boolean shouldCauseReequipAnimation(ItemStack oldStack, ItemStack newStack, boolean slotChanged) { - return false; - } - @Override public Multimap getAttributeModifiers(EquipmentSlot slot, ItemStack stack) { Multimap map = super.getAttributeModifiers(slot, stack); 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 a45bf4851..aebd3fe9f 100644 --- a/src/main/java/net/mcreator/target/item/gun/M79Item.java +++ b/src/main/java/net/mcreator/target/item/gun/M79Item.java @@ -135,16 +135,6 @@ public class M79Item extends GunItem implements GeoItem, AnimatedItem { return this.cache; } - @Override - public boolean onEntitySwing(ItemStack stack, LivingEntity entity) { - return true; - } - - @Override - public boolean shouldCauseReequipAnimation(ItemStack oldStack, ItemStack newStack, boolean slotChanged) { - return false; - } - @Override public Multimap getAttributeModifiers(EquipmentSlot slot, ItemStack stack) { Multimap map = super.getAttributeModifiers(slot, stack); diff --git a/src/main/java/net/mcreator/target/item/gun/M870Item.java b/src/main/java/net/mcreator/target/item/gun/M870Item.java index b623a018a..ef17f554f 100644 --- a/src/main/java/net/mcreator/target/item/gun/M870Item.java +++ b/src/main/java/net/mcreator/target/item/gun/M870Item.java @@ -163,16 +163,6 @@ public class M870Item extends GunItem implements GeoItem, AnimatedItem { return Set.of(TargetModSounds.M_870_PREPARE_LOAD.get(), TargetModSounds.M_870_LOOP.get()); } - @Override - public boolean onEntitySwing(ItemStack stack, LivingEntity entity) { - return true; - } - - @Override - public boolean shouldCauseReequipAnimation(ItemStack oldStack, ItemStack newStack, boolean slotChanged) { - return false; - } - @Override public Multimap getAttributeModifiers(EquipmentSlot slot, ItemStack stack) { Multimap map = super.getAttributeModifiers(slot, stack); diff --git a/src/main/java/net/mcreator/target/item/gun/M98bItem.java b/src/main/java/net/mcreator/target/item/gun/M98bItem.java index fffd1c5e1..49481ee1c 100644 --- a/src/main/java/net/mcreator/target/item/gun/M98bItem.java +++ b/src/main/java/net/mcreator/target/item/gun/M98bItem.java @@ -143,16 +143,6 @@ public class M98bItem extends GunItem implements GeoItem, AnimatedItem { TooltipTool.addGunTips(list, stack); } - @Override - public boolean onEntitySwing(ItemStack stack, LivingEntity entity) { - return true; - } - - @Override - public boolean shouldCauseReequipAnimation(ItemStack oldStack, ItemStack newStack, boolean slotChanged) { - return false; - } - @Override public Multimap getAttributeModifiers(EquipmentSlot slot, ItemStack stack) { Multimap map = super.getAttributeModifiers(slot, stack); diff --git a/src/main/java/net/mcreator/target/item/gun/MarlinItem.java b/src/main/java/net/mcreator/target/item/gun/MarlinItem.java index 90894a922..419a419a7 100644 --- a/src/main/java/net/mcreator/target/item/gun/MarlinItem.java +++ b/src/main/java/net/mcreator/target/item/gun/MarlinItem.java @@ -179,16 +179,6 @@ public class MarlinItem extends GunItem implements GeoItem, AnimatedItem { return Set.of(TargetModSounds.MARLIN_LOOP.get(), TargetModSounds.MARLIN_PREPARE.get(), TargetModSounds.MARLIN_END.get()); } - @Override - public boolean onEntitySwing(ItemStack stack, LivingEntity entity) { - return true; - } - - @Override - public boolean shouldCauseReequipAnimation(ItemStack oldStack, ItemStack newStack, boolean slotChanged) { - return false; - } - @Override public Multimap getAttributeModifiers(EquipmentSlot slot, ItemStack stack) { Multimap map = super.getAttributeModifiers(slot, stack); diff --git a/src/main/java/net/mcreator/target/item/gun/Minigun.java b/src/main/java/net/mcreator/target/item/gun/Minigun.java index a8e50a4ef..86b871471 100644 --- a/src/main/java/net/mcreator/target/item/gun/Minigun.java +++ b/src/main/java/net/mcreator/target/item/gun/Minigun.java @@ -156,16 +156,6 @@ public class Minigun extends GunItem implements GeoItem, AnimatedItem { return this.cache; } - @Override - public boolean onEntitySwing(ItemStack stack, LivingEntity entity) { - return true; - } - - @Override - public boolean shouldCauseReequipAnimation(ItemStack oldStack, ItemStack newStack, boolean slotChanged) { - return false; - } - @Override public Multimap getAttributeModifiers(EquipmentSlot slot, ItemStack stack) { Multimap map = super.getAttributeModifiers(slot, stack); diff --git a/src/main/java/net/mcreator/target/item/gun/Mk14Item.java b/src/main/java/net/mcreator/target/item/gun/Mk14Item.java index fdf1759d6..330102764 100644 --- a/src/main/java/net/mcreator/target/item/gun/Mk14Item.java +++ b/src/main/java/net/mcreator/target/item/gun/Mk14Item.java @@ -152,16 +152,6 @@ public class Mk14Item extends GunItem implements GeoItem, AnimatedItem { return Set.of(TargetModSounds.MK_14_RELOAD_EMPTY.get(), TargetModSounds.MK_14_RELOAD_NORMAL.get()); } - @Override - public boolean onEntitySwing(ItemStack stack, LivingEntity entity) { - return true; - } - - @Override - public boolean shouldCauseReequipAnimation(ItemStack oldStack, ItemStack newStack, boolean slotChanged) { - return false; - } - @Override public Multimap getAttributeModifiers(EquipmentSlot slot, ItemStack stack) { Multimap map = super.getAttributeModifiers(slot, stack); diff --git a/src/main/java/net/mcreator/target/item/gun/Ntw20.java b/src/main/java/net/mcreator/target/item/gun/Ntw20.java index d7006ea9d..c673b1104 100644 --- a/src/main/java/net/mcreator/target/item/gun/Ntw20.java +++ b/src/main/java/net/mcreator/target/item/gun/Ntw20.java @@ -20,6 +20,7 @@ import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.sounds.SoundEvent; import net.minecraft.world.InteractionHand; +import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.ai.attributes.Attribute; @@ -31,6 +32,7 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.TooltipFlag; import net.minecraft.world.level.Level; import net.minecraftforge.client.extensions.common.IClientItemExtensions; +import net.minecraftforge.common.capabilities.ForgeCapabilities; import software.bernie.geckolib.animatable.GeoItem; import software.bernie.geckolib.core.animatable.instance.AnimatableInstanceCache; import software.bernie.geckolib.core.animation.AnimatableManager; @@ -85,7 +87,7 @@ public class Ntw20 extends GunItem implements GeoItem, AnimatedItem { transformType = type; } - private PlayState idlePredicate(AnimationState event) { + private PlayState fireAnimPredicate(AnimationState event) { LocalPlayer player = Minecraft.getInstance().player; if (player == null) return PlayState.STOP; ItemStack stack = player.getMainHandItem(); @@ -93,10 +95,6 @@ public class Ntw20 extends GunItem implements GeoItem, AnimatedItem { if (this.animationProcedure.equals("empty")) { - if (stack.getOrCreateTag().getInt("draw_time") < 29) { - return event.setAndContinue(RawAnimation.begin().thenLoop("animation.ntw_20.draw")); - } - if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zooming && stack.getOrCreateTag().getInt("bolt_action_anim") > 0) { return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ntw_20.shift2")); } @@ -117,7 +115,26 @@ public class Ntw20 extends GunItem implements GeoItem, AnimatedItem { return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ntw_20.reload_normal")); } - if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("noRun") == 0) { + return event.setAndContinue(RawAnimation.begin().thenLoop("animation.ntw_20.idle")); + } + return PlayState.STOP; + } + + private PlayState idlePredicate(AnimationState event) { + LocalPlayer player = Minecraft.getInstance().player; + if (player == null) return PlayState.STOP; + ItemStack stack = player.getMainHandItem(); + if (!stack.is(TargetModTags.Items.GUN)) return PlayState.STOP; + + if (this.animationProcedure.equals("empty")) { + + if (stack.getOrCreateTag().getInt("draw_time") < 29) { + return event.setAndContinue(RawAnimation.begin().thenLoop("animation.ntw_20.draw")); + } + + if (player.isSprinting() && player.onGround() + && player.getPersistentData().getDouble("noRun") == 0 + && !(stack.getOrCreateTag().getBoolean("is_normal_reloading") || stack.getOrCreateTag().getBoolean("is_empty_reloading"))) { return event.setAndContinue(RawAnimation.begin().thenLoop("animation.ntw_20.run")); } @@ -126,25 +143,10 @@ public class Ntw20 extends GunItem implements GeoItem, AnimatedItem { return PlayState.STOP; } - private PlayState procedurePredicate(AnimationState event) { - if (transformType != null && transformType.firstPerson()) { - if (!this.animationProcedure.equals("empty") && event.getController().getAnimationState() == AnimationController.State.STOPPED) { - event.getController().setAnimation(RawAnimation.begin().thenPlay(this.animationProcedure)); - if (event.getController().getAnimationState() == AnimationController.State.STOPPED) { - this.animationProcedure = "empty"; - event.getController().forceAnimationReset(); - } - } else if (this.animationProcedure.equals("empty")) { - return PlayState.STOP; - } - } - return PlayState.CONTINUE; - } - @Override public void registerControllers(AnimatableManager.ControllerRegistrar data) { - var procedureController = new AnimationController<>(this, "procedureController", 0, this::procedurePredicate); - data.add(procedureController); + var fireAnimController = new AnimationController<>(this, "fireAnimController", 1, this::fireAnimPredicate); + data.add(fireAnimController); var idleController = new AnimationController<>(this, "idleController", 4, this::idlePredicate); data.add(idleController); } @@ -155,16 +157,6 @@ public class Ntw20 extends GunItem implements GeoItem, AnimatedItem { return this.cache; } - @Override - public boolean onEntitySwing(ItemStack stack, LivingEntity entity) { - return true; - } - - @Override - public boolean shouldCauseReequipAnimation(ItemStack oldStack, ItemStack newStack, boolean slotChanged) { - return false; - } - @Override public void appendHoverText(ItemStack stack, Level world, List list, TooltipFlag flag) { TooltipTool.addGunTips(list, stack); diff --git a/src/main/java/net/mcreator/target/item/gun/RpgItem.java b/src/main/java/net/mcreator/target/item/gun/RpgItem.java index ad29c72f9..2bf1faa62 100644 --- a/src/main/java/net/mcreator/target/item/gun/RpgItem.java +++ b/src/main/java/net/mcreator/target/item/gun/RpgItem.java @@ -131,16 +131,6 @@ public class RpgItem extends GunItem implements GeoItem, AnimatedItem { return this.cache; } - @Override - public boolean onEntitySwing(ItemStack stack, LivingEntity entity) { - return true; - } - - @Override - public boolean shouldCauseReequipAnimation(ItemStack oldStack, ItemStack newStack, boolean slotChanged) { - return false; - } - @Override public Multimap getAttributeModifiers(EquipmentSlot slot, ItemStack stack) { Multimap map = super.getAttributeModifiers(slot, stack); diff --git a/src/main/java/net/mcreator/target/item/gun/RpkItem.java b/src/main/java/net/mcreator/target/item/gun/RpkItem.java index fd1b0282e..52e011ebe 100644 --- a/src/main/java/net/mcreator/target/item/gun/RpkItem.java +++ b/src/main/java/net/mcreator/target/item/gun/RpkItem.java @@ -142,16 +142,6 @@ public class RpkItem extends GunItem implements GeoItem, AnimatedItem { return this.cache; } - @Override - public boolean onEntitySwing(ItemStack stack, LivingEntity entity) { - return true; - } - - @Override - public boolean shouldCauseReequipAnimation(ItemStack oldStack, ItemStack newStack, boolean slotChanged) { - return false; - } - @Override public Multimap getAttributeModifiers(EquipmentSlot slot, ItemStack stack) { Multimap map = super.getAttributeModifiers(slot, stack); diff --git a/src/main/java/net/mcreator/target/item/gun/SentinelItem.java b/src/main/java/net/mcreator/target/item/gun/SentinelItem.java index a7a99d409..1420cfe37 100644 --- a/src/main/java/net/mcreator/target/item/gun/SentinelItem.java +++ b/src/main/java/net/mcreator/target/item/gun/SentinelItem.java @@ -120,7 +120,7 @@ public class SentinelItem extends GunItem implements GeoItem, AnimatedItem { transformType = type; } - private PlayState idlePredicate(AnimationState event) { + private PlayState fireAnimPredicate(AnimationState event) { LocalPlayer player = Minecraft.getInstance().player; if (player == null) return PlayState.STOP; ItemStack stack = player.getMainHandItem(); @@ -128,10 +128,6 @@ public class SentinelItem extends GunItem implements GeoItem, AnimatedItem { if (this.animationProcedure.equals("empty")) { - if (stack.getOrCreateTag().getInt("draw_time") < 16) { - return event.setAndContinue(RawAnimation.begin().thenLoop("animation.sentinel.draw")); - } - if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zooming && stack.getOrCreateTag().getInt("bolt_action_anim") > 0) { return event.setAndContinue(RawAnimation.begin().thenPlay("animation.sentinel.shift2")); } @@ -156,7 +152,27 @@ public class SentinelItem extends GunItem implements GeoItem, AnimatedItem { return event.setAndContinue(RawAnimation.begin().thenPlay("animation.sentinel.charge")); } - if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("noRun") == 0) { + return event.setAndContinue(RawAnimation.begin().thenLoop("animation.sentinel.idle")); + } + return PlayState.STOP; + } + + private PlayState idlePredicate(AnimationState event) { + LocalPlayer player = Minecraft.getInstance().player; + if (player == null) return PlayState.STOP; + ItemStack stack = player.getMainHandItem(); + if (!stack.is(TargetModTags.Items.GUN)) return PlayState.STOP; + + if (this.animationProcedure.equals("empty")) { + + if (stack.getOrCreateTag().getInt("draw_time") < 16) { + return event.setAndContinue(RawAnimation.begin().thenLoop("animation.sentinel.draw")); + } + + if (player.isSprinting() && player.onGround() + && player.getPersistentData().getDouble("noRun") == 0 + && !(stack.getOrCreateTag().getBoolean("is_normal_reloading") || stack.getOrCreateTag().getBoolean("is_empty_reloading")) + && !stack.getOrCreateTag().getBoolean("sentinel_is_charging")) { return event.setAndContinue(RawAnimation.begin().thenLoop("animation.sentinel.run")); } @@ -182,8 +198,8 @@ public class SentinelItem extends GunItem implements GeoItem, AnimatedItem { @Override public void registerControllers(AnimatableManager.ControllerRegistrar data) { - var procedureController = new AnimationController<>(this, "procedureController", 0, this::procedurePredicate); - data.add(procedureController); + var fireAnimController = new AnimationController<>(this, "fireAnimController", 1, this::fireAnimPredicate); + data.add(fireAnimController); var idleController = new AnimationController<>(this, "idleController", 4, this::idlePredicate); data.add(idleController); } @@ -218,8 +234,8 @@ public class SentinelItem extends GunItem implements GeoItem, AnimatedItem { } ); - if (tag.getDouble("crot") > 0) { - tag.putDouble("crot", tag.getDouble("crot") - 1); + if (tag.getDouble("chamber_rot") > 0) { + tag.putDouble("chamber_rot", tag.getDouble("chamber_rot") - 1); } } @@ -233,16 +249,6 @@ public class SentinelItem extends GunItem implements GeoItem, AnimatedItem { ); } - @Override - public boolean onEntitySwing(ItemStack stack, LivingEntity entity) { - return true; - } - - @Override - public boolean shouldCauseReequipAnimation(ItemStack oldStack, ItemStack newStack, boolean slotChanged) { - return false; - } - @Override public Multimap getAttributeModifiers(EquipmentSlot slot, ItemStack stack) { Multimap map = super.getAttributeModifiers(slot, stack); diff --git a/src/main/java/net/mcreator/target/item/gun/SksItem.java b/src/main/java/net/mcreator/target/item/gun/SksItem.java index 6dc0ed5a7..888831d69 100644 --- a/src/main/java/net/mcreator/target/item/gun/SksItem.java +++ b/src/main/java/net/mcreator/target/item/gun/SksItem.java @@ -139,16 +139,6 @@ public class SksItem extends GunItem implements GeoItem, AnimatedItem { return this.cache; } - @Override - public boolean onEntitySwing(ItemStack stack, LivingEntity entity) { - return true; - } - - @Override - public boolean shouldCauseReequipAnimation(ItemStack oldStack, ItemStack newStack, boolean slotChanged) { - return false; - } - @Override public Multimap getAttributeModifiers(EquipmentSlot slot, ItemStack stack) { Multimap map = super.getAttributeModifiers(slot, stack); diff --git a/src/main/java/net/mcreator/target/item/gun/SvdItem.java b/src/main/java/net/mcreator/target/item/gun/SvdItem.java index 913a21c2e..f472787d5 100644 --- a/src/main/java/net/mcreator/target/item/gun/SvdItem.java +++ b/src/main/java/net/mcreator/target/item/gun/SvdItem.java @@ -145,16 +145,6 @@ public class SvdItem extends GunItem implements GeoItem, AnimatedItem { return Set.of(TargetModSounds.SVD_RELOAD_EMPTY.get(), TargetModSounds.SVD_RELOAD_NORMAL.get()); } - @Override - public boolean onEntitySwing(ItemStack stack, LivingEntity entity) { - return true; - } - - @Override - public boolean shouldCauseReequipAnimation(ItemStack oldStack, ItemStack newStack, boolean slotChanged) { - return false; - } - @Override public Multimap getAttributeModifiers(EquipmentSlot slot, ItemStack stack) { Multimap map = super.getAttributeModifiers(slot, stack); diff --git a/src/main/java/net/mcreator/target/item/gun/Taser.java b/src/main/java/net/mcreator/target/item/gun/Taser.java index 0b0973057..49b12d93a 100644 --- a/src/main/java/net/mcreator/target/item/gun/Taser.java +++ b/src/main/java/net/mcreator/target/item/gun/Taser.java @@ -148,16 +148,6 @@ public class Taser extends GunItem implements GeoItem, AnimatedItem { data.add(idleController); } - @Override - public boolean onEntitySwing(ItemStack stack, LivingEntity entity) { - return true; - } - - @Override - public boolean shouldCauseReequipAnimation(ItemStack oldStack, ItemStack newStack, boolean slotChanged) { - return false; - } - @Override public Multimap getAttributeModifiers(EquipmentSlot slot, ItemStack stack) { Multimap map = super.getAttributeModifiers(slot, stack); diff --git a/src/main/java/net/mcreator/target/item/gun/Trachelium.java b/src/main/java/net/mcreator/target/item/gun/Trachelium.java index a386c400c..e46d0df29 100644 --- a/src/main/java/net/mcreator/target/item/gun/Trachelium.java +++ b/src/main/java/net/mcreator/target/item/gun/Trachelium.java @@ -129,7 +129,7 @@ public class Trachelium extends GunItem implements GeoItem, AnimatedItem { public void registerControllers(AnimatableManager.ControllerRegistrar data) { AnimationController procedureController = new AnimationController<>(this, "procedureController", 0, this::procedurePredicate); data.add(procedureController); - AnimationController idleController = new AnimationController<>(this, "idleController", 6, this::idlePredicate); + AnimationController idleController = new AnimationController<>(this, "idleController", 3, this::idlePredicate); data.add(idleController); } @@ -138,11 +138,6 @@ public class Trachelium extends GunItem implements GeoItem, AnimatedItem { return this.cache; } - @Override - public boolean onEntitySwing(ItemStack stack, LivingEntity entity) { - return true; - } - @Override public Multimap getAttributeModifiers(EquipmentSlot slot, ItemStack stack) { Multimap map = super.getAttributeModifiers(slot, stack); @@ -155,11 +150,6 @@ public class Trachelium extends GunItem implements GeoItem, AnimatedItem { return map; } - @Override - public boolean shouldCauseReequipAnimation(ItemStack oldStack, ItemStack newStack, boolean slotChanged) { - return slotChanged; - } - @Override public void appendHoverText(ItemStack stack, @Nullable Level level, List list, TooltipFlag flag) { list.add(Component.translatable("des.target.trachelium_1").withStyle(ChatFormatting.GRAY).withStyle(ChatFormatting.ITALIC)); diff --git a/src/main/java/net/mcreator/target/item/gun/VectorItem.java b/src/main/java/net/mcreator/target/item/gun/VectorItem.java index 1025fd04d..a70983736 100644 --- a/src/main/java/net/mcreator/target/item/gun/VectorItem.java +++ b/src/main/java/net/mcreator/target/item/gun/VectorItem.java @@ -159,16 +159,6 @@ public class VectorItem extends GunItem implements GeoItem, AnimatedItem { return Set.of(TargetModSounds.VECTOR_RELOAD_NORMAL.get(), TargetModSounds.VECTOR_RELOAD_EMPTY.get()); } - @Override - public boolean onEntitySwing(ItemStack stack, LivingEntity entity) { - return true; - } - - @Override - public boolean shouldCauseReequipAnimation(ItemStack oldStack, ItemStack newStack, boolean slotChanged) { - return false; - } - @Override public Multimap getAttributeModifiers(EquipmentSlot slot, ItemStack stack) { Multimap map = super.getAttributeModifiers(slot, stack); diff --git a/src/main/resources/assets/target/animations/abekiri.animation.json b/src/main/resources/assets/target/animations/abekiri.animation.json index 9e132a6dd..af7c0b4fd 100644 --- a/src/main/resources/assets/target/animations/abekiri.animation.json +++ b/src/main/resources/assets/target/animations/abekiri.animation.json @@ -116,6 +116,25 @@ "position": { "vector": [0, -14, 16] } + }, + "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] + } + } } } }, @@ -137,325 +156,70 @@ } } }, - "animation.ab.fire2": { - "animation_length": 0.1, - "bones": { - "0": { - "rotation": { - "vector": [0, 0, 0] - }, - "position": { - "vector": [0, 0, 0] - } - }, - "ammo1": { - "position": { - "vector": [0, -14, 16] - } - } - } - }, - "animation.ab.fire3": { - "animation_length": 0.1, - "bones": { - "0": { - "rotation": { - "vector": [0, 0, 0] - }, - "position": { - "vector": [0, 0, 0] - } - }, - "ammo1": { - "position": { - "vector": [0, -14, 16] - } - } - } - }, - "animation.ab.fire4": { - "animation_length": 0.1, - "bones": { - "0": { - "rotation": { - "vector": [0, 0, 0] - }, - "position": { - "vector": [0, 0, 0] - } - }, - "ammo1": { - "position": { - "vector": [0, -14, 16] - } - } - } - }, - "animation.ab.fire5": { - "animation_length": 0.1, - "bones": { - "0": { - "rotation": { - "vector": [0, 0, 0] - }, - "position": { - "vector": [0, 0, 0] - } - }, - "ammo1": { - "position": { - "vector": [0, -14, 16] - } - } - } - }, - "animation.ab.reload": { - "animation_length": 4.1, + "animation.ab.reload_normal": { + "loop": "hold_on_last_frame", + "animation_length": 3.3, "bones": { "0": { "rotation": { "0.0": { "vector": [0, 0, 0] }, - "4.1": { - "vector": [0, 0, 0] - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "4.1": { - "vector": [0, 0, 0] - } - } - }, - "Lefthand": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.2": { - "vector": [46.55566, -11.28983, -10.57657] + "0.1": { + "vector": [3.63, -4.37, 0.63] }, "0.5": { - "vector": [28.88915, -28.22457, -26.44144] + "vector": [-40, -17.5, 2.5], + "easing": "easeInElastic" }, "0.7": { - "vector": [-28.15519, -39.5144, -37.01801] + "vector": [-40, -17.5, 2.5] }, "0.8": { - "vector": [-36.02531, -30.17168, -37.82607] + "vector": [-40, -17.5, 2.5] }, "0.9": { - "vector": [-32.83715, -25.49817, -32.05203] + "vector": [-48, -17.5, 2.5] }, "1.1": { - "vector": [-21.83715, -25.49817, -32.05203] - }, - "1.3": { - "vector": [-30.83715, -25.49817, -32.05203] - }, - "1.7": { - "vector": [-6.83715, -25.49817, -32.05203], - "easing": "easeInOutSine" - }, - "1.9": { - "vector": [-6.35997, -28.9577, -29.98792] - }, - "2.2": { - "vector": [-6.35997, -28.9577, -29.98792] - }, - "2.4": { - "vector": [-6.35997, -28.9577, -29.98792] - }, - "2.7": { - "vector": [-6.35997, -28.9577, -29.98792] - }, - "2.9": { - "vector": [-6.77006, -25.92966, -31.79066], - "easing": "easeInOutSine" - }, - "3.4": { - "vector": [-30.83715, -25.49817, -32.05203] - }, - "3.8": { - "vector": [0, 0, 0] - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.4": { - "vector": [0.69, -0.46, 4.34] - }, - "0.5": { - "vector": [-0.34, -4.97, 3.93] - }, - "0.7": { - "vector": [1.2, -0.8, -9.2] - }, - "0.9": { - "vector": [-0.5, -1, -5.7] - }, - "1.3": { - "vector": [-1.25, -2.8, -3.5] - }, - "1.7": { - "vector": [-1.6, 1.8, -9.9], - "easing": "easeInOutSine" - }, - "1.9": { - "vector": [-1.3, 1.1, -8.7] - }, - "2.2": { - "vector": [-1.7, 1.7, -3.8] - }, - "2.3": { - "vector": [-1.7, 1.7, -4.8] - }, - "2.4": { - "vector": [-1.7, 1.7, -3.8] - }, - "2.7": { - "vector": [-1.3, 1.1, -8.7] - }, - "2.9": { - "vector": [-1.46562, 1.65859, -9.3], - "easing": "easeInOutSine" - }, - "3.4": { - "vector": [-1.25, -2.8, -3.5] - }, - "3.8": { - "vector": [0, 0, 0] - } - } - }, - "gun": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.5": { - "vector": [-61.84703, -7.30939, 16.06196], - "easing": "easeInOutSine" - }, - "0.8": { - "vector": [-62.35953, -9.18152, 19.63391], - "easing": "easeInOutSine" - }, - "0.9": { - "vector": [-62.08184, -9.16606, 19.55314] - }, - "1.2": { - "vector": [-62.35953, -9.18152, 19.63391], - "easing": "easeInOutSine" + "vector": [-49, -17.5, 2.5] }, "1.5": { - "vector": [-64.90446, -8.55975, 18.92344] + "vector": [-55, -17.5, -1.5], + "easing": "easeInElastic" }, "1.7": { - "vector": [-71.30911, -9.92119, 21.7825] + "vector": [-46.79563, -18.49864, 2.59564], + "easing": "easeInElastic" }, "1.9": { - "vector": [-77.59601, -9.82198, 21.56467] + "vector": [-47.5963, -15.6527, 2.19631] }, "2.2": { - "vector": [-72.3504, -10.54478, 24.96893] - }, - "2.3": { - "vector": [-74.3504, -10.54478, 24.96893] - }, - "2.9": { - "vector": [-72.3504, -10.54478, 24.96893], - "easing": "easeOutSine" - }, - "3.6": { - "vector": [-68.05897, -8.46186, 20.03679] - }, - "3.8": { - "vector": [-37.14411, -8.96358, 5.53792] - }, - "4.1": { - "vector": [0, 0, 0], - "easing": "easeInQuad" - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.3": { - "vector": [0, -0.7, -0.6], - "easing": "easeOutSine" - }, - "0.5": { - "vector": [0, 0.4, -1], - "easing": "easeOutSine" - }, - "0.8": { - "vector": [0, 0.3, -1] - }, - "0.9": { - "vector": [0, -0.3, -1] - }, - "1.2": { - "vector": [0, 0.3, -1] - }, - "1.5": { - "vector": [0, 0.6, -0.98] - }, - "1.7": { - "vector": [0.2, 1, -0.97] - }, - "1.9": { - "vector": [0.2, 1.18, -0.95] - }, - "2.2": { - "vector": [-0.1, 0.17, -0.94], - "easing": "easeInOutSine" - }, - "2.3": { - "vector": [0.1, 0.77, -1.13], - "easing": "easeOutSine" + "vector": [-39.31777, -13.80393, -3.31195] }, "2.4": { - "vector": [-0.1, 0.17, -0.94], - "easing": "easeInSine" + "vector": [-46.55787, -15.73522, -6.41164] + }, + "2.5": { + "vector": [-50.84262, -25.6741, 5.62316], + "easing": "easeInOutSine" + }, + "2.6": { + "vector": [-46.55787, -15.73522, -6.41164], + "easing": "easeInElastic" + }, + "2.7": { + "vector": [-46.77711, -6.11321, 2.36949] }, "2.9": { - "vector": [-0.1, 0.57, -0.93], - "easing": "easeOutSine" + "vector": [3.48268, 0.40464, 8.20687], + "easing": "easeInOutSine" + }, + "3.1": { + "vector": [0, 0, -2] }, "3.2": { - "vector": [-0.18, -0.19, -0.7] - }, - "3.3": { - "vector": [-0.07, 0.09, -0.64] - }, - "3.6": { - "vector": [-0.07, 0.19, -0.6] - }, - "3.8": { - "vector": [-0.04, -1.19, -0.33] - }, - "3.9": { - "vector": [-0.02, -0.66, -0.88] - }, - "4.1": { - "vector": [0, 0, 0], - "easing": "easeInQuad" - } - } - }, - "stick": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "1.5": { "vector": [0, 0, 0] } }, @@ -463,188 +227,60 @@ "0.0": { "vector": [0, 0, 0] }, - "1.5": { - "vector": [0, 0, 0] - } - } - }, - "ammo1": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.7": { - "vector": [0, -23, 0] - }, - "0.8": { - "vector": [0, 0, 0] - }, - "0.9": { - "vector": [0, 0, 0] - }, - "2.0": { - "vector": [0, 0, 0] - }, - "2.2": { - "vector": [0, 0, 0] - }, - "2.5": { - "vector": [0, 0, 0] - } - }, - "position": { - "0.0": { - "vector": [0, -14, 16] - }, - "0.4": { - "vector": [6.6, -18.29, -1.08] - }, - "0.5": { - "vector": [4.13, -11.99, -4.97] + "0.1": { + "vector": [0.35, -1, -0.25] }, "0.6": { - "vector": [2.51, -5.79, -8.72] - }, - "0.7": { - "vector": [1.6, 0.05, -12.07] + "vector": [-0.04719, -2.0416, 3.30071], + "easing": "easeInElastic" }, "0.8": { - "vector": [0, 0, -9.2] + "vector": [-0.18, -2.17, 3.7] }, "0.9": { - "vector": [0, 0, -7.7] + "vector": [-0.43668, -2.41467, 4.4841] + }, + "1.0": { + "vector": [0.01946, -2.26502, 3.0541] + }, + "1.6": { + "vector": [-0.00665, -3.22215, 1.1422], + "easing": "easeInElastic" + }, + "1.7": { + "vector": [0.03835, -4.25101, 1.20914], + "easing": "easeInElastic" + }, + "1.8": { + "vector": [-0.13412, -3.87895, 1.57767] + }, + "1.9": { + "vector": [-0.10291, -4.58271, 1.49637] }, "2.0": { - "vector": [0, 0, -7.7] + "vector": [-0.09593, -3.21767, 1.44239] }, - "2.2": { - "vector": [0, 0, 0] + "2.4": { + "vector": [0.01714, -2.71659, 1.05271] }, "2.5": { - "vector": [0, 0, 0] - } - }, - "scale": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.3": { - "vector": [0, 0, 0] - }, - "0.4": { - "vector": [1, 1, 1] - } - } - }, - "ammo2": { - "scale": { - "0.0": { - "vector": [0, 0, 0] - }, - "4.1": { - "vector": [0, 0, 0] - } - } - }, - "gunzi": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "1.3": { - "vector": [0, 0, 0] - }, - "1.7": { - "vector": [-9.33333, -4.57143, 0], + "vector": [-0.17058, -3.58588, 1.87463], "easing": "easeInOutSine" }, - "1.9": { - "vector": [4, -6.85714, 0], - "easing": "easeOutSine" + "2.6": { + "vector": [0.01714, -2.71659, 1.05271], + "easing": "easeInElastic" }, - "2.2": { - "vector": [0, -1, 0], - "easing": "easeInOutSine" - }, - "2.3": { - "vector": [0, -4, 0] - }, - "2.4": { - "vector": [0, -1, 0], - "easing": "easeInOutSine" - }, - "2.7": { - "vector": [4, -6.85714, 0], - "easing": "easeOutSine" + "2.8": { + "vector": [0.15711, -0.73973, -0.60297] }, "2.9": { - "vector": [-9.33333, -4.57143, 0], - "easing": "easeInOutSine" + "vector": [0, 0, -1.65] }, - "3.4": { - "vector": [0, 0, 0], - "easing": "easeOutSine" - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] + "3.0": { + "vector": [0, 0, 0.93] }, - "1.3": { - "vector": [0, 0, 0] - }, - "1.7": { - "vector": [0.82, 0.89, -9.42], - "easing": "easeInOutSine" - }, - "1.9": { - "vector": [1.23, 1.34, -8.43], - "easing": "easeOutSine" - }, - "2.2": { - "vector": [0.9, 1.6, -3.5], - "easing": "easeInOutSine" - }, - "2.3": { - "vector": [0.9, 1.6, -4.6], - "easing": "easeInOutSine" - }, - "2.4": { - "vector": [0.9, 1.6, -3.5], - "easing": "easeInOutSine" - }, - "2.7": { - "vector": [1.23, 1.34, -8.43], - "easing": "easeOutSine" - }, - "2.9": { - "vector": [0.82, 0.89, -9.42], - "easing": "easeInOutSine" - }, - "3.4": { - "vector": [0, 0, 0] - } - } - } - } - }, - "animation.ab.reload2": { - "animation_length": 4.9, - "bones": { - "0": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "2.0": { - "vector": [0, 0, 0] - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "2.0": { + "3.2": { "vector": [0, 0, 0] } } @@ -669,55 +305,35 @@ "0.9": { "vector": [-32.83715, -25.49817, -32.05203] }, - "1.1": { - "vector": [-26.00382, -25.49817, -32.05203] - }, - "1.2": { - "vector": [-31.58715, -25.49817, -32.05203] - }, - "1.3": { + "1.0": { "vector": [-21.83715, -25.49817, -32.05203] }, - "1.5": { + "1.1": { "vector": [-30.83715, -25.49817, -32.05203] }, + "1.3": { + "vector": [-9.68, -52.68, -57.11] + }, + "1.5": { + "vector": [-6.35997, -28.9577, -29.98792] + }, + "1.7": { + "vector": [-11.35997, -28.9577, -29.98792] + }, "1.9": { - "vector": [-6.83715, -25.49817, -32.05203], - "easing": "easeInOutSine" + "vector": [-11.35997, -28.9577, -29.98792] }, "2.1": { "vector": [-6.35997, -28.9577, -29.98792] }, - "2.4": { - "vector": [-6.35997, -28.9577, -29.98792] - }, - "2.6": { - "vector": [-6.35997, -28.9577, -29.98792] - }, - "2.9": { - "vector": [-6.35997, -28.9577, -29.98792] - }, - "3.1": { + "2.3": { "vector": [-6.77006, -25.92966, -31.79066], "easing": "easeInOutSine" }, - "3.4": { - "vector": [-6.35997, -28.9577, -29.98792] - }, - "3.6": { - "vector": [-6.35997, -28.9577, -29.98792] - }, - "3.9": { - "vector": [-6.35997, -28.9577, -29.98792] - }, - "4.0": { - "vector": [-6.77006, -25.92966, -31.79066], - "easing": "easeInOutSine" - }, - "4.3": { + "2.5": { "vector": [-30.83715, -25.49817, -32.05203] }, - "4.6": { + "2.7": { "vector": [0, 0, 0] } }, @@ -738,254 +354,42 @@ "vector": [-0.5, -1, -5.7] }, "1.1": { - "vector": [-1.35, -0.4, -6.07156] - }, - "1.5": { "vector": [-1.25, -2.8, -3.5] }, - "1.9": { - "vector": [-1.6, 1.8, -9.9], + "1.3": { + "vector": [-1.27266, 0.20616, -5.50679] + }, + "1.4": { + "vector": [-1.61348, 0.83143, -7.7037], "easing": "easeInOutSine" }, + "1.5": { + "vector": [-1.3, 1.1, -6.7] + }, + "1.7": { + "vector": [-1.3, 1.1, -2.7] + }, + "1.8": { + "vector": [-1.3, 1.1, -3.7] + }, + "1.9": { + "vector": [-1.3, 1.1, -2.7] + }, "2.1": { - "vector": [-1.3, 1.1, -8.7] + "vector": [-1.3, 1.1, -6.7] }, - "2.4": { - "vector": [-1.7, 1.7, -3.8] + "2.3": { + "vector": [-1.46562, 1.65859, -6.8], + "easing": "easeInOutSine" }, "2.5": { - "vector": [-1.7, 1.7, -4.8] - }, - "2.6": { - "vector": [-1.7, 1.7, -3.8] - }, - "2.9": { - "vector": [-1.8, 1.4, -9.4] - }, - "3.1": { - "vector": [-0.96562, 1.54531, -8.7], - "easing": "easeInOutSine" - }, - "3.4": { - "vector": [-1.7, 1.7, -3.8] - }, - "3.5": { - "vector": [-1.7, 1.7, -4.8] - }, - "3.6": { - "vector": [-1.7, 1.7, -3.8] - }, - "3.9": { - "vector": [-1.3, 1.1, -8.7] - }, - "4.0": { - "vector": [-1.46562, 1.65859, -9.3], - "easing": "easeInOutSine" - }, - "4.3": { "vector": [-1.25, -2.8, -3.5] }, - "4.6": { + "2.7": { "vector": [0, 0, 0] } } }, - "gun": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.5": { - "vector": [-61.84703, -7.30939, 16.06196], - "easing": "easeInOutSine" - }, - "0.8": { - "vector": [-62.35953, -9.18152, 19.63391], - "easing": "easeInOutSine" - }, - "0.9": { - "vector": [-62.08184, -9.16606, 19.55314] - }, - "1.1": { - "vector": [-62.35953, -9.18152, 19.63391], - "easing": "easeInOutSine" - }, - "1.2": { - "vector": [-62.08184, -9.16606, 19.55314] - }, - "1.4": { - "vector": [-62.35953, -9.18152, 19.63391], - "easing": "easeInOutSine" - }, - "1.7": { - "vector": [-64.90446, -8.55975, 18.92344] - }, - "1.9": { - "vector": [-71.30911, -9.92119, 21.7825] - }, - "2.1": { - "vector": [-77.59601, -9.82198, 21.56467] - }, - "2.4": { - "vector": [-72.3504, -10.54478, 24.96893] - }, - "2.5": { - "vector": [-74.3504, -10.54478, 24.96893] - }, - "3.0": { - "vector": [-77.80184, -11.1932, 27.95155] - }, - "3.4": { - "vector": [-72.71592, -11.14515, 26.91139] - }, - "3.5": { - "vector": [-74.3504, -10.54478, 24.96893] - }, - "3.7": { - "vector": [-72.3504, -10.54478, 24.96893], - "easing": "easeOutSine" - }, - "4.4": { - "vector": [-68.05897, -8.46186, 20.03679] - }, - "4.6": { - "vector": [-37.14411, -8.96358, 5.53792] - }, - "4.9": { - "vector": [0, 0, 0], - "easing": "easeInQuad" - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.3": { - "vector": [0, -0.7, -0.6], - "easing": "easeOutSine" - }, - "0.5": { - "vector": [0, 0.4, -1], - "easing": "easeOutSine" - }, - "0.8": { - "vector": [0, 0.3, -1] - }, - "0.9": { - "vector": [0, -0.3, -1] - }, - "1.1": { - "vector": [0, 0.3, -1] - }, - "1.2": { - "vector": [0, -0.3, -1] - }, - "1.4": { - "vector": [0, 0.3, -1] - }, - "1.7": { - "vector": [0, 0.6, -0.98] - }, - "1.9": { - "vector": [0.2, 1, -0.97] - }, - "2.1": { - "vector": [0.2, 1.18, -0.95] - }, - "2.4": { - "vector": [-0.1, 0.17, -0.94], - "easing": "easeInOutSine" - }, - "2.5": { - "vector": [0.1, 0.77, -1.13], - "easing": "easeOutSine" - }, - "2.6": { - "vector": [-0.1, 0.17, -0.94], - "easing": "easeInSine" - }, - "3.0": { - "vector": [0.1, 0.37, -0.94] - }, - "3.4": { - "vector": [0.1, 0.17, -0.94], - "easing": "easeInOutSine" - }, - "3.5": { - "vector": [0.3, 0.77, -1.13], - "easing": "easeOutSine" - }, - "3.6": { - "vector": [0.1, 0.17, -0.94], - "easing": "easeInSine" - }, - "3.7": { - "vector": [0.1, 0.57, -0.93], - "easing": "easeOutSine" - }, - "4.0": { - "vector": [-0.08, -0.19, -0.7] - }, - "4.1": { - "vector": [0.03, 0.09, -0.64] - }, - "4.4": { - "vector": [-0.07, 0.19, -0.6] - }, - "4.6": { - "vector": [-0.04, -1.19, -0.33] - }, - "4.7": { - "vector": [-0.02, -0.66, -0.88] - }, - "4.9": { - "vector": [0, 0, 0], - "easing": "easeInQuad" - } - } - }, - "stick": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "1.5": { - "vector": [0, 0, 0] - }, - "2.9": { - "vector": [0, 0, 0] - }, - "4.1": { - "vector": [0, 7, 0], - "easing": "easeInSine" - }, - "4.2": { - "vector": [0, 0, 0], - "easing": "easeOutSine" - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "1.5": { - "vector": [0, 0, 0] - }, - "2.9": { - "vector": [0, 0, 0] - }, - "3.1": { - "vector": [-1.5, 0, 0] - }, - "4.0": { - "vector": [-1.5, 0, 0] - }, - "4.2": { - "vector": [0, 0, 0], - "easing": "easeOutSine" - } - } - }, "ammo1": { "rotation": { "0.0": { @@ -1000,18 +404,14 @@ "0.9": { "vector": [0, 0, 0] }, + "1.5": { + "vector": [0, 0, 0] + }, + "1.7": { + "vector": [0, 0, 0] + }, "2.0": { "vector": [0, 0, 0] - }, - "2.4": { - "vector": [0, 0, 0], - "easing": "easeInOutSine" - }, - "2.7": { - "vector": [0, 0, 0] - }, - "4.9": { - "vector": [0, 0, 0] } }, "position": { @@ -1036,17 +436,13 @@ "0.9": { "vector": [0, 0, -7.7] }, - "2.0": { + "1.5": { "vector": [0, 0, -7.7] }, - "2.4": { - "vector": [0, 0, 0], - "easing": "easeInOutSine" - }, - "2.7": { + "1.7": { "vector": [0, 0, 0] }, - "4.9": { + "2.0": { "vector": [0, 0, 0] } }, @@ -1059,6 +455,581 @@ }, "0.4": { "vector": [1, 1, 1] + }, + "0.9": { + "vector": [1, 1, 1] + }, + "0.91": { + "vector": [0, 0, 0] + } + } + }, + "ammo2": { + "scale": { + "vector": [0, 0, 0] + } + }, + "gunzi": { + "rotation": { + "0.0": { + "vector": [0, 0, 0] + }, + "1.1": { + "vector": [0, 0, 0] + }, + "1.4": { + "vector": [-9.33333, -4.57143, 0], + "easing": "easeInOutSine" + }, + "1.5": { + "vector": [4, -6.85714, 0], + "easing": "easeOutSine" + }, + "1.7": { + "vector": [0, -1, 0], + "easing": "easeInOutSine" + }, + "1.8": { + "vector": [0, -4, 0] + }, + "1.9": { + "vector": [0, -1, 0], + "easing": "easeInOutSine" + }, + "2.1": { + "vector": [4, -6.85714, 0], + "easing": "easeOutSine" + }, + "2.3": { + "vector": [-9.33333, -4.57143, 0], + "easing": "easeInOutSine" + }, + "2.5": { + "vector": [0, 0, 0], + "easing": "easeOutSine" + } + }, + "position": { + "0.0": { + "vector": [0, 0, 0] + }, + "1.1": { + "vector": [0, 0, 0] + }, + "1.4": { + "vector": [1.12071, 1.26075, -8.5413], + "easing": "easeInOutSine" + }, + "1.5": { + "vector": [1.23, 1.34, -8.43], + "easing": "easeOutSine" + }, + "1.7": { + "vector": [0.9, 1.6, -3.5], + "easing": "easeInOutSine" + }, + "1.8": { + "vector": [0.9, 1.6, -4.6], + "easing": "easeInOutSine" + }, + "1.9": { + "vector": [0.9, 1.6, -3.5], + "easing": "easeInOutSine" + }, + "2.1": { + "vector": [1.23, 1.34, -8.43], + "easing": "easeOutSine" + }, + "2.3": { + "vector": [0.82, 0.89, -8.42], + "easing": "easeInOutSine" + }, + "2.5": { + "vector": [0, 0, 0] + } + } + }, + "camera": { + "rotation": { + "0.2": { + "vector": [0, 0, 0] + }, + "0.7": { + "vector": [0, 1, -2], + "easing": "easeInElastic" + }, + "0.8": { + "vector": [0, -0.5, -1] + }, + "0.9": { + "vector": [0, 1, -2] + }, + "1.0": { + "vector": [0, -1, 1] + }, + "1.2": { + "vector": [0, 0, -0.5] + }, + "1.6": { + "vector": [0, 1, -2], + "easing": "easeInElastic" + }, + "1.7": { + "vector": [0, -0.5, -1] + }, + "1.8": { + "vector": [0, 1, -2] + }, + "1.9": { + "vector": [0, -1.5, 1.5] + }, + "2.1": { + "vector": [0, 0, -0.5] + }, + "2.2": { + "vector": [0, 1, -2], + "easing": "easeInElastic" + }, + "2.3": { + "vector": [0, 1, -2] + }, + "2.5": { + "vector": [0, -1, 1] + }, + "2.7": { + "vector": [0, 0, -0.5] + } + } + } + }, + "sound_effects": { + "0.0": { + "effect": "ntw_20_reload_normal" + } + } + }, + "animation.ab.reload_empty": { + "loop": "hold_on_last_frame", + "animation_length": 4.2, + "bones": { + "0": { + "rotation": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.1": { + "vector": [3.63, -4.37, 0.63] + }, + "0.5": { + "vector": [-40, -17.5, 2.5], + "easing": "easeInElastic" + }, + "0.7": { + "vector": [-40, -17.5, 2.5] + }, + "0.8": { + "vector": [-40, -17.5, 2.5] + }, + "0.9": { + "vector": [-48, -17.5, 2.5] + }, + "1.0": { + "vector": [-40, -17.5, 2.5] + }, + "1.1": { + "vector": [-48, -17.5, 2.5] + }, + "1.4": { + "vector": [-49, -17.5, 2.5] + }, + "1.8": { + "vector": [-55, -17.5, -1.5], + "easing": "easeInElastic" + }, + "2.0": { + "vector": [-46.79563, -18.49864, 2.59564], + "easing": "easeInElastic" + }, + "2.2": { + "vector": [-47.5963, -15.6527, 2.19631] + }, + "2.3": { + "vector": [-55, -17.5, -1.5], + "easing": "easeInElastic" + }, + "2.5": { + "vector": [-46.79563, -18.49864, 2.59564], + "easing": "easeInElastic" + }, + "2.7": { + "vector": [-47.5963, -15.6527, 2.19631] + }, + "3.0": { + "vector": [-39.31777, -13.80393, -3.31195] + }, + "3.2": { + "vector": [-46.55787, -15.73522, -6.41164] + }, + "3.3": { + "vector": [-50.84262, -25.6741, 5.62316], + "easing": "easeInOutSine" + }, + "3.4": { + "vector": [-46.55787, -15.73522, -6.41164], + "easing": "easeInElastic" + }, + "3.5": { + "vector": [-46.77711, -6.11321, 2.36949] + }, + "3.7": { + "vector": [3.48268, 0.40464, 8.20687], + "easing": "easeInOutSine" + }, + "3.9": { + "vector": [0, 0, -2] + }, + "4.0": { + "vector": [0, 0, 0] + } + }, + "position": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.1": { + "vector": [0.35, -1, -0.25] + }, + "0.6": { + "vector": [-0.04719, -2.0416, 3.30071], + "easing": "easeInElastic" + }, + "0.8": { + "vector": [-0.18, -2.17, 3.7] + }, + "0.9": { + "vector": [-0.43668, -2.41467, 4.4841] + }, + "1.0": { + "vector": [-0.18, -2.17, 3.7] + }, + "1.1": { + "vector": [-0.43668, -2.41467, 4.4841] + }, + "1.3": { + "vector": [0.01946, -2.26502, 3.0541] + }, + "1.9": { + "vector": [-0.00665, -3.22215, 1.1422], + "easing": "easeInElastic" + }, + "2.0": { + "vector": [0.03835, -4.25101, 1.20914], + "easing": "easeInElastic" + }, + "2.1": { + "vector": [-0.13412, -3.87895, 1.57767] + }, + "2.2": { + "vector": [-0.10291, -4.58271, 1.49637] + }, + "2.4": { + "vector": [-0.00665, -3.22215, 1.1422], + "easing": "easeInElastic" + }, + "2.5": { + "vector": [0.03835, -4.25101, 1.20914], + "easing": "easeInElastic" + }, + "2.6": { + "vector": [-0.13412, -3.87895, 1.57767] + }, + "2.7": { + "vector": [-0.10291, -4.58271, 1.49637] + }, + "2.8": { + "vector": [-0.09593, -3.21767, 1.44239] + }, + "3.2": { + "vector": [0.01714, -2.71659, 1.05271] + }, + "3.3": { + "vector": [-0.17058, -3.58588, 1.87463], + "easing": "easeInOutSine" + }, + "3.4": { + "vector": [0.01714, -2.71659, 1.05271], + "easing": "easeInElastic" + }, + "3.6": { + "vector": [0.15711, -0.73973, -0.60297] + }, + "3.7": { + "vector": [0, 0, -1.65] + }, + "3.8": { + "vector": [0, 0, 0.93] + }, + "4.0": { + "vector": [0, 0, 0] + } + } + }, + "Lefthand": { + "rotation": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.2": { + "vector": [46.55566, -11.28983, -10.57657] + }, + "0.5": { + "vector": [28.88915, -28.22457, -26.44144] + }, + "0.7": { + "vector": [-28.15519, -39.5144, -37.01801] + }, + "0.8": { + "vector": [-36.02531, -30.17168, -37.82607] + }, + "0.9": { + "vector": [-32.83715, -25.49817, -32.05203] + }, + "1.0": { + "vector": [-36.02531, -30.17168, -37.82607] + }, + "1.1": { + "vector": [-36.02531, -30.17168, -37.82607] + }, + "1.3": { + "vector": [-21.83715, -25.49817, -32.05203] + }, + "1.4": { + "vector": [-30.83715, -25.49817, -32.05203] + }, + "1.6": { + "vector": [-9.68, -52.68, -57.11] + }, + "1.8": { + "vector": [-6.35997, -28.9577, -29.98792] + }, + "2.0": { + "vector": [-11.35997, -28.9577, -29.98792] + }, + "2.2": { + "vector": [-11.35997, -28.9577, -29.98792] + }, + "2.3": { + "vector": [-6.35997, -28.9577, -29.98792] + }, + "2.5": { + "vector": [-11.35997, -28.9577, -29.98792] + }, + "2.7": { + "vector": [-11.35997, -28.9577, -29.98792] + }, + "2.9": { + "vector": [-6.35997, -28.9577, -29.98792] + }, + "3.1": { + "vector": [-6.77006, -25.92966, -31.79066], + "easing": "easeInOutSine" + }, + "3.3": { + "vector": [-30.83715, -25.49817, -32.05203] + }, + "3.5": { + "vector": [0, 0, 0] + } + }, + "position": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.4": { + "vector": [0.69, -0.46, 4.34] + }, + "0.5": { + "vector": [-0.34, -4.97, 3.93] + }, + "0.7": { + "vector": [1.2, -0.8, -9.2] + }, + "0.9": { + "vector": [-0.5, -1, -5.7] + }, + "1.0": { + "vector": [-1.4, -1, -7.2] + }, + "1.1": { + "vector": [-1.4, -1, -6.2] + }, + "1.3": { + "vector": [-1.25, -2.8, -3.5] + }, + "1.6": { + "vector": [-1.27266, 0.20616, -5.50679] + }, + "1.7": { + "vector": [-1.61348, 0.83143, -7.7037], + "easing": "easeInOutSine" + }, + "1.8": { + "vector": [-1.3, 1.1, -6.7] + }, + "2.0": { + "vector": [-1.3, 1.1, -2.7] + }, + "2.1": { + "vector": [-1.3, 1.1, -3.7] + }, + "2.2": { + "vector": [-1.3, 1.1, -2.7] + }, + "2.3": { + "vector": [-1.8, 1.1, -6.7] + }, + "2.5": { + "vector": [-2.8, 1.1, -2.7] + }, + "2.6": { + "vector": [-2.8, 1.1, -3.7] + }, + "2.7": { + "vector": [-2.8, 1.1, -2.7] + }, + "2.9": { + "vector": [-2.8, 1.1, -6.7] + }, + "3.1": { + "vector": [-2.21562, 1.65859, -6.8], + "easing": "easeInOutSine" + }, + "3.3": { + "vector": [-1.25, -2.8, -3.5] + }, + "3.5": { + "vector": [0, 0, 0] + } + } + }, + "ammo1": { + "rotation": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.7": { + "vector": [0, -23, 0] + }, + "0.8": { + "vector": [0, 0, 0] + }, + "0.9": { + "vector": [0, 0, 0] + }, + "1.8": { + "vector": [0, 0, 0] + }, + "2.0": { + "vector": [0, 0, 0] + } + }, + "position": { + "0.0": { + "vector": [0, -14, 16] + }, + "0.4": { + "vector": [6.6, -18.29, -1.08] + }, + "0.5": { + "vector": [4.13, -11.99, -4.97] + }, + "0.6": { + "vector": [2.51, -5.79, -8.72] + }, + "0.7": { + "vector": [1.6, 0.05, -12.07] + }, + "0.8": { + "vector": [0, 0, -9.2] + }, + "0.9": { + "vector": [0, 0, -7.7] + }, + "1.8": { + "vector": [0, 0, -7.7] + }, + "2.0": { + "vector": [0, 0, 0] + } + }, + "scale": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.3": { + "vector": [0, 0, 0] + }, + "0.4": { + "vector": [1, 1, 1] + }, + "2.8": { + "vector": [1, 1, 1] + }, + "2.81": { + "vector": [0, 0, 0] + } + } + }, + "ammo2": { + "rotation": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.8": { + "vector": [0, -33, 0] + }, + "1.0": { + "vector": [0, 0, 0] + }, + "1.1": { + "vector": [0, 0, 0] + } + }, + "position": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.8": { + "vector": [0.6, 0, -0.5] + }, + "1.0": { + "vector": [0, 0, -1.2] + }, + "1.1": { + "vector": [0, 0, 0] + }, + "1.8": { + "vector": [0, 0, 0] + }, + "2.0": { + "vector": [0, 0, -7.7] + }, + "2.3": { + "vector": [0, 0, -7.7] + }, + "2.5": { + "vector": [0, 0, 0] + } + }, + "scale": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.4": { + "vector": [0, 0, 0] + }, + "0.5": { + "vector": [1, 1, 1] } } }, @@ -1067,56 +1038,58 @@ "0.0": { "vector": [0, 0, 0] }, - "1.5": { + "1.4": { "vector": [0, 0, 0] }, - "1.9": { + "1.7": { "vector": [-9.33333, -4.57143, 0], "easing": "easeInOutSine" }, - "2.1": { + "1.8": { "vector": [4, -6.85714, 0], "easing": "easeOutSine" }, - "2.4": { + "2.0": { "vector": [0, -1, 0], "easing": "easeInOutSine" }, - "2.5": { + "2.1": { "vector": [0, -4, 0] }, + "2.2": { + "vector": [0, -1, 0], + "easing": "easeInOutSine" + }, + "2.3": { + "vector": [4.05789, -11.8448, -0.35592], + "easing": "easeInBack" + }, + "2.36": { + "vector": [4.06194, -18.48892, -0.84956] + }, + "2.42": { + "vector": [3.22441, -8.25171, -0.28469] + }, + "2.5": { + "vector": [0, -1, 0], + "easing": "easeInOutExpo" + }, "2.6": { + "vector": [0, -4, 0] + }, + "2.7": { "vector": [0, -1, 0], "easing": "easeInOutSine" }, "2.9": { - "vector": [-9.33333, -4.57143, 0], - "easing": "easeInOutSine" + "vector": [4, -6.85714, 0], + "easing": "easeOutSine" }, "3.1": { - "vector": [4, -6.85714, 0], - "easing": "easeOutSine" - }, - "3.4": { - "vector": [0, -1, 0], - "easing": "easeInOutSine" - }, - "3.5": { - "vector": [0, -4, 0] - }, - "3.6": { - "vector": [0, -1, 0], - "easing": "easeInOutSine" - }, - "3.9": { - "vector": [4, -6.85714, 0], - "easing": "easeOutSine" - }, - "4.0": { "vector": [-9.33333, -4.57143, 0], "easing": "easeInOutSine" }, - "4.3": { + "3.3": { "vector": [0, 0, 0], "easing": "easeOutSine" } @@ -1125,145 +1098,140 @@ "0.0": { "vector": [0, 0, 0] }, - "1.5": { + "1.4": { "vector": [0, 0, 0] }, - "1.9": { - "vector": [0.82, 0.89, -9.42], + "1.7": { + "vector": [1.12071, 1.26075, -8.5413], + "easing": "easeInOutSine" + }, + "1.8": { + "vector": [1.23, 1.34, -8.43], + "easing": "easeOutSine" + }, + "2.0": { + "vector": [0.9, 1.6, -3.5], "easing": "easeInOutSine" }, "2.1": { - "vector": [1.23, 1.34, -8.43], - "easing": "easeOutSine" + "vector": [0.9, 1.6, -4.6], + "easing": "easeInOutSine" }, - "2.4": { + "2.2": { "vector": [0.9, 1.6, -3.5], "easing": "easeInOutSine" }, + "2.3": { + "vector": [0.73, 1.34, -8.43], + "easing": "easeOutSine" + }, + "2.39": { + "vector": [-0.08, 1.45, -6.35] + }, + "2.45": { + "vector": [-0.78, 1.54, -4.72] + }, "2.5": { - "vector": [0.9, 1.6, -4.6], + "vector": [-0.6, 1.6, -3.5], "easing": "easeInOutSine" }, "2.6": { - "vector": [0.9, 1.6, -3.5], + "vector": [-0.6, 1.6, -4.6], + "easing": "easeInOutSine" + }, + "2.7": { + "vector": [-0.6, 1.6, -3.5], "easing": "easeInOutSine" }, "2.9": { - "vector": [0.82, 0.89, -9.42], - "easing": "easeInOutSine" + "vector": [-0.27, 1.34, -8.43], + "easing": "easeOutSine" }, "3.1": { - "vector": [1.23, 1.34, -8.43], - "easing": "easeOutSine" - }, - "3.4": { - "vector": [0.9, 1.6, -3.5], + "vector": [0.07, 0.89, -8.42], "easing": "easeInOutSine" }, - "3.5": { - "vector": [0.9, 1.6, -4.6], - "easing": "easeInOutSine" - }, - "3.6": { - "vector": [0.9, 1.6, -3.5], - "easing": "easeInOutSine" - }, - "3.9": { - "vector": [1.23, 1.34, -8.43], - "easing": "easeOutSine" - }, - "4.0": { - "vector": [0.82, 0.89, -9.42], - "easing": "easeInOutSine" - }, - "4.3": { - "vector": [0, 0, 0], - "easing": "easeOutSine" + "3.3": { + "vector": [0, 0, 0] } } }, - "ammo2": { + "camera": { "rotation": { - "0.0": { + "0.2": { "vector": [0, 0, 0] }, - "0.4": { - "vector": [0, -30, 0] + "0.7": { + "vector": [0, 1, -2], + "easing": "easeInElastic" + }, + "0.8": { + "vector": [0, -0.5, -1] }, "0.9": { - "vector": [0, -70, 0] - }, - "1.1": { - "vector": [0, -15, 0] - }, - "1.2": { - "vector": [0, 0, 0] - }, - "2.0": { - "vector": [0, 0, 0] - }, - "2.4": { - "vector": [0, 0, 0], - "easing": "easeInOutSine" - }, - "3.1": { - "vector": [0, 0, 0] - }, - "3.4": { - "vector": [0, 0, 0] - }, - "4.9": { - "vector": [0, 0, 0] - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.4": { - "vector": [1, -0.3, -0.4] - }, - "0.9": { - "vector": [0.7, -0.3, -1.2] + "vector": [0, 1, -2] }, "1.0": { - "vector": [0.7, 0.1, -1.6] + "vector": [0, -1, 1] }, "1.1": { - "vector": [0.4, 0, -1.7] + "vector": [0, 1, -2] }, "1.2": { - "vector": [0, 0, 0] + "vector": [0, -1, 1] + }, + "1.4": { + "vector": [0, 0, -0.5] + }, + "1.8": { + "vector": [0, 1, -2], + "easing": "easeInElastic" + }, + "1.9": { + "vector": [0, -0.5, -1] }, "2.0": { - "vector": [0, 0, 0] + "vector": [0, 1, -2] + }, + "2.1": { + "vector": [0, -1.5, 1.5] + }, + "2.2": { + "vector": [0, 1, -2], + "easing": "easeInElastic" + }, + "2.3": { + "vector": [0, -0.5, -1] }, "2.4": { - "vector": [0, 0, -7.7], - "easing": "easeInOutSine" + "vector": [0, 1, -2] + }, + "2.5": { + "vector": [0, -1.5, 1.5] + }, + "2.7": { + "vector": [0, 0, -0.5] + }, + "3.0": { + "vector": [0, 1, -2], + "easing": "easeInElastic" }, "3.1": { - "vector": [0, 0, -7.7] + "vector": [0, 1, -2] }, - "3.4": { - "vector": [0, 0, 0] + "3.3": { + "vector": [0, -1, 1] }, - "4.9": { - "vector": [0, 0, 0] - } - }, - "scale": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.3": { - "vector": [0, 0, 0] - }, - "0.4": { - "vector": [1, 1, 1] + "3.5": { + "vector": [0, 0, -0.5] } } } + }, + "sound_effects": { + "0.0": { + "effect": "ntw_20_reload_normal" + } } } }, diff --git a/src/main/resources/assets/target/animations/ntw_20.animation.json b/src/main/resources/assets/target/animations/ntw_20.animation.json index a8c5d38a8..419064f59 100644 --- a/src/main/resources/assets/target/animations/ntw_20.animation.json +++ b/src/main/resources/assets/target/animations/ntw_20.animation.json @@ -115,7 +115,33 @@ }, "animation.ntw_20.fire": { "loop": "hold_on_last_frame", - "animation_length": 0.7917 + "animation_length": 0.7917, + "bones": { + "action": { + "position": { + "0.0": { + "vector": [0, 0, 4] + }, + "0.3333": { + "vector": [0, 0, 0], + "easing": "easeInBounce", + "easingArgs": [0.1] + } + } + }, + "Lefthand": { + "position": { + "0.0": { + "vector": [0, 0, -4] + }, + "0.3333": { + "vector": [0, 0, 0], + "easing": "easeInBounce", + "easingArgs": [0.1] + } + } + } + } }, "animation.ntw_20.shift": { "loop": "hold_on_last_frame", @@ -152,10 +178,10 @@ "vector": [1.94405, -2.87655, -4.12958], "easing": "easeInOutSine" }, - "1.05": { + "1.0": { "vector": [0.77862, 1.99422, -0.58503] }, - "1.35": { + "1.2": { "vector": [0, 0, 0], "easing": "easeOutBack" } @@ -188,15 +214,49 @@ "vector": [0.19, -1.8, -1], "easing": "easeInOutSine" }, - "1.15": { + "1.1": { "vector": [-0.02, 0.09, 0.5] }, - "1.35": { + "1.2": { "vector": [0, 0, 0], "easing": "easeOutBack" } } }, + "camera": { + "rotation": { + "0.05": { + "vector": [0, 0, 0] + }, + "0.2": { + "vector": [1, 1, -1.5] + }, + "0.35": { + "vector": [-0.5, -1, -0.5] + }, + "0.6": { + "vector": [0.2, 1, 3], + "easing": "easeInElastic" + }, + "0.7": { + "vector": [0.2, 1, 3], + "easing": "easeInElastic" + }, + "0.9": { + "vector": [-0.1, -0.2, -2], + "easing": "easeInElastic" + }, + "1.0": { + "vector": [0, 0, 1.5] + }, + "1.1": { + "vector": [0, 0, -0.75] + }, + "1.2": { + "vector": [0, 0, 0] + } + } + }, "Righthand": { "rotation": { "0.0": { @@ -304,40 +364,6 @@ "easing": "easeInElastic" } } - }, - "camera": { - "rotation": { - "0.05": { - "vector": [0, 0, 0] - }, - "0.2": { - "vector": [1, 1, -1.5] - }, - "0.35": { - "vector": [-0.5, -1, -0.5] - }, - "0.6": { - "vector": [0.2, 1, 3], - "easing": "easeInElastic" - }, - "0.7": { - "vector": [0.2, 1, 3], - "easing": "easeInElastic" - }, - "0.9": { - "vector": [-0.1, -0.2, -2], - "easing": "easeInElastic" - }, - "1.0": { - "vector": [0, 0, 1.5] - }, - "1.1": { - "vector": [0, 0, -0.75] - }, - "1.2": { - "vector": [0, 0, 0] - } - } } }, "sound_effects": { @@ -426,6 +452,40 @@ } } }, + "camera": { + "rotation": { + "0.05": { + "vector": [0, 0, 0] + }, + "0.2": { + "vector": [1, 1, -1.5] + }, + "0.35": { + "vector": [-0.5, -1, -0.5] + }, + "0.6": { + "vector": [0.2, 1, 3], + "easing": "easeInElastic" + }, + "0.7": { + "vector": [0.2, 1, 3], + "easing": "easeInElastic" + }, + "0.9": { + "vector": [-0.1, -0.2, -2], + "easing": "easeInElastic" + }, + "1.0": { + "vector": [0, 0, 1.5] + }, + "1.1": { + "vector": [0, 0, -0.75] + }, + "1.2": { + "vector": [0, 0, 0] + } + } + }, "Righthand": { "rotation": { "0.0": { @@ -533,40 +593,6 @@ "easing": "easeInElastic" } } - }, - "camera": { - "rotation": { - "0.05": { - "vector": [0, 0, 0] - }, - "0.2": { - "vector": [1, 1, -1.5] - }, - "0.35": { - "vector": [-0.5, -1, -0.5] - }, - "0.6": { - "vector": [0.2, 1, 3], - "easing": "easeInElastic" - }, - "0.7": { - "vector": [0.2, 1, 3], - "easing": "easeInElastic" - }, - "0.9": { - "vector": [-0.1, -0.2, -2], - "easing": "easeInElastic" - }, - "1.0": { - "vector": [0, 0, 1.5] - }, - "1.1": { - "vector": [0, 0, -0.75] - }, - "1.2": { - "vector": [0, 0, 0] - } - } } }, "sound_effects": { @@ -755,6 +781,99 @@ } } }, + "camera": { + "rotation": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.1": { + "vector": [3, 1, -2] + }, + "0.25": { + "vector": [-1, -0.5, 1] + }, + "0.45": { + "vector": [1.69, 0, 0] + }, + "0.625": { + "vector": [3, 0, 1.5], + "easing": "easeInElastic" + }, + "0.675": { + "vector": [4, 1, -2], + "easing": "easeInSine" + }, + "0.8": { + "vector": [1, -0.5, 1.5] + }, + "0.925": { + "vector": [2.5, 0, 1.2], + "easing": "easeOutSine" + }, + "1.225": { + "vector": [3.5, 0, 2], + "easing": "easeInElastic" + }, + "1.6": { + "vector": [2.89, 0, 0.12] + }, + "1.875": { + "vector": [3.34, 0, 1.5] + }, + "2.325": { + "vector": [2.5, 0, 2.2], + "easing": "linear" + }, + "2.4": { + "vector": [4.5, -0.7, 1.2], + "easing": "easeInSine" + }, + "2.45": { + "vector": [2.6, 0.4, -1.5], + "easing": "easeOutSine" + }, + "2.55": { + "vector": [2, 0, 1.5], + "easing": "easeInElastic" + }, + "2.8": { + "vector": [0.03, 0.25, -1.18] + }, + "2.925": { + "vector": [0, 0, -2], + "easing": "easeInElastic" + }, + "3.025": { + "vector": [0.2, 0, 0] + }, + "3.15": { + "vector": [1, 2, 1.8] + }, + "3.2": { + "vector": [-1.5, -3, -1.5] + }, + "3.325": { + "vector": [0.2, 1.5, 3] + }, + "3.45": { + "vector": [2, 3, -2], + "easing": "easeInElastic" + }, + "3.525": { + "vector": [1, -1, 1.5] + }, + "3.625": { + "vector": [0, 0.5, -0.75] + }, + "3.725": { + "vector": [0, 0, 0.4], + "easing": "linear" + }, + "3.875": { + "vector": [0, 0, 0] + } + } + }, "Lefthand": { "rotation": { "0.1": { @@ -1028,99 +1147,6 @@ } } }, - "camera": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.1": { - "vector": [3, 1, -2] - }, - "0.25": { - "vector": [-1, -0.5, 1] - }, - "0.45": { - "vector": [1.69, 0, 0] - }, - "0.625": { - "vector": [3, 0, 1.5], - "easing": "easeInElastic" - }, - "0.675": { - "vector": [4, 1, -2], - "easing": "easeInSine" - }, - "0.8": { - "vector": [1, -0.5, 1.5] - }, - "0.925": { - "vector": [2.5, 0, 1.2], - "easing": "easeOutSine" - }, - "1.225": { - "vector": [3.5, 0, 2], - "easing": "easeInElastic" - }, - "1.6": { - "vector": [2.89, 0, 0.12] - }, - "1.875": { - "vector": [3.34, 0, 1.5] - }, - "2.325": { - "vector": [2.5, 0, 2.2], - "easing": "linear" - }, - "2.4": { - "vector": [4.5, -0.7, 1.2], - "easing": "easeInSine" - }, - "2.45": { - "vector": [2.6, 0.4, -1.5], - "easing": "easeOutSine" - }, - "2.55": { - "vector": [2, 0, 1.5], - "easing": "easeInElastic" - }, - "2.8": { - "vector": [0.03, 0.25, -1.18] - }, - "2.925": { - "vector": [0, 0, -2], - "easing": "easeInElastic" - }, - "3.025": { - "vector": [0.2, 0, 0] - }, - "3.15": { - "vector": [1, 2, 1.8] - }, - "3.2": { - "vector": [-1.5, -3, -1.5] - }, - "3.325": { - "vector": [0.2, 1.5, 3] - }, - "3.45": { - "vector": [2, 3, -2], - "easing": "easeInElastic" - }, - "3.525": { - "vector": [1, -1, 1.5] - }, - "3.625": { - "vector": [0, 0.5, -0.75] - }, - "3.725": { - "vector": [0, 0, 0.4], - "easing": "linear" - }, - "3.875": { - "vector": [0, 0, 0] - } - } - }, "bullet": { "position": { "0.2": { @@ -1271,6 +1297,76 @@ } } }, + "camera": { + "rotation": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.1": { + "vector": [3, 1, -2] + }, + "0.25": { + "vector": [-1, -0.5, 1] + }, + "0.45": { + "vector": [1.69, 0, 0] + }, + "0.625": { + "vector": [3, 0, 1.5], + "easing": "easeInElastic" + }, + "0.675": { + "vector": [4, 1, -2], + "easing": "easeInSine" + }, + "0.8": { + "vector": [1, -0.5, 1.5] + }, + "0.925": { + "vector": [2.5, 0, 1.2], + "easing": "easeOutSine" + }, + "1.225": { + "vector": [3.5, 0, 2], + "easing": "easeInElastic" + }, + "1.6": { + "vector": [2.89, 0, 0.12] + }, + "1.875": { + "vector": [3.34, 0, 1.5] + }, + "2.325": { + "vector": [2.5, 0, 2.2], + "easing": "linear" + }, + "2.4": { + "vector": [4.5, -0.7, 1.2], + "easing": "easeInSine" + }, + "2.45": { + "vector": [2.6, 0.4, -1.5], + "easing": "easeOutSine" + }, + "2.55": { + "vector": [2, 0, 1.5], + "easing": "easeInElastic" + }, + "2.675": { + "vector": [0.03, 0.25, -1.18] + }, + "2.8": { + "vector": [0, 0, -2], + "easing": "easeInElastic" + }, + "2.9": { + "vector": [0.2, 0, 0] + }, + "3.0": { + "vector": [0, 0, 0] + } + } + }, "Lefthand": { "rotation": { "0.1": { @@ -1429,76 +1525,6 @@ "easing": "easeInElastic" } } - }, - "camera": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.1": { - "vector": [3, 1, -2] - }, - "0.25": { - "vector": [-1, -0.5, 1] - }, - "0.45": { - "vector": [1.69, 0, 0] - }, - "0.625": { - "vector": [3, 0, 1.5], - "easing": "easeInElastic" - }, - "0.675": { - "vector": [4, 1, -2], - "easing": "easeInSine" - }, - "0.8": { - "vector": [1, -0.5, 1.5] - }, - "0.925": { - "vector": [2.5, 0, 1.2], - "easing": "easeOutSine" - }, - "1.225": { - "vector": [3.5, 0, 2], - "easing": "easeInElastic" - }, - "1.6": { - "vector": [2.89, 0, 0.12] - }, - "1.875": { - "vector": [3.34, 0, 1.5] - }, - "2.325": { - "vector": [2.5, 0, 2.2], - "easing": "linear" - }, - "2.4": { - "vector": [4.5, -0.7, 1.2], - "easing": "easeInSine" - }, - "2.45": { - "vector": [2.6, 0.4, -1.5], - "easing": "easeOutSine" - }, - "2.55": { - "vector": [2, 0, 1.5], - "easing": "easeInElastic" - }, - "2.675": { - "vector": [0.03, 0.25, -1.18] - }, - "2.8": { - "vector": [0, 0, -2], - "easing": "easeInElastic" - }, - "2.9": { - "vector": [0.2, 0, 0] - }, - "3.0": { - "vector": [0, 0, 0] - } - } } }, "sound_effects": { diff --git a/src/main/resources/assets/target/geo/abekiri.geo.json b/src/main/resources/assets/target/geo/abekiri.geo.json index 54e528219..d40dc1316 100644 --- a/src/main/resources/assets/target/geo/abekiri.geo.json +++ b/src/main/resources/assets/target/geo/abekiri.geo.json @@ -11,6 +11,10 @@ "visible_bounds_offset": [0, 0.5, 0] }, "bones": [ + { + "name": "camera", + "pivot": [2.97141, 7.56276, 13.47702] + }, { "name": "root", "pivot": [0, 1, 3] diff --git a/src/main/resources/assets/target/geo/mk14ebr.geo.json b/src/main/resources/assets/target/geo/mk14ebr.geo.json index 58e10d580..02b28398e 100644 --- a/src/main/resources/assets/target/geo/mk14ebr.geo.json +++ b/src/main/resources/assets/target/geo/mk14ebr.geo.json @@ -52,13 +52,217 @@ { "name": "rex", "parent": "gun", - "pivot": [0, 5.35078, -82.76641], + "pivot": [0, 5.32344, -82.76641], "cubes": [ { - "origin": [-9.8154, -4.46462, -82.76641], - "size": [19.6308, 19.6308, 0], + "origin": [-0.03649, -4.49196, -82.76641], + "size": [0.07299, 19.6308, 0], + "pivot": [0, 5.32344, -82.76641], + "rotation": [0, 0, -90], "uv": { - "south": {"uv": [95.2625, 54.25], "uv_size": [32, 32]} + "south": {"uv": [127, 0], "uv_size": [1, 1]} + } + }, + { + "origin": [-0.03649, -4.49196, -82.76641], + "size": [0.07299, 19.6308, 0], + "uv": { + "south": {"uv": [127, 0], "uv_size": [1, 1]} + } + }, + { + "origin": [-0.06892, -4.49196, -82.76641], + "size": [0.13783, 4, 0], + "pivot": [0, 5.32344, -82.76641], + "rotation": [0, 0, -90], + "uv": { + "south": {"uv": [127, 0], "uv_size": [1, 1]} + } + }, + { + "origin": [-0.06892, -4.49196, -82.76641], + "size": [0.13783, 4, 0], + "pivot": [0, 5.32344, -82.76641], + "rotation": [0, 0, 90], + "uv": { + "south": {"uv": [128, 0], "uv_size": [-1, 1]} + } + }, + { + "origin": [-0.06892, -4.49196, -82.76641], + "size": [0.13393, 4, 0], + "pivot": [0, 5.32344, -82.76641], + "rotation": [0, 0, 0], + "uv": { + "south": {"uv": [128, 0], "uv_size": [-1, 1]} + } + }, + { + "origin": [-0.06892, -4.49196, -82.76641], + "size": [0.13393, 4, 0], + "pivot": [0, 5.32344, -82.76641], + "rotation": [0, 0, -180], + "uv": { + "south": {"uv": [127, 0], "uv_size": [1, 1]} + } + } + ] + }, + { + "name": "bone173", + "parent": "rex", + "pivot": [0, 5.32344, -82.76641], + "cubes": [ + { + "origin": [-0.05329, 4.18147, -82.76641], + "size": [0.10658, 0.07656, 0], + "pivot": [0, 5.32344, -82.76641], + "rotation": [0, 0, -90], + "uv": { + "south": {"uv": [127, 0], "uv_size": [1, 1]} + } + }, + { + "origin": [-0.05329, 3.18147, -82.76641], + "size": [0.10658, 0.07656, 0], + "pivot": [0, 5.32344, -82.76641], + "rotation": [0, 0, -90], + "uv": { + "south": {"uv": [127, 0], "uv_size": [1, 1]} + } + }, + { + "origin": [-0.05329, 2.18147, -82.76641], + "size": [0.10658, 0.07656, 0], + "pivot": [0, 5.32344, -82.76641], + "rotation": [0, 0, -90], + "uv": { + "south": {"uv": [127, 0], "uv_size": [1, 1]} + } + }, + { + "origin": [-0.05329, 1.18147, -82.76641], + "size": [0.10658, 0.07656, 0], + "pivot": [0, 5.32344, -82.76641], + "rotation": [0, 0, -90], + "uv": { + "south": {"uv": [127, 0], "uv_size": [1, 1]} + } + }, + { + "origin": [-0.05329, 1.18147, -82.76641], + "size": [0.10658, 0.07656, 0], + "pivot": [0, 5.32344, -82.76641], + "rotation": [0, 0, 90], + "uv": { + "south": {"uv": [128, 0], "uv_size": [-1, 1]} + } + }, + { + "origin": [-0.05329, 4.18147, -82.76641], + "size": [0.10658, 0.07656, 0], + "pivot": [0, 5.32344, -82.76641], + "rotation": [0, 0, 90], + "uv": { + "south": {"uv": [128, 0], "uv_size": [-1, 1]} + } + }, + { + "origin": [-0.05329, 3.18147, -82.76641], + "size": [0.10658, 0.07656, 0], + "pivot": [0, 5.32344, -82.76641], + "rotation": [0, 0, 90], + "uv": { + "south": {"uv": [128, 0], "uv_size": [-1, 1]} + } + }, + { + "origin": [-0.05329, 2.18147, -82.76641], + "size": [0.10658, 0.07656, 0], + "pivot": [0, 5.32344, -82.76641], + "rotation": [0, 0, 90], + "uv": { + "south": {"uv": [128, 0], "uv_size": [-1, 1]} + } + } + ] + }, + { + "name": "bone174", + "parent": "rex", + "pivot": [0, 5.32344, -82.76641], + "rotation": [0, 0, -90], + "cubes": [ + { + "origin": [-0.05329, 4.18147, -82.76641], + "size": [0.10658, 0.07656, 0], + "pivot": [0, 5.32344, -82.76641], + "rotation": [0, 0, -90], + "uv": { + "south": {"uv": [127, 0], "uv_size": [1, 1]} + } + }, + { + "origin": [-0.05329, 3.18147, -82.76641], + "size": [0.10658, 0.07656, 0], + "pivot": [0, 5.32344, -82.76641], + "rotation": [0, 0, -90], + "uv": { + "south": {"uv": [127, 0], "uv_size": [1, 1]} + } + }, + { + "origin": [-0.05329, 2.18147, -82.76641], + "size": [0.10658, 0.07656, 0], + "pivot": [0, 5.32344, -82.76641], + "rotation": [0, 0, -90], + "uv": { + "south": {"uv": [127, 0], "uv_size": [1, 1]} + } + }, + { + "origin": [-0.05329, 1.18147, -82.76641], + "size": [0.10658, 0.07656, 0], + "pivot": [0, 5.32344, -82.76641], + "rotation": [0, 0, -90], + "uv": { + "south": {"uv": [127, 0], "uv_size": [1, 1]} + } + }, + { + "origin": [-0.05329, 1.18147, -82.76641], + "size": [0.10658, 0.07656, 0], + "pivot": [0, 5.32344, -82.76641], + "rotation": [0, 0, 90], + "uv": { + "south": {"uv": [128, 0], "uv_size": [-1, 1]} + } + }, + { + "origin": [-0.05329, 4.18147, -82.76641], + "size": [0.10658, 0.07656, 0], + "pivot": [0, 5.32344, -82.76641], + "rotation": [0, 0, 90], + "uv": { + "south": {"uv": [128, 0], "uv_size": [-1, 1]} + } + }, + { + "origin": [-0.05329, 3.18147, -82.76641], + "size": [0.10658, 0.07656, 0], + "pivot": [0, 5.32344, -82.76641], + "rotation": [0, 0, 90], + "uv": { + "south": {"uv": [128, 0], "uv_size": [-1, 1]} + } + }, + { + "origin": [-0.05329, 2.18147, -82.76641], + "size": [0.10658, 0.07656, 0], + "pivot": [0, 5.32344, -82.76641], + "rotation": [0, 0, 90], + "uv": { + "south": {"uv": [128, 0], "uv_size": [-1, 1]} } } ] @@ -90,16 +294,7 @@ { "name": "glass2", "parent": "bone102", - "pivot": [0, 5.30781, -5.66641], - "cubes": [ - { - "origin": [-0.79419, 4.55971, -3.56641], - "size": [1.58838, 1.58838, 0], - "uv": { - "south": {"uv": [96, 96], "uv_size": [32, 32]} - } - } - ] + "pivot": [0, 5.30781, -5.66641] }, { "name": "bone104", @@ -17797,12 +17992,12 @@ "origin": [2.67388, -7.52896, -5.36163], "size": [4, 12, 4], "uv": { - "north": {"uv": [124, 0], "uv_size": [4, 12]}, - "east": {"uv": [124, 0], "uv_size": [4, 12]}, - "south": {"uv": [124, 0], "uv_size": [4, 12]}, - "west": {"uv": [124, 0], "uv_size": [4, 12]}, - "up": {"uv": [128, 12], "uv_size": [-4, -12]}, - "down": {"uv": [128, 12], "uv_size": [-4, -12]} + "north": {"uv": [127, 127], "uv_size": [1, 1]}, + "east": {"uv": [127, 127], "uv_size": [1, 1]}, + "south": {"uv": [127, 127], "uv_size": [1, 1]}, + "west": {"uv": [127, 127], "uv_size": [1, 1]}, + "up": {"uv": [128, 128], "uv_size": [-1, -1]}, + "down": {"uv": [128, 128], "uv_size": [-1, -1]} } } ] @@ -18022,12 +18217,12 @@ "origin": [-5.52302, -3.72921, 10.12641], "size": [4, 12, 4], "uv": { - "north": {"uv": [124, 0], "uv_size": [4, 12]}, - "east": {"uv": [124, 0], "uv_size": [4, 12]}, - "south": {"uv": [124, 0], "uv_size": [4, 12]}, - "west": {"uv": [124, 0], "uv_size": [4, 12]}, - "up": {"uv": [128, 12], "uv_size": [-4, -12]}, - "down": {"uv": [128, 12], "uv_size": [-4, -12]} + "north": {"uv": [127, 126.75], "uv_size": [1, 1]}, + "east": {"uv": [127, 126.75], "uv_size": [1, 1]}, + "south": {"uv": [127, 126.75], "uv_size": [1, 1]}, + "west": {"uv": [127, 126.75], "uv_size": [1, 1]}, + "up": {"uv": [128, 127.75], "uv_size": [-1, -1]}, + "down": {"uv": [128, 127.75], "uv_size": [-1, -1]} } } ] diff --git a/src/main/resources/assets/target/geo/ntw_20.geo.json b/src/main/resources/assets/target/geo/ntw_20.geo.json index f471d7108..f367555bc 100644 --- a/src/main/resources/assets/target/geo/ntw_20.geo.json +++ b/src/main/resources/assets/target/geo/ntw_20.geo.json @@ -1803,6 +1803,287 @@ } ] }, + { + "name": "guan10", + "parent": "0", + "pivot": [0.00001, 3.53415, -18.61352], + "cubes": [ + { + "origin": [-0.3325, 1.4546, -12.83141], + "size": [0.465, 4.36206, 0.465], + "pivot": [-0.1, 3.53563, -12.59891], + "rotation": [0, 0, 90], + "uv": { + "north": {"uv": [59, 12], "uv_size": [0.5, 4.25]}, + "east": {"uv": [14, 59], "uv_size": [0.5, 4.25]}, + "south": {"uv": [59, 17], "uv_size": [0.5, 4.25]}, + "west": {"uv": [20, 59], "uv_size": [0.5, 4.25]} + } + }, + { + "origin": [1.84853, 3.53563, -12.93141], + "size": [0.665, 0.15, 0.665], + "pivot": [2.18103, 3.53563, -12.59891], + "rotation": [0, 0, 90], + "uv": { + "north": {"uv": [76, 80], "uv_size": [0.75, 0.25]}, + "east": {"uv": [80, 76], "uv_size": [0.75, 0.25]}, + "south": {"uv": [77, 80], "uv_size": [0.75, 0.25]}, + "west": {"uv": [80, 77], "uv_size": [0.75, 0.25]}, + "up": {"uv": [42, 75], "uv_size": [0.75, 0.75]}, + "down": {"uv": [75, 42.75], "uv_size": [0.75, -0.75]} + } + }, + { + "origin": [-2.51353, 3.53563, -12.93141], + "size": [0.665, 0.15, 0.665], + "pivot": [-2.18103, 3.53563, -12.59891], + "rotation": [0, 0, -90], + "uv": { + "north": {"uv": [78, 80], "uv_size": [0.75, 0.25]}, + "east": {"uv": [80, 78], "uv_size": [0.75, 0.25]}, + "south": {"uv": [79, 80], "uv_size": [0.75, 0.25]}, + "west": {"uv": [80, 79], "uv_size": [0.75, 0.25]}, + "up": {"uv": [75, 43], "uv_size": [0.75, 0.75]}, + "down": {"uv": [44, 75.75], "uv_size": [0.75, -0.75]} + } + }, + { + "origin": [-1.5325, 5.67413, -13.18141], + "size": [1.965, 0.13471, 1.165], + "pivot": [-0.1, 3.53563, -12.59891], + "rotation": [0, 0, 90], + "uv": { + "north": {"uv": [2, 76], "uv_size": [2, 0.25]}, + "east": {"uv": [22, 79], "uv_size": [1.25, 0.25]}, + "south": {"uv": [76, 2], "uv_size": [2, 0.25]}, + "west": {"uv": [79, 22], "uv_size": [1.25, 0.25]}, + "up": {"uv": [56, 42], "uv_size": [2, 1.25]}, + "down": {"uv": [56, 52.25], "uv_size": [2, -1.25]} + } + }, + { + "origin": [2.26572, 4.11063, -12.88141], + "size": [0.565, 0.5, 0.565], + "pivot": [2.54822, 4.48563, -12.59891], + "rotation": [0, 0, 90], + "uv": { + "north": {"uv": [79, 43], "uv_size": [0.5, 0.5]}, + "east": {"uv": [44, 79], "uv_size": [0.5, 0.5]}, + "south": {"uv": [79, 44], "uv_size": [0.5, 0.5]}, + "west": {"uv": [45, 79], "uv_size": [0.5, 0.5]} + } + }, + { + "origin": [2.3147, 4.35163, -12.88141], + "size": [0.565, 0.6, 0.565], + "pivot": [2.5972, 4.52663, -12.59891], + "rotation": [0, 0, 45], + "uv": { + "north": {"uv": [79, 41], "uv_size": [0.5, 0.5]}, + "east": {"uv": [42, 79], "uv_size": [0.5, 0.5]}, + "south": {"uv": [79, 42], "uv_size": [0.5, 0.5]}, + "west": {"uv": [43, 79], "uv_size": [0.5, 0.5]} + } + }, + { + "origin": [2.49148, 10.92638, -12.88141], + "size": [0.565, 0.6, 0.565], + "pivot": [2.77398, 11.10138, -12.59891], + "rotation": [0, 0, -45], + "uv": { + "north": {"uv": [79, 45], "uv_size": [0.5, 0.5]}, + "east": {"uv": [46, 79], "uv_size": [0.5, 0.5]}, + "south": {"uv": [79, 46], "uv_size": [0.5, 0.5]}, + "west": {"uv": [47, 79], "uv_size": [0.5, 0.5]} + } + }, + { + "origin": [-0.2825, 8.64377, -12.88141], + "size": [0.565, 5.35078, 0.565], + "pivot": [0, 11.31916, -12.59891], + "rotation": [0, 0, -90], + "uv": { + "north": {"uv": [33, 55], "uv_size": [0.5, 5.25]}, + "east": {"uv": [46, 55], "uv_size": [0.5, 5.25]}, + "south": {"uv": [47, 55], "uv_size": [0.5, 5.25]}, + "west": {"uv": [54, 55], "uv_size": [0.5, 5.25]} + } + }, + { + "origin": [2.53248, 4.62739, -12.88141], + "size": [0.565, 6.55, 0.565], + "pivot": [2.81498, 7.90239, -12.59891], + "rotation": [0, 0, 0], + "uv": { + "north": {"uv": [28, 54], "uv_size": [0.5, 6.5]}, + "east": {"uv": [29, 54], "uv_size": [0.5, 6.5]}, + "south": {"uv": [30, 54], "uv_size": [0.5, 6.5]}, + "west": {"uv": [31, 54], "uv_size": [0.5, 6.5]} + } + }, + { + "origin": [-2.83072, 4.11063, -12.88141], + "size": [0.565, 0.5, 0.565], + "pivot": [-2.54822, 4.48563, -12.59891], + "rotation": [0, 0, -90], + "uv": { + "north": {"uv": [79, 51], "uv_size": [0.5, 0.5]}, + "east": {"uv": [52, 79], "uv_size": [0.5, 0.5]}, + "south": {"uv": [79, 52], "uv_size": [0.5, 0.5]}, + "west": {"uv": [53, 79], "uv_size": [0.5, 0.5]} + } + }, + { + "origin": [-2.8797, 4.35163, -12.88141], + "size": [0.565, 0.6, 0.565], + "pivot": [-2.5972, 4.52663, -12.59891], + "rotation": [0, 0, -45], + "uv": { + "north": {"uv": [79, 49], "uv_size": [0.5, 0.5]}, + "east": {"uv": [50, 79], "uv_size": [0.5, 0.5]}, + "south": {"uv": [79, 50], "uv_size": [0.5, 0.5]}, + "west": {"uv": [51, 79], "uv_size": [0.5, 0.5]} + } + }, + { + "origin": [-3.09748, 4.62739, -12.88141], + "size": [0.565, 6.55, 0.565], + "pivot": [-2.81498, 7.90239, -12.59891], + "rotation": [0, 0, 0], + "uv": { + "north": {"uv": [54, 45], "uv_size": [0.5, 6.5]}, + "east": {"uv": [48, 54], "uv_size": [0.5, 6.5]}, + "south": {"uv": [49, 54], "uv_size": [0.5, 6.5]}, + "west": {"uv": [52, 54], "uv_size": [0.5, 6.5]} + } + }, + { + "origin": [-3.05648, 10.92638, -12.88141], + "size": [0.565, 0.6, 0.565], + "pivot": [-2.77398, 11.10138, -12.59891], + "rotation": [0, 0, 45], + "uv": { + "north": {"uv": [79, 47], "uv_size": [0.5, 0.5]}, + "east": {"uv": [48, 79], "uv_size": [0.5, 0.5]}, + "south": {"uv": [79, 48], "uv_size": [0.5, 0.5]}, + "west": {"uv": [49, 79], "uv_size": [0.5, 0.5]} + } + }, + { + "origin": [-0.4325, 5.67413, -13.18141], + "size": [1.965, 0.13471, 1.165], + "pivot": [0.1, 3.53563, -12.59891], + "rotation": [0, 0, -90], + "uv": { + "north": {"uv": [76, 3], "uv_size": [2, 0.25]}, + "east": {"uv": [79, 23], "uv_size": [1.25, 0.25]}, + "south": {"uv": [4, 76], "uv_size": [2, 0.25]}, + "west": {"uv": [24, 79], "uv_size": [1.25, 0.25]}, + "up": {"uv": [56, 53], "uv_size": [2, 1.25]}, + "down": {"uv": [57, 5.25], "uv_size": [2, -1.25]} + } + }, + { + "origin": [-0.71866, 1.79649, -14.54423], + "size": [1.43732, 3.47533, 3.87241], + "pivot": [0.00001, 3.53415, -18.61352], + "rotation": [0, 0, 22.5], + "uv": { + "north": {"uv": [46, 13], "uv_size": [1.5, 3.5]}, + "south": {"uv": [46, 17], "uv_size": [1.5, 3.5]}, + "up": {"uv": [44, 15], "uv_size": [1.5, 3.75]}, + "down": {"uv": [44, 22.75], "uv_size": [1.5, -3.75]} + } + }, + { + "origin": [-0.36866, 1.54649, -14.44423], + "size": [0.73732, 3.97533, 3.77241], + "pivot": [0.00001, 3.53415, -12.60802], + "rotation": [0, 0, 90], + "uv": { + "north": {"uv": [53, 22], "uv_size": [0.75, 4]}, + "east": {"uv": [9, 26], "uv_size": [3.75, 4]}, + "south": {"uv": [53, 54], "uv_size": [0.75, 4]}, + "west": {"uv": [26, 14], "uv_size": [3.75, 4]}, + "up": {"uv": [1, 55], "uv_size": [0.75, 3.75]}, + "down": {"uv": [9, 58.75], "uv_size": [0.75, -3.75]} + } + }, + { + "origin": [-0.41866, 1.53285, -13.99423], + "size": [0.70607, 4.07533, 2.73828], + "pivot": [-0.05, 3.52052, -12.55802], + "rotation": [0, 0, 90], + "uv": { + "east": {"uv": [21, 28], "uv_size": [2.75, 4]}, + "west": {"uv": [24, 28], "uv_size": [2.75, 4]}, + "up": {"uv": [59, 50], "uv_size": [0.75, 2.75]}, + "down": {"uv": [59, 55.75], "uv_size": [0.75, -2.75]} + } + }, + { + "origin": [-0.25, 1.49796, -14.24423], + "size": [0.5, 4.07533, 0.5], + "pivot": [0, 3.53563, -13.99423], + "rotation": [0, 45, 90], + "uv": { + "north": {"uv": [50, 62], "uv_size": [0.5, 4]}, + "west": {"uv": [51, 62], "uv_size": [0.5, 4]}, + "up": {"uv": [79, 39], "uv_size": [0.5, 0.5]}, + "down": {"uv": [40, 79.5], "uv_size": [0.5, -0.5]} + } + }, + { + "origin": [-0.25, 1.49796, -11.50595], + "size": [0.5, 4.07533, 0.5], + "pivot": [0, 3.53563, -11.25595], + "rotation": [0, 45, 90], + "uv": { + "east": {"uv": [52, 62], "uv_size": [0.5, 4]}, + "south": {"uv": [53, 62], "uv_size": [0.5, 4]}, + "up": {"uv": [79, 40], "uv_size": [0.5, 0.5]}, + "down": {"uv": [41, 79.5], "uv_size": [0.5, -0.5]} + } + }, + { + "origin": [-0.71866, 1.79649, -14.54423], + "size": [1.43732, 3.47533, 3.87241], + "pivot": [0.00001, 3.53415, -18.61352], + "rotation": [0, 0, -67.5], + "uv": { + "north": {"uv": [46, 21], "uv_size": [1.5, 3.5]}, + "south": {"uv": [23, 46], "uv_size": [1.5, 3.5]}, + "up": {"uv": [21, 44], "uv_size": [1.5, 3.75]}, + "down": {"uv": [44, 26.75], "uv_size": [1.5, -3.75]} + } + }, + { + "origin": [-0.71866, 1.79649, -14.54423], + "size": [1.43732, 3.47533, 3.87241], + "pivot": [0.00001, 3.53415, -18.61352], + "rotation": [0, 0, -112.5], + "uv": { + "north": {"uv": [46, 33], "uv_size": [1.5, 3.5]}, + "south": {"uv": [46, 37], "uv_size": [1.5, 3.5]}, + "up": {"uv": [44, 33], "uv_size": [1.5, 3.75]}, + "down": {"uv": [44, 40.75], "uv_size": [1.5, -3.75]} + } + }, + { + "origin": [-0.71866, 1.79649, -14.54423], + "size": [1.43732, 3.47533, 3.87241], + "pivot": [0.00001, 3.53415, -18.61352], + "rotation": [0, 0, -22.5], + "uv": { + "north": {"uv": [46, 41], "uv_size": [1.5, 3.5]}, + "south": {"uv": [0, 47], "uv_size": [1.5, 3.5]}, + "up": {"uv": [44, 41], "uv_size": [1.5, 3.75]}, + "down": {"uv": [45, 30.75], "uv_size": [1.5, -3.75]} + } + } + ] + }, { "name": "scope", "parent": "0", @@ -1816,16 +2097,7 @@ { "name": "glass2", "parent": "bone102", - "pivot": [0, 9.7164, -3.96641], - "cubes": [ - { - "origin": [-0.91332, 6.80308, -3.96641], - "size": [1.82664, 1.82664, 0], - "uv": { - "south": {"uv": [96, 96], "uv_size": [32, 32]} - } - } - ] + "pivot": [0, 9.7164, -3.96641] }, { "name": "bone104", @@ -7429,287 +7701,6 @@ } ] }, - { - "name": "guan10", - "parent": "body", - "pivot": [0.00001, 3.53415, -18.61352], - "cubes": [ - { - "origin": [-0.3325, 1.4546, -12.83141], - "size": [0.465, 4.36206, 0.465], - "pivot": [-0.1, 3.53563, -12.59891], - "rotation": [0, 0, 90], - "uv": { - "north": {"uv": [59, 12], "uv_size": [0.5, 4.25]}, - "east": {"uv": [14, 59], "uv_size": [0.5, 4.25]}, - "south": {"uv": [59, 17], "uv_size": [0.5, 4.25]}, - "west": {"uv": [20, 59], "uv_size": [0.5, 4.25]} - } - }, - { - "origin": [1.84853, 3.53563, -12.93141], - "size": [0.665, 0.15, 0.665], - "pivot": [2.18103, 3.53563, -12.59891], - "rotation": [0, 0, 90], - "uv": { - "north": {"uv": [76, 80], "uv_size": [0.75, 0.25]}, - "east": {"uv": [80, 76], "uv_size": [0.75, 0.25]}, - "south": {"uv": [77, 80], "uv_size": [0.75, 0.25]}, - "west": {"uv": [80, 77], "uv_size": [0.75, 0.25]}, - "up": {"uv": [42, 75], "uv_size": [0.75, 0.75]}, - "down": {"uv": [75, 42.75], "uv_size": [0.75, -0.75]} - } - }, - { - "origin": [-2.51353, 3.53563, -12.93141], - "size": [0.665, 0.15, 0.665], - "pivot": [-2.18103, 3.53563, -12.59891], - "rotation": [0, 0, -90], - "uv": { - "north": {"uv": [78, 80], "uv_size": [0.75, 0.25]}, - "east": {"uv": [80, 78], "uv_size": [0.75, 0.25]}, - "south": {"uv": [79, 80], "uv_size": [0.75, 0.25]}, - "west": {"uv": [80, 79], "uv_size": [0.75, 0.25]}, - "up": {"uv": [75, 43], "uv_size": [0.75, 0.75]}, - "down": {"uv": [44, 75.75], "uv_size": [0.75, -0.75]} - } - }, - { - "origin": [-1.5325, 5.67413, -13.18141], - "size": [1.965, 0.13471, 1.165], - "pivot": [-0.1, 3.53563, -12.59891], - "rotation": [0, 0, 90], - "uv": { - "north": {"uv": [2, 76], "uv_size": [2, 0.25]}, - "east": {"uv": [22, 79], "uv_size": [1.25, 0.25]}, - "south": {"uv": [76, 2], "uv_size": [2, 0.25]}, - "west": {"uv": [79, 22], "uv_size": [1.25, 0.25]}, - "up": {"uv": [56, 42], "uv_size": [2, 1.25]}, - "down": {"uv": [56, 52.25], "uv_size": [2, -1.25]} - } - }, - { - "origin": [2.26572, 4.21063, -12.88141], - "size": [0.565, 0.4, 0.565], - "pivot": [2.54822, 4.48563, -12.59891], - "rotation": [0, 0, 90], - "uv": { - "north": {"uv": [79, 43], "uv_size": [0.5, 0.5]}, - "east": {"uv": [44, 79], "uv_size": [0.5, 0.5]}, - "south": {"uv": [79, 44], "uv_size": [0.5, 0.5]}, - "west": {"uv": [45, 79], "uv_size": [0.5, 0.5]} - } - }, - { - "origin": [2.3147, 4.35163, -12.88141], - "size": [0.565, 0.6, 0.565], - "pivot": [2.5972, 4.52663, -12.59891], - "rotation": [0, 0, 45], - "uv": { - "north": {"uv": [79, 41], "uv_size": [0.5, 0.5]}, - "east": {"uv": [42, 79], "uv_size": [0.5, 0.5]}, - "south": {"uv": [79, 42], "uv_size": [0.5, 0.5]}, - "west": {"uv": [43, 79], "uv_size": [0.5, 0.5]} - } - }, - { - "origin": [2.49148, 10.92638, -12.88141], - "size": [0.565, 0.6, 0.565], - "pivot": [2.77398, 11.10138, -12.59891], - "rotation": [0, 0, -45], - "uv": { - "north": {"uv": [79, 45], "uv_size": [0.5, 0.5]}, - "east": {"uv": [46, 79], "uv_size": [0.5, 0.5]}, - "south": {"uv": [79, 46], "uv_size": [0.5, 0.5]}, - "west": {"uv": [47, 79], "uv_size": [0.5, 0.5]} - } - }, - { - "origin": [-0.2825, 8.64377, -12.88141], - "size": [0.565, 5.35078, 0.565], - "pivot": [0, 11.31916, -12.59891], - "rotation": [0, 0, -90], - "uv": { - "north": {"uv": [33, 55], "uv_size": [0.5, 5.25]}, - "east": {"uv": [46, 55], "uv_size": [0.5, 5.25]}, - "south": {"uv": [47, 55], "uv_size": [0.5, 5.25]}, - "west": {"uv": [54, 55], "uv_size": [0.5, 5.25]} - } - }, - { - "origin": [2.53248, 4.62739, -12.88141], - "size": [0.565, 6.55, 0.565], - "pivot": [2.81498, 7.90239, -12.59891], - "rotation": [0, 0, 0], - "uv": { - "north": {"uv": [28, 54], "uv_size": [0.5, 6.5]}, - "east": {"uv": [29, 54], "uv_size": [0.5, 6.5]}, - "south": {"uv": [30, 54], "uv_size": [0.5, 6.5]}, - "west": {"uv": [31, 54], "uv_size": [0.5, 6.5]} - } - }, - { - "origin": [-2.83072, 4.11063, -12.88141], - "size": [0.565, 0.5, 0.565], - "pivot": [-2.54822, 4.48563, -12.59891], - "rotation": [0, 0, -90], - "uv": { - "north": {"uv": [79, 51], "uv_size": [0.5, 0.5]}, - "east": {"uv": [52, 79], "uv_size": [0.5, 0.5]}, - "south": {"uv": [79, 52], "uv_size": [0.5, 0.5]}, - "west": {"uv": [53, 79], "uv_size": [0.5, 0.5]} - } - }, - { - "origin": [-2.8797, 4.35163, -12.88141], - "size": [0.565, 0.6, 0.565], - "pivot": [-2.5972, 4.52663, -12.59891], - "rotation": [0, 0, -45], - "uv": { - "north": {"uv": [79, 49], "uv_size": [0.5, 0.5]}, - "east": {"uv": [50, 79], "uv_size": [0.5, 0.5]}, - "south": {"uv": [79, 50], "uv_size": [0.5, 0.5]}, - "west": {"uv": [51, 79], "uv_size": [0.5, 0.5]} - } - }, - { - "origin": [-3.09748, 4.62739, -12.88141], - "size": [0.565, 6.55, 0.565], - "pivot": [-2.81498, 7.90239, -12.59891], - "rotation": [0, 0, 0], - "uv": { - "north": {"uv": [54, 45], "uv_size": [0.5, 6.5]}, - "east": {"uv": [48, 54], "uv_size": [0.5, 6.5]}, - "south": {"uv": [49, 54], "uv_size": [0.5, 6.5]}, - "west": {"uv": [52, 54], "uv_size": [0.5, 6.5]} - } - }, - { - "origin": [-3.05648, 10.92638, -12.88141], - "size": [0.565, 0.6, 0.565], - "pivot": [-2.77398, 11.10138, -12.59891], - "rotation": [0, 0, 45], - "uv": { - "north": {"uv": [79, 47], "uv_size": [0.5, 0.5]}, - "east": {"uv": [48, 79], "uv_size": [0.5, 0.5]}, - "south": {"uv": [79, 48], "uv_size": [0.5, 0.5]}, - "west": {"uv": [49, 79], "uv_size": [0.5, 0.5]} - } - }, - { - "origin": [-0.4325, 5.67413, -13.18141], - "size": [1.965, 0.13471, 1.165], - "pivot": [0.1, 3.53563, -12.59891], - "rotation": [0, 0, -90], - "uv": { - "north": {"uv": [76, 3], "uv_size": [2, 0.25]}, - "east": {"uv": [79, 23], "uv_size": [1.25, 0.25]}, - "south": {"uv": [4, 76], "uv_size": [2, 0.25]}, - "west": {"uv": [24, 79], "uv_size": [1.25, 0.25]}, - "up": {"uv": [56, 53], "uv_size": [2, 1.25]}, - "down": {"uv": [57, 5.25], "uv_size": [2, -1.25]} - } - }, - { - "origin": [-0.71866, 1.79649, -14.54423], - "size": [1.43732, 3.47533, 3.87241], - "pivot": [0.00001, 3.53415, -18.61352], - "rotation": [0, 0, 22.5], - "uv": { - "north": {"uv": [46, 13], "uv_size": [1.5, 3.5]}, - "south": {"uv": [46, 17], "uv_size": [1.5, 3.5]}, - "up": {"uv": [44, 15], "uv_size": [1.5, 3.75]}, - "down": {"uv": [44, 22.75], "uv_size": [1.5, -3.75]} - } - }, - { - "origin": [-0.36866, 1.54649, -14.44423], - "size": [0.73732, 3.97533, 3.77241], - "pivot": [0.00001, 3.53415, -12.60802], - "rotation": [0, 0, 90], - "uv": { - "north": {"uv": [53, 22], "uv_size": [0.75, 4]}, - "east": {"uv": [9, 26], "uv_size": [3.75, 4]}, - "south": {"uv": [53, 54], "uv_size": [0.75, 4]}, - "west": {"uv": [26, 14], "uv_size": [3.75, 4]}, - "up": {"uv": [1, 55], "uv_size": [0.75, 3.75]}, - "down": {"uv": [9, 58.75], "uv_size": [0.75, -3.75]} - } - }, - { - "origin": [-0.41866, 1.53285, -13.99423], - "size": [0.70607, 4.07533, 2.73828], - "pivot": [-0.05, 3.52052, -12.55802], - "rotation": [0, 0, 90], - "uv": { - "east": {"uv": [21, 28], "uv_size": [2.75, 4]}, - "west": {"uv": [24, 28], "uv_size": [2.75, 4]}, - "up": {"uv": [59, 50], "uv_size": [0.75, 2.75]}, - "down": {"uv": [59, 55.75], "uv_size": [0.75, -2.75]} - } - }, - { - "origin": [-0.25, 1.49796, -14.24423], - "size": [0.5, 4.07533, 0.5], - "pivot": [0, 3.53563, -13.99423], - "rotation": [0, 45, 90], - "uv": { - "north": {"uv": [50, 62], "uv_size": [0.5, 4]}, - "west": {"uv": [51, 62], "uv_size": [0.5, 4]}, - "up": {"uv": [79, 39], "uv_size": [0.5, 0.5]}, - "down": {"uv": [40, 79.5], "uv_size": [0.5, -0.5]} - } - }, - { - "origin": [-0.25, 1.49796, -11.50595], - "size": [0.5, 4.07533, 0.5], - "pivot": [0, 3.53563, -11.25595], - "rotation": [0, 45, 90], - "uv": { - "east": {"uv": [52, 62], "uv_size": [0.5, 4]}, - "south": {"uv": [53, 62], "uv_size": [0.5, 4]}, - "up": {"uv": [79, 40], "uv_size": [0.5, 0.5]}, - "down": {"uv": [41, 79.5], "uv_size": [0.5, -0.5]} - } - }, - { - "origin": [-0.71866, 1.79649, -14.54423], - "size": [1.43732, 3.47533, 3.87241], - "pivot": [0.00001, 3.53415, -18.61352], - "rotation": [0, 0, -67.5], - "uv": { - "north": {"uv": [46, 21], "uv_size": [1.5, 3.5]}, - "south": {"uv": [23, 46], "uv_size": [1.5, 3.5]}, - "up": {"uv": [21, 44], "uv_size": [1.5, 3.75]}, - "down": {"uv": [44, 26.75], "uv_size": [1.5, -3.75]} - } - }, - { - "origin": [-0.71866, 1.79649, -14.54423], - "size": [1.43732, 3.47533, 3.87241], - "pivot": [0.00001, 3.53415, -18.61352], - "rotation": [0, 0, -112.5], - "uv": { - "north": {"uv": [46, 33], "uv_size": [1.5, 3.5]}, - "south": {"uv": [46, 37], "uv_size": [1.5, 3.5]}, - "up": {"uv": [44, 33], "uv_size": [1.5, 3.75]}, - "down": {"uv": [44, 40.75], "uv_size": [1.5, -3.75]} - } - }, - { - "origin": [-0.71866, 1.79649, -14.54423], - "size": [1.43732, 3.47533, 3.87241], - "pivot": [0.00001, 3.53415, -18.61352], - "rotation": [0, 0, -22.5], - "uv": { - "north": {"uv": [46, 41], "uv_size": [1.5, 3.5]}, - "south": {"uv": [0, 47], "uv_size": [1.5, 3.5]}, - "up": {"uv": [44, 41], "uv_size": [1.5, 3.75]}, - "down": {"uv": [45, 30.75], "uv_size": [1.5, -3.75]} - } - } - ] - }, { "name": "guan14", "parent": "body", diff --git a/src/main/resources/assets/target/sounds/abekiri/abekiri_reload_empty.ogg b/src/main/resources/assets/target/sounds/abekiri/abekiri_reload_empty.ogg index 3d1e90d66..10879db83 100644 Binary files a/src/main/resources/assets/target/sounds/abekiri/abekiri_reload_empty.ogg and b/src/main/resources/assets/target/sounds/abekiri/abekiri_reload_empty.ogg differ diff --git a/src/main/resources/assets/target/sounds/abekiri/abekiri_reload_normal.ogg b/src/main/resources/assets/target/sounds/abekiri/abekiri_reload_normal.ogg index c0cc732cc..0a7ca4df6 100644 Binary files a/src/main/resources/assets/target/sounds/abekiri/abekiri_reload_normal.ogg and b/src/main/resources/assets/target/sounds/abekiri/abekiri_reload_normal.ogg differ diff --git a/src/main/resources/assets/target/textures/item/mk14.png b/src/main/resources/assets/target/textures/item/mk14.png index 23bb2924e..6c36e9796 100644 Binary files a/src/main/resources/assets/target/textures/item/mk14.png and b/src/main/resources/assets/target/textures/item/mk14.png differ diff --git a/src/main/resources/assets/target/textures/item/ntw_20.png b/src/main/resources/assets/target/textures/item/ntw_20.png index 258c631b8..07eeea552 100644 Binary files a/src/main/resources/assets/target/textures/item/ntw_20.png and b/src/main/resources/assets/target/textures/item/ntw_20.png differ diff --git a/src/main/resources/assets/target/textures/item/ntw_20_e.png b/src/main/resources/assets/target/textures/item/ntw_20_e.png index 92ecac180..66a128b25 100644 Binary files a/src/main/resources/assets/target/textures/item/ntw_20_e.png and b/src/main/resources/assets/target/textures/item/ntw_20_e.png differ diff --git a/src/main/resources/assets/target/textures/item/trachelium_icon.png b/src/main/resources/assets/target/textures/item/trachelium_icon.png index 3c34d8a88..3c8222dd1 100644 Binary files a/src/main/resources/assets/target/textures/item/trachelium_icon.png and b/src/main/resources/assets/target/textures/item/trachelium_icon.png differ diff --git a/src/main/resources/data/target/guns/abekiri.json b/src/main/resources/data/target/guns/abekiri.json index 1bfa31a8b..f81f580f9 100644 --- a/src/main/resources/data/target/guns/abekiri.json +++ b/src/main/resources/data/target/guns/abekiri.json @@ -16,6 +16,6 @@ "burst": 0, "auto": 0, "burst_size": 1, - "normal_reload_time": 86, - "empty_reload_time": 102 + "normal_reload_time": 66, + "empty_reload_time": 83 } \ No newline at end of file