m60去营业妨碍化

This commit is contained in:
Atsuihsio 2024-07-11 14:35:46 +08:00
parent 879cd73411
commit a180f50ce6
6 changed files with 13030 additions and 5085 deletions

View file

@ -87,11 +87,11 @@ public class M60ItemModel extends GeoModel<M60Item> {
double zp = 0;
zp = player.getPersistentData().getDouble("zoom_pos_z");
gun.setPosX(3.69f * (float) p);
gun.setPosX(3.74f * (float) p);
gun.setPosY(0.62f * (float) p - (float) (0.2f * zp));
gun.setPosY(-0.1f * (float) p - (float) (0.1f * zp));
gun.setPosZ((float) p + (float) (0.6f * zp));
gun.setPosZ((float) p + (float) (0.3f * zp));
gun.setRotZ(-0.087f * (float) p + (float) (0.05f * zp));
@ -99,12 +99,12 @@ public class M60ItemModel extends GeoModel<M60Item> {
double fr = player.getPersistentData().getDouble("fire_rot");
if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zooming) {
shen.setPosY(-0.01f * (float) (fp + 2 * fr));
shen.setPosZ(0.2f * (float) (fp + 0.54f * fr));
shen.setPosY(-0.03f * (float) (fp + 2 * fr));
shen.setPosZ(0.6f * (float) (fp + 0.54f * fr));
shen.setRotX(0.003f * (float) (fp + fr));
shen.setRotZ(0f);
} else {
shen.setPosY(-0.03f * (float) (fp + 2 * fr));
shen.setPosY(-0.05f * (float) (fp + 2 * fr));
shen.setPosZ(0.8f * (float) (fp + 0.54f * fr));
shen.setRotX(0.04f * (float) (0.18f * fp + fr));
shen.setRotZ(-0.04f * (float) (fp + 1.3 * fr));
@ -168,5 +168,13 @@ public class M60ItemModel extends GeoModel<M60Item> {
move.setRotY(Mth.DEG_TO_RAD * (float) yRot);
move.setRotZ(2.7f * (float) m + Mth.DEG_TO_RAD * (float) zRot);
CoreGeoBone camera = getAnimationProcessor().getBone("camera");
player.getPersistentData().putDouble("camera_rot_x", Mth.RAD_TO_DEG * camera.getRotX());
player.getPersistentData().putDouble("camera_rot_y", Mth.RAD_TO_DEG * camera.getRotY());
player.getPersistentData().putDouble("camera_rot_z", Mth.RAD_TO_DEG * camera.getRotZ());
}
}

View file

@ -11,144 +11,6 @@
}
}
},
"animation.m60.hit": {
"animation_length": 0.6,
"bones": {
"0": {
"rotation": {
"0.0": {
"vector": [0, 0, 0]
},
"0.1": {
"vector": [-109.99624, -5.6423, 87.09082]
},
"0.2": {
"vector": [-120.64214, 12.53737, 76.51478],
"easing": "easeInOutCubic"
},
"0.3": {
"vector": [-95.64214, 12.53737, 76.51478]
},
"0.4": {
"vector": [-30.75893, -0.13762, 69.59462],
"easing": "easeInCirc"
},
"0.5": {
"vector": [-15.85338, -1.67489, 10.01029],
"easing": "easeInOutCirc"
},
"0.6": {
"vector": [0, 0, 0],
"easing": "easeOutSine"
}
},
"position": {
"0.0": {
"vector": [0, 0, 0]
},
"0.1": {
"vector": [0, 0, -0.6]
},
"0.2": {
"vector": [-0.1, 2.7, -14.9],
"easing": "easeInOutCubic"
},
"0.4": {
"vector": [0, 0, 1.4],
"easing": "easeInCirc"
},
"0.5": {
"vector": [0, -0.3, 0.41]
},
"0.6": {
"vector": [0, 0, 0],
"easing": "easeOutSine"
}
}
},
"Righthand": {
"rotation": {
"0.0": {
"vector": [0, 0, 0]
},
"0.1": {
"vector": [115.09874, -2.71949, 20.40737]
},
"0.3": {
"vector": [117.68159, -1.57214, 10.14378]
},
"0.4": {
"vector": [80.64562, -5.59257, -1.31049]
},
"0.6": {
"vector": [0, 0, 0]
}
},
"position": {
"0.0": {
"vector": [0, 0, 0]
},
"0.1": {
"vector": [5.4, 15, -7.9]
},
"0.3": {
"vector": [2.9, 16.6, -8]
},
"0.4": {
"vector": [-0.27, 15.07, -1.33]
},
"0.5": {
"vector": [0.6, 8.23, 2.91]
},
"0.6": {
"vector": [0, 0, 0]
}
}
},
"Lefthand": {
"rotation": {
"0.0": {
"vector": [0, 0, 0]
},
"0.1": {
"vector": [160.00784, 26.63928, 97.85625]
},
"0.3": {
"vector": [119.73392, 26.4069, 30.49799]
},
"0.4": {
"vector": [32.51143, 12.91572, -13.61421]
},
"0.5": {
"vector": [4.26641, -22.39453, -18.39143]
},
"0.6": {
"vector": [0, 0, 0]
}
},
"position": {
"0.0": {
"vector": [0, 0, 0]
},
"0.1": {
"vector": [0.5, 14.6, -13.1]
},
"0.3": {
"vector": [-4.7, 17.1, -9.8]
},
"0.4": {
"vector": [-1.77, 11.77, -0.53]
},
"0.5": {
"vector": [-0.98, 3.54, -2.56]
},
"0.6": {
"vector": [0, 0, 0]
}
}
}
}
},
"animation.m60.draw": {
"animation_length": 2,
"bones": {
@ -184,6 +46,24 @@
"vector": [0, 0, 0]
}
}
},
"camera": {
"rotation": {
"0.0": {
"vector": [0, 0, 0]
},
"0.7": {
"vector": [0, 0, 0]
},
"1.1": {
"vector": [0.25, -0.5, 0.5],
"easing": "easeInSine"
},
"1.5": {
"vector": [0, 0, 0],
"easing": "easeOutSine"
}
}
}
}
},
@ -234,11 +114,30 @@
"easing": "easeOutSine"
}
}
},
"camera": {
"rotation": {
"0.0": {
"vector": [-0.3, -0.3, 0.3]
},
"0.2": {
"vector": [0.3, 0, -0.3]
},
"0.4": {
"vector": [-0.3, 0.3, 0.3]
},
"0.6": {
"vector": [0.3, 0, -0.3]
},
"0.8": {
"vector": [-0.3, -0.3, 0.3]
}
}
}
}
},
"animation.m60.fire": {
"animation_length": 0.08333,
"animation_length": 0.0833,
"bones": {
"m60_bullet_chain": {
"rotation": {
@ -261,7 +160,7 @@
}
},
"animation.m60.fire2": {
"animation_length": 0.08333,
"animation_length": 0.0833,
"bones": {
"m60_bullet_chain": {
"rotation": {
@ -334,16 +233,16 @@
"vector": [-2.56251, -4.49309, -3.5562]
},
"3.4583": {
"vector": [-8.45819, -6.00966, 5.06516]
"vector": [-8.45819, -6.00966, -1.0652]
},
"3.875": {
"vector": [-7.14311, -4.89926, 4.67693]
"vector": [-7.4, -4.96, -1.7]
},
"4.0417": {
"vector": [-8.16909, -5.15158, 11.18776]
"vector": [-8.16909, -5.15158, 0.18776]
},
"4.0833": {
"vector": [-8.16909, -5.15158, 11.18776]
"vector": [-8.16909, -5.15158, 8.1878]
},
"4.2917": {
"vector": [-6.50482, -5.89907, 0.20211]
@ -448,18 +347,18 @@
"3.4167": {
"vector": [-0.74, 1.15, -0.01]
},
"3.7917": {
"3.9167": {
"vector": [-0.74, 0.99, 0.02]
},
"4.0417": {
"vector": [-0.74, 0.65, 0.09],
"easing": "easeOutElastic"
},
"4.0833": {
"4.125": {
"vector": [-0.74, 0.65, 0.09],
"easing": "easeOutElastic"
},
"4.2083": {
"4.25": {
"vector": [-0.64, 1.17, 0.08]
},
"4.5417": {
@ -659,52 +558,49 @@
"easing": "easeInSine"
},
"2.5": {
"vector": [-16.70582, -8.14497, -4.27708]
"vector": [-16.70582, -8.14497, 15.72292]
},
"2.5833": {
"vector": [-21.7426, -8.44598, -21.35132],
"vector": [1.2574, -4.44598, 3.64868],
"easing": "easeOutSine"
},
"2.625": {
"vector": [-21.7426, -8.44598, -21.35132],
"vector": [1.2574, -4.44598, 3.64868],
"easing": "easeOutSine"
},
"4.2083": {
"vector": [-21.7426, -8.44598, -21.35132],
"vector": [1.2574, -4.44598, 3.64868],
"easing": "easeOutSine"
},
"4.375": {
"vector": [-24.42266, -44.66287, -23.47349]
},
"4.5417": {
"vector": [-12.96929, -39.3572, -60.30001]
"vector": [-12.96929, -39.3572, -46.30001]
},
"4.625": {
"vector": [-13.22775, -40.42384, -59.21314]
"vector": [-12.96929, -39.3572, -46.30001]
},
"4.7083": {
"vector": [-12.53951, -37.21222, -62.43842]
},
"4.75": {
"vector": [-12.29931, -35.77231, -63.84713]
},
"4.7917": {
"vector": [-12.53951, -37.21222, -62.43842]
"vector": [-12.53951, -37.21222, -65.43842]
},
"5.0417": {
"vector": [-21.52373, 2.87885, 5.45216],
"vector": [-21.52373, 2.87885, 13.45216],
"easing": "easeInOutSine"
},
"5.0833": {
"vector": [-21.52373, 2.87885, 5.45216],
"vector": [-21.52373, 2.87885, 13.45216],
"easing": "easeInOutSine"
},
"5.25": {
"vector": [-68.76834, -28.84985, -45.12465],
"vector": [-68.76834, -28.84985, -24.12465],
"easing": "easeInOutSine"
},
"5.375": {
"vector": [-68.76834, -28.84985, -45.12465],
"vector": [-68.76834, -28.84985, -24.12465],
"easing": "easeInOutSine"
},
"5.5": {
@ -733,45 +629,45 @@
"vector": [1.23, -2.04, 5.17]
},
"1.7917": {
"vector": [2.7, 4.9, 4.4]
"vector": [2.3, 5.9, 4.4]
},
"2.0833": {
"vector": [1.8, 10.9, -1.41484],
"vector": [1.8, 10.9, -1.91484],
"easing": "easeInQuart"
},
"2.2083": {
"vector": [1.8, 10.9, -1.41484],
"vector": [1.8, 10.9, -1.91484],
"easing": "easeInQuart"
},
"2.5833": {
"vector": [5.9, -0.5, 7.1],
"vector": [4.3, 0.9, 7.1],
"easing": "easeInOutSine"
},
"2.625": {
"vector": [5.9, -0.5, 7.1],
"vector": [4.3, 0.9, 7.1],
"easing": "easeInOutSine"
},
"4.2083": {
"vector": [5.9, -0.5, 7.1],
"vector": [4.3, 0.9, 7.1],
"easing": "easeInOutSine"
},
"4.5417": {
"vector": [3.1, 6.2, 9.7]
"vector": [4.4, 5.8, 7.7]
},
"4.625": {
"vector": [2.95, 6.75, 9.3]
"vector": [4.1, 6.2, 7.7]
},
"4.7083": {
"vector": [2, 7.3, 8.9]
"vector": [4, 8.6, 7.9]
},
"4.75": {
"vector": [2, 7.3, 8.9]
"vector": [3.8, 8.3, 7.9]
},
"4.7917": {
"vector": [2, 7.3, 8.9]
"vector": [4, 8.6, 7.9]
},
"4.9167": {
"vector": [1.2, 8.2, 6.79]
"vector": [3.5, 8.2, 7.39]
},
"5.0417": {
"vector": [0.4, 7.3, 4.68516],
@ -890,11 +786,123 @@
"easing": "easeInOutQuad"
}
}
}
},
"sound_effects": {
"0.0": {
"effect": "m60_reload"
},
"camera": {
"rotation": {
"0.0": {
"vector": [0, 0, 0],
"easing": "linear"
},
"0.125": {
"vector": [0.2, 0, 1.5]
},
"0.25": {
"vector": [1, 2, 1.8]
},
"0.2917": {
"vector": [-1.5, -3, -1.5]
},
"0.4167": {
"vector": [0.2, 1.5, 1.5]
},
"0.5833": {
"vector": [0, -0.5, -1],
"easing": "easeInElastic"
},
"0.9167": {
"vector": [-0.38, 0.25, 1]
},
"1.25": {
"vector": [-1, -1, -1]
},
"1.3333": {
"vector": [2, 1, -1]
},
"1.4583": {
"vector": [0, -0.5, 0]
},
"1.625": {
"vector": [0.35, 0.5, 0.5]
},
"1.875": {
"vector": [0.67, 0, -0.33]
},
"2.0833": {
"vector": [1.33, -1, -2]
},
"2.1667": {
"vector": [1.33, 1, 1]
},
"2.5": {
"vector": [1.33, -0.5, -1.25]
},
"2.6667": {
"vector": [2, -0.47, 1]
},
"2.7917": {
"vector": [1.93, 0.9, 2.5]
},
"2.875": {
"vector": [1.67, -0.9, -0.8]
},
"3.0": {
"vector": [2, 0.3, 1]
},
"3.1667": {
"vector": [1.74, -0.66, -0.44]
},
"3.5417": {
"vector": [1.74, -0.66, -1.5]
},
"3.9583": {
"vector": [1.46, -0.55, -1.26]
},
"4.0417": {
"vector": [2, -1, -2.5]
},
"4.0833": {
"vector": [0.3, -0.1, 1]
},
"4.2083": {
"vector": [1.58, -0.78, -1.63]
},
"4.4167": {
"vector": [0.3, -0.1, 1]
},
"4.7083": {
"vector": [1.07, -0.51, -0.58]
},
"4.75": {
"vector": [0.99, 0.3, 2]
},
"4.875": {
"vector": [0.86, -0.41, -1.5]
},
"4.9583": {
"vector": [-0.38, 0.25, 1]
},
"5.2917": {
"vector": [-1, -1, -1]
},
"5.375": {
"vector": [2, 1, -1]
},
"5.5": {
"vector": [0, -0.5, 0]
},
"6.125": {
"vector": [0.2, 0, 1.5]
},
"6.2083": {
"vector": [0.5, 1, 0.9]
},
"6.2917": {
"vector": [-0.5, -1, -1.5]
},
"6.375": {
"vector": [0, 0, 0]
}
}
}
}
},
@ -937,16 +945,16 @@
"vector": [-2.56251, -4.49309, -3.5562]
},
"2.625": {
"vector": [-8.45819, -6.00966, 5.06516]
"vector": [-8.45819, -6.00966, -1.0652]
},
"3.0417": {
"vector": [-7.14311, -4.89926, 4.67693]
"vector": [-7.4, -4.96, -1.7]
},
"3.2083": {
"vector": [-8.16909, -5.15158, 11.18776]
"vector": [-8.16909, -5.15158, 0.18776]
},
"3.25": {
"vector": [-8.16909, -5.15158, 11.18776]
"vector": [-8.16909, -5.15158, 8.1878]
},
"3.4583": {
"vector": [-6.50482, -5.89907, 0.20211]
@ -1032,18 +1040,18 @@
"2.5833": {
"vector": [-0.74, 1.15, -0.01]
},
"2.9583": {
"3.0833": {
"vector": [-0.74, 0.99, 0.02]
},
"3.2083": {
"vector": [-0.74, 0.65, 0.09],
"easing": "easeOutElastic"
},
"3.25": {
"3.2917": {
"vector": [-0.74, 0.65, 0.09],
"easing": "easeOutElastic"
},
"3.375": {
"3.4167": {
"vector": [-0.64, 1.17, 0.08]
},
"3.7083": {
@ -1180,52 +1188,49 @@
"easing": "easeInSine"
},
"1.6667": {
"vector": [-16.70582, -8.14497, -4.27708]
"vector": [-16.70582, -8.14497, 15.72292]
},
"1.75": {
"vector": [-21.7426, -8.44598, -21.35132],
"vector": [1.2574, -4.44598, 3.64868],
"easing": "easeOutSine"
},
"1.7917": {
"vector": [-21.7426, -8.44598, -21.35132],
"vector": [1.2574, -4.44598, 3.64868],
"easing": "easeOutSine"
},
"3.375": {
"vector": [-21.7426, -8.44598, -21.35132],
"vector": [1.2574, -4.44598, 3.64868],
"easing": "easeOutSine"
},
"3.5417": {
"vector": [-24.42266, -44.66287, -23.47349]
},
"3.7083": {
"vector": [-12.96929, -39.3572, -60.30001]
"vector": [-12.96929, -39.3572, -46.30001]
},
"3.7917": {
"vector": [-13.22775, -40.42384, -59.21314]
"vector": [-12.96929, -39.3572, -46.30001]
},
"3.875": {
"vector": [-12.53951, -37.21222, -62.43842]
},
"3.9167": {
"vector": [-12.29931, -35.77231, -63.84713]
},
"3.9583": {
"vector": [-12.53951, -37.21222, -62.43842]
"vector": [-12.53951, -37.21222, -65.43842]
},
"4.2083": {
"vector": [-21.52373, 2.87885, 5.45216],
"vector": [-21.52373, 2.87885, 13.45216],
"easing": "easeInOutSine"
},
"4.25": {
"vector": [-21.52373, 2.87885, 5.45216],
"vector": [-21.52373, 2.87885, 13.45216],
"easing": "easeInOutSine"
},
"4.4167": {
"vector": [-68.76834, -28.84985, -45.12465],
"vector": [-68.76834, -28.84985, -24.12465],
"easing": "easeInOutSine"
},
"4.5417": {
"vector": [-68.76834, -28.84985, -45.12465],
"vector": [-68.76834, -28.84985, -24.12465],
"easing": "easeInOutSine"
},
"4.6667": {
@ -1254,45 +1259,45 @@
"vector": [1.23, -2.04, 5.17]
},
"0.9583": {
"vector": [2.7, 4.9, 4.4]
"vector": [2.3, 5.9, 4.4]
},
"1.25": {
"vector": [1.8, 10.9, -1.41484],
"vector": [1.8, 10.9, -1.91484],
"easing": "easeInQuart"
},
"1.375": {
"vector": [1.8, 10.9, -1.41484],
"vector": [1.8, 10.9, -1.91484],
"easing": "easeInQuart"
},
"1.75": {
"vector": [5.9, -0.5, 7.1],
"vector": [4.3, 0.9, 7.1],
"easing": "easeInOutSine"
},
"1.7917": {
"vector": [5.9, -0.5, 7.1],
"vector": [4.3, 0.9, 7.1],
"easing": "easeInOutSine"
},
"3.375": {
"vector": [5.9, -0.5, 7.1],
"vector": [4.3, 0.9, 7.1],
"easing": "easeInOutSine"
},
"3.7083": {
"vector": [3.1, 6.2, 9.7]
"vector": [4.4, 5.8, 7.7]
},
"3.7917": {
"vector": [2.95, 6.75, 9.3]
"vector": [4.1, 6.2, 7.7]
},
"3.875": {
"vector": [2, 7.3, 8.9]
"vector": [4, 8.6, 7.9]
},
"3.9167": {
"vector": [2, 7.3, 8.9]
"vector": [3.8, 8.3, 7.9]
},
"3.9583": {
"vector": [2, 7.3, 8.9]
"vector": [4, 8.6, 7.9]
},
"4.0833": {
"vector": [1.2, 8.2, 6.79]
"vector": [3.5, 8.2, 7.39]
},
"4.2083": {
"vector": [0.4, 7.3, 4.68516],
@ -1618,6 +1623,106 @@
"vector": [0, 0, 0]
}
}
},
"camera": {
"rotation": {
"0.0": {
"vector": [0, 0, 0]
},
"0.1667": {
"vector": [-0.38, 0.25, 1]
},
"0.375": {
"vector": [-1, -1, -1]
},
"0.4583": {
"vector": [2, 1, -1]
},
"0.5833": {
"vector": [0, -0.5, 0]
},
"0.75": {
"vector": [0.35, 0.5, 0.5]
},
"1.0": {
"vector": [0.67, 0, -0.33]
},
"1.2083": {
"vector": [1.33, -1, -2]
},
"1.2917": {
"vector": [1.33, 1, 1]
},
"1.625": {
"vector": [1.33, -0.5, -1.25]
},
"1.7917": {
"vector": [2, -0.47, 1]
},
"1.9167": {
"vector": [1.93, 0.9, 2.5]
},
"2.0": {
"vector": [1.67, -0.9, -0.8]
},
"2.125": {
"vector": [2, 0.3, 1]
},
"2.2917": {
"vector": [1.74, -0.66, -0.44]
},
"2.6667": {
"vector": [1.74, -0.66, -1.5]
},
"3.0833": {
"vector": [1.46, -0.55, -1.26]
},
"3.1667": {
"vector": [2, -1, -2.5]
},
"3.2083": {
"vector": [0.3, -0.1, 1]
},
"3.3333": {
"vector": [1.58, -0.78, -1.63]
},
"3.5417": {
"vector": [0.3, -0.1, 1]
},
"3.8333": {
"vector": [1.07, -0.51, -0.58]
},
"3.875": {
"vector": [0.99, 0.3, 2]
},
"4.0": {
"vector": [0.86, -0.41, -1.5]
},
"4.0833": {
"vector": [-0.38, 0.25, 1]
},
"4.4167": {
"vector": [-1, -1, -1]
},
"4.5": {
"vector": [2, 1, -1]
},
"4.625": {
"vector": [0, -0.5, 0]
},
"5.25": {
"vector": [0.2, 0, 1.5]
},
"5.3333": {
"vector": [0.5, 1, 0.9]
},
"5.4167": {
"vector": [-0.5, -1, -1.5]
},
"5.5": {
"vector": [0, 0, 0]
}
}
}
}
}

File diff suppressed because it is too large Load diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 25 KiB

After

Width:  |  Height:  |  Size: 53 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.6 KiB

After

Width:  |  Height:  |  Size: 7.7 KiB