SVD去营业妨碍化,优化AA12后坐力动画表现
This commit is contained in:
parent
cb19e74007
commit
bf12d1c0b6
6 changed files with 8185 additions and 7429 deletions
|
@ -53,21 +53,21 @@ public class Aa12ItemModel extends GeoModel<Aa12Item> {
|
||||||
fp = player.getPersistentData().getDouble("firepos");
|
fp = player.getPersistentData().getDouble("firepos");
|
||||||
|
|
||||||
if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zooming) {
|
if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zooming) {
|
||||||
shen.setPosZ(2f * (float) fp);
|
shen.setPosZ(5f * (float) fp);
|
||||||
} else {
|
} else {
|
||||||
shen.setPosZ(4f * (float) fp);
|
shen.setPosZ(6f * (float) fp);
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zooming) {
|
if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zooming) {
|
||||||
shen.setRotX(0.002f * (float) fp);
|
shen.setRotX(0.03f * (float) fp);
|
||||||
} else {
|
} else {
|
||||||
shen.setRotX(0.02f * (float) fp);
|
shen.setRotX(0.06f * (float) fp);
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).recoilHorizon == 1) {
|
if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).recoilHorizon == 1) {
|
||||||
shen.setRotZ(0.003f * (float) fp);
|
shen.setRotZ(0.007f * (float) fp);
|
||||||
} else {
|
} else {
|
||||||
shen.setRotZ(-0.003f * (float) fp);
|
shen.setRotZ(-0.007f * (float) fp);
|
||||||
}
|
}
|
||||||
|
|
||||||
CoreGeoBone flare = getAnimationProcessor().getBone("flare");
|
CoreGeoBone flare = getAnimationProcessor().getBone("flare");
|
||||||
|
|
|
@ -208,29 +208,27 @@
|
||||||
"vector": [0, 0, 0]
|
"vector": [0, 0, 0]
|
||||||
},
|
},
|
||||||
"0.1": {
|
"0.1": {
|
||||||
"vector": [-0.9962, 0.08715, 3.24924]
|
"vector": [0.83482, 0.12236, 0.72798]
|
||||||
},
|
|
||||||
"0.2": {
|
|
||||||
"vector": [-2.5, 0.04, -1.88]
|
|
||||||
},
|
},
|
||||||
"0.3": {
|
"0.3": {
|
||||||
|
"vector": [-3.99454, -0.20917, -6.49271],
|
||||||
|
"easing": "easeInSine"
|
||||||
|
},
|
||||||
|
"0.4": {
|
||||||
"vector": [-4, 0, -7],
|
"vector": [-4, 0, -7],
|
||||||
"easing": "easeInOutSine"
|
"easing": "easeInOutSine"
|
||||||
},
|
},
|
||||||
"0.5": {
|
"0.5": {
|
||||||
"vector": [-0.00638, -0.05195, -0.49863],
|
"vector": [0.99362, -0.05195, -0.49863],
|
||||||
"easing": "easeOutSine"
|
"easing": "easeOutSine"
|
||||||
},
|
},
|
||||||
"0.8": {
|
"0.7": {
|
||||||
"vector": [-4.49954, -0.05233, -7.99863],
|
"vector": [-0.49954, -0.05233, -7.99863],
|
||||||
"easing": "easeOutSine"
|
"easing": "easeOutSine"
|
||||||
},
|
},
|
||||||
"1.0": {
|
|
||||||
"vector": [-5.99652, 0.19166, -5.00897],
|
|
||||||
"easing": "easeInOutSine"
|
|
||||||
},
|
|
||||||
"1.1": {
|
"1.1": {
|
||||||
"vector": [-5.99954, 0.05237, -5.00046]
|
"vector": [-5.99652, 0.19166, -5.00897],
|
||||||
|
"easing": "easeInOutSine"
|
||||||
},
|
},
|
||||||
"1.2": {
|
"1.2": {
|
||||||
"vector": [-3.99898, 0.01587, -5.99698]
|
"vector": [-3.99898, 0.01587, -5.99698]
|
||||||
|
@ -242,7 +240,7 @@
|
||||||
"vector": [-6.99256, -0.1915, -6.99013]
|
"vector": [-6.99256, -0.1915, -6.99013]
|
||||||
},
|
},
|
||||||
"1.5": {
|
"1.5": {
|
||||||
"vector": [-6.2646, 0.00739, -8.99132]
|
"vector": [-1.24031, 0.55228, -4.02102]
|
||||||
},
|
},
|
||||||
"1.6": {
|
"1.6": {
|
||||||
"vector": [-3.53664, 0.20628, -10.99252]
|
"vector": [-3.53664, 0.20628, -10.99252]
|
||||||
|
@ -273,41 +271,39 @@
|
||||||
"vector": [0, 0, 0]
|
"vector": [0, 0, 0]
|
||||||
},
|
},
|
||||||
"0.1": {
|
"0.1": {
|
||||||
"vector": [0, -0.18, 0.02]
|
"vector": [0, -0.07578, -0.1]
|
||||||
},
|
|
||||||
"0.2": {
|
|
||||||
"vector": [0, 0.21, 0.06]
|
|
||||||
},
|
},
|
||||||
"0.3": {
|
"0.3": {
|
||||||
"vector": [0, 0.12, 0.15],
|
"vector": [0, 0.2, -0.2],
|
||||||
"easing": "easeInSine"
|
"easing": "easeInSine"
|
||||||
},
|
},
|
||||||
"0.4": {
|
"0.4": {
|
||||||
"vector": [0, -0.29, 0.22]
|
"vector": [0, 0.42, 0.15],
|
||||||
|
"easing": "easeInSine"
|
||||||
},
|
},
|
||||||
"0.5": {
|
"0.5": {
|
||||||
"vector": [0, -0.3, -0.1],
|
"vector": [0, -0.8, -0.7],
|
||||||
"easing": "easeInOutSine"
|
"easing": "easeOutSine"
|
||||||
},
|
},
|
||||||
"0.6": {
|
"0.6": {
|
||||||
"vector": [0, -0.15, 0.2],
|
"vector": [0, -0.25, 0.2],
|
||||||
"easing": "easeOutSine"
|
"easing": "easeOutSine"
|
||||||
},
|
},
|
||||||
"0.8": {
|
"0.8": {
|
||||||
"vector": [0, -0.2, 0.1],
|
"vector": [0, -0.2, 0.1],
|
||||||
"easing": "easeInSine"
|
"easing": "easeInSine"
|
||||||
},
|
},
|
||||||
"0.9": {
|
"1.0": {
|
||||||
"vector": [0, -0.23, 0.32]
|
"vector": [0, -0.23, 0.32]
|
||||||
},
|
},
|
||||||
"1.2": {
|
"1.2": {
|
||||||
"vector": [0, -0.4, 0.3]
|
"vector": [0, -0.5, 0.3]
|
||||||
},
|
},
|
||||||
"1.3": {
|
"1.3": {
|
||||||
"vector": [0, 0.1, 0.3]
|
"vector": [0, 0.3, 0.3]
|
||||||
},
|
},
|
||||||
"1.5": {
|
"1.5": {
|
||||||
"vector": [0, -0.3, 0.3],
|
"vector": [0, -0.2, 0.3],
|
||||||
"easing": "easeInSine"
|
"easing": "easeInSine"
|
||||||
},
|
},
|
||||||
"1.8": {
|
"1.8": {
|
||||||
|
@ -346,7 +342,7 @@
|
||||||
"vector": [4.35141, -9.80475, 8.6364]
|
"vector": [4.35141, -9.80475, 8.6364]
|
||||||
},
|
},
|
||||||
"0.2": {
|
"0.2": {
|
||||||
"vector": [-4, -4, 0]
|
"vector": [-4.54953, -5.93492, 2.8788]
|
||||||
},
|
},
|
||||||
"0.3": {
|
"0.3": {
|
||||||
"vector": [0, -4, 0]
|
"vector": [0, -4, 0]
|
||||||
|
@ -361,10 +357,6 @@
|
||||||
"vector": [-18.71, -9.52, 1.13],
|
"vector": [-18.71, -9.52, 1.13],
|
||||||
"easing": "easeInOutSine"
|
"easing": "easeInOutSine"
|
||||||
},
|
},
|
||||||
"1.7": {
|
|
||||||
"vector": [-46.97111, -6.37986, -9.46036],
|
|
||||||
"easing": "easeInOutSine"
|
|
||||||
},
|
|
||||||
"1.8": {
|
"1.8": {
|
||||||
"vector": [-65.52408, -15.41359, 12.37484],
|
"vector": [-65.52408, -15.41359, 12.37484],
|
||||||
"easing": "easeInSine"
|
"easing": "easeInSine"
|
||||||
|
@ -395,11 +387,14 @@
|
||||||
"vector": [0, 0, 0]
|
"vector": [0, 0, 0]
|
||||||
},
|
},
|
||||||
"0.2": {
|
"0.2": {
|
||||||
"vector": [-0.7, -1.6, 4.3]
|
"vector": [-0.52, -2.15, 5.78]
|
||||||
},
|
},
|
||||||
"0.3": {
|
"0.3": {
|
||||||
"vector": [-0.7, -2.2, 3.7]
|
"vector": [-0.7, -2.2, 3.7]
|
||||||
},
|
},
|
||||||
|
"0.4": {
|
||||||
|
"vector": [-0.7, -2.2, 3.7]
|
||||||
|
},
|
||||||
"1.3": {
|
"1.3": {
|
||||||
"vector": [-0.7, -2.2, 3.7]
|
"vector": [-0.7, -2.2, 3.7]
|
||||||
},
|
},
|
||||||
|
@ -410,23 +405,23 @@
|
||||||
"vector": [-3.9, -9.2, 3.55],
|
"vector": [-3.9, -9.2, 3.55],
|
||||||
"easing": "easeInOutSine"
|
"easing": "easeInOutSine"
|
||||||
},
|
},
|
||||||
"1.7": {
|
|
||||||
"vector": [-4.1, -4.15, 1.13]
|
|
||||||
},
|
|
||||||
"1.8": {
|
"1.8": {
|
||||||
"vector": [-8, -4.7, -2.5],
|
"vector": [-6, -5.7, -1.3],
|
||||||
"easing": "easeInSine"
|
"easing": "easeInSine"
|
||||||
},
|
},
|
||||||
"2.1": {
|
"1.9": {
|
||||||
"vector": [-8, -4.7, -2.5],
|
"vector": [-6, -5.7, -1.06]
|
||||||
|
},
|
||||||
|
"2.0": {
|
||||||
|
"vector": [-6, -5.7, -2.5],
|
||||||
"easing": "easeInSine"
|
"easing": "easeInSine"
|
||||||
},
|
},
|
||||||
"2.2": {
|
"2.2": {
|
||||||
"vector": [-7.36, -6.5, -4.04],
|
"vector": [-5.36, -6.5, -4.04],
|
||||||
"easing": "easeInOutSine"
|
"easing": "easeInOutSine"
|
||||||
},
|
},
|
||||||
"2.4": {
|
"2.4": {
|
||||||
"vector": [-3.03, -7.17, 2.03]
|
"vector": [-3.03, -4.77, -0.97]
|
||||||
},
|
},
|
||||||
"2.7": {
|
"2.7": {
|
||||||
"vector": [0, 0, 0],
|
"vector": [0, 0, 0],
|
||||||
|
@ -439,16 +434,13 @@
|
||||||
"0.0": {
|
"0.0": {
|
||||||
"vector": [0, 0, 0]
|
"vector": [0, 0, 0]
|
||||||
},
|
},
|
||||||
"0.3": {
|
"0.4": {
|
||||||
"vector": [0, 0, 0]
|
"vector": [0, 0, 0]
|
||||||
},
|
},
|
||||||
"0.4": {
|
"0.7": {
|
||||||
"vector": [-9, 0, 0]
|
|
||||||
},
|
|
||||||
"0.6": {
|
|
||||||
"vector": [-12.62765, -2.62403, -2.08221]
|
"vector": [-12.62765, -2.62403, -2.08221]
|
||||||
},
|
},
|
||||||
"1.1": {
|
"1.0": {
|
||||||
"vector": [-12.62765, -2.62403, -2.08221]
|
"vector": [-12.62765, -2.62403, -2.08221]
|
||||||
},
|
},
|
||||||
"1.2": {
|
"1.2": {
|
||||||
|
@ -465,23 +457,21 @@
|
||||||
"0.0": {
|
"0.0": {
|
||||||
"vector": [0, 0, 0]
|
"vector": [0, 0, 0]
|
||||||
},
|
},
|
||||||
"0.3": {
|
|
||||||
"vector": [0, 0, 0]
|
|
||||||
},
|
|
||||||
"0.4": {
|
"0.4": {
|
||||||
"vector": [0, 0, 0]
|
"vector": [0, 0, 0]
|
||||||
},
|
},
|
||||||
"0.6": {
|
"0.7": {
|
||||||
|
"vector": [0, -9.27, -0.9]
|
||||||
|
},
|
||||||
|
"1.0": {
|
||||||
"vector": [0, -9.27, -0.9]
|
"vector": [0, -9.27, -0.9]
|
||||||
},
|
},
|
||||||
"1.1": {
|
"1.1": {
|
||||||
"vector": [0, -9.27, -0.9]
|
|
||||||
},
|
|
||||||
"1.2": {
|
|
||||||
"vector": [0, -2.27, -0.9]
|
"vector": [0, -2.27, -0.9]
|
||||||
},
|
},
|
||||||
"1.3": {
|
"1.3": {
|
||||||
"vector": [0, 0, 0]
|
"vector": [0, 0, 0],
|
||||||
|
"easing": "easeInOutQuad"
|
||||||
},
|
},
|
||||||
"1.4": {
|
"1.4": {
|
||||||
"vector": [0, 0, 0]
|
"vector": [0, 0, 0]
|
||||||
|
@ -520,27 +510,27 @@
|
||||||
"vector": [0, 0, 0]
|
"vector": [0, 0, 0]
|
||||||
},
|
},
|
||||||
"0.1": {
|
"0.1": {
|
||||||
"vector": [-3.97816, 0.41778, 2.48549],
|
"vector": [0.83482, 0.12236, 0.72798]
|
||||||
"easing": "easeInSine"
|
|
||||||
},
|
},
|
||||||
"0.3": {
|
"0.3": {
|
||||||
"vector": [-8, 0, -7],
|
"vector": [-3.99454, -0.20917, -6.49271],
|
||||||
"easing": "easeInOutSine"
|
"easing": "easeInSine"
|
||||||
},
|
},
|
||||||
"0.4": {
|
"0.4": {
|
||||||
"vector": [-0.00638, -0.05195, -0.49863],
|
"vector": [-4, 0, -7],
|
||||||
"easing": "easeOutSine"
|
|
||||||
},
|
|
||||||
"0.6": {
|
|
||||||
"vector": [-4.49954, -0.05233, -7.99863],
|
|
||||||
"easing": "easeOutSine"
|
|
||||||
},
|
|
||||||
"1.0": {
|
|
||||||
"vector": [-5.99652, 0.19166, -5.00897],
|
|
||||||
"easing": "easeInOutSine"
|
"easing": "easeInOutSine"
|
||||||
},
|
},
|
||||||
|
"0.5": {
|
||||||
|
"vector": [0.99362, -0.05195, -0.49863],
|
||||||
|
"easing": "easeOutSine"
|
||||||
|
},
|
||||||
|
"0.7": {
|
||||||
|
"vector": [-0.49954, -0.05233, -7.99863],
|
||||||
|
"easing": "easeOutSine"
|
||||||
|
},
|
||||||
"1.1": {
|
"1.1": {
|
||||||
"vector": [-3.99954, 0.05237, -5.00046]
|
"vector": [-5.99652, 0.19166, -5.00897],
|
||||||
|
"easing": "easeInOutSine"
|
||||||
},
|
},
|
||||||
"1.2": {
|
"1.2": {
|
||||||
"vector": [-3.99898, 0.01587, -5.99698]
|
"vector": [-3.99898, 0.01587, -5.99698]
|
||||||
|
@ -552,7 +542,7 @@
|
||||||
"vector": [-6.99256, -0.1915, -6.99013]
|
"vector": [-6.99256, -0.1915, -6.99013]
|
||||||
},
|
},
|
||||||
"1.5": {
|
"1.5": {
|
||||||
"vector": [-6.2646, 0.00739, -8.99132]
|
"vector": [-1.24031, 0.55228, -4.02102]
|
||||||
},
|
},
|
||||||
"1.7": {
|
"1.7": {
|
||||||
"vector": [-0.48525, 0.63548, -4.00548]
|
"vector": [-0.48525, 0.63548, -4.00548]
|
||||||
|
@ -566,36 +556,39 @@
|
||||||
"vector": [0, 0, 0]
|
"vector": [0, 0, 0]
|
||||||
},
|
},
|
||||||
"0.1": {
|
"0.1": {
|
||||||
|
"vector": [0, -0.07578, -0.1]
|
||||||
|
},
|
||||||
|
"0.3": {
|
||||||
"vector": [0, 0.2, -0.2],
|
"vector": [0, 0.2, -0.2],
|
||||||
"easing": "easeInSine"
|
"easing": "easeInSine"
|
||||||
},
|
},
|
||||||
"0.3": {
|
"0.4": {
|
||||||
"vector": [0, 0.42, 0.15],
|
"vector": [0, 0.42, 0.15],
|
||||||
"easing": "easeInSine"
|
"easing": "easeInSine"
|
||||||
},
|
},
|
||||||
"0.4": {
|
|
||||||
"vector": [0, -0.3, -0.5],
|
|
||||||
"easing": "easeOutSine"
|
|
||||||
},
|
|
||||||
"0.5": {
|
"0.5": {
|
||||||
"vector": [0, -0.15, 0.2],
|
"vector": [0, -0.8, -0.7],
|
||||||
"easing": "easeOutSine"
|
"easing": "easeOutSine"
|
||||||
},
|
},
|
||||||
"0.7": {
|
"0.6": {
|
||||||
|
"vector": [0, -0.25, 0.2],
|
||||||
|
"easing": "easeOutSine"
|
||||||
|
},
|
||||||
|
"0.8": {
|
||||||
"vector": [0, -0.2, 0.1],
|
"vector": [0, -0.2, 0.1],
|
||||||
"easing": "easeInSine"
|
"easing": "easeInSine"
|
||||||
},
|
},
|
||||||
"0.9": {
|
"1.0": {
|
||||||
"vector": [0, -0.23, 0.32]
|
"vector": [0, -0.23, 0.32]
|
||||||
},
|
},
|
||||||
"1.2": {
|
"1.2": {
|
||||||
"vector": [0, -0.4, 0.3]
|
"vector": [0, -0.5, 0.3]
|
||||||
},
|
},
|
||||||
"1.3": {
|
"1.3": {
|
||||||
"vector": [0, 0.1, 0.3]
|
"vector": [0, 0.3, 0.3]
|
||||||
},
|
},
|
||||||
"1.5": {
|
"1.5": {
|
||||||
"vector": [0, -0.3, 0.3],
|
"vector": [0, -0.2, 0.3],
|
||||||
"easing": "easeInSine"
|
"easing": "easeInSine"
|
||||||
},
|
},
|
||||||
"1.7": {
|
"1.7": {
|
||||||
|
@ -615,7 +608,7 @@
|
||||||
"vector": [4.35141, -9.80475, 8.6364]
|
"vector": [4.35141, -9.80475, 8.6364]
|
||||||
},
|
},
|
||||||
"0.2": {
|
"0.2": {
|
||||||
"vector": [-4, -4, 0]
|
"vector": [-4.54953, -5.93492, 2.8788]
|
||||||
},
|
},
|
||||||
"0.3": {
|
"0.3": {
|
||||||
"vector": [0, -4, 0]
|
"vector": [0, -4, 0]
|
||||||
|
@ -636,11 +629,14 @@
|
||||||
"vector": [0, 0, 0]
|
"vector": [0, 0, 0]
|
||||||
},
|
},
|
||||||
"0.2": {
|
"0.2": {
|
||||||
"vector": [-0.7, -1.6, 4.3]
|
"vector": [-0.52, -2.15, 5.78]
|
||||||
},
|
},
|
||||||
"0.3": {
|
"0.3": {
|
||||||
"vector": [-0.7, -2.2, 3.7]
|
"vector": [-0.7, -2.2, 3.7]
|
||||||
},
|
},
|
||||||
|
"0.4": {
|
||||||
|
"vector": [-0.7, -2.2, 3.7]
|
||||||
|
},
|
||||||
"1.3": {
|
"1.3": {
|
||||||
"vector": [-0.7, -2.2, 3.7]
|
"vector": [-0.7, -2.2, 3.7]
|
||||||
},
|
},
|
||||||
|
@ -658,16 +654,13 @@
|
||||||
"0.0": {
|
"0.0": {
|
||||||
"vector": [0, 0, 0]
|
"vector": [0, 0, 0]
|
||||||
},
|
},
|
||||||
"0.3": {
|
"0.4": {
|
||||||
"vector": [0, 0, 0]
|
"vector": [0, 0, 0]
|
||||||
},
|
},
|
||||||
"0.4": {
|
"0.7": {
|
||||||
"vector": [-9, 0, 0]
|
|
||||||
},
|
|
||||||
"0.6": {
|
|
||||||
"vector": [-12.62765, -2.62403, -2.08221]
|
"vector": [-12.62765, -2.62403, -2.08221]
|
||||||
},
|
},
|
||||||
"1.1": {
|
"1.0": {
|
||||||
"vector": [-12.62765, -2.62403, -2.08221]
|
"vector": [-12.62765, -2.62403, -2.08221]
|
||||||
},
|
},
|
||||||
"1.2": {
|
"1.2": {
|
||||||
|
@ -684,23 +677,21 @@
|
||||||
"0.0": {
|
"0.0": {
|
||||||
"vector": [0, 0, 0]
|
"vector": [0, 0, 0]
|
||||||
},
|
},
|
||||||
"0.3": {
|
|
||||||
"vector": [0, 0, 0]
|
|
||||||
},
|
|
||||||
"0.4": {
|
"0.4": {
|
||||||
"vector": [0, 0, 0]
|
"vector": [0, 0, 0]
|
||||||
},
|
},
|
||||||
"0.6": {
|
"0.7": {
|
||||||
|
"vector": [0, -9.27, -0.9]
|
||||||
|
},
|
||||||
|
"1.0": {
|
||||||
"vector": [0, -9.27, -0.9]
|
"vector": [0, -9.27, -0.9]
|
||||||
},
|
},
|
||||||
"1.1": {
|
"1.1": {
|
||||||
"vector": [0, -9.27, -0.9]
|
|
||||||
},
|
|
||||||
"1.2": {
|
|
||||||
"vector": [0, -2.27, -0.9]
|
"vector": [0, -2.27, -0.9]
|
||||||
},
|
},
|
||||||
"1.3": {
|
"1.3": {
|
||||||
"vector": [0, 0, 0]
|
"vector": [0, 0, 0],
|
||||||
|
"easing": "easeInOutQuad"
|
||||||
},
|
},
|
||||||
"1.4": {
|
"1.4": {
|
||||||
"vector": [0, 0, 0]
|
"vector": [0, 0, 0]
|
||||||
|
|
File diff suppressed because it is too large
Load diff
Binary file not shown.
Before Width: | Height: | Size: 132 KiB After Width: | Height: | Size: 81 KiB |
Binary file not shown.
Before Width: | Height: | Size: 152 KiB After Width: | Height: | Size: 10 KiB |
Binary file not shown.
Before Width: | Height: | Size: 7 KiB After Width: | Height: | Size: 5.9 KiB |
Loading…
Add table
Reference in a new issue