From 08dde0222497488865c900df398594d5c233e930 Mon Sep 17 00:00:00 2001
From: Angelo Fallaria <ba.fallaria@gmail.com>
Date: Wed, 31 Jul 2024 05:34:36 +0800
Subject: [PATCH] Add Makeup (#614)

<!--
This is a semi-strict format, you can add/remove sections as needed but
the order/format should be kept the same
Remove these comments before submitting
-->

# Description

<!--
Explain this PR in as much detail as applicable

Some example prompts to consider:
How might this affect the game? The codebase?
What might be some alternatives to this?
How/Who does this benefit/hurt [the game/codebase]?
-->

Adds new markings representing makeup:
- Lips
- Blush
- Nail Polish (Left)
- Nail Polish (Right)

Availability depends on the species. Cherry-picked from this
[pull-request](https://github.com/DeltaV-Station/Delta-v/pull/1191) from
Delta-V.

---

<!--
This is default collapsed, readers click to expand it and see all your
media
The PR media section can get very large at times, so this is a good way
to keep it clean
The title is written using HTML tags
The title must be within the <summary> tags or you won't see it
-->

<details><summary><h1>Media</h1></summary>
<p>

Human:


![image](https://github.com/user-attachments/assets/947f0186-297a-4af8-87e4-a14aa08d6100)

![image](https://github.com/user-attachments/assets/fc8b347d-a4fd-49f6-ba8c-2dcd9e5d7ac0)

![image](https://github.com/user-attachments/assets/ae5fc444-b1c2-45bb-969c-d0052c295a9d)


![image](https://github.com/user-attachments/assets/47a1650f-d2a6-4586-a4a1-83398db138b3)

Felinid:


![image](https://github.com/user-attachments/assets/fbd12ed4-e7ac-4898-aa01-bfeff23c2818)

![image](https://github.com/user-attachments/assets/3401464d-ba4d-4da0-b378-b0d45424d792)

![image](https://github.com/user-attachments/assets/f0a08c2f-0cb0-4349-976c-15c59723a702)

Moth:


![image](https://github.com/user-attachments/assets/e0036568-8860-4daf-b548-3f953f9a2ec4)

![image](https://github.com/user-attachments/assets/68620d38-6365-477d-be90-6b92dfaa32ee)
</p>
</details>

---

# Changelog

<!--
You can add an author after the `:cl:` to change the name that appears
in the changelog (ex: `:cl: Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->

:cl:
- add: Makeup is finally here: lips, blush, and nail polish! Sashay over
to Character Setup in the Markings section, then look at Head/Overlay to
give makeovers to your characters!
---
 Resources/Locale/en-US/markings/makeup.ftl    |  17 ++++
 .../Mobs/Customization/Markings/makeup.yml    |  87 ++++++++++++++++++
 .../Mobs/Customization/makeup.rsi/blush.png   | Bin 0 -> 151 bytes
 .../Mobs/Customization/makeup.rsi/lips.png    | Bin 0 -> 149 bytes
 .../Mobs/Customization/makeup.rsi/meta.json   |  35 +++++++
 .../Customization/makeup.rsi/moth_blush.png   | Bin 0 -> 139 bytes
 .../Customization/makeup.rsi/moth_lips.png    | Bin 0 -> 137 bytes
 .../makeup.rsi/nail_polish_l.png              | Bin 0 -> 170 bytes
 .../makeup.rsi/nail_polish_r.png              | Bin 0 -> 167 bytes
 9 files changed, 139 insertions(+)
 create mode 100644 Resources/Locale/en-US/markings/makeup.ftl
 create mode 100644 Resources/Prototypes/Entities/Mobs/Customization/Markings/makeup.yml
 create mode 100644 Resources/Textures/Mobs/Customization/makeup.rsi/blush.png
 create mode 100644 Resources/Textures/Mobs/Customization/makeup.rsi/lips.png
 create mode 100644 Resources/Textures/Mobs/Customization/makeup.rsi/meta.json
 create mode 100644 Resources/Textures/Mobs/Customization/makeup.rsi/moth_blush.png
 create mode 100644 Resources/Textures/Mobs/Customization/makeup.rsi/moth_lips.png
 create mode 100644 Resources/Textures/Mobs/Customization/makeup.rsi/nail_polish_l.png
 create mode 100644 Resources/Textures/Mobs/Customization/makeup.rsi/nail_polish_r.png

diff --git a/Resources/Locale/en-US/markings/makeup.ftl b/Resources/Locale/en-US/markings/makeup.ftl
new file mode 100644
index 00000000000..24ca3a10b7d
--- /dev/null
+++ b/Resources/Locale/en-US/markings/makeup.ftl
@@ -0,0 +1,17 @@
+marking-MakeupLips-lips = Lips
+marking-MakeupLips = Lips
+
+marking-MakeupBlush-blush = Blush
+marking-MakeupBlush = Blush
+
+marking-MakeupNailPolishLeft-nail_polish_l = Nail Polish (Left)
+marking-MakeupNailPolishLeft = Nail Polish (Left)
+
+marking-MakeupNailPolishRight-nail_polish_r = Nail Polish (Right)
+marking-MakeupNailPolishRight = Nail Polish (Right)
+
+marking-MakeupMothBlush-moth_blush = Moth Blush
+marking-MakeupMothBlush = Moth Blush
+
+marking-MakeupMothLips-moth_lips = Moth Lipstick
+marking-MakeupMothLips = Moth Lipstick
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/makeup.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/makeup.yml
new file mode 100644
index 00000000000..901bf6e75cf
--- /dev/null
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/makeup.yml
@@ -0,0 +1,87 @@
+- type: marking
+  id: MakeupLips
+  bodyPart: Head
+  markingCategory: Head
+  speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy] # Delta V - Felinid, Oni, Harpy
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#7e2727"
+  sprites:
+  - sprite: Mobs/Customization/makeup.rsi
+    state: lips
+
+- type: marking
+  id: MakeupBlush
+  bodyPart: Head
+  markingCategory: Head
+  speciesRestriction: [Dwarf, Human, Reptilian, SlimePerson, Felinid, Oni, Vulpkanin, Harpy] # Delta V - Felinid, Oni, Vulpkanin, Harpy
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#d39394"
+  sprites:
+  - sprite: Mobs/Customization/makeup.rsi
+    state: blush
+
+- type: marking
+  id: MakeupNailPolishRight
+  bodyPart: RHand
+  markingCategory: Overlay
+  speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#702020"
+  sprites:
+  - sprite: Mobs/Customization/makeup.rsi
+    state: nail_polish_r
+
+- type: marking
+  id: MakeupNailPolishLeft
+  bodyPart: LHand
+  markingCategory: Overlay
+  speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#702020"
+  sprites:
+  - sprite: Mobs/Customization/makeup.rsi
+    state: nail_polish_l
+
+# Moth-specific
+
+- type: marking
+  id: MakeupMothLips
+  bodyPart: Head
+  markingCategory: Overlay   # The marking category is in Overlay instead of Head
+                             # because the Head category for moths only allows 1
+                             # marking and lips should be usable alongside blush
+  speciesRestriction: [Moth]
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#7e2727"
+  sprites:
+  - sprite: Mobs/Customization/makeup.rsi
+    state: moth_lips
+
+- type: marking
+  id: MakeupMothBlush
+  bodyPart: Head
+  markingCategory: Overlay
+  speciesRestriction: [Moth]
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#d39394"
+  sprites:
+  - sprite: Mobs/Customization/makeup.rsi
+    state: moth_blush
diff --git a/Resources/Textures/Mobs/Customization/makeup.rsi/blush.png b/Resources/Textures/Mobs/Customization/makeup.rsi/blush.png
new file mode 100644
index 0000000000000000000000000000000000000000..9e672df8c31c1bbaa12a2033c023f41f10761734
GIT binary patch
literal 151
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Y)RhkE)0?k@(cp=>UJ#!if|Tq
zL>4nJa0`PlBg3pY5<o$7PZ!6Kid%1QEfi!h;9xNP7BA%!D$Bt#eTDoZWrl{nntvcO
jLEzo3Iu;vFF!O*5<6;~6hq8%^FF|}yS3j3^P6<r_T8ATx

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Mobs/Customization/makeup.rsi/lips.png b/Resources/Textures/Mobs/Customization/makeup.rsi/lips.png
new file mode 100644
index 0000000000000000000000000000000000000000..1e5034a92fba30d2cba23de4604fa0b43f3b42d9
GIT binary patch
literal 149
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Y)RhkE)4%caKYZ?lYt_f1s;*b
z3=G`DAk4@xYmNj^(A3k#F{I+w+gpl^3=AAc9Daq@G0F-^yi@X7&&80S=(!rG1`PJc
f{9&5M0%k@?w-<0<tP2<60C7EC{an^LB{Ts5`>Z3`

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Mobs/Customization/makeup.rsi/meta.json b/Resources/Textures/Mobs/Customization/makeup.rsi/meta.json
new file mode 100644
index 00000000000..422f1eec834
--- /dev/null
+++ b/Resources/Textures/Mobs/Customization/makeup.rsi/meta.json
@@ -0,0 +1,35 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Sprites by angelofallars (github)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "lips",
+      "directions": 4
+    },
+    {
+      "name": "blush",
+      "directions": 4
+    },
+    {
+      "name": "nail_polish_l",
+      "directions": 4
+    },
+    {
+      "name": "nail_polish_r",
+      "directions": 4
+    },
+    {
+      "name": "moth_lips",
+      "directions": 4
+    },
+    {
+      "name": "moth_blush",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Mobs/Customization/makeup.rsi/moth_blush.png b/Resources/Textures/Mobs/Customization/makeup.rsi/moth_blush.png
new file mode 100644
index 0000000000000000000000000000000000000000..c66a862be017fba40ab00802f73ba1afb1fd671b
GIT binary patch
literal 139
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I0wfs{c7_5;rX+877lxY8c5<pf9%q3^WHAE+
zw=f7ZGR&GI0Tk5tba4#HxcBzPLO})w4raq|@w;>y4i~sDx>wQ|#u%<z%nVd?UuAcG
f!ftj32D^;LCho6$jF*`LMHxI@{an^LB{Ts5>Dwa<

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Mobs/Customization/makeup.rsi/moth_lips.png b/Resources/Textures/Mobs/Customization/makeup.rsi/moth_lips.png
new file mode 100644
index 0000000000000000000000000000000000000000..72c6f57c6efc880557a31b5129c8fc959e0f24c8
GIT binary patch
literal 137
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I0wfs{c7_5;rX+877lxY8c5<pf9%q3^WHAE+
zw=f7ZGR&GI0Tk5rba4#HxcBykp&)|-!;uZY%>P;>Bs|uecwr-J!PZQm3Wkuk4~5S}
cF)%d5%REnJ|LNIntp*bIboFyt=akR{0O{Hz?EnA(

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Mobs/Customization/makeup.rsi/nail_polish_l.png b/Resources/Textures/Mobs/Customization/makeup.rsi/nail_polish_l.png
new file mode 100644
index 0000000000000000000000000000000000000000..73175b4e2c8436ee2c1c5548cbcd51377b9bb489
GIT binary patch
literal 170
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Y)RhkE)1I)(iv7=-5>V?D8gCb
z5n0T@z%2~Ij105pNB{-BJY5_^DsH{KwUL)WfrG{2(Ld|QOlEG20^e(`;{Pe81XRMn
zAeNHW_v~`yZSNIPJB+x&LJSRB+hdDvd$-nCyM1?NU^uXcPut)4{F#3rYC!Uyu6{1-
HoD!M<Ng6T(

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Mobs/Customization/makeup.rsi/nail_polish_r.png b/Resources/Textures/Mobs/Customization/makeup.rsi/nail_polish_r.png
new file mode 100644
index 0000000000000000000000000000000000000000..6ce26ba4aec36a7d0f10294ac2434933961772ac
GIT binary patch
literal 167
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Y)RhkE)1I)(iv7=-5>V?D8gCb
z5n0T@z%2~Ij105pNB{-hJzX3_DsH{KsmRBmz{BEr=>Pv3i2{qJ46DUj`YZ1k0+lc@
zY*X2Jcdc3a>Tf%;W;23C7%b{U?*BAel-qReJ|n}5e8w#r#^?8D&Flindb;|#taD0e
F0szN&F&h8?

literal 0
HcmV?d00001