diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/item/Ntw20Model.java b/src/main/java/com/atsuishio/superbwarfare/client/model/item/Ntw20Model.java index f248617d0..faf420210 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/item/Ntw20Model.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/item/Ntw20Model.java @@ -140,7 +140,7 @@ public class Ntw20Model extends GeoModel { GeoBone camera = getAnimationProcessor().getBone("camera"); GeoBone main = getAnimationProcessor().getBone("0"); - float numR = (float) (1 - 0.92 * zt); + float numR = (float) (1 - 0.98 * zt); float numP = (float) (1 - 0.88 * zt); if (data.reload.time() > 0 || data.bolt.actionTimer.get() > 0) { diff --git a/src/main/java/com/atsuishio/superbwarfare/event/ClientEventHandler.java b/src/main/java/com/atsuishio/superbwarfare/event/ClientEventHandler.java index 74608d8a6..928846272 100644 --- a/src/main/java/com/atsuishio/superbwarfare/event/ClientEventHandler.java +++ b/src/main/java/com/atsuishio/superbwarfare/event/ClientEventHandler.java @@ -1109,7 +1109,7 @@ public class ClientEventHandler { } } - if (isMoving() && !entity.isSprinting()) { + if (isMoving() && !entity.isSprinting() && firePosTimer == 0) { moveYTime += 1.2 * onGround * times * moveSpeed; moveXTime += 1.2 * onGround * times * moveSpeed; moveFadeTime = Mth.lerp(0.13 * times, moveFadeTime, 1); diff --git a/src/main/resources/assets/superbwarfare/animations/ntw_20.animation.json b/src/main/resources/assets/superbwarfare/animations/ntw_20.animation.json index 0f9b03c7e..9d7f50d63 100644 --- a/src/main/resources/assets/superbwarfare/animations/ntw_20.animation.json +++ b/src/main/resources/assets/superbwarfare/animations/ntw_20.animation.json @@ -151,47 +151,43 @@ "post": [0, 0, 0], "lerp_mode": "catmullrom" }, - "0.2": { - "post": [-0.71419, -0.44934, -0.93155], - "lerp_mode": "catmullrom" - }, - "0.35": { + "0.3": { "post": [-2.92021, -0.68057, 1.14234], "lerp_mode": "catmullrom" }, - "0.45": { + "0.35": { "post": [-2.99997, 0.01308, 9.49966], "lerp_mode": "catmullrom" }, - "0.55": { - "post": [1.25922, -0.52278, -0.33882], + "0.45": { + "post": [1.25922, -0.52278, 3.26118], "lerp_mode": "catmullrom" }, - "0.7": { - "post": [-0.47, -0.46, 0.91], + "0.6": { + "post": [-0.47, -0.46, 4.26], + "lerp_mode": "catmullrom" + }, + "0.75": { + "post": [-0.39012, -1.19904, 3.496], "lerp_mode": "catmullrom" }, "0.85": { - "post": [-0.39012, 1.90096, 3.496], + "post": [-0.39388, -0.71182, 4.75109], "lerp_mode": "catmullrom" }, - "0.95": { - "post": [-0.39388, -1.66182, 4.75109], + "1.2": { + "post": [3.05, -0.33, 2.23], "lerp_mode": "catmullrom" }, - "1.3": { - "post": [-0.27863, -2.07156, 5.7563], + "1.35": { + "post": [0.25, -0.73, -0.96], "lerp_mode": "catmullrom" }, - "1.4": { - "post": [4, 0, -1.4], + "1.45": { + "post": [-0.69, -0.13, 0.52], "lerp_mode": "catmullrom" }, "1.65": { - "post": [0.49, 0, 0], - "lerp_mode": "catmullrom" - }, - "1.7": { "post": [0, 0, 0], "lerp_mode": "catmullrom" } @@ -201,51 +197,51 @@ "post": [0, 0, 0], "lerp_mode": "catmullrom" }, - "0.15": { - "post": [0, -0.63359, 0], + "0.25": { + "post": [0, -0.63, -0.5], "lerp_mode": "catmullrom" }, "0.35": { - "post": [0, -0.63, 0], + "post": [0, -0.39562, -0.5], "lerp_mode": "catmullrom" }, - "0.45": { - "post": [0, -0.39562, 0], + "0.5": { + "post": [0, -0.63, -0.17], "lerp_mode": "catmullrom" }, - "0.65": { - "post": [0, -0.86484, 1], + "0.55": { + "post": [0, -0.86484, 0.65], "lerp_mode": "catmullrom" }, - "0.9": { - "post": [0, -0.69, 0.5], + "0.8": { + "post": [0, -0.69, -0.15], + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": [0, -0.69, 0.05], "lerp_mode": "catmullrom" }, "1.1": { - "post": [0, -0.69, -0.9], - "lerp_mode": "catmullrom" - }, - "1.2": { "post": [0, -0.52, -0.55], "lerp_mode": "catmullrom" }, - "1.3": { - "post": [0.08, -0.39, 0.41], + "1.2": { + "post": [0.02, -0.25, -0.97], + "lerp_mode": "catmullrom" + }, + "1.35": { + "post": [0.01, -0.44, 0.72], "lerp_mode": "catmullrom" }, "1.45": { - "post": [0.2, -0.2, -0.6], + "post": [0.01, -0.09, 0.32], "lerp_mode": "catmullrom" }, - "1.55": { - "post": [0.14, -0.14, 0.15], + "1.5": { + "post": [0.01, -0.15, -0.03], "lerp_mode": "catmullrom" }, "1.65": { - "post": [0.04, 0.15993, -0.05522], - "lerp_mode": "catmullrom" - }, - "1.75": { "post": [0, 0, 0], "lerp_mode": "catmullrom" } @@ -272,18 +268,54 @@ }, "camera": { "rotation": { - "0.0": [0, 0, 0], - "0.4": [0.03, 0.25, -1.18], - "0.55": [0, 0, -2], - "0.65": [0.2, 0, 1.8], - "0.75": [1, 0.65, -0.95], - "0.85": [-0.5, -0.6, -0.5], - "0.95": [0.2, 1.5, 3], - "1.2": [1, -0.4, -2.35], - "1.3": [1, 0.25, 1.5], - "1.4": [0, -0.3, -0.75], - "1.45": [0, 0.15, 0.4], - "1.65": [0, 0, 0] + "0.0": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.4": { + "post": [0.03, 0.25, -1.18], + "lerp_mode": "catmullrom" + }, + "0.55": { + "post": [0, 0, -2], + "lerp_mode": "catmullrom" + }, + "0.65": { + "post": [0.2, 0, 1.8], + "lerp_mode": "catmullrom" + }, + "0.75": { + "post": [1, 0.65, -0.95], + "lerp_mode": "catmullrom" + }, + "0.85": { + "post": [-0.5, -0.6, -0.5], + "lerp_mode": "catmullrom" + }, + "0.95": { + "post": [0.2, 1.5, 3], + "lerp_mode": "catmullrom" + }, + "1.2": { + "post": [1, -0.4, -2.35], + "lerp_mode": "catmullrom" + }, + "1.3": { + "post": [1, 0.25, 1.5], + "lerp_mode": "catmullrom" + }, + "1.4": { + "post": [0, -0.3, -0.75], + "lerp_mode": "catmullrom" + }, + "1.45": { + "post": [0, 0.15, 0.4], + "lerp_mode": "catmullrom" + }, + "1.65": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + } } }, "Righthand": { @@ -319,13 +351,16 @@ }, "sound_effects": { "0.0": { - "effect": "ntw_20_bolt" + "effect": "reload_1p_m200_boltback_wave000.mp3" + }, + "0.95": { + "effect": "reload_1p_m200_boltforward_wave000.mp3" } } }, - "animation.ntw_20.reload_empty": { + "animation.ntw_20.reload_normal": { "loop": "hold_on_last_frame", - "animation_length": 4.65, + "animation_length": 4.25, "override_previous_animation": true, "bones": { "0": { @@ -335,110 +370,110 @@ "lerp_mode": "catmullrom" }, "0.125": { - "post": [1.45985, 0.07591, 0.58601], + "post": [1.51, -0.48, 0.51], "lerp_mode": "catmullrom" }, - "0.2": { - "post": [0.76, 0.1, 2.85], + "0.25": { + "post": [-10.48, -1.4, 1.05], "lerp_mode": "catmullrom" }, - "0.45": { - "post": [-3, 0, -8.3], + "0.425": { + "post": [-45.55, 4.39, 1.29], "lerp_mode": "catmullrom" }, - "0.55": { - "post": [-3.67, -1.54, -3.26], + "0.575": { + "post": [-49.62, 12.99, -10.95], "lerp_mode": "catmullrom" }, - "0.625": { - "post": [-3.84661, -2.60404, 1.73436], + "0.7": { + "post": [-47.5, 9.7, -15.6], "lerp_mode": "catmullrom" }, - "0.675": { - "post": [-4.72544, -2.63823, 3.9162], + "0.85": { + "post": [-49.25425, 9.08299, -16.34666], "lerp_mode": "catmullrom" }, - "0.75": { - "post": [-3.42948, -3.73885, -3.93509], + "1.075": { + "post": [-49.4449, 7.56553, -17.66338], "lerp_mode": "catmullrom" }, - "0.95": { - "post": [-0.86867, -1.50277, 1.02136], + "1.2": { + "post": [-49.45406, 11.84662, -15.6082], "lerp_mode": "catmullrom" }, - "1.125": { - "post": [-0.65, -1.54, -1.32], + "1.25": { + "post": [-47.08025, 18.127, -11.57219], "lerp_mode": "catmullrom" }, - "1.3": { - "post": [-0.93407, -1.7999, -4.26302], + "1.325": { + "post": [-48.67686, 11.44465, -16.51193], "lerp_mode": "catmullrom" }, - "1.85": { - "post": [-2.33, -1.37, -3.56], + "1.45": { + "post": [-48.23321, 13.6902, -15.77359], + "lerp_mode": "catmullrom" + }, + "1.6": { + "post": [-49.03, 12.14, -16.57], + "lerp_mode": "catmullrom" + }, + "1.925": { + "post": [-48.80147, 14.24027, -15.66476], "lerp_mode": "catmullrom" }, "2.175": { - "post": [-1.33436, -1.26755, -4.1911], + "post": [-49.84886, 11.81151, -20.89307], "lerp_mode": "catmullrom" }, - "2.275": { - "post": [-2.10785, -2.69687, -8.59674], - "lerp_mode": "catmullrom" - }, - "2.375": { - "post": [-1.33436, -1.26755, -5.0411], + "2.4": { + "post": [-50.15063, 11.68826, -22.33202], "lerp_mode": "catmullrom" }, "2.5": { - "post": [0.32, -1.4, 3.28], + "post": [-49.99646, 11.04645, -21.54981], "lerp_mode": "catmullrom" }, "2.575": { - "post": [-1.34, -0.325, -3.96], + "post": [-49.86632, 11.81173, -20.89309], "lerp_mode": "catmullrom" }, - "2.925": { - "post": [-0.71419, -0.44934, -0.93155], + "2.6": { + "post": [-48.95251, 14.72674, -18.20031], "lerp_mode": "catmullrom" }, - "3.075": { - "post": [-2.92021, -0.68057, 1.14234], + "2.65": { + "post": [-49.32845, 7.80826, -20.98774], "lerp_mode": "catmullrom" }, - "3.175": { - "post": [-2.99997, 0.01308, 9.49966], + "2.75": { + "post": [-49.43694, 8.45927, -15.15453], "lerp_mode": "catmullrom" }, - "3.275": { - "post": [1.25922, -0.52278, -0.33882], + "2.9": { + "post": [-43.26667, 10.40283, -18.32126], "lerp_mode": "catmullrom" }, - "3.425": { - "post": [-0.47, -0.46, 0.91], + "3.375": { + "post": [-24.78, -1.4, 1.05], "lerp_mode": "catmullrom" }, - "3.575": { - "post": [-0.39012, 1.90096, 3.496], + "3.5": { + "post": [-3.44, -1.53, 2.31], "lerp_mode": "catmullrom" }, - "3.675": { - "post": [-0.39388, -1.66182, 4.75109], + "3.625": { + "post": [3.05, -0.33, 2.23], "lerp_mode": "catmullrom" }, - "4.025": { - "post": [-0.27863, -2.07156, 5.7563], + "3.775": { + "post": [0.25, -0.73, -0.96], "lerp_mode": "catmullrom" }, - "4.125": { - "post": [4, 0, -1.4], + "3.9": { + "post": [-0.69, -0.13, 0.52], "lerp_mode": "catmullrom" }, - "4.375": { - "post": [0.49, 0, 0], - "lerp_mode": "catmullrom" - }, - "4.425": { + "4.05": { "post": [0, 0, 0], "lerp_mode": "catmullrom" } @@ -448,256 +483,932 @@ "post": [0, 0, 0], "lerp_mode": "catmullrom" }, - "0.125": { - "post": [0, 0, -0.29], + "0.075": { + "post": [0, -0.85, -0.17], "lerp_mode": "catmullrom" }, - "0.225": { - "post": [-0.1, 0.7, 0.5], + "0.2": { + "post": [0, -0.24, 0.04], "lerp_mode": "catmullrom" }, - "0.525": { - "post": [0.1, 0.2, 0.4], + "0.275": { + "post": [0, -0.55, 0.95], "lerp_mode": "catmullrom" }, - "0.625": { - "post": [-0.3, 0.2, 0.85], + "0.475": { + "post": [0, -7.39, 2.03], "lerp_mode": "catmullrom" }, - "0.675": { - "post": [1.1, -0.02, 0.81], + "0.7": { + "post": [0, -7.2, -0.45], "lerp_mode": "catmullrom" }, - "0.8": { - "post": [0.33, 0.04, 0.73], + "1.075": { + "post": [-0.31435, -6.97639, -0.67623], "lerp_mode": "catmullrom" }, - "1.05": { - "post": [0.38, 0.07, 0.68], + "1.2": { + "post": [-0.26262, -6.9661, -0.68789], "lerp_mode": "catmullrom" }, - "1.575": { - "post": [0.39, 0.06, 0.7], + "1.25": { + "post": [0.45075, -6.8927, -0.90779], "lerp_mode": "catmullrom" }, - "1.95": { - "post": [0.42, 0.39, 0.67], + "1.325": { + "post": [-0.29113, -7.00594, -0.58332], "lerp_mode": "catmullrom" }, - "2.1": { - "post": [0.72, 0.47, 0.63], + "1.4": { + "post": [0.03, -6.96, -0.64], "lerp_mode": "catmullrom" }, - "2.175": { - "post": [0.31, 0.23, 0.37], + "1.45": { + "post": [-0.11293, -6.91836, -0.69834], + "lerp_mode": "catmullrom" + }, + "1.6": { + "post": [0.09, -7.02, -0.9], + "lerp_mode": "catmullrom" + }, + "1.925": { + "post": [-0.02738, -6.99619, -0.94831], "lerp_mode": "catmullrom" }, "2.35": { - "post": [0.32, 0.34, 0.37], + "post": [0.35068, -6.79777, -1.06632], "lerp_mode": "catmullrom" }, - "2.425": { - "post": [-0.34, 0.53, 0.37], + "2.4": { + "post": [0.3253, -6.85165, -1.0285], "lerp_mode": "catmullrom" }, - "2.475": { - "post": [-0.39, 0.22, 0.03], + "2.5": { + "post": [-0.13999, -6.92478, -1.0276], "lerp_mode": "catmullrom" }, "2.575": { - "post": [0.1, 0.21, -0.3], + "post": [-0.25713, -7.00744, -0.96971], "lerp_mode": "catmullrom" }, - "2.875": { - "post": [0, -0.63359, 0], + "2.6": { + "post": [-1.59293, -7.36386, -0.96167], + "lerp_mode": "catmullrom" + }, + "2.65": { + "post": [0.22385, -6.52222, -1.31902], + "lerp_mode": "catmullrom" + }, + "2.7": { + "post": [-0.07476, -6.57403, -1.5897], + "lerp_mode": "catmullrom" + }, + "2.775": { + "post": [-0.05, -6.69, -1.55], + "lerp_mode": "catmullrom" + }, + "2.975": { + "post": [-0.4, -6.38, -1.2], "lerp_mode": "catmullrom" }, "3.075": { - "post": [0, -0.63, 0], + "post": [-0.22, -6.64, -0.52], "lerp_mode": "catmullrom" }, "3.175": { - "post": [0, -0.39562, 0], + "post": [0, -4.14, 0.23], "lerp_mode": "catmullrom" }, - "3.375": { - "post": [0, -0.86484, 1], + "3.3": { + "post": [0.03, -3.89, 1.12], + "lerp_mode": "catmullrom" + }, + "3.475": { + "post": [0.03, -2.61, -0.53], "lerp_mode": "catmullrom" }, "3.625": { - "post": [0, -0.69, 0.5], + "post": [0.02, -0.25, -0.97], "lerp_mode": "catmullrom" }, - "3.825": { - "post": [0, -0.69, -0.9], + "3.75": { + "post": [0.01, -0.44, 0.52], "lerp_mode": "catmullrom" }, - "3.925": { - "post": [0, -0.52, -0.55], + "3.875": { + "post": [0.01, -0.09, -0.58], "lerp_mode": "catmullrom" }, - "4.025": { - "post": [0.08, -0.39, 0.41], + "3.95": { + "post": [0.01, -0.15, -0.03], "lerp_mode": "catmullrom" }, - "4.175": { - "post": [0.2, -0.2, -0.6], - "lerp_mode": "catmullrom" - }, - "4.275": { - "post": [0.14, -0.14, 0.15], - "lerp_mode": "catmullrom" - }, - "4.375": { - "post": [0.04, 0.15993, -0.05522], - "lerp_mode": "catmullrom" - }, - "4.475": { + "4.05": { "post": [0, 0, 0], "lerp_mode": "catmullrom" } } }, - "bolt": { - "rotation": { - "2.95": [0, 0, 0], - "3.1": [0, 0, 40], - "3.15": [0, 0, 40], - "3.9": [0, 0, 40], - "4.0": [0, 0, 40], - "4.1": [0, 0, 0] - }, - "position": { - "3.1": [0, 0, 0], - "3.15": [0, 0, 0], - "3.45": [0, 0, 8.8], - "3.65": [0, 0, 8.8], - "3.9": [0, 0, 0], - "4.0": [0, 0, 0] - } - }, "magazine": { "rotation": { "0.0": [0, 0, 0], - "0.55": [0, 0, 0], - "0.625": [0, 0, 0], - "0.675": [1.21283, -1.10507, 9.90356], - "0.9": [14.12813, -8.39708, -29.34165], - "0.95": [-0.34226, -16.38792, 51.75], - "1.775": [-0.34226, -16.38792, 51.75], - "2.025": [-0.33, -9.48, -0.33], - "2.1": [-1.79757, -1.34253, 13.28698], - "2.2": [-0.8, -2.72, 1.65], - "2.3": [-0.17367, 0.9985, -6.93784], - "2.375": [0, 7, 1.8], - "2.475": [0, 0, 0] + "1.1": [0, 0, 0], + "1.175": [0, -8, 0], + "1.25": [0, -13, 0], + "1.3": [-7.74115, -10.84001, 40.23084], + "1.5": [-13.60305, -3.7475, 91.30352], + "2.025": [-13.60305, -3.7475, 91.30352], + "2.2": [-7.74115, -10.84001, 40.23084], + "2.35": [0, -13, 0], + "2.4": [0, -7.67, 0], + "2.475": [0, 0, 0], + "2.55": [0, -3.67, 0], + "2.6": [0, 0, 0], + "2.675": [0, 0, 0] }, "position": { "0.0": [0, 0, 0], - "0.55": [0, 0, 0], - "0.625": [2.3, 0, 0], - "0.675": [2.9, -0.7, -0.8], - "0.8": [9.97, -0.11, 1.37], - "0.9": [17.03, -1.58, 3.55], - "0.95": [17.03, -16.53, 3.55], - "1.775": [17.03, -7.13, 3.55], - "1.925": [8.31, -0.31, -0.48], - "2.025": [2.5, 0, 0], - "2.1": [3.04, 0.07969, -0.1], - "2.2": [2.62, 0, -0.35], - "2.275": [2.5, 0, 0], - "2.375": [1.4, 0, 0], - "2.475": [0, 0, 0] - } - }, - "bullet": { - "position": { - "0.2": [0, 0, 0], - "0.225": [2, 0, 0], - "1.0": [2, 0, 0], - "1.025": [0, 0, 0] - } - }, - "camera": { - "rotation": { - "0.0": [0, 0, 0], - "0.1": [0.6, 0.25, -1.05], - "0.25": [-1, -0.5, 1], - "0.45": [1.69, 0, 0], - "0.625": [3, 0, 1.5], - "0.675": [4, 1, -2], - "0.8": [1, -0.5, 1.5], - "0.925": [2.5, 0, -0.65], - "1.225": [3.5, 0, 0.2], - "1.6": [2.89, 0, -0.18], - "1.875": [3.34, 0, 1.5], - "2.325": [2.5, 0, 2.2], - "2.4": [4.5, -0.7, 1.2], - "2.45": [2.6, 0.4, -1.5], - "2.55": [2, 0, 1.5], - "3.1": [0.03, 0.25, -1.18], - "3.225": [0, 0, -2], - "3.325": [0.2, 0, 0], - "3.45": [1, 2, 1.8], - "3.55": [-0.5, -1, -0.5], - "3.65": [0.2, 1.5, 3], - "3.9": [1, 0.5, -0.5], - "3.975": [1, -1, 1.5], - "4.075": [0, 0.5, -0.75], - "4.175": [0, 0, 0.4], - "4.325": [0, 0, 0] + "1.1": [0, 0, 0], + "1.175": [0.35, 0, -0.35], + "1.25": [2.9, 0, -0.25], + "1.3": [6.36, -0.82, 0.36], + "1.375": [8.67, -4.76, 4.9], + "1.5": [12.51, -11.32, 18.84], + "2.025": [12.51, -11.32, 18.84], + "2.2": [6.36, -0.82, -0.24], + "2.35": [2.9, 0, -0.25], + "2.4": [2.68, 0, -0.12], + "2.475": [1.35, 0, 0.05], + "2.55": [1.13, 0, -0.11], + "2.6": [0, 0, 0], + "2.675": [0, 0, 0] } }, "Lefthand": { "rotation": { "0.0": [0, 0, 0], - "0.1": [0, 0, 0], - "0.3": [87.48629, 58.60541, -93.25248], - "0.475": [45.91179, 109.88515, -174.8484], - "2.575": [45.91179, 109.88515, -174.8484], - "2.7": [87.48629, 58.60541, -93.25248], - "2.825": [35.71979, 31.96659, -50.86499], - "2.975": [0, 0, 0] + "0.775": [0, 0, 0], + "1.025": [28.9544, 33.55595, -127.80752], + "1.7": [28.9544, 33.55595, -127.80752], + "1.725": [18.21432, 34.54822, -81.61852], + "2.725": [18.21432, 34.54822, -81.61852], + "2.85": [48.59321, 17.66419, -20.25727], + "3.0": [0, 0, 0] }, "position": { "0.0": [0, 0, 0], - "0.1": [0, 0, 0], - "0.3": [9, 3.33, 12.55], - "0.475": [5.1, 6.15, 10.05], - "2.575": [5.1, 6.15, 10.05], - "2.7": [9, 3.33, 12.55], - "2.825": [4.91, -1.13, 6.85], - "2.975": [0, 0, 0] + "0.775": [0, 0, 0], + "0.9": [6.55, -0.96, 3.35], + "1.025": [6.7, 6.68, 1.5], + "1.7": [6.7, 6.68, 1.5], + "1.725": [6.35, 6.08, 2.25], + "2.725": [6.35, 6.08, 2.25], + "2.85": [9.95, 2.58, 3.55], + "3.0": [0, 0, 0] } }, "Righthand": { "rotation": { - "2.7": [0, 0, 0], - "2.8": [0, 0, 0], - "2.95": [17.08352, 12.70021, -29.3767], - "3.1": [22.5, 0, -10], - "3.15": [22.5, 0, -10], - "3.45": [22.5, 0, -10], - "3.65": [22.5, 0, -10], - "3.9": [22.5, 0, -10], - "4.0": [22.5, 0, -10], - "4.1": [17.08352, 12.70021, -29.3767], - "4.25": [0, 0, 0], - "4.3": [0, 0, 0] + "0.0": [0, 0, 0], + "0.125": [0, 0, 0], + "0.45": [8.23055, -1.0914, 28.61406], + "0.65": [16.19559, -17.06908, 82.98305], + "0.7": [16.19559, -17.06908, 82.98305], + "0.775": [16.19559, -17.06908, 82.98305], + "3.125": [16.19559, -17.06908, 82.98305], + "3.175": [15.08737, -21.59058, 73.9086], + "3.25": [10.86127, -34.39011, 71.54993], + "3.4": [0, 0, 0] }, "position": { - "2.7": [0, 0, 0], - "2.8": [0, 0, 0], - "2.95": [-4.5, 4, -0.5], - "3.1": [-5.25, 7.75, -0.5], - "3.15": [-5.25, 7.75, -0.5], - "3.45": [-5.25, 7.75, 8.3], - "3.65": [-5.25, 7.75, 8.3], - "3.9": [-5.25, 7.75, -0.5], - "4.0": [-5.25, 7.75, -0.5], - "4.1": [-4.5, 4, -0.5], - "4.25": [0, 0, 0], - "4.3": [0, 0, 0] + "0.0": [0, 0, 0], + "0.125": [0, 0, 0], + "0.3": [-3.45, 2.9, -0.55], + "0.45": [-4.94, 7.89, -6.08], + "0.65": [1, 14.55, -13.45], + "0.7": [1, 14.55, -13.45], + "0.775": [1.45, 13.35, -10.55], + "3.125": [1.45, 13.35, -10.55], + "3.175": [-0.66624, 13.43184, -7.29853], + "3.25": [-2.91612, 9.74899, -3.24601], + "3.4": [0, 0, 0] + } + }, + "handle": { + "rotation": { + "0.0": [0, 0, 0], + "0.125": [11, 0, 0], + "0.4": [-29.33, 0, 0], + "0.5": [-14, 0, 0], + "0.65": [-14, 0, 0], + "0.7": [-14, 0, 0], + "0.775": [-40, 0, 0], + "3.075": [-40, 0, 0], + "3.175": [10, 0, 0], + "3.325": [0, 0, 0] + } + }, + "camera": { + "rotation": { + "0.0": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.225": { + "post": [0.05, -0.5, 0.65], + "lerp_mode": "catmullrom" + }, + "0.525": { + "post": [9.6, 1, -0.5], + "lerp_mode": "catmullrom" + }, + "0.8": { + "post": [10.06, 0, 0.09], + "lerp_mode": "catmullrom" + }, + "1.05": { + "post": [9.9, 0.55, -0.24], + "lerp_mode": "catmullrom" + }, + "1.2": { + "post": [9.9, 0.4, -0.41], + "lerp_mode": "catmullrom" + }, + "1.3": { + "post": [9.92, -2.46, 2.66], + "lerp_mode": "catmullrom" + }, + "1.375": { + "post": [9.94, 0.88, -2.6], + "lerp_mode": "catmullrom" + }, + "1.525": { + "post": [9.97, -0.18, 0.91], + "lerp_mode": "catmullrom" + }, + "1.7": { + "post": [9.99, -0.04, 0.03], + "lerp_mode": "catmullrom" + }, + "2.25": { + "post": [12.53, 0.52, -0.05], + "lerp_mode": "catmullrom" + }, + "2.475": { + "post": [12.27, -0.31, -0.04], + "lerp_mode": "catmullrom" + }, + "2.625": { + "post": [12.4, 2.53, 3.11], + "lerp_mode": "catmullrom" + }, + "2.7": { + "post": [12.43, -0.93, -1.68], + "lerp_mode": "catmullrom" + }, + "2.85": { + "post": [11.94, 0.23, 0.71], + "lerp_mode": "catmullrom" + }, + "3.0": { + "post": [11.19, -0.5, 0.14], + "lerp_mode": "catmullrom" + }, + "3.175": { + "post": [11.17, -0.15, 0.02], + "lerp_mode": "catmullrom" + }, + "3.25": { + "post": [10.75, 0.45, 0], + "lerp_mode": "catmullrom" + }, + "3.375": { + "post": [8.41, -0.39, 0.45], + "lerp_mode": "catmullrom" + }, + "3.525": { + "post": [2.22, 0.26, -0.35], + "lerp_mode": "catmullrom" + }, + "3.675": { + "post": [0.67, 0.35, 0.95], + "lerp_mode": "catmullrom" + }, + "3.8": { + "post": [0.36, -0.54, -0.72], + "lerp_mode": "catmullrom" + }, + "3.9": { + "post": [0.2, 0.41, 0.4], + "lerp_mode": "catmullrom" + }, + "4.05": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + } + } + } + } + }, + "animation.ntw_20.reload_empty": { + "loop": "hold_on_last_frame", + "animation_length": 5.65, + "override_previous_animation": true, + "bones": { + "0": { + "rotation": { + "0.0": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.125": { + "post": [1.51, -0.48, 0.51], + "lerp_mode": "catmullrom" + }, + "0.25": { + "post": [-10.48, -1.4, 1.05], + "lerp_mode": "catmullrom" + }, + "0.425": { + "post": [-45.55, 4.39, 1.29], + "lerp_mode": "catmullrom" + }, + "0.575": { + "post": [-49.62, 12.99, -10.95], + "lerp_mode": "catmullrom" + }, + "0.7": { + "post": [-47.5, 9.7, -15.6], + "lerp_mode": "catmullrom" + }, + "0.85": { + "post": [-49.25425, 9.08299, -16.34666], + "lerp_mode": "catmullrom" + }, + "1.075": { + "post": [-49.4449, 7.56553, -17.66338], + "lerp_mode": "catmullrom" + }, + "1.2": { + "post": [-49.45406, 11.84662, -15.6082], + "lerp_mode": "catmullrom" + }, + "1.25": { + "post": [-47.08025, 18.127, -11.57219], + "lerp_mode": "catmullrom" + }, + "1.325": { + "post": [-48.67686, 11.44465, -16.51193], + "lerp_mode": "catmullrom" + }, + "1.45": { + "post": [-48.23321, 13.6902, -15.77359], + "lerp_mode": "catmullrom" + }, + "1.6": { + "post": [-49.03, 12.14, -16.57], + "lerp_mode": "catmullrom" + }, + "1.925": { + "post": [-48.80147, 14.24027, -15.66476], + "lerp_mode": "catmullrom" + }, + "2.175": { + "post": [-49.84886, 11.81151, -20.89307], + "lerp_mode": "catmullrom" + }, + "2.4": { + "post": [-50.15063, 11.68826, -22.33202], + "lerp_mode": "catmullrom" + }, + "2.5": { + "post": [-49.99646, 11.04645, -21.54981], + "lerp_mode": "catmullrom" + }, + "2.575": { + "post": [-49.86632, 11.81173, -20.89309], + "lerp_mode": "catmullrom" + }, + "2.6": { + "post": [-48.95251, 14.72674, -18.20031], + "lerp_mode": "catmullrom" + }, + "2.65": { + "post": [-49.32845, 7.80826, -20.98774], + "lerp_mode": "catmullrom" + }, + "2.75": { + "post": [-49.43694, 8.45927, -15.15453], + "lerp_mode": "catmullrom" + }, + "2.9": { + "post": [-43.26667, 10.40283, -18.32126], + "lerp_mode": "catmullrom" + }, + "3.375": { + "post": [-24.78, -1.4, 1.05], + "lerp_mode": "catmullrom" + }, + "3.5": { + "post": [-3.44, -1.53, 2.31], + "lerp_mode": "catmullrom" + }, + "3.625": { + "post": [3.05, -0.33, 2.23], + "lerp_mode": "catmullrom" + }, + "3.775": { + "post": [0.74836, -0.51512, 6.25347], + "lerp_mode": "catmullrom" + }, + "4.0": { + "post": [-2.92021, -0.68057, 1.14234], + "lerp_mode": "catmullrom" + }, + "4.05": { + "post": [-2.99997, 0.01308, 9.49966], + "lerp_mode": "catmullrom" + }, + "4.15": { + "post": [1.25922, -0.52278, 3.26118], + "lerp_mode": "catmullrom" + }, + "4.3": { + "post": [-0.47, -0.46, 4.26], + "lerp_mode": "catmullrom" + }, + "4.45": { + "post": [-0.39012, -1.19904, 3.496], + "lerp_mode": "catmullrom" + }, + "4.55": { + "post": [-0.39388, -0.71182, 4.75109], + "lerp_mode": "catmullrom" + }, + "4.9": { + "post": [3.05, -0.33, 2.23], + "lerp_mode": "catmullrom" + }, + "5.05": { + "post": [0.25, -0.73, -0.96], + "lerp_mode": "catmullrom" + }, + "5.175": { + "post": [-0.69, -0.13, 0.52], + "lerp_mode": "catmullrom" + }, + "5.325": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.075": { + "post": [0, -0.85, -0.17], + "lerp_mode": "catmullrom" + }, + "0.2": { + "post": [0, -0.24, 0.04], + "lerp_mode": "catmullrom" + }, + "0.275": { + "post": [0, -0.55, 0.95], + "lerp_mode": "catmullrom" + }, + "0.475": { + "post": [0, -7.39, 2.03], + "lerp_mode": "catmullrom" + }, + "0.7": { + "post": [0, -7.2, -0.45], + "lerp_mode": "catmullrom" + }, + "1.075": { + "post": [-0.31435, -6.97639, -0.67623], + "lerp_mode": "catmullrom" + }, + "1.2": { + "post": [-0.26262, -6.9661, -0.68789], + "lerp_mode": "catmullrom" + }, + "1.25": { + "post": [0.45075, -6.8927, -0.90779], + "lerp_mode": "catmullrom" + }, + "1.325": { + "post": [-0.29113, -7.00594, -0.58332], + "lerp_mode": "catmullrom" + }, + "1.4": { + "post": [0.03, -6.96, -0.64], + "lerp_mode": "catmullrom" + }, + "1.45": { + "post": [-0.11293, -6.91836, -0.69834], + "lerp_mode": "catmullrom" + }, + "1.6": { + "post": [0.09, -7.02, -0.9], + "lerp_mode": "catmullrom" + }, + "1.925": { + "post": [-0.02738, -6.99619, -0.94831], + "lerp_mode": "catmullrom" + }, + "2.35": { + "post": [0.35068, -6.79777, -1.06632], + "lerp_mode": "catmullrom" + }, + "2.4": { + "post": [0.3253, -6.85165, -1.0285], + "lerp_mode": "catmullrom" + }, + "2.5": { + "post": [-0.13999, -6.92478, -1.0276], + "lerp_mode": "catmullrom" + }, + "2.575": { + "post": [-0.25713, -7.00744, -0.96971], + "lerp_mode": "catmullrom" + }, + "2.6": { + "post": [-1.59293, -7.36386, -0.96167], + "lerp_mode": "catmullrom" + }, + "2.65": { + "post": [0.22385, -6.52222, -1.31902], + "lerp_mode": "catmullrom" + }, + "2.7": { + "post": [-0.07476, -6.57403, -1.5897], + "lerp_mode": "catmullrom" + }, + "2.775": { + "post": [-0.05, -6.69, -1.55], + "lerp_mode": "catmullrom" + }, + "2.975": { + "post": [-0.4, -6.38, -1.2], + "lerp_mode": "catmullrom" + }, + "3.075": { + "post": [-0.22, -6.64, -0.52], + "lerp_mode": "catmullrom" + }, + "3.175": { + "post": [0, -4.14, 0.23], + "lerp_mode": "catmullrom" + }, + "3.3": { + "post": [0.03, -3.89, 1.12], + "lerp_mode": "catmullrom" + }, + "3.475": { + "post": [0.03, -2.61, -0.53], + "lerp_mode": "catmullrom" + }, + "3.625": { + "post": [0.02, -0.25, -0.97], + "lerp_mode": "catmullrom" + }, + "3.95": { + "post": [0, -0.63, -0.5], + "lerp_mode": "catmullrom" + }, + "4.05": { + "post": [0, -0.39562, -0.5], + "lerp_mode": "catmullrom" + }, + "4.2": { + "post": [0, -0.63, -0.17], + "lerp_mode": "catmullrom" + }, + "4.25": { + "post": [0, -0.86484, 0.65], + "lerp_mode": "catmullrom" + }, + "4.5": { + "post": [0, -0.69, -0.15], + "lerp_mode": "catmullrom" + }, + "4.7": { + "post": [0, -0.69, 0.05], + "lerp_mode": "catmullrom" + }, + "4.8": { + "post": [0, -0.52, -0.55], + "lerp_mode": "catmullrom" + }, + "4.9": { + "post": [0.02, -0.25, -0.97], + "lerp_mode": "catmullrom" + }, + "5.025": { + "post": [0.01, -0.44, 0.72], + "lerp_mode": "catmullrom" + }, + "5.15": { + "post": [0.01, -0.09, 0.32], + "lerp_mode": "catmullrom" + }, + "5.225": { + "post": [0.01, -0.15, -0.03], + "lerp_mode": "catmullrom" + }, + "5.325": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + } + } + }, + "magazine": { + "rotation": { + "0.0": [0, 0, 0], + "1.1": [0, 0, 0], + "1.175": [0, -8, 0], + "1.25": [0, -13, 0], + "1.3": [-7.74115, -10.84001, 40.23084], + "1.5": [-13.60305, -3.7475, 91.30352], + "2.025": [-13.60305, -3.7475, 91.30352], + "2.2": [-7.74115, -10.84001, 40.23084], + "2.35": [0, -13, 0], + "2.4": [0, -7.67, 0], + "2.475": [0, 0, 0], + "2.55": [0, -3.67, 0], + "2.6": [0, 0, 0], + "2.675": [0, 0, 0] + }, + "position": { + "0.0": [0, 0, 0], + "1.1": [0, 0, 0], + "1.175": [0.35, 0, -0.35], + "1.25": [2.9, 0, -0.25], + "1.3": [6.36, -0.82, 0.36], + "1.375": [8.67, -4.76, 4.9], + "1.5": [12.51, -11.32, 18.84], + "2.025": [12.51, -11.32, 18.84], + "2.2": [6.36, -0.82, -0.24], + "2.35": [2.9, 0, -0.25], + "2.4": [2.68, 0, -0.12], + "2.475": [1.35, 0, 0.05], + "2.55": [1.13, 0, -0.11], + "2.6": [0, 0, 0], + "2.675": [0, 0, 0] + } + }, + "Lefthand": { + "rotation": { + "0.0": [0, 0, 0], + "0.775": [0, 0, 0], + "1.025": [28.9544, 33.55595, -127.80752], + "1.7": [28.9544, 33.55595, -127.80752], + "1.725": [18.21432, 34.54822, -81.61852], + "2.725": [18.21432, 34.54822, -81.61852], + "2.85": [48.59321, 17.66419, -20.25727], + "3.0": [0, 0, 0] + }, + "position": { + "0.0": [0, 0, 0], + "0.775": [0, 0, 0], + "0.9": [6.55, -0.96, 3.35], + "1.025": [6.7, 6.68, 1.5], + "1.7": [6.7, 6.68, 1.5], + "1.725": [6.35, 6.08, 2.25], + "2.725": [6.35, 6.08, 2.25], + "2.85": [9.95, 2.58, 3.55], + "3.0": [0, 0, 0] + } + }, + "Righthand": { + "rotation": { + "0.0": [0, 0, 0], + "0.125": [0, 0, 0], + "0.45": [8.23055, -1.0914, 28.61406], + "0.65": [16.19559, -17.06908, 82.98305], + "0.7": [16.19559, -17.06908, 82.98305], + "0.775": [16.19559, -17.06908, 82.98305], + "3.125": [16.19559, -17.06908, 82.98305], + "3.175": [15.08737, -21.59058, 73.9086], + "3.25": [10.86127, -34.39011, 71.54993], + "3.4": [0, 0, 0], + "3.575": [0, 0, 0], + "3.675": [0, 0, 0], + "3.825": [17.08352, 12.70021, -29.3767], + "3.975": [22.5, 0, -10], + "4.025": [22.5, 0, -10], + "4.325": [22.5, 0, -10], + "4.525": [22.5, 0, -10], + "4.775": [22.5, 0, -10], + "4.875": [22.5, 0, -10], + "4.975": [17.08352, 12.70021, -29.3767], + "5.125": [0, 0, 0], + "5.175": [0, 0, 0] + }, + "position": { + "0.0": [0, 0, 0], + "0.125": [0, 0, 0], + "0.3": [-3.45, 2.9, -0.55], + "0.45": [-4.94, 7.89, -6.08], + "0.65": [1, 14.55, -13.45], + "0.7": [1, 14.55, -13.45], + "0.775": [1.45, 13.35, -10.55], + "3.125": [1.45, 13.35, -10.55], + "3.175": [-0.66624, 13.43184, -7.29853], + "3.25": [-2.91612, 9.74899, -3.24601], + "3.4": [0, 0, 0], + "3.575": [0, 0, 0], + "3.675": [0, 0, 0], + "3.825": [-4.5, 4, -0.5], + "3.975": [-5.25, 7.75, -0.5], + "4.025": [-5.25, 7.75, -0.5], + "4.325": [-5.25, 7.75, 8.3], + "4.525": [-5.25, 7.75, 8.3], + "4.775": [-5.25, 7.75, -0.5], + "4.875": [-5.25, 7.75, -0.5], + "4.975": [-4.5, 4, -0.5], + "5.125": [0, 0, 0], + "5.175": [0, 0, 0] + } + }, + "handle": { + "rotation": { + "0.0": [0, 0, 0], + "0.125": [11, 0, 0], + "0.4": [-29.33, 0, 0], + "0.5": [-14, 0, 0], + "0.65": [-14, 0, 0], + "0.7": [-14, 0, 0], + "0.775": [-40, 0, 0], + "3.075": [-40, 0, 0], + "3.175": [10, 0, 0], + "3.325": [0, 0, 0] + } + }, + "bolt": { + "rotation": { + "3.825": [0, 0, 0], + "3.975": [0, 0, 40], + "4.025": [0, 0, 40], + "4.775": [0, 0, 40], + "4.875": [0, 0, 40], + "4.975": [0, 0, 0] + }, + "position": { + "3.575": [0, 0, 0], + "3.975": [0, 0, 0], + "4.025": [0, 0, 0], + "4.325": [0, 0, 8.8], + "4.525": [0, 0, 8.8], + "4.775": [0, 0, 0], + "4.875": [0, 0, 0] + } + }, + "camera": { + "rotation": { + "0.0": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.225": { + "post": [0.05, -0.5, 0.65], + "lerp_mode": "catmullrom" + }, + "0.525": { + "post": [9.6, 1, -0.5], + "lerp_mode": "catmullrom" + }, + "0.8": { + "post": [10.06, 0, 0.09], + "lerp_mode": "catmullrom" + }, + "1.05": { + "post": [9.9, 0.55, -0.24], + "lerp_mode": "catmullrom" + }, + "1.2": { + "post": [9.9, 0.4, -0.41], + "lerp_mode": "catmullrom" + }, + "1.3": { + "post": [9.92, -2.46, 2.66], + "lerp_mode": "catmullrom" + }, + "1.375": { + "post": [9.94, 0.88, -2.6], + "lerp_mode": "catmullrom" + }, + "1.525": { + "post": [9.97, -0.18, 0.91], + "lerp_mode": "catmullrom" + }, + "1.7": { + "post": [9.99, -0.04, 0.03], + "lerp_mode": "catmullrom" + }, + "2.25": { + "post": [12.53, 0.52, -0.05], + "lerp_mode": "catmullrom" + }, + "2.475": { + "post": [12.27, -0.31, -0.04], + "lerp_mode": "catmullrom" + }, + "2.625": { + "post": [12.4, 2.53, 3.11], + "lerp_mode": "catmullrom" + }, + "2.7": { + "post": [12.43, -0.93, -1.68], + "lerp_mode": "catmullrom" + }, + "2.85": { + "post": [11.94, 0.23, 0.71], + "lerp_mode": "catmullrom" + }, + "3.0": { + "post": [11.19, -0.5, 0.14], + "lerp_mode": "catmullrom" + }, + "3.175": { + "post": [11.17, -0.15, 0.02], + "lerp_mode": "catmullrom" + }, + "3.25": { + "post": [10.75, 0.45, 0], + "lerp_mode": "catmullrom" + }, + "3.375": { + "post": [8.41, -0.39, 0.45], + "lerp_mode": "catmullrom" + }, + "3.525": { + "post": [2.22, 0.26, -0.35], + "lerp_mode": "catmullrom" + }, + "3.675": { + "post": [0.67, 0.35, 0.95], + "lerp_mode": "catmullrom" + }, + "3.8": { + "post": [0.36, -0.54, -0.72], + "lerp_mode": "catmullrom" + }, + "3.9": { + "post": [0.2, 0.41, 0.4], + "lerp_mode": "catmullrom" + }, + "4.025": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "4.175": { + "post": [0.03, 0.25, -1.18], + "lerp_mode": "catmullrom" + }, + "4.325": { + "post": [0, 0, -2], + "lerp_mode": "catmullrom" + }, + "4.425": { + "post": [0.2, 0, 1.8], + "lerp_mode": "catmullrom" + }, + "4.525": { + "post": [1, 0.65, -0.95], + "lerp_mode": "catmullrom" + }, + "4.625": { + "post": [-0.5, -0.6, -0.5], + "lerp_mode": "catmullrom" + }, + "4.725": { + "post": [0.2, 1.5, 3], + "lerp_mode": "catmullrom" + }, + "4.975": { + "post": [1, -0.4, -2.35], + "lerp_mode": "catmullrom" + }, + "5.075": { + "post": [1, 0.25, 1.5], + "lerp_mode": "catmullrom" + }, + "5.175": { + "post": [0, -0.3, -0.75], + "lerp_mode": "catmullrom" + }, + "5.225": { + "post": [0, 0.15, 0.4], + "lerp_mode": "catmullrom" + }, + "5.425": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + } } } }, @@ -706,260 +1417,6 @@ "effect": "ntw_20_reload_empty" } } - }, - "animation.ntw_20.reload_normal": { - "loop": "hold_on_last_frame", - "animation_length": 3.2, - "override_previous_animation": true, - "bones": { - "0": { - "rotation": { - "0.0": { - "post": [0, 0, 0], - "lerp_mode": "catmullrom" - }, - "0.125": { - "post": [1.45985, 0.07591, 0.58601], - "lerp_mode": "catmullrom" - }, - "0.2": { - "post": [0.76, 0.1, 2.85], - "lerp_mode": "catmullrom" - }, - "0.45": { - "post": [-3, 0, -8.3], - "lerp_mode": "catmullrom" - }, - "0.55": { - "post": [-3.67, -1.54, -3.26], - "lerp_mode": "catmullrom" - }, - "0.625": { - "post": [-3.84661, -2.60404, 1.73436], - "lerp_mode": "catmullrom" - }, - "0.675": { - "post": [-4.72544, -2.63823, 3.9162], - "lerp_mode": "catmullrom" - }, - "0.75": { - "post": [-3.42948, -3.73885, -3.93509], - "lerp_mode": "catmullrom" - }, - "0.95": { - "post": [-0.86867, -1.50277, 1.02136], - "lerp_mode": "catmullrom" - }, - "1.125": { - "post": [-0.65, -1.54, -1.32], - "lerp_mode": "catmullrom" - }, - "1.3": { - "post": [-0.93407, -1.7999, -4.26302], - "lerp_mode": "catmullrom" - }, - "1.85": { - "post": [-2.33, -1.37, -3.56], - "lerp_mode": "catmullrom" - }, - "2.175": { - "post": [-1.33436, -1.26755, -4.1911], - "lerp_mode": "catmullrom" - }, - "2.275": { - "post": [-2.10785, -2.69687, -8.59674], - "lerp_mode": "catmullrom" - }, - "2.375": { - "post": [-1.33436, -1.26755, -5.0411], - "lerp_mode": "catmullrom" - }, - "2.5": { - "post": [0.32, -1.4, 3.28], - "lerp_mode": "catmullrom" - }, - "2.575": { - "post": [-1.34, -0.325, -3.96], - "lerp_mode": "catmullrom" - }, - "2.725": { - "post": [4, 0, 0], - "lerp_mode": "catmullrom" - }, - "2.95": { - "post": [0.49, 0, 0], - "lerp_mode": "catmullrom" - }, - "3.05": { - "post": [0, 0, 0], - "lerp_mode": "catmullrom" - } - }, - "position": { - "0.0": { - "post": [0, 0, 0], - "lerp_mode": "catmullrom" - }, - "0.125": { - "post": [0, 0, -0.29], - "lerp_mode": "catmullrom" - }, - "0.225": { - "post": [-0.1, 0.7, 0.5], - "lerp_mode": "catmullrom" - }, - "0.525": { - "post": [0.1, 0.2, 0.4], - "lerp_mode": "catmullrom" - }, - "0.625": { - "post": [-0.3, 0.2, 0.85], - "lerp_mode": "catmullrom" - }, - "0.675": { - "post": [1.1, -0.02, 0.81], - "lerp_mode": "catmullrom" - }, - "0.8": { - "post": [0.33, 0.04, 0.73], - "lerp_mode": "catmullrom" - }, - "1.05": { - "post": [0.38, 0.07, 0.68], - "lerp_mode": "catmullrom" - }, - "1.575": { - "post": [0.39, 0.06, 0.7], - "lerp_mode": "catmullrom" - }, - "1.95": { - "post": [0.42, 0.39, 0.67], - "lerp_mode": "catmullrom" - }, - "2.1": { - "post": [0.72, 0.47, 0.63], - "lerp_mode": "catmullrom" - }, - "2.175": { - "post": [0.31, 0.23, 0.37], - "lerp_mode": "catmullrom" - }, - "2.35": { - "post": [0.32, 0.34, 0.37], - "lerp_mode": "catmullrom" - }, - "2.425": { - "post": [-0.34, 0.53, 0.37], - "lerp_mode": "catmullrom" - }, - "2.475": { - "post": [-0.39, 0.22, 0.03], - "lerp_mode": "catmullrom" - }, - "2.575": { - "post": [0.1, 0.21, -0.3], - "lerp_mode": "catmullrom" - }, - "2.75": { - "post": [-0.1, -0.2, -0.3], - "lerp_mode": "catmullrom" - }, - "2.85": { - "post": [0.14, -0.14, 0.25], - "lerp_mode": "catmullrom" - }, - "2.95": { - "post": [-0.01, 0.15993, -0.00522], - "lerp_mode": "catmullrom" - }, - "3.075": { - "post": [0, 0, 0], - "lerp_mode": "catmullrom" - } - } - }, - "magazine": { - "rotation": { - "0.0": [0, 0, 0], - "0.55": [0, 0, 0], - "0.625": [0, 0, 0], - "0.675": [1.21283, -1.10507, 9.90356], - "0.9": [14.12813, -8.39708, -29.34165], - "0.95": [-0.34226, -16.38792, 51.75], - "1.775": [-0.34226, -16.38792, 51.75], - "2.025": [-0.33, -9.48, -0.33], - "2.1": [-1.79757, -1.34253, 13.28698], - "2.2": [-0.8, -2.72, 1.65], - "2.3": [-0.17367, 0.9985, -6.93784], - "2.375": [0, 7, 1.8], - "2.475": [0, 0, 0] - }, - "position": { - "0.0": [0, 0, 0], - "0.55": [0, 0, 0], - "0.625": [2.3, 0, 0], - "0.675": [2.9, -0.7, -0.8], - "0.8": [9.97, -0.11, 1.37], - "0.9": [17.03, -1.58, 3.55], - "0.95": [17.03, -16.53, 3.55], - "1.775": [17.03, -7.13, 3.55], - "1.925": [8.31, -0.31, -0.48], - "2.025": [2.5, 0, 0], - "2.1": [3.04, 0.07969, -0.1], - "2.2": [2.62, 0, -0.35], - "2.275": [2.5, 0, 0], - "2.375": [1.4, 0, 0], - "2.475": [0, 0, 0] - } - }, - "camera": { - "rotation": { - "0.0": [0, 0, 0], - "0.1": [0.6, 0.25, -1.05], - "0.25": [-1, -0.5, 1], - "0.45": [1.69, 0, 0], - "0.625": [3, 0, 1.5], - "0.675": [4, 1, -2], - "0.8": [1, -0.5, 1.5], - "0.925": [2.5, 0, -0.65], - "1.225": [3.5, 0, 0.2], - "1.6": [2.89, 0, -0.18], - "1.875": [3.34, 0, 1.5], - "2.325": [2.5, 0, 2.2], - "2.4": [4.5, -0.7, 1.2], - "2.45": [2.6, 0.4, -1.5], - "2.55": [2, 0, 1.5], - "2.825": [0, 0, 0] - } - }, - "Lefthand": { - "rotation": { - "0.0": [0, 0, 0], - "0.1": [0, 0, 0], - "0.3": [87.48629, 58.60541, -93.25248], - "0.475": [45.91179, 109.88515, -174.8484], - "2.575": [45.91179, 109.88515, -174.8484], - "2.7": [87.48629, 58.60541, -93.25248], - "2.825": [35.71979, 31.96659, -50.86499], - "2.975": [0, 0, 0] - }, - "position": { - "0.0": [0, 0, 0], - "0.1": [0, 0, 0], - "0.3": [9, 3.33, 12.55], - "0.475": [5.1, 6.15, 10.05], - "2.575": [5.1, 6.15, 10.05], - "2.7": [9, 3.33, 12.55], - "2.825": [4.91, -1.13, 6.85], - "2.975": [0, 0, 0] - } - } - }, - "sound_effects": { - "0.0": { - "effect": "ntw_20_reload_normal" - } - } } } } \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/geo/ntw_20.geo.json b/src/main/resources/assets/superbwarfare/geo/ntw_20.geo.json index 2f29b6b04..f563e8342 100644 --- a/src/main/resources/assets/superbwarfare/geo/ntw_20.geo.json +++ b/src/main/resources/assets/superbwarfare/geo/ntw_20.geo.json @@ -2315,114 +2315,6 @@ "down": {"uv": [59, 42.25], "uv_size": [2, -1.25]} } }, - { - "origin": [2.26572, 4.11063, -12.88141], - "size": [0.565, 0.5, 0.565], - "pivot": [2.54822, 4.48563, -12.59891], - "rotation": [0, 0, 90], - "uv": { - "north": {"uv": [71, 32], "uv_size": [0.5, 0.5]}, - "east": {"uv": [33, 71], "uv_size": [0.5, 0.5]}, - "south": {"uv": [71, 33], "uv_size": [0.5, 0.5]}, - "west": {"uv": [34, 71], "uv_size": [0.5, 0.5]} - } - }, - { - "origin": [2.3147, 4.35163, -12.88141], - "size": [0.565, 0.6, 0.565], - "pivot": [2.5972, 4.52663, -12.59891], - "rotation": [0, 0, 45], - "uv": { - "north": {"uv": [71, 34], "uv_size": [0.5, 0.5]}, - "east": {"uv": [35, 71], "uv_size": [0.5, 0.5]}, - "south": {"uv": [71, 35], "uv_size": [0.5, 0.5]}, - "west": {"uv": [71, 36], "uv_size": [0.5, 0.5]} - } - }, - { - "origin": [2.49148, 10.92638, -12.88141], - "size": [0.565, 0.6, 0.565], - "pivot": [2.77398, 11.10138, -12.59891], - "rotation": [0, 0, -45], - "uv": { - "north": {"uv": [71, 37], "uv_size": [0.5, 0.5]}, - "east": {"uv": [38, 71], "uv_size": [0.5, 0.5]}, - "south": {"uv": [39, 71], "uv_size": [0.5, 0.5]}, - "west": {"uv": [40, 71], "uv_size": [0.5, 0.5]} - } - }, - { - "origin": [-0.2825, 8.64377, -12.88141], - "size": [0.565, 5.35078, 0.565], - "pivot": [0, 11.31916, -12.59891], - "rotation": [0, 0, -90], - "uv": { - "north": {"uv": [16, 59], "uv_size": [0.5, 5.25]}, - "east": {"uv": [17, 59], "uv_size": [0.5, 5.25]}, - "south": {"uv": [18, 59], "uv_size": [0.5, 5.25]}, - "west": {"uv": [19, 59], "uv_size": [0.5, 5.25]} - } - }, - { - "origin": [2.53248, 4.62739, -12.88141], - "size": [0.565, 6.55, 0.565], - "pivot": [2.81498, 7.90239, -12.59891], - "rotation": [0, 0, 0], - "uv": { - "north": {"uv": [46, 57], "uv_size": [0.5, 6.5]}, - "east": {"uv": [47, 57], "uv_size": [0.5, 6.5]}, - "south": {"uv": [57, 51], "uv_size": [0.5, 6.5]}, - "west": {"uv": [58, 22], "uv_size": [0.5, 6.5]} - } - }, - { - "origin": [-2.83072, 4.11063, -12.88141], - "size": [0.565, 0.5, 0.565], - "pivot": [-2.54822, 4.48563, -12.59891], - "rotation": [0, 0, -90], - "uv": { - "north": {"uv": [41, 71], "uv_size": [0.5, 0.5]}, - "east": {"uv": [42, 71], "uv_size": [0.5, 0.5]}, - "south": {"uv": [43, 71], "uv_size": [0.5, 0.5]}, - "west": {"uv": [44, 71], "uv_size": [0.5, 0.5]} - } - }, - { - "origin": [-2.8797, 4.35163, -12.88141], - "size": [0.565, 0.6, 0.565], - "pivot": [-2.5972, 4.52663, -12.59891], - "rotation": [0, 0, -45], - "uv": { - "north": {"uv": [45, 71], "uv_size": [0.5, 0.5]}, - "east": {"uv": [71, 45], "uv_size": [0.5, 0.5]}, - "south": {"uv": [46, 71], "uv_size": [0.5, 0.5]}, - "west": {"uv": [71, 46], "uv_size": [0.5, 0.5]} - } - }, - { - "origin": [-3.09748, 4.62739, -12.88141], - "size": [0.565, 6.55, 0.565], - "pivot": [-2.81498, 7.90239, -12.59891], - "rotation": [0, 0, 0], - "uv": { - "north": {"uv": [58, 29], "uv_size": [0.5, 6.5]}, - "east": {"uv": [58, 51], "uv_size": [0.5, 6.5]}, - "south": {"uv": [52, 58], "uv_size": [0.5, 6.5]}, - "west": {"uv": [55, 58], "uv_size": [0.5, 6.5]} - } - }, - { - "origin": [-3.05648, 10.92638, -12.88141], - "size": [0.565, 0.6, 0.565], - "pivot": [-2.77398, 11.10138, -12.59891], - "rotation": [0, 0, 45], - "uv": { - "north": {"uv": [47, 71], "uv_size": [0.5, 0.5]}, - "east": {"uv": [48, 71], "uv_size": [0.5, 0.5]}, - "south": {"uv": [71, 48], "uv_size": [0.5, 0.5]}, - "west": {"uv": [49, 71], "uv_size": [0.5, 0.5]} - } - }, { "origin": [-0.4325, 5.67413, -13.18141], "size": [1.965, 0.13471, 1.165], @@ -2537,6 +2429,121 @@ } ] }, + { + "name": "handle", + "parent": "0", + "pivot": [-2.54822, 4.52563, -12.59891], + "cubes": [ + { + "origin": [2.26572, 4.11063, -12.88141], + "size": [0.565, 0.5, 0.565], + "pivot": [2.54822, 4.48563, -12.59891], + "rotation": [0, 0, 90], + "uv": { + "north": {"uv": [71, 32], "uv_size": [0.5, 0.5]}, + "east": {"uv": [33, 71], "uv_size": [0.5, 0.5]}, + "south": {"uv": [71, 33], "uv_size": [0.5, 0.5]}, + "west": {"uv": [34, 71], "uv_size": [0.5, 0.5]} + } + }, + { + "origin": [2.3147, 4.35163, -12.88141], + "size": [0.565, 0.6, 0.565], + "pivot": [2.5972, 4.52663, -12.59891], + "rotation": [0, 0, 45], + "uv": { + "north": {"uv": [71, 34], "uv_size": [0.5, 0.5]}, + "east": {"uv": [35, 71], "uv_size": [0.5, 0.5]}, + "south": {"uv": [71, 35], "uv_size": [0.5, 0.5]}, + "west": {"uv": [71, 36], "uv_size": [0.5, 0.5]} + } + }, + { + "origin": [2.53248, 4.62739, -12.88141], + "size": [0.565, 6.55, 0.565], + "pivot": [2.81498, 7.90239, -12.59891], + "rotation": [0, 0, 0], + "uv": { + "north": {"uv": [46, 57], "uv_size": [0.5, 6.5]}, + "east": {"uv": [47, 57], "uv_size": [0.5, 6.5]}, + "south": {"uv": [57, 51], "uv_size": [0.5, 6.5]}, + "west": {"uv": [58, 22], "uv_size": [0.5, 6.5]} + } + }, + { + "origin": [2.49148, 10.92638, -12.88141], + "size": [0.565, 0.6, 0.565], + "pivot": [2.77398, 11.10138, -12.59891], + "rotation": [0, 0, -45], + "uv": { + "north": {"uv": [71, 37], "uv_size": [0.5, 0.5]}, + "east": {"uv": [38, 71], "uv_size": [0.5, 0.5]}, + "south": {"uv": [39, 71], "uv_size": [0.5, 0.5]}, + "west": {"uv": [40, 71], "uv_size": [0.5, 0.5]} + } + }, + { + "origin": [-0.2825, 8.64377, -12.88141], + "size": [0.565, 5.35078, 0.565], + "pivot": [0, 11.31916, -12.59891], + "rotation": [0, 0, -90], + "uv": { + "north": {"uv": [16, 59], "uv_size": [0.5, 5.25]}, + "east": {"uv": [17, 59], "uv_size": [0.5, 5.25]}, + "south": {"uv": [18, 59], "uv_size": [0.5, 5.25]}, + "west": {"uv": [19, 59], "uv_size": [0.5, 5.25]} + } + }, + { + "origin": [-3.09748, 4.62739, -12.88141], + "size": [0.565, 6.55, 0.565], + "pivot": [-2.81498, 7.90239, -12.59891], + "rotation": [0, 0, 0], + "uv": { + "north": {"uv": [58, 29], "uv_size": [0.5, 6.5]}, + "east": {"uv": [58, 51], "uv_size": [0.5, 6.5]}, + "south": {"uv": [52, 58], "uv_size": [0.5, 6.5]}, + "west": {"uv": [55, 58], "uv_size": [0.5, 6.5]} + } + }, + { + "origin": [-3.05648, 10.92638, -12.88141], + "size": [0.565, 0.6, 0.565], + "pivot": [-2.77398, 11.10138, -12.59891], + "rotation": [0, 0, 45], + "uv": { + "north": {"uv": [47, 71], "uv_size": [0.5, 0.5]}, + "east": {"uv": [48, 71], "uv_size": [0.5, 0.5]}, + "south": {"uv": [71, 48], "uv_size": [0.5, 0.5]}, + "west": {"uv": [49, 71], "uv_size": [0.5, 0.5]} + } + }, + { + "origin": [-2.8797, 4.35163, -12.88141], + "size": [0.565, 0.6, 0.565], + "pivot": [-2.5972, 4.52663, -12.59891], + "rotation": [0, 0, -45], + "uv": { + "north": {"uv": [45, 71], "uv_size": [0.5, 0.5]}, + "east": {"uv": [71, 45], "uv_size": [0.5, 0.5]}, + "south": {"uv": [46, 71], "uv_size": [0.5, 0.5]}, + "west": {"uv": [71, 46], "uv_size": [0.5, 0.5]} + } + }, + { + "origin": [-2.83072, 4.11063, -12.88141], + "size": [0.565, 0.5, 0.565], + "pivot": [-2.54822, 4.48563, -12.59891], + "rotation": [0, 0, -90], + "uv": { + "north": {"uv": [41, 71], "uv_size": [0.5, 0.5]}, + "east": {"uv": [42, 71], "uv_size": [0.5, 0.5]}, + "south": {"uv": [43, 71], "uv_size": [0.5, 0.5]}, + "west": {"uv": [44, 71], "uv_size": [0.5, 0.5]} + } + } + ] + }, { "name": "body", "parent": "0", diff --git a/src/main/resources/assets/superbwarfare/sounds/ntw_20/ntw_20_bolt.ogg b/src/main/resources/assets/superbwarfare/sounds/ntw_20/ntw_20_bolt.ogg index 5a6d3ff69..3d359bb6b 100644 Binary files a/src/main/resources/assets/superbwarfare/sounds/ntw_20/ntw_20_bolt.ogg and b/src/main/resources/assets/superbwarfare/sounds/ntw_20/ntw_20_bolt.ogg differ diff --git a/src/main/resources/assets/superbwarfare/sounds/ntw_20/ntw_20_reload_empty.ogg b/src/main/resources/assets/superbwarfare/sounds/ntw_20/ntw_20_reload_empty.ogg index 31af739b2..44f07f1d9 100644 Binary files a/src/main/resources/assets/superbwarfare/sounds/ntw_20/ntw_20_reload_empty.ogg and b/src/main/resources/assets/superbwarfare/sounds/ntw_20/ntw_20_reload_empty.ogg differ diff --git a/src/main/resources/assets/superbwarfare/sounds/ntw_20/ntw_20_reload_normal.ogg b/src/main/resources/assets/superbwarfare/sounds/ntw_20/ntw_20_reload_normal.ogg index ca69a63c2..0dc22545f 100644 Binary files a/src/main/resources/assets/superbwarfare/sounds/ntw_20/ntw_20_reload_normal.ogg and b/src/main/resources/assets/superbwarfare/sounds/ntw_20/ntw_20_reload_normal.ogg differ diff --git a/src/main/resources/data/superbwarfare/guns/ntw_20.json b/src/main/resources/data/superbwarfare/guns/ntw_20.json index 64063bb64..1c91dee3d 100644 --- a/src/main/resources/data/superbwarfare/guns/ntw_20.json +++ b/src/main/resources/data/superbwarfare/guns/ntw_20.json @@ -10,8 +10,8 @@ "Magazine": 3, "BoltActionTime": 37, "Weight": 13, - "NormalReloadTime": 63, - "EmptyReloadTime": 92, + "NormalReloadTime": 84, + "EmptyReloadTime": 112, "BypassesArmor": 1, "SoundRadius": 22 } \ No newline at end of file