diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/item/HomemadeShotgunItemModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/item/HomemadeShotgunItemModel.java index 53a867166..639dfb9ba 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/item/HomemadeShotgunItemModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/item/HomemadeShotgunItemModel.java @@ -13,7 +13,6 @@ import net.minecraft.world.item.ItemStack; import software.bernie.geckolib.animation.AnimationState; import software.bernie.geckolib.cache.object.GeoBone; -// TODO 这个模型里面有俩莫名其妙的块 public class HomemadeShotgunItemModel extends CustomGunModel { @Override diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/item/SentinelItemModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/item/SentinelItemModel.java index fcae16213..888a34efd 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/item/SentinelItemModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/item/SentinelItemModel.java @@ -13,7 +13,6 @@ import net.minecraft.world.item.ItemStack; import software.bernie.geckolib.animation.AnimationState; import software.bernie.geckolib.cache.object.GeoBone; -// TODO 这个模型后面还有电线,记得渲染时候清除掉 public class SentinelItemModel extends CustomGunModel { @Override diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/HomemadeShotgunItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/HomemadeShotgunItemRenderer.java index 629a37ac9..353766b97 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/HomemadeShotgunItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/HomemadeShotgunItemRenderer.java @@ -10,6 +10,7 @@ import com.mojang.blaze3d.vertex.VertexConsumer; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; +import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; import software.bernie.geckolib.animatable.GeoItem; import software.bernie.geckolib.cache.object.GeoBone; @@ -36,7 +37,15 @@ public class HomemadeShotgunItemRenderer extends CustomGunRenderer { if (player == null) return; ItemStack itemStack = player.getMainHandItem(); if (itemStack.getItem() instanceof GunItem && GeoItem.getId(itemStack) == this.getInstanceId(animatable)) { + if (this.renderPerspective != ItemDisplayContext.FIRST_PERSON_RIGHT_HAND) { + if (name.equals("wires")) { + bone.setHidden(true); + } + } + var cap = itemStack.getCapability(Capabilities.EnergyStorage.ITEM); var flag = cap != null && cap.getEnergyStored() > 0; @@ -47,7 +54,7 @@ public class SentinelItemRenderer extends CustomGunRenderer { AnimationHelper.handleZoomCrossHair(currentBuffer, renderType, name, stack, bone, buffer, 0, 0.265, -0.05, 0.075f, 255, 0, 0, 255, "apex_3x", false); AnimationHelper.handleShootFlare(name, stack, itemStack, bone, buffer, packedLightIn, 0, 0, 1.53125, 0.6); - } else if (name.equals("charge_illuminated")) { + } else if (name.equals("charge_illuminated") || name.equals("wires")) { bone.setHidden(true); } diff --git a/src/main/resources/assets/superbwarfare/animations/sentinel.animation.json b/src/main/resources/assets/superbwarfare/animations/sentinel.animation.json index f52a07ac0..598d81c6b 100644 --- a/src/main/resources/assets/superbwarfare/animations/sentinel.animation.json +++ b/src/main/resources/assets/superbwarfare/animations/sentinel.animation.json @@ -9,35 +9,17 @@ "bones": { "0": { "rotation": { - "0.0": { - "vector": [27.21312, -47.42646, -2.0218] - }, - "0.3": { - "vector": [12.5, -15, 0] - }, - "0.4": { - "vector": [3.48268, 0.40464, 8.20687] - }, - "0.6": { - "vector": [0, 0, -2] - }, - "0.7": { - "vector": [0, 0, 0] - } + "0.0": [27.21312, -47.42646, -2.0218], + "0.3": [12.5, -15, 0], + "0.4": [3.48268, 0.40464, 8.20687], + "0.6": [0, 0, -2], + "0.7": [0, 0, 0] }, "position": { - "0.0": { - "vector": [3, -17.3, 0] - }, - "0.4": { - "vector": [0, 0, -1.65] - }, - "0.5": { - "vector": [0, 0, 0.93] - }, - "0.7": { - "vector": [0, 0, 0] - } + "0.0": [3, -17.3, 0], + "0.4": [0, 0, -1.65], + "0.5": [0, 0, 0.93], + "0.7": [0, 0, 0] } } } @@ -48,63 +30,27 @@ "bones": { "0": { "rotation": { - "0.0": { - "vector": [-6.16643, -52.95314, 18.27888] - }, - "0.2": { - "vector": [-7.82957, -53.32669, 17.91689], - "easing": "easeInSine" - }, - "0.4": { - "vector": [-6.16643, -52.95314, 18.27888], - "easing": "easeOutSine" - }, - "0.6": { - "vector": [-4.51353, -52.58603, 18.6555], - "easing": "easeInSine" - }, - "0.8": { - "vector": [-6.16643, -52.95314, 18.27888] - } + "0.0": [-6.16643, -52.95314, 18.27888], + "0.2": [-7.82957, -53.32669, 17.91689], + "0.4": [-6.16643, -52.95314, 18.27888], + "0.6": [-4.51353, -52.58603, 18.6555], + "0.8": [-6.16643, -52.95314, 18.27888] }, "position": { - "0.0": { - "vector": [3.5, -2, 0] - }, - "0.2": { - "vector": [1.75, -1.5, 0], - "easing": "easeInSine" - }, - "0.4": { - "vector": [0.5, -2, 0], - "easing": "easeOutSine" - }, - "0.6": { - "vector": [1.75, -1.5, 0], - "easing": "easeInSine" - }, - "0.8": { - "vector": [3.5, -2, 0] - } + "0.0": [3.5, -2, 0], + "0.2": [1.75, -1.5, 0], + "0.4": [0.5, -2, 0], + "0.6": [1.75, -1.5, 0], + "0.8": [3.5, -2, 0] } }, "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] - } + "0.0": [-0.3, -0.3, 0.3], + "0.2": [0.3, 0, -0.3], + "0.4": [-0.3, 0.3, 0.3], + "0.6": [0.3, 0, -0.3], + "0.8": [-0.3, -0.3, 0.3] } } } @@ -115,81 +61,35 @@ "bones": { "0": { "rotation": { - "0.0": { - "vector": [-65.32786, 12.14905, 0.43184] - }, - "0.175": { - "vector": [-65.21083, 16.27391, 6.66077], - "easing": "easeInSine" - }, - "0.35": { - "vector": [-68.74727, 14.25203, 5.74607], - "easing": "easeOutSine" - }, - "0.525": { - "vector": [-70.53091, 9.93418, -3.00092], - "easing": "easeInSine" - }, - "0.7": { - "vector": [-65.32786, 12.14905, 0.43184] - } + "0.0": [-65.32786, 12.14905, 0.43184], + "0.175": [-65.21083, 16.27391, 6.66077], + "0.35": [-68.74727, 14.25203, 5.74607], + "0.525": [-70.53091, 9.93418, -3.00092], + "0.7": [-65.32786, 12.14905, 0.43184] }, "position": { - "0.0": { - "vector": [-4.52807, 0.28395, 1.288], - "easing": "easeOutSine" - }, - "0.175": { - "vector": [-5.57571, 2.65883, 1.2116], - "easing": "easeInSine" - }, - "0.35": { - "vector": [-7.57844, 0.1221, -0.22187], - "easing": "easeOutSine" - }, - "0.525": { - "vector": [-5.75027, 2.85577, 1.23384], - "easing": "easeInSine" - }, - "0.7": { - "vector": [-4.52807, 0.28395, 1.288], - "easing": "easeOutSine" - } + "0.0": [-4.52807, 0.28395, 1.288], + "0.175": [-5.57571, 2.65883, 1.2116], + "0.35": [-7.57844, 0.1221, -0.22187], + "0.525": [-5.75027, 2.85577, 1.23384], + "0.7": [-4.52807, 0.28395, 1.288] } }, "Lefthand": { - "rotation": { - "vector": [-1.41476, -16.33468, -1.66483] - }, - "position": { - "vector": [6, -13, 49] - } + "rotation": [-1.41476, -16.33468, -1.66483], + "position": [6, -13, 49] }, "Righthand": { - "rotation": { - "vector": [-0.9113, -14.0962, -8.80599] - }, - "position": { - "vector": [2.87519, -0.6965, 0.78255] - } + "rotation": [-0.9113, -14.0962, -8.80599], + "position": [2.87519, -0.6965, 0.78255] }, "camera": { "rotation": { - "0.0": { - "vector": [-0.3, -0.3, 0.3] - }, - "0.175": { - "vector": [0.3, 0, -0.3] - }, - "0.35": { - "vector": [-0.3, 0.3, 0.3] - }, - "0.525": { - "vector": [0.3, 0, -0.3] - }, - "0.7": { - "vector": [-0.3, -0.3, 0.3] - } + "0.0": [-0.3, -0.3, 0.3], + "0.175": [0.3, 0, -0.3], + "0.35": [-0.3, 0.3, 0.3], + "0.525": [0.3, 0, -0.3], + "0.7": [-0.3, -0.3, 0.3] } } } @@ -199,22 +99,12 @@ "bones": { "0": { "rotation": { - "0.0": { - "vector": [0, 0, -2] - }, - "0.0101": { - "vector": [0, 0, 0], - "easing": "easeOutBack", - "easingArgs": [3] - } + "0.0": [0, 0, -2], + "0.0101": [0, 0, 0] }, "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.0101": { - "vector": [0, 0, 0] - } + "0.0": [0, 0, 0], + "0.0101": [0, 0, 0] } } } @@ -225,235 +115,82 @@ "bones": { "0": { "rotation": { - "0.0": { - "vector": [0, 0, 0], - "easing": "easeInOutSine" - }, - "0.2": { - "vector": [-0.19988, 0.00698, 0.99999], - "easing": "easeInElastic" - }, - "0.3": { - "vector": [-1.57113, -0.42828, 13.16089], - "easing": "easeInSine" - }, - "0.4": { - "vector": [-4.4686, -0.19009, 3.51355], - "easing": "easeInElastic" - }, - "0.6": { - "vector": [-0.25, -0.5, 4.82] - }, - "0.7": { - "vector": [2.28655, 1.56915, 2.11954] - }, - "0.8": { - "vector": [0.92716, 0.58779, -6.48154], - "easing": "easeInOutSine" - }, - "0.9": { - "vector": [0.49, 0, 0] - }, - "1.0": { - "vector": [0, 0, 0] - } + "0.0": [0, 0, 0], + "0.2": [-0.19988, 0.00698, 0.99999], + "0.3": [-1.57113, -0.42828, 13.16089], + "0.4": [-4.4686, -0.19009, 3.51355], + "0.6": [-0.25, -0.5, 4.82], + "0.7": [2.28655, 1.56915, 2.11954], + "0.8": [0.92716, 0.58779, -6.48154], + "0.9": [0.49, 0, 0], + "1.0": [0, 0, 0] }, "position": { - "0.0": { - "vector": [0, 0, 0], - "easing": "easeInOutSine" - }, - "0.1": { - "vector": [0, 0, 0], - "easing": "linear" - }, - "0.3": { - "vector": [-0.21, -0.23, 0.32] - }, - "0.4": { - "vector": [-0.2, -0.5, 0.3], - "easing": "easeInElastic" - }, - "0.5": { - "vector": [-0.3, -0.5, 0.6] - }, - "0.6": { - "vector": [-0.3, -0.5, -1.4] - }, - "0.7": { - "vector": [-0.1, -0.2, 0.1], - "easing": "easeInElastic" - }, - "0.8": { - "vector": [0.14, -0.05, 0.2], - "easing": "easeInSine" - }, - "0.9": { - "vector": [0.04, 0.1, 0.24478] - }, - "1.0": { - "vector": [0, 0, 0], - "easing": "easeOutSine" - } + "0.0": [0, 0, 0], + "0.1": [0, 0, 0], + "0.3": [-0.21, -0.23, 0.32], + "0.4": [-0.2, -0.5, 0.3], + "0.5": [-0.3, -0.5, 0.6], + "0.6": [-0.3, -0.5, -1.4], + "0.7": [-0.1, -0.2, 0.1], + "0.8": [0.14, -0.05, 0.2], + "0.9": [0.04, 0.1, 0.24478], + "1.0": [0, 0, 0] } }, "Righthand": { "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.1": { - "vector": [16.59544, -8.00389, 2.51994], - "easing": "linear" - }, - "0.2": { - "vector": [19.22102, -14.25631, 14.03819], - "easing": "easeInSine" - }, - "0.3": { - "vector": [19.22102, -14.25631, 14.03819], - "easing": "easeInSine" - }, - "0.4": { - "vector": [19.22102, -14.25631, 14.03819], - "easing": "easeInSine" - }, - "0.5": { - "vector": [19.22102, -14.25631, 14.03819], - "easing": "easeInSine" - }, - "0.6": { - "vector": [19.22102, -14.25631, 14.03819], - "easing": "easeInSine" - }, - "0.7": { - "vector": [16.59544, -8.00389, 2.51994], - "easing": "linear" - }, - "0.9": { - "vector": [0, 0, 0], - "easing": "easeInElastic" - } + "0.0": [0, 0, 0], + "0.1": [16.59544, -8.00389, 2.51994], + "0.2": [19.22102, -14.25631, 14.03819], + "0.3": [19.22102, -14.25631, 14.03819], + "0.4": [19.22102, -14.25631, 14.03819], + "0.5": [19.22102, -14.25631, 14.03819], + "0.6": [19.22102, -14.25631, 14.03819], + "0.7": [16.59544, -8.00389, 2.51994], + "0.9": [0, 0, 0] }, "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.1": { - "vector": [-1, 0.6, -0.5], - "easing": "linear" - }, - "0.2": { - "vector": [-1, 1.5, -0.5], - "easing": "easeInSine" - }, - "0.3": { - "vector": [-1, 1.5, -0.5], - "easing": "easeInSine" - }, - "0.4": { - "vector": [-1, 1.5, 2.7], - "easing": "easeInSine" - }, - "0.5": { - "vector": [-1, 1.5, 2.7], - "easing": "easeInSine" - }, - "0.6": { - "vector": [-1, 1.5, -0.5], - "easing": "easeInSine" - }, - "0.7": { - "vector": [-1, 0.6, -0.5], - "easing": "linear" - }, - "0.9": { - "vector": [0, 0, 0], - "easing": "easeInElastic" - } + "0.0": [0, 0, 0], + "0.1": [-1, 0.6, -0.5], + "0.2": [-1, 1.5, -0.5], + "0.3": [-1, 1.5, -0.5], + "0.4": [-1, 1.5, 2.7], + "0.5": [-1, 1.5, 2.7], + "0.6": [-1, 1.5, -0.5], + "0.7": [-1, 0.6, -0.5], + "0.9": [0, 0, 0] } }, "bolt": { "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.1": { - "vector": [0, 0, 0] - }, - "0.2": { - "vector": [0, 0, 30], - "easing": "easeInSine" - }, - "0.3": { - "vector": [0, 0, 30], - "easing": "easeInSine" - }, - "0.6": { - "vector": [0, 0, 30], - "easing": "easeInSine" - }, - "0.7": { - "vector": [0, 0, 0] - } + "0.0": [0, 0, 0], + "0.1": [0, 0, 0], + "0.2": [0, 0, 30], + "0.3": [0, 0, 30], + "0.6": [0, 0, 30], + "0.7": [0, 0, 0] }, "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.1": { - "vector": [0, 0, 0] - }, - "0.2": { - "vector": [0, 0, 0], - "easing": "easeInSine" - }, - "0.3": { - "vector": [0, 0, 0], - "easing": "easeInSine" - }, - "0.4": { - "vector": [0, 0, 3.2], - "easing": "easeInSine" - }, - "0.5": { - "vector": [0, 0, 3.2] - }, - "0.6": { - "vector": [0, 0, 0], - "easing": "easeInSine" - }, - "0.7": { - "vector": [0, 0, 0], - "easing": "easeInSine" - } + "0.0": [0, 0, 0], + "0.1": [0, 0, 0], + "0.2": [0, 0, 0], + "0.3": [0, 0, 0], + "0.4": [0, 0, 3.2], + "0.5": [0, 0, 3.2], + "0.6": [0, 0, 0], + "0.7": [0, 0, 0] } }, "camera": { "rotation": { - "0.1": { - "vector": [0, 0, 0] - }, - "0.3": { - "vector": [-0.5, -0.8, -0.5] - }, - "0.5": { - "vector": [0.2, 0.4, 3], - "easing": "easeInElastic" - }, - "0.6": { - "vector": [-0.1, -0.2, -2], - "easing": "easeInElastic" - }, - "0.8": { - "vector": [0, 0, 1.5] - }, - "0.9": { - "vector": [0, 0, -0.75] - }, - "1.0": { - "vector": [0, 0, 0] - } + "0.1": [0, 0, 0], + "0.3": [-0.5, -0.8, -0.5], + "0.5": [0.2, 0.4, 3], + "0.6": [-0.1, -0.2, -2], + "0.8": [0, 0, 1.5], + "0.9": [0, 0, -0.75], + "1.0": [0, 0, 0] } } } @@ -465,507 +202,174 @@ "bones": { "0": { "rotation": { - "0.05": { - "vector": [0, 0, 0], - "easing": "easeInOutSine" - }, - "0.15": { - "vector": [-3.45497, -0.95836, -7.61112] - }, - "0.275": { - "vector": [-9.57654, -3.53761, 1.15466], - "easing": "easeInElastic" - }, - "0.45": { - "vector": [-12.53915, -4.37782, 30.21731], - "easing": "easeInElastic" - }, - "0.55": { - "vector": [-17, -0.83, 2.11] - }, - "1.075": { - "vector": [-57.82901, -5.00184, -8.17655], - "easing": "easeInElastic" - }, - "1.225": { - "vector": [-61.90219, -20.81857, -19.95071] - }, - "1.3": { - "vector": [-66.74175, -19.12898, -21.06421] - }, - "1.525": { - "vector": [-60.98072, -13.49534, -17.11409] - }, - "1.775": { - "vector": [-59.14389, -9.68328, -20.39262] - }, - "2.0": { - "vector": [-55.01718, -24.39228, -33.75787] - }, - "2.225": { - "vector": [-55.51438, -22.7486, -32.51464] - }, - "2.475": { - "vector": [-52.12845, -31.71311, -39.87549] - }, - "2.55": { - "vector": [-50.63166, -30.29197, -38.76909] - }, - "2.625": { - "vector": [-53.06059, -26.45672, -38.1501] - }, - "2.775": { - "vector": [-52.12845, -31.71311, -39.87549] - }, - "3.15": { - "vector": [-16.92692, 1.80081, 10.71797] - }, - "3.3": { - "vector": [0.6713, 1.51642, 7.12107] - }, - "3.4": { - "vector": [-8.33126, 1.11015, 1.98264] - }, - "3.525": { - "vector": [-2.25, -2, 1.82] - }, - "3.625": { - "vector": [1.0636, 0.18753, -12.84826], - "easing": "easeInElastic" - }, - "3.75": { - "vector": [4, 0, 0], - "easing": "easeInOutSine" - }, - "3.975": { - "vector": [0.49, 0, 0] - }, - "4.075": { - "vector": [0, 0, 0] - } + "0.05": [0, 0, 0], + "0.15": [-3.45497, -0.95836, -7.61112], + "0.275": [-9.57654, -3.53761, 1.15466], + "0.45": [-12.53915, -4.37782, 30.21731], + "0.55": [-17, -0.83, 2.11], + "1.075": [-57.82901, -5.00184, -8.17655], + "1.225": [-61.90219, -20.81857, -19.95071], + "1.3": [-66.74175, -19.12898, -21.06421], + "1.525": [-60.98072, -13.49534, -17.11409], + "1.775": [-59.14389, -9.68328, -20.39262], + "2.0": [-55.01718, -24.39228, -33.75787], + "2.225": [-55.51438, -22.7486, -32.51464], + "2.475": [-52.12845, -31.71311, -39.87549], + "2.55": [-50.63166, -30.29197, -38.76909], + "2.625": [-53.06059, -26.45672, -38.1501], + "2.775": [-52.12845, -31.71311, -39.87549], + "3.15": [-16.92692, 1.80081, 10.71797], + "3.3": [0.6713, 1.51642, 7.12107], + "3.4": [-8.33126, 1.11015, 1.98264], + "3.525": [-2.25, -2, 1.82], + "3.625": [1.0636, 0.18753, -12.84826], + "3.75": [4, 0, 0], + "3.975": [0.49, 0, 0], + "4.075": [0, 0, 0] }, "position": { - "0.05": { - "vector": [0, 0, 0], - "easing": "easeInOutSine" - }, - "0.2": { - "vector": [0, -0.3, 0] - }, - "0.45": { - "vector": [0, 0, 0], - "easing": "easeInElastic" - }, - "0.55": { - "vector": [-0.14027, -1.24256, 1.51996], - "easing": "easeInElastic" - }, - "0.65": { - "vector": [-0.1, 0, 2.5] - }, - "0.975": { - "vector": [-2.78, 7.3, -1.1], - "easing": "easeInElastic" - }, - "1.225": { - "vector": [-3.53, 7.5, -0.74] - }, - "1.3": { - "vector": [-2.64701, 7.47083, -1.19545] - }, - "1.4": { - "vector": [-2.66981, 7.11209, -0.68424] - }, - "1.9": { - "vector": [-3.51028, 6.5846, -1.08775] - }, - "2.45": { - "vector": [-3.51, 6.58, -1.09] - }, - "2.55": { - "vector": [-3.43374, 6.54933, -1.14853] - }, - "2.625": { - "vector": [-3.03368, 6.41847, -1.18575] - }, - "2.7": { - "vector": [-3.69025, 6.67119, -0.86389] - }, - "2.85": { - "vector": [-3.69025, 6.67119, -0.86389] - }, - "3.325": { - "vector": [-0.1, 0, 1.9], - "easing": "easeInElastic" - }, - "3.4": { - "vector": [-0.1, 0, 1.1] - }, - "3.525": { - "vector": [-0.1, 0, -1.1] - }, - "3.6": { - "vector": [0.2, -0.2, -1] - }, - "3.675": { - "vector": [0.16912, -0.00252, -0.70688] - }, - "3.775": { - "vector": [0.2, -0.2, -0.3] - }, - "3.875": { - "vector": [0.14, -0.14, 1], - "easing": "easeInSine" - }, - "3.975": { - "vector": [0.04, 0.15993, 0.24478] - }, - "4.1": { - "vector": [0, 0, 0], - "easing": "easeOutSine" - } + "0.05": [0, 0, 0], + "0.2": [0, -0.3, 0], + "0.45": [0, 0, 0], + "0.55": [-0.14027, -1.24256, 1.51996], + "0.65": [-0.1, 0, 2.5], + "0.975": [-2.78, 7.3, -1.1], + "1.225": [-3.53, 7.5, -0.74], + "1.3": [-2.64701, 7.47083, -1.19545], + "1.4": [-2.66981, 7.11209, -0.68424], + "1.9": [-3.51028, 6.5846, -1.08775], + "2.45": [-3.51, 6.58, -1.09], + "2.55": [-3.43374, 6.54933, -1.14853], + "2.625": [-3.03368, 6.41847, -1.18575], + "2.7": [-3.69025, 6.67119, -0.86389], + "2.85": [-3.69025, 6.67119, -0.86389], + "3.325": [-0.1, 0, 1.9], + "3.4": [-0.1, 0, 1.1], + "3.525": [-0.1, 0, -1.1], + "3.6": [0.2, -0.2, -1], + "3.675": [0.16912, -0.00252, -0.70688], + "3.775": [0.2, -0.2, -0.3], + "3.875": [0.14, -0.14, 1], + "3.975": [0.04, 0.15993, 0.24478], + "4.1": [0, 0, 0] } }, "Righthand": { "rotation": { - "0.1": { - "vector": [0, 0, 0] - }, - "0.325": { - "vector": [7.1897, -20.5137, -8.85702], - "easing": "easeInElastic" - }, - "0.4": { - "vector": [11.0512, -19.4714, -3.30226] - }, - "0.475": { - "vector": [9.594, -27.1862, 35.64132], - "easing": "easeInSine" - }, - "0.55": { - "vector": [9.594, -27.1862, 35.64132], - "easing": "easeInSine" - }, - "0.675": { - "vector": [4.1423, -19.7951, 13.70946] - }, - "0.775": { - "vector": [0, 0, 0] - }, - "3.225": { - "vector": [0, 0, 0] - }, - "3.325": { - "vector": [5.2693, -23.9397, 9.47263] - }, - "3.4": { - "vector": [14.486, -25.3851, 36.51757], - "easing": "easeInSine" - }, - "3.5": { - "vector": [9.594, -27.1862, 35.64132], - "easing": "easeInSine" - }, - "3.6": { - "vector": [11.0512, -19.4714, -3.30226] - }, - "3.8": { - "vector": [0, 0, 0] - } + "0.1": [0, 0, 0], + "0.325": [7.1897, -20.5137, -8.85702], + "0.4": [11.0512, -19.4714, -3.30226], + "0.475": [9.594, -27.1862, 35.64132], + "0.55": [9.594, -27.1862, 35.64132], + "0.675": [4.1423, -19.7951, 13.70946], + "0.775": [0, 0, 0], + "3.225": [0, 0, 0], + "3.325": [5.2693, -23.9397, 9.47263], + "3.4": [14.486, -25.3851, 36.51757], + "3.5": [9.594, -27.1862, 35.64132], + "3.6": [11.0512, -19.4714, -3.30226], + "3.8": [0, 0, 0] }, "position": { - "0.1": { - "vector": [0, 0, 0] - }, - "0.325": { - "vector": [1.9, 1.8, 1.1], - "easing": "easeInElastic" - }, - "0.4": { - "vector": [1.3, 1.8, 1.1] - }, - "0.475": { - "vector": [0.6, 4.3, 1.3], - "easing": "easeInSine" - }, - "0.55": { - "vector": [0.2, 4.1, 4.2], - "easing": "easeInSine" - }, - "0.65": { - "vector": [0.11, 2.28, 5.83] - }, - "0.775": { - "vector": [0, 0, 0] - }, - "3.225": { - "vector": [0, 0, 0] - }, - "3.4": { - "vector": [0.2, 4.1, 4.2], - "easing": "easeInSine" - }, - "3.5": { - "vector": [0.6, 4.3, 1.3], - "easing": "easeInSine" - }, - "3.6": { - "vector": [1.3, 1.8, 1.1] - }, - "3.8": { - "vector": [0, 0, 0] - } + "0.1": [0, 0, 0], + "0.325": [1.9, 1.8, 1.1], + "0.4": [1.3, 1.8, 1.1], + "0.475": [0.6, 4.3, 1.3], + "0.55": [0.2, 4.1, 4.2], + "0.65": [0.11, 2.28, 5.83], + "0.775": [0, 0, 0], + "3.225": [0, 0, 0], + "3.4": [0.2, 4.1, 4.2], + "3.5": [0.6, 4.3, 1.3], + "3.6": [1.3, 1.8, 1.1], + "3.8": [0, 0, 0] } }, "magzine": { "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "1.2": { - "vector": [0, 0, 0] - }, - "1.3": { - "vector": [0, 0, 0], - "easing": "easeInCubic" - }, - "1.425": { - "vector": [15, 0, 0], - "easing": "easeOutCubic" - }, - "2.2": { - "vector": [15, 0, 0], - "easing": "easeOutCubic" - }, - "2.35": { - "vector": [15, 0, 0] - }, - "2.45": { - "vector": [8.5, 0, 3] - }, - "2.65": { - "vector": [2, 0, 0] - }, - "2.725": { - "vector": [0, 0, 0], - "easing": "easeInElastic" - } + "0.0": [0, 0, 0], + "1.2": [0, 0, 0], + "1.3": [0, 0, 0], + "1.425": [15, 0, 0], + "2.2": [15, 0, 0], + "2.35": [15, 0, 0], + "2.45": [8.5, 0, 3], + "2.65": [2, 0, 0], + "2.725": [0, 0, 0] }, "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "1.2": { - "vector": [0, 0, 0] - }, - "1.3": { - "vector": [0, -4.9, 0], - "easing": "easeInCubic" - }, - "1.425": { - "vector": [0, -16.3, 10.6], - "easing": "easeOutCubic" - }, - "2.2": { - "vector": [0, -16.3, 10.6], - "easing": "easeOutCubic" - }, - "2.35": { - "vector": [0, -4.9, 0.9] - }, - "2.45": { - "vector": [0, -5.2, 0.3] - }, - "2.65": { - "vector": [0, -4.6, 0.3] - }, - "2.725": { - "vector": [0, 0, 0], - "easing": "easeInElastic" - } + "0.0": [0, 0, 0], + "1.2": [0, 0, 0], + "1.3": [0, -4.9, 0], + "1.425": [0, -16.3, 10.6], + "2.2": [0, -16.3, 10.6], + "2.35": [0, -4.9, 0.9], + "2.45": [0, -5.2, 0.3], + "2.65": [0, -4.6, 0.3], + "2.725": [0, 0, 0] } }, "bolt": { "rotation": { - "0.175": { - "vector": [0, 0, 0] - }, - "0.4": { - "vector": [0, 0, 0] - }, - "0.475": { - "vector": [0, 0, 35], - "easing": "easeInSine" - }, - "3.5": { - "vector": [0, 0, 35] - }, - "3.6": { - "vector": [0, 0, 0] - } + "0.175": [0, 0, 0], + "0.4": [0, 0, 0], + "0.475": [0, 0, 35], + "3.5": [0, 0, 35], + "3.6": [0, 0, 0] }, "position": { - "0.175": { - "vector": [0, 0, 0] - }, - "0.4": { - "vector": [0, 0, 0] - }, - "0.475": { - "vector": [0, 0, 0], - "easing": "easeInSine" - }, - "0.55": { - "vector": [0, 0, 3.14453], - "easing": "easeInSine" - }, - "3.4": { - "vector": [0, 0, 3.14453] - }, - "3.5": { - "vector": [0, 0, 0], - "easing": "easeInSine" - }, - "3.6": { - "vector": [0, 0, 0], - "easing": "easeInSine" - } + "0.175": [0, 0, 0], + "0.4": [0, 0, 0], + "0.475": [0, 0, 0], + "0.55": [0, 0, 3.14453], + "3.4": [0, 0, 3.14453], + "3.5": [0, 0, 0], + "3.6": [0, 0, 0] } }, "Lefthand": { "rotation": { - "0.65": { - "vector": [0, 0, 0] - }, - "0.75": { - "vector": [31.4003, 27.5843, -34.88785], - "easing": "linear" - }, - "0.9": { - "vector": [18.8359, 15.4973, -28.28221], - "easing": "linear" - }, - "2.95": { - "vector": [18.8359, 15.4973, -28.28221], - "easing": "linear" - }, - "3.075": { - "vector": [27.6681, 12.1849, -18.97431], - "easing": "linear" - }, - "3.225": { - "vector": [0, 0, 0], - "easing": "easeInElastic" - } + "0.65": [0, 0, 0], + "0.75": [31.4003, 27.5843, -34.88785], + "0.9": [18.8359, 15.4973, -28.28221], + "2.95": [18.8359, 15.4973, -28.28221], + "3.075": [27.6681, 12.1849, -18.97431], + "3.225": [0, 0, 0] }, "position": { - "0.65": { - "vector": [0, 0, 0] - }, - "0.75": { - "vector": [-0.1, -1.5, 10.3], - "easing": "linear" - }, - "0.9": { - "vector": [-1, -1.2, 22.1], - "easing": "linear" - }, - "2.95": { - "vector": [-1, -1.2, 22.1], - "easing": "linear" - }, - "3.075": { - "vector": [-0.1, -3.5, 10.3], - "easing": "linear" - }, - "3.225": { - "vector": [0, 0, 0], - "easing": "easeInElastic" - } + "0.65": [0, 0, 0], + "0.75": [-0.1, -1.5, 10.3], + "0.9": [-1, -1.2, 22.1], + "2.95": [-1, -1.2, 22.1], + "3.075": [-0.1, -3.5, 10.3], + "3.225": [0, 0, 0] } }, "camera": { "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.3": { - "vector": [0, 0, -2], - "easing": "easeInElastic" - }, - "0.4": { - "vector": [0.2, 0, 0] - }, - "0.525": { - "vector": [1, 2, 1.8] - }, - "0.575": { - "vector": [-1.5, -3, -1.5] - }, - "0.95": { - "vector": [3, 0.1, 1.6] - }, - "1.275": { - "vector": [3, 0, 1.5], - "easing": "easeInElastic" - }, - "1.325": { - "vector": [4, 1, -2], - "easing": "easeInSine" - }, - "1.45": { - "vector": [1, -0.5, 1.5] - }, - "1.575": { - "vector": [2.5, 0, 1.2], - "easing": "easeOutSine" - }, - "2.05": { - "vector": [1, 0, -0.5] - }, - "2.35": { - "vector": [3.5, 0, 2], - "easing": "easeInElastic" - }, - "2.5": { - "vector": [2.5, 0, 2.2], - "easing": "linear" - }, - "2.6": { - "vector": [4.5, -0.7, 1.2], - "easing": "easeInSine" - }, - "2.7": { - "vector": [2.6, 0.4, -1.5], - "easing": "easeOutSine" - }, - "2.875": { - "vector": [2, 0, 1.5], - "easing": "easeInElastic" - }, - "3.125": { - "vector": [0.03, 0.25, -1.18] - }, - "3.4": { - "vector": [0.2, 1.5, 3] - }, - "3.525": { - "vector": [2, 3, -2], - "easing": "easeInElastic" - }, - "3.6": { - "vector": [1, -1, 1.5] - }, - "3.7": { - "vector": [0, 0.5, -0.75] - }, - "3.8": { - "vector": [0, 0, 0.4], - "easing": "linear" - }, - "4.0": { - "vector": [0, 0, 0] - } + "0.0": [0, 0, 0], + "0.3": [0, 0, -2], + "0.4": [0.2, 0, 0], + "0.525": [1, 2, 1.8], + "0.575": [-1.5, -3, -1.5], + "0.95": [3, 0.1, 1.6], + "1.275": [3, 0, 1.5], + "1.325": [4, 1, -2], + "1.45": [1, -0.5, 1.5], + "1.575": [2.5, 0, 1.2], + "2.05": [1, 0, -0.5], + "2.35": [3.5, 0, 2], + "2.5": [2.5, 0, 2.2], + "2.6": [4.5, -0.7, 1.2], + "2.7": [2.6, 0.4, -1.5], + "2.875": [2, 0, 1.5], + "3.125": [0.03, 0.25, -1.18], + "3.4": [0.2, 1.5, 3], + "3.525": [2, 3, -2], + "3.6": [1, -1, 1.5], + "3.7": [0, 0.5, -0.75], + "3.8": [0, 0, 0.4], + "4.0": [0, 0, 0] } } } @@ -977,293 +381,102 @@ "bones": { "0": { "rotation": { - "0.125": { - "vector": [0, 0, 0], - "easing": "easeInOutSine" - }, - "0.225": { - "vector": [-1.07, -0.74, 6.37] - }, - "0.425": { - "vector": [-20.56192, -1.50886, -9.45771], - "easing": "easeInElastic" - }, - "0.5": { - "vector": [-20.48387, -9.95091, -26.47651] - }, - "0.6": { - "vector": [-17.67, -9.06, -20.67] - }, - "0.725": { - "vector": [-43.4025, -7.94945, -13.41702] - }, - "0.925": { - "vector": [-59.14389, -9.68328, -20.39262], - "easing": "easeInElastic" - }, - "1.075": { - "vector": [-55.01718, -24.39228, -33.75787] - }, - "1.375": { - "vector": [-55.51438, -22.7486, -32.51464] - }, - "1.725": { - "vector": [-52.12845, -31.71311, -39.87549] - }, - "1.8": { - "vector": [-50.63166, -30.29197, -38.76909] - }, - "1.875": { - "vector": [-53.06059, -26.45672, -38.1501] - }, - "2.025": { - "vector": [-52.12845, -31.71311, -39.87549] - }, - "2.3": { - "vector": [-16.92692, 1.80081, 10.71797] - }, - "2.425": { - "vector": [0.6713, 1.51642, 7.12107] - }, - "2.5": { - "vector": [4, 0, 0], - "easing": "easeInOutSine" - }, - "2.725": { - "vector": [0.49, 0, 0] - }, - "2.825": { - "vector": [0, 0, 0] - } + "0.125": [0, 0, 0], + "0.225": [-1.07, -0.74, 6.37], + "0.425": [-20.56192, -1.50886, -9.45771], + "0.5": [-20.48387, -9.95091, -26.47651], + "0.6": [-17.67, -9.06, -20.67], + "0.725": [-43.4025, -7.94945, -13.41702], + "0.925": [-59.14389, -9.68328, -20.39262], + "1.075": [-55.01718, -24.39228, -33.75787], + "1.375": [-55.51438, -22.7486, -32.51464], + "1.725": [-52.12845, -31.71311, -39.87549], + "1.8": [-50.63166, -30.29197, -38.76909], + "1.875": [-53.06059, -26.45672, -38.1501], + "2.025": [-52.12845, -31.71311, -39.87549], + "2.3": [-16.92692, 1.80081, 10.71797], + "2.425": [0.6713, 1.51642, 7.12107], + "2.5": [4, 0, 0], + "2.725": [0.49, 0, 0], + "2.825": [0, 0, 0] }, "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.075": { - "vector": [0, 0, -1], - "easing": "easeInOutSine" - }, - "0.425": { - "vector": [-3.53, 4, -1.24] - }, - "0.5": { - "vector": [-2.14701, 3.47083, -2.19545] - }, - "0.6": { - "vector": [-2.96981, 4.21209, -2.58424] - }, - "0.975": { - "vector": [-3.51028, 6.5846, -1.08775] - }, - "1.7": { - "vector": [-3.51, 6.58, -1.09] - }, - "1.8": { - "vector": [-3.43374, 6.54933, -1.14853] - }, - "1.875": { - "vector": [-3.03368, 6.41847, -1.18575] - }, - "1.95": { - "vector": [-3.69025, 6.67119, -0.86389] - }, - "2.1": { - "vector": [-3.69025, 6.67119, -0.86389] - }, - "2.45": { - "vector": [-0.1, 0, 0.9], - "easing": "easeInElastic" - }, - "2.525": { - "vector": [0.2, -0.2, -0.3] - }, - "2.625": { - "vector": [0.14, -0.14, 1], - "easing": "easeInSine" - }, - "2.725": { - "vector": [0.04, 0.15993, 0.24478] - }, - "2.85": { - "vector": [0, 0, 0], - "easing": "easeOutSine" - } + "0.0": [0, 0, 0], + "0.075": [0, 0, -1], + "0.425": [-3.53, 4, -1.24], + "0.5": [-2.14701, 3.47083, -2.19545], + "0.6": [-2.96981, 4.21209, -2.58424], + "0.975": [-3.51028, 6.5846, -1.08775], + "1.7": [-3.51, 6.58, -1.09], + "1.8": [-3.43374, 6.54933, -1.14853], + "1.875": [-3.03368, 6.41847, -1.18575], + "1.95": [-3.69025, 6.67119, -0.86389], + "2.1": [-3.69025, 6.67119, -0.86389], + "2.45": [-0.1, 0, 0.9], + "2.525": [0.2, -0.2, -0.3], + "2.625": [0.14, -0.14, 1], + "2.725": [0.04, 0.15993, 0.24478], + "2.85": [0, 0, 0] } }, "magzine": { "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.375": { - "vector": [0, 0, 0] - }, - "0.475": { - "vector": [0, 0, 0], - "easing": "easeInCubic" - }, - "0.6": { - "vector": [15, 0, 0], - "easing": "easeOutCubic" - }, - "1.525": { - "vector": [15, 0, 0], - "easing": "easeOutCubic" - }, - "1.675": { - "vector": [15, 0, 0] - }, - "1.775": { - "vector": [8.5, 0, 3] - }, - "1.925": { - "vector": [2, 0, 0] - }, - "2.05": { - "vector": [0, 0, 0], - "easing": "easeInElastic" - } + "0.0": [0, 0, 0], + "0.375": [0, 0, 0], + "0.475": [0, 0, 0], + "0.6": [15, 0, 0], + "1.525": [15, 0, 0], + "1.675": [15, 0, 0], + "1.775": [8.5, 0, 3], + "1.925": [2, 0, 0], + "2.05": [0, 0, 0] }, "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.375": { - "vector": [0, 0, 0] - }, - "0.475": { - "vector": [0, -4.9, 0], - "easing": "easeInCubic" - }, - "0.6": { - "vector": [0, -16.3, 10.6], - "easing": "easeOutCubic" - }, - "1.525": { - "vector": [0, -16.3, 10.6], - "easing": "easeOutCubic" - }, - "1.675": { - "vector": [0, -4.9, 0.9] - }, - "1.775": { - "vector": [0, -5.2, 0.3] - }, - "1.925": { - "vector": [0, -4.6, 0.3] - }, - "2.05": { - "vector": [0, 0, 0], - "easing": "easeInElastic" - } + "0.0": [0, 0, 0], + "0.375": [0, 0, 0], + "0.475": [0, -4.9, 0], + "0.6": [0, -16.3, 10.6], + "1.525": [0, -16.3, 10.6], + "1.675": [0, -4.9, 0.9], + "1.775": [0, -5.2, 0.3], + "1.925": [0, -4.6, 0.3], + "2.05": [0, 0, 0] } }, "Lefthand": { "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.1": { - "vector": [31.4003, 27.5843, -34.88785], - "easing": "linear" - }, - "0.25": { - "vector": [18.8359, 15.4973, -28.28221], - "easing": "linear" - }, - "2.125": { - "vector": [18.8359, 15.4973, -28.28221], - "easing": "linear" - }, - "2.25": { - "vector": [27.6681, 12.1849, -18.97431], - "easing": "linear" - }, - "2.375": { - "vector": [0, 0, 0], - "easing": "easeInElastic" - } + "0.0": [0, 0, 0], + "0.1": [31.4003, 27.5843, -34.88785], + "0.25": [18.8359, 15.4973, -28.28221], + "2.125": [18.8359, 15.4973, -28.28221], + "2.25": [27.6681, 12.1849, -18.97431], + "2.375": [0, 0, 0] }, "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.1": { - "vector": [-0.1, -1.5, 10.3], - "easing": "linear" - }, - "0.25": { - "vector": [-1, -1.2, 22.1], - "easing": "linear" - }, - "2.125": { - "vector": [-1, -1.2, 22.1], - "easing": "linear" - }, - "2.25": { - "vector": [-0.1, -3.5, 10.3], - "easing": "linear" - }, - "2.375": { - "vector": [0, 0, 0], - "easing": "easeInElastic" - } + "0.0": [0, 0, 0], + "0.1": [-0.1, -1.5, 10.3], + "0.25": [-1, -1.2, 22.1], + "2.125": [-1, -1.2, 22.1], + "2.25": [-0.1, -3.5, 10.3], + "2.375": [0, 0, 0] } }, "camera": { "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.35": { - "vector": [3, 0.1, 1.6], - "easing": "easeInElastic" - }, - "0.425": { - "vector": [3, 0, 1.5], - "easing": "easeInElastic" - }, - "0.475": { - "vector": [4, 1, -2], - "easing": "easeInSine" - }, - "0.6": { - "vector": [1, -0.5, 1.5] - }, - "0.725": { - "vector": [2.5, 0, 1.2], - "easing": "easeOutSine" - }, - "0.9": { - "vector": [1, 0, -0.5] - }, - "1.5": { - "vector": [3.5, 0, 2], - "easing": "easeInElastic" - }, - "1.65": { - "vector": [2.5, 0, 2.2], - "easing": "linear" - }, - "1.75": { - "vector": [4.5, -0.7, 1.2], - "easing": "easeInSine" - }, - "1.85": { - "vector": [2.6, 0.4, -1.5], - "easing": "easeOutSine" - }, - "2.025": { - "vector": [2, 0, 1.5], - "easing": "easeInElastic" - }, - "2.275": { - "vector": [0.03, 0.25, -1.18] - }, - "2.475": { - "vector": [0, 0, 0] - } + "0.0": [0, 0, 0], + "0.35": [3, 0.1, 1.6], + "0.425": [3, 0, 1.5], + "0.475": [4, 1, -2], + "0.6": [1, -0.5, 1.5], + "0.725": [2.5, 0, 1.2], + "0.9": [1, 0, -0.5], + "1.5": [3.5, 0, 2], + "1.65": [2.5, 0, 2.2], + "1.75": [4.5, -0.7, 1.2], + "1.85": [2.6, 0.4, -1.5], + "2.025": [2, 0, 1.5], + "2.275": [0.03, 0.25, -1.18], + "2.475": [0, 0, 0] } } }, @@ -1280,417 +493,143 @@ "bones": { "0": { "rotation": { - "0.125": { - "vector": [0, 0, 0], - "easing": "easeInOutSine" - }, - "0.225": { - "vector": [-1.07, -0.74, 6.37] - }, - "0.4": { - "vector": [-21.00421, 2.1987, -9.76969], - "easing": "easeInElastic" - }, - "0.45": { - "vector": [-10.45706, -0.57219, -1.48766] - }, - "0.625": { - "vector": [-12.79191, 1.29478, -15.71322], - "easing": "easeOutSine" - }, - "0.875": { - "vector": [-8.94473, 1.01294, -13.62331], - "easing": "easeInSine" - }, - "1.15": { - "vector": [-11.19715, -0.70529, -24.48873], - "easing": "easeOutSine" - }, - "1.25": { - "vector": [-22.13465, -0.70529, -24.48873] - }, - "1.325": { - "vector": [-14.15548, -0.70529, -24.48873] - }, - "1.4": { - "vector": [-11.19715, -0.70529, -24.48873] - }, - "1.6": { - "vector": [-14.60525, -1.27905, -25.09341] - }, - "2.2": { - "vector": [-13.65087, -0.52126, -22.19032], - "easing": "easeInOutBounce" - }, - "3.2": { - "vector": [-14.09507, -1.32686, -25.33937], - "easing": "easeOutBounce" - }, - "4.0": { - "vector": [-14.60525, -1.27905, -25.09341], - "easing": "easeInOutElastic", - "easingArgs": [2] - }, - "4.8": { - "vector": [-14.09507, -1.32686, -25.33937], - "easing": "easeOutBounce" - }, - "5.3": { - "vector": [-19.16482, -4.69151, -30.4598], - "easing": "easeInOutElastic" - }, - "5.35": { - "vector": [-1.2, -2.98, -24.12] - }, - "5.425": { - "vector": [-9.51036, -1.88007, -20.04177] - }, - "5.55": { - "vector": [-4.25751, -0.41349, -14.60414] - }, - "5.725": { - "vector": [0.6713, 1.51642, 7.12107] - }, - "5.85": { - "vector": [4, 0, 0], - "easing": "easeInOutSine" - }, - "6.075": { - "vector": [0.49, 0, 0] - }, - "6.175": { - "vector": [0, 0, 0] - } + "0.125": [0, 0, 0], + "0.225": [-1.07, -0.74, 6.37], + "0.4": [-21.00421, 2.1987, -9.76969], + "0.45": [-10.45706, -0.57219, -1.48766], + "0.625": [-12.79191, 1.29478, -15.71322], + "0.875": [-8.94473, 1.01294, -13.62331], + "1.15": [-11.19715, -0.70529, -24.48873], + "1.25": [-22.13465, -0.70529, -24.48873], + "1.325": [-14.15548, -0.70529, -24.48873], + "1.4": [-11.19715, -0.70529, -24.48873], + "1.6": [-14.60525, -1.27905, -25.09341], + "2.2": [-13.65087, -0.52126, -22.19032], + "3.2": [-14.09507, -1.32686, -25.33937], + "4.0": [-14.60525, -1.27905, -25.09341], + "4.8": [-14.09507, -1.32686, -25.33937], + "5.3": [-19.16482, -4.69151, -30.4598], + "5.35": [-1.2, -2.98, -24.12], + "5.425": [-9.51036, -1.88007, -20.04177], + "5.55": [-4.25751, -0.41349, -14.60414], + "5.725": [0.6713, 1.51642, 7.12107], + "5.85": [4, 0, 0], + "6.075": [0.49, 0, 0], + "6.175": [0, 0, 0] }, "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.075": { - "vector": [0, 0, -1], - "easing": "easeInOutSine" - }, - "0.425": { - "vector": [-1.36248, 1.69031, 2.10621] - }, - "0.475": { - "vector": [-0.8712, 0.69827, 1.88583] - }, - "0.55": { - "vector": [-0.98626, 0.8841, 1.93682] - }, - "0.875": { - "vector": [-1.31843, 1.64318, 2.1022] - }, - "1.15": { - "vector": [-1.44352, 1.86669, 2.15767], - "easing": "easeOutSine" - }, - "1.25": { - "vector": [-1.62065, 1.90639, 2.21894] - }, - "1.325": { - "vector": [-1.47764, 1.47777, 2.20227] - }, - "1.4": { - "vector": [-1.4844, 0.95586, 2.17709], - "easing": "easeOutSine" - }, - "1.8": { - "vector": [-1.41, 1.27, 1.93] - }, - "2.0": { - "vector": [-1.41, 1.20359, 1.93] - }, - "2.3": { - "vector": [-1.41, 1.27, 1.93] - }, - "2.8": { - "vector": [-1.41, 1.19188, 1.93], - "easing": "easeInBounce" - }, - "3.5": { - "vector": [-1.41, 1.27, 1.93] - }, - "4.6": { - "vector": [-1.41, 1.19188, 1.93], - "easing": "easeInBounce" - }, - "5.3": { - "vector": [-1.33, 1.82, 1.74] - }, - "5.375": { - "vector": [-0.86, 0.07, 1.93] - }, - "5.45": { - "vector": [-0.86, -0.14, 1.25] - }, - "5.75": { - "vector": [-0.1, 0.5, 1.9], - "easing": "easeInElastic" - }, - "5.875": { - "vector": [0.2, 0.05, -0.3] - }, - "5.975": { - "vector": [0.14, 0.11, 1], - "easing": "easeInSine" - }, - "6.075": { - "vector": [0.04, 0.15993, 0.24478] - }, - "6.2": { - "vector": [0, 0, 0], - "easing": "easeOutSine" - } + "0.0": [0, 0, 0], + "0.075": [0, 0, -1], + "0.425": [-1.36248, 1.69031, 2.10621], + "0.475": [-0.8712, 0.69827, 1.88583], + "0.55": [-0.98626, 0.8841, 1.93682], + "0.875": [-1.31843, 1.64318, 2.1022], + "1.15": [-1.44352, 1.86669, 2.15767], + "1.25": [-1.62065, 1.90639, 2.21894], + "1.325": [-1.47764, 1.47777, 2.20227], + "1.4": [-1.4844, 0.95586, 2.17709], + "1.8": [-1.41, 1.27, 1.93], + "2.0": [-1.41, 1.20359, 1.93], + "2.3": [-1.41, 1.27, 1.93], + "2.8": [-1.41, 1.19188, 1.93], + "3.5": [-1.41, 1.27, 1.93], + "4.6": [-1.41, 1.19188, 1.93], + "5.3": [-1.33, 1.82, 1.74], + "5.375": [-0.86, 0.07, 1.93], + "5.45": [-0.86, -0.14, 1.25], + "5.75": [-0.1, 0.5, 1.9], + "5.875": [0.2, 0.05, -0.3], + "5.975": [0.14, 0.11, 1], + "6.075": [0.04, 0.15993, 0.24478], + "6.2": [0, 0, 0] } }, "Lefthand": { "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.125": { - "vector": [5.2274, 20.401, -3.54905] - }, - "0.325": { - "vector": [5.7779, -3.3065, 2.38196], - "easing": "linear" - }, - "0.4": { - "vector": [5.7779, -3.3065, 2.38196], - "easing": "linear" - }, - "0.6": { - "vector": [5.7779, -3.3065, 2.38196], - "easing": "linear" - }, - "1.0": { - "vector": [5.7779, -3.3065, 2.38196], - "easing": "linear" - }, - "1.2": { - "vector": [5.7779, -3.3065, 2.38196], - "easing": "linear" - }, - "1.3": { - "vector": [5.7779, -3.3065, 2.38196], - "easing": "linear" - }, - "1.4": { - "vector": [46.33526, 34.1097, -55.1921], - "easing": "linear" - }, - "1.6": { - "vector": [33.06345, 45.06718, -89.58383], - "easing": "linear" - }, - "5.3": { - "vector": [33.06345, 45.06718, -89.58383] - }, - "5.8": { - "vector": [0, 0, 0] - } + "0.0": [0, 0, 0], + "0.125": [5.2274, 20.401, -3.54905], + "0.325": [5.7779, -3.3065, 2.38196], + "0.4": [5.7779, -3.3065, 2.38196], + "0.6": [5.7779, -3.3065, 2.38196], + "1.0": [5.7779, -3.3065, 2.38196], + "1.2": [5.7779, -3.3065, 2.38196], + "1.3": [5.7779, -3.3065, 2.38196], + "1.4": [46.33526, 34.1097, -55.1921], + "1.6": [33.06345, 45.06718, -89.58383], + "5.3": [33.06345, 45.06718, -89.58383], + "5.8": [0, 0, 0] }, "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.125": { - "vector": [-0.06, 1.39, 4.09] - }, - "0.325": { - "vector": [-0.9, -2.5, 6.3], - "easing": "linear" - }, - "0.4": { - "vector": [-0.9, -2.5, 6.3], - "easing": "linear" - }, - "0.6": { - "vector": [-0.9, -11.5, 6.3], - "easing": "linear" - }, - "1.0": { - "vector": [-0.9, -11.5, 6.3], - "easing": "linear" - }, - "1.2": { - "vector": [-0.9, -2.5, 6.3], - "easing": "linear" - }, - "1.3": { - "vector": [-0.9, -2.5, 6.3], - "easing": "linear" - }, - "1.6": { - "vector": [-4.23047, -0.61484, 8.4] - }, - "5.3": { - "vector": [-4.23047, -0.61484, 8.4] - }, - "5.5": { - "vector": [-4.4, -11.5, 7.7], - "easing": "easeOutSine" - }, - "5.8": { - "vector": [0, 0, 0] - } + "0.0": [0, 0, 0], + "0.125": [-0.06, 1.39, 4.09], + "0.325": [-0.9, -2.5, 6.3], + "0.4": [-0.9, -2.5, 6.3], + "0.6": [-0.9, -11.5, 6.3], + "1.0": [-0.9, -11.5, 6.3], + "1.2": [-0.9, -2.5, 6.3], + "1.3": [-0.9, -2.5, 6.3], + "1.6": [-4.23047, -0.61484, 8.4], + "5.3": [-4.23047, -0.61484, 8.4], + "5.5": [-4.4, -11.5, 7.7], + "5.8": [0, 0, 0] } }, "chamber": { "rotation": { - "1.5": { - "vector": [0, 0, 0], - "easing": "easeOutBack" - }, - "3.2": { - "vector": [0, 0, -2160], - "easing": "easeInOutSine" - }, - "5.4": { - "vector": [0, 0, 0], - "easing": "easeInOutBack" - } + "1.5": [0, 0, 0], + "3.2": [0, 0, -2160], + "5.4": [0, 0, 0] } }, "battery": { "rotation": { - "0.4": { - "vector": [0, 0, 0] - }, - "1.2": { - "vector": [0, 0, 0] - } + "0.4": [0, 0, 0], + "1.2": [0, 0, 0] }, "position": { - "0.4": { - "vector": [0, 0, 0] - }, - "0.6": { - "vector": [0, -9, 0] - }, - "1.0": { - "vector": [0, -9, 0] - }, - "1.2": { - "vector": [0, 0, 0] - } + "0.4": [0, 0, 0], + "0.6": [0, -9, 0], + "1.0": [0, -9, 0], + "1.2": [0, 0, 0] } }, "line": { "position": { - "0.7": { - "vector": [0, 0, 0] - }, - "0.725": { - "vector": [0, 10, -50] - }, - "5.3": { - "vector": [0, 10, -50] - }, - "5.475": { - "vector": [-1, 0.9, -47.3] - }, - "5.5": { - "vector": [0, 0, 0] - } + "0.7": [0, 0, 0], + "0.725": [0, 10, -50], + "5.3": [0, 10, -50], + "5.475": [-1, 0.9, -47.3], + "5.5": [0, 0, 0] } }, "camera": { "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.125": { - "vector": [0, 0, -0.25] - }, - "0.4": { - "vector": [0, 0, 1.5], - "easing": "easeInElastic" - }, - "0.45": { - "vector": [2, 1, -2], - "easing": "easeInSine" - }, - "0.575": { - "vector": [-1, -0.5, 1.5] - }, - "0.775": { - "vector": [0.5, 0, 1.2], - "easing": "easeOutSine" - }, - "0.95": { - "vector": [0.5, 0, 2], - "easing": "easeInElastic" - }, - "1.075": { - "vector": [-0.5, 0, 2.2], - "easing": "linear" - }, - "1.2": { - "vector": [1.5, -0.7, 1.2], - "easing": "easeInSine" - }, - "1.25": { - "vector": [-0.4, 0.4, -1.5], - "easing": "easeOutSine" - }, - "1.425": { - "vector": [0, 0, 1.5], - "easing": "easeInElastic" - }, - "1.6": { - "vector": [-1, -0.5, 0.5] - }, - "1.725": { - "vector": [-0.79, 0.39, -0.39] - }, - "2.55": { - "vector": [0.2, 0.1, 0.1] - }, - "2.85": { - "vector": [0.5, 0, 1.2], - "easing": "easeOutSine" - }, - "3.3": { - "vector": [0.21, -0.1, 1.26] - }, - "4.05": { - "vector": [0.27, 0.08, 0.35] - }, - "5.2": { - "vector": [-0.55, 0.32, -0.27] - }, - "5.3": { - "vector": [3, 0, 1.5], - "easing": "easeInElastic" - }, - "5.35": { - "vector": [4, 1, -2], - "easing": "easeInSine" - }, - "5.475": { - "vector": [1, -0.5, 1.5] - }, - "5.55": { - "vector": [2.5, 0, 1.2], - "easing": "easeOutSine" - }, - "5.675": { - "vector": [-0.4, 0.4, -1.5], - "easing": "easeOutSine" - }, - "5.85": { - "vector": [0, 0, 1.5], - "easing": "easeInElastic" - }, - "6.025": { - "vector": [-1, -0.5, -0.5] - }, - "6.15": { - "vector": [0, 0, 0] - } + "0.0": [0, 0, 0], + "0.125": [0, 0, -0.25], + "0.4": [0, 0, 1.5], + "0.45": [2, 1, -2], + "0.575": [-1, -0.5, 1.5], + "0.775": [0.5, 0, 1.2], + "0.95": [0.5, 0, 2], + "1.075": [-0.5, 0, 2.2], + "1.2": [1.5, -0.7, 1.2], + "1.25": [-0.4, 0.4, -1.5], + "1.425": [0, 0, 1.5], + "1.6": [-1, -0.5, 0.5], + "1.725": [-0.79, 0.39, -0.39], + "2.55": [0.2, 0.1, 0.1], + "2.85": [0.5, 0, 1.2], + "3.3": [0.21, -0.1, 1.26], + "4.05": [0.27, 0.08, 0.35], + "5.2": [-0.55, 0.32, -0.27], + "5.3": [3, 0, 1.5], + "5.35": [4, 1, -2], + "5.475": [1, -0.5, 1.5], + "5.55": [2.5, 0, 1.2], + "5.675": [-0.4, 0.4, -1.5], + "5.85": [0, 0, 1.5], + "6.025": [-1, -0.5, -0.5], + "6.15": [0, 0, 0] } } }, @@ -1700,6 +639,5 @@ } } } - }, - "geckolib_format_version": 2 + } } \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/geo/sentinel.geo.json b/src/main/resources/assets/superbwarfare/geo/sentinel.geo.json index 707198498..31cd3ff54 100644 --- a/src/main/resources/assets/superbwarfare/geo/sentinel.geo.json +++ b/src/main/resources/assets/superbwarfare/geo/sentinel.geo.json @@ -7694,7 +7694,12 @@ { "name": "line", "parent": "battery", - "pivot": [5.83675, -18.29754, 50.60784], + "pivot": [5.83675, -18.29754, 50.60784] + }, + { + "name": "wires", + "parent": "line", + "pivot": [0, 0, 0], "cubes": [ { "origin": [-0.2676, -14.16696, 49.07347],