Merge pull request 'Base mcl_skins templates off old PP skins' (#2977) from old_pp_skins into master

Reviewed-on: MineClone2/MineClone2#2977
Reviewed-by: PrairieWind <prairie.astronomer1@gmail.com>
This commit is contained in:
PrairieWind 2022-11-17 21:53:45 +00:00
commit 7e3cb59863
3 changed files with 38 additions and 38 deletions

View File

@ -25,21 +25,21 @@ mcl_skins = {
-- Base color is separate to keep the number of junk nodes registered in check -- Base color is separate to keep the number of junk nodes registered in check
base_color = {0xffeeb592, 0xffb47a57, 0xff8d471d}, base_color = {0xffeeb592, 0xffb47a57, 0xff8d471d},
color = { color = {
0xff613915, -- 1 Dark brown Steve hair, Alex bottom 0xff613915, -- 1 Dark brown
0xff97491b, -- 2 Medium brown 0xff97491b, -- 2 Medium brown
0xffb17050, -- 3 Light brown 0xffb17050, -- 3 Light brown
0xffe2bc7b, -- 4 Beige 0xffe2bc7b, -- 4 Beige
0xff706662, -- 5 Gray 0xff706662, -- 5 Gray
0xff151515, -- 6 Black 0xff151515, -- 6 Black
0xffc21c1c, -- 7 Red 0xffc21c1c, -- 7 Red
0xff178c32, -- 8 Green Alex top 0xff178c32, -- 8 Green
0xffae2ad3, -- 9 Plum 0xffae2ad3, -- 9 Plum
0xffebe8e4, -- 10 White 0xffebe8e4, -- 10 White
0xffe3dd26, -- 11 Yellow 0xffe3dd26, -- 11 Yellow
0xff449acc, -- 12 Light blue Steve top 0xff449acc, -- 12 Light blue
0xff124d87, -- 13 Dark blue Steve bottom 0xff124d87, -- 13 Dark blue
0xfffc0eb3, -- 14 Pink 0xfffc0eb3, -- 14 Pink
0xffd0672a, -- 15 Orange Alex hair 0xffd0672a, -- 15 Orange
}, },
footwear = {}, footwear = {},
mouth = {}, mouth = {},
@ -574,16 +574,16 @@ local function init()
for _, item in pairs(json) do for _, item in pairs(json) do
mcl_skins.register_item(item) mcl_skins.register_item(item)
end end
mcl_skins.steve.base_color = mcl_skins.base_color[1] mcl_skins.steve.base_color = mcl_skins.base_color[2]
mcl_skins.steve.hair_color = mcl_skins.color[1] mcl_skins.steve.hair_color = 0xff5d473b
mcl_skins.steve.top_color = mcl_skins.color[12] mcl_skins.steve.top_color = 0xff993535
mcl_skins.steve.bottom_color = mcl_skins.color[13] mcl_skins.steve.bottom_color = 0xff644939
mcl_skins.steve.slim_arms = false mcl_skins.steve.slim_arms = false
mcl_skins.alex.base_color = mcl_skins.base_color[1] mcl_skins.alex.base_color = mcl_skins.base_color[1]
mcl_skins.alex.hair_color = mcl_skins.color[15] mcl_skins.alex.hair_color = 0xff715d57
mcl_skins.alex.top_color = mcl_skins.color[8] mcl_skins.alex.top_color = 0xff346840
mcl_skins.alex.bottom_color = mcl_skins.color[1] mcl_skins.alex.bottom_color = 0xff383532
mcl_skins.alex.slim_arms = true mcl_skins.alex.slim_arms = true
end end

View File

@ -18,11 +18,13 @@
}, },
{ {
"type": "eye", "type": "eye",
"texture": "mcl_skins_eye_1.png" "texture": "mcl_skins_eye_1.png",
"alex": true
}, },
{ {
"type": "eye", "type": "eye",
"texture": "mcl_skins_eye_2.png" "texture": "mcl_skins_eye_2.png",
"steve": true
}, },
{ {
"type": "eye", "type": "eye",
@ -34,9 +36,7 @@
}, },
{ {
"type": "eye", "type": "eye",
"texture": "mcl_skins_eye_5.png", "texture": "mcl_skins_eye_5.png"
"steve": true,
"alex": true
}, },
{ {
"type": "eye", "type": "eye",
@ -73,21 +73,23 @@
}, },
{ {
"type": "mouth", "type": "mouth",
"texture": "mcl_skins_mouth_7.png", "texture": "mcl_skins_mouth_7.png"
"alex": true
}, },
{ {
"type": "mouth" "type": "mouth",
"alex": true
}, },
{ {
"type": "hair", "type": "hair",
"texture": "mcl_skins_hair_1.png", "texture": "mcl_skins_hair_1.png",
"mask": "mcl_skins_hair_1_mask.png" "mask": "mcl_skins_hair_1_mask.png",
"alex": true
}, },
{ {
"type": "hair", "type": "hair",
"texture": "mcl_skins_hair_2.png", "texture": "mcl_skins_hair_2.png",
"mask": "mcl_skins_hair_2_mask.png" "mask": "mcl_skins_hair_2_mask.png",
"steve": true
}, },
{ {
"type": "hair", "type": "hair",
@ -127,14 +129,12 @@
{ {
"type": "hair", "type": "hair",
"texture": "mcl_skins_hair_10.png", "texture": "mcl_skins_hair_10.png",
"mask": "mcl_skins_hair_10_mask.png", "mask": "mcl_skins_hair_10_mask.png"
"steve": true
}, },
{ {
"type": "hair", "type": "hair",
"texture": "mcl_skins_hair_11.png", "texture": "mcl_skins_hair_11.png",
"mask": "mcl_skins_hair_11_mask.png", "mask": "mcl_skins_hair_11_mask.png"
"alex": true
}, },
{ {
"type": "hair" "type": "hair"
@ -145,7 +145,8 @@
}, },
{ {
"type": "headwear", "type": "headwear",
"texture": "mcl_skins_headwear_2.png" "texture": "mcl_skins_headwear_2.png",
"alex": true
}, },
{ {
"type": "headwear", "type": "headwear",
@ -173,13 +174,14 @@
}, },
{ {
"type": "headwear", "type": "headwear",
"steve": true, "steve": true
"alex": true
}, },
{ {
"type": "bottom", "type": "bottom",
"texture": "mcl_skins_bottom_1.png", "texture": "mcl_skins_bottom_1.png",
"mask": "mcl_skins_bottom_1_mask.png" "mask": "mcl_skins_bottom_1_mask.png",
"steve": true,
"alex": true
}, },
{ {
"type": "bottom", "type": "bottom",
@ -194,14 +196,14 @@
{ {
"type": "bottom", "type": "bottom",
"texture": "mcl_skins_bottom_4.png", "texture": "mcl_skins_bottom_4.png",
"mask": "mcl_skins_bottom_4_mask.png", "mask": "mcl_skins_bottom_4_mask.png"
"steve": true,
"alex": true
}, },
{ {
"type": "top", "type": "top",
"texture": "mcl_skins_top_1.png", "texture": "mcl_skins_top_1.png",
"mask": "mcl_skins_top_1_mask.png" "mask": "mcl_skins_top_1_mask.png",
"steve": true,
"alex": true
}, },
{ {
"type": "top", "type": "top",
@ -241,14 +243,12 @@
{ {
"type": "top", "type": "top",
"texture": "mcl_skins_top_9.png", "texture": "mcl_skins_top_9.png",
"mask": "mcl_skins_top_9_mask.png", "mask": "mcl_skins_top_9_mask.png"
"alex": true
}, },
{ {
"type": "top", "type": "top",
"texture": "mcl_skins_top_10.png", "texture": "mcl_skins_top_10.png",
"mask": "mcl_skins_top_10_mask.png", "mask": "mcl_skins_top_10_mask.png"
"steve": true
}, },
{ {
"type": "base", "type": "base",

Binary file not shown.

Before

Width:  |  Height:  |  Size: 484 B

After

Width:  |  Height:  |  Size: 361 B