Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Penance Ranger #747

Merged
merged 2 commits into from
Jan 17, 2024
Merged

Penance Ranger #747

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e9f626d
Penance Ranger
EnderSven Jan 17, 2024
d689215
Mobs Assigned
EnderSven Jan 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions assets/minecraft/models/item/apple.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@
{"predicate": {"custom_model_data":32},"model":"ms:mobs/giant_mole/baby_mole_pink"},
{"predicate": {"custom_model_data":33},"model":"ms:mobs/giant_mole/baby_mole_grey"},
{"predicate": {"custom_model_data":34},"model":"ms:mobs/giantrat/dungeon_rat"},
{"predicate": {"custom_model_data":35},"model":"item/empty"},
{"predicate": {"custom_model_data":36},"model":"item/empty"},
{"predicate": {"custom_model_data":37},"model":"item/empty"},
{"predicate": {"custom_model_data":38},"model":"item/empty"},
{"predicate": {"custom_model_data":35},"model":"ms:mobs/barbarian_assault/penance_ranger"},
{"predicate": {"custom_model_data":36},"model":"ms:mobs/barbarian_assault/penance_fighter"},
{"predicate": {"custom_model_data":37},"model":"ms:mobs/barbarian_assault/penance_healer"},
{"predicate": {"custom_model_data":38},"model":"ms:mobs/barbarian_assault/penance_runner"},
{"predicate": {"custom_model_data":39},"model":"item/empty"},
{"predicate": {"custom_model_data":40},"model":"item/empty"},
{"predicate": {"custom_model_data":41},"model":"item/empty"},
Expand Down
Binary file added assets/minecraft/textures/item/custom/colors/penance_set/rangerwings.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
160 changes: 80 additions & 80 deletions assets/ms/models/mobs/barbarian_assault/penance_fighter.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
"elements": [
{
"name": "Body",
"from": [5.0329, 21.38489, 5.3933],
"to": [11.0584, 22.58739, 10.0897],
"rotation": {"angle": 0, "axis": "y", "origin": [0.4114, -2.07031, 1.07389]},
"from": [5.0579, 21.38489, 5.3933],
"to": [11.0834, 22.58739, 10.0897],
"rotation": {"angle": 0, "axis": "y", "origin": [0.4364, -2.07031, 1.07389]},
"faces": {
"north": {"uv": [4, 7, 9.625, 12.25], "texture": "#1"},
"east": {"uv": [4, 7, 9.625, 12.25], "texture": "#1"},
Expand All @@ -26,9 +26,9 @@
},
{
"name": "Body",
"from": [6.9829, 22.25989, 5.3933],
"to": [9.0084, 23.48739, 10.0897],
"rotation": {"angle": 0, "axis": "y", "origin": [0.4114, -2.07031, 1.07389]},
"from": [7.0079, 22.25989, 5.3933],
"to": [9.0334, 23.48739, 10.0897],
"rotation": {"angle": 0, "axis": "y", "origin": [0.4364, -2.07031, 1.07389]},
"faces": {
"north": {"uv": [4, 7, 9.625, 12.25], "texture": "#1"},
"east": {"uv": [4, 7, 9.625, 12.25], "texture": "#1"},
Expand All @@ -39,9 +39,9 @@
},
{
"name": "Body2",
"from": [4.1554, 21.70989, 5.40793],
"to": [5.0329, 22.93839, 10.0897],
"rotation": {"angle": -45, "axis": "z", "origin": [4.1554, 21.70994, 6.25114]},
"from": [4.1804, 21.70989, 5.40793],
"to": [5.0579, 22.93839, 10.0897],
"rotation": {"angle": -45, "axis": "z", "origin": [4.1804, 21.70994, 6.25114]},
"faces": {
"north": {"uv": [4, 7, 9.625, 12.25], "texture": "#1"},
"south": {"uv": [4, 7, 9.625, 12.25], "texture": "#1"},
Expand All @@ -51,9 +51,9 @@
},
{
"name": "Body3",
"from": [11.0584, 21.70989, 5.41679],
"to": [12.2869, 22.58739, 10.09272],
"rotation": {"angle": -45, "axis": "z", "origin": [11.0584, 22.58744, 6.25114]},
"from": [11.0834, 21.70989, 5.41679],
"to": [12.3119, 22.58739, 10.09272],
"rotation": {"angle": -45, "axis": "z", "origin": [11.0834, 22.58744, 6.25114]},
"faces": {
"north": {"uv": [4, 7, 9.625, 12.25], "texture": "#1"},
"east": {"uv": [4, 7, 9.625, 12.25], "texture": "#1"},
Expand All @@ -64,9 +64,9 @@
},
{
"name": "Body4",
"from": [8.83199, 23.29488, 5.41377],
"to": [10.85949, 25.45938, 10.0897],
"rotation": {"angle": 22.5, "axis": "z", "origin": [12.73734, 23.44113, 7.86423]},
"from": [8.85699, 23.29488, 5.41377],
"to": [10.88449, 25.45938, 10.0897],
"rotation": {"angle": 22.5, "axis": "z", "origin": [12.76234, 23.44113, 7.86423]},
"faces": {
"north": {"uv": [4, 7, 9.625, 12.25], "rotation": 90, "texture": "#1"},
"east": {"uv": [4, 7, 9.625, 12.25], "rotation": 90, "texture": "#1"},
Expand All @@ -78,9 +78,9 @@
},
{
"name": "Body5",
"from": [7.46582, 23.9599, 5.41377],
"to": [9.59332, 25.3054, 10.0897],
"rotation": {"angle": 45, "axis": "z", "origin": [9.15457, 25.04215, 7.86423]},
"from": [7.49082, 23.9599, 5.41377],
"to": [9.61832, 25.3054, 10.0897],
"rotation": {"angle": 45, "axis": "z", "origin": [9.17957, 25.04215, 7.86423]},
"faces": {
"north": {"uv": [4, 7, 9.625, 12.25], "rotation": 90, "texture": "#1"},
"east": {"uv": [4, 7, 9.625, 12.25], "rotation": 90, "texture": "#1"},
Expand All @@ -92,9 +92,9 @@
},
{
"name": "Body6",
"from": [8.51647, 24.95189, 5.41377],
"to": [9.16197, 25.82939, 10.0897],
"rotation": {"angle": -22.5, "axis": "z", "origin": [8.48922, 25.39064, 7.75173]},
"from": [8.54147, 24.95189, 5.41377],
"to": [9.18697, 25.82939, 10.0897],
"rotation": {"angle": -22.5, "axis": "z", "origin": [8.51422, 25.39064, 7.75173]},
"faces": {
"north": {"uv": [4, 7, 9.625, 12.25], "rotation": 180, "texture": "#1"},
"east": {"uv": [4, 7, 9.625, 12.25], "texture": "#1"},
Expand All @@ -106,9 +106,9 @@
},
{
"name": "Body7",
"from": [7.4118, 23.50806, 5.41377],
"to": [8.6823, 25.78556, 10.0897],
"rotation": {"angle": 0, "axis": "z", "origin": [8.35955, 25.34681, 7.75173]},
"from": [7.4368, 23.50806, 5.41377],
"to": [8.7073, 25.78556, 10.0897],
"rotation": {"angle": 0, "axis": "z", "origin": [8.38455, 25.34681, 7.75173]},
"faces": {
"north": {"uv": [4, 7, 9.625, 12.25], "rotation": 180, "texture": "#1"},
"east": {"uv": [4, 7, 9.625, 12.25], "texture": "#1"},
Expand All @@ -120,9 +120,9 @@
},
{
"name": "Body7",
"from": [6.92932, 24.95189, 5.41377],
"to": [7.57482, 25.82939, 10.0897],
"rotation": {"angle": 22.5, "axis": "z", "origin": [7.60207, 25.39064, 7.75173]},
"from": [6.95432, 24.95189, 5.41377],
"to": [7.59982, 25.82939, 10.0897],
"rotation": {"angle": 22.5, "axis": "z", "origin": [7.62707, 25.39064, 7.75173]},
"faces": {
"north": {"uv": [9.625, 7, 4, 12.25], "rotation": 180, "texture": "#1"},
"east": {"uv": [9.625, 7, 4, 12.25], "texture": "#1"},
Expand All @@ -134,9 +134,9 @@
},
{
"name": "Body6",
"from": [5.97441, 23.16384, 5.41377],
"to": [7.31991, 25.19134, 10.0897],
"rotation": {"angle": 45, "axis": "z", "origin": [6.64716, 24.75259, 7.86423]},
"from": [5.99941, 23.16384, 5.41377],
"to": [7.34491, 25.19134, 10.0897],
"rotation": {"angle": 45, "axis": "z", "origin": [6.67216, 24.75259, 7.86423]},
"faces": {
"north": {"uv": [4, 7, 9.625, 12.25], "rotation": 180, "texture": "#1"},
"east": {"uv": [4, 7, 9.625, 12.25], "texture": "#1"},
Expand All @@ -148,9 +148,9 @@
},
{
"name": "Body5",
"from": [5.14291, 20.97598, 5.41377],
"to": [6.97041, 23.14048, 10.0897],
"rotation": {"angle": -22.5, "axis": "z", "origin": [9.13846, 22.05823, 7.86423]},
"from": [5.16791, 20.97598, 5.41377],
"to": [6.99541, 23.14048, 10.0897],
"rotation": {"angle": -22.5, "axis": "z", "origin": [9.16346, 22.05823, 7.86423]},
"faces": {
"north": {"uv": [4, 7, 9.625, 12.25], "rotation": 90, "texture": "#1"},
"east": {"uv": [4, 7, 9.625, 12.25], "rotation": 90, "texture": "#1"},
Expand Down Expand Up @@ -702,8 +702,8 @@
},
{
"name": "Body10",
"from": [6.136, 15.97696, 9.75304],
"to": [7.784, 16.68096, 10.29704],
"from": [6.211, 15.97696, 9.75304],
"to": [7.859, 16.68096, 10.29704],
"rotation": {"angle": 0, "axis": "y", "origin": [-2.216, -8.60698, -3.13502]},
"faces": {
"north": {"uv": [4, 7, 9.625, 12.25], "texture": "#9"},
Expand All @@ -716,8 +716,8 @@
},
{
"name": "Body11",
"from": [8.184, 15.97696, 9.75304],
"to": [9.832, 16.68096, 10.29704],
"from": [8.259, 15.97696, 9.75304],
"to": [9.907, 16.68096, 10.29704],
"rotation": {"angle": 0, "axis": "y", "origin": [-2.216, -8.60698, -3.13502]},
"faces": {
"north": {"uv": [4, 7, 9.625, 12.25], "texture": "#9"},
Expand All @@ -730,8 +730,8 @@
},
{
"name": "Body12",
"from": [8.184, 17.12896, 9.75304],
"to": [9.832, 17.83296, 10.29704],
"from": [8.259, 17.12896, 9.75304],
"to": [9.907, 17.83296, 10.29704],
"rotation": {"angle": 0, "axis": "y", "origin": [-2.216, -8.60698, -3.13502]},
"faces": {
"north": {"uv": [4, 7, 9.625, 12.25], "texture": "#9"},
Expand All @@ -744,8 +744,8 @@
},
{
"name": "Body11",
"from": [6.136, 17.12896, 9.75304],
"to": [7.784, 17.83296, 10.29704],
"from": [6.211, 17.12896, 9.75304],
"to": [7.859, 17.83296, 10.29704],
"rotation": {"angle": 0, "axis": "y", "origin": [-2.216, -8.60698, -3.13502]},
"faces": {
"north": {"uv": [4, 7, 9.625, 12.25], "texture": "#9"},
Expand All @@ -758,8 +758,8 @@
},
{
"name": "Body12",
"from": [6.136, 18.28096, 9.75304],
"to": [7.784, 18.98496, 10.29704],
"from": [6.211, 18.28096, 9.75304],
"to": [7.859, 18.98496, 10.29704],
"rotation": {"angle": 0, "axis": "y", "origin": [-2.216, -8.60698, -3.13502]},
"faces": {
"north": {"uv": [4, 7, 9.625, 12.25], "texture": "#9"},
Expand All @@ -772,8 +772,8 @@
},
{
"name": "Body13",
"from": [8.184, 18.28096, 9.75304],
"to": [9.832, 18.98496, 10.29704],
"from": [8.259, 18.28096, 9.75304],
"to": [9.907, 18.98496, 10.29704],
"rotation": {"angle": 0, "axis": "y", "origin": [-2.216, -8.60698, -3.13502]},
"faces": {
"north": {"uv": [4, 7, 9.625, 12.25], "texture": "#9"},
Expand All @@ -786,9 +786,9 @@
},
{
"name": "Body14",
"from": [8.806, 21.58396, 9.62804],
"to": [9.01, 22.53196, 10.17204],
"rotation": {"angle": -45, "axis": "z", "origin": [8.658, 22.90796, 9.90004]},
"from": [8.881, 21.58396, 9.62804],
"to": [9.085, 22.53196, 10.17204],
"rotation": {"angle": -45, "axis": "z", "origin": [8.733, 22.90796, 9.90004]},
"faces": {
"north": {"uv": [4, 7, 9.625, 12.25], "rotation": 90, "texture": "#4"},
"east": {"uv": [4, 7, 9.625, 12.25], "rotation": 270, "texture": "#4"},
Expand All @@ -800,9 +800,9 @@
},
{
"name": "Body15",
"from": [8.43703, 22.39319, 9.62804],
"to": [8.64103, 23.51619, 10.17204],
"rotation": {"angle": 0, "axis": "z", "origin": [8.48903, 22.94219, 9.90004]},
"from": [8.51203, 22.39319, 9.62804],
"to": [8.71603, 23.51619, 10.17204],
"rotation": {"angle": 0, "axis": "z", "origin": [8.56403, 22.94219, 9.90004]},
"faces": {
"north": {"uv": [4, 7, 9.625, 12.25], "rotation": 90, "texture": "#4"},
"east": {"uv": [4, 7, 9.625, 12.25], "rotation": 270, "texture": "#4"},
Expand All @@ -814,9 +814,9 @@
},
{
"name": "Body16",
"from": [7.48903, 23.31219, 9.62804],
"to": [8.43703, 23.51619, 10.17204],
"rotation": {"angle": 0, "axis": "z", "origin": [8.16303, 23.28919, 9.90004]},
"from": [7.56403, 23.31219, 9.62804],
"to": [8.51203, 23.51619, 10.17204],
"rotation": {"angle": 0, "axis": "z", "origin": [8.23803, 23.28919, 9.90004]},
"faces": {
"north": {"uv": [4, 7, 9.625, 12.25], "rotation": 180, "texture": "#4"},
"east": {"uv": [4, 7, 9.625, 12.25], "rotation": 180, "texture": "#4"},
Expand All @@ -828,9 +828,9 @@
},
{
"name": "Body16",
"from": [7.29753, 22.37101, 9.62804],
"to": [7.50153, 23.51901, 10.17204],
"rotation": {"angle": 0, "axis": "z", "origin": [9.44953, 22.94501, 9.90004]},
"from": [7.37253, 22.37101, 9.62804],
"to": [7.57653, 23.51901, 10.17204],
"rotation": {"angle": 0, "axis": "z", "origin": [9.52453, 22.94501, 9.90004]},
"faces": {
"north": {"uv": [4, 7, 9.625, 12.25], "rotation": 90, "texture": "#4"},
"east": {"uv": [4, 7, 9.625, 12.25], "rotation": 270, "texture": "#4"},
Expand All @@ -842,9 +842,9 @@
},
{
"name": "Body15",
"from": [7.37604, 21.80646, 9.62804],
"to": [7.58004, 22.55446, 10.17204],
"rotation": {"angle": 45, "axis": "z", "origin": [7.52804, 22.38046, 9.90004]},
"from": [7.45104, 21.80646, 9.62804],
"to": [7.65504, 22.55446, 10.17204],
"rotation": {"angle": 45, "axis": "z", "origin": [7.60304, 22.38046, 9.90004]},
"faces": {
"north": {"uv": [4, 7, 9.625, 12.25], "rotation": 90, "texture": "#4"},
"east": {"uv": [4, 7, 9.625, 12.25], "rotation": 270, "texture": "#4"},
Expand All @@ -856,9 +856,9 @@
},
{
"name": "Body17",
"from": [7.48028, 22.50958, 9.70472],
"to": [8.44816, 23.37482, 10.14536],
"rotation": {"angle": 0, "axis": "z", "origin": [8.12622, 23.19095, 9.92504]},
"from": [7.55528, 22.50958, 9.70472],
"to": [8.52316, 23.37482, 10.14536],
"rotation": {"angle": 0, "axis": "z", "origin": [8.20122, 23.19095, 9.92504]},
"faces": {
"north": {"uv": [4, 7, 9.625, 12.25], "rotation": 180, "texture": "#3"},
"east": {"uv": [4, 7, 9.625, 12.25], "rotation": 180, "texture": "#3"},
Expand All @@ -870,9 +870,9 @@
},
{
"name": "Body15",
"from": [8.04702, 21.80972, 9.70472],
"to": [8.81226, 22.5776, 10.14536],
"rotation": {"angle": -45, "axis": "z", "origin": [8.52714, 22.88216, 9.92504]},
"from": [8.12202, 21.80972, 9.70472],
"to": [8.88726, 22.5776, 10.14536],
"rotation": {"angle": -45, "axis": "z", "origin": [8.60214, 22.88216, 9.92504]},
"faces": {
"north": {"uv": [4, 7, 9.625, 12.25], "rotation": 90, "texture": "#3"},
"east": {"uv": [4, 7, 9.625, 12.25], "rotation": 270, "texture": "#3"},
Expand All @@ -884,8 +884,8 @@
},
{
"name": "Body14",
"from": [8.184, 19.43296, 9.75304],
"to": [10.232, 21.41696, 10.29704],
"from": [8.259, 19.43296, 9.75304],
"to": [10.307, 21.41696, 10.29704],
"rotation": {"angle": 0, "axis": "y", "origin": [-2.216, -8.60698, -3.13502]},
"faces": {
"north": {"uv": [4, 7, 9.625, 12.25], "texture": "#9"},
Expand All @@ -898,8 +898,8 @@
},
{
"name": "Body15",
"from": [10.216, 19.94496, 9.75304],
"to": [11.384, 21.41696, 10.29704],
"from": [10.291, 19.94496, 9.75304],
"to": [11.459, 21.41696, 10.29704],
"rotation": {"angle": 0, "axis": "y", "origin": [-2.216, -8.60698, -3.13502]},
"faces": {
"north": {"uv": [4, 7, 9.625, 12.25], "texture": "#9"},
Expand All @@ -912,8 +912,8 @@
},
{
"name": "Body16",
"from": [4.536, 19.94496, 9.75304],
"to": [5.704, 21.41696, 10.29704],
"from": [4.611, 19.94496, 9.75304],
"to": [5.779, 21.41696, 10.29704],
"rotation": {"angle": 0, "axis": "y", "origin": [18.264, -8.60698, -3.13502]},
"faces": {
"north": {"uv": [9.625, 7, 4, 12.25], "texture": "#9"},
Expand All @@ -926,8 +926,8 @@
},
{
"name": "Body15",
"from": [5.688, 19.43296, 9.75304],
"to": [7.736, 21.41696, 10.29704],
"from": [5.763, 19.43296, 9.75304],
"to": [7.811, 21.41696, 10.29704],
"rotation": {"angle": 0, "axis": "y", "origin": [18.264, -8.60698, -3.13502]},
"faces": {
"north": {"uv": [9.625, 7, 4, 12.25], "texture": "#9"},
Expand Down Expand Up @@ -1083,9 +1083,9 @@
},
{
"name": "Body6",
"from": [7.84288, 23.99461, 8.68509],
"to": [8.21901, 24.35949, 10.18589],
"rotation": {"angle": 0, "axis": "y", "origin": [4.02991, 9.36366, 4.72793]},
"from": [7.91788, 23.99461, 8.68509],
"to": [8.29401, 24.35949, 10.18589],
"rotation": {"angle": 0, "axis": "y", "origin": [4.10491, 9.36366, 4.72793]},
"faces": {
"north": {"uv": [0, 7, 1.625, 8.25], "texture": "#4"},
"east": {"uv": [0, 3, 1.625, 4.25], "texture": "#4"},
Expand All @@ -1097,9 +1097,9 @@
},
{
"name": "Body5",
"from": [7.51458, 23.66631, 8.63819],
"to": [8.50041, 24.68779, 10.13899],
"rotation": {"angle": 0, "axis": "y", "origin": [4.02991, 9.36366, 4.72793]},
"from": [7.58958, 23.66631, 8.63819],
"to": [8.57541, 24.68779, 10.13899],
"rotation": {"angle": 0, "axis": "y", "origin": [4.10491, 9.36366, 4.72793]},
"faces": {
"north": {"uv": [0, 7, 1.625, 8.25], "texture": "#6"},
"east": {"uv": [0, 3, 1.625, 4.25], "texture": "#6"},
Expand Down
2 changes: 1 addition & 1 deletion assets/ms/models/mobs/barbarian_assault/penance_healer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -717,7 +717,7 @@
},
{
"from": [6.10907, 4.572, 4.53128],
"to": [8.25107, 10.233, 5.12528],
"to": [8.35107, 10.233, 5.12528],
"rotation": {"angle": 45, "axis": "y", "origin": [5.40882, 5.166, 7.64451]},
"faces": {
"north": {"uv": [0, 0, 3, 4], "texture": "#6"},
Expand Down
Loading
Loading