From 40b9a9dda4ae11fc0c9e995f9acc46194604d9f6 Mon Sep 17 00:00:00 2001 From: Martin Petkovski <63034378+martin69420@users.noreply.github.com> Date: Sun, 14 Aug 2022 16:23:25 +1000 Subject: [PATCH] fixed inhand and worn sprites for boxing gloves (#10574) --- .../Entities/Clothing/Hands/gloves.yml | 27 +++---- .../boxingblue.rsi/equipped-HAND.png} | Bin .../boxingblue.rsi/icon.png} | Bin .../boxingblue.rsi/inhand-left.png} | Bin .../boxingblue.rsi/inhand-right.png} | Bin .../Gloves/Boxing/boxingblue.rsi/meta.json | 26 +++++++ .../boxinggreen.rsi/equipped-HAND.png} | Bin .../boxinggreen.rsi/icon.png} | Bin .../boxinggreen.rsi/inhand-left.png} | Bin .../boxinggreen.rsi/inhand-right.png} | Bin .../Gloves/Boxing/boxinggreen.rsi/meta.json | 26 +++++++ .../boxingred.rsi}/equipped-HAND.png | Bin .../boxingred.rsi}/icon.png | Bin .../boxingred.rsi}/inhand-left.png | Bin .../boxingred.rsi}/inhand-right.png | Bin .../Gloves/Boxing/boxingred.rsi/meta.json | 26 +++++++ .../boxingyellow.rsi/equipped-HAND.png} | Bin .../boxingyellow.rsi/icon.png} | Bin .../boxingyellow.rsi/inhand-left.png} | Bin .../boxingyellow.rsi/inhand-right.png} | Bin .../Gloves/Boxing/boxingyellow.rsi/meta.json | 26 +++++++ .../Hands/Gloves/boxing.rsi/meta.json | 71 ------------------ 22 files changed, 116 insertions(+), 86 deletions(-) rename Resources/Textures/Clothing/Hands/Gloves/{boxing.rsi/blue-equipped-HAND.png => Boxing/boxingblue.rsi/equipped-HAND.png} (100%) rename Resources/Textures/Clothing/Hands/Gloves/{boxing.rsi/icon-blue.png => Boxing/boxingblue.rsi/icon.png} (100%) rename Resources/Textures/Clothing/Hands/Gloves/{boxing.rsi/blue-inhand-left.png => Boxing/boxingblue.rsi/inhand-left.png} (100%) rename Resources/Textures/Clothing/Hands/Gloves/{boxing.rsi/blue-inhand-right.png => Boxing/boxingblue.rsi/inhand-right.png} (100%) create mode 100644 Resources/Textures/Clothing/Hands/Gloves/Boxing/boxingblue.rsi/meta.json rename Resources/Textures/Clothing/Hands/Gloves/{boxing.rsi/green-equipped-HAND.png => Boxing/boxinggreen.rsi/equipped-HAND.png} (100%) rename Resources/Textures/Clothing/Hands/Gloves/{boxing.rsi/icon-green.png => Boxing/boxinggreen.rsi/icon.png} (100%) rename Resources/Textures/Clothing/Hands/Gloves/{boxing.rsi/green-inhand-left.png => Boxing/boxinggreen.rsi/inhand-left.png} (100%) rename Resources/Textures/Clothing/Hands/Gloves/{boxing.rsi/green-inhand-right.png => Boxing/boxinggreen.rsi/inhand-right.png} (100%) create mode 100644 Resources/Textures/Clothing/Hands/Gloves/Boxing/boxinggreen.rsi/meta.json rename Resources/Textures/Clothing/Hands/Gloves/{boxing.rsi => Boxing/boxingred.rsi}/equipped-HAND.png (100%) rename Resources/Textures/Clothing/Hands/Gloves/{boxing.rsi => Boxing/boxingred.rsi}/icon.png (100%) rename Resources/Textures/Clothing/Hands/Gloves/{boxing.rsi => Boxing/boxingred.rsi}/inhand-left.png (100%) rename Resources/Textures/Clothing/Hands/Gloves/{boxing.rsi => Boxing/boxingred.rsi}/inhand-right.png (100%) create mode 100644 Resources/Textures/Clothing/Hands/Gloves/Boxing/boxingred.rsi/meta.json rename Resources/Textures/Clothing/Hands/Gloves/{boxing.rsi/yellow-equipped-HAND.png => Boxing/boxingyellow.rsi/equipped-HAND.png} (100%) rename Resources/Textures/Clothing/Hands/Gloves/{boxing.rsi/icon-yellow.png => Boxing/boxingyellow.rsi/icon.png} (100%) rename Resources/Textures/Clothing/Hands/Gloves/{boxing.rsi/yellow-inhand-left.png => Boxing/boxingyellow.rsi/inhand-left.png} (100%) rename Resources/Textures/Clothing/Hands/Gloves/{boxing.rsi/yellow-inhand-right.png => Boxing/boxingyellow.rsi/inhand-right.png} (100%) create mode 100644 Resources/Textures/Clothing/Hands/Gloves/Boxing/boxingyellow.rsi/meta.json delete mode 100644 Resources/Textures/Clothing/Hands/Gloves/boxing.rsi/meta.json diff --git a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml index a5cb659e17..515b027b0d 100644 --- a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml +++ b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml @@ -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 diff --git a/Resources/Textures/Clothing/Hands/Gloves/boxing.rsi/blue-equipped-HAND.png b/Resources/Textures/Clothing/Hands/Gloves/Boxing/boxingblue.rsi/equipped-HAND.png similarity index 100% rename from Resources/Textures/Clothing/Hands/Gloves/boxing.rsi/blue-equipped-HAND.png rename to Resources/Textures/Clothing/Hands/Gloves/Boxing/boxingblue.rsi/equipped-HAND.png diff --git a/Resources/Textures/Clothing/Hands/Gloves/boxing.rsi/icon-blue.png b/Resources/Textures/Clothing/Hands/Gloves/Boxing/boxingblue.rsi/icon.png similarity index 100% rename from Resources/Textures/Clothing/Hands/Gloves/boxing.rsi/icon-blue.png rename to Resources/Textures/Clothing/Hands/Gloves/Boxing/boxingblue.rsi/icon.png diff --git a/Resources/Textures/Clothing/Hands/Gloves/boxing.rsi/blue-inhand-left.png b/Resources/Textures/Clothing/Hands/Gloves/Boxing/boxingblue.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/Hands/Gloves/boxing.rsi/blue-inhand-left.png rename to Resources/Textures/Clothing/Hands/Gloves/Boxing/boxingblue.rsi/inhand-left.png diff --git a/Resources/Textures/Clothing/Hands/Gloves/boxing.rsi/blue-inhand-right.png b/Resources/Textures/Clothing/Hands/Gloves/Boxing/boxingblue.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/Hands/Gloves/boxing.rsi/blue-inhand-right.png rename to Resources/Textures/Clothing/Hands/Gloves/Boxing/boxingblue.rsi/inhand-right.png diff --git a/Resources/Textures/Clothing/Hands/Gloves/Boxing/boxingblue.rsi/meta.json b/Resources/Textures/Clothing/Hands/Gloves/Boxing/boxingblue.rsi/meta.json new file mode 100644 index 0000000000..88e3ebd509 --- /dev/null +++ b/Resources/Textures/Clothing/Hands/Gloves/Boxing/boxingblue.rsi/meta.json @@ -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 + } + ] +} diff --git a/Resources/Textures/Clothing/Hands/Gloves/boxing.rsi/green-equipped-HAND.png b/Resources/Textures/Clothing/Hands/Gloves/Boxing/boxinggreen.rsi/equipped-HAND.png similarity index 100% rename from Resources/Textures/Clothing/Hands/Gloves/boxing.rsi/green-equipped-HAND.png rename to Resources/Textures/Clothing/Hands/Gloves/Boxing/boxinggreen.rsi/equipped-HAND.png diff --git a/Resources/Textures/Clothing/Hands/Gloves/boxing.rsi/icon-green.png b/Resources/Textures/Clothing/Hands/Gloves/Boxing/boxinggreen.rsi/icon.png similarity index 100% rename from Resources/Textures/Clothing/Hands/Gloves/boxing.rsi/icon-green.png rename to Resources/Textures/Clothing/Hands/Gloves/Boxing/boxinggreen.rsi/icon.png diff --git a/Resources/Textures/Clothing/Hands/Gloves/boxing.rsi/green-inhand-left.png b/Resources/Textures/Clothing/Hands/Gloves/Boxing/boxinggreen.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/Hands/Gloves/boxing.rsi/green-inhand-left.png rename to Resources/Textures/Clothing/Hands/Gloves/Boxing/boxinggreen.rsi/inhand-left.png diff --git a/Resources/Textures/Clothing/Hands/Gloves/boxing.rsi/green-inhand-right.png b/Resources/Textures/Clothing/Hands/Gloves/Boxing/boxinggreen.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/Hands/Gloves/boxing.rsi/green-inhand-right.png rename to Resources/Textures/Clothing/Hands/Gloves/Boxing/boxinggreen.rsi/inhand-right.png diff --git a/Resources/Textures/Clothing/Hands/Gloves/Boxing/boxinggreen.rsi/meta.json b/Resources/Textures/Clothing/Hands/Gloves/Boxing/boxinggreen.rsi/meta.json new file mode 100644 index 0000000000..88e3ebd509 --- /dev/null +++ b/Resources/Textures/Clothing/Hands/Gloves/Boxing/boxinggreen.rsi/meta.json @@ -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 + } + ] +} diff --git a/Resources/Textures/Clothing/Hands/Gloves/boxing.rsi/equipped-HAND.png b/Resources/Textures/Clothing/Hands/Gloves/Boxing/boxingred.rsi/equipped-HAND.png similarity index 100% rename from Resources/Textures/Clothing/Hands/Gloves/boxing.rsi/equipped-HAND.png rename to Resources/Textures/Clothing/Hands/Gloves/Boxing/boxingred.rsi/equipped-HAND.png diff --git a/Resources/Textures/Clothing/Hands/Gloves/boxing.rsi/icon.png b/Resources/Textures/Clothing/Hands/Gloves/Boxing/boxingred.rsi/icon.png similarity index 100% rename from Resources/Textures/Clothing/Hands/Gloves/boxing.rsi/icon.png rename to Resources/Textures/Clothing/Hands/Gloves/Boxing/boxingred.rsi/icon.png diff --git a/Resources/Textures/Clothing/Hands/Gloves/boxing.rsi/inhand-left.png b/Resources/Textures/Clothing/Hands/Gloves/Boxing/boxingred.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/Hands/Gloves/boxing.rsi/inhand-left.png rename to Resources/Textures/Clothing/Hands/Gloves/Boxing/boxingred.rsi/inhand-left.png diff --git a/Resources/Textures/Clothing/Hands/Gloves/boxing.rsi/inhand-right.png b/Resources/Textures/Clothing/Hands/Gloves/Boxing/boxingred.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/Hands/Gloves/boxing.rsi/inhand-right.png rename to Resources/Textures/Clothing/Hands/Gloves/Boxing/boxingred.rsi/inhand-right.png diff --git a/Resources/Textures/Clothing/Hands/Gloves/Boxing/boxingred.rsi/meta.json b/Resources/Textures/Clothing/Hands/Gloves/Boxing/boxingred.rsi/meta.json new file mode 100644 index 0000000000..88e3ebd509 --- /dev/null +++ b/Resources/Textures/Clothing/Hands/Gloves/Boxing/boxingred.rsi/meta.json @@ -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 + } + ] +} diff --git a/Resources/Textures/Clothing/Hands/Gloves/boxing.rsi/yellow-equipped-HAND.png b/Resources/Textures/Clothing/Hands/Gloves/Boxing/boxingyellow.rsi/equipped-HAND.png similarity index 100% rename from Resources/Textures/Clothing/Hands/Gloves/boxing.rsi/yellow-equipped-HAND.png rename to Resources/Textures/Clothing/Hands/Gloves/Boxing/boxingyellow.rsi/equipped-HAND.png diff --git a/Resources/Textures/Clothing/Hands/Gloves/boxing.rsi/icon-yellow.png b/Resources/Textures/Clothing/Hands/Gloves/Boxing/boxingyellow.rsi/icon.png similarity index 100% rename from Resources/Textures/Clothing/Hands/Gloves/boxing.rsi/icon-yellow.png rename to Resources/Textures/Clothing/Hands/Gloves/Boxing/boxingyellow.rsi/icon.png diff --git a/Resources/Textures/Clothing/Hands/Gloves/boxing.rsi/yellow-inhand-left.png b/Resources/Textures/Clothing/Hands/Gloves/Boxing/boxingyellow.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/Hands/Gloves/boxing.rsi/yellow-inhand-left.png rename to Resources/Textures/Clothing/Hands/Gloves/Boxing/boxingyellow.rsi/inhand-left.png diff --git a/Resources/Textures/Clothing/Hands/Gloves/boxing.rsi/yellow-inhand-right.png b/Resources/Textures/Clothing/Hands/Gloves/Boxing/boxingyellow.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/Hands/Gloves/boxing.rsi/yellow-inhand-right.png rename to Resources/Textures/Clothing/Hands/Gloves/Boxing/boxingyellow.rsi/inhand-right.png diff --git a/Resources/Textures/Clothing/Hands/Gloves/Boxing/boxingyellow.rsi/meta.json b/Resources/Textures/Clothing/Hands/Gloves/Boxing/boxingyellow.rsi/meta.json new file mode 100644 index 0000000000..88e3ebd509 --- /dev/null +++ b/Resources/Textures/Clothing/Hands/Gloves/Boxing/boxingyellow.rsi/meta.json @@ -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 + } + ] +} diff --git a/Resources/Textures/Clothing/Hands/Gloves/boxing.rsi/meta.json b/Resources/Textures/Clothing/Hands/Gloves/boxing.rsi/meta.json deleted file mode 100644 index d9a6fdb267..0000000000 --- a/Resources/Textures/Clothing/Hands/Gloves/boxing.rsi/meta.json +++ /dev/null @@ -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 - } - ] -}