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 2328bac88..4be34600f 100644 --- a/src/main/resources/assets/superbwarfare/animations/ntw_20.animation.json +++ b/src/main/resources/assets/superbwarfare/animations/ntw_20.animation.json @@ -205,105 +205,80 @@ "easing": "easeOutSine" }, "0.25": { - "vector": [-0.40011, -4.1801, 16.84555], - "easing": "easeInElastic" + "vector": [-2.97528, -0.37174, -0.11535] }, - "0.45": { - "vector": [-0.31044, -4.79856, 9.77775], - "easing": "easeInElastic" + "0.4": { + "vector": [-2.99997, 0.01308, 7.24966] }, - "0.65": { - "vector": [-8.42958, -1.75942, 6.93929], - "easing": "easeInElastic" + "0.6": { + "vector": [1.19769, -0.65153, 7.26011] }, "0.7": { - "vector": [-12.42958, -1.75942, 6.93929], - "easing": "easeInElastic" + "vector": [-0.47, -0.46, -1.74] }, - "0.8": { - "vector": [-3.14165, 0.49667, 13.87691], - "easing": "easeInOutSine" - }, - "0.95": { - "vector": [1.94405, -2.87655, -4.12958], - "easing": "easeInOutSine" + "0.85": { + "vector": [-0.39012, 1.90096, -2.554] }, "1.0": { - "vector": [0.77862, 1.99422, -0.58503] + "vector": [-0.39388, -1.66182, 2.50109] }, - "1.2": { - "vector": [0, 0, 0], - "easing": "easeOutBack" + "1.3": { + "vector": [-0.27863, -2.07156, 3.5063] + }, + "1.4": { + "vector": [4, 0, 0], + "easing": "easeInOutSine" + }, + "1.65": { + "vector": [0.49, 0, 0] + }, + "1.7": { + "vector": [0, 0, 0] } }, "position": { "0.0": { "vector": [0, 0, 0] }, - "0.35": { - "vector": [0.7, 0.45, 0], - "easing": "easeInElastic" - }, - "0.45": { - "vector": [0.85, 0, 0], + "0.25": { + "vector": [0, -0.63359, 0], "easing": "easeOutSine" }, - "0.65": { - "vector": [0.88, 0.8, 1.3], - "easing": "easeInElastic" - }, - "0.7": { - "vector": [0.88, 0.8, 1.3], - "easing": "easeInElastic" - }, - "0.85": { - "vector": [0.41, -0.4, 0.2], - "easing": "easeInOutSine" - }, - "0.95": { - "vector": [0.19, -1.8, -1], - "easing": "easeInOutSine" - }, - "1.1": { - "vector": [-0.02, 0.09, 0.5] - }, - "1.2": { - "vector": [0, 0, 0], - "easing": "easeOutBack" - } - } - }, - "camera": { - "rotation": { - "0.05": { - "vector": [0, 0, 0] - }, - "0.2": { - "vector": [1, 1, -1.5] - }, "0.35": { - "vector": [-0.5, -1, -0.5] + "vector": [0, -0.63, 0] }, - "0.6": { - "vector": [0.2, 1, 3], + "0.45": { + "vector": [0, -0.39562, 0], "easing": "easeInElastic" }, - "0.7": { - "vector": [0.2, 1, 3], - "easing": "easeInElastic" + "0.65": { + "vector": [0, -0.86484, 0], + "easing": "easeOutSine" }, - "0.9": { - "vector": [-0.1, -0.2, -2], + "0.8": { + "vector": [0, -0.69, 1.8], "easing": "easeInElastic" }, "1.0": { - "vector": [0, 0, 1.5] - }, - "1.1": { - "vector": [0, 0, -0.75] + "vector": [0, -0.6, 1.60672] }, "1.2": { - "vector": [0, 0, 0] + "vector": [0, -0.52, -0.55], + "easing": "easeInSine" + }, + "1.45": { + "vector": [0.2, -0.2, -0.3] + }, + "1.55": { + "vector": [0.14, -0.14, 1], + "easing": "easeInSine" + }, + "1.65": { + "vector": [0.04, 0.15993, 0.24478] + }, + "1.75": { + "vector": [0, 0, 0], + "easing": "easeOutSine" } } }, @@ -312,67 +287,80 @@ "0.0": { "vector": [0, 0, 0] }, - "0.2": { - "vector": [1.17928, 19.18922, -51.6579] + "0.1": { + "vector": [-0.48741, 14.28774, -38.99288] }, - "0.35": { - "vector": [-26.2074, 17.38825, -7.65418], + "0.25": { + "vector": [-1.00779, 7.74886, -37.95224], "easing": "easeInSine" }, - "0.55": { - "vector": [-26.2074, 17.38825, -7.65418], - "easing": "easeInElastic" + "0.4": { + "vector": [-11.81393, 13.69942, -19.24875] }, - "0.6": { - "vector": [-26.2074, 17.38825, -7.65418], - "easing": "easeInElastic" + "0.45": { + "vector": [-11.81393, 13.69942, -19.24875] }, - "0.7": { + "0.75": { + "vector": [-11.81393, 13.69942, -19.24875] + }, + "0.95": { "vector": [-11.43633, 62.64422, 48.97487], "easing": "easeInElastic" }, - "0.9": { - "vector": [-11.43633, 62.64422, 48.97487], - "easing": "easeInElastic" - }, - "1.05": { - "vector": [5.04988, 36.75897, 29.94974], - "easing": "easeInElastic" - }, "1.2": { - "vector": [0, 0, 0] + "vector": [-11.43633, 62.64422, 48.97487], + "easing": "easeInElastic" + }, + "1.3": { + "vector": [-11.43633, 62.64422, 48.97487], + "easing": "easeInElastic" + }, + "1.45": { + "vector": [-21.97175, 42.41191, -3.51587], + "easing": "easeInSine" + }, + "1.6": { + "vector": [0, 0, 0], + "easing": "easeOutSine" } }, "position": { "0.0": { "vector": [0, 0, 0] }, - "0.35": { - "vector": [-2.13278, 3.4446, -2.23813], + "0.25": { + "vector": [-2.13278, 2.0446, -0.63813], "easing": "easeInSine" }, - "0.55": { - "vector": [-2.13278, 3.4446, 6.56187], - "easing": "easeInElastic" + "0.4": { + "vector": [-2.30969, 4.59359, -1.1925] }, - "0.6": { - "vector": [-2.13278, 3.4446, 6.56187], - "easing": "easeInElastic" + "0.45": { + "vector": [-2.30969, 4.59359, -1.1925] }, - "0.7": { + "0.75": { + "vector": [-2.30969, 4.59359, 7.6075], + "easing": "easeInQuint" + }, + "0.95": { "vector": [-1.23278, 3.4446, 6.56187], "easing": "easeInElastic" }, - "0.9": { - "vector": [-1.23278, 3.4446, -2.23813], - "easing": "easeInElastic" - }, - "1.1": { - "vector": [0, -0.56, -2.15], - "easing": "easeInElastic" - }, "1.2": { - "vector": [0, 0, 0] + "vector": [-1.23278, 3.4446, -2.23813], + "easing": "easeInCubic" + }, + "1.3": { + "vector": [-1.23278, 3.4446, -2.23813], + "easing": "easeInCubic" + }, + "1.45": { + "vector": [0, -0.56, -2.15], + "easing": "easeInSine" + }, + "1.6": { + "vector": [0, 0, 0], + "easing": "easeOutSine" } } }, @@ -381,265 +369,94 @@ "0.25": { "vector": [0, 0, 0] }, - "0.35": { + "0.4": { "vector": [0, 0, 40], "easing": "easeInSine" }, - "0.9": { - "vector": [0, 0, 40], - "easing": "easeInSine" - }, - "1.0": { - "vector": [0, 0, 0], - "easing": "easeInElastic" - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.35": { - "vector": [0, 0, 0] - }, - "0.55": { - "vector": [0, 0, 8.8], - "easing": "easeInElastic" - }, - "0.7": { - "vector": [0, 0, 8.8], - "easing": "easeInElastic" - }, - "0.9": { - "vector": [0, 0, 0], - "easing": "easeInElastic" - } - } - } - }, - "sound_effects": { - "0.0": { - "effect": "ntw_20_bolt" - } - } - }, - "animation.ntw_20.shift2": { - "loop": "hold_on_last_frame", - "animation_length": 2, - "override_previous_animation": true, - "bones": { - "0": { - "rotation": { - "0.0": { - "vector": [0, 0, 0], - "easing": "easeOutSine" - }, - "0.25": { - "vector": [-0.04001, -0.41801, 1.68455], - "easing": "easeInElastic" - }, "0.45": { - "vector": [-0.03104, -0.47986, 0.97778], - "easing": "easeInElastic" - }, - "0.65": { - "vector": [-0.84296, -0.17594, 0.69393], - "easing": "easeInElastic" - }, - "0.7": { - "vector": [-1.24296, -0.17594, 0.69393], - "easing": "easeInElastic" - }, - "0.8": { - "vector": [-0.31416, 0.04967, 0.58769], - "easing": "easeInOutSine" - }, - "0.95": { - "vector": [0.19441, -0.11765, -0.41296], - "easing": "easeInOutSine" - }, - "1.0": { - "vector": [0.07786, 0.19942, -0.0585] + "vector": [0, 0, 40], + "easing": "easeInSine" }, "1.2": { + "vector": [0, 0, 40], + "easing": "easeInSine" + }, + "1.3": { + "vector": [0, 0, 40], + "easing": "easeInSine" + }, + "1.4": { "vector": [0, 0, 0], - "easing": "easeOutBack" + "easing": "easeInElastic" } }, "position": { "0.0": { "vector": [0, 0, 0] }, - "0.35": { - "vector": [-0.07, 0.045, 0], - "easing": "easeInElastic" + "0.4": { + "vector": [0, 0, 0] }, "0.45": { - "vector": [-0.085, 0, 0], - "easing": "easeOutSine" + "vector": [0, 0, 0] }, - "0.65": { - "vector": [-0.08, 0.2, 1.3], - "easing": "easeInElastic" - }, - "0.7": { - "vector": [-0.08, 0.2, 1.3], - "easing": "easeInElastic" - }, - "0.85": { - "vector": [0.041, -0.04, 0.02], - "easing": "easeInOutSine" + "0.75": { + "vector": [0, 0, 8.8], + "easing": "easeInQuint" }, "0.95": { - "vector": [0.19, -0.2, -1], - "easing": "easeInOutSine" - }, - "1.1": { - "vector": [-0.002, 0.009, 0.05] - }, - "1.2": { - "vector": [0, 0, 0], - "easing": "easeOutBack" - } - } - }, - "Righthand": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.2": { - "vector": [1.17928, 19.18922, -51.6579] - }, - "0.35": { - "vector": [-26.2074, 17.38825, -7.65418], - "easing": "easeInSine" - }, - "0.55": { - "vector": [-26.2074, 17.38825, -7.65418], - "easing": "easeInElastic" - }, - "0.6": { - "vector": [-26.2074, 17.38825, -7.65418], - "easing": "easeInElastic" - }, - "0.7": { - "vector": [-11.43633, 62.64422, 48.97487], - "easing": "easeInElastic" - }, - "0.9": { - "vector": [-11.43633, 62.64422, 48.97487], - "easing": "easeInElastic" - }, - "1.05": { - "vector": [5.04988, 36.75897, 29.94974], - "easing": "easeInElastic" - }, - "1.2": { - "vector": [0, 0, 0] - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.35": { - "vector": [-2.13278, 3.4446, -2.23813], - "easing": "easeInSine" - }, - "0.55": { - "vector": [-2.13278, 3.4446, 6.56187], - "easing": "easeInElastic" - }, - "0.6": { - "vector": [-2.13278, 3.4446, 6.56187], - "easing": "easeInElastic" - }, - "0.7": { - "vector": [-1.23278, 3.4446, 6.56187], - "easing": "easeInElastic" - }, - "0.9": { - "vector": [-1.23278, 3.4446, -2.23813], - "easing": "easeInElastic" - }, - "1.1": { - "vector": [0, -0.56, -2.15], - "easing": "easeInElastic" - }, - "1.2": { - "vector": [0, 0, 0] - } - } - }, - "bolt": { - "rotation": { - "0.25": { - "vector": [0, 0, 0] - }, - "0.35": { - "vector": [0, 0, 40], - "easing": "easeInSine" - }, - "0.9": { - "vector": [0, 0, 40], - "easing": "easeInSine" - }, - "1.0": { - "vector": [0, 0, 0], - "easing": "easeInElastic" - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.35": { - "vector": [0, 0, 0] - }, - "0.55": { "vector": [0, 0, 8.8], "easing": "easeInElastic" }, - "0.7": { - "vector": [0, 0, 8.8], - "easing": "easeInElastic" - }, - "0.9": { + "1.2": { "vector": [0, 0, 0], - "easing": "easeInElastic" + "easing": "easeInCubic" + }, + "1.3": { + "vector": [0, 0, 0], + "easing": "easeInCubic" } } }, "camera": { "rotation": { - "0.05": { + "0.0": { "vector": [0, 0, 0] }, - "0.2": { - "vector": [1, 1, -1.5] + "0.4": { + "vector": [0.03, 0.25, -1.18] }, - "0.35": { + "0.55": { + "vector": [0, 0, -2], + "easing": "easeInElastic" + }, + "0.65": { + "vector": [0.2, 0, 0] + }, + "0.75": { + "vector": [1, 2, 1.8] + }, + "0.85": { "vector": [-0.5, -1, -0.5] }, - "0.6": { - "vector": [0.2, 1, 3], - "easing": "easeInElastic" - }, - "0.7": { - "vector": [0.2, 1, 3], - "easing": "easeInElastic" - }, - "0.9": { - "vector": [-0.1, -0.2, -2], - "easing": "easeInElastic" - }, - "1.0": { - "vector": [0, 0, 1.5] - }, - "1.1": { - "vector": [0, 0, -0.75] + "0.95": { + "vector": [0.2, 1.5, 3] }, "1.2": { + "vector": [1, 0.5, -0.5], + "easing": "easeInElastic" + }, + "1.3": { + "vector": [1, -1, 1.5] + }, + "1.4": { + "vector": [0, 0.5, -0.75] + }, + "1.45": { + "vector": [0, 0, 0.4], + "easing": "linear" + }, + "1.65": { "vector": [0, 0, 0] } } @@ -653,7 +470,7 @@ }, "animation.ntw_20.reload_empty": { "loop": "hold_on_last_frame", - "animation_length": 4.4, + "animation_length": 4.65, "override_previous_animation": true, "bones": { "0": { @@ -665,81 +482,77 @@ "vector": [1.45985, 0.07591, 6.63601] }, "0.45": { - "vector": [-9, 0, -10], + "vector": [-3, 0, -10], "easing": "easeInElastic" }, "0.625": { - "vector": [-11.84661, -2.60404, -3.26564] + "vector": [-3.84661, -2.60404, -3.26564] }, "0.675": { - "vector": [-9.72544, -2.63823, 3.9162] + "vector": [-4.72544, -2.63823, 3.9162] }, "0.75": { - "vector": [-9.42948, -3.73885, -3.53509] + "vector": [-3.42948, -3.73885, -3.53509] }, "0.95": { - "vector": [-9.86867, -3.00277, -1.67864] + "vector": [-0.86867, -3.00277, -1.67864] }, "1.3": { - "vector": [-9.93407, -3.2999, -3.81302] + "vector": [-0.93407, -3.2999, -3.81302] }, "1.85": { - "vector": [-10.33, -2.87, -2.11] + "vector": [-2.33, -2.87, -2.11] }, "2.175": { - "vector": [-20.33436, -0.01755, -11.2911], + "vector": [-1.33436, -0.01755, -11.2911], "easing": "easeInElastic" }, "2.275": { - "vector": [-16.60785, -1.44687, -14.04674] + "vector": [-2.10785, -1.44687, -14.04674] }, "2.375": { - "vector": [-20.33436, -0.01755, -11.2911] + "vector": [-1.33436, -0.01755, -11.2911] }, "2.5": { - "vector": [-18.68, -0.65, -12.52] + "vector": [0.32, -0.65, -12.52] }, "2.575": { - "vector": [-13.34, -0.325, -6.26] - }, - "2.725": { - "vector": [0, 0, 0], - "easing": "easeOutSine" + "vector": [-1.34, -0.325, -6.26] }, "2.875": { "vector": [0.40293, -2.42411, 3], "easing": "linear" }, - "3.0": { - "vector": [-0.40011, -4.1801, 16.84555], - "easing": "easeInElastic" + "2.95": { + "vector": [-2.97528, -0.37174, -0.11535] }, - "3.2": { - "vector": [-0.31044, -4.79856, 9.77775], - "easing": "easeInElastic" + "3.1": { + "vector": [-2.99997, 0.01308, 7.24966] + }, + "3.3": { + "vector": [1.19769, -0.65153, 7.26011] }, "3.4": { - "vector": [-8.42958, -1.75942, 6.93929], - "easing": "easeInElastic" + "vector": [-0.47, -0.46, -1.74] }, - "3.45": { - "vector": [-12.42958, -1.75942, 6.93929], - "easing": "easeInElastic" + "3.55": { + "vector": [-0.39012, 1.90096, -2.554] }, - "3.6": { - "vector": [-3.14165, 0.49667, 13.87691], + "3.7": { + "vector": [-0.39388, -1.66182, 2.50109] + }, + "4.0": { + "vector": [-0.27863, -2.07156, 3.5063] + }, + "4.1": { + "vector": [4, 0, 0], "easing": "easeInOutSine" }, - "3.75": { - "vector": [1.94405, -2.87655, -4.12958], - "easing": "easeInOutSine" + "4.35": { + "vector": [0.49, 0, 0] }, - "3.85": { - "vector": [0.77862, 1.99422, -0.58503] - }, - "4.15": { - "vector": [0, 0, 0], - "easing": "easeOutBack" + "4.4": { + "vector": [0, 0, 0] } }, "position": { @@ -791,43 +604,49 @@ "2.575": { "vector": [-0.65, 0.71, 0.45] }, - "2.675": { - "vector": [0, 0, 0] - }, "2.875": { "vector": [0.53, -0.75, 0], "easing": "linear" }, - "3.1": { - "vector": [0.7, 0.45, 0], - "easing": "easeInElastic" - }, - "3.2": { - "vector": [0.85, 0, 0], + "2.95": { + "vector": [0, -0.63359, 0], "easing": "easeOutSine" }, - "3.4": { - "vector": [0.88, 0.8, 1.3], + "3.05": { + "vector": [0, -0.63, 0] + }, + "3.15": { + "vector": [0, -0.39562, 0], "easing": "easeInElastic" }, - "3.45": { - "vector": [0.88, 0.8, 1.3], + "3.35": { + "vector": [0, -0.86484, 0], + "easing": "easeOutSine" + }, + "3.5": { + "vector": [0, -0.69, 1.8], "easing": "easeInElastic" }, - "3.65": { - "vector": [0.41, -0.4, 0.2], - "easing": "easeInOutSine" + "3.7": { + "vector": [0, -0.6, 1.60672] }, - "3.75": { - "vector": [0.19, -1.8, -1], - "easing": "easeInOutSine" - }, - "3.95": { - "vector": [-0.02, 0.09, 0.5] + "3.9": { + "vector": [0, -0.52, -0.55], + "easing": "easeInSine" }, "4.15": { + "vector": [0.2, -0.2, -0.3] + }, + "4.25": { + "vector": [0.14, -0.14, 1], + "easing": "easeInSine" + }, + "4.35": { + "vector": [0.04, 0.15993, 0.24478] + }, + "4.45": { "vector": [0, 0, 0], - "easing": "easeOutBack" + "easing": "easeOutSine" } } }, @@ -900,114 +719,131 @@ "Righthand": { "rotation": { "2.775": { - "vector": [0, 0, 0] + "vector": [0, 0, 0], + "easing": "easeOutSine" }, - "2.9": { - "vector": [0, 0, 0] - }, - "3.0": { - "vector": [1.17928, 19.18922, -51.6579] - }, - "3.15": { - "vector": [-26.2074, 17.38825, -7.65418], + "2.95": { + "vector": [-1.00779, 7.74886, -37.95224], "easing": "easeInSine" }, - "3.25": { - "vector": [-26.2074, 17.38825, -7.65418], - "easing": "easeInElastic" + "3.1": { + "vector": [-11.81393, 13.69942, -19.24875] }, - "3.3": { - "vector": [-26.2074, 17.38825, -7.65418], - "easing": "easeInElastic" + "3.15": { + "vector": [-11.81393, 13.69942, -19.24875] }, - "3.375": { - "vector": [-11.43633, 62.64422, 48.97487], - "easing": "easeInElastic" - }, - "3.5": { - "vector": [-11.43633, 62.64422, 48.97487], - "easing": "easeInElastic" + "3.45": { + "vector": [-11.81393, 13.69942, -19.24875] }, "3.65": { - "vector": [5.04988, 36.75897, 29.94974], + "vector": [-11.43633, 62.64422, 48.97487], "easing": "easeInElastic" }, - "3.8": { - "vector": [0, 0, 0] + "3.9": { + "vector": [-11.43633, 62.64422, 48.97487], + "easing": "easeInElastic" + }, + "4.0": { + "vector": [-11.43633, 62.64422, 48.97487], + "easing": "easeInElastic" + }, + "4.15": { + "vector": [-21.97175, 42.41191, -3.51587], + "easing": "easeInSine" + }, + "4.3": { + "vector": [0, 0, 0], + "easing": "easeOutSine" } }, "position": { "2.775": { "vector": [0, 0, 0] }, - "2.9": { - "vector": [0, 0, 0] - }, - "3.15": { - "vector": [-2.13278, 3.4446, -2.23813], + "2.95": { + "vector": [-2.13278, 2.0446, -0.63813], "easing": "easeInSine" }, - "3.25": { - "vector": [-2.13278, 3.4446, 6.56187], - "easing": "easeInElastic" + "3.1": { + "vector": [-2.30969, 4.59359, -1.1925] }, - "3.3": { - "vector": [-2.13278, 3.4446, 6.56187], - "easing": "easeInElastic" + "3.15": { + "vector": [-2.30969, 4.59359, -1.1925] }, - "3.375": { + "3.45": { + "vector": [-2.30969, 4.59359, 7.6075], + "easing": "easeInQuint" + }, + "3.65": { "vector": [-1.23278, 3.4446, 6.56187], "easing": "easeInElastic" }, - "3.5": { + "3.9": { "vector": [-1.23278, 3.4446, -2.23813], - "easing": "easeInElastic" + "easing": "easeInCubic" }, - "3.7": { + "4.0": { + "vector": [-1.23278, 3.4446, -2.23813], + "easing": "easeInCubic" + }, + "4.15": { "vector": [0, -0.56, -2.15], - "easing": "easeInElastic" + "easing": "easeInSine" }, - "3.8": { - "vector": [0, 0, 0] + "4.3": { + "vector": [0, 0, 0], + "easing": "easeOutSine" } } }, "bolt": { "rotation": { - "3.05": { + "2.95": { "vector": [0, 0, 0] }, + "3.1": { + "vector": [0, 0, 40], + "easing": "easeInSine" + }, "3.15": { "vector": [0, 0, 40], "easing": "easeInSine" }, - "3.5": { + "3.9": { "vector": [0, 0, 40], "easing": "easeInSine" }, - "3.6": { + "4.0": { + "vector": [0, 0, 40], + "easing": "easeInSine" + }, + "4.1": { "vector": [0, 0, 0], "easing": "easeInElastic" } }, "position": { - "2.775": { + "3.1": { "vector": [0, 0, 0] }, "3.15": { "vector": [0, 0, 0] }, - "3.25": { + "3.45": { + "vector": [0, 0, 8.8], + "easing": "easeInQuint" + }, + "3.65": { "vector": [0, 0, 8.8], "easing": "easeInElastic" }, - "3.375": { - "vector": [0, 0, 8.8], - "easing": "easeInElastic" - }, - "3.5": { + "3.9": { "vector": [0, 0, 0], - "easing": "easeInElastic" + "easing": "easeInCubic" + }, + "4.0": { + "vector": [0, 0, 0], + "easing": "easeInCubic" } } }, @@ -1175,40 +1011,40 @@ "vector": [2, 0, 1.5], "easing": "easeInElastic" }, - "2.8": { + "3.1": { "vector": [0.03, 0.25, -1.18] }, - "2.925": { + "3.225": { "vector": [0, 0, -2], "easing": "easeInElastic" }, - "3.025": { + "3.325": { "vector": [0.2, 0, 0] }, - "3.15": { + "3.45": { "vector": [1, 2, 1.8] }, - "3.2": { - "vector": [-1.5, -3, -1.5] + "3.55": { + "vector": [-0.5, -1, -0.5] }, - "3.325": { + "3.65": { "vector": [0.2, 1.5, 3] }, - "3.45": { - "vector": [2, 3, -2], + "3.9": { + "vector": [1, 0.5, -0.5], "easing": "easeInElastic" }, - "3.525": { + "3.975": { "vector": [1, -1, 1.5] }, - "3.625": { + "4.075": { "vector": [0, 0.5, -0.75] }, - "3.725": { + "4.175": { "vector": [0, 0, 0.4], "easing": "linear" }, - "3.875": { + "4.325": { "vector": [0, 0, 0] } } @@ -1216,7 +1052,7 @@ }, "sound_effects": { "0.0": { - "effect": "sentinel_reload_empty" + "effect": "ntw_20_reload_empty" } } }, @@ -1234,42 +1070,42 @@ "vector": [1.45985, 0.07591, 6.63601] }, "0.45": { - "vector": [-9, 0, -10], + "vector": [-3, 0, -10], "easing": "easeInElastic" }, "0.625": { - "vector": [-11.84661, -2.60404, -3.26564] + "vector": [-3.84661, -2.60404, -3.26564] }, "0.675": { - "vector": [-9.72544, -2.63823, 3.9162] + "vector": [-4.72544, -2.63823, 3.9162] }, "0.75": { - "vector": [-9.42948, -3.73885, -3.53509] + "vector": [-3.42948, -3.73885, -3.53509] }, "0.95": { - "vector": [-9.86867, -3.00277, -1.67864] + "vector": [-0.86867, -3.00277, -1.67864] }, "1.3": { - "vector": [-9.93407, -3.2999, -3.81302] + "vector": [-0.93407, -3.2999, -3.81302] }, "1.85": { - "vector": [-10.33, -2.87, -2.11] + "vector": [-2.33, -2.87, -2.11] }, "2.175": { - "vector": [-20.33436, -0.01755, -11.2911], + "vector": [-1.33436, -0.01755, -11.2911], "easing": "easeInElastic" }, "2.275": { - "vector": [-16.60785, -1.44687, -14.04674] + "vector": [-2.10785, -1.44687, -14.04674] }, "2.375": { - "vector": [-20.33436, -0.01755, -11.2911] + "vector": [-1.33436, -0.01755, -11.2911] }, "2.5": { - "vector": [-18.68, -0.65, -12.52] + "vector": [0.32, -0.65, -12.52] }, "2.575": { - "vector": [-13.34, -0.325, -6.26] + "vector": [-1.34, -0.325, -6.26] }, "2.725": { "vector": [4, 0, 0], @@ -1347,76 +1183,6 @@ } } }, - "camera": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.1": { - "vector": [3, 1, -2] - }, - "0.25": { - "vector": [-1, -0.5, 1] - }, - "0.45": { - "vector": [1.69, 0, 0] - }, - "0.625": { - "vector": [3, 0, 1.5], - "easing": "easeInElastic" - }, - "0.675": { - "vector": [4, 1, -2], - "easing": "easeInSine" - }, - "0.8": { - "vector": [1, -0.5, 1.5] - }, - "0.925": { - "vector": [2.5, 0, 1.2], - "easing": "easeOutSine" - }, - "1.225": { - "vector": [3.5, 0, 2], - "easing": "easeInElastic" - }, - "1.6": { - "vector": [2.89, 0, 0.12] - }, - "1.875": { - "vector": [3.34, 0, 1.5] - }, - "2.325": { - "vector": [2.5, 0, 2.2], - "easing": "linear" - }, - "2.4": { - "vector": [4.5, -0.7, 1.2], - "easing": "easeInSine" - }, - "2.45": { - "vector": [2.6, 0.4, -1.5], - "easing": "easeOutSine" - }, - "2.55": { - "vector": [2, 0, 1.5], - "easing": "easeInElastic" - }, - "2.675": { - "vector": [0.03, 0.25, -1.18] - }, - "2.8": { - "vector": [0, 0, -2], - "easing": "easeInElastic" - }, - "2.9": { - "vector": [0.2, 0, 0] - }, - "3.0": { - "vector": [0, 0, 0] - } - } - }, "Lefthand": { "rotation": { "0.1": { @@ -1575,6 +1341,66 @@ "easing": "easeInElastic" } } + }, + "camera": { + "rotation": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.1": { + "vector": [3, 1, -2] + }, + "0.25": { + "vector": [-1, -0.5, 1] + }, + "0.45": { + "vector": [1.69, 0, 0] + }, + "0.625": { + "vector": [3, 0, 1.5], + "easing": "easeInElastic" + }, + "0.675": { + "vector": [4, 1, -2], + "easing": "easeInSine" + }, + "0.8": { + "vector": [1, -0.5, 1.5] + }, + "0.925": { + "vector": [2.5, 0, 1.2], + "easing": "easeOutSine" + }, + "1.225": { + "vector": [3.5, 0, 2], + "easing": "easeInElastic" + }, + "1.6": { + "vector": [2.89, 0, 0.12] + }, + "1.875": { + "vector": [3.34, 0, 1.5] + }, + "2.325": { + "vector": [2.5, 0, 2.2], + "easing": "linear" + }, + "2.4": { + "vector": [4.5, -0.7, 1.2], + "easing": "easeInSine" + }, + "2.45": { + "vector": [2.6, 0.4, -1.5], + "easing": "easeOutSine" + }, + "2.55": { + "vector": [2, 0, 1.5], + "easing": "easeInElastic" + }, + "2.825": { + "vector": [0, 0, 0] + } + } } }, "sound_effects": { 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 8c0fde844..5a6d3ff69 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 246a747d7..31af739b2 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/data/superbwarfare/guns/ntw_20.json b/src/main/resources/data/superbwarfare/guns/ntw_20.json index 701acaf0a..e87d241d9 100644 --- a/src/main/resources/data/superbwarfare/guns/ntw_20.json +++ b/src/main/resources/data/superbwarfare/guns/ntw_20.json @@ -12,16 +12,16 @@ "velocity": 31, "projectile_amount": 1, "mag": 3, - "bolt_action_time": 30, + "bolt_action_time": 37, "weight": 2, "fire_mode": 0, "semi": 1, "burst": 0, "auto": 0, "burst_size": 1, - "normal_reload_time": 64, - "empty_reload_time": 87, + "normal_reload_time": 63, + "empty_reload_time": 92, "BypassesArmor": 1, "SoundRadius": 22, - "rpm": 180 + "rpm": 90 } \ No newline at end of file