fixed inhand and worn sprites for boxing gloves (#10574)

This commit is contained in:
Martin Petkovski
2022-08-14 16:23:25 +10:00
committed by GitHub
parent b128132243
commit 40b9a9dda4
22 changed files with 116 additions and 86 deletions

View File

@@ -1,13 +1,13 @@
- type: entity
parent: ClothingHandsBase
id: ClothingHandsGlovesBoxingRed
name: boxing gloves
name: red boxing gloves
description: Red gloves for competitive boxing.
components:
- type: Sprite
sprite: Clothing/Hands/Gloves/boxing.rsi
sprite: Clothing/Hands/Gloves/Boxing/boxingred.rsi
- type: Clothing
sprite: Clothing/Hands/Gloves/boxing.rsi
sprite: Clothing/Hands/Gloves/Boxing/boxingred.rsi
- type: BoxingGloves
- type: StaminaDamageOnHit
damage: 8 #Stam damage values seem a bit higher than regular damage because of the decay, etc
@@ -30,11 +30,10 @@
description: Blue gloves for competitive boxing.
components:
- type: Sprite
sprite: Clothing/Hands/Gloves/boxing.rsi
state: icon-blue
sprite: Clothing/Hands/Gloves/Boxing/boxingblue.rsi
state: icon
- type: Clothing
sprite: Clothing/Hands/Gloves/boxing.rsi
heldPrefix: blue
sprite: Clothing/Hands/Gloves/Boxing/boxingblue.rsi
- type: Fiber
fiberMaterial: fibers-leather
fiberColor: fibers-blue
@@ -47,11 +46,10 @@
description: Green gloves for competitive boxing.
components:
- type: Sprite
sprite: Clothing/Hands/Gloves/boxing.rsi
state: icon-green
sprite: Clothing/Hands/Gloves/Boxing/boxinggreen.rsi
state: icon
- type: Clothing
sprite: Clothing/Hands/Gloves/boxing.rsi
heldPrefix: green
sprite: Clothing/Hands/Gloves/Boxing/boxinggreen.rsi
- type: Fiber
fiberMaterial: fibers-leather
fiberColor: fibers-green
@@ -64,11 +62,10 @@
description: Yellow gloves for competitive boxing.
components:
- type: Sprite
sprite: Clothing/Hands/Gloves/boxing.rsi
state: icon-yellow
sprite: Clothing/Hands/Gloves/Boxing/boxingyellow.rsi
state: icon
- type: Clothing
sprite: Clothing/Hands/Gloves/boxing.rsi
heldPrefix: yellow
sprite: Clothing/Hands/Gloves/Boxing/boxingyellow.rsi
- type: Fiber
fiberMaterial: fibers-leather
fiberColor: fibers-yellow

View File

@@ -0,0 +1,26 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-HAND",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}

View File

@@ -0,0 +1,26 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-HAND",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}

View File

Before

Width:  |  Height:  |  Size: 734 B

After

Width:  |  Height:  |  Size: 734 B

View File

@@ -0,0 +1,26 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-HAND",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}

View File

@@ -0,0 +1,26 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-HAND",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}

View File

@@ -1,71 +0,0 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "icon-blue"
},
{
"name": "icon-green"
},
{
"name": "icon-yellow"
},
{
"name": "equipped-HAND",
"directions": 4
},
{
"name": "blue-equipped-HAND",
"directions": 4
},
{
"name": "green-equipped-HAND",
"directions": 4
},
{
"name": "yellow-equipped-HAND",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "blue-inhand-left",
"directions": 4
},
{
"name": "blue-inhand-right",
"directions": 4
},
{
"name": "green-inhand-left",
"directions": 4
},
{
"name": "green-inhand-right",
"directions": 4
},
{
"name": "yellow-inhand-left",
"directions": 4
},
{
"name": "yellow-inhand-right",
"directions": 4
}
]
}