diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/item/Glock17ItemModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/item/Glock17ItemModel.java index 9d4dba470..183644e52 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/item/Glock17ItemModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/item/Glock17ItemModel.java @@ -63,27 +63,25 @@ public class Glock17ItemModel extends GeoModel { double fp = ClientEventHandler.firePos; double fr = ClientEventHandler.fireRot; - gun.setPosX(-1.34f * (float) zp); + gun.setPosX(2.23f * (float) zp); - gun.setPosY(5.05f * (float) zp - (float) (0.2f * zpz)); + gun.setPosY(3.15f * (float) zp - (float) (0.2f * zpz)); gun.setPosZ(5f * (float) zp + (float) (0.3f * zpz)); gun.setScaleZ(1f - (0.35f * (float) zp)); - gun.setRotZ(-11 * Mth.DEG_TO_RAD * (float) zp + (float) (0.05f * zpz)); - shen.setPosX((float) (0.95f * ClientEventHandler.recoilHorizon * fpz * fp)); - shen.setPosY((float) (0.21f * fp + 0.25f * fr)); + shen.setPosY((float) (0.25f * fp + 0.28f * fr)); shen.setPosZ((float) (2.375 * fp + 0.44f * fr + 0.75 * fpz)); - shen.setRotX((float) (0.01f * fp + 0.05f * fr + 0.01f * fpz)); + shen.setRotX((float) (0.15f * fp + 0.3f * fr + 0.3f * fpz)); shen.setRotY((float) (0.1f * ClientEventHandler.recoilHorizon * fpz)); shen.setRotZ((float) ((0.08f + 0.1 * fr) * ClientEventHandler.recoilHorizon)); shen.setPosX((float) (shen.getPosX() * (1 - 0.4 * zt))); shen.setPosY((float) (shen.getPosY() * (1 - 0.5 * zt))); shen.setPosZ((float) (shen.getPosZ() * (1 - 0.3 * zt))); - shen.setRotX((float) (shen.getRotX() * (1 - 0.27 * zt))); + shen.setRotX((float) (shen.getRotX() * (1 - 0.8 * zt))); shen.setRotY((float) (shen.getRotY() * (1 - 0.7 * zt))); shen.setRotZ((float) (shen.getRotZ() * (1 - 0.65 * zt))); @@ -127,8 +125,10 @@ public class Glock17ItemModel extends GeoModel { AnimationHelper.handleShellsAnimation(getAnimationProcessor(), 0.7f, 1f); CoreGeoBone shell = getAnimationProcessor().getBone("shell"); + CoreGeoBone barrel = getAnimationProcessor().getBone("guan"); if (GunsTool.getGunBooleanTag(stack, "HoldOpen")) { slide.setPosZ(1.5f); + barrel.setRotX(4 * Mth.DEG_TO_RAD); bullet.setScaleX(0); bullet.setScaleY(0); bullet.setScaleZ(0); @@ -137,6 +137,7 @@ public class Glock17ItemModel extends GeoModel { shell.setScaleY(0); shell.setScaleZ(0); } else { + barrel.setRotX(0); bullet.setScaleX(1); bullet.setScaleY(1); bullet.setScaleZ(1); diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/item/Glock18ItemModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/item/Glock18ItemModel.java index a5a50ba90..fe3c39c2a 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/item/Glock18ItemModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/item/Glock18ItemModel.java @@ -72,27 +72,25 @@ public class Glock18ItemModel extends GeoModel { double fp = ClientEventHandler.firePos; double fr = ClientEventHandler.fireRot; - gun.setPosX(-1.34f * (float) zp); + gun.setPosX(2.23f * (float) zp); - gun.setPosY(5.05f * (float) zp - (float) (0.2f * zpz)); + gun.setPosY(3.15f * (float) zp - (float) (0.2f * zpz)); gun.setPosZ(5f * (float) zp + (float) (0.3f * zpz)); gun.setScaleZ(1f - (0.35f * (float) zp)); - gun.setRotZ(-11 * Mth.DEG_TO_RAD * (float) zp + (float) (0.05f * zpz)); - shen.setPosX((float) (0.95f * ClientEventHandler.recoilHorizon * fpz * fp)); - shen.setPosY((float) (0.21f * fp + 0.25f * fr)); + shen.setPosY((float) (0.25f * fp + 0.28f * fr)); shen.setPosZ((float) (2.375 * fp + 0.44f * fr + 0.75 * fpz)); - shen.setRotX((float) (0.01f * fp + 0.05f * fr + 0.01f * fpz)); + shen.setRotX((float) (0.15f * fp + 0.3f * fr + 0.3f * fpz)); shen.setRotY((float) (0.1f * ClientEventHandler.recoilHorizon * fpz)); shen.setRotZ((float) ((0.08f + 0.1 * fr) * ClientEventHandler.recoilHorizon)); shen.setPosX((float) (shen.getPosX() * (1 - 0.4 * zt))); shen.setPosY((float) (shen.getPosY() * (1 - 0.5 * zt))); shen.setPosZ((float) (shen.getPosZ() * (1 - 0.3 * zt))); - shen.setRotX((float) (shen.getRotX() * (1 - 0.27 * zt))); + shen.setRotX((float) (shen.getRotX() * (1 - 0.8 * zt))); shen.setRotY((float) (shen.getRotY() * (1 - 0.7 * zt))); shen.setRotZ((float) (shen.getRotZ() * (1 - 0.65 * zt))); @@ -136,8 +134,10 @@ public class Glock18ItemModel extends GeoModel { AnimationHelper.handleShellsAnimation(getAnimationProcessor(), 0.7f, 1f); CoreGeoBone shell = getAnimationProcessor().getBone("shell"); + CoreGeoBone barrel = getAnimationProcessor().getBone("guan"); if (GunsTool.getGunBooleanTag(stack, "HoldOpen")) { slide.setPosZ(1.5f); + barrel.setRotX(4 * Mth.DEG_TO_RAD); bullet.setScaleX(0); bullet.setScaleY(0); bullet.setScaleZ(0); @@ -146,6 +146,7 @@ public class Glock18ItemModel extends GeoModel { shell.setScaleY(0); shell.setScaleZ(0); } else { + barrel.setRotX(0); bullet.setScaleX(1); bullet.setScaleY(1); bullet.setScaleZ(1); diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/item/M1911ItemModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/item/M1911ItemModel.java index 963078d81..cafba228c 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/item/M1911ItemModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/item/M1911ItemModel.java @@ -20,7 +20,7 @@ public class M1911ItemModel extends GeoModel { @Override public ResourceLocation getAnimationResource(M1911Item animatable) { - return ModUtils.loc("animations/m1911.animation.json"); + return ModUtils.loc("animations/glock17.animation.json"); } @Override @@ -64,11 +64,11 @@ public class M1911ItemModel extends GeoModel { double fp = ClientEventHandler.firePos; double fr = ClientEventHandler.fireRot; - gun.setPosX(1.86f * (float) zp); + gun.setPosX(2.23f * (float) zp); - gun.setPosY(1.55f * (float) zp - (float) (0.2f * zpz)); + gun.setPosY(3.15f * (float) zp - (float) (0.2f * zpz)); - gun.setPosZ(2f * (float) zp + (float) (0.3f * zpz)); + gun.setPosZ(5f * (float) zp + (float) (0.3f * zpz)); gun.setScaleZ(1f - (0.35f * (float) zp)); @@ -82,7 +82,7 @@ public class M1911ItemModel extends GeoModel { shen.setPosX((float) (shen.getPosX() * (1 - 0.4 * zt))); shen.setPosY((float) (shen.getPosY() * (1 - 0.5 * zt))); shen.setPosZ((float) (shen.getPosZ() * (1 - 0.3 * zt))); - shen.setRotX((float) (shen.getRotX() * (1 - 0.27 * zt))); + shen.setRotX((float) (shen.getRotX() * (1 - 0.5 * zt))); shen.setRotY((float) (shen.getRotY() * (1 - 0.7 * zt))); shen.setRotZ((float) (shen.getRotZ() * (1 - 0.65 * zt))); diff --git a/src/main/java/com/atsuishio/superbwarfare/event/GunEventHandler.java b/src/main/java/com/atsuishio/superbwarfare/event/GunEventHandler.java index 27887e4bc..477f454cd 100644 --- a/src/main/java/com/atsuishio/superbwarfare/event/GunEventHandler.java +++ b/src/main/java/com/atsuishio/superbwarfare/event/GunEventHandler.java @@ -351,7 +351,7 @@ public class GunEventHandler { if (data.getInt("ReloadTime") == 84) { tag.putBoolean("empty", false); } - if (data.getInt("ReloadTime") == 7) { + if (data.getInt("ReloadTime") == 9) { data.putBoolean("CloseHammer", false); } } @@ -375,7 +375,7 @@ public class GunEventHandler { } if (stack.getItem() == ModItems.GLOCK_17.get() || stack.getItem() == ModItems.GLOCK_18.get() || stack.getItem() == ModItems.M_1911.get()) { - if (data.getInt("ReloadTime") == 5) { + if (data.getInt("ReloadTime") == 9) { data.putBoolean("HoldOpen", 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 914e8d587..d34dabe8b 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 @@ -110,7 +110,7 @@ public class Glock17Item extends GunItem implements GeoItem, AnimatedItem { public void registerControllers(AnimatableManager.ControllerRegistrar data) { var fireAnimController = new AnimationController<>(this, "fireAnimController", 1, this::fireAnimPredicate); data.add(fireAnimController); - var idleController = new AnimationController<>(this, "idleController", 4, this::idlePredicate); + var idleController = new AnimationController<>(this, "idleController", 2, this::idlePredicate); data.add(idleController); } 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 8026282ea..981b76317 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 @@ -109,7 +109,7 @@ public class Glock18Item extends GunItem implements GeoItem, AnimatedItem { public void registerControllers(AnimatableManager.ControllerRegistrar data) { var fireAnimController = new AnimationController<>(this, "fireAnimController", 1, this::fireAnimPredicate); data.add(fireAnimController); - var idleController = new AnimationController<>(this, "idleController", 4, this::idlePredicate); + var idleController = new AnimationController<>(this, "idleController", 2, this::idlePredicate); data.add(idleController); } 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 ca8eef08b..09f05c0e9 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 @@ -67,36 +67,48 @@ public class M1911Item extends GunItem implements GeoItem, AnimatedItem { transformType = type; } - private PlayState idlePredicate(AnimationState event) { + private PlayState fireAnimPredicate(AnimationState event) { LocalPlayer player = Minecraft.getInstance().player; if (player == null) return PlayState.STOP; ItemStack stack = player.getMainHandItem(); if (!stack.is(ModTags.Items.GUN)) return PlayState.STOP; if (stack.getOrCreateTag().getBoolean("is_empty_reloading")) { - return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m1911.reload_empty")); + return event.setAndContinue(RawAnimation.begin().thenPlay("animation.glock.reload_empty")); } if (stack.getOrCreateTag().getBoolean("is_normal_reloading")) { - return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m1911.reload_normal")); + return event.setAndContinue(RawAnimation.begin().thenPlay("animation.glock.reload_normal")); } + + return event.setAndContinue(RawAnimation.begin().thenLoop("animation.glock.idle")); + } + + private PlayState idlePredicate(AnimationState event) { + LocalPlayer player = Minecraft.getInstance().player; + if (player == null) return PlayState.STOP; + ItemStack stack = player.getMainHandItem(); + if (!stack.is(ModTags.Items.GUN)) return PlayState.STOP; + if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("noRun") == 0 && !(stack.getOrCreateTag().getBoolean("is_normal_reloading") || stack.getOrCreateTag().getBoolean("is_empty_reloading")) && ClientEventHandler.drawTime < 0.01) { if (player.hasEffect(MobEffects.MOVEMENT_SPEED)) { - return event.setAndContinue(RawAnimation.begin().thenLoop("animation.m1911.run_fast")); + return event.setAndContinue(RawAnimation.begin().thenLoop("animation.glock.run_fast")); } else { - return event.setAndContinue(RawAnimation.begin().thenLoop("animation.m1911.run")); + return event.setAndContinue(RawAnimation.begin().thenLoop("animation.glock.run")); } } - return event.setAndContinue(RawAnimation.begin().thenLoop("animation.m1911.idle")); + return event.setAndContinue(RawAnimation.begin().thenLoop("animation.glock.idle")); } @Override public void registerControllers(AnimatableManager.ControllerRegistrar data) { + var fireAnimController = new AnimationController<>(this, "fireAnimController", 1, this::fireAnimPredicate); + data.add(fireAnimController); var idleController = new AnimationController<>(this, "idleController", 2, this::idlePredicate); data.add(idleController); } diff --git a/src/main/resources/assets/superbwarfare/animations/glock17.animation.json b/src/main/resources/assets/superbwarfare/animations/glock17.animation.json index aca24f3fc..92b9f7c92 100644 --- a/src/main/resources/assets/superbwarfare/animations/glock17.animation.json +++ b/src/main/resources/assets/superbwarfare/animations/glock17.animation.json @@ -165,490 +165,375 @@ "bones": { "lun": { "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.0417": { - "vector": [0, 0, -22.5] - } + "0.0": [0, 0, 0], + "0.0417": [0, 0, -22.5] }, "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.0417": { - "vector": [0, 0, 0] - } - } - }, - "roll": { - "rotation": { - "0.0": { - "vector": [-5, 0, 0] - }, - "0.0833": { - "vector": [0, 0, 0], - "easing": "easeInElastic" - } + "0.0": [0, 0, 0], + "0.0417": [0, 0, 0] } } } }, "animation.glock.reload_normal": { "loop": "hold_on_last_frame", - "animation_length": 1.4, + "animation_length": 2.25, "bones": { "0": { "rotation": { "0.0": { - "vector": [0, 0, 0] + "post": [0, 0, 0], + "lerp_mode": "catmullrom" }, - "0.075": { - "vector": [-9.91615, -1.29876, -7.38733] + "0.25": { + "post": [-7.84741, -44.31709, -48.98224], + "lerp_mode": "catmullrom" }, - "0.225": { - "vector": [-9.905, -0.18197, -24.3992] + "0.325": { + "post": [-11.1895, -47.46919, -53.35021], + "lerp_mode": "catmullrom" + }, + "0.425": { + "post": [-7.90015, -44.55651, -51.76327], + "lerp_mode": "catmullrom" }, "0.45": { - "vector": [0, 0, 0] + "post": [-7.00009, -42.7168, -53.38496], + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": [-5.69594, -40.35533, -53.10614], + "lerp_mode": "catmullrom" }, "0.575": { - "vector": [0, 0, -20], - "easing": "easeInOutSine" + "post": [-13.17379, -33.26859, -36.3151], + "lerp_mode": "catmullrom" }, - "0.95": { - "vector": [-2.13733, 4.36681, -32.14213], - "easing": "easeInOutSine" + "0.675": { + "post": [-17.29224, -28.30714, -30.00414], + "lerp_mode": "catmullrom" }, - "1.05": { - "vector": [-11, 0, -7.59] + "0.75": { + "post": [-19.69, -27.05, -25.9], + "lerp_mode": "catmullrom" + }, + "0.925": { + "post": [-20.72322, -26.33422, -23.62513], + "lerp_mode": "catmullrom" + }, + "1.075": { + "post": [-9.27, -29.09, -35.48], + "lerp_mode": "catmullrom" + }, + "1.125": { + "post": [-8.34112, -29.29448, -35.39555], + "lerp_mode": "catmullrom" }, "1.2": { - "vector": [0, 0, 11] + "post": [-7.72663, -29.63736, -37.84819], + "lerp_mode": "catmullrom" }, - "1.3": { - "vector": [0, 0, 0], - "easing": "easeInElastic" + "1.25": { + "post": [-18.17618, -26.94302, -26.90611], + "lerp_mode": "catmullrom" + }, + "1.325": { + "post": [-16.834, -25.67932, -25.19726], + "lerp_mode": "catmullrom" + }, + "1.425": { + "post": [-10.58818, -26.70155, -35.48562], + "lerp_mode": "catmullrom" + }, + "1.5": { + "post": [-17.32271, -15.25166, -17.85267], + "lerp_mode": "catmullrom" + }, + "1.575": { + "post": [-12.20061, -2.95264, -6.65592], + "lerp_mode": "catmullrom" + }, + "1.7": { + "post": [-0.00144, -0.05997, 2.74935], + "lerp_mode": "catmullrom" + }, + "1.8": { + "post": [0.4638, 0.14423, -0.8758], + "lerp_mode": "catmullrom" + }, + "1.925": { + "post": [0, 0, 0.5], + "lerp_mode": "catmullrom" + }, + "2.075": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" } }, "position": { "0.0": { - "vector": [0, 0, 0] + "post": [0, 0, 0], + "lerp_mode": "catmullrom" }, - "0.225": { - "vector": [1.05142, 4.26654, 0.62687] + "0.075": { + "post": [-0.255, -0.015, 1.36], + "lerp_mode": "catmullrom" }, - "0.45": { - "vector": [0, 0, 0] + "0.25": { + "post": [-1.375, 3.425, 2.525], + "lerp_mode": "catmullrom" }, - "0.575": { - "vector": [-0.18863, 2.27254, 0], - "easing": "easeInOutSine" + "0.375": { + "post": [-1.33, 3.275, 3.405], + "lerp_mode": "catmullrom" }, - "0.8": { - "vector": [-2.09488, 5.29738, -0.68123] + "0.5": { + "post": [-1.73, 4.13, 3.13], + "lerp_mode": "catmullrom" }, - "0.9": { - "vector": [-2.54838, 4.40163, -0.94985] + "0.75": { + "post": [-1.73, 3.155, 3.135], + "lerp_mode": "catmullrom" }, "0.95": { - "vector": [-1.1451, 3.34429, -1.15779], - "easing": "easeInOutSine" - }, - "1.025": { - "vector": [-1.21556, 3.52975, -0.6553] + "post": [-1.69, 3.085, 2.875], + "lerp_mode": "catmullrom" }, "1.075": { - "vector": [-0.7894, 1.92782, -0.35804] - }, - "1.15": { - "vector": [0.16272, 2.04257, 1.76535] + "post": [-1.56, 3.76, 2.125], + "lerp_mode": "catmullrom" }, "1.2": { - "vector": [0.12347, 0.9124, 2.31886] + "post": [-1.53, 3.735, 1.935], + "lerp_mode": "catmullrom" }, - "1.3": { - "vector": [0, 0, 0], - "easing": "easeInElastic" + "1.25": { + "post": [-1.455, 2.19, 1.485], + "lerp_mode": "catmullrom" + }, + "1.425": { + "post": [-1.55, 2.07, 1.335], + "lerp_mode": "catmullrom" + }, + "1.55": { + "post": [-0.825, 1.05, -1.425], + "lerp_mode": "catmullrom" + }, + "1.625": { + "post": [-0.07, -0.39, -2.07], + "lerp_mode": "catmullrom" + }, + "1.75": { + "post": [0, -0.2075, 0.2875], + "lerp_mode": "catmullrom" + }, + "1.925": { + "post": [0, -0.05625, -0.075], + "lerp_mode": "catmullrom" + }, + "2.075": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" } } }, "camera": { "rotation": { - "0.05": { - "vector": [0, 0, 0] - }, - "0.175": { - "vector": [2, -2, 1], - "easing": "easeInSine" + "0.0": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" }, "0.25": { - "vector": [2.5, 3, -2], - "easing": "easeInElastic" + "post": [1.2, 0.225, -0.275], + "lerp_mode": "catmullrom" }, - "0.3": { - "vector": [-1, -2, 1], - "easing": "easeInSine" + "0.425": { + "post": [1.265, 0.29, -0.34], + "lerp_mode": "catmullrom" }, - "0.375": { - "vector": [0, 2, -0.8] + "0.45": { + "post": [1.85, 0.3, 0.1], + "lerp_mode": "catmullrom" }, - "0.475": { - "vector": [-0.67, -0.67, 0.4] + "0.575": { + "post": [1.265, 0.24, -0.61], + "lerp_mode": "catmullrom" }, - "0.75": { - "vector": [0.5, 0, 1.2], - "easing": "easeOutSine" + "0.7": { + "post": [0.45, 0.15, -0.1], + "lerp_mode": "catmullrom" }, - "0.875": { - "vector": [-0.1, 0, 2] + "0.925": { + "post": [0.67, 0.15, -0.35], + "lerp_mode": "catmullrom" }, - "0.975": { - "vector": [0, 0, 1.5], - "easing": "easeInElastic" + "1.075": { + "post": [1.345, 0.3, -0.35], + "lerp_mode": "catmullrom" }, - "1.025": { - "vector": [1, 1, -2.5], - "easing": "easeInSine" - }, - "1.1": { - "vector": [-0.5, -0.5, 1.5] - }, - "1.2": { - "vector": [0.5, 0.5, -1.17] + "1.25": { + "post": [1.295, 0.3, -0.35], + "lerp_mode": "catmullrom" }, "1.3": { - "vector": [0, 0, 0] + "post": [1.835, 0.29, 0.11], + "lerp_mode": "catmullrom" + }, + "1.425": { + "post": [1.125, 0.25, -0.585], + "lerp_mode": "catmullrom" + }, + "1.5": { + "post": [0.87, 0.225, -0.275], + "lerp_mode": "catmullrom" + }, + "1.7": { + "post": [-0.05, 0, 0.125], + "lerp_mode": "catmullrom" + }, + "1.825": { + "post": [0.05, 0, -0.125], + "lerp_mode": "catmullrom" + }, + "2.075": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" } } }, "Righthand": { "rotation": { - "0.25": { - "vector": [0, 0, 0] - }, - "0.325": { - "vector": [-0.74716, 1.87653, -7.1133] - }, - "1.0": { - "vector": [-0.74716, 1.87653, -7.1133] - }, - "1.1": { - "vector": [0, 0, 0] - } + "0.0": [0, 0, 0], + "0.225": [5.40317, -4.29309, -3.01948], + "1.4": [5.40317, -4.29309, -3.01948], + "1.575": [0, 0, 0] }, "position": { - "0.25": { - "vector": [0, 0, 0] - }, - "0.325": { - "vector": [-0.66084, -0.04017, 0.01492] - }, - "1.0": { - "vector": [-0.66084, -0.04017, 0.01492] - }, - "1.1": { - "vector": [0, 0, 0] - } + "0.0": [0, 0, 0], + "0.225": [0, 0, 0], + "1.4": [0, 0, 0], + "1.575": [0, 0, 0] } }, "Lefthand": { "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.075": { - "vector": [-133.307, 9.7256, -30.6365] - }, - "0.65": { - "vector": [-25.4672, 22.2363, 78.12621] - }, - "0.725": { - "vector": [-23.3479, 25.2612, 70.86152] - }, - "0.8": { - "vector": [-15.3559, -5.207, 63.75845] - }, - "0.925": { - "vector": [-15.3559, -5.207, 63.75845] - }, - "0.975": { - "vector": [-15.3559, -5.207, 63.75845] - }, - "1.0": { - "vector": [-13.0438, -11.8806, 62.82106] - }, - "1.025": { - "vector": [-15.3559, -5.207, 63.75845] - }, - "1.05": { - "vector": [-5.6402, -8.6348, 66.98444] - }, - "1.125": { - "vector": [0, 0, 8] - }, - "1.225": { - "vector": [0, 0, 0], - "easing": "easeInBounce" - } + "0.0": [0, 0, 0], + "0.3": [8.4751, 3.79173, -8.36955], + "1.25": [8.4751, 3.79173, -8.36955], + "1.4": [-15.10922, -10.96659, 49.74871], + "1.575": [0, 0, 0] }, "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.65": { - "vector": [0.72628, -10.24946, 6.73057] - }, - "0.725": { - "vector": [-0.56676, -7.78513, 7.50953] - }, - "0.775": { - "vector": [-0.72986, -7.69452, 4.29183] - }, - "0.8": { - "vector": [-1.52007, -6.19301, 2.97592] - }, - "0.85": { - "vector": [-1.50644, -6.628, 4.31341] - }, - "0.9": { - "vector": [-1.77543, -6.29446, 5.06677] - }, - "0.925": { - "vector": [-2.17152, -5.6814, 5.79795] - }, - "0.95": { - "vector": [-2.33022, -5.39513, 5.92379] - }, - "0.975": { - "vector": [-2.35753, -4.95022, 4.69759] - }, - "1.0": { - "vector": [-3.25277, -2.91075, 4.22029] - }, - "1.1": { - "vector": [0, 0, 0] - }, - "1.225": { - "vector": [0, 0, 0], - "easing": "easeInBounce" - } - } - }, - "gun": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.1": { - "vector": [9, 0, -20.64], - "easing": "easeInSine" - }, - "0.25": { - "vector": [-13, 22.5, 84.5], - "easing": "easeInElastic" - }, - "0.4": { - "vector": [-6, 0.5, -19.5], - "easing": "easeInElastic" - }, - "0.525": { - "vector": [-17, 0.5, -27.5], - "easing": "easeInElastic" - }, - "0.675": { - "vector": [-14.28, 0.42, -28.43] - }, - "0.9": { - "vector": [-6.8, 0.2, -31] - }, - "0.975": { - "vector": [0.24, 0.14, -24.7], - "easing": "easeInElastic" - }, - "1.025": { - "vector": [-2.83, 0.1, -23.5] - }, - "1.25": { - "vector": [0, 0, 0] - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.1": { - "vector": [-1.92969, 1.12536, 0], - "easing": "easeInOutSine" - }, - "0.225": { - "vector": [-6.16, -1.54, 0] - }, - "0.325": { - "vector": [-7.2, 0, 0], - "easing": "easeInElastic" - }, - "0.4": { - "vector": [-6, 0.3, 0] - }, - "0.525": { - "vector": [-5.3, 1.1, 1.4], - "easing": "easeInElastic" - }, - "0.75": { - "vector": [-4.2604, 0.26871, 1.06417] - }, - "0.9": { - "vector": [-4.60562, -0.06676, 1.19608] - }, - "0.975": { - "vector": [-4.40093, 1.02209, 1.59999] - }, - "1.025": { - "vector": [-3.30405, 0.16741, 2.44762] - }, - "1.25": { - "vector": [0, 0, 0], - "easing": "easeInElastic" - } - } - }, - "body": { - "rotation": { - "0.15": { - "vector": [0, 0, 0] - }, - "0.25": { - "vector": [-6, -20, 0] - }, - "0.5": { - "vector": [-10.27, -10.73, 0] - }, - "0.8": { - "vector": [-11, -15, 0] - }, - "1.025": { - "vector": [-11, -15, 0] - }, - "1.225": { - "vector": [0, 0, 0] - } - }, - "position": { - "0.15": { - "vector": [0, 0, 0] - }, - "0.25": { - "vector": [0.57956, 0, 0.15529] - }, - "0.8": { - "vector": [0.57956, 0, 0.15529] - }, - "1.025": { - "vector": [0.57956, 0, 0.15529] - }, - "1.225": { - "vector": [0, 0, 0] - } + "0.0": [0, 0, 0], + "0.3": [0, -3.9, 1.5], + "1.25": [0, -3.9, 1.5], + "1.4": [0, -1.3, 0.81], + "1.575": [0, 0, 0] } }, "magazine": { "rotation": { - "0.175": { - "vector": [0, 0, 0] + "0.0": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" }, - "0.225": { - "vector": [0, 0, 0] + "0.425": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" }, - "0.575": { - "vector": [-15.75262, -37.73703, 456.13539], - "easing": "easeOutSine" + "0.45": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.55": { + "post": [0, 0, -24], + "lerp_mode": "catmullrom" }, "0.625": { - "vector": [-15.75262, -37.73703, 456.13539], - "easing": "easeOutSine" + "post": [-61.29955, 22.00636, -55.16179], + "lerp_mode": "catmullrom" }, - "0.65": { - "vector": [32.40128, 10.54474, 0.36623] - }, - "0.8": { - "vector": [14.83291, 5.73814, -1.20757] - }, - "0.925": { - "vector": [0, 0, 0] - }, - "0.975": { - "vector": [0, 0, 0] + "0.875": { + "post": [-61.29955, 22.00636, -55.16179], + "lerp_mode": "catmullrom" }, "1.0": { - "vector": [0, 0, 0] + "post": [-47.75682, -1.59869, -45.04013], + "lerp_mode": "catmullrom" + }, + "1.075": { + "post": [-10, 0, -12], + "lerp_mode": "catmullrom" + }, + "1.125": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.2": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.25": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" } }, "position": { - "0.175": { - "vector": [0, 0, 0] - }, - "0.225": { - "vector": [0, -4.7, 0.9], - "easing": "easeInQuad" - }, - "0.25": { - "vector": [-1.01654, -5.97646, 1.15849] - }, - "0.275": { - "vector": [-6.41418, -6.62275, 1.0015] - }, - "0.3": { - "vector": [-14.80325, 1.71423, 0.74022] - }, - "0.325": { - "vector": [-16.00879, 13.41548, -0.24656] - }, - "0.35": { - "vector": [-19.74367, 18.68347, -0.39542] - }, - "0.375": { - "vector": [-26.68159, 19.19734, 0.27006] - }, - "0.4": { - "vector": [-33.15559, 20.22964, 0.86581] + "0.0": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" }, "0.425": { - "vector": [-37.30305, 21.75236, -1.08329] + "post": [0, 0, 0], + "lerp_mode": "catmullrom" }, "0.45": { - "vector": [-40.69671, 23.35227, -5.15997] - }, - "0.475": { - "vector": [-44.5015, 24.56967, -7.58785] + "post": [0, -2.42, 0.49], + "lerp_mode": "catmullrom" }, "0.5": { - "vector": [-48.40692, 25.15858, -7.71781] + "post": [0, -4.85, 1.1], + "lerp_mode": "catmullrom" }, "0.575": { - "vector": [-272.2128, 80.51608, 12.36898] + "post": [4.57954, -10.32343, 3.11785], + "lerp_mode": "catmullrom" }, - "0.625": { - "vector": [-272.2128, 80.51608, 12.36898] + "0.7": { + "post": [5.93847, -14.6107, 9.16898], + "lerp_mode": "catmullrom" }, - "0.65": { - "vector": [-0.45801, -11.75106, 8.69283], - "easing": "easeInQuad" - }, - "0.8": { - "vector": [0.05474, -4.54521, 2.4771], - "easing": "easeInQuad" - }, - "0.925": { - "vector": [0, -4.7, 1.9], - "easing": "easeInQuad" - }, - "0.975": { - "vector": [0, -4.7, 0.9], - "easing": "easeInQuad" + "0.875": { + "post": [5.93847, -14.6107, 9.16898], + "lerp_mode": "catmullrom" }, "1.0": { - "vector": [0, 0, 0] + "post": [3.96678, -8.96114, 4.27665], + "lerp_mode": "catmullrom" + }, + "1.075": { + "post": [0.675, -6.075, 1.2875], + "lerp_mode": "catmullrom" + }, + "1.125": { + "post": [0, -5.75, 1.295], + "lerp_mode": "catmullrom" + }, + "1.175": { + "post": [0, -5.91, 1.195], + "lerp_mode": "catmullrom" + }, + "1.2": { + "post": [0, -5.825, 1.35], + "lerp_mode": "catmullrom" + }, + "1.25": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" } } } @@ -656,1067 +541,375 @@ }, "animation.glock.reload_empty": { "loop": "hold_on_last_frame", - "animation_length": 1.7, + "animation_length": 2.65, "bones": { "0": { "rotation": { "0.0": { - "vector": [0, 0, 0] + "post": [0, 0, 0], + "lerp_mode": "catmullrom" }, - "0.075": { - "vector": [-9.91615, -1.29876, -7.38733] - }, - "0.225": { - "vector": [-9.905, -0.18197, -24.3992] - }, - "0.45": { - "vector": [0, 0, 0] - }, - "0.575": { - "vector": [0, 0, -20], - "easing": "easeInOutSine" - }, - "0.95": { - "vector": [-2.13733, 4.36681, -32.14213], - "easing": "easeInOutSine" - }, - "1.2": { - "vector": [-9.0963, 11.7554, -1.9037] - }, - "1.225": { - "vector": [-14.64574, 13.27302, 4.69755], - "easing": "easeInQuart" - }, - "1.35": { - "vector": [-23.75162, 11.92866, 3.66136] - }, - "1.45": { - "vector": [-1.83441, 7.95244, 2.44091] - }, - "1.625": { - "vector": [0, 0, 0] - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.225": { - "vector": [1.05142, 4.26654, 0.62687] - }, - "0.45": { - "vector": [0, 0, 0] - }, - "0.575": { - "vector": [-0.18863, 2.27254, 0], - "easing": "easeInOutSine" - }, - "0.8": { - "vector": [-2.09488, 5.29738, -0.68123] - }, - "0.95": { - "vector": [-1.1451, 3.34429, -1.15779], - "easing": "easeInOutSine" - }, - "1.125": { - "vector": [-0.90702, 2.71908, -0.35018] - }, - "1.2": { - "vector": [-1.4, 0, 0], - "easing": "easeInElastic" - }, - "1.225": { - "vector": [-0.19, 0.3, 3.9], - "easing": "easeInQuart" - }, - "1.35": { - "vector": [-0.38, 0.59, 2.64] - }, - "1.45": { - "vector": [-0.12, 0.29, -2.04] - }, - "1.55": { - "vector": [-0.04, 0.09, 1.84] - }, - "1.625": { - "vector": [0, 0, 0], - "easing": "easeInElastic" - } - } - }, - "Righthand": { - "rotation": { "0.25": { - "vector": [0, 0, 0] + "post": [-7.84741, -44.31709, -48.98224], + "lerp_mode": "catmullrom" }, "0.325": { - "vector": [-0.74716, 1.87653, -7.1133] - }, - "1.0": { - "vector": [-0.74716, 1.87653, -7.1133] - }, - "1.1": { - "vector": [0, 0, 0] - } - }, - "position": { - "0.25": { - "vector": [0, 0, 0] - }, - "0.325": { - "vector": [-0.66084, -0.04017, 0.01492] - }, - "1.0": { - "vector": [-0.66084, -0.04017, 0.01492] - }, - "1.1": { - "vector": [0, 0, 0] - } - } - }, - "Lefthand": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.075": { - "vector": [-133.307, 9.7256, -30.6365] - }, - "0.65": { - "vector": [-25.4672, 22.2363, 78.12621] - }, - "0.725": { - "vector": [-23.3479, 25.2612, 70.86152] - }, - "0.8": { - "vector": [-15.3559, -5.207, 63.75845] - }, - "0.925": { - "vector": [-15.3559, -5.207, 63.75845] - }, - "0.975": { - "vector": [-15.3559, -5.207, 63.75845] - }, - "1.0": { - "vector": [-13.0438, -11.8806, 62.82106] - }, - "1.05": { - "vector": [4.9382, 6.6412, 30.82739] - }, - "1.15": { - "vector": [32.8892, 30.5582, -55.9374], - "easing": "easeInOutSine" - }, - "1.2": { - "vector": [32.8892, 30.5582, -55.9374], - "easing": "easeInOutSine" - }, - "1.225": { - "vector": [32.8892, 30.5582, -55.9374], - "easing": "easeInOutSine" - }, - "1.4": { - "vector": [32.8892, 30.5582, -55.9374], - "easing": "easeInOutSine" - }, - "1.5": { - "vector": [-3.537, 23.8275, -26.97592] - }, - "1.575": { - "vector": [0, 0, 0] - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.65": { - "vector": [0.72628, -10.24946, 6.73057] - }, - "0.725": { - "vector": [-0.56676, -7.78513, 7.50953] - }, - "0.775": { - "vector": [-0.72986, -7.69452, 4.29183] - }, - "0.8": { - "vector": [-1.52007, -6.19301, 2.97592] - }, - "0.85": { - "vector": [-1.50644, -6.628, 4.31341] - }, - "0.9": { - "vector": [-1.77543, -6.29446, 5.06677] - }, - "0.925": { - "vector": [-2.17152, -5.6814, 5.79795] - }, - "0.95": { - "vector": [-2.33022, -5.39513, 5.92379] - }, - "0.975": { - "vector": [-2.35753, -4.95022, 4.69759] - }, - "1.0": { - "vector": [-3.25277, -2.91075, 4.22029] - }, - "1.05": { - "vector": [-1.7943, 0.59114, 3.07913] - }, - "1.1": { - "vector": [0.88646, 1.82623, 0.12722] - }, - "1.15": { - "vector": [5.7, 3.6, -2.7], - "easing": "easeInOutSine" - }, - "1.2": { - "vector": [5.7, 3.6, -2.7], - "easing": "easeInOutSine" - }, - "1.225": { - "vector": [5.7, 3.6, -0.7], - "easing": "easeInOutSine" - }, - "1.4": { - "vector": [5.7, 3.6, -0.7], - "easing": "easeInOutSine" - }, - "1.5": { - "vector": [2.76, 2.16, -1.12] - }, - "1.575": { - "vector": [0, 0, 0] - } - } - }, - "gun": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.1": { - "vector": [9, 0, -20.64], - "easing": "easeInSine" - }, - "0.25": { - "vector": [-13, 22.5, 84.5], - "easing": "easeInElastic" - }, - "0.4": { - "vector": [-6, 0.5, -19.5], - "easing": "easeInElastic" - }, - "0.525": { - "vector": [-17, 0.5, -27.5], - "easing": "easeInElastic" - }, - "0.675": { - "vector": [-14.28, 0.42, -28.43] - }, - "0.9": { - "vector": [-6.8, 0.2, -31] - }, - "0.975": { - "vector": [0.24, 0.14, -24.7], - "easing": "easeInElastic" - }, - "1.025": { - "vector": [-2.83, 0.1, -23.5] - }, - "1.2": { - "vector": [0, 0, 0], - "easing": "easeInElastic" - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.1": { - "vector": [-1.92969, 1.12536, 0], - "easing": "easeInOutSine" - }, - "0.225": { - "vector": [-6.16, -1.54, 0] - }, - "0.325": { - "vector": [-7.2, 0, 0], - "easing": "easeInElastic" - }, - "0.4": { - "vector": [-6, 0.3, 0] - }, - "0.525": { - "vector": [-5.3, 1.1, 1.4], - "easing": "easeInElastic" - }, - "0.75": { - "vector": [-4.2604, 0.26871, 1.06417] - }, - "0.9": { - "vector": [-4.60562, -0.06676, 1.19608] - }, - "0.975": { - "vector": [-4.40093, 1.02209, 1.59999] - }, - "1.025": { - "vector": [-3.30405, 0.16741, 2.44762] - }, - "1.2": { - "vector": [0, 0, 0], - "easing": "easeInElastic" - } - } - }, - "body": { - "rotation": { - "0.15": { - "vector": [0, 0, 0] - }, - "0.25": { - "vector": [-6, -20, 0] - }, - "0.5": { - "vector": [-10.27, -10.73, 0] - }, - "0.8": { - "vector": [-11, -15, 0] - }, - "1.025": { - "vector": [-11, -15, 0] - }, - "1.225": { - "vector": [0, 0, 0] - } - }, - "position": { - "0.15": { - "vector": [0, 0, 0] - }, - "0.25": { - "vector": [0.57956, 0, 0.15529] - }, - "0.8": { - "vector": [0.57956, 0, 0.15529] - }, - "1.025": { - "vector": [0.57956, 0, 0.15529] - }, - "1.225": { - "vector": [0, 0, 0] - } - } - }, - "magazine": { - "rotation": { - "0.175": { - "vector": [0, 0, 0] - }, - "0.225": { - "vector": [0, 0, 0] - }, - "0.575": { - "vector": [-15.75262, -37.73703, 456.13539], - "easing": "easeOutSine" - }, - "0.625": { - "vector": [-15.75262, -37.73703, 456.13539], - "easing": "easeOutSine" - }, - "0.65": { - "vector": [32.40128, 10.54474, 0.36623] - }, - "0.8": { - "vector": [14.83291, 5.73814, -1.20757] - }, - "0.925": { - "vector": [0, 0, 0] - }, - "0.975": { - "vector": [0, 0, 0] - }, - "1.0": { - "vector": [0, 0, 0] - } - }, - "position": { - "0.175": { - "vector": [0, 0, 0] - }, - "0.225": { - "vector": [0, -4.7, 0.9], - "easing": "easeInQuad" - }, - "0.25": { - "vector": [-1.01654, -5.97646, 1.15849] - }, - "0.275": { - "vector": [-6.41418, -6.62275, 1.0015] - }, - "0.3": { - "vector": [-14.80325, 1.71423, 0.74022] - }, - "0.325": { - "vector": [-16.00879, 13.41548, -0.24656] - }, - "0.35": { - "vector": [-19.74367, 18.68347, -0.39542] - }, - "0.375": { - "vector": [-26.68159, 19.19734, 0.27006] - }, - "0.4": { - "vector": [-33.15559, 20.22964, 0.86581] + "post": [-11.1895, -47.46919, -53.35021], + "lerp_mode": "catmullrom" }, "0.425": { - "vector": [-37.30305, 21.75236, -1.08329] + "post": [-7.90015, -44.55651, -51.76327], + "lerp_mode": "catmullrom" }, "0.45": { - "vector": [-40.69671, 23.35227, -5.15997] - }, - "0.475": { - "vector": [-44.5015, 24.56967, -7.58785] + "post": [-7.00009, -42.7168, -53.38496], + "lerp_mode": "catmullrom" }, "0.5": { - "vector": [-48.40692, 25.15858, -7.71781] + "post": [-5.69594, -40.35533, -53.10614], + "lerp_mode": "catmullrom" }, "0.575": { - "vector": [-272.2128, 80.51608, 12.36898] + "post": [-13.17379, -33.26859, -36.3151], + "lerp_mode": "catmullrom" }, - "0.625": { - "vector": [-272.2128, 80.51608, 12.36898] + "0.675": { + "post": [-17.29224, -28.30714, -30.00414], + "lerp_mode": "catmullrom" }, - "0.65": { - "vector": [-0.45801, -11.75106, 8.69283], - "easing": "easeInQuad" - }, - "0.8": { - "vector": [0.05474, -4.54521, 2.4771], - "easing": "easeInQuad" + "0.75": { + "post": [-19.69, -27.05, -25.9], + "lerp_mode": "catmullrom" }, "0.925": { - "vector": [0, -4.7, 1.9], - "easing": "easeInQuad" + "post": [-20.72322, -26.33422, -23.62513], + "lerp_mode": "catmullrom" }, - "0.975": { - "vector": [0, -4.7, 0.9], - "easing": "easeInQuad" + "1.075": { + "post": [-9.27, -29.09, -35.48], + "lerp_mode": "catmullrom" }, - "1.0": { - "vector": [0, 0, 0] + "1.125": { + "post": [-8.34112, -29.29448, -35.39555], + "lerp_mode": "catmullrom" + }, + "1.2": { + "post": [-7.72663, -29.63736, -37.84819], + "lerp_mode": "catmullrom" + }, + "1.25": { + "post": [-18.17618, -26.94302, -26.90611], + "lerp_mode": "catmullrom" + }, + "1.325": { + "post": [-16.834, -25.67932, -25.19726], + "lerp_mode": "catmullrom" + }, + "1.425": { + "post": [-10.58818, -26.70155, -20.23562], + "lerp_mode": "catmullrom" + }, + "1.5": { + "post": [-9.12454, -12.44453, -7.85072], + "lerp_mode": "catmullrom" + }, + "1.625": { + "post": [-0.73, -6.99, 11.81], + "lerp_mode": "catmullrom" + }, + "1.75": { + "post": [-2.95061, -2.95264, -3.55592], + "lerp_mode": "catmullrom" + }, + "1.875": { + "post": [-0.00144, -0.05997, 0.89935], + "lerp_mode": "catmullrom" + }, + "1.975": { + "post": [-0.5862, 0.14423, -0.2258], + "lerp_mode": "catmullrom" + }, + "2.1": { + "post": [0, 0, 0.8], + "lerp_mode": "catmullrom" + }, + "2.25": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.075": { + "post": [-0.255, -0.015, 1.36], + "lerp_mode": "catmullrom" + }, + "0.25": { + "post": [-1.375, 3.425, 2.525], + "lerp_mode": "catmullrom" + }, + "0.375": { + "post": [-1.33, 3.275, 3.405], + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": [-1.73, 4.13, 3.13], + "lerp_mode": "catmullrom" + }, + "0.75": { + "post": [-1.73, 3.155, 3.135], + "lerp_mode": "catmullrom" + }, + "0.95": { + "post": [-1.69, 3.085, 2.875], + "lerp_mode": "catmullrom" + }, + "1.075": { + "post": [-1.56, 3.76, 2.125], + "lerp_mode": "catmullrom" + }, + "1.2": { + "post": [-1.53, 3.735, 1.935], + "lerp_mode": "catmullrom" + }, + "1.25": { + "post": [-1.455, 2.19, 1.485], + "lerp_mode": "catmullrom" + }, + "1.325": { + "post": [-1.53, 2.59, 1.54], + "lerp_mode": "catmullrom" + }, + "1.425": { + "post": [-1.55, 2.07, 1.335], + "lerp_mode": "catmullrom" + }, + "1.55": { + "post": [-0.825, 1.05, -0.675], + "lerp_mode": "catmullrom" + }, + "1.625": { + "post": [-0.55, -0.71, -1.16], + "lerp_mode": "catmullrom" + }, + "1.8": { + "post": [-0.07, 0.06, 0.18], + "lerp_mode": "catmullrom" + }, + "1.925": { + "post": [0, -0.2075, -0.1125], + "lerp_mode": "catmullrom" + }, + "2.1": { + "post": [0, -0.05625, 0.125], + "lerp_mode": "catmullrom" + }, + "2.25": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" } } }, "camera": { "rotation": { - "0.05": { - "vector": [0, 0, 0] - }, - "0.175": { - "vector": [2, -2, 1], - "easing": "easeInSine" + "0.0": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" }, "0.25": { - "vector": [2.5, 3, -2], - "easing": "easeInElastic" + "post": [1.2, 0.225, -0.275], + "lerp_mode": "catmullrom" }, - "0.3": { - "vector": [-1, -2, 1], - "easing": "easeInSine" + "0.425": { + "post": [1.265, 0.29, -0.34], + "lerp_mode": "catmullrom" }, - "0.375": { - "vector": [0, 2, -0.8] + "0.45": { + "post": [1.85, 0.3, 0.1], + "lerp_mode": "catmullrom" }, - "0.475": { - "vector": [-0.67, -0.67, 0.4] + "0.575": { + "post": [1.265, 0.24, -0.61], + "lerp_mode": "catmullrom" }, - "0.75": { - "vector": [0.5, 0, 1.2], - "easing": "easeOutSine" + "0.7": { + "post": [0.45, 0.15, -0.1], + "lerp_mode": "catmullrom" }, - "0.875": { - "vector": [-0.1, 0, 2] - }, - "0.975": { - "vector": [0, 0, 1.5], - "easing": "easeInElastic" - }, - "1.025": { - "vector": [1, 1, -2.5], - "easing": "easeInSine" + "0.925": { + "post": [0.67, 0.15, -0.35], + "lerp_mode": "catmullrom" }, "1.075": { - "vector": [-0.5, -0.5, 1.5] - }, - "1.2": { - "vector": [0.2, 0, -1.5] + "post": [1.345, 0.3, -0.35], + "lerp_mode": "catmullrom" }, "1.25": { - "vector": [1, 2, 1.8] + "post": [1.295, 0.3, -0.35], + "lerp_mode": "catmullrom" }, - "1.35": { - "vector": [-1.5, -3, -1.5] + "1.3": { + "post": [1.835, 0.29, 0.11], + "lerp_mode": "catmullrom" }, - "1.45": { - "vector": [0, 2, 1], - "easing": "easeInElastic" + "1.425": { + "post": [1.125, 0.25, -0.585], + "lerp_mode": "catmullrom" }, - "1.55": { - "vector": [0, 0, 0] - } - } - }, - "bullet": { - "scale": { - "0.1": { - "vector": [1, 1, 1] + "1.5": { + "post": [0.87, 0.225, -0.275], + "lerp_mode": "catmullrom" }, - "0.125": { - "vector": [0, 0, 0] + "1.7": { + "post": [-0.05, 0, 0.125], + "lerp_mode": "catmullrom" }, - "0.6": { - "vector": [0, 0, 0] + "1.825": { + "post": [0.05, 0, -0.125], + "lerp_mode": "catmullrom" }, - "0.625": { - "vector": [1, 1, 1] - } - } - } - } - }, - "animation.m1911.reload_empty": { - "loop": "hold_on_last_frame", - "animation_length": 1.7, - "bones": { - "0": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.075": { - "vector": [-9.91615, -1.29876, -7.38733] - }, - "0.225": { - "vector": [-9.905, -0.18197, -24.3992] - }, - "0.45": { - "vector": [0, 0, 0] - }, - "0.575": { - "vector": [0, 0, -20], - "easing": "easeInOutSine" - }, - "0.95": { - "vector": [-24.63733, 4.36681, -2.14213], - "easing": "easeInOutSine" - }, - "1.025": { - "vector": [-12.48, 6.58, 6.93] - }, - "1.2": { - "vector": [-9.0963, 11.7554, 28.0963] - }, - "1.225": { - "vector": [-14.64574, 13.27302, 34.69755], - "easing": "easeInQuart" - }, - "1.35": { - "vector": [-23.75162, 26.92866, 33.66136] - }, - "1.45": { - "vector": [-1.83441, 2.95244, 12.44091] - }, - "1.625": { - "vector": [0, 0, 0] - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.225": { - "vector": [1.05142, 4.26654, 0.62687] - }, - "0.45": { - "vector": [0, 0, 0] - }, - "0.575": { - "vector": [-0.18863, 2.27254, 0], - "easing": "easeInOutSine" - }, - "0.8": { - "vector": [-0.59488, 3.39738, -0.68123] - }, - "0.95": { - "vector": [-1.1451, 4.34429, -1.15779], - "easing": "easeInOutSine" - }, - "1.05": { - "vector": [-0.71, 3.32, 0.4] - }, - "1.125": { - "vector": [-0.90702, 1.71908, -0.35018] - }, - "1.2": { - "vector": [-1.4, 0, 0], - "easing": "easeInElastic" - }, - "1.225": { - "vector": [-0.19, 0.3, 3.9], - "easing": "easeInQuart" - }, - "1.35": { - "vector": [-0.38, 0.59, 2.64] - }, - "1.45": { - "vector": [-0.12, 1.29, -2.04] - }, - "1.55": { - "vector": [-0.04, 0.09, 1.84] - }, - "1.625": { - "vector": [0, 0, 0], - "easing": "easeInElastic" + "2.075": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" } } }, "Righthand": { "rotation": { - "0.25": { - "vector": [0, 0, 0] - }, - "0.325": { - "vector": [-0.74716, 1.87653, -7.1133] - }, - "1.0": { - "vector": [-0.74716, 1.87653, -7.1133] - }, - "1.1": { - "vector": [0, 0, 0] - } + "0.0": [0, 0, 0], + "0.225": [5.40317, -4.29309, -3.01948], + "1.475": [5.40317, -4.29309, -3.01948], + "1.575": [0, 0, 0] }, "position": { - "0.25": { - "vector": [0, 0, 0] - }, - "0.325": { - "vector": [-0.66084, -0.04017, 0.01492] - }, - "1.0": { - "vector": [-0.66084, -0.04017, 0.01492] - }, - "1.1": { - "vector": [0, 0, 0] - } + "0.0": [0, 0, 0], + "0.225": [0, 0, 0], + "1.475": [0, 0, 0], + "1.575": [0, 0, 0] } }, "Lefthand": { "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.075": { - "vector": [-133.307, 9.7256, -30.6365] - }, - "0.65": { - "vector": [-25.4672, 22.2363, 78.12621] - }, - "0.725": { - "vector": [-23.3479, 25.2612, 70.86152] - }, - "0.8": { - "vector": [-15.3559, -5.207, 63.75845] - }, - "0.925": { - "vector": [-15.3559, -5.207, 63.75845] - }, - "0.975": { - "vector": [-15.3559, -5.207, 63.75845] - }, - "1.0": { - "vector": [-13.0438, -11.8806, 62.82106] - }, - "1.05": { - "vector": [4.9382, 6.6412, 30.82739] - }, - "1.15": { - "vector": [32.8892, 30.5582, -55.9374], - "easing": "easeInOutSine" - }, - "1.2": { - "vector": [32.8892, 30.5582, -55.9374], - "easing": "easeInOutSine" - }, - "1.225": { - "vector": [32.8892, 30.5582, -55.9374], - "easing": "easeInOutSine" - }, - "1.4": { - "vector": [32.8892, 30.5582, -55.9374], - "easing": "easeInOutSine" - }, - "1.5": { - "vector": [-3.537, 23.8275, -26.97592] - }, - "1.575": { - "vector": [0, 0, 0] - } + "0.0": [0, 0, 0], + "0.3": [8.4751, 3.79173, -8.36955], + "1.25": [8.4751, 3.79173, -8.36955], + "1.4": [-15.10922, -10.96659, 49.74871], + "1.575": [0, 0, 0] }, "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.65": { - "vector": [0.72628, -10.24946, 6.73057] - }, - "0.725": { - "vector": [-0.56676, -7.78513, 7.50953] - }, - "0.775": { - "vector": [-0.72986, -7.69452, 4.29183] - }, - "0.8": { - "vector": [-1.52007, -6.19301, 2.97592] - }, - "0.85": { - "vector": [-1.50644, -6.628, 4.31341] - }, - "0.9": { - "vector": [-1.77543, -6.29446, 5.06677] - }, - "0.925": { - "vector": [-2.17152, -5.6814, 5.79795] - }, - "0.95": { - "vector": [-2.33022, -5.39513, 5.92379] - }, - "0.975": { - "vector": [-2.35753, -4.95022, 4.69759] - }, - "1.0": { - "vector": [-3.25277, -2.91075, 4.22029] - }, - "1.05": { - "vector": [-1.7943, 0.59114, 3.07913] - }, - "1.1": { - "vector": [0.88646, 1.82623, 0.12722] - }, - "1.15": { - "vector": [5.7, 3.6, -2.7], - "easing": "easeInOutSine" - }, - "1.2": { - "vector": [5.7, 3.6, -2.7], - "easing": "easeInOutSine" - }, - "1.225": { - "vector": [5.7, 3.6, -0.7], - "easing": "easeInOutSine" - }, - "1.4": { - "vector": [5.7, 3.6, -0.7], - "easing": "easeInOutSine" - }, - "1.5": { - "vector": [2.76, 2.16, -1.12] - }, - "1.575": { - "vector": [0, 0, 0] - } - } - }, - "gun": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.1": { - "vector": [9, 0, -20.64], - "easing": "easeInSine" - }, - "0.25": { - "vector": [-13, 22.5, 84.5], - "easing": "easeInElastic" - }, - "0.4": { - "vector": [-6, 0.5, -19.5], - "easing": "easeInElastic" - }, - "0.525": { - "vector": [-17, 0.5, -27.5], - "easing": "easeInElastic" - }, - "0.675": { - "vector": [-14.28, 0.42, -28.43] - }, - "0.9": { - "vector": [-6.8, 0.2, -31] - }, - "0.975": { - "vector": [0.24, 0.14, -24.7], - "easing": "easeInElastic" - }, - "1.025": { - "vector": [-2.83, 0.1, -23.5] - }, - "1.2": { - "vector": [0, 0, 0], - "easing": "easeInElastic" - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.1": { - "vector": [-1.92969, 1.12536, 0], - "easing": "easeInOutSine" - }, - "0.225": { - "vector": [-6.16, -1.54, 0] - }, - "0.325": { - "vector": [-7.2, 0, 0], - "easing": "easeInElastic" - }, - "0.4": { - "vector": [-6, 0.3, 0] - }, - "0.525": { - "vector": [-5.3, 1.1, 1.4], - "easing": "easeInElastic" - }, - "0.75": { - "vector": [-4.2604, 0.26871, 1.06417] - }, - "0.9": { - "vector": [-4.60562, -0.06676, 1.19608] - }, - "0.975": { - "vector": [-4.40093, 1.02209, 1.59999] - }, - "1.025": { - "vector": [-3.30405, 0.16741, 2.44762] - }, - "1.2": { - "vector": [0, 0, 0], - "easing": "easeInElastic" - } - } - }, - "body": { - "rotation": { - "0.15": { - "vector": [0, 0, 0] - }, - "0.25": { - "vector": [-6, -20, 0] - }, - "0.5": { - "vector": [-10.27, -10.73, 0] - }, - "0.8": { - "vector": [-11, -15, 0] - }, - "1.025": { - "vector": [-11, -15, 0] - }, - "1.225": { - "vector": [0, 0, 0] - } - }, - "position": { - "0.15": { - "vector": [0, 0, 0] - }, - "0.25": { - "vector": [0.57956, 0, 0.15529] - }, - "0.8": { - "vector": [0.57956, 0, 0.15529] - }, - "1.025": { - "vector": [0.57956, 0, 0.15529] - }, - "1.225": { - "vector": [0, 0, 0] - } + "0.0": [0, 0, 0], + "0.3": [0, -3.9, 1.5], + "1.25": [0, -3.9, 1.5], + "1.4": [0, -1.3, 0.81], + "1.575": [0, 0, 0] } }, "magazine": { "rotation": { - "0.175": { - "vector": [0, 0, 0] + "0.0": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" }, - "0.225": { - "vector": [0, 0, 0] + "0.425": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" }, - "0.575": { - "vector": [-15.75262, -37.73703, 456.13539], - "easing": "easeOutSine" + "0.45": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.55": { + "post": [0, 0, -24], + "lerp_mode": "catmullrom" }, "0.625": { - "vector": [-15.75262, -37.73703, 456.13539], - "easing": "easeOutSine" + "post": [-61.29955, 22.00636, -55.16179], + "lerp_mode": "catmullrom" }, - "0.65": { - "vector": [32.40128, 10.54474, 0.36623] - }, - "0.8": { - "vector": [14.83291, 5.73814, -1.20757] - }, - "0.925": { - "vector": [0, 0, 0] - }, - "0.975": { - "vector": [0, 0, 0] + "0.875": { + "post": [-61.29955, 22.00636, -55.16179], + "lerp_mode": "catmullrom" }, "1.0": { - "vector": [0, 0, 0] + "post": [-47.75682, -1.59869, -45.04013], + "lerp_mode": "catmullrom" + }, + "1.075": { + "post": [-10, 0, -12], + "lerp_mode": "catmullrom" + }, + "1.125": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.2": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.25": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" } }, "position": { - "0.175": { - "vector": [0, 0, 0] - }, - "0.225": { - "vector": [0, -4.7, 0.9], - "easing": "easeInQuad" - }, - "0.25": { - "vector": [-1.01654, -5.97646, 1.15849] - }, - "0.275": { - "vector": [-6.41418, -6.62275, 1.0015] - }, - "0.3": { - "vector": [-14.80325, 1.71423, 0.74022] - }, - "0.325": { - "vector": [-16.00879, 13.41548, -0.24656] - }, - "0.35": { - "vector": [-19.74367, 18.68347, -0.39542] - }, - "0.375": { - "vector": [-26.68159, 19.19734, 0.27006] - }, - "0.4": { - "vector": [-33.15559, 20.22964, 0.86581] + "0.0": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" }, "0.425": { - "vector": [-37.30305, 21.75236, -1.08329] + "post": [0, 0, 0], + "lerp_mode": "catmullrom" }, "0.45": { - "vector": [-40.69671, 23.35227, -5.15997] - }, - "0.475": { - "vector": [-44.5015, 24.56967, -7.58785] + "post": [0, -2.42, 0.49], + "lerp_mode": "catmullrom" }, "0.5": { - "vector": [-48.40692, 25.15858, -7.71781] + "post": [0, -4.85, 1.1], + "lerp_mode": "catmullrom" }, "0.575": { - "vector": [-272.2128, 80.51608, 12.36898] + "post": [4.57954, -10.32343, 3.11785], + "lerp_mode": "catmullrom" }, - "0.625": { - "vector": [-272.2128, 80.51608, 12.36898] - }, - "0.65": { - "vector": [-0.45801, -11.75106, 8.69283], - "easing": "easeInQuad" - }, - "0.8": { - "vector": [0.05474, -4.54521, 2.4771], - "easing": "easeInQuad" - }, - "0.925": { - "vector": [0, -4.7, 1.9], - "easing": "easeInQuad" - }, - "0.975": { - "vector": [0, -4.7, 0.9], - "easing": "easeInQuad" - }, - "1.0": { - "vector": [0, 0, 0] - } - } - }, - "bullet": { - "scale": { - "0.1": { - "vector": [1, 1, 1] - }, - "0.125": { - "vector": [0, 0, 0] - }, - "0.6": { - "vector": [0, 0, 0] - }, - "0.625": { - "vector": [1, 1, 1] - } - } - }, - "camera": { - "rotation": { - "0.05": { - "vector": [0, 0, 0] - }, - "0.175": { - "vector": [2, -2, 1], - "easing": "easeInSine" - }, - "0.25": { - "vector": [2.5, 3, -2], - "easing": "easeInElastic" - }, - "0.3": { - "vector": [-1, -2, 1], - "easing": "easeInSine" - }, - "0.375": { - "vector": [0, 2, -0.8] - }, - "0.475": { - "vector": [-0.67, -0.67, 0.4] - }, - "0.75": { - "vector": [0.5, 0, 1.2], - "easing": "easeOutSine" + "0.7": { + "post": [5.93847, -14.6107, 9.16898], + "lerp_mode": "catmullrom" }, "0.875": { - "vector": [-0.1, 0, 2] + "post": [5.93847, -14.6107, 9.16898], + "lerp_mode": "catmullrom" }, - "0.975": { - "vector": [0, 0, 1.5], - "easing": "easeInElastic" - }, - "1.025": { - "vector": [1, 1, -2.5], - "easing": "easeInSine" + "1.0": { + "post": [3.96678, -8.96114, 4.27665], + "lerp_mode": "catmullrom" }, "1.075": { - "vector": [-0.5, -0.5, 1.5] + "post": [0.675, -6.075, 1.2875], + "lerp_mode": "catmullrom" + }, + "1.125": { + "post": [0, -5.75, 1.295], + "lerp_mode": "catmullrom" + }, + "1.175": { + "post": [0, -5.91, 1.195], + "lerp_mode": "catmullrom" }, "1.2": { - "vector": [0.2, 0, -1.5] + "post": [0, -5.825, 1.35], + "lerp_mode": "catmullrom" }, "1.25": { - "vector": [1, 2, 1.8] - }, - "1.35": { - "vector": [-1.5, -3, -1.5] - }, - "1.45": { - "vector": [0, 2, 1], - "easing": "easeInElastic" - }, - "1.55": { - "vector": [0, 0, 0] + "post": [0, 0, 0], + "lerp_mode": "catmullrom" } } } diff --git a/src/main/resources/assets/superbwarfare/animations/m1911.animation.json b/src/main/resources/assets/superbwarfare/animations/m1911.animation.json deleted file mode 100644 index fe36aa75a..000000000 --- a/src/main/resources/assets/superbwarfare/animations/m1911.animation.json +++ /dev/null @@ -1,1160 +0,0 @@ -{ - "format_version": "1.8.0", - "animations": { - "animation.m1911.idle": { - "loop": true, - "animation_length": 2 - }, - "animation.m1911.run": { - "loop": true, - "animation_length": 0.8, - "bones": { - "0": { - "rotation": { - "0.0": { - "vector": [4.74287, -58.94632, 9.89514] - }, - "0.2": { - "vector": [-8.55104, -59.60571, 19.61648], - "easing": "easeInSine" - }, - "0.4": { - "vector": [-8.58141, -58.99717, 19.60323], - "easing": "easeOutSine" - }, - "0.6": { - "vector": [-0.82277, -58.8651, 9.93666], - "easing": "easeInSine" - }, - "0.8": { - "vector": [4.74287, -58.94632, 9.89514] - } - }, - "position": { - "0.0": { - "vector": [5.5, -3, 0] - }, - "0.2": { - "vector": [3.75, -2.5, 0], - "easing": "easeInSine" - }, - "0.4": { - "vector": [2.5, -3, 0], - "easing": "easeOutSine" - }, - "0.6": { - "vector": [4.25, -2.5, 0], - "easing": "easeInSine" - }, - "0.8": { - "vector": [5.5, -3, 0] - } - } - }, - "Righthand": { - "rotation": { - "vector": [0, 12.5, 0] - }, - "position": { - "vector": [2.19838, 0, -0.07415] - } - }, - "camera": { - "rotation": { - "0.0": { - "vector": [-0.3, -0.3, 0.3] - }, - "0.2": { - "vector": [0.3, 0, -0.3] - }, - "0.4": { - "vector": [-0.3, 0.3, 0.3] - }, - "0.6": { - "vector": [0.3, 0, -0.3] - }, - "0.8": { - "vector": [-0.3, -0.3, 0.3] - } - } - } - } - }, - "animation.m1911.run_fast": { - "loop": true, - "animation_length": 0.7, - "bones": { - "0": { - "rotation": { - "0.0": { - "vector": [-64.40359, 6.54216, -8.29677] - }, - "0.175": { - "vector": [-63.64549, 6.90094, -2.09726], - "easing": "easeInSine" - }, - "0.35": { - "vector": [-64.40359, 6.54216, -8.29677], - "easing": "easeOutSine" - }, - "0.525": { - "vector": [-65.4022, 6.21514, -14.3956], - "easing": "easeInSine" - }, - "0.7": { - "vector": [-64.40359, 6.54216, -8.29677], - "easing": "easeOutSine" - } - }, - "position": { - "0.0": { - "vector": [-8.5, 4, 2], - "easing": "easeOutSine" - }, - "0.175": { - "vector": [-8.5, 6, 3], - "easing": "easeInSine" - }, - "0.35": { - "vector": [-10.5, 4, 2], - "easing": "easeOutSine" - }, - "0.525": { - "vector": [-9.5, 6, 2], - "easing": "easeInSine" - }, - "0.7": { - "vector": [-8.5, 4, 2], - "easing": "easeOutSine" - } - } - }, - "Lefthand": { - "rotation": { - "vector": [-1.41476, -16.33468, -1.66483] - }, - "position": { - "vector": [6, -41, 27] - } - }, - "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] - } - } - } - } - }, - "animation.m1911.reload_normal": { - "loop": "hold_on_last_frame", - "animation_length": 1.4, - "bones": { - "0": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.075": { - "vector": [-9.91615, -1.29876, -7.38733] - }, - "0.225": { - "vector": [-9.905, -0.18197, -24.3992] - }, - "0.45": { - "vector": [0, 0, 0] - }, - "0.575": { - "vector": [0, 0, -20], - "easing": "easeInOutSine" - }, - "0.95": { - "vector": [-2.13733, 4.36681, -32.14213], - "easing": "easeInOutSine" - }, - "1.05": { - "vector": [-11, 0, -7.59] - }, - "1.2": { - "vector": [0, 0, 11] - }, - "1.3": { - "vector": [0, 0, 0], - "easing": "easeInElastic" - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.225": { - "vector": [1.05142, 4.26654, 0.62687] - }, - "0.45": { - "vector": [0, 0, 0] - }, - "0.575": { - "vector": [-0.18863, 2.27254, 0], - "easing": "easeInOutSine" - }, - "0.8": { - "vector": [-2.09488, 5.29738, -0.68123] - }, - "0.9": { - "vector": [-2.54838, 4.40163, -0.94985] - }, - "0.95": { - "vector": [-1.1451, 3.34429, -1.15779], - "easing": "easeInOutSine" - }, - "1.025": { - "vector": [-1.21556, 3.52975, -0.6553] - }, - "1.075": { - "vector": [-0.7894, 1.92782, -0.35804] - }, - "1.15": { - "vector": [0.16272, 2.04257, 1.76535] - }, - "1.2": { - "vector": [0.12347, 0.9124, 2.31886] - }, - "1.3": { - "vector": [0, 0, 0], - "easing": "easeInElastic" - } - } - }, - "Righthand": { - "rotation": { - "0.25": { - "vector": [0, 0, 0] - }, - "0.325": { - "vector": [-0.74716, 1.87653, -7.1133] - }, - "1.0": { - "vector": [-0.74716, 1.87653, -7.1133] - }, - "1.1": { - "vector": [0, 0, 0] - } - }, - "position": { - "0.25": { - "vector": [0, 0, 0] - }, - "0.325": { - "vector": [-0.66084, -0.04017, 0.01492] - }, - "1.0": { - "vector": [-0.66084, -0.04017, 0.01492] - }, - "1.1": { - "vector": [0, 0, 0] - } - } - }, - "Lefthand": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.075": { - "vector": [-133.307, 9.7256, -30.6365] - }, - "0.65": { - "vector": [-25.4672, 22.2363, 78.12621] - }, - "0.725": { - "vector": [-23.3479, 25.2612, 70.86152] - }, - "0.8": { - "vector": [-15.3559, -5.207, 63.75845] - }, - "0.925": { - "vector": [-15.3559, -5.207, 63.75845] - }, - "0.975": { - "vector": [-15.3559, -5.207, 63.75845] - }, - "1.0": { - "vector": [-13.0438, -11.8806, 62.82106] - }, - "1.025": { - "vector": [-15.3559, -5.207, 63.75845] - }, - "1.05": { - "vector": [-5.6402, -8.6348, 66.98444] - }, - "1.125": { - "vector": [0, 0, 8] - }, - "1.225": { - "vector": [0, 0, 0], - "easing": "easeInBounce" - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.65": { - "vector": [0.72628, -10.24946, 6.73057] - }, - "0.725": { - "vector": [-0.56676, -7.78513, 7.50953] - }, - "0.775": { - "vector": [-0.72986, -7.69452, 4.29183] - }, - "0.8": { - "vector": [-1.52007, -6.19301, 2.97592] - }, - "0.85": { - "vector": [-1.50644, -6.628, 4.31341] - }, - "0.9": { - "vector": [-1.77543, -6.29446, 5.06677] - }, - "0.925": { - "vector": [-2.17152, -5.6814, 5.79795] - }, - "0.95": { - "vector": [-2.33022, -5.39513, 5.92379] - }, - "0.975": { - "vector": [-2.35753, -4.95022, 4.69759] - }, - "1.0": { - "vector": [-3.25277, -2.91075, 4.22029] - }, - "1.1": { - "vector": [0, 0, 0] - }, - "1.225": { - "vector": [0, 0, 0], - "easing": "easeInBounce" - } - } - }, - "gun": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.1": { - "vector": [9, 0, -20.64], - "easing": "easeInSine" - }, - "0.25": { - "vector": [-13, 22.5, 84.5], - "easing": "easeInElastic" - }, - "0.4": { - "vector": [-6, 0.5, -19.5], - "easing": "easeInElastic" - }, - "0.525": { - "vector": [-17, 0.5, -27.5], - "easing": "easeInElastic" - }, - "0.675": { - "vector": [-14.28, 0.42, -28.43] - }, - "0.9": { - "vector": [-6.8, 0.2, -31] - }, - "0.975": { - "vector": [0.24, 0.14, -24.7], - "easing": "easeInElastic" - }, - "1.025": { - "vector": [-2.83, 0.1, -23.5] - }, - "1.25": { - "vector": [0, 0, 0] - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.1": { - "vector": [-1.92969, 1.12536, 0], - "easing": "easeInOutSine" - }, - "0.225": { - "vector": [-6.16, -1.54, 0] - }, - "0.325": { - "vector": [-7.2, 0, 0], - "easing": "easeInElastic" - }, - "0.4": { - "vector": [-6, 0.3, 0] - }, - "0.525": { - "vector": [-5.3, 1.1, 1.4], - "easing": "easeInElastic" - }, - "0.75": { - "vector": [-4.2604, 0.26871, 1.06417] - }, - "0.9": { - "vector": [-4.60562, -0.06676, 1.19608] - }, - "0.975": { - "vector": [-4.40093, 1.02209, 1.59999] - }, - "1.025": { - "vector": [-3.30405, 0.16741, 2.44762] - }, - "1.25": { - "vector": [0, 0, 0], - "easing": "easeInElastic" - } - } - }, - "body": { - "rotation": { - "0.15": { - "vector": [0, 0, 0] - }, - "0.25": { - "vector": [-6, -20, 0] - }, - "0.5": { - "vector": [-10.27, -10.73, 0] - }, - "0.8": { - "vector": [-11, -15, 0] - }, - "1.025": { - "vector": [-11, -15, 0] - }, - "1.225": { - "vector": [0, 0, 0] - } - }, - "position": { - "0.15": { - "vector": [0, 0, 0] - }, - "0.25": { - "vector": [0.57956, 0, 0.15529] - }, - "0.8": { - "vector": [0.57956, 0, 0.15529] - }, - "1.025": { - "vector": [0.57956, 0, 0.15529] - }, - "1.225": { - "vector": [0, 0, 0] - } - } - }, - "magazine": { - "rotation": { - "0.175": { - "vector": [0, 0, 0] - }, - "0.225": { - "vector": [0, 0, 0] - }, - "0.575": { - "vector": [-15.75262, -37.73703, 456.13539], - "easing": "easeOutSine" - }, - "0.625": { - "vector": [-15.75262, -37.73703, 456.13539], - "easing": "easeOutSine" - }, - "0.65": { - "vector": [32.40128, 10.54474, 0.36623] - }, - "0.8": { - "vector": [14.83291, 5.73814, -1.20757] - }, - "0.925": { - "vector": [0, 0, 0] - }, - "0.975": { - "vector": [0, 0, 0] - }, - "1.0": { - "vector": [0, 0, 0] - } - }, - "position": { - "0.175": { - "vector": [0, 0, 0] - }, - "0.225": { - "vector": [0, -4.7, 0.9], - "easing": "easeInQuad" - }, - "0.25": { - "vector": [-1.01654, -5.97646, 1.15849] - }, - "0.275": { - "vector": [-6.41418, -6.62275, 1.0015] - }, - "0.3": { - "vector": [-14.80325, 1.71423, 0.74022] - }, - "0.325": { - "vector": [-16.00879, 13.41548, -0.24656] - }, - "0.35": { - "vector": [-19.74367, 18.68347, -0.39542] - }, - "0.375": { - "vector": [-26.68159, 19.19734, 0.27006] - }, - "0.4": { - "vector": [-33.15559, 20.22964, 0.86581] - }, - "0.425": { - "vector": [-37.30305, 21.75236, -1.08329] - }, - "0.45": { - "vector": [-40.69671, 23.35227, -5.15997] - }, - "0.475": { - "vector": [-44.5015, 24.56967, -7.58785] - }, - "0.5": { - "vector": [-48.40692, 25.15858, -7.71781] - }, - "0.575": { - "vector": [-272.2128, 80.51608, 12.36898] - }, - "0.625": { - "vector": [-272.2128, 80.51608, 12.36898] - }, - "0.65": { - "vector": [-0.45801, -11.75106, 8.69283], - "easing": "easeInQuad" - }, - "0.8": { - "vector": [0.05474, -4.54521, 2.4771], - "easing": "easeInQuad" - }, - "0.925": { - "vector": [0, -4.7, 1.9], - "easing": "easeInQuad" - }, - "0.975": { - "vector": [0, -4.7, 0.9], - "easing": "easeInQuad" - }, - "1.0": { - "vector": [0, 0, 0] - } - } - }, - "camera": { - "rotation": { - "0.05": { - "vector": [0, 0, 0] - }, - "0.175": { - "vector": [2, -2, 1], - "easing": "easeInSine" - }, - "0.25": { - "vector": [2.5, 3, -2], - "easing": "easeInElastic" - }, - "0.3": { - "vector": [-1, -2, 1], - "easing": "easeInSine" - }, - "0.375": { - "vector": [0, 2, -0.8] - }, - "0.475": { - "vector": [-0.67, -0.67, 0.4] - }, - "0.75": { - "vector": [0.5, 0, 1.2], - "easing": "easeOutSine" - }, - "0.875": { - "vector": [-0.1, 0, 2] - }, - "0.975": { - "vector": [0, 0, 1.5], - "easing": "easeInElastic" - }, - "1.025": { - "vector": [1, 1, -2.5], - "easing": "easeInSine" - }, - "1.1": { - "vector": [-0.5, -0.5, 1.5] - }, - "1.2": { - "vector": [0.5, 0.5, -1.17] - }, - "1.3": { - "vector": [0, 0, 0] - } - } - } - } - }, - "animation.m1911.reload_empty": { - "loop": "hold_on_last_frame", - "animation_length": 1.7, - "bones": { - "0": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.075": { - "vector": [-9.91615, -1.29876, -7.38733] - }, - "0.225": { - "vector": [-9.905, -0.18197, -24.3992] - }, - "0.45": { - "vector": [0, 0, 0] - }, - "0.575": { - "vector": [0, 0, -20], - "easing": "easeInOutSine" - }, - "0.95": { - "vector": [-24.63733, 4.36681, -2.14213], - "easing": "easeInOutSine" - }, - "1.025": { - "vector": [-12.48, 6.58, 6.93] - }, - "1.2": { - "vector": [-9.0963, 11.7554, 28.0963] - }, - "1.225": { - "vector": [-14.64574, 13.27302, 34.69755], - "easing": "easeInQuart" - }, - "1.35": { - "vector": [-23.75162, 26.92866, 33.66136] - }, - "1.45": { - "vector": [-1.83441, 2.95244, 12.44091] - }, - "1.625": { - "vector": [0, 0, 0] - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.225": { - "vector": [1.05142, 4.26654, 0.62687] - }, - "0.45": { - "vector": [0, 0, 0] - }, - "0.575": { - "vector": [-0.18863, 2.27254, 0], - "easing": "easeInOutSine" - }, - "0.8": { - "vector": [-0.59488, 3.39738, -0.68123] - }, - "0.95": { - "vector": [-1.1451, 4.34429, -1.15779], - "easing": "easeInOutSine" - }, - "1.05": { - "vector": [-0.71, 3.32, 0.4] - }, - "1.125": { - "vector": [-0.90702, 1.71908, -0.35018] - }, - "1.2": { - "vector": [-1.4, 0, 0], - "easing": "easeInElastic" - }, - "1.225": { - "vector": [-0.19, 0.3, 3.9], - "easing": "easeInQuart" - }, - "1.35": { - "vector": [-0.38, 0.59, 2.64] - }, - "1.45": { - "vector": [-0.12, 1.29, -2.04] - }, - "1.55": { - "vector": [-0.04, 0.09, 1.84] - }, - "1.625": { - "vector": [0, 0, 0], - "easing": "easeInElastic" - } - } - }, - "Righthand": { - "rotation": { - "0.25": { - "vector": [0, 0, 0] - }, - "0.325": { - "vector": [-0.74716, 1.87653, -7.1133] - }, - "1.0": { - "vector": [-0.74716, 1.87653, -7.1133] - }, - "1.1": { - "vector": [0, 0, 0] - } - }, - "position": { - "0.25": { - "vector": [0, 0, 0] - }, - "0.325": { - "vector": [-0.66084, -0.04017, 0.01492] - }, - "1.0": { - "vector": [-0.66084, -0.04017, 0.01492] - }, - "1.1": { - "vector": [0, 0, 0] - } - } - }, - "Lefthand": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.075": { - "vector": [-133.307, 9.7256, -30.6365] - }, - "0.65": { - "vector": [-25.4672, 22.2363, 78.12621] - }, - "0.725": { - "vector": [-23.3479, 25.2612, 70.86152] - }, - "0.8": { - "vector": [-15.3559, -5.207, 63.75845] - }, - "0.925": { - "vector": [-15.3559, -5.207, 63.75845] - }, - "0.975": { - "vector": [-15.3559, -5.207, 63.75845] - }, - "1.0": { - "vector": [-13.0438, -11.8806, 62.82106] - }, - "1.05": { - "vector": [4.9382, 6.6412, 30.82739] - }, - "1.15": { - "vector": [32.8892, 30.5582, -55.9374], - "easing": "easeInOutSine" - }, - "1.2": { - "vector": [32.8892, 30.5582, -55.9374], - "easing": "easeInOutSine" - }, - "1.225": { - "vector": [32.8892, 30.5582, -55.9374], - "easing": "easeInOutSine" - }, - "1.4": { - "vector": [32.8892, 30.5582, -55.9374], - "easing": "easeInOutSine" - }, - "1.5": { - "vector": [-3.537, 23.8275, -26.97592] - }, - "1.575": { - "vector": [0, 0, 0] - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.65": { - "vector": [0.72628, -10.24946, 6.73057] - }, - "0.725": { - "vector": [-0.56676, -7.78513, 7.50953] - }, - "0.775": { - "vector": [-0.72986, -7.69452, 4.29183] - }, - "0.8": { - "vector": [-1.52007, -6.19301, 2.97592] - }, - "0.85": { - "vector": [-1.50644, -6.628, 4.31341] - }, - "0.9": { - "vector": [-1.77543, -6.29446, 5.06677] - }, - "0.925": { - "vector": [-2.17152, -5.6814, 5.79795] - }, - "0.95": { - "vector": [-2.33022, -5.39513, 5.92379] - }, - "0.975": { - "vector": [-2.35753, -4.95022, 4.69759] - }, - "1.0": { - "vector": [-3.25277, -2.91075, 4.22029] - }, - "1.05": { - "vector": [-1.7943, 0.59114, 3.07913] - }, - "1.1": { - "vector": [0.88646, 1.82623, 0.12722] - }, - "1.15": { - "vector": [5.7, 3.6, -2.7], - "easing": "easeInOutSine" - }, - "1.2": { - "vector": [5.7, 3.6, -2.7], - "easing": "easeInOutSine" - }, - "1.225": { - "vector": [5.7, 3.6, -0.7], - "easing": "easeInOutSine" - }, - "1.4": { - "vector": [5.7, 3.6, -0.7], - "easing": "easeInOutSine" - }, - "1.5": { - "vector": [2.76, 2.16, -1.12] - }, - "1.575": { - "vector": [0, 0, 0] - } - } - }, - "gun": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.1": { - "vector": [9, 0, -20.64], - "easing": "easeInSine" - }, - "0.25": { - "vector": [-13, 22.5, 84.5], - "easing": "easeInElastic" - }, - "0.4": { - "vector": [-6, 0.5, -19.5], - "easing": "easeInElastic" - }, - "0.525": { - "vector": [-17, 0.5, -27.5], - "easing": "easeInElastic" - }, - "0.675": { - "vector": [-14.28, 0.42, -28.43] - }, - "0.9": { - "vector": [-6.8, 0.2, -31] - }, - "0.975": { - "vector": [0.24, 0.14, -24.7], - "easing": "easeInElastic" - }, - "1.025": { - "vector": [-2.83, 0.1, -23.5] - }, - "1.2": { - "vector": [0, 0, 0], - "easing": "easeInElastic" - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.1": { - "vector": [-1.92969, 1.12536, 0], - "easing": "easeInOutSine" - }, - "0.225": { - "vector": [-6.16, -1.54, 0] - }, - "0.325": { - "vector": [-7.2, 0, 0], - "easing": "easeInElastic" - }, - "0.4": { - "vector": [-6, 0.3, 0] - }, - "0.525": { - "vector": [-5.3, 1.1, 1.4], - "easing": "easeInElastic" - }, - "0.75": { - "vector": [-4.2604, 0.26871, 1.06417] - }, - "0.9": { - "vector": [-4.60562, -0.06676, 1.19608] - }, - "0.975": { - "vector": [-4.40093, 1.02209, 1.59999] - }, - "1.025": { - "vector": [-3.30405, 0.16741, 2.44762] - }, - "1.2": { - "vector": [0, 0, 0], - "easing": "easeInElastic" - } - } - }, - "body": { - "rotation": { - "0.15": { - "vector": [0, 0, 0] - }, - "0.25": { - "vector": [-6, -20, 0] - }, - "0.5": { - "vector": [-10.27, -10.73, 0] - }, - "0.8": { - "vector": [-11, -15, 0] - }, - "1.025": { - "vector": [-11, -15, 0] - }, - "1.225": { - "vector": [0, 0, 0] - } - }, - "position": { - "0.15": { - "vector": [0, 0, 0] - }, - "0.25": { - "vector": [0.57956, 0, 0.15529] - }, - "0.8": { - "vector": [0.57956, 0, 0.15529] - }, - "1.025": { - "vector": [0.57956, 0, 0.15529] - }, - "1.225": { - "vector": [0, 0, 0] - } - } - }, - "magazine": { - "rotation": { - "0.175": { - "vector": [0, 0, 0] - }, - "0.225": { - "vector": [0, 0, 0] - }, - "0.575": { - "vector": [-15.75262, -37.73703, 456.13539], - "easing": "easeOutSine" - }, - "0.625": { - "vector": [-15.75262, -37.73703, 456.13539], - "easing": "easeOutSine" - }, - "0.65": { - "vector": [32.40128, 10.54474, 0.36623] - }, - "0.8": { - "vector": [14.83291, 5.73814, -1.20757] - }, - "0.925": { - "vector": [0, 0, 0] - }, - "0.975": { - "vector": [0, 0, 0] - }, - "1.0": { - "vector": [0, 0, 0] - } - }, - "position": { - "0.175": { - "vector": [0, 0, 0] - }, - "0.225": { - "vector": [0, -4.7, 0.9], - "easing": "easeInQuad" - }, - "0.25": { - "vector": [-1.01654, -5.97646, 1.15849] - }, - "0.275": { - "vector": [-6.41418, -6.62275, 1.0015] - }, - "0.3": { - "vector": [-14.80325, 1.71423, 0.74022] - }, - "0.325": { - "vector": [-16.00879, 13.41548, -0.24656] - }, - "0.35": { - "vector": [-19.74367, 18.68347, -0.39542] - }, - "0.375": { - "vector": [-26.68159, 19.19734, 0.27006] - }, - "0.4": { - "vector": [-33.15559, 20.22964, 0.86581] - }, - "0.425": { - "vector": [-37.30305, 21.75236, -1.08329] - }, - "0.45": { - "vector": [-40.69671, 23.35227, -5.15997] - }, - "0.475": { - "vector": [-44.5015, 24.56967, -7.58785] - }, - "0.5": { - "vector": [-48.40692, 25.15858, -7.71781] - }, - "0.575": { - "vector": [-272.2128, 80.51608, 12.36898] - }, - "0.625": { - "vector": [-272.2128, 80.51608, 12.36898] - }, - "0.65": { - "vector": [-0.45801, -11.75106, 8.69283], - "easing": "easeInQuad" - }, - "0.8": { - "vector": [0.05474, -4.54521, 2.4771], - "easing": "easeInQuad" - }, - "0.925": { - "vector": [0, -4.7, 1.9], - "easing": "easeInQuad" - }, - "0.975": { - "vector": [0, -4.7, 0.9], - "easing": "easeInQuad" - }, - "1.0": { - "vector": [0, 0, 0] - } - } - }, - "bullet": { - "scale": { - "0.1": { - "vector": [1, 1, 1] - }, - "0.125": { - "vector": [0, 0, 0] - }, - "0.6": { - "vector": [0, 0, 0] - }, - "0.625": { - "vector": [1, 1, 1] - } - } - }, - "camera": { - "rotation": { - "0.05": { - "vector": [0, 0, 0] - }, - "0.175": { - "vector": [2, -2, 1], - "easing": "easeInSine" - }, - "0.25": { - "vector": [2.5, 3, -2], - "easing": "easeInElastic" - }, - "0.3": { - "vector": [-1, -2, 1], - "easing": "easeInSine" - }, - "0.375": { - "vector": [0, 2, -0.8] - }, - "0.475": { - "vector": [-0.67, -0.67, 0.4] - }, - "0.75": { - "vector": [0.5, 0, 1.2], - "easing": "easeOutSine" - }, - "0.875": { - "vector": [-0.1, 0, 2] - }, - "0.975": { - "vector": [0, 0, 1.5], - "easing": "easeInElastic" - }, - "1.025": { - "vector": [1, 1, -2.5], - "easing": "easeInSine" - }, - "1.075": { - "vector": [-0.5, -0.5, 1.5] - }, - "1.2": { - "vector": [0.2, 0, -1.5] - }, - "1.25": { - "vector": [1, 2, 1.8] - }, - "1.35": { - "vector": [-1.5, -3, -1.5] - }, - "1.45": { - "vector": [0, 2, 1], - "easing": "easeInElastic" - }, - "1.55": { - "vector": [0, 0, 0] - } - } - } - } - } - }, - "geckolib_format_version": 2 -} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/geo/glock17.geo.json b/src/main/resources/assets/superbwarfare/geo/glock17.geo.json index 605eccefc..6e5425f92 100644 --- a/src/main/resources/assets/superbwarfare/geo/glock17.geo.json +++ b/src/main/resources/assets/superbwarfare/geo/glock17.geo.json @@ -34,35 +34,9 @@ "parent": "shen", "pivot": [0, 0, 0] }, - { - "name": "roll", - "parent": "0", - "pivot": [0, 0, 0], - "rotation": [0, 0, 11] - }, - { - "name": "Lefthand", - "parent": "roll", - "pivot": [2.6976, -5.69887, 9.77824], - "rotation": [113.29762, -12.57035, 179.33701], - "cubes": [ - { - "origin": [0.6476, -5.69887, 7.82824], - "size": [4, 12, 4], - "uv": { - "north": {"uv": [0, 36], "uv_size": [1, 1]}, - "east": {"uv": [0, 36], "uv_size": [1, 1]}, - "south": {"uv": [0, 36], "uv_size": [1, 1]}, - "west": {"uv": [0, 36], "uv_size": [1, 1]}, - "up": {"uv": [1, 37], "uv_size": [-1, -1]}, - "down": {"uv": [1, 37], "uv_size": [-1, -1]} - } - } - ] - }, { "name": "gun", - "parent": "roll", + "parent": "0", "pivot": [0, 0.46563, 1.72795] }, { @@ -99,6 +73,192 @@ } ] }, + { + "name": "magazine", + "parent": "gun", + "pivot": [0, -0.3, 1.8] + }, + { + "name": "Lefthand", + "parent": "magazine", + "pivot": [2.6976, -5.69887, 9.77824], + "rotation": [113.29762, -12.57035, 179.33701], + "cubes": [ + { + "origin": [0.6476, -5.69887, 7.82824], + "size": [4, 12, 4], + "uv": { + "north": {"uv": [0, 36], "uv_size": [1, 1]}, + "east": {"uv": [0, 36], "uv_size": [1, 1]}, + "south": {"uv": [0, 36], "uv_size": [1, 1]}, + "west": {"uv": [0, 36], "uv_size": [1, 1]}, + "up": {"uv": [1, 37], "uv_size": [-1, -1]}, + "down": {"uv": [1, 37], "uv_size": [-1, -1]} + } + } + ] + }, + { + "name": "bullet", + "parent": "magazine", + "pivot": [0, 2.04506, 1.58179], + "cubes": [ + { + "origin": [-0.26066, 1.7844, 1.37382], + "size": [0.52132, 0.52132, 0.87264], + "uv": { + "north": {"uv": [29, 18], "uv_size": [0.5, 0.5]}, + "east": {"uv": [27, 3], "uv_size": [0.75, 0.5]}, + "south": {"uv": [19, 29], "uv_size": [0.5, 0.5]}, + "west": {"uv": [4, 27], "uv_size": [0.75, 0.5]}, + "up": {"uv": [27, 4], "uv_size": [0.5, 0.75]}, + "down": {"uv": [5, 27.75], "uv_size": [0.5, -0.75]} + } + }, + { + "origin": [-0.22434, 1.82073, 0.92637], + "size": [0.44867, 0.44867, 1.44011], + "uv": { + "north": {"uv": [29, 19], "uv_size": [0.5, 0.5]}, + "east": {"uv": [5, 21], "uv_size": [1.5, 0.5]}, + "south": {"uv": [20, 29], "uv_size": [0.5, 0.5]}, + "west": {"uv": [7, 21], "uv_size": [1.5, 0.5]}, + "up": {"uv": [1, 21], "uv_size": [0.5, 1.5]}, + "down": {"uv": [21, 12.5], "uv_size": [0.5, -1.5]} + } + }, + { + "origin": [-0.26066, 1.7844, 2.329], + "size": [0.52132, 0.52132, 0.13453], + "uv": { + "north": {"uv": [29, 20], "uv_size": [0.5, 0.5]}, + "east": {"uv": [32, 4], "uv_size": [0.25, 0.5]}, + "south": {"uv": [21, 29], "uv_size": [0.5, 0.5]}, + "west": {"uv": [5, 32], "uv_size": [0.25, 0.5]}, + "up": {"uv": [32, 5], "uv_size": [0.5, 0.25]}, + "down": {"uv": [6, 32.25], "uv_size": [0.5, -0.25]} + } + } + ] + }, + { + "name": "mag", + "parent": "magazine", + "pivot": [0.24823, -5.38367, 0.94374], + "cubes": [ + { + "origin": [-0.625, -3.29687, 2.66311], + "size": [1.25, 0.21875, 1.95], + "uv": { + "east": {"uv": [20, 24], "uv_size": [2, 0.25]}, + "south": {"uv": [27, 10], "uv_size": [1.25, 0.25]}, + "west": {"uv": [24, 20], "uv_size": [2, 0.25]}, + "up": {"uv": [8, 14], "uv_size": [1.25, 2]}, + "down": {"uv": [14, 10], "uv_size": [1.25, -2]} + } + }, + { + "origin": [-0.5, -3.07812, 3.36311], + "size": [1, 0.21875, 0.75], + "uv": { + "east": {"uv": [30, 2], "uv_size": [0.75, 0.25]}, + "west": {"uv": [3, 30], "uv_size": [0.75, 0.25]} + } + }, + { + "origin": [-0.475, -3.29687, 2.51311], + "size": [0.95, 0.21875, 0.15], + "uv": { + "north": {"uv": [28, 28], "uv_size": [1, 0.25]}, + "up": {"uv": [0, 29], "uv_size": [1, 0.25]}, + "down": {"uv": [29, 0.25], "uv_size": [1, -0.25]} + } + }, + { + "origin": [1.63218, -3.29687, 1.77338], + "size": [0.21293, 0.21875, 0.10938], + "pivot": [0.16105, -2.05902, 0.74544], + "rotation": [0, -45, 0], + "uv": { + "north": {"uv": [0, 33], "uv_size": [0.25, 0.25]}, + "up": {"uv": [33, 0], "uv_size": [0.25, 0.25]}, + "down": {"uv": [1, 33.25], "uv_size": [0.25, -0.25]} + } + }, + { + "origin": [-1.84511, -3.29687, 1.77338], + "size": [0.21293, 0.21875, 0.10938], + "pivot": [-0.16105, -2.05902, 0.74544], + "rotation": [0, 45, 0], + "uv": { + "north": {"uv": [35, 24], "uv_size": [0.25, 0.25]}, + "up": {"uv": [25, 35], "uv_size": [0.25, 0.25]}, + "down": {"uv": [35, 25.25], "uv_size": [0.25, -0.25]} + } + }, + { + "origin": [-0.5005, -4.49049, 3.36385], + "size": [1.001, 5.4385, 0.5635], + "pivot": [0.06161, -2.05902, 0.721], + "rotation": [22.5, 0, 0], + "uv": { + "north": {"uv": [6, 10], "uv_size": [1, 5.5]}, + "east": {"uv": [13, 11], "uv_size": [0.5, 5.5]}, + "south": {"uv": [7, 10], "uv_size": [1, 5.5]}, + "west": {"uv": [0, 14], "uv_size": [0.5, 5.5]} + } + }, + { + "origin": [-0.5005, -4.02174, 2.22635], + "size": [1.001, 5.19397, 1.1385], + "pivot": [0.06161, -2.05902, 0.721], + "rotation": [22.5, 0, 0], + "uv": { + "north": {"uv": [12, 0], "uv_size": [1, 5.25]}, + "east": {"uv": [6, 4], "uv_size": [1.25, 5.25]}, + "west": {"uv": [0, 8], "uv_size": [1.25, 5.25]}, + "up": {"uv": [13, 17], "uv_size": [1, 1.25]}, + "down": {"uv": [17, 16.25], "uv_size": [1, -1.25]} + } + }, + { + "origin": [-0.4995, 1.50233, 0.87522], + "size": [1, 0.44141, 1.66328], + "uv": { + "north": {"uv": [24, 21], "uv_size": [1, 0.5]}, + "east": {"uv": [20, 2], "uv_size": [1.75, 0.5]}, + "west": {"uv": [3, 20], "uv_size": [1.75, 0.5]}, + "up": {"uv": [16, 0], "uv_size": [1, 1.75]} + } + }, + { + "origin": [-1.99396, 1.44791, 1.1635], + "size": [0.125, 0.25, 1.375], + "pivot": [-0.00039, -2.06076, 0.72723], + "rotation": [0, 0, 22.5], + "uv": { + "north": {"uv": [33, 1], "uv_size": [0.25, 0.25]}, + "east": {"uv": [26, 8], "uv_size": [1.5, 0.25]}, + "south": {"uv": [2, 33], "uv_size": [0.25, 0.25]}, + "west": {"uv": [26, 9], "uv_size": [1.5, 0.25]}, + "up": {"uv": [10, 26], "uv_size": [0.25, 1.5]} + } + }, + { + "origin": [1.87934, 1.49507, 1.1635], + "size": [0.125, 0.25, 1.375], + "pivot": [0.12462, -2.06076, 0.72723], + "rotation": [0, 0, -22.5], + "uv": { + "north": {"uv": [33, 2], "uv_size": [0.25, 0.25]}, + "east": {"uv": [11, 26], "uv_size": [1.5, 0.25]}, + "south": {"uv": [3, 33], "uv_size": [0.25, 0.25]}, + "west": {"uv": [13, 26], "uv_size": [1.5, 0.25]}, + "up": {"uv": [15, 26], "uv_size": [0.25, 1.5]} + } + } + ] + }, { "name": "body", "parent": "gun", @@ -1459,172 +1619,6 @@ } ] }, - { - "name": "magazine", - "parent": "body", - "pivot": [0, -0.3, 1.8] - }, - { - "name": "bullet", - "parent": "magazine", - "pivot": [0, 2.04506, 1.58179], - "cubes": [ - { - "origin": [-0.26066, 1.7844, 1.37382], - "size": [0.52132, 0.52132, 0.87264], - "uv": { - "north": {"uv": [29, 18], "uv_size": [0.5, 0.5]}, - "east": {"uv": [27, 3], "uv_size": [0.75, 0.5]}, - "south": {"uv": [19, 29], "uv_size": [0.5, 0.5]}, - "west": {"uv": [4, 27], "uv_size": [0.75, 0.5]}, - "up": {"uv": [27, 4], "uv_size": [0.5, 0.75]}, - "down": {"uv": [5, 27.75], "uv_size": [0.5, -0.75]} - } - }, - { - "origin": [-0.22434, 1.82073, 0.92637], - "size": [0.44867, 0.44867, 1.44011], - "uv": { - "north": {"uv": [29, 19], "uv_size": [0.5, 0.5]}, - "east": {"uv": [5, 21], "uv_size": [1.5, 0.5]}, - "south": {"uv": [20, 29], "uv_size": [0.5, 0.5]}, - "west": {"uv": [7, 21], "uv_size": [1.5, 0.5]}, - "up": {"uv": [1, 21], "uv_size": [0.5, 1.5]}, - "down": {"uv": [21, 12.5], "uv_size": [0.5, -1.5]} - } - }, - { - "origin": [-0.26066, 1.7844, 2.329], - "size": [0.52132, 0.52132, 0.13453], - "uv": { - "north": {"uv": [29, 20], "uv_size": [0.5, 0.5]}, - "east": {"uv": [32, 4], "uv_size": [0.25, 0.5]}, - "south": {"uv": [21, 29], "uv_size": [0.5, 0.5]}, - "west": {"uv": [5, 32], "uv_size": [0.25, 0.5]}, - "up": {"uv": [32, 5], "uv_size": [0.5, 0.25]}, - "down": {"uv": [6, 32.25], "uv_size": [0.5, -0.25]} - } - } - ] - }, - { - "name": "mag", - "parent": "magazine", - "pivot": [0.24823, -5.38367, 0.94374], - "cubes": [ - { - "origin": [-0.625, -3.29687, 2.66311], - "size": [1.25, 0.21875, 1.95], - "uv": { - "east": {"uv": [20, 24], "uv_size": [2, 0.25]}, - "south": {"uv": [27, 10], "uv_size": [1.25, 0.25]}, - "west": {"uv": [24, 20], "uv_size": [2, 0.25]}, - "up": {"uv": [8, 14], "uv_size": [1.25, 2]}, - "down": {"uv": [14, 10], "uv_size": [1.25, -2]} - } - }, - { - "origin": [-0.5, -3.07812, 3.36311], - "size": [1, 0.21875, 0.75], - "uv": { - "east": {"uv": [30, 2], "uv_size": [0.75, 0.25]}, - "west": {"uv": [3, 30], "uv_size": [0.75, 0.25]} - } - }, - { - "origin": [-0.475, -3.29687, 2.51311], - "size": [0.95, 0.21875, 0.15], - "uv": { - "north": {"uv": [28, 28], "uv_size": [1, 0.25]}, - "up": {"uv": [0, 29], "uv_size": [1, 0.25]}, - "down": {"uv": [29, 0.25], "uv_size": [1, -0.25]} - } - }, - { - "origin": [1.63218, -3.29687, 1.77338], - "size": [0.21293, 0.21875, 0.10938], - "pivot": [0.16105, -2.05902, 0.74544], - "rotation": [0, -45, 0], - "uv": { - "north": {"uv": [0, 33], "uv_size": [0.25, 0.25]}, - "up": {"uv": [33, 0], "uv_size": [0.25, 0.25]}, - "down": {"uv": [1, 33.25], "uv_size": [0.25, -0.25]} - } - }, - { - "origin": [-1.84511, -3.29687, 1.77338], - "size": [0.21293, 0.21875, 0.10938], - "pivot": [-0.16105, -2.05902, 0.74544], - "rotation": [0, 45, 0], - "uv": { - "north": {"uv": [35, 24], "uv_size": [0.25, 0.25]}, - "up": {"uv": [25, 35], "uv_size": [0.25, 0.25]}, - "down": {"uv": [35, 25.25], "uv_size": [0.25, -0.25]} - } - }, - { - "origin": [-0.5005, -4.49049, 3.36385], - "size": [1.001, 5.4385, 0.5635], - "pivot": [0.06161, -2.05902, 0.721], - "rotation": [22.5, 0, 0], - "uv": { - "north": {"uv": [6, 10], "uv_size": [1, 5.5]}, - "east": {"uv": [13, 11], "uv_size": [0.5, 5.5]}, - "south": {"uv": [7, 10], "uv_size": [1, 5.5]}, - "west": {"uv": [0, 14], "uv_size": [0.5, 5.5]} - } - }, - { - "origin": [-0.5005, -4.02174, 2.22635], - "size": [1.001, 5.19397, 1.1385], - "pivot": [0.06161, -2.05902, 0.721], - "rotation": [22.5, 0, 0], - "uv": { - "north": {"uv": [12, 0], "uv_size": [1, 5.25]}, - "east": {"uv": [6, 4], "uv_size": [1.25, 5.25]}, - "west": {"uv": [0, 8], "uv_size": [1.25, 5.25]}, - "up": {"uv": [13, 17], "uv_size": [1, 1.25]}, - "down": {"uv": [17, 16.25], "uv_size": [1, -1.25]} - } - }, - { - "origin": [-0.4995, 1.50233, 0.87522], - "size": [1, 0.44141, 1.66328], - "uv": { - "north": {"uv": [24, 21], "uv_size": [1, 0.5]}, - "east": {"uv": [20, 2], "uv_size": [1.75, 0.5]}, - "west": {"uv": [3, 20], "uv_size": [1.75, 0.5]}, - "up": {"uv": [16, 0], "uv_size": [1, 1.75]} - } - }, - { - "origin": [-1.99396, 1.44791, 1.1635], - "size": [0.125, 0.25, 1.375], - "pivot": [-0.00039, -2.06076, 0.72723], - "rotation": [0, 0, 22.5], - "uv": { - "north": {"uv": [33, 1], "uv_size": [0.25, 0.25]}, - "east": {"uv": [26, 8], "uv_size": [1.5, 0.25]}, - "south": {"uv": [2, 33], "uv_size": [0.25, 0.25]}, - "west": {"uv": [26, 9], "uv_size": [1.5, 0.25]}, - "up": {"uv": [10, 26], "uv_size": [0.25, 1.5]} - } - }, - { - "origin": [1.87934, 1.49507, 1.1635], - "size": [0.125, 0.25, 1.375], - "pivot": [0.12462, -2.06076, 0.72723], - "rotation": [0, 0, -22.5], - "uv": { - "north": {"uv": [33, 2], "uv_size": [0.25, 0.25]}, - "east": {"uv": [11, 26], "uv_size": [1.5, 0.25]}, - "south": {"uv": [3, 33], "uv_size": [0.25, 0.25]}, - "west": {"uv": [13, 26], "uv_size": [1.5, 0.25]}, - "up": {"uv": [15, 26], "uv_size": [0.25, 1.5]} - } - } - ] - }, { "name": "huatao", "parent": "body", diff --git a/src/main/resources/assets/superbwarfare/geo/glock18.geo.json b/src/main/resources/assets/superbwarfare/geo/glock18.geo.json index 6b72afda5..bd65cea0a 100644 --- a/src/main/resources/assets/superbwarfare/geo/glock18.geo.json +++ b/src/main/resources/assets/superbwarfare/geo/glock18.geo.json @@ -34,35 +34,9 @@ "parent": "shen", "pivot": [0, 0, 0] }, - { - "name": "roll", - "parent": "0", - "pivot": [0, 0, 0], - "rotation": [0, 0, 11] - }, - { - "name": "Lefthand", - "parent": "roll", - "pivot": [2.6976, -5.69887, 9.77824], - "rotation": [113.29762, -12.57035, 179.33701], - "cubes": [ - { - "origin": [0.6476, -5.69887, 7.82824], - "size": [4, 12, 4], - "uv": { - "north": {"uv": [0, 36], "uv_size": [1, 1]}, - "east": {"uv": [0, 36], "uv_size": [1, 1]}, - "south": {"uv": [0, 36], "uv_size": [1, 1]}, - "west": {"uv": [0, 36], "uv_size": [1, 1]}, - "up": {"uv": [1, 37], "uv_size": [-1, -1]}, - "down": {"uv": [1, 37], "uv_size": [-1, -1]} - } - } - ] - }, { "name": "gun", - "parent": "roll", + "parent": "0", "pivot": [0, 0.46563, 1.72795] }, { @@ -99,6 +73,192 @@ } ] }, + { + "name": "magazine", + "parent": "gun", + "pivot": [0, -0.3, 1.8] + }, + { + "name": "Lefthand", + "parent": "magazine", + "pivot": [2.6976, -5.69887, 9.77824], + "rotation": [113.29762, -12.57035, 179.33701], + "cubes": [ + { + "origin": [0.6476, -5.69887, 7.82824], + "size": [4, 12, 4], + "uv": { + "north": {"uv": [0, 36], "uv_size": [1, 1]}, + "east": {"uv": [0, 36], "uv_size": [1, 1]}, + "south": {"uv": [0, 36], "uv_size": [1, 1]}, + "west": {"uv": [0, 36], "uv_size": [1, 1]}, + "up": {"uv": [1, 37], "uv_size": [-1, -1]}, + "down": {"uv": [1, 37], "uv_size": [-1, -1]} + } + } + ] + }, + { + "name": "bullet", + "parent": "magazine", + "pivot": [0, 2.04506, 1.58179], + "cubes": [ + { + "origin": [-0.26066, 1.7844, 1.37382], + "size": [0.52132, 0.52132, 0.87264], + "uv": { + "north": {"uv": [29, 18], "uv_size": [0.5, 0.5]}, + "east": {"uv": [27, 3], "uv_size": [0.75, 0.5]}, + "south": {"uv": [19, 29], "uv_size": [0.5, 0.5]}, + "west": {"uv": [4, 27], "uv_size": [0.75, 0.5]}, + "up": {"uv": [27, 4], "uv_size": [0.5, 0.75]}, + "down": {"uv": [5, 27.75], "uv_size": [0.5, -0.75]} + } + }, + { + "origin": [-0.22434, 1.82073, 0.92637], + "size": [0.44867, 0.44867, 1.44011], + "uv": { + "north": {"uv": [29, 19], "uv_size": [0.5, 0.5]}, + "east": {"uv": [5, 21], "uv_size": [1.5, 0.5]}, + "south": {"uv": [20, 29], "uv_size": [0.5, 0.5]}, + "west": {"uv": [7, 21], "uv_size": [1.5, 0.5]}, + "up": {"uv": [1, 21], "uv_size": [0.5, 1.5]}, + "down": {"uv": [21, 12.5], "uv_size": [0.5, -1.5]} + } + }, + { + "origin": [-0.26066, 1.7844, 2.329], + "size": [0.52132, 0.52132, 0.13453], + "uv": { + "north": {"uv": [29, 20], "uv_size": [0.5, 0.5]}, + "east": {"uv": [32, 4], "uv_size": [0.25, 0.5]}, + "south": {"uv": [21, 29], "uv_size": [0.5, 0.5]}, + "west": {"uv": [5, 32], "uv_size": [0.25, 0.5]}, + "up": {"uv": [32, 5], "uv_size": [0.5, 0.25]}, + "down": {"uv": [6, 32.25], "uv_size": [0.5, -0.25]} + } + } + ] + }, + { + "name": "mag", + "parent": "magazine", + "pivot": [0.24823, -5.38367, 0.94374], + "cubes": [ + { + "origin": [-0.625, -3.29687, 2.66311], + "size": [1.25, 0.21875, 1.95], + "uv": { + "east": {"uv": [20, 24], "uv_size": [2, 0.25]}, + "south": {"uv": [27, 10], "uv_size": [1.25, 0.25]}, + "west": {"uv": [24, 20], "uv_size": [2, 0.25]}, + "up": {"uv": [8, 14], "uv_size": [1.25, 2]}, + "down": {"uv": [14, 10], "uv_size": [1.25, -2]} + } + }, + { + "origin": [-0.5, -3.07812, 3.36311], + "size": [1, 0.21875, 0.75], + "uv": { + "east": {"uv": [30, 2], "uv_size": [0.75, 0.25]}, + "west": {"uv": [3, 30], "uv_size": [0.75, 0.25]} + } + }, + { + "origin": [-0.475, -3.29687, 2.51311], + "size": [0.95, 0.21875, 0.15], + "uv": { + "north": {"uv": [28, 28], "uv_size": [1, 0.25]}, + "up": {"uv": [0, 29], "uv_size": [1, 0.25]}, + "down": {"uv": [29, 0.25], "uv_size": [1, -0.25]} + } + }, + { + "origin": [1.63218, -3.29687, 1.77338], + "size": [0.21293, 0.21875, 0.10938], + "pivot": [0.16105, -2.05902, 0.74544], + "rotation": [0, -45, 0], + "uv": { + "north": {"uv": [0, 33], "uv_size": [0.25, 0.25]}, + "up": {"uv": [33, 0], "uv_size": [0.25, 0.25]}, + "down": {"uv": [1, 33.25], "uv_size": [0.25, -0.25]} + } + }, + { + "origin": [-1.84511, -3.29687, 1.77338], + "size": [0.21293, 0.21875, 0.10938], + "pivot": [-0.16105, -2.05902, 0.74544], + "rotation": [0, 45, 0], + "uv": { + "north": {"uv": [35, 24], "uv_size": [0.25, 0.25]}, + "up": {"uv": [25, 35], "uv_size": [0.25, 0.25]}, + "down": {"uv": [35, 25.25], "uv_size": [0.25, -0.25]} + } + }, + { + "origin": [-0.5005, -4.49049, 3.36385], + "size": [1.001, 5.4385, 0.5635], + "pivot": [0.06161, -2.05902, 0.721], + "rotation": [22.5, 0, 0], + "uv": { + "north": {"uv": [6, 10], "uv_size": [1, 5.5]}, + "east": {"uv": [13, 11], "uv_size": [0.5, 5.5]}, + "south": {"uv": [7, 10], "uv_size": [1, 5.5]}, + "west": {"uv": [0, 14], "uv_size": [0.5, 5.5]} + } + }, + { + "origin": [-0.5005, -4.02174, 2.22635], + "size": [1.001, 5.19397, 1.1385], + "pivot": [0.06161, -2.05902, 0.721], + "rotation": [22.5, 0, 0], + "uv": { + "north": {"uv": [12, 0], "uv_size": [1, 5.25]}, + "east": {"uv": [6, 4], "uv_size": [1.25, 5.25]}, + "west": {"uv": [0, 8], "uv_size": [1.25, 5.25]}, + "up": {"uv": [13, 17], "uv_size": [1, 1.25]}, + "down": {"uv": [17, 16.25], "uv_size": [1, -1.25]} + } + }, + { + "origin": [-0.4995, 1.50233, 0.87522], + "size": [1, 0.44141, 1.66328], + "uv": { + "north": {"uv": [24, 21], "uv_size": [1, 0.5]}, + "east": {"uv": [20, 2], "uv_size": [1.75, 0.5]}, + "west": {"uv": [3, 20], "uv_size": [1.75, 0.5]}, + "up": {"uv": [16, 0], "uv_size": [1, 1.75]} + } + }, + { + "origin": [-1.99396, 1.44791, 1.1635], + "size": [0.125, 0.25, 1.375], + "pivot": [-0.00039, -2.06076, 0.72723], + "rotation": [0, 0, 22.5], + "uv": { + "north": {"uv": [33, 1], "uv_size": [0.25, 0.25]}, + "east": {"uv": [26, 8], "uv_size": [1.5, 0.25]}, + "south": {"uv": [2, 33], "uv_size": [0.25, 0.25]}, + "west": {"uv": [26, 9], "uv_size": [1.5, 0.25]}, + "up": {"uv": [10, 26], "uv_size": [0.25, 1.5]} + } + }, + { + "origin": [1.87934, 1.49507, 1.1635], + "size": [0.125, 0.25, 1.375], + "pivot": [0.12462, -2.06076, 0.72723], + "rotation": [0, 0, -22.5], + "uv": { + "north": {"uv": [33, 2], "uv_size": [0.25, 0.25]}, + "east": {"uv": [11, 26], "uv_size": [1.5, 0.25]}, + "south": {"uv": [3, 33], "uv_size": [0.25, 0.25]}, + "west": {"uv": [13, 26], "uv_size": [1.5, 0.25]}, + "up": {"uv": [15, 26], "uv_size": [0.25, 1.5]} + } + } + ] + }, { "name": "body", "parent": "gun", @@ -1459,172 +1619,6 @@ } ] }, - { - "name": "magazine", - "parent": "body", - "pivot": [0, -0.3, 1.8] - }, - { - "name": "bullet", - "parent": "magazine", - "pivot": [0, 2.04506, 1.58179], - "cubes": [ - { - "origin": [-0.26066, 1.7844, 1.37382], - "size": [0.52132, 0.52132, 0.87264], - "uv": { - "north": {"uv": [29, 18], "uv_size": [0.5, 0.5]}, - "east": {"uv": [27, 3], "uv_size": [0.75, 0.5]}, - "south": {"uv": [19, 29], "uv_size": [0.5, 0.5]}, - "west": {"uv": [4, 27], "uv_size": [0.75, 0.5]}, - "up": {"uv": [27, 4], "uv_size": [0.5, 0.75]}, - "down": {"uv": [5, 27.75], "uv_size": [0.5, -0.75]} - } - }, - { - "origin": [-0.22434, 1.82073, 0.92637], - "size": [0.44867, 0.44867, 1.44011], - "uv": { - "north": {"uv": [29, 19], "uv_size": [0.5, 0.5]}, - "east": {"uv": [5, 21], "uv_size": [1.5, 0.5]}, - "south": {"uv": [20, 29], "uv_size": [0.5, 0.5]}, - "west": {"uv": [7, 21], "uv_size": [1.5, 0.5]}, - "up": {"uv": [1, 21], "uv_size": [0.5, 1.5]}, - "down": {"uv": [21, 12.5], "uv_size": [0.5, -1.5]} - } - }, - { - "origin": [-0.26066, 1.7844, 2.329], - "size": [0.52132, 0.52132, 0.13453], - "uv": { - "north": {"uv": [29, 20], "uv_size": [0.5, 0.5]}, - "east": {"uv": [32, 4], "uv_size": [0.25, 0.5]}, - "south": {"uv": [21, 29], "uv_size": [0.5, 0.5]}, - "west": {"uv": [5, 32], "uv_size": [0.25, 0.5]}, - "up": {"uv": [32, 5], "uv_size": [0.5, 0.25]}, - "down": {"uv": [6, 32.25], "uv_size": [0.5, -0.25]} - } - } - ] - }, - { - "name": "mag", - "parent": "magazine", - "pivot": [0.24823, -5.38367, 0.94374], - "cubes": [ - { - "origin": [-0.625, -3.29687, 2.66311], - "size": [1.25, 0.21875, 1.95], - "uv": { - "east": {"uv": [20, 24], "uv_size": [2, 0.25]}, - "south": {"uv": [27, 10], "uv_size": [1.25, 0.25]}, - "west": {"uv": [24, 20], "uv_size": [2, 0.25]}, - "up": {"uv": [8, 14], "uv_size": [1.25, 2]}, - "down": {"uv": [14, 10], "uv_size": [1.25, -2]} - } - }, - { - "origin": [-0.5, -3.07812, 3.36311], - "size": [1, 0.21875, 0.75], - "uv": { - "east": {"uv": [30, 2], "uv_size": [0.75, 0.25]}, - "west": {"uv": [3, 30], "uv_size": [0.75, 0.25]} - } - }, - { - "origin": [-0.475, -3.29687, 2.51311], - "size": [0.95, 0.21875, 0.15], - "uv": { - "north": {"uv": [28, 28], "uv_size": [1, 0.25]}, - "up": {"uv": [0, 29], "uv_size": [1, 0.25]}, - "down": {"uv": [29, 0.25], "uv_size": [1, -0.25]} - } - }, - { - "origin": [1.63218, -3.29687, 1.77338], - "size": [0.21293, 0.21875, 0.10938], - "pivot": [0.16105, -2.05902, 0.74544], - "rotation": [0, -45, 0], - "uv": { - "north": {"uv": [0, 33], "uv_size": [0.25, 0.25]}, - "up": {"uv": [33, 0], "uv_size": [0.25, 0.25]}, - "down": {"uv": [1, 33.25], "uv_size": [0.25, -0.25]} - } - }, - { - "origin": [-1.84511, -3.29687, 1.77338], - "size": [0.21293, 0.21875, 0.10938], - "pivot": [-0.16105, -2.05902, 0.74544], - "rotation": [0, 45, 0], - "uv": { - "north": {"uv": [35, 24], "uv_size": [0.25, 0.25]}, - "up": {"uv": [25, 35], "uv_size": [0.25, 0.25]}, - "down": {"uv": [35, 25.25], "uv_size": [0.25, -0.25]} - } - }, - { - "origin": [-0.5005, -4.49049, 3.36385], - "size": [1.001, 5.4385, 0.5635], - "pivot": [0.06161, -2.05902, 0.721], - "rotation": [22.5, 0, 0], - "uv": { - "north": {"uv": [6, 10], "uv_size": [1, 5.5]}, - "east": {"uv": [13, 11], "uv_size": [0.5, 5.5]}, - "south": {"uv": [7, 10], "uv_size": [1, 5.5]}, - "west": {"uv": [0, 14], "uv_size": [0.5, 5.5]} - } - }, - { - "origin": [-0.5005, -4.02174, 2.22635], - "size": [1.001, 5.19397, 1.1385], - "pivot": [0.06161, -2.05902, 0.721], - "rotation": [22.5, 0, 0], - "uv": { - "north": {"uv": [12, 0], "uv_size": [1, 5.25]}, - "east": {"uv": [6, 4], "uv_size": [1.25, 5.25]}, - "west": {"uv": [0, 8], "uv_size": [1.25, 5.25]}, - "up": {"uv": [13, 17], "uv_size": [1, 1.25]}, - "down": {"uv": [17, 16.25], "uv_size": [1, -1.25]} - } - }, - { - "origin": [-0.4995, 1.50233, 0.87522], - "size": [1, 0.44141, 1.66328], - "uv": { - "north": {"uv": [24, 21], "uv_size": [1, 0.5]}, - "east": {"uv": [20, 2], "uv_size": [1.75, 0.5]}, - "west": {"uv": [3, 20], "uv_size": [1.75, 0.5]}, - "up": {"uv": [16, 0], "uv_size": [1, 1.75]} - } - }, - { - "origin": [-1.99396, 1.44791, 1.1635], - "size": [0.125, 0.25, 1.375], - "pivot": [-0.00039, -2.06076, 0.72723], - "rotation": [0, 0, 22.5], - "uv": { - "north": {"uv": [33, 1], "uv_size": [0.25, 0.25]}, - "east": {"uv": [26, 8], "uv_size": [1.5, 0.25]}, - "south": {"uv": [2, 33], "uv_size": [0.25, 0.25]}, - "west": {"uv": [26, 9], "uv_size": [1.5, 0.25]}, - "up": {"uv": [10, 26], "uv_size": [0.25, 1.5]} - } - }, - { - "origin": [1.87934, 1.49507, 1.1635], - "size": [0.125, 0.25, 1.375], - "pivot": [0.12462, -2.06076, 0.72723], - "rotation": [0, 0, -22.5], - "uv": { - "north": {"uv": [33, 2], "uv_size": [0.25, 0.25]}, - "east": {"uv": [11, 26], "uv_size": [1.5, 0.25]}, - "south": {"uv": [3, 33], "uv_size": [0.25, 0.25]}, - "west": {"uv": [13, 26], "uv_size": [1.5, 0.25]}, - "up": {"uv": [15, 26], "uv_size": [0.25, 1.5]} - } - } - ] - }, { "name": "huatao", "parent": "body", @@ -2686,6 +2680,12 @@ } } ] + }, + { + "name": "roll", + "parent": "0", + "pivot": [0, 0, 0], + "rotation": [0, 0, 11] } ] } diff --git a/src/main/resources/assets/superbwarfare/geo/m1911.geo.json b/src/main/resources/assets/superbwarfare/geo/m1911.geo.json index 91750c129..1af1fdd96 100644 --- a/src/main/resources/assets/superbwarfare/geo/m1911.geo.json +++ b/src/main/resources/assets/superbwarfare/geo/m1911.geo.json @@ -34,14 +34,9 @@ "parent": "shen", "pivot": [0, 0, 0] }, - { - "name": "roll", - "parent": "0", - "pivot": [0, 0, 0] - }, { "name": "gun", - "parent": "roll", + "parent": "0", "pivot": [0, 0.46563, 1.72795] }, { @@ -58,6 +53,211 @@ } ] }, + { + "name": "magazine", + "parent": "gun", + "pivot": [0, -0.3, 1.8] + }, + { + "name": "Lefthand", + "parent": "magazine", + "pivot": [2.6976, -5.69887, 9.77824], + "rotation": [113.29762, -12.57035, 179.33701], + "cubes": [ + { + "origin": [0.6476, -5.69887, 7.82824], + "size": [4, 12, 4], + "uv": { + "north": {"uv": [0, 36], "uv_size": [1, 1]}, + "east": {"uv": [0, 36], "uv_size": [1, 1]}, + "south": {"uv": [0, 36], "uv_size": [1, 1]}, + "west": {"uv": [0, 36], "uv_size": [1, 1]}, + "up": {"uv": [1, 37], "uv_size": [-1, -1]}, + "down": {"uv": [1, 37], "uv_size": [-1, -1]} + } + } + ] + }, + { + "name": "bullet", + "parent": "magazine", + "pivot": [0, 2.04506, 1.95095], + "cubes": [ + { + "origin": [-0.26066, 1.7844, 1.37382], + "size": [0.52132, 0.52132, 0.87264], + "uv": { + "north": {"uv": [17, 28], "uv_size": [0.5, 0.5]}, + "east": {"uv": [10, 27], "uv_size": [0.75, 0.5]}, + "south": {"uv": [28, 17], "uv_size": [0.5, 0.5]}, + "west": {"uv": [12, 27], "uv_size": [0.75, 0.5]}, + "up": {"uv": [27, 13], "uv_size": [0.5, 0.75]} + } + }, + { + "origin": [-0.22434, 1.82073, 0.92637], + "size": [0.44867, 0.44867, 1.44011], + "uv": { + "north": {"uv": [18, 28], "uv_size": [0.5, 0.5]}, + "east": {"uv": [22, 18], "uv_size": [1.5, 0.5]}, + "south": {"uv": [28, 18], "uv_size": [0.5, 0.5]}, + "west": {"uv": [22, 19], "uv_size": [1.5, 0.5]}, + "up": {"uv": [20, 22], "uv_size": [0.5, 1.5]} + } + }, + { + "origin": [-0.26066, 1.7844, 2.329], + "size": [0.52132, 0.52132, 0.13453], + "uv": { + "north": {"uv": [19, 28], "uv_size": [0.5, 0.5]}, + "east": {"uv": [32, 22], "uv_size": [0.25, 0.5]}, + "south": {"uv": [28, 19], "uv_size": [0.5, 0.5]}, + "west": {"uv": [23, 32], "uv_size": [0.25, 0.5]}, + "up": {"uv": [32, 23], "uv_size": [0.5, 0.25]} + } + } + ] + }, + { + "name": "mag", + "parent": "magazine", + "pivot": [0.24823, -5.38367, 0.94374], + "cubes": [ + { + "origin": [-0.37525, -3.07812, 2.66311], + "size": [0.75, 0.41875, 1.45], + "pivot": [0.08636, -1.84027, 0.721], + "rotation": [3, 0, 0], + "uv": { + "east": {"uv": [22, 16], "uv_size": [1.5, 0.5]}, + "west": {"uv": [22, 17], "uv_size": [1.5, 0.5]} + } + }, + { + "origin": [-0.37475, -3.10462, 2.9737], + "size": [0.75, 5.1385, 0.5635], + "pivot": [0.02475, -0.53537, 3.25545], + "rotation": [22.5, 0, 0], + "uv": { + "north": {"uv": [5, 5], "uv_size": [0.75, 5.25]}, + "east": {"uv": [1, 10], "uv_size": [0.5, 5.25]}, + "south": {"uv": [6, 0], "uv_size": [0.75, 5.25]}, + "west": {"uv": [2, 10], "uv_size": [0.5, 5.25]} + } + }, + { + "origin": [-0.37475, -3.04411, 3.84589], + "size": [0.75, 0.1385, 0.2635], + "pivot": [0.02475, -1.07486, 3.82764], + "rotation": [12.5, 0, 0], + "uv": { + "north": {"uv": [32, 11], "uv_size": [0.75, 0.25]}, + "east": {"uv": [1, 39], "uv_size": [0.25, 0.25]}, + "south": {"uv": [12, 32], "uv_size": [0.75, 0.25]}, + "west": {"uv": [39, 1], "uv_size": [0.25, 0.25]} + } + }, + { + "origin": [-0.37475, -3.72175, 2.22635], + "size": [0.75, 4.89397, 1.1385], + "pivot": [0.08636, -2.05902, 0.721], + "rotation": [22.5, 0, 0], + "uv": { + "north": {"uv": [6, 6], "uv_size": [0.75, 5]}, + "east": {"uv": [0, 0], "uv_size": [1.25, 5]}, + "west": {"uv": [2, 0], "uv_size": [1.25, 5]}, + "up": {"uv": [22, 3], "uv_size": [0.75, 1.25]}, + "down": {"uv": [5, 23.25], "uv_size": [0.75, -1.25]} + } + }, + { + "origin": [-0.375, 1.50233, 0.87522], + "size": [0.75, 0.44141, 1.66328], + "uv": { + "north": {"uv": [27, 2], "uv_size": [0.75, 0.5]}, + "east": {"uv": [11, 22], "uv_size": [1.75, 0.5]}, + "west": {"uv": [22, 12], "uv_size": [1.75, 0.5]}, + "up": {"uv": [7, 17], "uv_size": [0.75, 1.75]} + } + }, + { + "origin": [-1.86921, 1.4503, 1.15754], + "size": [0.125, 0.25, 1.375], + "pivot": [0.12436, -2.05837, 0.72128], + "rotation": [0, 0, 22.5], + "uv": { + "north": {"uv": [34, 13], "uv_size": [0.25, 0.25]}, + "east": {"uv": [27, 3], "uv_size": [1.5, 0.25]}, + "south": {"uv": [14, 34], "uv_size": [0.25, 0.25]}, + "west": {"uv": [27, 4], "uv_size": [1.5, 0.25]}, + "up": {"uv": [3, 27], "uv_size": [0.25, 1.5]} + } + }, + { + "origin": [1.75409, 1.49746, 1.15754], + "size": [0.125, 0.25, 1.375], + "pivot": [-0.00063, -2.05837, 0.72128], + "rotation": [0, 0, -22.5], + "uv": { + "north": {"uv": [34, 14], "uv_size": [0.25, 0.25]}, + "east": {"uv": [27, 5], "uv_size": [1.5, 0.25]}, + "south": {"uv": [15, 34], "uv_size": [0.25, 0.25]}, + "west": {"uv": [27, 6], "uv_size": [1.5, 0.25]}, + "up": {"uv": [27, 8], "uv_size": [0.25, 1.5]} + } + } + ] + }, + { + "name": "bone8", + "parent": "mag", + "pivot": [0, -3.0875, 2.57009], + "rotation": [3, 0, 0], + "cubes": [ + { + "origin": [-0.375, -3.12812, 2.36311], + "size": [0.75, 0.15, 2.23203], + "uv": { + "east": {"uv": [14, 25], "uv_size": [2.25, 0.25]}, + "south": {"uv": [31, 1], "uv_size": [0.75, 0.25]}, + "west": {"uv": [25, 21], "uv_size": [2.25, 0.25]}, + "up": {"uv": [7, 14], "uv_size": [0.75, 2.25]}, + "down": {"uv": [14, 9.25], "uv_size": [0.75, -2.25]} + } + }, + { + "origin": [-0.225, -3.12812, 2.21311], + "size": [0.45, 0.15, 0.15], + "uv": { + "north": {"uv": [17, 32], "uv_size": [0.5, 0.25]}, + "up": {"uv": [32, 17], "uv_size": [0.5, 0.25]}, + "down": {"uv": [18, 32.25], "uv_size": [0.5, -0.25]} + } + }, + { + "origin": [1.38274, -3.12812, 1.47394], + "size": [0.21293, 0.15, 0.10938], + "pivot": [-0.08839, -1.95902, 0.446], + "rotation": [0, -45, 0], + "uv": { + "north": {"uv": [12, 34], "uv_size": [0.25, 0.25]}, + "up": {"uv": [34, 12], "uv_size": [0.25, 0.25]}, + "down": {"uv": [13, 34.25], "uv_size": [0.25, -0.25]} + } + }, + { + "origin": [-1.59567, -3.12812, 1.47394], + "size": [0.21293, 0.15, 0.10938], + "pivot": [0.08839, -1.95902, 0.446], + "rotation": [0, 45, 0], + "uv": { + "north": {"uv": [18, 34], "uv_size": [0.25, 0.25]}, + "up": {"uv": [34, 18], "uv_size": [0.25, 0.25]}, + "down": {"uv": [19, 34.25], "uv_size": [0.25, -0.25]} + } + } + ] + }, { "name": "body", "parent": "gun", @@ -553,8 +753,6 @@ { "origin": [-0.262, 0.41813, -1.3058], "size": [0.524, 0.69275, 0.1], - "pivot": [0, 0.7395, -1.2558], - "rotation": [0, 0, 0], "uv": { "north": {"uv": [14, 27], "uv_size": [0.5, 0.75]}, "east": {"uv": [2, 31], "uv_size": [0.25, 0.75]}, @@ -686,8 +884,6 @@ { "origin": [-0.46925, 0.23029, 0.928], "size": [0.9385, 0.501, 0.19241], - "pivot": [0, 0.43079, 1.04921], - "rotation": [0, 0, 0], "uv": { "north": {"uv": [26, 1], "uv_size": [1, 0.5]}, "east": {"uv": [3, 33], "uv_size": [0.25, 0.5]}, @@ -697,8 +893,6 @@ { "origin": [-0.46925, -0.16813, 0.80108], "size": [0.9385, 0.31272, 0.44241], - "pivot": [0, -0.05591, 1.02229], - "rotation": [0, 0, 0], "uv": { "north": {"uv": [22, 28], "uv_size": [1, 0.25]}, "east": {"uv": [32, 32], "uv_size": [0.5, 0.25]}, @@ -1644,191 +1838,6 @@ } ] }, - { - "name": "magazine", - "parent": "body", - "pivot": [0, -0.3, 1.8] - }, - { - "name": "bullet", - "parent": "magazine", - "pivot": [0, 2.04506, 1.95095], - "cubes": [ - { - "origin": [-0.26066, 1.7844, 1.37382], - "size": [0.52132, 0.52132, 0.87264], - "uv": { - "north": {"uv": [17, 28], "uv_size": [0.5, 0.5]}, - "east": {"uv": [10, 27], "uv_size": [0.75, 0.5]}, - "south": {"uv": [28, 17], "uv_size": [0.5, 0.5]}, - "west": {"uv": [12, 27], "uv_size": [0.75, 0.5]}, - "up": {"uv": [27, 13], "uv_size": [0.5, 0.75]} - } - }, - { - "origin": [-0.22434, 1.82073, 0.92637], - "size": [0.44867, 0.44867, 1.44011], - "uv": { - "north": {"uv": [18, 28], "uv_size": [0.5, 0.5]}, - "east": {"uv": [22, 18], "uv_size": [1.5, 0.5]}, - "south": {"uv": [28, 18], "uv_size": [0.5, 0.5]}, - "west": {"uv": [22, 19], "uv_size": [1.5, 0.5]}, - "up": {"uv": [20, 22], "uv_size": [0.5, 1.5]} - } - }, - { - "origin": [-0.26066, 1.7844, 2.329], - "size": [0.52132, 0.52132, 0.13453], - "uv": { - "north": {"uv": [19, 28], "uv_size": [0.5, 0.5]}, - "east": {"uv": [32, 22], "uv_size": [0.25, 0.5]}, - "south": {"uv": [28, 19], "uv_size": [0.5, 0.5]}, - "west": {"uv": [23, 32], "uv_size": [0.25, 0.5]}, - "up": {"uv": [32, 23], "uv_size": [0.5, 0.25]} - } - } - ] - }, - { - "name": "mag", - "parent": "magazine", - "pivot": [0.24823, -5.38367, 0.94374], - "cubes": [ - { - "origin": [-0.37525, -3.07812, 2.66311], - "size": [0.75, 0.41875, 1.45], - "pivot": [0.08636, -1.84027, 0.721], - "rotation": [3, 0, 0], - "uv": { - "east": {"uv": [22, 16], "uv_size": [1.5, 0.5]}, - "west": {"uv": [22, 17], "uv_size": [1.5, 0.5]} - } - }, - { - "origin": [-0.37475, -3.10462, 2.9737], - "size": [0.75, 5.1385, 0.5635], - "pivot": [0.02475, -0.53537, 3.25545], - "rotation": [22.5, 0, 0], - "uv": { - "north": {"uv": [5, 5], "uv_size": [0.75, 5.25]}, - "east": {"uv": [1, 10], "uv_size": [0.5, 5.25]}, - "south": {"uv": [6, 0], "uv_size": [0.75, 5.25]}, - "west": {"uv": [2, 10], "uv_size": [0.5, 5.25]} - } - }, - { - "origin": [-0.37475, -3.04411, 3.84589], - "size": [0.75, 0.1385, 0.2635], - "pivot": [0.02475, -1.07486, 3.82764], - "rotation": [12.5, 0, 0], - "uv": { - "north": {"uv": [32, 11], "uv_size": [0.75, 0.25]}, - "east": {"uv": [1, 39], "uv_size": [0.25, 0.25]}, - "south": {"uv": [12, 32], "uv_size": [0.75, 0.25]}, - "west": {"uv": [39, 1], "uv_size": [0.25, 0.25]} - } - }, - { - "origin": [-0.37475, -3.72175, 2.22635], - "size": [0.75, 4.89397, 1.1385], - "pivot": [0.08636, -2.05902, 0.721], - "rotation": [22.5, 0, 0], - "uv": { - "north": {"uv": [6, 6], "uv_size": [0.75, 5]}, - "east": {"uv": [0, 0], "uv_size": [1.25, 5]}, - "west": {"uv": [2, 0], "uv_size": [1.25, 5]}, - "up": {"uv": [22, 3], "uv_size": [0.75, 1.25]}, - "down": {"uv": [5, 23.25], "uv_size": [0.75, -1.25]} - } - }, - { - "origin": [-0.375, 1.50233, 0.87522], - "size": [0.75, 0.44141, 1.66328], - "uv": { - "north": {"uv": [27, 2], "uv_size": [0.75, 0.5]}, - "east": {"uv": [11, 22], "uv_size": [1.75, 0.5]}, - "west": {"uv": [22, 12], "uv_size": [1.75, 0.5]}, - "up": {"uv": [7, 17], "uv_size": [0.75, 1.75]} - } - }, - { - "origin": [-1.86921, 1.4503, 1.15754], - "size": [0.125, 0.25, 1.375], - "pivot": [0.12436, -2.05837, 0.72128], - "rotation": [0, 0, 22.5], - "uv": { - "north": {"uv": [34, 13], "uv_size": [0.25, 0.25]}, - "east": {"uv": [27, 3], "uv_size": [1.5, 0.25]}, - "south": {"uv": [14, 34], "uv_size": [0.25, 0.25]}, - "west": {"uv": [27, 4], "uv_size": [1.5, 0.25]}, - "up": {"uv": [3, 27], "uv_size": [0.25, 1.5]} - } - }, - { - "origin": [1.75409, 1.49746, 1.15754], - "size": [0.125, 0.25, 1.375], - "pivot": [-0.00063, -2.05837, 0.72128], - "rotation": [0, 0, -22.5], - "uv": { - "north": {"uv": [34, 14], "uv_size": [0.25, 0.25]}, - "east": {"uv": [27, 5], "uv_size": [1.5, 0.25]}, - "south": {"uv": [15, 34], "uv_size": [0.25, 0.25]}, - "west": {"uv": [27, 6], "uv_size": [1.5, 0.25]}, - "up": {"uv": [27, 8], "uv_size": [0.25, 1.5]} - } - } - ] - }, - { - "name": "bone8", - "parent": "mag", - "pivot": [0, -3.0875, 2.57009], - "rotation": [3, 0, 0], - "cubes": [ - { - "origin": [-0.375, -3.12812, 2.36311], - "size": [0.75, 0.15, 2.23203], - "uv": { - "east": {"uv": [14, 25], "uv_size": [2.25, 0.25]}, - "south": {"uv": [31, 1], "uv_size": [0.75, 0.25]}, - "west": {"uv": [25, 21], "uv_size": [2.25, 0.25]}, - "up": {"uv": [7, 14], "uv_size": [0.75, 2.25]}, - "down": {"uv": [14, 9.25], "uv_size": [0.75, -2.25]} - } - }, - { - "origin": [-0.225, -3.12812, 2.21311], - "size": [0.45, 0.15, 0.15], - "uv": { - "north": {"uv": [17, 32], "uv_size": [0.5, 0.25]}, - "up": {"uv": [32, 17], "uv_size": [0.5, 0.25]}, - "down": {"uv": [18, 32.25], "uv_size": [0.5, -0.25]} - } - }, - { - "origin": [1.38274, -3.12812, 1.47394], - "size": [0.21293, 0.15, 0.10938], - "pivot": [-0.08839, -1.95902, 0.446], - "rotation": [0, -45, 0], - "uv": { - "north": {"uv": [12, 34], "uv_size": [0.25, 0.25]}, - "up": {"uv": [34, 12], "uv_size": [0.25, 0.25]}, - "down": {"uv": [13, 34.25], "uv_size": [0.25, -0.25]} - } - }, - { - "origin": [-1.59567, -3.12812, 1.47394], - "size": [0.21293, 0.15, 0.10938], - "pivot": [0.08839, -1.95902, 0.446], - "rotation": [0, 45, 0], - "uv": { - "north": {"uv": [18, 34], "uv_size": [0.25, 0.25]}, - "up": {"uv": [34, 18], "uv_size": [0.25, 0.25]}, - "down": {"uv": [19, 34.25], "uv_size": [0.25, -0.25]} - } - } - ] - }, { "name": "huatao", "parent": "body", @@ -3262,26 +3271,6 @@ } } ] - }, - { - "name": "Lefthand", - "parent": "roll", - "pivot": [2.6976, -5.69887, 9.77824], - "rotation": [113.29762, -12.57035, 179.33701], - "cubes": [ - { - "origin": [0.6476, -5.69887, 7.82824], - "size": [4, 12, 4], - "uv": { - "north": {"uv": [0, 36], "uv_size": [1, 1]}, - "east": {"uv": [0, 36], "uv_size": [1, 1]}, - "south": {"uv": [0, 36], "uv_size": [1, 1]}, - "west": {"uv": [0, 36], "uv_size": [1, 1]}, - "up": {"uv": [1, 37], "uv_size": [-1, -1]}, - "down": {"uv": [1, 37], "uv_size": [-1, -1]} - } - } - ] } ] } diff --git a/src/main/resources/assets/superbwarfare/models/displaysettings/glock17.item.json b/src/main/resources/assets/superbwarfare/models/displaysettings/glock17.item.json index 320b0bc35..325f6e514 100644 --- a/src/main/resources/assets/superbwarfare/models/displaysettings/glock17.item.json +++ b/src/main/resources/assets/superbwarfare/models/displaysettings/glock17.item.json @@ -33,9 +33,9 @@ }, "firstperson_righthand": { "translation": [ - -8.25, - 1.25, - -2.75 + -6.75, + 1.75, + -2.5 ] }, "firstperson_lefthand": { diff --git a/src/main/resources/assets/superbwarfare/models/displaysettings/m1911.item.json b/src/main/resources/assets/superbwarfare/models/displaysettings/m1911.item.json index a31af5bee..4d30667a4 100644 --- a/src/main/resources/assets/superbwarfare/models/displaysettings/m1911.item.json +++ b/src/main/resources/assets/superbwarfare/models/displaysettings/m1911.item.json @@ -33,14 +33,9 @@ }, "firstperson_righthand": { "translation": [ - -7, - 3.25, - 0.75 - ], - "scale": [ - 1.05, - 1.05, - 1.05 + -6.75, + 2.75, + -1.25 ] }, "firstperson_lefthand": { diff --git a/src/main/resources/assets/superbwarfare/models/item/m_1911_base.json b/src/main/resources/assets/superbwarfare/models/item/m_1911_base.json index f6c648891..625f7fabb 100644 --- a/src/main/resources/assets/superbwarfare/models/item/m_1911_base.json +++ b/src/main/resources/assets/superbwarfare/models/item/m_1911_base.json @@ -1,5 +1,5 @@ { - "parent": "superbwarfare:displaysettings/m1911.item", + "parent": "superbwarfare:displaysettings/glock17.item", "textures": { "layer0": "superbwarfare:item/m1911" } diff --git a/src/main/resources/assets/superbwarfare/sounds/glock_17/glock_reload_empty.ogg b/src/main/resources/assets/superbwarfare/sounds/glock_17/glock_reload_empty.ogg index 2ed34d4a3..7fd8ca51e 100644 Binary files a/src/main/resources/assets/superbwarfare/sounds/glock_17/glock_reload_empty.ogg and b/src/main/resources/assets/superbwarfare/sounds/glock_17/glock_reload_empty.ogg differ diff --git a/src/main/resources/assets/superbwarfare/sounds/glock_17/glock_reload_normal.ogg b/src/main/resources/assets/superbwarfare/sounds/glock_17/glock_reload_normal.ogg index ed7d1a7d6..2a40f38b8 100644 Binary files a/src/main/resources/assets/superbwarfare/sounds/glock_17/glock_reload_normal.ogg and b/src/main/resources/assets/superbwarfare/sounds/glock_17/glock_reload_normal.ogg differ diff --git a/src/main/resources/data/superbwarfare/guns/glock_17.json b/src/main/resources/data/superbwarfare/guns/glock_17.json index 6c519ab1c..e96aa8237 100644 --- a/src/main/resources/data/superbwarfare/guns/glock_17.json +++ b/src/main/resources/data/superbwarfare/guns/glock_17.json @@ -7,8 +7,8 @@ "Velocity": 17, "Magazine": 17, "Weight": 1, - "NormalReloadTime": 30, - "EmptyReloadTime": 35, + "NormalReloadTime": 44, + "EmptyReloadTime": 47, "BypassesArmor": 0.15, "SoundRadius": 8, "RPM": 400 diff --git a/src/main/resources/data/superbwarfare/guns/glock_18.json b/src/main/resources/data/superbwarfare/guns/glock_18.json index aa2e8606d..68925ea43 100644 --- a/src/main/resources/data/superbwarfare/guns/glock_18.json +++ b/src/main/resources/data/superbwarfare/guns/glock_18.json @@ -8,8 +8,8 @@ "Magazine": 17, "Weight": 1, "FireMode": 2, - "NormalReloadTime": 30, - "EmptyReloadTime": 35, + "NormalReloadTime": 44, + "EmptyReloadTime": 47, "BypassesArmor": 0.15, "SoundRadius": 8, "RPM": 1300 diff --git a/src/main/resources/data/superbwarfare/guns/m_1911.json b/src/main/resources/data/superbwarfare/guns/m_1911.json index d109e3647..7da655273 100644 --- a/src/main/resources/data/superbwarfare/guns/m_1911.json +++ b/src/main/resources/data/superbwarfare/guns/m_1911.json @@ -7,8 +7,8 @@ "Velocity": 15, "Magazine": 7, "Weight": 2, - "NormalReloadTime": 30, - "EmptyReloadTime": 35, + "NormalReloadTime": 44, + "EmptyReloadTime": 47, "BypassesArmor": 0.2, "SoundRadius": 10, "RPM": 400