Use TG human sprites.
@@ -44,7 +44,8 @@ namespace Content.Client.GameObjects.Components.Mobs
|
|||||||
sprite.LayerSetColor(HumanoidVisualLayers.Hair, Appearance.HairColor);
|
sprite.LayerSetColor(HumanoidVisualLayers.Hair, Appearance.HairColor);
|
||||||
sprite.LayerSetColor(HumanoidVisualLayers.FacialHair, Appearance.FacialHairColor);
|
sprite.LayerSetColor(HumanoidVisualLayers.FacialHair, Appearance.FacialHairColor);
|
||||||
|
|
||||||
sprite.LayerSetState(HumanoidVisualLayers.Body, Sex == Sex.Male ? "male" : "female");
|
sprite.LayerSetState(HumanoidVisualLayers.Chest, Sex == Sex.Male ? "human_chest_m" : "human_chest_f");
|
||||||
|
sprite.LayerSetState(HumanoidVisualLayers.Head, Sex == Sex.Male ? "human_head_m" : "human_head_f");
|
||||||
|
|
||||||
var hairStyle = Appearance.HairStyleName;
|
var hairStyle = Appearance.HairStyleName;
|
||||||
if (string.IsNullOrWhiteSpace(hairStyle) || !HairStyles.HairStylesMap.ContainsKey(hairStyle))
|
if (string.IsNullOrWhiteSpace(hairStyle) || !HairStyles.HairStylesMap.ContainsKey(hairStyle))
|
||||||
|
|||||||
@@ -4,6 +4,13 @@ namespace Content.Shared.Preferences.Appearance
|
|||||||
{
|
{
|
||||||
Hair,
|
Hair,
|
||||||
FacialHair,
|
FacialHair,
|
||||||
Body
|
Chest,
|
||||||
|
Head,
|
||||||
|
RArm,
|
||||||
|
LArm,
|
||||||
|
RHand,
|
||||||
|
LHand,
|
||||||
|
RLeg,
|
||||||
|
LLeg,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -22,9 +22,42 @@
|
|||||||
drawdepth: Mobs
|
drawdepth: Mobs
|
||||||
|
|
||||||
layers:
|
layers:
|
||||||
- map: ["enum.HumanoidVisualLayers.Body"]
|
- map: ["enum.HumanoidVisualLayers.Chest"]
|
||||||
|
color: "#e8b59b"
|
||||||
sprite: Mob/human.rsi
|
sprite: Mob/human.rsi
|
||||||
state: male
|
state: human_chest_m
|
||||||
|
- map: ["enum.HumanoidVisualLayers.Head"]
|
||||||
|
color: "#e8b59b"
|
||||||
|
sprite: Mob/human.rsi
|
||||||
|
state: human_head_m
|
||||||
|
- sprite: Mob/eyes.rsi
|
||||||
|
state: eyes
|
||||||
|
color: "#008800"
|
||||||
|
- map: ["enum.HumanoidVisualLayers.RArm"]
|
||||||
|
color: "#e8b59b"
|
||||||
|
sprite: Mob/human.rsi
|
||||||
|
state: human_r_arm
|
||||||
|
- map: ["enum.HumanoidVisualLayers.LArm"]
|
||||||
|
color: "#e8b59b"
|
||||||
|
sprite: Mob/human.rsi
|
||||||
|
state: human_l_arm
|
||||||
|
- map: ["enum.HumanoidVisualLayers.LHand"]
|
||||||
|
color: "#e8b59b"
|
||||||
|
sprite: Mob/human.rsi
|
||||||
|
state: human_l_hand
|
||||||
|
- map: ["enum.HumanoidVisualLayers.RHand"]
|
||||||
|
color: "#e8b59b"
|
||||||
|
sprite: Mob/human.rsi
|
||||||
|
state: human_r_hand
|
||||||
|
- map: ["enum.HumanoidVisualLayers.RLeg"]
|
||||||
|
color: "#e8b59b"
|
||||||
|
sprite: Mob/human.rsi
|
||||||
|
state: human_r_leg
|
||||||
|
- map: ["enum.HumanoidVisualLayers.LLeg"]
|
||||||
|
color: "#e8b59b"
|
||||||
|
sprite: Mob/human.rsi
|
||||||
|
state: human_l_leg
|
||||||
|
|
||||||
- map: ["enum.Slots.INNERCLOTHING"]
|
- map: ["enum.Slots.INNERCLOTHING"]
|
||||||
- map: ["enum.Slots.IDCARD"]
|
- map: ["enum.Slots.IDCARD"]
|
||||||
- map: ["enum.Slots.GLOVES"]
|
- map: ["enum.Slots.GLOVES"]
|
||||||
@@ -47,7 +80,7 @@
|
|||||||
|
|
||||||
- type: Icon
|
- type: Icon
|
||||||
sprite: Mob/human.rsi
|
sprite: Mob/human.rsi
|
||||||
state: male
|
state: human_basic
|
||||||
|
|
||||||
- type: Physics
|
- type: Physics
|
||||||
mass: 85
|
mass: 85
|
||||||
@@ -105,32 +138,65 @@
|
|||||||
drawdepth: Mobs
|
drawdepth: Mobs
|
||||||
|
|
||||||
layers:
|
layers:
|
||||||
- map: ["enum.HumanoidVisualLayers.Body"]
|
- map: ["enum.HumanoidVisualLayers.Chest"]
|
||||||
sprite: Mob/human.rsi
|
color: "#e8b59b"
|
||||||
state: male
|
sprite: Mob/human.rsi
|
||||||
- map: ["enum.Slots.INNERCLOTHING"]
|
state: human_chest_m
|
||||||
- map: ["enum.Slots.IDCARD"]
|
- map: ["enum.HumanoidVisualLayers.Head"]
|
||||||
- map: ["enum.Slots.GLOVES"]
|
color: "#e8b59b"
|
||||||
- map: ["enum.Slots.SHOES"]
|
sprite: Mob/human.rsi
|
||||||
- map: ["enum.Slots.EARS"]
|
state: human_head_m
|
||||||
- map: ["enum.Slots.OUTERCLOTHING"]
|
- sprite: Mob/eyes.rsi
|
||||||
- map: ["enum.Slots.EYES"]
|
state: eyes
|
||||||
- map: ["enum.Slots.BELT"]
|
color: "#008800"
|
||||||
- map: ["enum.Slots.BACKPACK"]
|
- map: ["enum.HumanoidVisualLayers.RArm"]
|
||||||
- map: ["enum.HumanoidVisualLayers.FacialHair"]
|
color: "#e8b59b"
|
||||||
state: shaved
|
sprite: Mob/human.rsi
|
||||||
sprite: Mob/human_facial_hair.rsi
|
state: human_r_arm
|
||||||
- map: ["enum.HumanoidVisualLayers.Hair"]
|
- map: ["enum.HumanoidVisualLayers.LArm"]
|
||||||
state: bald
|
color: "#e8b59b"
|
||||||
sprite: Mob/human_hair.rsi
|
sprite: Mob/human.rsi
|
||||||
- map: ["enum.Slots.MASK"]
|
state: human_l_arm
|
||||||
- map: ["enum.Slots.HEAD"]
|
- map: ["enum.HumanoidVisualLayers.LHand"]
|
||||||
- map: ["hand-left"]
|
color: "#e8b59b"
|
||||||
- map: ["hand-right"]
|
sprite: Mob/human.rsi
|
||||||
|
state: human_l_hand
|
||||||
|
- map: ["enum.HumanoidVisualLayers.RHand"]
|
||||||
|
color: "#e8b59b"
|
||||||
|
sprite: Mob/human.rsi
|
||||||
|
state: human_r_hand
|
||||||
|
- map: ["enum.HumanoidVisualLayers.RLeg"]
|
||||||
|
color: "#e8b59b"
|
||||||
|
sprite: Mob/human.rsi
|
||||||
|
state: human_r_leg
|
||||||
|
- map: ["enum.HumanoidVisualLayers.LLeg"]
|
||||||
|
color: "#e8b59b"
|
||||||
|
sprite: Mob/human.rsi
|
||||||
|
state: human_l_leg
|
||||||
|
|
||||||
|
- map: ["enum.Slots.INNERCLOTHING"]
|
||||||
|
- map: ["enum.Slots.IDCARD"]
|
||||||
|
- map: ["enum.Slots.GLOVES"]
|
||||||
|
- map: ["enum.Slots.SHOES"]
|
||||||
|
- map: ["enum.Slots.EARS"]
|
||||||
|
- map: ["enum.Slots.OUTERCLOTHING"]
|
||||||
|
- map: ["enum.Slots.EYES"]
|
||||||
|
- map: ["enum.Slots.BELT"]
|
||||||
|
- map: ["enum.Slots.BACKPACK"]
|
||||||
|
- map: ["enum.HumanoidVisualLayers.FacialHair"]
|
||||||
|
state: shaved
|
||||||
|
sprite: Mob/human_facial_hair.rsi
|
||||||
|
- map: ["enum.HumanoidVisualLayers.Hair"]
|
||||||
|
state: bald
|
||||||
|
sprite: Mob/human_hair.rsi
|
||||||
|
- map: ["enum.Slots.MASK"]
|
||||||
|
- map: ["enum.Slots.HEAD"]
|
||||||
|
- map: ["hand-left"]
|
||||||
|
- map: ["hand-right"]
|
||||||
|
|
||||||
- type: Icon
|
- type: Icon
|
||||||
sprite: Mob/human.rsi
|
sprite: Mob/human.rsi
|
||||||
state: male
|
state: human_basic
|
||||||
|
|
||||||
- type: Physics
|
- type: Physics
|
||||||
mass: 85
|
mass: 85
|
||||||
|
|||||||
BIN
Resources/Textures/Mob/eyes.rsi/eyes.png
Normal file
|
After Width: | Height: | Size: 112 B |
1
Resources/Textures/Mob/eyes.rsi/meta.json
Normal file
@@ -0,0 +1 @@
|
|||||||
|
{"version": 1, "size": {"x": 32, "y": 32}, "states": [{"name": "eyes", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]}
|
||||||
|
Before Width: | Height: | Size: 1.9 KiB |
|
Before Width: | Height: | Size: 1.8 KiB |
|
Before Width: | Height: | Size: 1.7 KiB |
|
Before Width: | Height: | Size: 1.5 KiB |
BIN
Resources/Textures/Mob/human.rsi/human_basic.png
Normal file
|
After Width: | Height: | Size: 486 B |
BIN
Resources/Textures/Mob/human.rsi/human_chest_f.png
Normal file
|
After Width: | Height: | Size: 785 B |
BIN
Resources/Textures/Mob/human.rsi/human_chest_m.png
Normal file
|
After Width: | Height: | Size: 682 B |
BIN
Resources/Textures/Mob/human.rsi/human_head_f.png
Normal file
|
After Width: | Height: | Size: 442 B |
BIN
Resources/Textures/Mob/human.rsi/human_head_m.png
Normal file
|
After Width: | Height: | Size: 435 B |
BIN
Resources/Textures/Mob/human.rsi/human_l_arm.png
Normal file
|
After Width: | Height: | Size: 266 B |
BIN
Resources/Textures/Mob/human.rsi/human_l_hand.png
Normal file
|
After Width: | Height: | Size: 257 B |
BIN
Resources/Textures/Mob/human.rsi/human_l_leg.png
Normal file
|
After Width: | Height: | Size: 354 B |
BIN
Resources/Textures/Mob/human.rsi/human_r_arm.png
Normal file
|
After Width: | Height: | Size: 276 B |
BIN
Resources/Textures/Mob/human.rsi/human_r_hand.png
Normal file
|
After Width: | Height: | Size: 261 B |
BIN
Resources/Textures/Mob/human.rsi/human_r_leg.png
Normal file
|
After Width: | Height: | Size: 349 B |
|
Before Width: | Height: | Size: 1.3 KiB |
|
Before Width: | Height: | Size: 1.7 KiB |
|
Before Width: | Height: | Size: 1.7 KiB |
|
Before Width: | Height: | Size: 1.4 KiB |
@@ -1,153 +1 @@
|
|||||||
{
|
{"version": 1, "size": {"x": 32, "y": 32}, "states": [{"name": "human_basic", "directions": 1, "delays": [[1.0]]}, {"name": "human_chest_f", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "human_chest_m", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "human_head_f", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "human_head_m", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "human_l_arm", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "human_l_hand", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "human_l_leg", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "human_r_arm", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "human_r_hand", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "human_r_leg", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]}
|
||||||
"version": 1,
|
|
||||||
"size": {
|
|
||||||
"x": 32,
|
|
||||||
"y": 32
|
|
||||||
},
|
|
||||||
"states": [
|
|
||||||
{
|
|
||||||
"name": "fat_husk",
|
|
||||||
"directions": 4,
|
|
||||||
"delays": [
|
|
||||||
[
|
|
||||||
1.0
|
|
||||||
],
|
|
||||||
[
|
|
||||||
1.0
|
|
||||||
],
|
|
||||||
[
|
|
||||||
1.0
|
|
||||||
],
|
|
||||||
[
|
|
||||||
1.0
|
|
||||||
]
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "female",
|
|
||||||
"directions": 4,
|
|
||||||
"delays": [
|
|
||||||
[
|
|
||||||
1.0
|
|
||||||
],
|
|
||||||
[
|
|
||||||
1.0
|
|
||||||
],
|
|
||||||
[
|
|
||||||
1.0
|
|
||||||
],
|
|
||||||
[
|
|
||||||
1.0
|
|
||||||
]
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "female_fat",
|
|
||||||
"directions": 4,
|
|
||||||
"delays": [
|
|
||||||
[
|
|
||||||
1.0
|
|
||||||
],
|
|
||||||
[
|
|
||||||
1.0
|
|
||||||
],
|
|
||||||
[
|
|
||||||
1.0
|
|
||||||
],
|
|
||||||
[
|
|
||||||
1.0
|
|
||||||
]
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "female_slim",
|
|
||||||
"directions": 4,
|
|
||||||
"delays": [
|
|
||||||
[
|
|
||||||
1.0
|
|
||||||
],
|
|
||||||
[
|
|
||||||
1.0
|
|
||||||
],
|
|
||||||
[
|
|
||||||
1.0
|
|
||||||
],
|
|
||||||
[
|
|
||||||
1.0
|
|
||||||
]
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "husk",
|
|
||||||
"directions": 4,
|
|
||||||
"delays": [
|
|
||||||
[
|
|
||||||
1.0
|
|
||||||
],
|
|
||||||
[
|
|
||||||
1.0
|
|
||||||
],
|
|
||||||
[
|
|
||||||
1.0
|
|
||||||
],
|
|
||||||
[
|
|
||||||
1.0
|
|
||||||
]
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "male",
|
|
||||||
"directions": 4,
|
|
||||||
"delays": [
|
|
||||||
[
|
|
||||||
1.0
|
|
||||||
],
|
|
||||||
[
|
|
||||||
1.0
|
|
||||||
],
|
|
||||||
[
|
|
||||||
1.0
|
|
||||||
],
|
|
||||||
[
|
|
||||||
1.0
|
|
||||||
]
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "male_fat",
|
|
||||||
"directions": 4,
|
|
||||||
"delays": [
|
|
||||||
[
|
|
||||||
1.0
|
|
||||||
],
|
|
||||||
[
|
|
||||||
1.0
|
|
||||||
],
|
|
||||||
[
|
|
||||||
1.0
|
|
||||||
],
|
|
||||||
[
|
|
||||||
1.0
|
|
||||||
]
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "male_slim",
|
|
||||||
"directions": 4,
|
|
||||||
"delays": [
|
|
||||||
[
|
|
||||||
1.0
|
|
||||||
],
|
|
||||||
[
|
|
||||||
1.0
|
|
||||||
],
|
|
||||||
[
|
|
||||||
1.0
|
|
||||||
],
|
|
||||||
[
|
|
||||||
1.0
|
|
||||||
]
|
|
||||||
]
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||