diff --git a/src/main/resources/assets/superbwarfare/animations/k98.animation.json b/src/main/resources/assets/superbwarfare/animations/k98.animation.json index 83acc2335..5c578ddea 100644 --- a/src/main/resources/assets/superbwarfare/animations/k98.animation.json +++ b/src/main/resources/assets/superbwarfare/animations/k98.animation.json @@ -235,28 +235,43 @@ "vector": [0, 0, 0], "easing": "easeInOutSine" }, - "0.3": { - "vector": [-2, 0, -4], + "0.175": { + "vector": [-0.2, 0, -1], "easing": "easeInElastic" }, - "0.4": { - "vector": [-1.92, 0, 19.15], + "0.275": { + "vector": [-0.2584, -0.4688, 5.16075], + "easing": "easeInSine" + }, + "0.35": { + "vector": [-0.1745, -0.1155, 4.6568], "easing": "easeInElastic" }, - "0.5": { - "vector": [-8.92, 0, 4.15], + "0.425": { + "vector": [-0.6993, -0.252, -1.4861], "easing": "easeInElastic" }, + "0.575": { + "vector": [-2.25, -1, 4.82] + }, + "0.625": { + "vector": [-0.25, -0.5, 4.82] + }, "0.7": { - "vector": [-2.25, -4, 4.82] + "vector": [0.53655, 1.56915, 2.11954] }, - "0.8": { - "vector": [1.08, 0, -9.85], - "easing": "linear" + "0.75": { + "vector": [0.9659, 0.52169, -2.4819], + "easing": "easeInOutSine" + }, + "0.85": { + "vector": [0.7935, 0.19563, -2.80573] }, "0.9": { - "vector": [0, 0, 0], - "easing": "easeInOutSine" + "vector": [0.49, 0, 0] + }, + "1.0": { + "vector": [0, 0, 0] } }, "position": { @@ -264,90 +279,125 @@ "vector": [0, 0, 0], "easing": "easeInOutSine" }, - "0.3": { + "0.125": { "vector": [0, 0, 0], "easing": "linear" }, - "0.5": { - "vector": [-0.1, 0, 1.9], + "0.3": { + "vector": [-0.41, -0.23, 0.32] + }, + "0.425": { + "vector": [-0.1, -0.5, 0.3], "easing": "easeInElastic" }, - "0.6": { - "vector": [-0.1, 0, 1.6] + "0.525": { + "vector": [-0.1, -0.5, 0.6] + }, + "0.575": { + "vector": [-0.3, -0.5, -0.6] + }, + "0.625": { + "vector": [-0.3, -0.5, -0.6] }, "0.7": { - "vector": [-0.3, 0, -1.9] + "vector": [-0.1, -0.2, 0.1], + "easing": "easeInElastic" }, - "0.8": { - "vector": [-0.2, -0.4, 0.5] + "0.775": { + "vector": [0.2, -0.3, -0.1] + }, + "0.825": { + "vector": [0.14, -0.05, 0.2], + "easing": "easeInSine" + }, + "0.9": { + "vector": [0.04, 0.1, 0.24478] }, "1.0": { "vector": [0, 0, 0], - "easing": "easeInOutSine" + "easing": "easeOutSine" } } }, "Righthand": { "rotation": { - "0.1": { + "0.0": { "vector": [0, 0, 0] }, - "0.3": { - "vector": [-11.05124, 19.47135, -3.30226], + "0.075": { + "vector": [-18.55124, 17.47135, 19.69774], "easing": "linear" }, - "0.4": { - "vector": [-2.21355, 15.26875, 0.47749], + "0.225": { + "vector": [-21.13227, 15.58282, 11.08112], "easing": "easeInSine" }, - "0.5": { - "vector": [-2.21355, 15.26875, 0.47749], + "0.275": { + "vector": [-21.13227, 15.58282, 11.08112], "easing": "easeInSine" }, - "0.6": { - "vector": [-2.21355, 15.26875, 0.47749], + "0.375": { + "vector": [-15.21355, 15.26875, 0.47749], + "easing": "easeInSine" + }, + "0.525": { + "vector": [-21.13227, 15.58282, 11.08112], + "easing": "easeInSine" + }, + "0.575": { + "vector": [-21.13227, 15.58282, 11.08112], + "easing": "easeInSine" + }, + "0.625": { + "vector": [-21.13227, 15.58282, 11.08112], "easing": "easeInSine" }, "0.7": { - "vector": [-2.21355, 15.26875, 0.47749], - "easing": "easeInSine" + "vector": [-18.55124, 17.47135, 19.69774], + "easing": "linear" }, - "0.8": { - "vector": [-11.05124, 19.47135, -3.30226] - }, - "1.0": { + "0.85": { "vector": [0, 0, 0], "easing": "easeInElastic" } }, "position": { - "0.1": { + "0.0": { "vector": [0, 0, 0] }, - "0.3": { - "vector": [1.3, 0.8, -3.9], + "0.075": { + "vector": [-1.8, -0.8, -6], "easing": "linear" }, - "0.4": { - "vector": [0.69956, 3.29369, -3.69314], + "0.225": { + "vector": [-0.30044, 0.39369, -6.49314], "easing": "easeInSine" }, - "0.5": { - "vector": [0.69956, 3.29369, 0.30686], + "0.275": { + "vector": [-0.30044, 0.39369, -6.49314], "easing": "easeInSine" }, - "0.6": { - "vector": [0.69956, 3.29369, 0.30686], + "0.375": { + "vector": [1.29956, 1.69369, -1.19314], + "easing": "easeInSine" + }, + "0.525": { + "vector": [-0.30044, 0.39369, -1.99314], + "easing": "easeInSine" + }, + "0.575": { + "vector": [-0.30044, 0.39369, -6.49314], + "easing": "easeInSine" + }, + "0.625": { + "vector": [-0.30044, 0.39369, -6.49314], "easing": "easeInSine" }, "0.7": { - "vector": [0.69956, 3.29369, -3.69314], - "easing": "easeInSine" + "vector": [-1.8, -0.8, -6], + "easing": "linear" }, - "0.8": { - "vector": [1.3, 0.3, -3.2] - }, - "1.0": { + "0.85": { "vector": [0, 0, 0], "easing": "easeInElastic" } @@ -358,30 +408,123 @@ "0.0": { "vector": [0, 0, 0] }, - "0.3": { + "0.125": { "vector": [0, 0, 0] }, - "0.4": { + "0.225": { "vector": [0, 0, 0], "easing": "easeInSine" }, - "0.5": { + "0.275": { + "vector": [0, 0, 0], + "easing": "easeInSine" + }, + "0.375": { "vector": [0, 0, 4.14453], "easing": "easeInSine" }, - "0.6": { + "0.525": { "vector": [0, 0, 4.14453] }, + "0.575": { + "vector": [0, 0, 0], + "easing": "easeInSine" + }, + "0.625": { + "vector": [0, 0, 0], + "easing": "easeInSine" + }, "0.7": { "vector": [0, 0, 0], "easing": "easeInSine" + } + } + }, + "ammo": { + "position": { + "0.0": { + "vector": [0, 0, 0] }, - "0.8": { + "0.1": { + "vector": [0, -0.32031, 4] + }, + "0.6": { + "vector": [0, -0.32031, 4] + }, + "0.7": { "vector": [0, 0, 0], "easing": "easeInSine" } } }, + "shell": { + "rotation": { + "0.275": { + "vector": [0, 0, 0] + }, + "0.375": { + "vector": [-21.80427, 22.90431, 1.23855], + "easing": "easeInBack" + }, + "0.575": { + "vector": [-210.8043, 220.9043, 1.23855], + "easing": "linear" + }, + "0.675": { + "vector": [0, 0, 0] + } + }, + "position": { + "0.275": { + "vector": [0, 0, 0] + }, + "0.375": { + "vector": [0, 0.3, 4.14453], + "easing": "easeInSine" + }, + "0.475": { + "vector": [-4, 6.3, 10.14] + }, + "0.575": { + "vector": [-8.5, 9.3, 19.14] + }, + "0.675": { + "vector": [-13.8, 10.2, 2070.44] + }, + "0.775": { + "vector": [0, 0, 0] + } + } + }, + "bolt_rot": { + "rotation": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.125": { + "vector": [0, 0, 0] + }, + "0.225": { + "vector": [0, 0, 90], + "easing": "easeInSine" + }, + "0.275": { + "vector": [0, 0, 90], + "easing": "easeInSine" + }, + "0.575": { + "vector": [0, 0, 90], + "easing": "easeInSine" + }, + "0.625": { + "vector": [0, 0, 90], + "easing": "easeInSine" + }, + "0.7": { + "vector": [0, 0, 0] + } + } + }, "camera": { "rotation": { "0.1": { @@ -408,83 +551,6 @@ "vector": [0, 0, 0] } } - }, - "ammo": { - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.1": { - "vector": [0, -0.32031, 4] - }, - "0.6": { - "vector": [0, -0.32031, 4] - }, - "0.7": { - "vector": [0, 0, 0], - "easing": "easeInSine" - } - } - }, - "shell": { - "rotation": { - "0.4": { - "vector": [0, 0, 0] - }, - "0.5": { - "vector": [-21.80427, 22.90431, 1.23855], - "easing": "easeInBack" - }, - "0.7": { - "vector": [-210.8043, 220.9043, 1.23855], - "easing": "linear" - }, - "0.8": { - "vector": [0, 0, 0] - } - }, - "position": { - "0.4": { - "vector": [0, 0, 0] - }, - "0.5": { - "vector": [0, 0.3, 4.14453], - "easing": "easeInSine" - }, - "0.6": { - "vector": [-4, 6.3, 10.14] - }, - "0.7": { - "vector": [-8.5, 9.3, 19.14] - }, - "0.8": { - "vector": [-13.8, 10.2, 2070.44] - }, - "0.9": { - "vector": [0, 0, 0] - } - } - }, - "bolt_rot": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.3": { - "vector": [0, 0, 0] - }, - "0.4": { - "vector": [0, 0, 90], - "easing": "easeInSine" - }, - "0.7": { - "vector": [0, 0, 90], - "easing": "easeInSine" - }, - "0.8": { - "vector": [0, 0, 0] - } - } } }, "sound_effects": { @@ -1262,33 +1328,36 @@ "vector": [-2.21355, 15.26875, 0.47749], "easing": "easeInSine" }, - "0.425": { + "0.4": { "vector": [-2.3634, 22.74644, -2.37175], "easing": "easeInSine" }, - "0.475": { - "vector": [-33.04909, 19.74944, 35.22827] + "0.45": { + "vector": [-38.00184, 36.4054, 12.11123] }, "0.5": { - "vector": [-26.26116, 13.39501, 17.38543] + "vector": [-25.14483, 27.42795, 31.71508] }, - "0.725": { + "0.625": { + "vector": [-26.07019, 8.24668, 23.7982] + }, + "0.85": { "vector": [-20.82632, 5.64263, 37.12867], "easing": "easeInQuad" }, - "0.8": { + "0.9": { "vector": [-20.82632, 5.64263, 37.12867], "easing": "easeInQuad" }, - "0.875": { - "vector": [-21.52185, 6.02263, 40.77085], - "easing": "easeInQuad" - }, "0.95": { + "vector": [-21.52185, 6.02263, 40.77085], + "easing": "easeInQuad" + }, + "1.025": { "vector": [-20.82632, 5.64263, 37.12867], "easing": "easeInQuad" }, - "1.075": { + "1.15": { "vector": [-16.71355, 15.26875, 0.47749], "easing": "easeInSine" }, @@ -1313,33 +1382,42 @@ "vector": [0.69956, 3.29369, -3.69314], "easing": "easeInSine" }, - "0.425": { + "0.4": { "vector": [0.69956, 3.29369, 0.30686], "easing": "easeInSine" }, - "0.475": { - "vector": [-4.18, 3.55, -2.6] + "0.45": { + "vector": [-0.98, 0.35, -0.1] }, "0.5": { - "vector": [-2.80606, 3.72321, -4.59756] + "vector": [-3.40606, 4.12321, -3.59756] }, - "0.725": { + "0.575": { + "vector": [-2.78, 3.89, -3.85] + }, + "0.625": { + "vector": [-2.75, 4.06, -5.1] + }, + "0.7": { + "vector": [-4.08, 3.6, -6.11] + }, + "0.85": { "vector": [-4.08051, 2.22253, -9.13422], "easing": "easeInQuad" }, - "0.8": { + "0.9": { "vector": [-4.08051, 2.22253, -9.13422], "easing": "easeInQuad" }, - "0.875": { - "vector": [-4.41332, 1.52253, -9.13422], - "easing": "easeInQuad" - }, "0.95": { + "vector": [-4.41332, 1.52253, -9.13422], + "easing": "easeInQuad" + }, + "1.025": { "vector": [-3.86957, 2.22253, -9.13422], "easing": "easeInQuad" }, - "1.075": { + "1.15": { "vector": [1.49956, -3.30631, -2.39314], "easing": "easeInSine" }, @@ -1383,11 +1461,11 @@ "0.5": { "vector": [-53.3, 55.9, 1.24] }, - "0.725": { + "0.85": { "vector": [0, 0, 0], "easing": "easeInQuad" }, - "0.8": { + "0.9": { "vector": [0, 0, 0], "easing": "easeInQuad" }, @@ -1415,15 +1493,24 @@ "0.5": { "vector": [-2, 4.5, 9.24] }, - "0.725": { + "0.575": { + "vector": [-0.99, 3.94, 9.23] + }, + "0.625": { + "vector": [-0.58, 4.33, 8.22] + }, + "0.7": { + "vector": [-1.58, 3.8, 7.19] + }, + "0.85": { "vector": [0, 0.3, 3.69453], "easing": "easeInQuad" }, - "0.8": { + "0.9": { "vector": [0, 0.3, 3.69453], "easing": "easeInQuad" }, - "0.875": { + "0.95": { "vector": [0, -0.45, 3.94] }, "1.275": { @@ -1440,10 +1527,10 @@ } }, "scale": { - "0.875": { + "0.95": { "vector": [1, 1, 1] }, - "0.9": { + "0.975": { "vector": [0, 0, 0] }, "1.275": { diff --git a/src/main/resources/assets/superbwarfare/sounds/k_98/k_98_far.ogg b/src/main/resources/assets/superbwarfare/sounds/k_98/k_98_far.ogg index 0890ca7d9..34da1db64 100644 Binary files a/src/main/resources/assets/superbwarfare/sounds/k_98/k_98_far.ogg and b/src/main/resources/assets/superbwarfare/sounds/k_98/k_98_far.ogg differ diff --git a/src/main/resources/assets/superbwarfare/sounds/k_98/k_98_fire_1p.ogg b/src/main/resources/assets/superbwarfare/sounds/k_98/k_98_fire_1p.ogg index 2c3717eff..13c00db01 100644 Binary files a/src/main/resources/assets/superbwarfare/sounds/k_98/k_98_fire_1p.ogg and b/src/main/resources/assets/superbwarfare/sounds/k_98/k_98_fire_1p.ogg differ diff --git a/src/main/resources/assets/superbwarfare/sounds/k_98/k_98_fire_3p.ogg b/src/main/resources/assets/superbwarfare/sounds/k_98/k_98_fire_3p.ogg index 59bb324d6..72f4ec00f 100644 Binary files a/src/main/resources/assets/superbwarfare/sounds/k_98/k_98_fire_3p.ogg and b/src/main/resources/assets/superbwarfare/sounds/k_98/k_98_fire_3p.ogg differ diff --git a/src/main/resources/assets/superbwarfare/sounds/k_98/k_98_veryfar.ogg b/src/main/resources/assets/superbwarfare/sounds/k_98/k_98_veryfar.ogg index 5c9d47d7a..968fca02b 100644 Binary files a/src/main/resources/assets/superbwarfare/sounds/k_98/k_98_veryfar.ogg and b/src/main/resources/assets/superbwarfare/sounds/k_98/k_98_veryfar.ogg differ diff --git a/src/main/resources/data/superbwarfare/guns/k_98.json b/src/main/resources/data/superbwarfare/guns/k_98.json index 7e3d87f88..c17a58e76 100644 --- a/src/main/resources/data/superbwarfare/guns/k_98.json +++ b/src/main/resources/data/superbwarfare/guns/k_98.json @@ -3,8 +3,8 @@ "zoom": 1.25, "spread": 5, "zoomSpread": 0.001, - "recoil_x": 0.007, - "recoil_y": 0.013, + "recoil_x": 0.002, + "recoil_y": 0.063, "damage": 35, "headshot": 3, "velocity": 37.75, diff --git a/src/main/resources/data/superbwarfare/recipes/glock18_smithing.json b/src/main/resources/data/superbwarfare/recipes/glock18_smithing.json index b6904c7cd..3e8231fd1 100644 --- a/src/main/resources/data/superbwarfare/recipes/glock18_smithing.json +++ b/src/main/resources/data/superbwarfare/recipes/glock18_smithing.json @@ -4,7 +4,7 @@ "item": "superbwarfare:glock_18_blueprint" }, "base": { - "item": "superbwarfare:common_material_pack" + "item": "superbwarfare:rare_material_pack" }, "addition": { "item": "minecraft:gold_ingot"