diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/SenpaiEntity.java b/src/main/java/com/atsuishio/superbwarfare/entity/SenpaiEntity.java index 3fba5c032..d1da26ed7 100644 --- a/src/main/java/com/atsuishio/superbwarfare/entity/SenpaiEntity.java +++ b/src/main/java/com/atsuishio/superbwarfare/entity/SenpaiEntity.java @@ -139,7 +139,7 @@ public class SenpaiEntity extends Monster implements GeoEntity { return event.setAndContinue(RawAnimation.begin().thenPlay("animation.senpai.die")); } if (this.isAggressive() && event.isMoving()) { - return event.setAndContinue(RawAnimation.begin().thenLoop("animation.senpai.run")); + return event.setAndContinue(RawAnimation.begin().thenLoop("animation.senpai.run2")); } return event.setAndContinue(RawAnimation.begin().thenLoop("animation.senpai.idle")); } diff --git a/src/main/resources/assets/superbwarfare/animations/senpai.animation.json b/src/main/resources/assets/superbwarfare/animations/senpai.animation.json index f2f81bc6d..d2410f595 100644 --- a/src/main/resources/assets/superbwarfare/animations/senpai.animation.json +++ b/src/main/resources/assets/superbwarfare/animations/senpai.animation.json @@ -38,105 +38,102 @@ "animation_length": 1, "bones": { "upper": { + "rotation": { + "0.0": [0, 0, 0], + "0.25": [0, 2.5, 2.5], + "0.5": [0, 0, 0], + "0.75": [0, -2.5, -2.5], + "1.0": [0, 0, 0] + }, "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.25": { - "vector": [0, -0.4, 0] - }, - "0.5": { - "vector": [0, 0, 0] - }, - "0.75": { - "vector": [0, -0.4, 0] - }, - "1.0": { - "vector": [0, 0, 0] - } + "0.0": [0, 0, 0], + "0.25": [0, -0.9, 0], + "0.5": [0, 0, 0], + "0.75": [0, -0.9, 0], + "1.0": [0, 0, 0] } }, "right_arm": { "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.25": { - "vector": [-20, 0, 0] - }, - "0.75": { - "vector": [20, 0, 0] - }, - "1.0": { - "vector": [0, 0, 0] - } + "0.0": [0, 0, 4], + "0.25": [-20, 0, 4], + "0.75": [20, 0, 4], + "1.0": [0, 0, 4] } }, "left_arm": { "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.25": { - "vector": [20, 0, 0] - }, - "0.75": { - "vector": [-20, 0, 0] - }, - "1.0": { - "vector": [0, 0, 0] - } + "0.0": [0, 0, -4], + "0.25": [20, 0, -4], + "0.75": [-20, 0, -4], + "1.0": [0, 0, -4] } }, "lower": { "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.25": { - "vector": [0, -0.4, 0] - }, - "0.5": { - "vector": [0, 0, 0] - }, - "0.75": { - "vector": [0, -0.4, 0] - }, - "1.0": { - "vector": [0, 0, 0] - } + "0.0": [0, 0, 0], + "0.25": [0, -0.4, 0], + "0.5": [0, 0, 0], + "0.75": [0, -0.4, 0], + "1.0": [0, 0, 0] } }, "rightleg": { "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.25": { - "vector": [20, 0, 0] - }, - "0.75": { - "vector": [-20, 0, 0] - }, - "1.0": { - "vector": [0, 0, 0] - } + "0.0": [0, 0, 0], + "0.25": [20, 0, 0], + "0.75": [-20, 0, 0], + "1.0": [0, 0, 0] } }, "leftleg": { "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.25": { - "vector": [-20, 0, 0] - }, - "0.75": { - "vector": [20, 0, 0] - }, - "1.0": { - "vector": [0, 0, 0] - } + "0.0": [0, 0, 0], + "0.25": [-20, 0, 0], + "0.75": [20, 0, 0], + "1.0": [0, 0, 0] + } + }, + "head": { + "rotation": { + "0.0": [0, 0, 0], + "0.25": [2.5, 0, -2.5], + "0.5": [0, 0, 0], + "0.75": [2.5, 0, 2.5], + "1.0": [0, 0, 0] + } + }, + "left_arm2": { + "rotation": { + "0.0": [0, 0, 0], + "0.25": [-5, 0, 0], + "0.75": [0, 0, 0], + "1.0": [0, 0, 0] + } + }, + "right_arm2": { + "rotation": { + "0.0": [-2.5, 0, 0], + "0.25": [0, 0, 0], + "0.75": [-5, 0, 0], + "1.0": [-2.5, 0, 0] + } + }, + "rightleg2": { + "rotation": { + "0.0": [0, 0, 0], + "0.25": [0, 0, 0], + "0.5": [25, 0, 0], + "0.75": [0, 0, 0], + "1.0": [0, 0, 0] + } + }, + "leftleg2": { + "rotation": { + "0.0": [25, 0, 0], + "0.25": [0, 0, 0], + "0.75": [0, 0, 0], + "1.0": [25, 0, 0] } } } @@ -494,6 +491,234 @@ } } }, + "animation.senpai.run2": { + "loop": true, + "animation_length": 0.6667, + "bones": { + "0": { + "position": { + "0.0": [0, 0, 0], + "0.1667": [0, -1, 0], + "0.3333": [0, 0, 0], + "0.5": [0, -1, 0], + "0.6667": [0, 0, 0] + } + }, + "upper": { + "rotation": { + "0.0": [10.06689, -8.25323, 3.6169], + "0.1667": [10.01934, 2.46192, 0.43482], + "0.3333": [10.06689, 8.25322, -3.61691], + "0.5": [10.01934, -2.46192, -0.43482], + "0.6667": [10.06689, -8.25323, 3.6169] + } + }, + "right_arm": { + "rotation": { + "0.0": { + "post": [0, -20, 10], + "lerp_mode": "catmullrom" + }, + "0.1667": { + "post": [-65, -15, 10], + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": [42.5, -15, 10], + "lerp_mode": "catmullrom" + }, + "0.6667": { + "post": [0, -20, 10], + "lerp_mode": "catmullrom" + } + } + }, + "left_arm": { + "rotation": { + "0.0": { + "post": [0, 16, -10], + "lerp_mode": "catmullrom" + }, + "0.1667": { + "post": [42.5, 16, -10], + "lerp_mode": "catmullrom" + }, + "0.3333": { + "post": [-11.58037, 20.90124, -11.04289], + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": [-65, 16, -10], + "lerp_mode": "catmullrom" + }, + "0.6667": { + "post": [0, 16, -10], + "lerp_mode": "catmullrom" + } + } + }, + "rightleg": { + "rotation": { + "0.0": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.1667": { + "post": [42.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": [-65, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.6667": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + } + } + }, + "leftleg": { + "rotation": { + "0.0": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.1667": { + "post": [-65, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": [42.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.6667": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + } + } + }, + "head": { + "rotation": { + "0.0": { + "post": [-10, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.1667": { + "post": [10.26378, 10.08896, -10.30577], + "lerp_mode": "catmullrom" + }, + "0.3333": { + "post": [-10.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": [10.26378, -10.08896, 10.30577], + "lerp_mode": "catmullrom" + }, + "0.6667": { + "post": [-10, 0, 0], + "lerp_mode": "catmullrom" + } + } + }, + "left_arm2": { + "rotation": { + "0.0": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.0833": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.3333": { + "post": [-67.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5833": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.6667": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + } + } + }, + "right_arm2": { + "rotation": { + "0.0": { + "post": [-67.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.0833": { + "post": [-67.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.3333": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5833": { + "post": [-67.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.6667": { + "post": [-67.5, 0, 0], + "lerp_mode": "catmullrom" + } + } + }, + "rightleg2": { + "rotation": { + "0.0": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.1667": { + "post": [45, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.3333": { + "post": [47.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": [45, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.6667": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + } + } + }, + "leftleg2": { + "rotation": { + "0.0": { + "post": [25, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.1667": { + "post": [45, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.3333": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": [45, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.6667": { + "post": [25, 0, 0], + "lerp_mode": "catmullrom" + } + } + } + } + }, "animation.senpai.die": { "loop": "hold_on_last_frame", "animation_length": 2, @@ -501,484 +726,237 @@ "bones": { "upper": { "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.125": { - "vector": [20, 0, 0] - }, - "0.3333": { - "vector": [-12.5, 0, 0] - }, - "0.5": { - "vector": [0, 0, 0] - }, - "0.625": { - "vector": [-4, 0, 0] - }, - "0.9167": { - "vector": [-90, 0, 0] - }, - "1.9583": { - "vector": [-90, 0, 0] - } + "0.0": [0, 0, 0], + "0.125": [20, 0, 0], + "0.3333": [-12.5, 0, 0], + "0.5": [0, 0, 0], + "0.625": [-4, 0, 0], + "0.9167": [-90, 0, 0], + "1.9583": [-90, 0, 0] }, "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.0417": { - "vector": [0, 0, 4.75] - }, - "0.0833": { - "vector": [0, -0.82812, 6.96594] - }, - "0.125": { - "vector": [0, -2, 9] - }, - "0.1667": { - "vector": [0, -5.5, 12.25] - }, - "0.2083": { - "vector": [0, -7.62109, 13.43078] - }, - "0.25": { - "vector": [0, -10, 14] - }, - "1.9583": { - "vector": [0, -10, 14] - } + "0.0": [0, 0, 0], + "0.0417": [0, 0, 4.75], + "0.0833": [0, -0.82812, 6.96594], + "0.125": [0, -2, 9], + "0.1667": [0, -5.5, 12.25], + "0.2083": [0, -7.62109, 13.43078], + "0.25": [0, -10, 14], + "1.9583": [0, -10, 14] } }, "head": { "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.125": { - "vector": [24.18, 0, 0] - }, - "0.375": { - "vector": [-24.08, 0, 0] - }, - "0.5833": { - "vector": [22.38, 0, 0] - }, - "0.9167": { - "vector": [-7.5, 0, 0] - }, - "1.0": { - "vector": [2.5, 0, 0] - }, - "1.125": { - "vector": [-7.5, 0, 0] - }, - "1.9583": { - "vector": [-7.5, 0, 0] - } + "0.0": [0, 0, 0], + "0.125": [24.18, 0, 0], + "0.375": [-24.08, 0, 0], + "0.5833": [22.38, 0, 0], + "0.9167": [-7.5, 0, 0], + "1.0": [2.5, 0, 0], + "1.125": [-7.5, 0, 0], + "1.9583": [-7.5, 0, 0] }, "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.75": { - "vector": [0, 0, 0] - }, - "0.9583": { - "vector": [0, 0, -2] - }, - "1.9583": { - "vector": [0, 0, -2] - } + "0.0": [0, 0, 0], + "0.75": [0, 0, 0], + "0.9583": [0, 0, -2], + "1.9583": [0, 0, -2] } }, "body_total": { "rotation": { - "0.0": { - "vector": [0, 10, 0] - }, - "0.25": { - "vector": [0, 0, 0] - }, - "1.9583": { - "vector": [0, 0, 0] - } + "0.0": [0, 10, 0], + "0.25": [0, 0, 0], + "1.9583": [0, 0, 0] } }, "right_arm": { "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.125": { - "vector": [-71.03258, 7.38792, 6.20286] - }, - "0.3333": { - "vector": [3.50376, 3.04724, 4.61734] - }, - "0.4583": { - "vector": [14.03, -0.88, 8.87] - }, - "0.5833": { - "vector": [-1.44928, -4.8074, 13.12453] - }, - "0.75": { - "vector": [-17.37455, -2.1376, 7.69704] - }, - "1.0": { - "vector": [-12.58296, -3.26661, 9.89396] - }, - "1.125": { - "vector": [6.5834, -7.78266, 18.68164] - }, - "2.0": { - "vector": [6.5834, -7.78266, 18.68164] - } + "0.0": [0, 0, 0], + "0.125": [-71.03258, 7.38792, 6.20286], + "0.3333": [3.50376, 3.04724, 4.61734], + "0.4583": [14.03, -0.88, 8.87], + "0.5833": [-1.44928, -4.8074, 13.12453], + "0.75": [-17.37455, -2.1376, 7.69704], + "1.0": [-12.58296, -3.26661, 9.89396], + "1.125": [6.5834, -7.78266, 18.68164], + "2.0": [6.5834, -7.78266, 18.68164] } }, "rightarm2": { "rotation": { - "0.0": { - "vector": [-18.39032, -17.80324, -0.60089] - }, - "0.1667": { - "vector": [-0.17118, -8.29184, -3.77457] - }, - "0.9167": { - "vector": [-0.17, -8.29, -3.77] - }, - "1.9583": { - "vector": [-0.17, -8.29, -3.77] - } + "0.0": [-18.39032, -17.80324, -0.60089], + "0.1667": [-0.17118, -8.29184, -3.77457], + "0.9167": [-0.17, -8.29, -3.77], + "1.9583": [-0.17, -8.29, -3.77] } }, "spare": { "rotation": { - "0.0": { - "vector": [0.83619, -17.07228, -3.90399] - }, - "0.1667": { - "vector": [0.81276, 10.42498, -3.51141] - }, - "0.7917": { - "vector": [0.81, 10.42, -3.51] - }, - "1.125": { - "vector": [177.41262, 72.06186, 173.88173] - }, - "1.1667": { - "vector": [177.41262, 72.06186, 173.88173] - }, - "1.375": { - "vector": [175.60411, 79.54891, 172.02025] - }, - "1.5833": { - "vector": [177.41262, 72.06186, 173.88173] - }, - "1.75": { - "vector": [177.00663, 74.55892, 173.45798] - }, - "1.875": { - "vector": [177.41262, 72.06186, 173.88173] - }, - "1.9583": { - "vector": [177.41, 72.06, 173.88] - } + "0.0": [0.83619, -17.07228, -3.90399], + "0.1667": [0.81276, 10.42498, -3.51141], + "0.7917": [0.81, 10.42, -3.51], + "1.125": [177.41262, 72.06186, 173.88173], + "1.1667": [177.41262, 72.06186, 173.88173], + "1.375": [175.60411, 79.54891, 172.02025], + "1.5833": [177.41262, 72.06186, 173.88173], + "1.75": [177.00663, 74.55892, 173.45798], + "1.875": [177.41262, 72.06186, 173.88173], + "1.9583": [177.41, 72.06, 173.88] }, "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "1.0417": { - "vector": [0, 0, 0] - }, - "1.3333": { - "vector": [-1, -1.7, 0.6] - }, - "1.875": { - "vector": [-1, -1.7, 0.6] - }, - "1.9583": { - "vector": [-1, -1.7, 0.6] - } + "0.0": [0, 0, 0], + "1.0417": [0, 0, 0], + "1.3333": [-1, -1.7, 0.6], + "1.875": [-1, -1.7, 0.6], + "1.9583": [-1, -1.7, 0.6] } }, "left_arm": { "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.125": { - "vector": [-77.25742, -5.73853, -9.00377] - }, - "0.3333": { - "vector": [0, 0, -7.5] - }, - "0.4583": { - "vector": [15, 0, -7.5] - }, - "0.5833": { - "vector": [2, 0, -7.5] - }, - "0.75": { - "vector": [-47.5, 0, -7.5] - }, - "1.0": { - "vector": [-11.65587, -0.50539, -9.94842] - }, - "1.125": { - "vector": [0, 0, -22.5] - }, - "2.0": { - "vector": [0, 0, -22.5] - } + "0.0": [0, 0, 0], + "0.125": [-77.25742, -5.73853, -9.00377], + "0.3333": [0, 0, -7.5], + "0.4583": [15, 0, -7.5], + "0.5833": [2, 0, -7.5], + "0.75": [-47.5, 0, -7.5], + "1.0": [-11.65587, -0.50539, -9.94842], + "1.125": [0, 0, -22.5], + "2.0": [0, 0, -22.5] } }, "leftarm2": { "rotation": { - "0.0": { - "vector": [-14.47761, 5.24826, 11.36081] - }, - "1.9583": { - "vector": [-14.48, 5.25, 11.36] - } + "0.0": [-14.47761, 5.24826, 11.36081], + "1.9583": [-14.48, 5.25, 11.36] } }, "lower": { "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.25": { - "vector": [-90, 0, 0] - }, - "1.9583": { - "vector": [-90, 0, 0] - } + "0.0": [0, 0, 0], + "0.25": [-90, 0, 0], + "1.9583": [-90, 0, 0] }, "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.0417": { - "vector": [0, 0, 4.75] - }, - "0.0833": { - "vector": [0, -0.82812, 6.96594] - }, - "0.125": { - "vector": [0, -2, 9] - }, - "0.1667": { - "vector": [0, -5.5, 12.25] - }, - "0.2083": { - "vector": [0, -7.62109, 13.43078] - }, - "0.25": { - "vector": [0, -10, 14] - }, - "1.9583": { - "vector": [0, -10, 14] - } + "0.0": [0, 0, 0], + "0.0417": [0, 0, 4.75], + "0.0833": [0, -0.82812, 6.96594], + "0.125": [0, -2, 9], + "0.1667": [0, -5.5, 12.25], + "0.2083": [0, -7.62109, 13.43078], + "0.25": [0, -10, 14], + "1.9583": [0, -10, 14] } }, "rightleg": { "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.25": { - "vector": [0, 0, 7.5] - }, - "0.6667": { - "vector": [0, 0, 7.5] - }, - "0.875": { - "vector": [-27.5, 0, 7.5] - }, - "1.0833": { - "vector": [0, 0, 7.5] - }, - "1.9583": { - "vector": [0, 0, 7.5] - } + "0.0": [0, 0, 0], + "0.25": [0, 0, 7.5], + "0.6667": [0, 0, 7.5], + "0.875": [-27.5, 0, 7.5], + "1.0833": [0, 0, 7.5], + "1.9583": [0, 0, 7.5] } }, "rightleg2": { "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.6667": { - "vector": [0, 0, 0] - }, - "0.875": { - "vector": [12.5, 0, 0] - }, - "1.0833": { - "vector": [0, 0, 0] - }, - "1.9583": { - "vector": [0, 0, 0] - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.6667": { - "vector": [0, 0, 0] - }, - "1.9583": { - "vector": [0, 0, 0] - } + "0.0": [0, 0, 0], + "0.6667": [0, 0, 0], + "0.875": [32.5, 0, 0], + "1.0833": [0, 0, 0], + "1.9583": [0, 0, 0] } }, "leftleg": { "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.25": { - "vector": [0, 0, -7.5] - }, - "0.6667": { - "vector": [0, 0, -7.5] - }, - "0.875": { - "vector": [-27.5, 0, -7.5] - }, - "1.0833": { - "vector": [0, 0, -7.5] - }, - "1.9583": { - "vector": [0, 0, -7.5] - } + "0.0": [0, 0, 0], + "0.25": [0, 0, -7.5], + "0.6667": [0, 0, -7.5], + "0.875": [-27.5, 0, -7.5], + "1.0833": [0, 0, -7.5], + "1.9583": [0, 0, -7.5] } }, "leftleg2": { "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.6667": { - "vector": [0, 0, 0] - }, - "0.875": { - "vector": [15, 0, 0] - }, - "1.0833": { - "vector": [0, 0, 0] - }, - "1.9583": { - "vector": [0, 0, 0] - } + "0.0": [0, 0, 0], + "0.6667": [0, 0, 0], + "0.875": [32.5, 0, 0], + "1.0833": [0, 0, 0], + "1.9583": [0, 0, 0] } }, "youmei": { "rotation": { - "0.0": { - "vector": [0, 0, -22.5] - }, - "0.5833": { - "vector": [0, 0, -22.5] - }, - "0.7917": { - "vector": [0, 0, 7.5] - }, - "1.9583": { - "vector": [0, 0, 7.5] - } + "0.0": [0, 0, -22.5], + "0.5833": [0, 0, -22.5], + "0.7917": [0, 0, 7.5], + "1.9583": [0, 0, 7.5] } }, "zuomei": { "rotation": { - "0.0": { - "vector": [0, 0, 22.5] - }, - "0.5833": { - "vector": [0, 0, 22.5] - }, - "0.7917": { - "vector": [0, 0, -7.5] - }, - "1.9583": { - "vector": [0, 0, -7.5] - } + "0.0": [0, 0, 22.5], + "0.5833": [0, 0, 22.5], + "0.7917": [0, 0, -7.5], + "1.9583": [0, 0, -7.5] } }, "eyes": { "scale": { - "0.0": { - "vector": [1, 1, 1] - }, - "0.125": { - "vector": [1, 1, 1] - }, - "0.25": { - "vector": [1, 0.1, 1] - }, - "0.5": { - "vector": [1, 1.28, 1] - }, - "1.9583": { - "vector": [1, 1.28, 1] - } + "0.0": [1, 1, 1], + "0.125": [1, 1, 1], + "0.25": [1, 0.1, 1], + "0.5": [1, 1.28, 1], + "1.9583": [1, 1.28, 1] } }, "lefttongkong": { "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.2917": { - "vector": [0, 0, 0] - }, - "0.5833": { - "vector": [0, 0.5, 0] - }, - "1.9583": { - "vector": [0, 0.5, 0] - } + "0.0": [0, 0, 0], + "0.2917": [0, 0, 0], + "0.5833": [0, 0.5, 0], + "1.9583": [0, 0.5, 0] }, "scale": { - "0.0": { - "vector": [1, 1, 1] - }, - "0.25": { - "vector": [1, 1, 1] - }, - "0.5": { - "vector": [0.7, 0.4, 1] - } + "0.0": [1, 1, 1], + "0.25": [1, 1, 1], + "0.5": [0.7, 0.4, 1] } }, "righttongkong": { "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.2917": { - "vector": [0, 0, 0] - }, - "0.5833": { - "vector": [0, 0.5, 0] - }, - "1.9583": { - "vector": [0, 0.5, 0] - } + "0.0": [0, 0, 0], + "0.2917": [0, 0, 0], + "0.5833": [0, 0.5, 0], + "1.9583": [0, 0.5, 0] }, "scale": { - "0.0": { - "vector": [1, 1, 1] - }, - "0.25": { - "vector": [1, 1, 1] - }, - "0.5": { - "vector": [0.7, 0.4, 1] - } + "0.0": [1, 1, 1], + "0.25": [1, 1, 1], + "0.5": [0.7, 0.4, 1] + } + }, + "left_arm2": { + "rotation": { + "0.0": [0, 0, 0], + "0.125": [-22.5, 0, 0], + "0.3333": [-22.5, 0, 0], + "0.4583": [0, 0, 0], + "0.5833": [0, 0, 0], + "0.75": [-45, 0, 0], + "1.0": [0, 0, 0] + } + }, + "right_arm2": { + "rotation": { + "0.0": [0, 0, 0], + "0.125": [-22.5, 0, 0], + "0.3333": [-22.5, 0, 0], + "0.4583": [0, 0, 0], + "0.5833": [0, 0, 0], + "0.75": [-45, 0, 0], + "1.0": [0, 0, 0] } } } diff --git a/src/main/resources/assets/superbwarfare/geo/senpai.geo.json b/src/main/resources/assets/superbwarfare/geo/senpai.geo.json index 7d747fdd9..030596f5a 100644 --- a/src/main/resources/assets/superbwarfare/geo/senpai.geo.json +++ b/src/main/resources/assets/superbwarfare/geo/senpai.geo.json @@ -6,7 +6,7 @@ "identifier": "geometry.ChiramIdolChestplateModel", "texture_width": 64, "texture_height": 64, - "visible_bounds_width": 4, + "visible_bounds_width": 6, "visible_bounds_height": 4.5, "visible_bounds_offset": [0, 1.75, 0] }, @@ -64,27 +64,46 @@ "pivot": [-5, 22, 0], "cubes": [ { - "origin": [-8, 12.25, -2], - "size": [4, 7.75, 4], + "origin": [-8, 18, -2], + "size": [4, 2, 4], "uv": { - "north": {"uv": [26, 0], "uv_size": [4.5, 8]}, - "east": {"uv": [26, 26], "uv_size": [4, 8]}, - "south": {"uv": [26, 18], "uv_size": [4.5, 8]}, - "west": {"uv": [0, 28], "uv_size": [4, 8]}, - "up": {"uv": [18, 8], "uv_size": [4.5, 4]}, - "down": {"uv": [39, 28], "uv_size": [4.5, -4]} + "north": {"uv": [26, 6], "uv_size": [4, 2]}, + "east": {"uv": [4, 44], "uv_size": [4, 2]}, + "south": {"uv": [44, 16], "uv_size": [4, 2]}, + "west": {"uv": [44, 18], "uv_size": [4, 2]}, + "up": {"uv": [36, 41], "uv_size": [4, 4]}, + "down": {"uv": [41, 42], "uv_size": [4, -4]} } }, { "origin": [-8.25, 20, -2.25], "size": [4.25, 4, 4.5], "uv": { - "north": {"uv": [43, 12], "uv_size": [4, 4]}, - "east": {"uv": [40, 35], "uv_size": [4.5, 4]}, - "south": {"uv": [16, 43], "uv_size": [4, 4]}, - "west": {"uv": [40, 39], "uv_size": [4.5, 4]}, - "up": {"uv": [35, 41], "uv_size": [4, 4.5]}, - "down": {"uv": [0, 46.5], "uv_size": [4, -4.5]} + "north": {"uv": [18, 8], "uv_size": [4.5, 4]}, + "east": {"uv": [39, 26], "uv_size": [4.5, 4]}, + "south": {"uv": [39, 30], "uv_size": [4.5, 4]}, + "west": {"uv": [0, 40], "uv_size": [4.5, 4]}, + "up": {"uv": [31, 36], "uv_size": [4.5, 4.5]}, + "down": {"uv": [36, 40.5], "uv_size": [4.5, -4.5]} + } + } + ] + }, + { + "name": "right_arm2", + "parent": "right_arm", + "pivot": [-6, 18, 2], + "cubes": [ + { + "origin": [-8, 12, -2], + "size": [4, 6, 4], + "uv": { + "north": {"uv": [35, 30], "uv_size": [4, 6]}, + "east": {"uv": [36, 0], "uv_size": [4, 6]}, + "south": {"uv": [23, 36], "uv_size": [4, 6]}, + "west": {"uv": [27, 36], "uv_size": [4, 6]}, + "up": {"uv": [18, 43], "uv_size": [4, 4]}, + "down": {"uv": [0, 48], "uv_size": [4, -4]} } } ] @@ -95,15 +114,15 @@ "pivot": [5, 22, 0], "cubes": [ { - "origin": [4, 12, -2], - "size": [4, 8, 4], + "origin": [4, 18, -2], + "size": [4, 2, 4], "uv": { - "north": {"uv": [4, 28], "uv_size": [4, 8]}, - "east": {"uv": [8, 28], "uv_size": [4, 8]}, - "south": {"uv": [12, 28], "uv_size": [4, 8]}, - "west": {"uv": [30, 26], "uv_size": [4, 8]}, - "up": {"uv": [43, 4], "uv_size": [4, 4]}, - "down": {"uv": [43, 12], "uv_size": [4, -4]} + "north": {"uv": [44, 20], "uv_size": [4, 2]}, + "east": {"uv": [44, 22], "uv_size": [4, 2]}, + "south": {"uv": [44, 24], "uv_size": [4, 2]}, + "west": {"uv": [44, 26], "uv_size": [4, 2]}, + "up": {"uv": [42, 4], "uv_size": [4, 4]}, + "down": {"uv": [42, 12], "uv_size": [4, -4]} } }, { @@ -111,11 +130,30 @@ "size": [4.25, 4, 4.5], "uv": { "north": {"uv": [40, 0], "uv_size": [4.5, 4]}, - "east": {"uv": [40, 16], "uv_size": [4.5, 4]}, - "south": {"uv": [40, 20], "uv_size": [4.5, 4]}, - "west": {"uv": [26, 40], "uv_size": [4.5, 4]}, - "up": {"uv": [21, 38], "uv_size": [4.5, 4.5]}, - "down": {"uv": [38, 34.5], "uv_size": [4.5, -4.5]} + "east": {"uv": [5, 40], "uv_size": [4.5, 4]}, + "south": {"uv": [31, 41], "uv_size": [4.5, 4]}, + "west": {"uv": [41, 34], "uv_size": [4.5, 4]}, + "up": {"uv": [37, 6], "uv_size": [4.5, 4.5]}, + "down": {"uv": [37, 15.5], "uv_size": [4.5, -4.5]} + } + } + ] + }, + { + "name": "left_arm2", + "parent": "left_arm", + "pivot": [6, 18, 2], + "cubes": [ + { + "origin": [4, 12, -2], + "size": [4, 6, 4], + "uv": { + "north": {"uv": [4, 34], "uv_size": [4, 6]}, + "east": {"uv": [8, 34], "uv_size": [4, 6]}, + "south": {"uv": [35, 18], "uv_size": [4, 6]}, + "west": {"uv": [35, 24], "uv_size": [4, 6]}, + "up": {"uv": [10, 43], "uv_size": [4, 4]}, + "down": {"uv": [14, 47], "uv_size": [4, -4]} } } ] @@ -130,28 +168,35 @@ "parent": "lower", "pivot": [-1.9, 12, 0], "cubes": [ - { - "origin": [-4, 0, -2], - "size": [4, 6, 4], - "uv": { - "north": {"uv": [34, 30], "uv_size": [4, 6]}, - "east": {"uv": [0, 36], "uv_size": [4, 6]}, - "south": {"uv": [36, 0], "uv_size": [4, 6]}, - "west": {"uv": [4, 36], "uv_size": [4, 6]}, - "up": {"uv": [4, 42], "uv_size": [4, 4]}, - "down": {"uv": [8, 46], "uv_size": [4, -4]} - } - }, { "origin": [-4.25, 6, -2.25], "size": [4.5, 6, 4.5], "uv": { - "north": {"uv": [33, 6], "uv_size": [4.5, 6]}, - "east": {"uv": [33, 12], "uv_size": [4.5, 6]}, - "south": {"uv": [34, 24], "uv_size": [4.5, 6]}, - "west": {"uv": [26, 34], "uv_size": [4.5, 6]}, - "up": {"uv": [38, 11], "uv_size": [4.5, 4.5]}, - "down": {"uv": [16, 42.5], "uv_size": [4.5, -4.5]} + "north": {"uv": [26, 0], "uv_size": [4.5, 6]}, + "east": {"uv": [26, 18], "uv_size": [4.5, 6]}, + "south": {"uv": [26, 24], "uv_size": [4.5, 6]}, + "west": {"uv": [0, 28], "uv_size": [4.5, 6]}, + "up": {"uv": [12, 38], "uv_size": [4.5, 4.5]}, + "down": {"uv": [17, 42.5], "uv_size": [4.5, -4.5]} + } + } + ] + }, + { + "name": "rightleg2", + "parent": "rightleg", + "pivot": [-2, 6, -2], + "cubes": [ + { + "origin": [-4, 0, -2], + "size": [4, 6, 4], + "uv": { + "north": {"uv": [31, 18], "uv_size": [4, 6]}, + "east": {"uv": [31, 24], "uv_size": [4, 6]}, + "south": {"uv": [31, 30], "uv_size": [4, 6]}, + "west": {"uv": [15, 32], "uv_size": [4, 6]}, + "up": {"uv": [42, 12], "uv_size": [4, 4]}, + "down": {"uv": [22, 46], "uv_size": [4, -4]} } } ] @@ -161,28 +206,35 @@ "parent": "lower", "pivot": [1.9, 12, 0], "cubes": [ - { - "origin": [0, 0, -2], - "size": [4, 6, 4], - "uv": { - "north": {"uv": [8, 36], "uv_size": [4, 6]}, - "east": {"uv": [12, 36], "uv_size": [4, 6]}, - "south": {"uv": [36, 18], "uv_size": [4, 6]}, - "west": {"uv": [31, 36], "uv_size": [4, 6]}, - "up": {"uv": [12, 42], "uv_size": [4, 4]}, - "down": {"uv": [31, 46], "uv_size": [4, -4]} - } - }, { "origin": [-0.25, 6, -2.25], "size": [4.5, 6, 4.5], "uv": { - "north": {"uv": [31, 0], "uv_size": [4.5, 6]}, - "east": {"uv": [31, 18], "uv_size": [4.5, 6]}, - "south": {"uv": [16, 32], "uv_size": [4.5, 6]}, - "west": {"uv": [21, 32], "uv_size": [4.5, 6]}, - "up": {"uv": [35, 36], "uv_size": [4.5, 4.5]}, - "down": {"uv": [38, 10.5], "uv_size": [4.5, -4.5]} + "north": {"uv": [5, 28], "uv_size": [4.5, 6]}, + "east": {"uv": [10, 28], "uv_size": [4.5, 6]}, + "south": {"uv": [26, 30], "uv_size": [4.5, 6]}, + "west": {"uv": [31, 0], "uv_size": [4.5, 6]}, + "up": {"uv": [39, 16], "uv_size": [4.5, 4.5]}, + "down": {"uv": [39, 25.5], "uv_size": [4.5, -4.5]} + } + } + ] + }, + { + "name": "leftleg2", + "parent": "leftleg", + "pivot": [2, 6, -2], + "cubes": [ + { + "origin": [0, 0, -2], + "size": [4, 6, 4], + "uv": { + "north": {"uv": [19, 32], "uv_size": [4, 6]}, + "east": {"uv": [33, 6], "uv_size": [4, 6]}, + "south": {"uv": [33, 12], "uv_size": [4, 6]}, + "west": {"uv": [0, 34], "uv_size": [4, 6]}, + "up": {"uv": [26, 42], "uv_size": [4, 4]}, + "down": {"uv": [40, 46], "uv_size": [4, -4]} } } ] diff --git a/src/main/resources/assets/superbwarfare/textures/entity/senpai.png b/src/main/resources/assets/superbwarfare/textures/entity/senpai.png index 6c1353a00..04d0f34c2 100644 Binary files a/src/main/resources/assets/superbwarfare/textures/entity/senpai.png and b/src/main/resources/assets/superbwarfare/textures/entity/senpai.png differ