diff --git a/src/main/java/com/atsuishio/superbwarfare/client/ClickHandler.java b/src/main/java/com/atsuishio/superbwarfare/client/ClickHandler.java index 524fa0eb1..f43346976 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/ClickHandler.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/ClickHandler.java @@ -317,7 +317,7 @@ public class ClickHandler { player.playSound(ModSounds.TRIGGER_CLICK.get(), 1, 1); } - if (!gunItem.useBackpackAmmo(stack) && gunItem.getAmmoCount(stack) <= 0 && stack.getOrCreateTag().getInt("ReloadTime") == 0) { + if (!gunItem.useBackpackAmmo(stack) && GunsTool.getGunIntTag(stack, "Ammo", 0) <= 0 && stack.getOrCreateTag().getInt("ReloadTime") == 0) { if (ReloadConfig.LEFT_CLICK_RELOAD.get()) { ModUtils.PACKET_HANDLER.sendToServer(new ReloadMessage(0)); } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/screens/FuMO25ScreenHelper.java b/src/main/java/com/atsuishio/superbwarfare/client/screens/FuMO25ScreenHelper.java index d9de9f532..c3735c869 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/screens/FuMO25ScreenHelper.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/screens/FuMO25ScreenHelper.java @@ -3,10 +3,12 @@ package com.atsuishio.superbwarfare.client.screens; import com.atsuishio.superbwarfare.block.entity.FuMO25BlockEntity; import com.atsuishio.superbwarfare.menu.FuMO25Menu; import com.atsuishio.superbwarfare.tools.SeekTool; +import net.minecraft.client.Camera; import net.minecraft.client.Minecraft; +import net.minecraft.client.player.LocalPlayer; import net.minecraft.core.BlockPos; import net.minecraft.world.entity.Entity; -import net.minecraft.world.entity.player.Player; +import net.minecraft.world.phys.Vec3; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.event.TickEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; @@ -27,14 +29,18 @@ public class FuMO25ScreenHelper { public static void onClientTick(TickEvent.ClientTickEvent event) { if (event.side != LogicalSide.CLIENT) return; if (event.phase != TickEvent.Phase.END) return; - Player player = Minecraft.getInstance().player; + Minecraft mc = Minecraft.getInstance(); + LocalPlayer player = mc.player; + Camera camera = mc.gameRenderer.getMainCamera(); + Vec3 cameraPos = camera.getPosition(); + if (player == null) return; var menu = player.containerMenu; if (!(menu instanceof FuMO25Menu fuMO25Menu)) return; if (pos == null) return; - if (pos.distToCenterSqr(player.getOnPos().getX(), player.getOnPos().getY(), player.getOnPos().getZ()) > TOLERANCE_DISTANCE * TOLERANCE_DISTANCE) { - pos = player.getOnPos(); + if (pos.distToCenterSqr(cameraPos) > TOLERANCE_DISTANCE * TOLERANCE_DISTANCE) { + pos = BlockPos.containing(cameraPos); } if (fuMO25Menu.getEnergy() <= 0) { diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/GunItem.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/GunItem.java index 79c52942d..5b8181715 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/GunItem.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/GunItem.java @@ -70,10 +70,10 @@ public abstract class GunItem extends Item { handleGunPerks(stack); handleGunAttachment(stack); - if ((gunItem.bulletInBarrel(stack) && gunItem.getAmmoCount(stack) > GunsTool.getGunIntTag(stack, "Magazine", 0) + stack.getOrCreateTag().getInt("customMag") + 1) - || (!gunItem.bulletInBarrel(stack) && gunItem.getAmmoCount(stack) > GunsTool.getGunIntTag(stack, "Magazine", 0) + stack.getOrCreateTag().getInt("customMag")) + if ((gunItem.bulletInBarrel(stack) && GunsTool.getGunIntTag(stack, "Ammo", 0) > GunsTool.getGunIntTag(stack, "Magazine", 0) + stack.getOrCreateTag().getInt("customMag") + 1) + || (!gunItem.bulletInBarrel(stack) && GunsTool.getGunIntTag(stack, "Ammo", 0) > GunsTool.getGunIntTag(stack, "Magazine", 0) + stack.getOrCreateTag().getInt("customMag")) ) { - int count = gunItem.getAmmoCount(stack) - GunsTool.getGunIntTag(stack, "Magazine", 0) + stack.getOrCreateTag().getInt("customMag") - (gunItem.bulletInBarrel(stack) ? 1 : 0); + int count = GunsTool.getGunIntTag(stack, "Ammo", 0) - GunsTool.getGunIntTag(stack, "Magazine", 0) + stack.getOrCreateTag().getInt("customMag") - (gunItem.bulletInBarrel(stack) ? 1 : 0); entity.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> { if (stack.is(ModTags.Items.USE_SHOTGUN_AMMO)) { @@ -247,10 +247,6 @@ public abstract class GunItem extends Item { return false; } - public int getAmmoCount(ItemStack stack) { - return GunsTool.getGunIntTag(stack, "Ammo", 0); - } - public boolean isOpenBolt(ItemStack stack) { return false; } @@ -294,4 +290,16 @@ public abstract class GunItem extends Item { public boolean ejectShell(ItemStack stack) { return false; } + + public boolean semi(ItemStack stack) { + return false; + } + + public boolean burst(ItemStack stack) { + return false; + } + + public boolean auto(ItemStack stack) { + return false; + } } diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/Glock17Item.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/Glock17Item.java index 008328f96..497ea1c42 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/Glock17Item.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/Glock17Item.java @@ -167,4 +167,19 @@ public class Glock17Item extends GunItem implements GeoItem, AnimatedItem { public boolean ejectShell(ItemStack stack) { return true; } + + @Override + public boolean semi(ItemStack stack) { + return true; + } + + @Override + public boolean burst(ItemStack stack) { + return true; + } + + @Override + public boolean auto(ItemStack stack) { + return true; + } } \ No newline at end of file diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/Glock18Item.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/Glock18Item.java index 3c500e04c..313a4fb99 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/Glock18Item.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/Glock18Item.java @@ -175,4 +175,14 @@ public class Glock18Item extends GunItem implements GeoItem, AnimatedItem { public boolean ejectShell(ItemStack stack) { return true; } + + @Override + public boolean semi(ItemStack stack) { + return true; + } + + @Override + public boolean auto(ItemStack stack) { + return true; + } } \ No newline at end of file diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/M1911Item.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/M1911Item.java index 3e5c5ec87..376577c4f 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/M1911Item.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/M1911Item.java @@ -158,4 +158,9 @@ public class M1911Item extends GunItem implements GeoItem, AnimatedItem { public boolean ejectShell(ItemStack stack) { return true; } + + @Override + public boolean semi(ItemStack stack) { + return true; + } } \ No newline at end of file diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/Trachelium.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/Trachelium.java index cfcd5e0dc..57dd0f381 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/Trachelium.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/Trachelium.java @@ -343,4 +343,9 @@ public class Trachelium extends GunItem implements GeoItem, AnimatedItem { public boolean canCustomStock(ItemStack stack) { return true; } + + @Override + public boolean semi(ItemStack stack) { + return true; + } } \ No newline at end of file diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/machinegun/DevotionItem.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/machinegun/DevotionItem.java index b3e1874ad..9fa008635 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/machinegun/DevotionItem.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/machinegun/DevotionItem.java @@ -159,4 +159,9 @@ public class DevotionItem extends GunItem implements GeoItem, AnimatedItem { public boolean ejectShell(ItemStack stack) { return true; } + + @Override + public boolean auto(ItemStack stack) { + return true; + } } \ No newline at end of file diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/machinegun/M60Item.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/machinegun/M60Item.java index 47b5200dd..cb883c078 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/machinegun/M60Item.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/machinegun/M60Item.java @@ -183,4 +183,9 @@ public class M60Item extends GunItem implements GeoItem, AnimatedItem { public boolean ejectShell(ItemStack stack) { return true; } + + @Override + public boolean auto(ItemStack stack) { + return true; + } } \ No newline at end of file diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/machinegun/RpkItem.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/machinegun/RpkItem.java index 16475d395..a96c4eacd 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/machinegun/RpkItem.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/machinegun/RpkItem.java @@ -160,4 +160,14 @@ public class RpkItem extends GunItem implements GeoItem, AnimatedItem { public boolean ejectShell(ItemStack stack) { return true; } + + @Override + public boolean semi(ItemStack stack) { + return true; + } + + @Override + public boolean auto(ItemStack stack) { + return true; + } } \ No newline at end of file diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/AK12Item.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/AK12Item.java index 57acdaa5d..7e7896bf4 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/AK12Item.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/AK12Item.java @@ -205,6 +205,11 @@ public class AK12Item extends GunItem implements GeoItem, AnimatedItem { return PerkHelper.RIFLE_PERKS.test(perk) || PerkHelper.MAGAZINE_PERKS.test(perk); } + @Override + public boolean isMagazineReload(ItemStack stack) { + return true; + } + @Override public boolean isOpenBolt(ItemStack stack) { return true; @@ -254,4 +259,14 @@ public class AK12Item extends GunItem implements GeoItem, AnimatedItem { public boolean ejectShell(ItemStack stack) { return true; } + + @Override + public boolean semi(ItemStack stack) { + return true; + } + + @Override + public boolean auto(ItemStack stack) { + return true; + } } \ No newline at end of file diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/AK47Item.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/AK47Item.java index 537d1006b..dccd03d62 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/AK47Item.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/AK47Item.java @@ -268,4 +268,14 @@ public class AK47Item extends GunItem implements GeoItem, AnimatedItem { public boolean ejectShell(ItemStack stack) { return true; } + + @Override + public boolean semi(ItemStack stack) { + return true; + } + + @Override + public boolean auto(ItemStack stack) { + return true; + } } \ No newline at end of file diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/Hk416Item.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/Hk416Item.java index aa26c6f66..c2e9f0de5 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/Hk416Item.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/Hk416Item.java @@ -270,4 +270,14 @@ public class Hk416Item extends GunItem implements GeoItem, AnimatedItem { public boolean ejectShell(ItemStack stack) { return true; } + + @Override + public boolean semi(ItemStack stack) { + return true; + } + + @Override + public boolean auto(ItemStack stack) { + return true; + } } \ No newline at end of file diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/M4Item.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/M4Item.java index e78ca7d1a..b467e09cf 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/M4Item.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/M4Item.java @@ -269,4 +269,14 @@ public class M4Item extends GunItem implements GeoItem, AnimatedItem { public boolean ejectShell(ItemStack stack) { return true; } + + @Override + public boolean semi(ItemStack stack) { + return true; + } + + @Override + public boolean auto(ItemStack stack) { + return true; + } } \ No newline at end of file diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/MarlinItem.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/MarlinItem.java index 97d1f2f9a..e537bc880 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/MarlinItem.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/MarlinItem.java @@ -175,4 +175,9 @@ public class MarlinItem extends GunItem implements GeoItem, AnimatedItem { public boolean isIterativeReload(ItemStack stack) { return true; } + + @Override + public boolean semi(ItemStack stack) { + return true; + } } \ No newline at end of file diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/Mk14Item.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/Mk14Item.java index 258d28c64..d0437b2da 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/Mk14Item.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/Mk14Item.java @@ -268,4 +268,14 @@ public class Mk14Item extends GunItem implements GeoItem, AnimatedItem { public boolean ejectShell(ItemStack stack) { return true; } + + @Override + public boolean semi(ItemStack stack) { + return true; + } + + @Override + public boolean auto(ItemStack stack) { + return true; + } } \ No newline at end of file diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/Qbz95Item.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/Qbz95Item.java index 2120258b2..9252e01dc 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/Qbz95Item.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/Qbz95Item.java @@ -266,4 +266,14 @@ public class Qbz95Item extends GunItem implements GeoItem, AnimatedItem { public boolean ejectShell(ItemStack stack) { return true; } + + @Override + public boolean semi(ItemStack stack) { + return true; + } + + @Override + public boolean auto(ItemStack stack) { + return true; + } } \ No newline at end of file diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/SksItem.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/SksItem.java index f10ae7679..ef1b6e055 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/SksItem.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/SksItem.java @@ -168,4 +168,9 @@ public class SksItem extends GunItem implements GeoItem, AnimatedItem { public boolean ejectShell(ItemStack stack) { return true; } + + @Override + public boolean semi(ItemStack stack) { + return true; + } } \ No newline at end of file diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/shotgun/Aa12Item.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/shotgun/Aa12Item.java index b4dc97270..67af59e85 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/shotgun/Aa12Item.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/shotgun/Aa12Item.java @@ -192,4 +192,14 @@ public class Aa12Item extends GunItem implements GeoItem, AnimatedItem { public boolean ejectShell(ItemStack stack) { return true; } + + @Override + public boolean semi(ItemStack stack) { + return true; + } + + @Override + public boolean auto(ItemStack stack) { + return true; + } } \ No newline at end of file diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/shotgun/AbekiriItem.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/shotgun/AbekiriItem.java index 04b278c17..c1a43bddd 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/shotgun/AbekiriItem.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/shotgun/AbekiriItem.java @@ -153,4 +153,9 @@ public class AbekiriItem extends GunItem implements GeoItem, AnimatedItem { public boolean isOpenBolt(ItemStack stack) { return true; } + + @Override + public boolean semi(ItemStack stack) { + return true; + } } diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/shotgun/M870Item.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/shotgun/M870Item.java index 7d0d6926b..660629f45 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/shotgun/M870Item.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/shotgun/M870Item.java @@ -182,4 +182,9 @@ public class M870Item extends GunItem implements GeoItem, AnimatedItem { public boolean isIterativeReload(ItemStack stack) { return true; } + + @Override + public boolean semi(ItemStack stack) { + return true; + } } \ No newline at end of file diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/smg/VectorItem.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/smg/VectorItem.java index 3301fe4eb..02aa6257f 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/smg/VectorItem.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/smg/VectorItem.java @@ -244,4 +244,19 @@ public class VectorItem extends GunItem implements GeoItem, AnimatedItem { public boolean ejectShell(ItemStack stack) { return true; } + + @Override + public boolean semi(ItemStack stack) { + return true; + } + + @Override + public boolean burst(ItemStack stack) { + return true; + } + + @Override + public boolean auto(ItemStack stack) { + return true; + } } \ No newline at end of file diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/HuntingRifleItem.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/HuntingRifleItem.java index 7ea3c772e..e76ea4094 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/HuntingRifleItem.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/HuntingRifleItem.java @@ -134,4 +134,9 @@ public class HuntingRifleItem extends GunItem implements GeoItem, AnimatedItem { public boolean isMagazineReload(ItemStack stack) { return true; } + + @Override + public boolean semi(ItemStack stack) { + return true; + } } \ No newline at end of file diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/K98Item.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/K98Item.java index 4d7ed652f..89a55b18d 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/K98Item.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/K98Item.java @@ -182,4 +182,9 @@ public class K98Item extends GunItem implements GeoItem, AnimatedItem { public boolean isIterativeReload(ItemStack stack) { return true; } + + @Override + public boolean semi(ItemStack stack) { + return true; + } } \ No newline at end of file diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/M98bItem.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/M98bItem.java index 0450f82f6..919105c7e 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/M98bItem.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/M98bItem.java @@ -165,4 +165,9 @@ public class M98bItem extends GunItem implements GeoItem, AnimatedItem { public boolean bulletInBarrel(ItemStack stack) { return true; } + + @Override + public boolean semi(ItemStack stack) { + return true; + } } \ No newline at end of file diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/MosinNagantItem.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/MosinNagantItem.java index 215ded923..b20d76346 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/MosinNagantItem.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/MosinNagantItem.java @@ -177,4 +177,9 @@ public class MosinNagantItem extends GunItem implements GeoItem, AnimatedItem { public boolean isIterativeReload(ItemStack stack) { return true; } + + @Override + public boolean semi(ItemStack stack) { + return true; + } } \ No newline at end of file diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/Ntw20Item.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/Ntw20Item.java index a724a184c..e3369686e 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/Ntw20Item.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/Ntw20Item.java @@ -166,4 +166,9 @@ public class Ntw20Item extends GunItem implements GeoItem, AnimatedItem { public boolean bulletInBarrel(ItemStack stack) { return true; } + + @Override + public boolean semi(ItemStack stack) { + return true; + } } \ No newline at end of file diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/SentinelItem.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/SentinelItem.java index fb7004ea7..1155360b3 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/SentinelItem.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/SentinelItem.java @@ -248,4 +248,9 @@ public class SentinelItem extends GunItem implements GeoItem, AnimatedItem { public boolean bulletInBarrel(ItemStack stack) { return true; } + + @Override + public boolean semi(ItemStack stack) { + return true; + } } \ No newline at end of file diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/SvdItem.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/SvdItem.java index 58ea04f57..1b39e90c2 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/SvdItem.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/SvdItem.java @@ -153,4 +153,9 @@ public class SvdItem extends GunItem implements GeoItem, AnimatedItem { public boolean ejectShell(ItemStack stack) { return true; } + + @Override + public boolean semi(ItemStack stack) { + return true; + } } \ No newline at end of file diff --git a/src/main/java/com/atsuishio/superbwarfare/network/message/FireModeMessage.java b/src/main/java/com/atsuishio/superbwarfare/network/message/FireModeMessage.java index 87368ef11..1bfad62f5 100644 --- a/src/main/java/com/atsuishio/superbwarfare/network/message/FireModeMessage.java +++ b/src/main/java/com/atsuishio/superbwarfare/network/message/FireModeMessage.java @@ -2,7 +2,7 @@ package com.atsuishio.superbwarfare.network.message; import com.atsuishio.superbwarfare.init.ModItems; import com.atsuishio.superbwarfare.init.ModSounds; -import com.atsuishio.superbwarfare.init.ModTags; +import com.atsuishio.superbwarfare.item.gun.GunItem; import com.atsuishio.superbwarfare.tools.GunsTool; import net.minecraft.ChatFormatting; import net.minecraft.core.Holder; @@ -54,93 +54,92 @@ public class FireModeMessage { public static void changeFireMode(Player player) { ItemStack stack = player.getMainHandItem(); - if (!stack.is(ModTags.Items.GUN)) return; + if (stack.getItem() instanceof GunItem gunItem) { + CompoundTag data = stack.getOrCreateTag().getCompound("GunData"); + int fireMode = data.getInt("FireMode"); - CompoundTag data = stack.getOrCreateTag().getCompound("GunData"); - int fireMode = data.getInt("FireMode"); + CompoundTag tag = stack.getOrCreateTag(); - CompoundTag tag = stack.getOrCreateTag(); - - if (fireMode == 0) { - if (GunsTool.getGunBooleanTag(stack, "Burst", false)) { - GunsTool.setGunIntTag(stack, "FireMode", 1); - playChangeModeSound(player); - return; + if (fireMode == 0) { + if (gunItem.burst(stack)) { + GunsTool.setGunIntTag(stack, "FireMode", 1); + playChangeModeSound(player); + return; + } + if (gunItem.auto(stack)) { + GunsTool.setGunIntTag(stack, "FireMode", 2); + playChangeModeSound(player); + return; + } } - if (GunsTool.getGunBooleanTag(stack, "Auto", false)) { - GunsTool.setGunIntTag(stack, "FireMode", 2); - playChangeModeSound(player); - return; - } - } - if (fireMode == 1) { - if (GunsTool.getGunBooleanTag(stack, "Auto", false)) { - GunsTool.setGunIntTag(stack, "FireMode", 2); - playChangeModeSound(player); - return; + if (fireMode == 1) { + if (gunItem.auto(stack)) { + GunsTool.setGunIntTag(stack, "FireMode", 2); + playChangeModeSound(player); + return; + } + if (gunItem.semi(stack)) { + GunsTool.setGunIntTag(stack, "FireMode", 0); + playChangeModeSound(player); + return; + } } - if (GunsTool.getGunBooleanTag(stack, "Semi", false)) { - GunsTool.setGunIntTag(stack, "FireMode", 0); - playChangeModeSound(player); - return; + + if (fireMode == 2) { + if (gunItem.semi(stack)) { + GunsTool.setGunIntTag(stack, "FireMode", 0); + playChangeModeSound(player); + return; + } + if (gunItem.burst(stack)) { + GunsTool.setGunIntTag(stack, "FireMode", 1); + playChangeModeSound(player); + return; + } } - } - if (fireMode == 2) { - if (GunsTool.getGunBooleanTag(stack, "Semi", false)) { - GunsTool.setGunIntTag(stack, "FireMode", 0); - playChangeModeSound(player); - return; - } - if (GunsTool.getGunBooleanTag(stack, "Burst", false)) { - GunsTool.setGunIntTag(stack, "FireMode", 1); - playChangeModeSound(player); - return; - } - } + if (stack.getItem() == ModItems.SENTINEL.get() + && !player.isSpectator() + && !(player.getCooldowns().isOnCooldown(stack.getItem())) + && GunsTool.getGunIntTag(stack, "ReloadTime") == 0 + && !stack.getOrCreateTag().getBoolean("sentinel_is_charging")) { - if (stack.getItem() == ModItems.SENTINEL.get() - && !player.isSpectator() - && !(player.getCooldowns().isOnCooldown(stack.getItem())) - && GunsTool.getGunIntTag(stack, "ReloadTime") == 0 - && !stack.getOrCreateTag().getBoolean("sentinel_is_charging")) { + for (var cell : player.getInventory().items) { + if (cell.is(ModItems.CELL.get())) { + AtomicBoolean flag = new AtomicBoolean(false); + cell.getCapability(ForgeCapabilities.ENERGY).ifPresent( + iEnergyStorage -> flag.set(iEnergyStorage.getEnergyStored() >= 0) + ); - for (var cell : player.getInventory().items) { - if (cell.is(ModItems.CELL.get())) { - AtomicBoolean flag = new AtomicBoolean(false); - cell.getCapability(ForgeCapabilities.ENERGY).ifPresent( - iEnergyStorage -> flag.set(iEnergyStorage.getEnergyStored() >= 0) - ); - - if (flag.get()) { - tag.putBoolean("start_sentinel_charge", true); + if (flag.get()) { + tag.putBoolean("start_sentinel_charge", true); + } } } } - } - if (stack.getItem() == ModItems.JAVELIN.get()) { - tag.putBoolean("TopMode", !tag.getBoolean("TopMode")); - if (player instanceof ServerPlayer serverPlayer) { - serverPlayer.connection.send(new ClientboundSoundPacket(new Holder.Direct<>(ModSounds.CANNON_ZOOM_OUT.get()), - SoundSource.PLAYERS, serverPlayer.getX(), serverPlayer.getY(), serverPlayer.getZ(), 1f, 1f, serverPlayer.level().random.nextLong())); + if (stack.getItem() == ModItems.JAVELIN.get()) { + tag.putBoolean("TopMode", !tag.getBoolean("TopMode")); + if (player instanceof ServerPlayer serverPlayer) { + serverPlayer.connection.send(new ClientboundSoundPacket(new Holder.Direct<>(ModSounds.CANNON_ZOOM_OUT.get()), + SoundSource.PLAYERS, serverPlayer.getX(), serverPlayer.getY(), serverPlayer.getZ(), 1f, 1f, serverPlayer.level().random.nextLong())); + } + } + + if (stack.getItem() == ModItems.TRACHELIUM.get() && !GunsTool.getGunBooleanTag(stack, "NeedBoltAction", false)) { + if (!tag.getBoolean("DA")) { + tag.putBoolean("DA", true); + player.displayClientMessage(Component.translatable("des.superbwarfare.revolver.sa").withStyle(ChatFormatting.BOLD), true); + } else { + tag.putBoolean("DA", false); + player.displayClientMessage(Component.translatable("des.superbwarfare.revolver.da").withStyle(ChatFormatting.BOLD), true); + } + if (!tag.getBoolean("canImmediatelyShoot")) { + GunsTool.setGunBooleanTag(stack, "NeedBoltAction", true); + } } } - - if (stack.getItem() == ModItems.TRACHELIUM.get() && !GunsTool.getGunBooleanTag(stack, "NeedBoltAction", false)) { - if (!tag.getBoolean("DA")) { - tag.putBoolean("DA", true); - player.displayClientMessage(Component.translatable("des.superbwarfare.revolver.sa").withStyle(ChatFormatting.BOLD), true); - } else { - tag.putBoolean("DA", false); - player.displayClientMessage(Component.translatable("des.superbwarfare.revolver.da").withStyle(ChatFormatting.BOLD), true); - } - if (!tag.getBoolean("canImmediatelyShoot")) { - GunsTool.setGunBooleanTag(stack, "NeedBoltAction", true); - } - } - } private static void playChangeModeSound(Player player) { diff --git a/src/main/java/com/atsuishio/superbwarfare/network/message/ReloadMessage.java b/src/main/java/com/atsuishio/superbwarfare/network/message/ReloadMessage.java index 498264531..b362f022b 100644 --- a/src/main/java/com/atsuishio/superbwarfare/network/message/ReloadMessage.java +++ b/src/main/java/com/atsuishio/superbwarfare/network/message/ReloadMessage.java @@ -65,7 +65,7 @@ public class ReloadMessage { boolean canSingleReload = gunItem.isIterativeReload(stack); boolean canReload = gunItem.isMagazineReload(stack) && !gunItem.isClipReload(stack); - boolean clipLoad = gunItem.getAmmoCount(stack) == 0 && gunItem.isClipReload(stack); + boolean clipLoad = GunsTool.getGunIntTag(stack, "Ammo", 0) == 0 && gunItem.isClipReload(stack); // 检查备弹 int count = 0; @@ -96,12 +96,26 @@ public class ReloadMessage { } if (canReload || clipLoad) { - tag.putBoolean("start_reload", true); + int magazine = GunsTool.getGunIntTag(stack, "Magazine", 0); + + if (gunItem.isOpenBolt(stack)) { + if (gunItem.bulletInBarrel(stack)) { + if (GunsTool.getGunIntTag(stack, "Ammo", 0) < magazine + tag.getInt("customMag") + 1) { + tag.putBoolean("start_reload", true); + } + } else { + if (GunsTool.getGunIntTag(stack, "Ammo", 0) < magazine + tag.getInt("customMag")) { + tag.putBoolean("start_reload", true); + } + } + } else if (GunsTool.getGunIntTag(stack, "Ammo", 0) < magazine + tag.getInt("customMag")) { + tag.putBoolean("start_reload", true); + } return; } if (canSingleReload) { - if (gunItem.getAmmoCount(stack) < GunsTool.getGunIntTag(stack, "Magazine", 0) + tag.getInt("customMag")) { + if (GunsTool.getGunIntTag(stack, "Ammo", 0) < GunsTool.getGunIntTag(stack, "Magazine", 0) + tag.getInt("customMag")) { tag.putBoolean("start_single_reload", true); } } diff --git a/src/main/java/com/atsuishio/superbwarfare/tools/GunsTool.java b/src/main/java/com/atsuishio/superbwarfare/tools/GunsTool.java index 2f7d81788..6b92b180a 100644 --- a/src/main/java/com/atsuishio/superbwarfare/tools/GunsTool.java +++ b/src/main/java/com/atsuishio/superbwarfare/tools/GunsTool.java @@ -106,7 +106,7 @@ public class GunsTool { if (!(stack.getItem() instanceof GunItem gunItem)) return; int mag = GunsTool.getGunIntTag(stack, "Magazine", 0) + tag.getInt("customMag"); - int ammo = gunItem.getAmmoCount(stack); + int ammo = GunsTool.getGunIntTag(stack, "Ammo", 0); int ammoToAdd = mag - ammo + (extraOne ? 1 : 0); // 空仓换弹的栓动武器应该在换弹后取消待上膛标记 diff --git a/src/main/resources/assets/superbwarfare/animations/ak12.animation.json b/src/main/resources/assets/superbwarfare/animations/ak12.animation.json index 2dd5942db..ad29903fc 100644 --- a/src/main/resources/assets/superbwarfare/animations/ak12.animation.json +++ b/src/main/resources/assets/superbwarfare/animations/ak12.animation.json @@ -242,349 +242,370 @@ "bones": { "0": { "rotation": { - "0.15": { + "0.0": { "vector": [0, 0, 0] }, - "0.2333": { - "vector": [-13.59467, 1.59889, -0.0597], - "easing": "easeInElastic" + "0.1333": { + "vector": [-2.99197, -2.34076, -3.81083] }, - "0.3167": { - "vector": [-13.4882, 1.37149, -0.57174] + "0.2": { + "vector": [-12.10904, -5.51675, -10.10819] }, - "0.4333": { - "vector": [-13.3918, 0.47094, -5.24635] + "0.3": { + "vector": [-23.11357, -19.36321, -23.07043] }, - "0.5167": { - "vector": [-10.88864, -0.3826, -2.87472] + "0.3833": { + "vector": [-32.74067, -21.6486, -17.91188] }, - "0.6333": { - "vector": [-14.32523, -1.08564, -11.90473] + "0.4833": { + "vector": [-32.05197, -22.72024, -19.7356] }, - "0.7333": { - "vector": [-14.30348, -1.33052, -12.87588] + "0.5333": { + "vector": [-23.74634, -23.91069, -20.32174] }, - "0.8": { - "vector": [-4.36856, -0.15301, -17.00875], - "easing": "easeInElastic" + "0.55": { + "vector": [-30.13262, -22.68022, -21.23467] }, - "0.9333": { - "vector": [-11.32739, -0.93021, -6.94156], - "easing": "easeOutSine" + "0.5833": { + "vector": [-26.82846, -22.86927, -20.31653] }, - "1.1333": { - "vector": [-11.24975, 1.6251, -6.69388] + "0.65": { + "vector": [-33.85009, -21.36902, -20.34008] }, - "1.3": { - "vector": [-9.97469, 3.02705, -17.6383] + "0.7833": { + "vector": [-23.69767, -30.65149, -34.97942] }, - "1.7333": { - "vector": [-9.86643, 3.67788, -17.84913] + "0.8833": { + "vector": [-23.87314, -29.5668, -39.13569] }, - "1.8": { - "vector": [-17.05451, 6.16944, -16.87618] + "1.0167": { + "vector": [-14.34, -35.89, -55.17] + }, + "1.15": { + "vector": [-16.61483, -35.05489, -52.4888] + }, + "1.2833": { + "vector": [-16.07951, -33.94957, -53.78507] + }, + "1.4167": { + "vector": [-22.61113, -30.8633, -43.53397] + }, + "1.4833": { + "vector": [-32.46981, -20.07549, -20.95037] + }, + "1.6167": { + "vector": [-26.681, -27.52061, -35.20432] + }, + "1.7833": { + "vector": [-15.31958, -2.96368, -5.03831] }, "1.8667": { - "vector": [-8.03014, 2.69913, -17.54102] + "vector": [-9.07234, -1.20567, 6.00913] }, - "2.05": { - "vector": [0.1, 1.74, -4.02] + "1.9333": { + "vector": [-2.94771, -1.4232, 3.47003] }, - "2.25": { - "vector": [2, 0, 2.25] + "1.9833": { + "vector": [0.57324, -1.68438, -0.35369] }, - "2.4333": { - "vector": [0, 0, 0], - "easing": "easeInElastic" + "2.0833": { + "vector": [-0.78429, -0.96449, -0.75002] + }, + "2.1833": { + "vector": [-0.01963, 0.49961, 0.62491] + }, + "2.2833": { + "vector": [0, 0.375, -0.125] + }, + "2.3833": { + "vector": [0, 0, 0] } }, "position": { - "0.0833": { + "0.0": { "vector": [0, 0, 0] }, - "0.1833": { - "vector": [-0.1, 0.1, -0.4], - "easing": "easeInElastic" + "0.1333": { + "vector": [-0.15, -0.6, 0.275] }, - "0.2833": { - "vector": [-0.1, 0.7, 0.65], - "easing": "easeOutQuad" + "0.2": { + "vector": [-0.195, -0.05, 0.24] }, - "0.3667": { - "vector": [-0.1, 0.7, -0.4], - "easing": "easeOutQuad" + "0.3": { + "vector": [-0.19, 0.935, 0.03] + }, + "0.3833": { + "vector": [-0.07, 1.915, -0.385] + }, + "0.4333": { + "vector": [-0.15, 1.45, -0.645] + }, + "0.4833": { + "vector": [-0.15, 1.425, -0.655] }, "0.5333": { - "vector": [-0.1, 0.5, -0.6] + "vector": [0.48008, 0.67962, -0.93897] }, - "0.6333": { - "vector": [-0.1, 0.25, -0.6] + "0.5833": { + "vector": [-0.25, 1.235, -0.545] }, - "0.7333": { - "vector": [-0.1, 0.25, -0.6] + "0.6": { + "vector": [-0.34, 1.505, -0.385] }, - "0.8": { - "vector": [0.36495, -0.3011, -0.70059] + "0.7": { + "vector": [-0.42, 1.63, -0.495] }, - "1.05": { - "vector": [-0.04863, 0.13019, -0.57971] + "0.8833": { + "vector": [-0.69, 0.95625, -1.015] }, - "1.2": { - "vector": [0.10317, -0.10129, -0.60415] + "0.9667": { + "vector": [-0.475, 1.025, -1.015] }, - "1.45": { - "vector": [0.14325, 0.06078, -0.58657] + "1.2833": { + "vector": [0.03, 1.03, -1.01] }, - "1.7333": { - "vector": [0.11268, 0.11258, -0.78102] + "1.4167": { + "vector": [-0.47, 1.03, -1.01] }, - "1.8": { - "vector": [0.14791, 0.0351, -0.49198] + "1.4833": { + "vector": [-0.32, 1.03, -1.01] }, - "1.8667": { - "vector": [-0.5395, 0.29301, -0.39434] + "1.6167": { + "vector": [0.06655, 0.97467, -1.01395] }, - "1.95": { - "vector": [0.14791, 0.0351, -0.49198] + "1.8333": { + "vector": [-0.395, 0.225, 0.135] }, - "2.0167": { - "vector": [0.40834, -0.35741, -0.73343], - "easing": "easeInSine" + "1.9333": { + "vector": [-0.59, -0.07, -0.775] }, - "2.0833": { - "vector": [0.44, -0.17, -0.42] + "1.9833": { + "vector": [-0.165, -0.15, -1.135] }, - "2.1667": { - "vector": [0, 0.06, 0.14844] + "2.0667": { + "vector": [0.06, -0.23, -0.325] }, - "2.2667": { - "vector": [0, 0.02, 0.8986] + "2.1333": { + "vector": [-0.025, -0.15, 0.2] }, - "2.4167": { - "vector": [0, 0, 0], - "easing": "easeInElastic" + "2.1833": { + "vector": [0.05, 0.025, 0] + }, + "2.2833": { + "vector": [0, -0.05, 0.03125] + }, + "2.3667": { + "vector": [0, 0, 0] } } }, "magazine": { "rotation": { - "0.7167": { + "0.5333": { "vector": [0, 0, 0] }, - "0.9167": { - "vector": [22.5, 0, 0] + "0.55": { + "vector": [-4, 0, 0] }, - "0.9667": { - "vector": [0, 0, 0] + "0.6": { + "vector": [-9.75, 0, 0] }, - "1.1": { - "vector": [-12.5, -70, -130] + "0.6333": { + "vector": [-24.75, 0, 0] }, - "1.1333": { - "vector": [-12.5, -70, -130] + "0.85": { + "vector": [59.73664, 1.67294, -32.59404] }, - "1.1833": { - "vector": [1.51, -72.16, -135.34] + "0.9": { + "vector": [54.9, 0, 0] }, - "1.2333": { - "vector": [-0.58781, -40.02039, -106.56534] + "1.2667": { + "vector": [-10.64, -0.22, -0.76] }, - "1.35": { - "vector": [-14.72777, -7.86614, -33.43033], - "easing": "easeInOutSine" + "1.3333": { + "vector": [-11.53843, -0.2156, -0.76216] }, - "1.45": { - "vector": [-22.63843, -5.6156, -7.36216], - "easing": "easeInOutSine" + "1.4167": { + "vector": [-1.89, -0.22, -0.76] }, - "1.65": { - "vector": [-12, 0, 0] + "1.4333": { + "vector": [-1.88843, -0.2156, -0.76216] }, - "1.7167": { - "vector": [-11.39, 0, 0] + "1.4667": { + "vector": [2.77, 1.19, 1.08] }, - "1.8333": { - "vector": [0, 0, 0] + "1.5333": { + "vector": [-4, 0, 0] }, - "1.8833": { + "1.5833": { "vector": [0, 0, 0] } }, "position": { - "0.7167": { + "0.5333": { "vector": [0, 0, 0] }, + "0.55": { + "vector": [0, 0, -0.1875] + }, + "0.6": { + "vector": [0, -0.07812, -0.38672] + }, + "0.6333": { + "vector": [0, 0.12188, -0.93672] + }, + "0.7": { + "vector": [1.69, -2.94, 0.1] + }, "0.9167": { - "vector": [0, -10, 3], - "easing": "easeInSine" + "vector": [7.2, -12.25391, 6.7875] }, - "0.9667": { - "vector": [0, -10, 0], - "easing": "easeInSine" + "1.0": { + "vector": [7.2, -12.25391, 6.7875] }, - "1.1": { - "vector": [3.05, -7.25, 7.56] + "1.2667": { + "vector": [-0.13, -0.30828, -0.43563] }, - "1.1333": { - "vector": [4.08351, -1.47888, 4.9022], - "easing": "easeInOutSine" + "1.3333": { + "vector": [-0.12957, -0.31603, -0.4701] }, - "1.2": { - "vector": [5.1, 0.44, 3.5] + "1.4167": { + "vector": [-0.13, -0.30828, -0.43563] }, - "1.3167": { - "vector": [2.86, -1.65, -0.74] + "1.4333": { + "vector": [-0.12957, 0.18006, -0.46385] }, - "1.45": { - "vector": [0.39786, 0.10076, -1.31536], - "easing": "easeInOutSine" + "1.4667": { + "vector": [-0.22, 0.14, -0.29] }, - "1.6333": { - "vector": [0, -0.26562, -0.6] + "1.5333": { + "vector": [0, 0, -0.1875] }, - "1.7167": { - "vector": [0, -0.23203, -0.53359] - }, - "1.8333": { - "vector": [0, 0, 0], - "easing": "easeInElastic" - }, - "1.8833": { + "1.5833": { "vector": [0, 0, 0] } } }, "Lefthand": { "rotation": { - "0.3333": { + "0.0833": { "vector": [0, 0, 0] }, - "0.4333": { + "0.2667": { "vector": [-10.83774, -11.3082, 26.01338], "easing": "easeInElastic" }, - "0.55": { - "vector": [-10.83774, -11.3082, 26.01338], - "easing": "easeInElastic" - }, - "0.6667": { + "0.4": { "vector": [-10.83774, -11.3082, 26.01338], "easing": "easeInOutSine" }, - "0.7167": { + "0.4833": { "vector": [-10.84, -11.31, 26.01] }, + "0.5333": { + "vector": [-11.44, -11.36, 27.22] + }, + "0.6333": { + "vector": [-4.63269, -11.45846, 29.63712] + }, + "0.7": { + "vector": [-20.58591, -2.16914, 27.63857] + }, "0.9167": { - "vector": [-12.84863, -4.82913, 20.93756], - "easing": "easeOutSine" + "vector": [-87.4143, -4.67709, 33.76112] }, - "0.9667": { - "vector": [10.233, 10.2596, 3.51854], - "easing": "easeOutSine" - }, - "1.1": { - "vector": [-49.77006, 64.26495, -91.19885] - }, - "1.1333": { - "vector": [-47.55314, 65.39596, -103.44208] + "1.0": { + "vector": [-90.78179, 3.04131, 29.32006] }, "1.2": { - "vector": [-46.07222, 70.25928, -87.18593] + "vector": [-22.5014, -15.83802, 29.24083] }, - "1.2667": { - "vector": [-16.54273, 37.67935, -40.57865] + "1.2833": { + "vector": [-21.52768, -17.94881, 26.27751] }, "1.3167": { - "vector": [-13.14801, 19.23814, -10.56439] + "vector": [-23.93819, -18.79312, 25.09219] + }, + "1.4167": { + "vector": [-23.69, -11.36, 27.22] }, "1.45": { - "vector": [-10.79618, 6.21927, 22.54367], - "easing": "linear" + "vector": [-18.19, -11.36, 27.22] }, - "1.6333": { - "vector": [-27.96238, -13.84396, 58.89893] + "1.5167": { + "vector": [-23.69, -11.36, 27.22] }, - "1.7333": { - "vector": [-23.9632, -12.39386, 52.59974], - "easing": "linear" + "1.5833": { + "vector": [-23.69, -11.36, 27.22] }, - "1.8333": { - "vector": [-23.9632, -12.39386, 52.59974], - "easing": "linear" + "1.65": { + "vector": [-23.69, -11.36, 27.22] }, - "1.9167": { - "vector": [-23.9632, -12.39386, 52.59974], - "easing": "linear" - }, - "2.0833": { + "1.8167": { "vector": [0, 0, 0] } }, "position": { - "0.3333": { + "0.0833": { "vector": [0, 0, 0] }, - "0.4333": { + "0.2667": { "vector": [-2.59069, -0.63326, 6.31688], "easing": "easeInElastic" }, - "0.55": { - "vector": [-2.59069, -0.63326, 6.31688], - "easing": "easeInElastic" - }, - "0.6667": { + "0.4": { "vector": [-2.59069, -0.63326, 6.31688], "easing": "easeInOutSine" }, - "0.7167": { + "0.4833": { "vector": [-2.59, -1.29, 5.89] }, + "0.5333": { + "vector": [-2.66, -1.3, 5.9] + }, + "0.5833": { + "vector": [-2.88, -2.455, 5.59] + }, + "0.6333": { + "vector": [-3.11, -3.285, 3.745] + }, + "0.7": { + "vector": [-2.39, -4.44, 7.47] + }, "0.9167": { - "vector": [-2.69069, -12.23326, 9.61688], - "easing": "easeInSine" + "vector": [2.56, -2.95, 15.53] }, - "0.9667": { - "vector": [-1.09069, -13.13326, 3.41688], - "easing": "easeInSine" + "1.0": { + "vector": [1.71, -2.945, 14.35] }, - "1.1": { - "vector": [3.78778, -5.55218, 11.79434] - }, - "1.1333": { - "vector": [6.50262, 0.9929, 8.56821] + "1.1167": { + "vector": [0.37, -4.1, 12.695] }, "1.2": { - "vector": [6.51159, 0.43131, 6.5098] + "vector": [-0.59, -4.92, 8.21] }, - "1.2667": { - "vector": [5.08812, -0.82527, 5.37621] + "1.2833": { + "vector": [-1.55, -2.12, 5.78] }, "1.3167": { - "vector": [1.61237, -3.02671, 4.36969] + "vector": [-1.93, -0.77, 5.86] }, - "1.3833": { - "vector": [-0.78777, -2.78872, 4.5296] + "1.4167": { + "vector": [-2.63, -1.3, 6.605] }, "1.45": { - "vector": [-3.9135, -3.08305, 4.31438], - "easing": "linear" + "vector": [-2.63, -1.43, 6.115] }, - "1.6333": { - "vector": [-5.03219, -1.54203, 6.77] + "1.5167": { + "vector": [-2.63, -1.3, 6.605] }, - "1.7333": { - "vector": [-4.22575, -1.43666, 6.09951], - "easing": "linear" + "1.5833": { + "vector": [-2.63, -1.3, 6.94] }, - "1.8333": { - "vector": [-4.22575, -1.43666, 6.09951], - "easing": "linear" + "1.65": { + "vector": [-2.63, -1.3, 6.605] }, - "1.9167": { - "vector": [-4.22575, -1.43666, 6.09951], - "easing": "linear" - }, - "2.0833": { + "1.8167": { "vector": [0, 0, 0] } } @@ -659,354 +680,372 @@ "bones": { "0": { "rotation": { - "0.15": { + "0.0": { "vector": [0, 0, 0] }, - "0.2333": { - "vector": [-13.59467, 1.59889, -0.0597], - "easing": "easeInElastic" + "0.1333": { + "vector": [-2.99197, -2.34076, -3.81083] }, - "0.3167": { - "vector": [-13.4882, 1.37149, -0.57174] + "0.2": { + "vector": [-12.10904, -5.51675, -10.10819] }, - "0.4333": { - "vector": [-13.3918, 0.47094, -5.24635] + "0.3": { + "vector": [-23.11357, -19.36321, -23.07043] }, - "0.5167": { - "vector": [-10.88864, -0.3826, -2.87472] + "0.3833": { + "vector": [-32.74067, -21.6486, -17.91188] }, - "0.6333": { - "vector": [-14.32523, -1.08564, -11.90473] + "0.4833": { + "vector": [-32.05197, -22.72024, -19.7356] }, - "0.7333": { - "vector": [-14.30348, -1.33052, -12.87588] + "0.5333": { + "vector": [-23.74634, -23.91069, -20.32174] }, - "0.8": { - "vector": [-4.36856, -0.15301, -17.00875], - "easing": "easeInElastic" + "0.55": { + "vector": [-30.13262, -22.68022, -21.23467] }, - "0.9333": { - "vector": [-11.32739, -0.93021, -6.94156], - "easing": "easeOutSine" + "0.5833": { + "vector": [-26.82846, -22.86927, -20.31653] }, - "1.1333": { - "vector": [-11.24975, 1.6251, -6.69388] + "0.65": { + "vector": [-33.85009, -21.36902, -20.34008] }, - "1.3": { - "vector": [-9.97469, 3.02705, -17.6383] + "0.7833": { + "vector": [-23.69767, -30.65149, -34.97942] }, - "1.7333": { - "vector": [-9.86643, 3.67788, -17.84913] + "0.8833": { + "vector": [-23.87314, -29.5668, -39.13569] }, - "1.8": { - "vector": [-17.05451, 6.16944, -16.87618] + "1.0167": { + "vector": [-14.34, -35.89, -55.17] + }, + "1.15": { + "vector": [-16.61483, -35.05489, -52.4888] + }, + "1.2833": { + "vector": [-16.07951, -33.94957, -53.78507] + }, + "1.4167": { + "vector": [-22.61113, -30.8633, -43.53397] + }, + "1.4833": { + "vector": [-32.46981, -20.07549, -20.95037] + }, + "1.6167": { + "vector": [-26.681, -27.52061, -35.20432] + }, + "1.7833": { + "vector": [-15.31958, -2.96368, -5.03831] }, "1.8667": { - "vector": [-8.03014, 2.69913, -17.54102] + "vector": [-9.07234, -1.20567, 6.00913] }, - "2.05": { - "vector": [0.1, 1.74, -4.02] + "1.9333": { + "vector": [-2.94771, -1.4232, 3.47003] }, - "2.25": { - "vector": [2, 0, 2.25] + "1.9833": { + "vector": [0.57324, -1.68438, -0.35369] }, - "2.4333": { - "vector": [0, 0, 0], - "easing": "easeInElastic" + "2.0833": { + "vector": [-0.78429, -0.96449, -0.75002] + }, + "2.1833": { + "vector": [-0.01963, 0.49961, 0.62491] + }, + "2.2833": { + "vector": [0, 0.375, -0.125] + }, + "2.3833": { + "vector": [0, 0, 0] } }, "position": { - "0.0833": { + "0.0": { "vector": [0, 0, 0] }, - "0.1833": { - "vector": [-0.1, 0.1, -0.4], - "easing": "easeInElastic" + "0.1333": { + "vector": [-0.15, -0.6, 0.275] }, - "0.2833": { - "vector": [-0.1, 0.7, 0.65], - "easing": "easeOutQuad" + "0.2": { + "vector": [-0.195, -0.05, 0.24] }, - "0.3667": { - "vector": [-0.1, 0.7, -0.4], - "easing": "easeOutQuad" + "0.3": { + "vector": [-0.19, 0.935, 0.03] + }, + "0.3833": { + "vector": [-0.07, 1.915, -0.385] + }, + "0.4333": { + "vector": [-0.15, 1.45, -0.645] + }, + "0.4833": { + "vector": [-0.15, 1.425, -0.655] }, "0.5333": { - "vector": [-0.1, 0.5, -0.6] + "vector": [0.48008, 0.67962, -0.93897] }, - "0.6333": { - "vector": [-0.1, 0.25, -0.6] + "0.5833": { + "vector": [-0.25, 1.235, -0.545] }, - "0.7333": { - "vector": [-0.1, 0.25, -0.6] + "0.6": { + "vector": [-0.34, 1.505, -0.385] }, - "0.8": { - "vector": [0.36495, -0.3011, -0.70059] + "0.7": { + "vector": [-0.42, 1.63, -0.495] }, - "1.05": { - "vector": [-0.04863, 0.13019, -0.57971] + "0.8833": { + "vector": [-0.69, 0.95625, -1.015] }, - "1.2": { - "vector": [0.10317, -0.10129, -0.60415] + "0.9667": { + "vector": [-0.475, 1.025, -1.015] }, - "1.45": { - "vector": [0.14325, 0.06078, -0.58657] + "1.2833": { + "vector": [0.03, 1.03, -1.01] }, - "1.7333": { - "vector": [0.11268, 0.11258, -0.78102] + "1.4167": { + "vector": [-0.47, 1.03, -1.01] }, - "1.8": { - "vector": [0.14791, 0.0351, -0.49198] + "1.4833": { + "vector": [-0.32, 1.03, -1.01] }, - "1.8667": { - "vector": [-0.5395, 0.29301, -0.39434] + "1.6167": { + "vector": [0.06655, 0.97467, -1.01395] }, - "1.95": { - "vector": [0.14791, 0.0351, -0.49198] + "1.8333": { + "vector": [-0.395, 0.225, 0.135] }, - "2.0167": { - "vector": [0.40834, -0.35741, -0.73343], - "easing": "easeInSine" + "1.9333": { + "vector": [-0.59, -0.07, -0.775] }, - "2.0833": { - "vector": [0.44, -0.17, -0.42] + "1.9833": { + "vector": [-0.165, -0.15, -1.135] }, - "2.1667": { - "vector": [0, 0.06, 0.14844] + "2.0667": { + "vector": [0.06, -0.23, -0.325] }, - "2.2667": { - "vector": [0, 0.02, 0.8986] + "2.1333": { + "vector": [-0.025, -0.15, 0.2] }, - "2.4167": { - "vector": [0, 0, 0], - "easing": "easeInElastic" + "2.1833": { + "vector": [0.05, 0.025, 0] + }, + "2.2833": { + "vector": [0, -0.05, 0.03125] + }, + "2.3667": { + "vector": [0, 0, 0] } } }, "magazine": { "rotation": { - "0.7167": { + "0.5333": { "vector": [0, 0, 0] }, - "0.9167": { - "vector": [22.5, 0, 0] + "0.55": { + "vector": [-4, 0, 0] }, - "0.9667": { - "vector": [0, 0, 0] + "0.6": { + "vector": [-9.75, 0, 0] }, - "1.1": { - "vector": [-12.5, -70, -130] + "0.6333": { + "vector": [-24.75, 0, 0] }, - "1.1333": { - "vector": [-12.5, -70, -130] + "0.85": { + "vector": [59.73664, 1.67294, -32.59404] }, - "1.1833": { - "vector": [1.51, -72.16, -135.34] + "0.9": { + "vector": [54.9, 0, 0] }, - "1.2333": { - "vector": [-0.58781, -40.02039, -106.56534] + "1.2667": { + "vector": [-10.64, -0.22, -0.76] }, - "1.35": { - "vector": [-14.72777, -7.86614, -33.43033], - "easing": "easeInOutSine" + "1.3333": { + "vector": [-11.53843, -0.2156, -0.76216] }, - "1.45": { - "vector": [-22.63843, -5.6156, -7.36216], - "easing": "easeInOutSine" + "1.4167": { + "vector": [-1.89, -0.22, -0.76] }, - "1.65": { - "vector": [-12, 0, 0] + "1.4333": { + "vector": [-1.88843, -0.2156, -0.76216] }, - "1.7167": { - "vector": [-11.39, 0, 0] + "1.4667": { + "vector": [2.77, 1.19, 1.08] }, - "1.8333": { - "vector": [0, 0, 0] + "1.5333": { + "vector": [-4, 0, 0] }, - "1.8833": { + "1.5833": { "vector": [0, 0, 0] } }, "position": { - "0.7167": { + "0.5333": { "vector": [0, 0, 0] }, + "0.55": { + "vector": [0, 0, -0.1875] + }, + "0.6": { + "vector": [0, -0.07812, -0.38672] + }, + "0.6333": { + "vector": [0, 0.12188, -0.93672] + }, + "0.7": { + "vector": [1.69, -2.94, 0.1] + }, "0.9167": { - "vector": [0, -10, 3], - "easing": "easeInSine" + "vector": [7.2, -12.25391, 6.7875] }, - "0.9667": { - "vector": [0, -10, 0], - "easing": "easeInSine" + "1.0": { + "vector": [7.2, -12.25391, 6.7875] }, - "1.1": { - "vector": [3.05, -7.25, 7.56] + "1.2667": { + "vector": [-0.13, -0.30828, -0.43563] }, - "1.1333": { - "vector": [4.08351, -1.47888, 4.9022], - "easing": "easeInOutSine" + "1.3333": { + "vector": [-0.12957, -0.31603, -0.4701] }, - "1.2": { - "vector": [5.1, 0.44, 3.5] + "1.4167": { + "vector": [-0.13, -0.30828, -0.43563] }, - "1.3167": { - "vector": [2.86, -1.65, -0.74] + "1.4333": { + "vector": [-0.12957, 0.18006, -0.46385] }, - "1.45": { - "vector": [0.39786, 0.10076, -1.31536], - "easing": "easeInOutSine" + "1.4667": { + "vector": [-0.22, 0.14, -0.29] }, - "1.6333": { - "vector": [0, -0.26562, -0.6] + "1.5333": { + "vector": [0, 0, -0.1875] }, - "1.7167": { - "vector": [0, -0.23203, -0.53359] - }, - "1.8333": { - "vector": [0, 0, 0], - "easing": "easeInElastic" - }, - "1.8833": { + "1.5833": { "vector": [0, 0, 0] } } }, "Lefthand": { "rotation": { - "0.3333": { + "0.0833": { "vector": [0, 0, 0] }, - "0.4333": { - "vector": [-23.04, -6.9, 40.68] + "0.2667": { + "vector": [-20.94118, -6.08528, 30.80432], + "easing": "easeInElastic" }, - "0.55": { - "vector": [-23.04, -6.9, 40.68] - }, - "0.6667": { - "vector": [-19.44764, -4.38972, 32.30549], + "0.4": { + "vector": [-22.00608, -5.12697, 31.18773], "easing": "easeInOutSine" }, - "0.7167": { - "vector": [-19.44764, -4.38972, 32.30549], + "0.4833": { + "vector": [-22.00608, -5.12697, 31.18773], "easing": "easeInOutSine" }, + "0.5333": { + "vector": [-12.26845, -7.60354, 30.6228] + }, + "0.6333": { + "vector": [-9.0723, -17.52906, 45.91057] + }, + "0.7": { + "vector": [-23.98801, -11.99261, 44.27125] + }, "0.9167": { - "vector": [-12.84863, -4.82913, 20.93756], - "easing": "easeOutSine" + "vector": [-75.00219, 7.02533, 38.7168] }, - "0.9667": { - "vector": [10.233, 10.2596, 3.51854], - "easing": "easeOutSine" - }, - "1.1": { - "vector": [8.96186, 2.0287, -3.2794] - }, - "1.1333": { - "vector": [10.14796, 1.03822, -17.5079] + "1.0": { + "vector": [-78.86682, 11.92965, 47.27762] }, "1.2": { - "vector": [15.47014, -1.87641, -9.25971] + "vector": [-21.84027, -8.03931, 33.93157] }, - "1.2667": { - "vector": [-2.21105, -13.60693, 5.606] + "1.2833": { + "vector": [-14.99823, -16.14441, 37.15204] }, "1.3167": { - "vector": [-12.93896, -12.29493, 22.09467] + "vector": [-14.99823, -16.14441, 37.15204] }, - "1.3833": { - "vector": [-16.2633, -16.81844, 40.76366] + "1.4167": { + "vector": [-20.02306, -10.63719, 38.20898] }, "1.45": { - "vector": [-26.42462, -24.4908, 57.19633], - "easing": "linear" + "vector": [-20.02306, -10.63719, 38.20898] }, - "1.55": { - "vector": [-23.13815, -22.34869, 50.80967], - "easing": "linear" + "1.5167": { + "vector": [-28.66524, -24.0462, 57.94176] }, - "1.6333": { - "vector": [-30.61838, -18.5508, 57.11005] + "1.5833": { + "vector": [-28.45042, -21.67782, 56.83388] }, - "1.7333": { - "vector": [-29.15028, -18.84594, 56.47139] + "1.65": { + "vector": [-28.45042, -21.67782, 56.83388] }, - "1.8333": { - "vector": [-29.15028, -18.84594, 56.47139] - }, - "1.9167": { - "vector": [-25.10279, -2.73231, 57.98657], - "easing": "linear" - }, - "2.0833": { + "1.8167": { "vector": [0, 0, 0] } }, "position": { - "0.3333": { + "0.0833": { "vector": [0, 0, 0] }, - "0.4333": { - "vector": [-2.59, -0.63, 6.45] + "0.2667": { + "vector": [-2.59069, -0.63326, 6.31688], + "easing": "easeInElastic" }, - "0.55": { - "vector": [-2.59, -0.63, 6.45] - }, - "0.6667": { + "0.4": { "vector": [-2.59069, -0.63326, 6.31688], "easing": "easeInOutSine" }, - "0.7167": { + "0.4833": { "vector": [-2.59069, -0.63326, 6.31688], "easing": "easeInOutSine" }, + "0.5333": { + "vector": [-2.66, -1.3, 5.9] + }, + "0.5833": { + "vector": [-2.88, -2.455, 5.59] + }, + "0.6333": { + "vector": [-3.51, -2.685, 3.745] + }, + "0.7": { + "vector": [-1.64, -3.14, 7.47] + }, "0.9167": { - "vector": [-2.69069, -12.23326, 9.61688], - "easing": "easeInSine" + "vector": [2.56, -2.75, 15.53] }, - "0.9667": { - "vector": [-1.09069, -13.13326, 3.41688], - "easing": "easeInSine" + "1.0": { + "vector": [1.71, -2.945, 14.35] }, - "1.1": { - "vector": [3.78778, -5.55218, 11.79434] - }, - "1.1333": { - "vector": [6.50262, 0.9929, 8.56821] + "1.1167": { + "vector": [0.37, -4.1, 12.695] }, "1.2": { - "vector": [6.51159, 0.43131, 6.5098] + "vector": [-0.59, -3.22, 8.01] }, - "1.2667": { - "vector": [5.08812, -0.82527, 5.37621] + "1.2833": { + "vector": [-1.8, -1.92, 5.13] }, "1.3167": { - "vector": [2.11901, -1.90094, 5.02998] + "vector": [-1.8, -1.92, 5.13] }, - "1.3833": { - "vector": [-0.78777, -2.78872, 4.5296] + "1.4167": { + "vector": [-2.63, -1.3, 6.605] }, "1.45": { - "vector": [-2.65755, -2.13952, 4.93059], - "easing": "linear" + "vector": [-2.63, -1.3, 6.605] }, - "1.55": { - "vector": [-2.65755, -2.13952, 4.93059], - "easing": "linear" + "1.5167": { + "vector": [-2.63, -1.3, 6.605] }, - "1.6333": { - "vector": [-3.27214, -1.48037, 6.08189] + "1.5833": { + "vector": [-2.63, -1.3, 6.94] }, - "1.7333": { - "vector": [-3.21729, -1.68999, 6.47986] + "1.65": { + "vector": [-2.63, -1.3, 6.94] }, - "1.8333": { - "vector": [-3.21729, -1.68999, 6.47986] - }, - "1.9167": { - "vector": [-4.22575, -1.43666, 6.09951], - "easing": "linear" - }, - "2.0833": { + "1.8167": { "vector": [0, 0, 0] } } @@ -1692,349 +1731,370 @@ "bones": { "0": { "rotation": { - "0.15": { + "0.0": { "vector": [0, 0, 0] }, - "0.2333": { - "vector": [-13.59467, 1.59889, -0.0597], - "easing": "easeInElastic" + "0.1333": { + "vector": [-2.99197, -2.34076, -3.81083] }, - "0.3167": { - "vector": [-13.4882, 1.37149, -0.57174] + "0.2": { + "vector": [-12.10904, -5.51675, -10.10819] }, - "0.4333": { - "vector": [-13.3918, 0.47094, -5.24635] + "0.3": { + "vector": [-23.11357, -19.36321, -23.07043] }, - "0.5167": { - "vector": [-10.88864, -0.3826, -2.87472] + "0.3833": { + "vector": [-32.74067, -21.6486, -17.91188] }, - "0.6333": { - "vector": [-14.32523, -1.08564, -11.90473] + "0.4833": { + "vector": [-32.05197, -22.72024, -19.7356] }, - "0.7333": { - "vector": [-14.30348, -1.33052, -12.87588] + "0.5333": { + "vector": [-23.74634, -23.91069, -20.32174] }, - "0.8": { - "vector": [-4.36856, -0.15301, -17.00875], - "easing": "easeInElastic" + "0.55": { + "vector": [-30.13262, -22.68022, -21.23467] }, - "0.9333": { - "vector": [-11.32739, -0.93021, -6.94156], - "easing": "easeOutSine" + "0.5833": { + "vector": [-26.82846, -22.86927, -20.31653] }, - "1.1333": { - "vector": [-11.24975, 1.6251, -6.69388] + "0.65": { + "vector": [-33.85009, -21.36902, -20.34008] }, - "1.3": { - "vector": [-9.97469, 3.02705, -17.6383] + "0.7833": { + "vector": [-23.69767, -30.65149, -34.97942] }, - "1.7333": { - "vector": [-9.86643, 3.67788, -17.84913] + "0.8833": { + "vector": [-23.87314, -29.5668, -39.13569] }, - "1.8": { - "vector": [-17.05451, 6.16944, -16.87618] + "1.0167": { + "vector": [-14.34, -35.89, -55.17] + }, + "1.15": { + "vector": [-16.61483, -35.05489, -52.4888] + }, + "1.2833": { + "vector": [-16.07951, -33.94957, -53.78507] + }, + "1.4167": { + "vector": [-22.61113, -30.8633, -43.53397] + }, + "1.4833": { + "vector": [-32.46981, -20.07549, -20.95037] + }, + "1.6167": { + "vector": [-26.681, -27.52061, -35.20432] + }, + "1.7833": { + "vector": [-15.31958, -2.96368, -5.03831] }, "1.8667": { - "vector": [-8.03014, 2.69913, -17.54102] + "vector": [-9.07234, -1.20567, 6.00913] }, - "2.05": { - "vector": [0.1, 1.74, -4.02] + "1.9333": { + "vector": [-2.94771, -1.4232, 3.47003] }, - "2.25": { - "vector": [2, 0, 2.25] + "1.9833": { + "vector": [0.57324, -1.68438, -0.35369] }, - "2.4333": { - "vector": [0, 0, 0], - "easing": "easeInElastic" + "2.0833": { + "vector": [-0.78429, -0.96449, -0.75002] + }, + "2.1833": { + "vector": [-0.01963, 0.49961, 0.62491] + }, + "2.2833": { + "vector": [0, 0.375, -0.125] + }, + "2.3833": { + "vector": [0, 0, 0] } }, "position": { - "0.0833": { + "0.0": { "vector": [0, 0, 0] }, - "0.1833": { - "vector": [-0.1, 0.1, -0.4], - "easing": "easeInElastic" + "0.1333": { + "vector": [-0.15, -0.6, 0.275] }, - "0.2833": { - "vector": [-0.1, 0.7, 0.65], - "easing": "easeOutQuad" + "0.2": { + "vector": [-0.195, -0.05, 0.24] }, - "0.3667": { - "vector": [-0.1, 0.7, -0.4], - "easing": "easeOutQuad" + "0.3": { + "vector": [-0.19, 0.935, 0.03] + }, + "0.3833": { + "vector": [-0.07, 1.915, -0.385] + }, + "0.4333": { + "vector": [-0.15, 1.45, -0.645] + }, + "0.4833": { + "vector": [-0.15, 1.425, -0.655] }, "0.5333": { - "vector": [-0.1, 0.5, -0.6] + "vector": [0.48008, 0.67962, -0.93897] }, - "0.6333": { - "vector": [-0.1, 0.25, -0.6] + "0.5833": { + "vector": [-0.25, 1.235, -0.545] }, - "0.7333": { - "vector": [-0.1, 0.25, -0.6] + "0.6": { + "vector": [-0.34, 1.505, -0.385] }, - "0.8": { - "vector": [0.36495, -0.3011, -0.70059] + "0.7": { + "vector": [-0.42, 1.63, -0.495] }, - "1.05": { - "vector": [-0.04863, 0.13019, -0.57971] + "0.8833": { + "vector": [-0.69, 0.95625, -1.015] }, - "1.2": { - "vector": [0.10317, -0.10129, -0.60415] + "0.9667": { + "vector": [-0.475, 1.025, -1.015] }, - "1.45": { - "vector": [0.14325, 0.06078, -0.58657] + "1.2833": { + "vector": [0.03, 1.03, -1.01] }, - "1.7333": { - "vector": [0.11268, 0.11258, -0.78102] + "1.4167": { + "vector": [-0.47, 1.03, -1.01] }, - "1.8": { - "vector": [0.14791, 0.0351, -0.49198] + "1.4833": { + "vector": [-0.32, 1.03, -1.01] }, - "1.8667": { - "vector": [-0.5395, 0.29301, -0.39434] + "1.6167": { + "vector": [0.06655, 0.97467, -1.01395] }, - "1.95": { - "vector": [0.14791, 0.0351, -0.49198] + "1.8333": { + "vector": [-0.395, 0.225, 0.135] }, - "2.0167": { - "vector": [0.40834, -0.35741, -0.73343], - "easing": "easeInSine" + "1.9333": { + "vector": [-0.59, -0.07, -0.775] }, - "2.0833": { - "vector": [0.44, -0.17, -0.42] + "1.9833": { + "vector": [-0.165, -0.15, -1.135] }, - "2.1667": { - "vector": [0, 0.06, 0.14844] + "2.0667": { + "vector": [0.06, -0.23, -0.325] }, - "2.2667": { - "vector": [0, 0.02, 0.8986] + "2.1333": { + "vector": [-0.025, -0.15, 0.2] }, - "2.4167": { - "vector": [0, 0, 0], - "easing": "easeInElastic" + "2.1833": { + "vector": [0.05, 0.025, 0] + }, + "2.2833": { + "vector": [0, -0.05, 0.03125] + }, + "2.3667": { + "vector": [0, 0, 0] } } }, "magazine": { "rotation": { - "0.7167": { + "0.5333": { "vector": [0, 0, 0] }, - "0.9167": { - "vector": [22.5, 0, 0] + "0.55": { + "vector": [-4, 0, 0] }, - "0.9667": { - "vector": [0, 0, 0] + "0.6": { + "vector": [-9.75, 0, 0] }, - "1.1": { - "vector": [-12.5, -70, -130] + "0.6333": { + "vector": [-24.75, 0, 0] }, - "1.1333": { - "vector": [-12.5, -70, -130] + "0.85": { + "vector": [59.73664, 1.67294, -32.59404] }, - "1.1833": { - "vector": [1.51, -72.16, -135.34] + "0.9": { + "vector": [54.9, 0, 0] }, - "1.2333": { - "vector": [-0.58781, -40.02039, -106.56534] + "1.2667": { + "vector": [-10.64, -0.22, -0.76] }, - "1.35": { - "vector": [-14.72777, -7.86614, -33.43033], - "easing": "easeInOutSine" + "1.3333": { + "vector": [-11.53843, -0.2156, -0.76216] }, - "1.45": { - "vector": [-22.63843, -5.6156, -7.36216], - "easing": "easeInOutSine" + "1.4167": { + "vector": [-1.89, -0.22, -0.76] }, - "1.65": { - "vector": [-12, 0, 0] + "1.4333": { + "vector": [-1.88843, -0.2156, -0.76216] }, - "1.7167": { - "vector": [-11.39, 0, 0] + "1.4667": { + "vector": [2.77, 1.19, 1.08] }, - "1.8333": { - "vector": [0, 0, 0] + "1.5333": { + "vector": [-4, 0, 0] }, - "1.8833": { + "1.5833": { "vector": [0, 0, 0] } }, "position": { - "0.7167": { + "0.5333": { "vector": [0, 0, 0] }, + "0.55": { + "vector": [0, 0, -0.1875] + }, + "0.6": { + "vector": [0, -0.07812, -0.38672] + }, + "0.6333": { + "vector": [0, 0.12188, -0.93672] + }, + "0.7": { + "vector": [1.69, -2.94, 0.1] + }, "0.9167": { - "vector": [0, -10, 3], - "easing": "easeInSine" + "vector": [7.2, -12.25391, 6.7875] }, - "0.9667": { - "vector": [0, -10, 0], - "easing": "easeInSine" + "1.0": { + "vector": [7.2, -12.25391, 6.7875] }, - "1.1": { - "vector": [3.05, -7.25, 7.56] + "1.2667": { + "vector": [-0.13, -0.30828, -0.43563] }, - "1.1333": { - "vector": [4.08351, -1.47888, 4.9022], - "easing": "easeInOutSine" + "1.3333": { + "vector": [-0.12957, -0.31603, -0.4701] }, - "1.2": { - "vector": [5.1, 0.44, 3.5] + "1.4167": { + "vector": [-0.13, -0.30828, -0.43563] }, - "1.3167": { - "vector": [2.86, -1.65, -0.74] + "1.4333": { + "vector": [-0.12957, 0.18006, -0.46385] }, - "1.45": { - "vector": [0.39786, 0.10076, -1.31536], - "easing": "easeInOutSine" + "1.4667": { + "vector": [-0.22, 0.14, -0.29] }, - "1.6333": { - "vector": [0, -0.26562, -0.6] + "1.5333": { + "vector": [0, 0, -0.1875] }, - "1.7167": { - "vector": [0, -0.23203, -0.53359] - }, - "1.8333": { - "vector": [0, 0, 0], - "easing": "easeInElastic" - }, - "1.8833": { + "1.5833": { "vector": [0, 0, 0] } } }, "Lefthand": { "rotation": { - "0.3333": { + "0.1333": { "vector": [-21.95161, -23.67637, 29.25716] }, - "0.4333": { + "0.2667": { "vector": [-10.83774, -11.3082, 26.01338], "easing": "easeInElastic" }, - "0.55": { - "vector": [-10.83774, -11.3082, 26.01338], - "easing": "easeInElastic" - }, - "0.6667": { + "0.4": { "vector": [-10.83774, -11.3082, 26.01338], "easing": "easeInOutSine" }, - "0.7167": { + "0.4833": { "vector": [-10.84, -11.31, 26.01] }, + "0.5333": { + "vector": [-11.44, -11.36, 27.22] + }, + "0.6333": { + "vector": [-4.63269, -11.45846, 29.63712] + }, + "0.7": { + "vector": [-20.58591, -2.16914, 27.63857] + }, "0.9167": { - "vector": [-12.84863, -4.82913, 20.93756], - "easing": "easeOutSine" + "vector": [-87.4143, -4.67709, 33.76112] }, - "0.9667": { - "vector": [10.233, 10.2596, 3.51854], - "easing": "easeOutSine" - }, - "1.1": { - "vector": [-49.77006, 64.26495, -91.19885] - }, - "1.1333": { - "vector": [-47.55314, 65.39596, -103.44208] + "1.0": { + "vector": [-90.78179, 3.04131, 29.32006] }, "1.2": { - "vector": [-46.07222, 70.25928, -87.18593] + "vector": [-22.5014, -15.83802, 29.24083] }, - "1.2667": { - "vector": [-16.54273, 37.67935, -40.57865] + "1.2833": { + "vector": [-21.52768, -17.94881, 26.27751] }, "1.3167": { - "vector": [-13.14801, 19.23814, -10.56439] + "vector": [-23.93819, -18.79312, 25.09219] + }, + "1.4167": { + "vector": [-23.69, -11.36, 27.22] }, "1.45": { - "vector": [-10.79618, 6.21927, 22.54367], - "easing": "linear" + "vector": [-18.19, -11.36, 27.22] }, - "1.6333": { - "vector": [-27.96238, -13.84396, 58.89893] + "1.5167": { + "vector": [-23.69, -11.36, 27.22] }, - "1.7333": { - "vector": [-23.9632, -12.39386, 52.59974], - "easing": "linear" + "1.5833": { + "vector": [-23.69, -11.36, 27.22] }, - "1.8333": { - "vector": [-23.9632, -12.39386, 52.59974], - "easing": "linear" + "1.65": { + "vector": [-23.69, -11.36, 27.22] }, - "1.9167": { - "vector": [-23.9632, -12.39386, 52.59974], - "easing": "linear" - }, - "2.0833": { + "1.85": { "vector": [-21.95161, -23.67637, 29.25716] } }, "position": { - "0.3333": { + "0.1333": { "vector": [-1.1, 0.7, 0.3] }, - "0.4333": { + "0.2667": { "vector": [-2.59069, -0.63326, 6.31688], "easing": "easeInElastic" }, - "0.55": { - "vector": [-2.59069, -0.63326, 6.31688], - "easing": "easeInElastic" - }, - "0.6667": { + "0.4": { "vector": [-2.59069, -0.63326, 6.31688], "easing": "easeInOutSine" }, - "0.7167": { + "0.4833": { "vector": [-2.59, -1.29, 5.89] }, + "0.5333": { + "vector": [-2.66, -1.3, 5.9] + }, + "0.5833": { + "vector": [-2.88, -2.455, 5.59] + }, + "0.6333": { + "vector": [-3.11, -3.285, 3.745] + }, + "0.7": { + "vector": [-2.39, -4.44, 7.47] + }, "0.9167": { - "vector": [-2.69069, -12.23326, 9.61688], - "easing": "easeInSine" + "vector": [2.56, -2.95, 15.53] }, - "0.9667": { - "vector": [-1.09069, -13.13326, 3.41688], - "easing": "easeInSine" + "1.0": { + "vector": [1.71, -2.945, 14.35] }, - "1.1": { - "vector": [3.78778, -5.55218, 11.79434] - }, - "1.1333": { - "vector": [6.50262, 0.9929, 8.56821] + "1.1167": { + "vector": [0.37, -4.1, 12.695] }, "1.2": { - "vector": [6.51159, 0.43131, 6.5098] + "vector": [-0.59, -4.92, 8.21] }, - "1.2667": { - "vector": [5.08812, -0.82527, 5.37621] + "1.2833": { + "vector": [-1.55, -2.12, 5.78] }, "1.3167": { - "vector": [1.61237, -3.02671, 4.36969] + "vector": [-1.93, -0.77, 5.86] }, - "1.3833": { - "vector": [-0.78777, -2.78872, 4.5296] + "1.4167": { + "vector": [-2.63, -1.3, 6.605] }, "1.45": { - "vector": [-3.9135, -3.08305, 4.31438], - "easing": "linear" + "vector": [-2.63, -1.43, 6.115] }, - "1.6333": { - "vector": [-5.03219, -1.54203, 6.77] + "1.5167": { + "vector": [-2.63, -1.3, 6.605] }, - "1.7333": { - "vector": [-4.22575, -1.43666, 6.09951], - "easing": "linear" + "1.5833": { + "vector": [-2.63, -1.3, 6.94] }, - "1.8333": { - "vector": [-4.22575, -1.43666, 6.09951], - "easing": "linear" + "1.65": { + "vector": [-2.63, -1.3, 6.605] }, - "1.9167": { - "vector": [-4.22575, -1.43666, 6.09951], - "easing": "linear" - }, - "2.0833": { + "1.85": { "vector": [-1.1, 0.7, 0.3] } } @@ -2109,354 +2169,372 @@ "bones": { "0": { "rotation": { - "0.15": { + "0.0": { "vector": [0, 0, 0] }, - "0.2333": { - "vector": [-13.59467, 1.59889, -0.0597], - "easing": "easeInElastic" + "0.1333": { + "vector": [-2.99197, -2.34076, -3.81083] }, - "0.3167": { - "vector": [-13.4882, 1.37149, -0.57174] + "0.2": { + "vector": [-12.10904, -5.51675, -10.10819] }, - "0.4333": { - "vector": [-13.3918, 0.47094, -5.24635] + "0.3": { + "vector": [-23.11357, -19.36321, -23.07043] }, - "0.5167": { - "vector": [-10.88864, -0.3826, -2.87472] + "0.3833": { + "vector": [-32.74067, -21.6486, -17.91188] }, - "0.6333": { - "vector": [-14.32523, -1.08564, -11.90473] + "0.4833": { + "vector": [-32.05197, -22.72024, -19.7356] }, - "0.7333": { - "vector": [-14.30348, -1.33052, -12.87588] + "0.5333": { + "vector": [-23.74634, -23.91069, -20.32174] }, - "0.8": { - "vector": [-4.36856, -0.15301, -17.00875], - "easing": "easeInElastic" + "0.55": { + "vector": [-30.13262, -22.68022, -21.23467] }, - "0.9333": { - "vector": [-11.32739, -0.93021, -6.94156], - "easing": "easeOutSine" + "0.5833": { + "vector": [-26.82846, -22.86927, -20.31653] }, - "1.1333": { - "vector": [-11.24975, 1.6251, -6.69388] + "0.65": { + "vector": [-33.85009, -21.36902, -20.34008] }, - "1.3": { - "vector": [-9.97469, 3.02705, -17.6383] + "0.7833": { + "vector": [-23.69767, -30.65149, -34.97942] }, - "1.7333": { - "vector": [-9.86643, 3.67788, -17.84913] + "0.8833": { + "vector": [-23.87314, -29.5668, -39.13569] }, - "1.8": { - "vector": [-17.05451, 6.16944, -16.87618] + "1.0167": { + "vector": [-14.34, -35.89, -55.17] + }, + "1.15": { + "vector": [-16.61483, -35.05489, -52.4888] + }, + "1.2833": { + "vector": [-16.07951, -33.94957, -53.78507] + }, + "1.4167": { + "vector": [-22.61113, -30.8633, -43.53397] + }, + "1.4833": { + "vector": [-32.46981, -20.07549, -20.95037] + }, + "1.6167": { + "vector": [-26.681, -27.52061, -35.20432] + }, + "1.7833": { + "vector": [-15.31958, -2.96368, -5.03831] }, "1.8667": { - "vector": [-8.03014, 2.69913, -17.54102] + "vector": [-9.07234, -1.20567, 6.00913] }, - "2.05": { - "vector": [0.1, 1.74, -4.02] + "1.9333": { + "vector": [-2.94771, -1.4232, 3.47003] }, - "2.25": { - "vector": [2, 0, 2.25] + "1.9833": { + "vector": [0.57324, -1.68438, -0.35369] }, - "2.4333": { - "vector": [0, 0, 0], - "easing": "easeInElastic" + "2.0833": { + "vector": [-0.78429, -0.96449, -0.75002] + }, + "2.1833": { + "vector": [-0.01963, 0.49961, 0.62491] + }, + "2.2833": { + "vector": [0, 0.375, -0.125] + }, + "2.3833": { + "vector": [0, 0, 0] } }, "position": { - "0.0833": { + "0.0": { "vector": [0, 0, 0] }, - "0.1833": { - "vector": [-0.1, 0.1, -0.4], - "easing": "easeInElastic" + "0.1333": { + "vector": [-0.15, -0.6, 0.275] }, - "0.2833": { - "vector": [-0.1, 0.7, 0.65], - "easing": "easeOutQuad" + "0.2": { + "vector": [-0.195, -0.05, 0.24] }, - "0.3667": { - "vector": [-0.1, 0.7, -0.4], - "easing": "easeOutQuad" + "0.3": { + "vector": [-0.19, 0.935, 0.03] + }, + "0.3833": { + "vector": [-0.07, 1.915, -0.385] + }, + "0.4333": { + "vector": [-0.15, 1.45, -0.645] + }, + "0.4833": { + "vector": [-0.15, 1.425, -0.655] }, "0.5333": { - "vector": [-0.1, 0.5, -0.6] + "vector": [0.48008, 0.67962, -0.93897] }, - "0.6333": { - "vector": [-0.1, 0.25, -0.6] + "0.5833": { + "vector": [-0.25, 1.235, -0.545] }, - "0.7333": { - "vector": [-0.1, 0.25, -0.6] + "0.6": { + "vector": [-0.34, 1.505, -0.385] }, - "0.8": { - "vector": [0.36495, -0.3011, -0.70059] + "0.7": { + "vector": [-0.42, 1.63, -0.495] }, - "1.05": { - "vector": [-0.04863, 0.13019, -0.57971] + "0.8833": { + "vector": [-0.69, 0.95625, -1.015] }, - "1.2": { - "vector": [0.10317, -0.10129, -0.60415] + "0.9667": { + "vector": [-0.475, 1.025, -1.015] }, - "1.45": { - "vector": [0.14325, 0.06078, -0.58657] + "1.2833": { + "vector": [0.03, 1.03, -1.01] }, - "1.7333": { - "vector": [0.11268, 0.11258, -0.78102] + "1.4167": { + "vector": [-0.47, 1.03, -1.01] }, - "1.8": { - "vector": [0.14791, 0.0351, -0.49198] + "1.4833": { + "vector": [-0.32, 1.03, -1.01] }, - "1.8667": { - "vector": [-0.5395, 0.29301, -0.39434] + "1.6167": { + "vector": [0.06655, 0.97467, -1.01395] }, - "1.95": { - "vector": [0.14791, 0.0351, -0.49198] + "1.8333": { + "vector": [-0.395, 0.225, 0.135] }, - "2.0167": { - "vector": [0.40834, -0.35741, -0.73343], - "easing": "easeInSine" + "1.9333": { + "vector": [-0.59, -0.07, -0.775] }, - "2.0833": { - "vector": [0.44, -0.17, -0.42] + "1.9833": { + "vector": [-0.165, -0.15, -1.135] }, - "2.1667": { - "vector": [0, 0.06, 0.14844] + "2.0667": { + "vector": [0.06, -0.23, -0.325] }, - "2.2667": { - "vector": [0, 0.02, 0.8986] + "2.1333": { + "vector": [-0.025, -0.15, 0.2] }, - "2.4167": { - "vector": [0, 0, 0], - "easing": "easeInElastic" + "2.1833": { + "vector": [0.05, 0.025, 0] + }, + "2.2833": { + "vector": [0, -0.05, 0.03125] + }, + "2.3667": { + "vector": [0, 0, 0] } } }, "magazine": { "rotation": { - "0.7167": { + "0.5333": { "vector": [0, 0, 0] }, - "0.9167": { - "vector": [22.5, 0, 0] + "0.55": { + "vector": [-4, 0, 0] }, - "0.9667": { - "vector": [0, 0, 0] + "0.6": { + "vector": [-9.75, 0, 0] }, - "1.1": { - "vector": [-12.5, -70, -130] + "0.6333": { + "vector": [-24.75, 0, 0] }, - "1.1333": { - "vector": [-12.5, -70, -130] + "0.85": { + "vector": [59.73664, 1.67294, -32.59404] }, - "1.1833": { - "vector": [1.51, -72.16, -135.34] + "0.9": { + "vector": [54.9, 0, 0] }, - "1.2333": { - "vector": [-0.58781, -40.02039, -106.56534] + "1.2667": { + "vector": [-10.64, -0.22, -0.76] }, - "1.35": { - "vector": [-14.72777, -7.86614, -33.43033], - "easing": "easeInOutSine" + "1.3333": { + "vector": [-11.53843, -0.2156, -0.76216] }, - "1.45": { - "vector": [-22.63843, -5.6156, -7.36216], - "easing": "easeInOutSine" + "1.4167": { + "vector": [-1.89, -0.22, -0.76] }, - "1.65": { - "vector": [-12, 0, 0] + "1.4333": { + "vector": [-1.88843, -0.2156, -0.76216] }, - "1.7167": { - "vector": [-11.39, 0, 0] + "1.4667": { + "vector": [2.77, 1.19, 1.08] }, - "1.8333": { - "vector": [0, 0, 0] + "1.5333": { + "vector": [-4, 0, 0] }, - "1.8833": { + "1.5833": { "vector": [0, 0, 0] } }, "position": { - "0.7167": { + "0.5333": { "vector": [0, 0, 0] }, + "0.55": { + "vector": [0, 0, -0.1875] + }, + "0.6": { + "vector": [0, -0.07812, -0.38672] + }, + "0.6333": { + "vector": [0, 0.12188, -0.93672] + }, + "0.7": { + "vector": [1.69, -2.94, 0.1] + }, "0.9167": { - "vector": [0, -10, 3], - "easing": "easeInSine" + "vector": [7.2, -12.25391, 6.7875] }, - "0.9667": { - "vector": [0, -10, 0], - "easing": "easeInSine" + "1.0": { + "vector": [7.2, -12.25391, 6.7875] }, - "1.1": { - "vector": [3.05, -7.25, 7.56] + "1.2667": { + "vector": [-0.13, -0.30828, -0.43563] }, - "1.1333": { - "vector": [4.08351, -1.47888, 4.9022], - "easing": "easeInOutSine" + "1.3333": { + "vector": [-0.12957, -0.31603, -0.4701] }, - "1.2": { - "vector": [5.1, 0.44, 3.5] + "1.4167": { + "vector": [-0.13, -0.30828, -0.43563] }, - "1.3167": { - "vector": [2.86, -1.65, -0.74] + "1.4333": { + "vector": [-0.12957, 0.18006, -0.46385] }, - "1.45": { - "vector": [0.39786, 0.10076, -1.31536], - "easing": "easeInOutSine" + "1.4667": { + "vector": [-0.22, 0.14, -0.29] }, - "1.6333": { - "vector": [0, -0.26562, -0.6] + "1.5333": { + "vector": [0, 0, -0.1875] }, - "1.7167": { - "vector": [0, -0.23203, -0.53359] - }, - "1.8333": { - "vector": [0, 0, 0], - "easing": "easeInElastic" - }, - "1.8833": { + "1.5833": { "vector": [0, 0, 0] } } }, "Lefthand": { "rotation": { - "0.3333": { + "0.1333": { "vector": [-21.95161, -23.67637, 29.25716] }, - "0.4333": { - "vector": [-23.04, -6.9, 40.68] + "0.2667": { + "vector": [-20.94118, -6.08528, 30.80432], + "easing": "easeInElastic" }, - "0.55": { - "vector": [-23.04, -6.9, 40.68] - }, - "0.6667": { - "vector": [-19.44764, -4.38972, 32.30549], + "0.4": { + "vector": [-22.00608, -5.12697, 31.18773], "easing": "easeInOutSine" }, - "0.7167": { - "vector": [-19.44764, -4.38972, 32.30549], + "0.4833": { + "vector": [-22.00608, -5.12697, 31.18773], "easing": "easeInOutSine" }, + "0.5333": { + "vector": [-12.26845, -7.60354, 30.6228] + }, + "0.6333": { + "vector": [-9.0723, -17.52906, 45.91057] + }, + "0.7": { + "vector": [-23.98801, -11.99261, 44.27125] + }, "0.9167": { - "vector": [-12.84863, -4.82913, 20.93756], - "easing": "easeOutSine" + "vector": [-75.00219, 7.02533, 38.7168] }, - "0.9667": { - "vector": [10.233, 10.2596, 3.51854], - "easing": "easeOutSine" - }, - "1.1": { - "vector": [8.96186, 2.0287, -3.2794] - }, - "1.1333": { - "vector": [10.14796, 1.03822, -17.5079] + "1.0": { + "vector": [-78.86682, 11.92965, 47.27762] }, "1.2": { - "vector": [15.47014, -1.87641, -9.25971] + "vector": [-21.84027, -8.03931, 33.93157] }, - "1.2667": { - "vector": [-2.21105, -13.60693, 5.606] + "1.2833": { + "vector": [-14.99823, -16.14441, 37.15204] }, "1.3167": { - "vector": [-12.93896, -12.29493, 22.09467] + "vector": [-14.99823, -16.14441, 37.15204] }, - "1.3833": { - "vector": [-16.2633, -16.81844, 40.76366] + "1.4167": { + "vector": [-20.02306, -10.63719, 38.20898] }, "1.45": { - "vector": [-26.42462, -24.4908, 57.19633], - "easing": "linear" + "vector": [-20.02306, -10.63719, 38.20898] }, - "1.55": { - "vector": [-23.13815, -22.34869, 50.80967], - "easing": "linear" + "1.5167": { + "vector": [-28.66524, -24.0462, 57.94176] }, - "1.6333": { - "vector": [-30.61838, -18.5508, 57.11005] + "1.5833": { + "vector": [-28.45042, -21.67782, 56.83388] }, - "1.7333": { - "vector": [-29.15028, -18.84594, 56.47139] + "1.65": { + "vector": [-28.45042, -21.67782, 56.83388] }, - "1.8333": { - "vector": [-29.15028, -18.84594, 56.47139] - }, - "1.9167": { - "vector": [-25.10279, -2.73231, 57.98657], - "easing": "linear" - }, - "2.0833": { + "1.85": { "vector": [-21.95161, -23.67637, 29.25716] } }, "position": { - "0.3333": { + "0.1333": { "vector": [-1.1, 0.7, 0.3] }, - "0.4333": { - "vector": [-2.59, -0.63, 6.45] + "0.2667": { + "vector": [-2.59069, -0.63326, 6.31688], + "easing": "easeInElastic" }, - "0.55": { - "vector": [-2.59, -0.63, 6.45] - }, - "0.6667": { + "0.4": { "vector": [-2.59069, -0.63326, 6.31688], "easing": "easeInOutSine" }, - "0.7167": { + "0.4833": { "vector": [-2.59069, -0.63326, 6.31688], "easing": "easeInOutSine" }, + "0.5333": { + "vector": [-2.66, -1.3, 5.9] + }, + "0.5833": { + "vector": [-2.88, -2.455, 5.59] + }, + "0.6333": { + "vector": [-3.51, -2.685, 3.745] + }, + "0.7": { + "vector": [-1.64, -3.14, 7.47] + }, "0.9167": { - "vector": [-2.69069, -12.23326, 9.61688], - "easing": "easeInSine" + "vector": [2.56, -2.75, 15.53] }, - "0.9667": { - "vector": [-1.09069, -13.13326, 3.41688], - "easing": "easeInSine" + "1.0": { + "vector": [1.71, -2.945, 14.35] }, - "1.1": { - "vector": [3.78778, -5.55218, 11.79434] - }, - "1.1333": { - "vector": [6.50262, 0.9929, 8.56821] + "1.1167": { + "vector": [0.37, -4.1, 12.695] }, "1.2": { - "vector": [6.51159, 0.43131, 6.5098] + "vector": [-0.59, -3.22, 8.01] }, - "1.2667": { - "vector": [5.08812, -0.82527, 5.37621] + "1.2833": { + "vector": [-1.8, -1.92, 5.13] }, "1.3167": { - "vector": [2.11901, -1.90094, 5.02998] + "vector": [-1.8, -1.92, 5.13] }, - "1.3833": { - "vector": [-0.78777, -2.78872, 4.5296] + "1.4167": { + "vector": [-2.63, -1.3, 6.605] }, "1.45": { - "vector": [-2.65755, -2.13952, 4.93059], - "easing": "linear" + "vector": [-2.63, -1.3, 6.605] }, - "1.55": { - "vector": [-2.65755, -2.13952, 4.93059], - "easing": "linear" + "1.5167": { + "vector": [-2.63, -1.3, 6.605] }, - "1.6333": { - "vector": [-3.27214, -1.48037, 6.08189] + "1.5833": { + "vector": [-2.63, -1.3, 6.94] }, - "1.7333": { - "vector": [-3.21729, -1.68999, 6.47986] + "1.65": { + "vector": [-2.63, -1.3, 6.94] }, - "1.8333": { - "vector": [-3.21729, -1.68999, 6.47986] - }, - "1.9167": { - "vector": [-4.22575, -1.43666, 6.09951], - "easing": "linear" - }, - "2.0833": { + "1.85": { "vector": [-1.1, 0.7, 0.3] } } diff --git a/src/main/resources/assets/superbwarfare/sounds/ak_12/ak_12_reload_normal.ogg b/src/main/resources/assets/superbwarfare/sounds/ak_12/ak_12_reload_normal.ogg index b4816d71f..15f5f500e 100644 Binary files a/src/main/resources/assets/superbwarfare/sounds/ak_12/ak_12_reload_normal.ogg and b/src/main/resources/assets/superbwarfare/sounds/ak_12/ak_12_reload_normal.ogg differ diff --git a/src/main/resources/data/superbwarfare/guns/aa_12.json b/src/main/resources/data/superbwarfare/guns/aa_12.json index 0bbb77eb3..d61ad87c4 100644 --- a/src/main/resources/data/superbwarfare/guns/aa_12.json +++ b/src/main/resources/data/superbwarfare/guns/aa_12.json @@ -9,8 +9,6 @@ "ProjectileAmount": 12, "Weight": 7, "FireMode": 2, - "Semi": 1, - "Auto": 1, "NormalReloadTime": 64, "EmptyReloadTime": 85, "BypassesArmor": 0.05, diff --git a/src/main/resources/data/superbwarfare/guns/abekiri.json b/src/main/resources/data/superbwarfare/guns/abekiri.json index 41c8811e6..861af0b1d 100644 --- a/src/main/resources/data/superbwarfare/guns/abekiri.json +++ b/src/main/resources/data/superbwarfare/guns/abekiri.json @@ -8,8 +8,6 @@ "Magazine": 2, "ProjectileAmount": 12, "Weight": 1, - "FireMode": 0, - "Semi": 1, "NormalReloadTime": 66, "EmptyReloadTime": 83, "BypassesArmor": 0.01, diff --git a/src/main/resources/data/superbwarfare/guns/ak_12.json b/src/main/resources/data/superbwarfare/guns/ak_12.json index f8b6feaf0..e0d8a13c9 100644 --- a/src/main/resources/data/superbwarfare/guns/ak_12.json +++ b/src/main/resources/data/superbwarfare/guns/ak_12.json @@ -10,8 +10,6 @@ "Magazine": 30, "Weight": 4, "FireMode": 2, - "Semi": 1, - "Auto": 1, "NormalReloadTime": 52, "EmptyReloadTime": 58, "BypassesArmor": 0.23, diff --git a/src/main/resources/data/superbwarfare/guns/ak_47.json b/src/main/resources/data/superbwarfare/guns/ak_47.json index 31e5c5da4..10eb5af3b 100644 --- a/src/main/resources/data/superbwarfare/guns/ak_47.json +++ b/src/main/resources/data/superbwarfare/guns/ak_47.json @@ -10,8 +10,6 @@ "Magazine": 30, "Weight": 5, "FireMode": 2, - "Semi": 1, - "Auto": 1, "NormalReloadTime": 52, "EmptyReloadTime": 65, "BypassesArmor": 0.2, diff --git a/src/main/resources/data/superbwarfare/guns/devotion.json b/src/main/resources/data/superbwarfare/guns/devotion.json index 1c3d05b6a..d0eb57949 100644 --- a/src/main/resources/data/superbwarfare/guns/devotion.json +++ b/src/main/resources/data/superbwarfare/guns/devotion.json @@ -9,7 +9,6 @@ "Magazine": 55, "Weight": 6, "FireMode": 2, - "Auto": 1, "NormalReloadTime": 73, "EmptyReloadTime": 95, "BypassesArmor": 0.25, diff --git a/src/main/resources/data/superbwarfare/guns/glock_17.json b/src/main/resources/data/superbwarfare/guns/glock_17.json index 5ab594e41..6c519ab1c 100644 --- a/src/main/resources/data/superbwarfare/guns/glock_17.json +++ b/src/main/resources/data/superbwarfare/guns/glock_17.json @@ -7,8 +7,6 @@ "Velocity": 17, "Magazine": 17, "Weight": 1, - "FireMode": 0, - "Semi": 1, "NormalReloadTime": 30, "EmptyReloadTime": 35, "BypassesArmor": 0.15, diff --git a/src/main/resources/data/superbwarfare/guns/glock_18.json b/src/main/resources/data/superbwarfare/guns/glock_18.json index d564e4dfc..aa2e8606d 100644 --- a/src/main/resources/data/superbwarfare/guns/glock_18.json +++ b/src/main/resources/data/superbwarfare/guns/glock_18.json @@ -8,8 +8,6 @@ "Magazine": 17, "Weight": 1, "FireMode": 2, - "Semi": 1, - "Auto": 1, "NormalReloadTime": 30, "EmptyReloadTime": 35, "BypassesArmor": 0.15, diff --git a/src/main/resources/data/superbwarfare/guns/hk_416.json b/src/main/resources/data/superbwarfare/guns/hk_416.json index a375c48a0..545dbd450 100644 --- a/src/main/resources/data/superbwarfare/guns/hk_416.json +++ b/src/main/resources/data/superbwarfare/guns/hk_416.json @@ -10,8 +10,6 @@ "Magazine": 30, "Weight": 4, "FireMode": 2, - "Semi": 1, - "Auto": 1, "NormalReloadTime": 56, "EmptyReloadTime": 64, "BypassesArmor": 0.25, diff --git a/src/main/resources/data/superbwarfare/guns/hunting_rifle.json b/src/main/resources/data/superbwarfare/guns/hunting_rifle.json index 0801a7cfb..4ca6850a4 100644 --- a/src/main/resources/data/superbwarfare/guns/hunting_rifle.json +++ b/src/main/resources/data/superbwarfare/guns/hunting_rifle.json @@ -7,8 +7,6 @@ "Velocity": 38, "Magazine": 1, "Weight": 5, - "FireMode": 0, - "Semi": 1, "EmptyReloadTime": 64, "BypassesArmor": 0.7, "SoundRadius": 20 diff --git a/src/main/resources/data/superbwarfare/guns/k_98.json b/src/main/resources/data/superbwarfare/guns/k_98.json index 98bd19225..6d3a51656 100644 --- a/src/main/resources/data/superbwarfare/guns/k_98.json +++ b/src/main/resources/data/superbwarfare/guns/k_98.json @@ -9,7 +9,6 @@ "BoltActionTime": 22, "Weight": 5, "FireMode": 0, - "Semi": 1, "EmptyReloadTime": 59, "PrepareTime": 29, "IterativeTime": 11, diff --git a/src/main/resources/data/superbwarfare/guns/m_1911.json b/src/main/resources/data/superbwarfare/guns/m_1911.json index bf14612b0..d109e3647 100644 --- a/src/main/resources/data/superbwarfare/guns/m_1911.json +++ b/src/main/resources/data/superbwarfare/guns/m_1911.json @@ -7,8 +7,6 @@ "Velocity": 15, "Magazine": 7, "Weight": 2, - "FireMode": 0, - "Semi": 1, "NormalReloadTime": 30, "EmptyReloadTime": 35, "BypassesArmor": 0.2, diff --git a/src/main/resources/data/superbwarfare/guns/m_4.json b/src/main/resources/data/superbwarfare/guns/m_4.json index 89dfac180..bdad9e132 100644 --- a/src/main/resources/data/superbwarfare/guns/m_4.json +++ b/src/main/resources/data/superbwarfare/guns/m_4.json @@ -10,8 +10,6 @@ "Magazine": 30, "Weight": 4, "FireMode": 2, - "Semi": 1, - "Auto": 1, "NormalReloadTime": 56, "EmptyReloadTime": 64, "BypassesArmor": 0.25, diff --git a/src/main/resources/data/superbwarfare/guns/m_60.json b/src/main/resources/data/superbwarfare/guns/m_60.json index 3a25a9b94..11a515089 100644 --- a/src/main/resources/data/superbwarfare/guns/m_60.json +++ b/src/main/resources/data/superbwarfare/guns/m_60.json @@ -8,7 +8,6 @@ "Magazine": 100, "Weight": 8, "FireMode": 2, - "Auto": 1, "NormalReloadTime": 114, "EmptyReloadTime": 133, "BypassesArmor": 0.25, diff --git a/src/main/resources/data/superbwarfare/guns/m_870.json b/src/main/resources/data/superbwarfare/guns/m_870.json index 0302bcb45..c5774572f 100644 --- a/src/main/resources/data/superbwarfare/guns/m_870.json +++ b/src/main/resources/data/superbwarfare/guns/m_870.json @@ -8,8 +8,6 @@ "Magazine": 8, "ProjectileAmount": 12, "Weight": 4, - "FireMode": 0, - "Semi": 1, "PrepareTime": 7, "PrepareLoadTime": 36, "IterativeTime": 16, diff --git a/src/main/resources/data/superbwarfare/guns/m_98b.json b/src/main/resources/data/superbwarfare/guns/m_98b.json index 957a0e60f..03869e762 100644 --- a/src/main/resources/data/superbwarfare/guns/m_98b.json +++ b/src/main/resources/data/superbwarfare/guns/m_98b.json @@ -11,8 +11,6 @@ "Magazine": 5, "BoltActionTime": 18, "Weight": 7, - "FireMode": 0, - "Semi": 1, "NormalReloadTime": 60, "EmptyReloadTime": 78, "BypassesArmor": 0.6, diff --git a/src/main/resources/data/superbwarfare/guns/marlin.json b/src/main/resources/data/superbwarfare/guns/marlin.json index 9092f29d6..111a87fa9 100644 --- a/src/main/resources/data/superbwarfare/guns/marlin.json +++ b/src/main/resources/data/superbwarfare/guns/marlin.json @@ -7,8 +7,6 @@ "Velocity": 38, "Magazine": 8, "Weight": 3, - "FireMode": 0, - "Semi": 1, "PrepareTime": 7, "IterativeTime": 16, "FinishTime": 19, diff --git a/src/main/resources/data/superbwarfare/guns/minigun.json b/src/main/resources/data/superbwarfare/guns/minigun.json index 86ba41771..92e4e445b 100644 --- a/src/main/resources/data/superbwarfare/guns/minigun.json +++ b/src/main/resources/data/superbwarfare/guns/minigun.json @@ -6,7 +6,6 @@ "Headshot": 2, "Velocity": 46, "Weight": 10, - "FireMode": 2, "BypassesArmor": 0.3, "SoundRadius": 14, "RPM": 1200 diff --git a/src/main/resources/data/superbwarfare/guns/mk_14.json b/src/main/resources/data/superbwarfare/guns/mk_14.json index 509827609..a88d5d450 100644 --- a/src/main/resources/data/superbwarfare/guns/mk_14.json +++ b/src/main/resources/data/superbwarfare/guns/mk_14.json @@ -9,9 +9,7 @@ "Velocity": 42.5, "Magazine": 20, "Weight": 5, - "FireMode": 0, - "Semi": 1, - "Auto": 1, + "FireMode": 2, "NormalReloadTime": 54, "EmptyReloadTime": 71, "BypassesArmor": 0.4, diff --git a/src/main/resources/data/superbwarfare/guns/mosin_nagant.json b/src/main/resources/data/superbwarfare/guns/mosin_nagant.json index 8a75023e3..4aace0cd9 100644 --- a/src/main/resources/data/superbwarfare/guns/mosin_nagant.json +++ b/src/main/resources/data/superbwarfare/guns/mosin_nagant.json @@ -9,8 +9,6 @@ "Magazine": 5, "BoltActionTime": 22, "Weight": 5, - "FireMode": 0, - "Semi": 1, "PrepareTime": 29, "PrepareEmptyTime": 16, "IterativeTime": 11, diff --git a/src/main/resources/data/superbwarfare/guns/ntw_20.json b/src/main/resources/data/superbwarfare/guns/ntw_20.json index b1af7b715..25b58e9ef 100644 --- a/src/main/resources/data/superbwarfare/guns/ntw_20.json +++ b/src/main/resources/data/superbwarfare/guns/ntw_20.json @@ -9,8 +9,6 @@ "Magazine": 3, "BoltActionTime": 37, "Weight": 10, - "FireMode": 0, - "Semi": 1, "NormalReloadTime": 63, "EmptyReloadTime": 92, "BypassesArmor": 1, diff --git a/src/main/resources/data/superbwarfare/guns/qbz_95.json b/src/main/resources/data/superbwarfare/guns/qbz_95.json index 52f22ab82..b3592ecb8 100644 --- a/src/main/resources/data/superbwarfare/guns/qbz_95.json +++ b/src/main/resources/data/superbwarfare/guns/qbz_95.json @@ -10,8 +10,6 @@ "Magazine": 30, "Weight": 4, "FireMode": 2, - "Semi": 1, - "Auto": 1, "NormalReloadTime": 60, "EmptyReloadTime": 74, "BypassesArmor": 0.28, diff --git a/src/main/resources/data/superbwarfare/guns/rpk.json b/src/main/resources/data/superbwarfare/guns/rpk.json index fa8f62594..d26bcaaf9 100644 --- a/src/main/resources/data/superbwarfare/guns/rpk.json +++ b/src/main/resources/data/superbwarfare/guns/rpk.json @@ -8,8 +8,6 @@ "Magazine": 75, "Weight": 6, "FireMode": 2, - "Semi": 1, - "Auto": 1, "NormalReloadTime": 73, "EmptyReloadTime": 95, "BypassesArmor": 0.23, diff --git a/src/main/resources/data/superbwarfare/guns/sentinel.json b/src/main/resources/data/superbwarfare/guns/sentinel.json index 89a0237e9..2ffe85528 100644 --- a/src/main/resources/data/superbwarfare/guns/sentinel.json +++ b/src/main/resources/data/superbwarfare/guns/sentinel.json @@ -9,8 +9,6 @@ "Velocity": 70, "BoltActionTime": 22, "Weight": 7, - "FireMode": 0, - "Semi": 1, "NormalReloadTime": 59, "EmptyReloadTime": 89, "BypassesArmor": 0.8, diff --git a/src/main/resources/data/superbwarfare/guns/sks.json b/src/main/resources/data/superbwarfare/guns/sks.json index 80c91efb4..bc8d0de03 100644 --- a/src/main/resources/data/superbwarfare/guns/sks.json +++ b/src/main/resources/data/superbwarfare/guns/sks.json @@ -7,8 +7,6 @@ "Velocity": 36, "Magazine": 20, "Weight": 4, - "FireMode": 0, - "Semi": 1, "NormalReloadTime": 54, "EmptyReloadTime": 75, "BypassesArmor": 0.23, diff --git a/src/main/resources/data/superbwarfare/guns/svd.json b/src/main/resources/data/superbwarfare/guns/svd.json index 3bf9bdf11..89bac0b09 100644 --- a/src/main/resources/data/superbwarfare/guns/svd.json +++ b/src/main/resources/data/superbwarfare/guns/svd.json @@ -8,8 +8,6 @@ "Velocity": 42, "Magazine": 10, "Weight": 5, - "FireMode": 0, - "Semi": 1, "NormalReloadTime": 56, "EmptyReloadTime": 70, "BypassesArmor": 0.45, diff --git a/src/main/resources/data/superbwarfare/guns/trachelium.json b/src/main/resources/data/superbwarfare/guns/trachelium.json index e31d7fd30..fae77792a 100644 --- a/src/main/resources/data/superbwarfare/guns/trachelium.json +++ b/src/main/resources/data/superbwarfare/guns/trachelium.json @@ -7,8 +7,6 @@ "Velocity": 24, "Magazine": 6, "Weight": 2, - "FireMode": 0, - "Semi": 1, "EmptyReloadTime": 65, "BypassesArmor": 0.3, "SoundRadius": 10, diff --git a/src/main/resources/data/superbwarfare/guns/vector.json b/src/main/resources/data/superbwarfare/guns/vector.json index 038067290..74e1248db 100644 --- a/src/main/resources/data/superbwarfare/guns/vector.json +++ b/src/main/resources/data/superbwarfare/guns/vector.json @@ -8,9 +8,6 @@ "Magazine": 13, "Weight": 3, "FireMode": 2, - "Semi": 1, - "Burst": 1, - "Auto": 1, "BurstSize": 3, "NormalReloadTime": 46, "EmptyReloadTime": 64,