Working flashlight for hard hats (#2599)

* Add verb to toggle flashlight * Playing with hand-held light for hard hat * ClothingEquippedPrefix will update players sprite when changed * Make abstract prototype for hardhat and fixed hardhat orange sprites * Fixed all other hard hats * Fixed requested changes * Restore prototype and sprites changes * Nullables * That's actually nullable Co-authored-by: Metal Gear Sloth <metalgearsloth@gmail.com>
2020-11-23 06:17:38 +03:00
parent e97763afd2
commit fb6dd4a490
44 changed files with 202 additions and 31 deletions
--- a/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/light-icon.png
+++ b/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/light-icon.png
--- a/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/meta.json
@@ -10,17 +10,33 @@
    {
      "name": "icon",
      "directions": 1
+    },
+	{
+      "name": "light-icon",
+      "directions": 1
    },
    {
-      "name": "equipped-HELMET",
+      "name": "off-equipped-HELMET",
      "directions": 4
    },
    {
-      "name": "inhand-left",
+      "name": "off-inhand-left",
      "directions": 4
    },
    {
-      "name": "inhand-right",
+      "name": "off-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "on-equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "on-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "on-inhand-right",
      "directions": 4
    }
  ]
--- a/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/off-equipped-HELMET.png
+++ b/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/off-equipped-HELMET.png
--- a/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/off-inhand-left.png
+++ b/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/off-inhand-left.png
--- a/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/off-inhand-right.png
+++ b/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/off-inhand-right.png
--- a/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/on-icon.png
+++ b/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/on-icon.png
--- a/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/on-inhand-left.png
+++ b/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/on-inhand-left.png
--- a/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/on-inhand-right.png
+++ b/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/on-inhand-right.png
--- a/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/light-icon.png
+++ b/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/light-icon.png
--- a/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/meta.json
@@ -10,17 +10,33 @@
    {
      "name": "icon",
      "directions": 1
+    },
+	{
+      "name": "light-icon",
+      "directions": 1
    },
    {
-      "name": "equipped-HELMET",
+      "name": "off-equipped-HELMET",
      "directions": 4
    },
    {
-      "name": "inhand-left",
+      "name": "off-inhand-left",
      "directions": 4
    },
    {
-      "name": "inhand-right",
+      "name": "off-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "on-equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "on-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "on-inhand-right",
      "directions": 4
    }
  ]
--- a/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/off-equipped-HELMET.png
+++ b/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/off-equipped-HELMET.png
--- a/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/off-inhand-left.png
+++ b/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/off-inhand-left.png
--- a/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/off-inhand-right.png
+++ b/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/off-inhand-right.png
--- a/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/on-icon.png
+++ b/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/on-icon.png
--- a/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/on-inhand-left.png
+++ b/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/on-inhand-left.png
--- a/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/on-inhand-right.png
+++ b/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/on-inhand-right.png
--- a/Resources/Textures/Clothing/Head/Hardhats/red.rsi/light-icon.png
+++ b/Resources/Textures/Clothing/Head/Hardhats/red.rsi/light-icon.png
--- a/Resources/Textures/Clothing/Head/Hardhats/red.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Hardhats/red.rsi/meta.json
@@ -10,17 +10,33 @@
    {
      "name": "icon",
      "directions": 1
+    },
+	{
+      "name": "light-icon",
+      "directions": 1
    },
    {
-      "name": "equipped-HELMET",
+      "name": "off-equipped-HELMET",
      "directions": 4
    },
    {
-      "name": "inhand-left",
+      "name": "off-inhand-left",
      "directions": 4
    },
    {
-      "name": "inhand-right",
+      "name": "off-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "on-equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "on-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "on-inhand-right",
      "directions": 4
    }
  ]
--- a/Resources/Textures/Clothing/Head/Hardhats/red.rsi/off-equipped-HELMET.png
+++ b/Resources/Textures/Clothing/Head/Hardhats/red.rsi/off-equipped-HELMET.png
--- a/Resources/Textures/Clothing/Head/Hardhats/red.rsi/off-inhand-left.png
+++ b/Resources/Textures/Clothing/Head/Hardhats/red.rsi/off-inhand-left.png
--- a/Resources/Textures/Clothing/Head/Hardhats/red.rsi/off-inhand-right.png
+++ b/Resources/Textures/Clothing/Head/Hardhats/red.rsi/off-inhand-right.png
--- a/Resources/Textures/Clothing/Head/Hardhats/red.rsi/on-icon.png
+++ b/Resources/Textures/Clothing/Head/Hardhats/red.rsi/on-icon.png
--- a/Resources/Textures/Clothing/Head/Hardhats/red.rsi/on-inhand-left.png
+++ b/Resources/Textures/Clothing/Head/Hardhats/red.rsi/on-inhand-left.png
--- a/Resources/Textures/Clothing/Head/Hardhats/red.rsi/on-inhand-right.png
+++ b/Resources/Textures/Clothing/Head/Hardhats/red.rsi/on-inhand-right.png
--- a/Resources/Textures/Clothing/Head/Hardhats/white.rsi/light-icon.png
+++ b/Resources/Textures/Clothing/Head/Hardhats/white.rsi/light-icon.png
--- a/Resources/Textures/Clothing/Head/Hardhats/white.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Hardhats/white.rsi/meta.json
@@ -10,17 +10,33 @@
    {
      "name": "icon",
      "directions": 1
+    },
+	{
+      "name": "light-icon",
+      "directions": 1
    },
    {
-      "name": "equipped-HELMET",
+      "name": "off-equipped-HELMET",
      "directions": 4
    },
    {
-      "name": "inhand-left",
+      "name": "off-inhand-left",
      "directions": 4
    },
    {
-      "name": "inhand-right",
+      "name": "off-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "on-equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "on-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "on-inhand-right",
      "directions": 4
    }
  ]
--- a/Resources/Textures/Clothing/Head/Hardhats/white.rsi/off-equipped-HELMET.png
+++ b/Resources/Textures/Clothing/Head/Hardhats/white.rsi/off-equipped-HELMET.png
--- a/Resources/Textures/Clothing/Head/Hardhats/white.rsi/off-inhand-left.png
+++ b/Resources/Textures/Clothing/Head/Hardhats/white.rsi/off-inhand-left.png
--- a/Resources/Textures/Clothing/Head/Hardhats/white.rsi/off-inhand-right.png
+++ b/Resources/Textures/Clothing/Head/Hardhats/white.rsi/off-inhand-right.png
--- a/Resources/Textures/Clothing/Head/Hardhats/white.rsi/on-icon.png
+++ b/Resources/Textures/Clothing/Head/Hardhats/white.rsi/on-icon.png
--- a/Resources/Textures/Clothing/Head/Hardhats/white.rsi/on-inhand-left.png
+++ b/Resources/Textures/Clothing/Head/Hardhats/white.rsi/on-inhand-left.png
--- a/Resources/Textures/Clothing/Head/Hardhats/white.rsi/on-inhand-right.png
+++ b/Resources/Textures/Clothing/Head/Hardhats/white.rsi/on-inhand-right.png
--- a/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/light-icon.png
+++ b/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/light-icon.png
--- a/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/meta.json
@@ -10,17 +10,33 @@
    {
      "name": "icon",
      "directions": 1
+    },
+	{
+      "name": "light-icon",
+      "directions": 1
    },
    {
-      "name": "equipped-HELMET",
+      "name": "off-equipped-HELMET",
      "directions": 4
    },
    {
-      "name": "inhand-left",
+      "name": "off-inhand-left",
      "directions": 4
    },
    {
-      "name": "inhand-right",
+      "name": "off-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "on-equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "on-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "on-inhand-right",
      "directions": 4
    }
  ]
--- a/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/off-equipped-HELMET.png
+++ b/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/off-equipped-HELMET.png
--- a/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/off-inhand-left.png
+++ b/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/off-inhand-left.png
--- a/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/off-inhand-right.png
+++ b/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/off-inhand-right.png
--- a/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/on-icon.png
+++ b/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/on-icon.png
--- a/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/on-inhand-left.png
+++ b/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/on-inhand-left.png
--- a/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/on-inhand-right.png
+++ b/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/on-inhand-right.png