Skip to content

Commit

Permalink
Add Makeup (#614)
Browse files Browse the repository at this point in the history
<!--
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](DeltaV-Station/Delta-v#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!
  • Loading branch information
angelofallars authored Jul 30, 2024
1 parent 055ad75 commit 08dde02
Show file tree
Hide file tree
Showing 9 changed files with 139 additions and 0 deletions.
17 changes: 17 additions & 0 deletions Resources/Locale/en-US/markings/makeup.ftl
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
35 changes: 35 additions & 0 deletions Resources/Textures/Mobs/Customization/makeup.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -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
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 08dde02

Please sign in to comment.