Engineer's helmet (#188)

* refacting some sprite things

* fix sprites

* Netcode for sending a new icon state to the ClientComponent

* Fixed broken torches.

* Fix dirty calls.

* ClothingComponentState now also includes EquippedPrefix

* Inherritance ClothingComponent : ItemComponent

* Added parameter to ItemComponentState constructor.

* Update RobustToolbox

* Revert "Update RobustToolbox"

This reverts commit 82c7e98ff3853b64698d5e80a45cd7a3758618e0.

Undo weird commit to toolbox?
This commit is contained in:
PrPleGoo
2019-04-08 12:18:27 +02:00
committed by Pieter-Jan Briers
parent 50433c7ab6
commit 35f3cbe3f9
22 changed files with 248 additions and 21 deletions

View File

@@ -14,3 +14,27 @@
Slots:
- head
sprite: Clothing/helmet_sec.rsi
- type: entity
parent: Clothing
id: HelmetEngineering
name: Hard hat
description: A piece of headgear used in dangerous working conditions to protect the head. Comes with a built-in flashlight.
components:
- type: HandheldLight
- type: PointLight
state: Off
- type: Sprite
sprite: Clothing/helmet_engineering.rsi
layers:
- state: HelmetEngineering
- state: HandheldLightOnOverlay
shader: unshaded
visible: false
- type: Icon
sprite: Clothing/helmet_engineering.rsi
state: HelmetEngineering
- type: Clothing
Slots:
- head
sprite: Clothing/helmet_engineering.rsi

View File

@@ -92,7 +92,11 @@
- type: HandheldLight
- type: Sprite
sprite: Objects/lantern.rsi
state: lantern_off
layers:
- state: lantern_off
- state: HandheldLightOnOverlay
shader: unshaded
visible: false
- type: Icon
sprite: Objects/lantern.rsi
state: lantern_off

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.5 KiB

View File

@@ -0,0 +1,51 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "Taken from https://github.com/discordia-space/CEV-Eris at commit 9a3a3a180344460263e8df7ea2565128e07b86b5",
"states": [
{
"name": "Off-equipped-HELMET",
"directions": 4,
"delays": [
[ 1.0 ],
[ 1.0 ],
[ 1.0 ],
[ 1.0 ]
]
},
{
"name": "On-equipped-HELMET",
"directions": 4,
"delays": [
[ 1.0 ],
[ 1.0 ],
[ 1.0 ],
[ 1.0 ]
]
},
{
"name": "equipped-HELMET",
"directions": 4,
"delays": [
[ 1.0 ],
[ 1.0 ],
[ 1.0 ],
[ 1.0 ]
]
},
{
"name": "HelmetEngineering",
"directions": 1,
"delays": [ [ 1.0 ] ]
},
{
"name": "HandheldLightOnOverlay",
"directions": 1,
"delays": [ [ 1.0 ] ]
}
]
}

View File

@@ -1 +1,26 @@
{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/discordia-space/CEV-Eris at commit 9a3a3a180344460263e8df7ea2565128e07b86b5", "states": [{"name": "equipped-HELMET", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "helmet", "directions": 1, "delays": [[1.0]]}]}
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "Taken from https://github.com/discordia-space/CEV-Eris at commit 9a3a3a180344460263e8df7ea2565128e07b86b5",
"states": [
{
"name": "equipped-HELMET",
"directions": 4,
"delays": [
[ 1.0 ],
[ 1.0 ],
[ 1.0 ],
[ 1.0 ]
]
},
{
"name": "helmet",
"directions": 1,
"delays": [ [ 1.0 ] ]
}
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 293 B

View File

@@ -1,4 +1,4 @@
{
{
"version": 1,
"size": {
"x": 32,
@@ -17,7 +17,7 @@
]
},
{
"name": "lantern_on",
"name": "HandheldLightOnOverlay",
"select": [],
"flags": {},
"directions": 1,