Added hair, facial hair, magic mirror (#452)

* Added hair, facial hair, magic mirror

* I forgot to commit the textures lmao

* Use shader to fix hair color blending
This commit is contained in:
DamianX
2019-11-23 21:55:46 +01:00
committed by Pieter-Jan Briers
parent b89615342e
commit 3a7a3a89ba
192 changed files with 767 additions and 3 deletions

View File

@@ -0,0 +1,26 @@
- type: entity
id: mirror
name: Mirror
components:
- type: Sprite
sprite: Buildings/mirror.rsi
state: mirror
- type: Icon
sprite: Buildings/mirror.rsi
state: mirror
- type: Collidable
shapes:
- !type:PhysShapeAabb
mask: 19
layer: 16
- type: Clickable
- type: Physics
mass: 25
Anchored: true
- type: SnapGrid
offset: Center
- type: MagicMirror
- type: UserInterface
interfaces:
- key: enum.MagicMirrorUiKey.Key
type: MagicMirrorBoundUserInterface

View File

@@ -12,7 +12,7 @@
- type: Thirst
# Organs
- type: Stomach
- type: Inventory
- type: Constructor
- type: Clickable
@@ -23,6 +23,12 @@
layers:
- sprite: Mob/human.rsi
state: male
- map: ["enum.HumanoidVisualLayers.Hair"]
state: bald
sprite: Mob/human_hair.rsi
- map: ["enum.HumanoidVisualLayers.FacialHair"]
state: shaved
sprite: Mob/human_facial_hair.rsi
- map: ["enum.Slots.INNERCLOTHING"]
- map: ["enum.Slots.IDCARD"]
- map: ["enum.Slots.SHOES"]
@@ -47,7 +53,7 @@
- type: Collidable
shapes:
- !type:PhysShapeAabb
bounds: "-0.5,-0.25,-0.05,0.25"
bounds: "-0.5,-0.25,-0.05,0.25"
mask: 19
layer: 2
@@ -75,4 +81,4 @@
- type: Examiner
- type: CharacterInfo
- type: FootstepSound
- type: Hair

View File

@@ -0,0 +1,6 @@
- type: shader
id: hair
kind: source
path: "/Shaders/hair.swsl"
params:
hairColor: "#000000"