Elf Ears (#33572)

* Elf Supremacy

* Delete old ears

* Review Fix

diff --git a/Resources/Locale/en-US/markings/ears.ftl b/Resources/Locale/en-US/markings/ears.ftl
index 62921f5e446bf1c051f3cf8388c1161a9d0a9f27..4c35ed9f418cdc7aa420788a3cb206d5f861bc00 100644 (file)
--- a/Resources/Locale/en-US/markings/ears.ftl
+++ b/Resources/Locale/en-US/markings/ears.ftl
@@ -1 +1,6 @@
-marking-HumanLongEars = Long Ears
+marking-HumanLongEars = Long Ears Standard
+marking-LongEarsWide = Long Ears Wide
+marking-LongEarsSmall = Long Ears Small
+marking-LongEarsUpwards = Long Ears Upwards
+marking-LongEarsTall = Long Ears Tall
+marking-LongEarsThin = Long Ears Thin

diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/ears.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/ears.yml
index 6e350880329a7faa5ce36cad89b51a954da7cd58..c32348b273db48473fa82d519f8be40d12f0097d 100644 (file)
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/ears.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/ears.yml
@@ -2,9 +2,64 @@
   id: HumanLongEars
   bodyPart: HeadTop
   markingCategory: HeadTop
+  forcedColoring: true
+  followSkinColor: true
   speciesRestriction: [Human, Dwarf]
+  sprites:
+  - sprite: Mobs/Customization/ears.rsi
+    state: long_ears_standard
+
+- type: marking
+  id: LongEarsWide
+  bodyPart: HeadTop
+  markingCategory: HeadTop
   forcedColoring: true
   followSkinColor: true
+  speciesRestriction: [Human]
+  sprites:
+  - sprite: Mobs/Customization/ears.rsi
+    state: long_ears_wide
+
+- type: marking
+  id: LongEarsSmall
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  forcedColoring: true
+  followSkinColor: true
+  speciesRestriction: [Human, Dwarf]
+  sprites:
+  - sprite: Mobs/Customization/ears.rsi
+    state: long_ears_small
+
+- type: marking
+  id: LongEarsUpwards
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  forcedColoring: true
+  followSkinColor: true
+  speciesRestriction: [Human]
+  sprites:
+  - sprite: Mobs/Customization/ears.rsi
+    state: long_ears_upwards
+
+- type: marking
+  id: LongEarsTall
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  forcedColoring: true
+  followSkinColor: true
+  speciesRestriction: [Human]
+  sprites:
+  - sprite: Mobs/Customization/ears.rsi
+    state: long_ears_tall
+
+- type: marking
+  id: LongEarsThin
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  forcedColoring: true
+  followSkinColor: true
+  speciesRestriction: [Human, Dwarf]
   sprites:
   - sprite: Mobs/Customization/ears.rsi
-    state: long_ears
+    state: long_ears_thin

diff --git a/Resources/Textures/Mobs/Customization/ears.rsi/long_ears.png b/Resources/Textures/Mobs/Customization/ears.rsi/long_ears.png
deleted file mode 100644 (file)
index 6779427..0000000
Binary files a/Resources/Textures/Mobs/Customization/ears.rsi/long_ears.png and /dev/null differ

diff --git a/Resources/Textures/Mobs/Customization/ears.rsi/long_ears_small.png b/Resources/Textures/Mobs/Customization/ears.rsi/long_ears_small.png
new file mode 100644 (file)
index 0000000..c6cdebe
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/ears.rsi/long_ears_small.png differ

diff --git a/Resources/Textures/Mobs/Customization/ears.rsi/long_ears_standard.png b/Resources/Textures/Mobs/Customization/ears.rsi/long_ears_standard.png
new file mode 100644 (file)
index 0000000..38d7137
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/ears.rsi/long_ears_standard.png differ

diff --git a/Resources/Textures/Mobs/Customization/ears.rsi/long_ears_tall.png b/Resources/Textures/Mobs/Customization/ears.rsi/long_ears_tall.png
new file mode 100644 (file)
index 0000000..f42a866
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/ears.rsi/long_ears_tall.png differ

diff --git a/Resources/Textures/Mobs/Customization/ears.rsi/long_ears_thin.png b/Resources/Textures/Mobs/Customization/ears.rsi/long_ears_thin.png
new file mode 100644 (file)
index 0000000..a910e67
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/ears.rsi/long_ears_thin.png differ

diff --git a/Resources/Textures/Mobs/Customization/ears.rsi/long_ears_upwards.png b/Resources/Textures/Mobs/Customization/ears.rsi/long_ears_upwards.png
new file mode 100644 (file)
index 0000000..8454708
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/ears.rsi/long_ears_upwards.png differ

diff --git a/Resources/Textures/Mobs/Customization/ears.rsi/long_ears_wide.png b/Resources/Textures/Mobs/Customization/ears.rsi/long_ears_wide.png
new file mode 100644 (file)
index 0000000..2a643bf
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/ears.rsi/long_ears_wide.png differ

diff --git a/Resources/Textures/Mobs/Customization/ears.rsi/meta.json b/Resources/Textures/Mobs/Customization/ears.rsi/meta.json
index 9e443733ad3d9a12a14a515d4691fd700de0e90a..ab8deddeaa87e1321de25a9922cd2bcd6e3a94d1 100644 (file)
--- a/Resources/Textures/Mobs/Customization/ears.rsi/meta.json
+++ b/Resources/Textures/Mobs/Customization/ears.rsi/meta.json
@@ -1,16 +1,35 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Drawn by Rouge2t7/Sarahon",
+  "copyright": "Sprites by angelofallars (github)",
   "size": {
     "x": 32,
     "y": 32
   },
   "states": [
     {
-      "name": "long_ears",
+      "name": "long_ears_standard",
+      "directions": 4
+    },
+    {
+      "name": "long_ears_wide",
+      "directions": 4
+    },
+    {
+      "name": "long_ears_small",
+      "directions": 4
+    },
+    {
+      "name": "long_ears_upwards",
+      "directions": 4
+    },
+    {
+      "name": "long_ears_tall",
+      "directions": 4
+    },
+    {
+      "name": "long_ears_thin",
       "directions": 4
     }
-
   ]
 }