Skip to content

Commit

Permalink
Cherry-Pick Oni Markings (#1691)
Browse files Browse the repository at this point in the history
* Oni Horn Markings (#726)

# Description

---

Three new Oni horn markings,] two of which have three tone support.
There was a distinct lack of large horns, which I tried my hand at.

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


![display](https://github.com/user-attachments/assets/cb0604e8-941c-48fd-8fb8-205893b87c5c)

</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: Added crowned, tall bull, and tall curved Oni horns.

* Oni Pointy Ears And Tusks (#727)

# Description

Adds eight pointy ears, two tusks, one feet marking (toes resembling
WarCraft trolls) and human nose markings to Onis. The pointed ears are a
big reference to tieflings (similar to Onis) who often have them.

Onis will now have pointy ears by default, but there is a marking to
disable ears.

5 human nose markings have all been made available to Onis, Harpies, and
Felinids. Onis and Felinids can now get chest scars, originally
humna-only. The tusk markings are originally from Frontier goblins.

The new pointy ears give players the power to make their Onis look like
**tieflings, orcs, elves, goblins**, and more fantasy races.

These markings can potentially be used in the future for other species
like psionic elves.

## Media

**Blood Elf** (Tall Ears)


![image](https://github.com/user-attachments/assets/257c8839-303c-45b2-b129-3f9183e47695)

<details><summary>See more</summary>

**Orc** (Upward Ears, Large Tusks)


![image](https://github.com/user-attachments/assets/46bac694-de88-4e04-a12b-7ff8a8111e7b)

**Night Elf** (Wide Ears)


![image](https://github.com/user-attachments/assets/18813660-cd2c-4d37-800d-bf84b1d7dee5)

**Night Elf** (Slanted Ears)


![image](https://github.com/user-attachments/assets/7f39457b-875d-4c46-a5fb-428a6a535fb1)

**Troll** (Large Ears, Small Tusks, Two-Toed Feet)


![image](https://github.com/user-attachments/assets/d9a0c52e-020d-4b55-bb7e-7a4afed61dcc)

**Character Setup**


![image](https://github.com/user-attachments/assets/35ba27d4-e6d1-4c52-bbc7-0f057df12fc8)


![image](https://github.com/user-attachments/assets/5d9e7690-7118-48b3-95b9-50ee784660e2)

</details>

## Changelog

:cl: Skubman
- add: Onis have received eight new pointy ear markings in the 'Head
(Side)' section that can help them resemble tieflings, orcs, elves,
goblins, trolls, and more.
- add: Onis get two new tusk markings in the 'Snout' section, and a
Two-Toed feet marking in the 'Legs' section.
- add: Felinids, Onis, and Harpies can now select Human nose markings
like the schnozz, blobby nose, and nubby nose.
- add: Felinids and Onis can now select the Chest Scar and Top Surgery
Scar markings.
- tweak: Default Onis now use the Double Curved horn and Upward Ears
markings.

* [S] Onis: Get A Boatload Of Troll Horns. (#741)

# Description

Adds **16** new horns to Onis, 10 of which are inspired by **Homestuck**
trolls. Most of the new horns have three-tone variants, and some also
have striped variants.

New horns and available variants:
- Antlers (Three Tone)
- Aries (Three Tone)
- Double Thick (Striped, Three Tone)
- Erebia (Ringed, Three Tone)
- Inclined (Three Tone)
- Makara (Striped, Three Tone)
- Nepeta (Three Tone)
- Pisces (Striped, Three Tone)
- Sagittarius
- Serket (Three Tone)
- Taurus (Striped, Three Tone)
- Tavris (Three Tone)
- Unicorn
- Vantas (Three Tone)
- Virgo (Three Tone)
- Wavy (Striped, Three Tone)
- Three Tone for the existing Double Curved horn
- Three Tone for the existing Double Curved Outwards horn

## Media

**Serket (Three Tone)**


![image](https://github.com/user-attachments/assets/69beabb3-01ea-49ac-9e9e-8d9351bf99df)

<details><summary>See more</summary>

**Makara (Striped)**


![image](https://github.com/user-attachments/assets/839707b7-c063-41f4-b59f-dc36f2126967)

**Aries (Three Tone)**


![image](https://github.com/user-attachments/assets/ba7a65da-06d0-4ddd-b0d0-afa9cff5ad03)


![image](https://github.com/user-attachments/assets/b4abcdd2-a11e-4d4f-be61-1970e78cf588)

**Antlers**


![image](https://github.com/user-attachments/assets/cfb47d5b-f985-4dbe-b86d-96c31472007f)

**Pisces (Striped)**


![image](https://github.com/user-attachments/assets/9426c51e-49fe-41d4-b049-ee8b1a159c57)

**Wavy**


![image](https://github.com/user-attachments/assets/c29420aa-4576-49ec-af08-0ff38aff7ea4)

**Taurus (Striped)**


![image](https://github.com/user-attachments/assets/9aa3084e-4acc-473e-b875-465b242d0551)

**Nepeta (Three Tone)**


![image](https://github.com/user-attachments/assets/639abc4a-0cf1-456a-b214-6520e39e992f)

**Sagittarius (Three Tone)**


![image](https://github.com/user-attachments/assets/2a4a7c6f-0678-462d-8de6-f8fe6c10aef3)

**Unicorn**


![image](https://github.com/user-attachments/assets/6783cbd4-2dcf-4204-bb03-3f3601e1c6f7)


![image](https://github.com/user-attachments/assets/c09f7ef3-a0e3-429f-be70-76db0232ad01)

</details>

## Changelog

:cl: Skubman
- add: 16 new horns for Onis have been added, with three-tone variants
and some striped variants! The new horns include the Serket, Nepeta,
Vantas, Makara, and more.
- add: The Oni horns Double Curved and Double Curved Outwards have
received three-tone variants.

* Respacing to EE

* I forgot human.yml, apparently, but we're fiiine.

---------

Co-authored-by: dootythefrooty <[email protected]>
Co-authored-by: Angelo Fallaria <[email protected]>
  • Loading branch information
3 people authored Aug 27, 2024
1 parent 5c21335 commit d89a727
Show file tree
Hide file tree
Showing 118 changed files with 1,343 additions and 9 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
### goblin tusks
marking-GoblinTusksBasic = No Tusks
marking-GoblinTusksBasic-goblin_tusks_none = No Tusks
marking-GoblinTusksSmall = Small Tusks
marking-GoblinTusksSmall-goblin_tusks_small = Small Tusks
marking-GoblinTusksBig = Long Tusks
marking-GoblinTusksBig-goblin_tusks_big = Long Tusks
176 changes: 176 additions & 0 deletions Resources/Locale/en-US/einstein-engines/markings/oni.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,176 @@
marking-OniHornTallCurved = Tall Curved
marking-OniHornTallCurved-tall_curved = Tall Curved
marking-OniHornTallCurved3Tone = Tall Curved (Three Tone)
marking-OniHornTallCurved3Tone-tall_curved_3tone_1 = Bottom Third
marking-OniHornTallCurved3Tone-tall_curved_3tone_2 = Middle Third
marking-OniHornTallCurved3Tone-tall_curved_3tone_3 = Top Third
marking-OniHornTallBull= Tall Bull
marking-OniHornTallBull-tall_bull = Tall Bull
marking-OniHornTallBull3Tone = Tall Bull (Three Tone)
marking-OniHornTallBull3Tone-tall_bull_3tone_1 = Bottom Third
marking-OniHornTallBull3Tone-tall_bull_3tone_2 = Middle Third
marking-OniHornTallBull3Tone-tall_bull_3tone_3 = Top Third
marking-OniHornCrowned = Crowned
marking-OniHornCrowned-crowned = Crowned
marking-OniHornSerket = Serket
marking-OniHornSerket-serket = Serket
marking-OniHornSerket3Tone = Serket (Three Tone)
marking-OniHornSerket3Tone-serket_3tone_1 = Bottom Third
marking-OniHornSerket3Tone-serket_3tone_2 = Middle Third
marking-OniHornSerket3Tone-serket_3tone_3 = Top Third
marking-OniHornPisces = Pisces
marking-OniHornPisces-pisces = Pisces
marking-OniHornPisces2Tone = Pisces (Striped)
marking-OniHornPisces2Tone-pisces_2tone_1 = Even stripes
marking-OniHornPisces2Tone-pisces_2tone_2 = Odd stripes
marking-OniHornPisces3Tone = Pisces (Three Tone)
marking-OniHornPisces3Tone-pisces_3tone_1 = Bottom Third
marking-OniHornPisces3Tone-pisces_3tone_2 = Middle Third
marking-OniHornPisces3Tone-pisces_3tone_3 = Top Third
marking-OniHornVirgo = Virgo
marking-OniHornVirgo-virgo = Virgo
marking-OniHornVirgo3Tone = Virgo (Three Tone)
marking-OniHornVirgo3Tone-virgo_3tone_1 = Bottom Third
marking-OniHornVirgo3Tone-virgo_3tone_2 = Middle Third
marking-OniHornVirgo3Tone-virgo_3tone_3 = Top Third
marking-OniHornSagittarius = Sagittarius
marking-OniHornSagittarius-sagittarius = Sagittarius
marking-OniHornSagittarius3Tone = Sagittarius (Three Tone)
marking-OniHornSagittarius3Tone-sagittarius_3tone_1 = Bottom Third
marking-OniHornSagittarius3Tone-sagittarius_3tone_2 = Middle Third
marking-OniHornSagittarius3Tone-sagittarius_3tone_3 = Top Third
marking-OniHornVantas = Vantas
marking-OniHornVantas-vantas = Vantas
marking-OniHornVantas3Tone = Vantas (Three Tone)
marking-OniHornVantas3Tone-vantas_3tone_1 = Bottom Third
marking-OniHornVantas3Tone-vantas_3tone_2 = Middle Third
marking-OniHornVantas3Tone-vantas_3tone_3 = Top Third
marking-OniHornMakara = Makara
marking-OniHornMakara-makara = Makara
marking-OniHornMakara2Tone = Makara (Striped)
marking-OniHornMakara2Tone-makara_2tone_1 = Even stripes
marking-OniHornMakara2Tone-makara_2tone_2 = Odd stripes
marking-OniHornMakara3Tone = Makara (Three Tone)
marking-OniHornMakara3Tone-makara_3tone_1 = Bottom Third
marking-OniHornMakara3Tone-makara_3tone_2 = Middle Third
marking-OniHornMakara3Tone-makara_3tone_3 = Top Third
marking-OniHornNepeta = Nepeta
marking-OniHornNepeta-nepeta = Nepeta
marking-OniHornNepeta3Tone = Nepeta (Three Tone)
marking-OniHornNepeta3Tone-nepeta_3tone_1 = Bottom Third
marking-OniHornNepeta3Tone-nepeta_3tone_2 = Middle Third
marking-OniHornNepeta3Tone-nepeta_3tone_3 = Top Third
marking-OniHornTaurus = Taurus
marking-OniHornTaurus-taurus = Taurus
marking-OniHornTaurus2Tone = Taurus (Striped)
marking-OniHornTaurus2Tone-taurus_2tone_1 = Even stripes
marking-OniHornTaurus2Tone-taurus_2tone_2 = Odd stripes
marking-OniHornTaurus3Tone = Taurus (Three Tone)
marking-OniHornTaurus3Tone-taurus_3tone_1 = Bottom Third
marking-OniHornTaurus3Tone-taurus_3tone_2 = Middle Third
marking-OniHornTaurus3Tone-taurus_3tone_3 = Top Third
marking-OniHornAries = Aries
marking-OniHornAries-aries = Aries
marking-OniHornAries3Tone = Aries (Three Tone)
marking-OniHornAries3Tone-aries_3tone_1 = Bottom Third
marking-OniHornAries3Tone-aries_3tone_2 = Middle Third
marking-OniHornAries3Tone-aries_3tone_3 = Top Third
marking-OniHornTavris = Tavris
marking-OniHornTavris-tavris = Tavris
marking-OniHornTavris3Tone = Tavris (Three Tone)
marking-OniHornTavris3Tone-tavris_3tone_1 = Bottom Third
marking-OniHornTavris3Tone-tavris_3tone_2 = Middle Third
marking-OniHornTavris3Tone-tavris_3tone_3 = Top Third
marking-OniHornInclined = Inclined
marking-OniHornInclined-inclined = Inclined
marking-OniHornInclined3Tone = Inclined (Three Tone)
marking-OniHornInclined3Tone-inclined_3tone_1 = Bottom Third
marking-OniHornInclined3Tone-inclined_3tone_2 = Middle Third
marking-OniHornInclined3Tone-inclined_3tone_3 = Top Third
marking-OniHornWavy = Wavy
marking-OniHornWavy-wavy = Wavy
marking-OniHornWavy2Tone = Wavy (Striped)
marking-OniHornWavy2Tone-wavy_2tone_1 = Even stripes
marking-OniHornWavy2Tone-wavy_2tone_2 = Odd stripes
marking-OniHornWavy3Tone = Wavy (Three Tone)
marking-OniHornWavy3Tone-wavy_3tone_1 = Bottom Third
marking-OniHornWavy3Tone-wavy_3tone_2 = Middle Third
marking-OniHornWavy3Tone-wavy_3tone_3 = Top Third
marking-OniHornAntlers = Antlers
marking-OniHornAntlers-antlers_2tone_1 = Base
marking-OniHornAntlers-antlers_2tone_2 = Wings
marking-OniHornAntlers3Tone = Antlers (Three Tone)
marking-OniHornAntlers3Tone-antlers_3tone_1 = Bottom Third
marking-OniHornAntlers3Tone-antlers_3tone_2 = Middle Third
marking-OniHornAntlers3Tone-antlers_3tone_3 = Top Third
marking-OniHornUnicorn = Unicorn
marking-OniHornUnicorn-unicorn = Unicorn
marking-OniHornErebia = Erebia
marking-OniHornErebia-erebia = Erebia
marking-OniHornErebia3Tone = Erebia (Three Tone)
marking-OniHornErebia3Tone-erebia_3tone_1 = Bottom Third
marking-OniHornErebia3Tone-erebia_3tone_2 = Middle Third
marking-OniHornErebia3Tone-erebia_3tone_3 = Top Third
marking-OniHornErebiaRings = Erebia (Ringed)
marking-OniHornErebiaRings-erebia = Erebia
marking-OniHornErebiaRings-erebia_rings = Rings
marking-OniHornDoubleThick = Double Thick
marking-OniHornDoubleThick-double_thick = Double Thick
marking-OniHornDoubleThick2Tone = Double Thick (Striped)
marking-OniHornDoubleThick2Tone-double_thick_2tone_1 = Even stripes
marking-OniHornDoubleThick2Tone-double_thick_2tone_2 = Odd stripes
marking-OniHornDoubleThick3Tone = Double Thick (Three Tone)
marking-OniHornDoubleThick3Tone-double_thick_3tone_1 = Bottom Third
marking-OniHornDoubleThick3Tone-double_thick_3tone_2 = Middle Third
marking-OniHornDoubleThick3Tone-double_thick_3tone_3 = Top Third
marking-OniHornDoubleCurved3Tone = Double Curved (Three Tone)
marking-OniHornDoubleCurved3Tone-double_curved_3tone_1 = Bottom Third
marking-OniHornDoubleCurved3Tone-double_curved_3tone_2 = Middle Third
marking-OniHornDoubleCurved3Tone-double_curved_3tone_3 = Top Third
marking-OniHornDoubleCurvedOutwards3Tone = Double Curved Outwards (Three Tone)
marking-OniHornDoubleCurvedOutwards3Tone-double_curved_outwards_3tone_1 = Bottom Third
marking-OniHornDoubleCurvedOutwards3Tone-double_curved_outwards_3tone_2 = Middle Third
marking-OniHornDoubleCurvedOutwards3Tone-double_curved_outwards_3tone_3 = Top Third
2 changes: 2 additions & 0 deletions Resources/Locale/en-US/einstein-engines/markings/oni_feet.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
marking-OniTwoToedFeet-two_toes= Two-Toed Feet
marking-OniTwoToedFeet= Two-Toed Feet
26 changes: 26 additions & 0 deletions Resources/Locale/en-US/einstein-engines/markings/pointy_ears.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
marking-PointyEarsStandard-pointy_ears_standard = Standard Ears
marking-PointyEarsStandard = Standard Ears
marking-PointyEarsWide-pointy_ears_wide = Wide Ears
marking-PointyEarsWide = Wide Ears
marking-PointyEarsSmall-pointy_ears_small = Small Ears
marking-PointyEarsSmall = Small Ears
marking-PointyEarsUpwards-pointy_ears_upwards = Upward Ears
marking-PointyEarsUpwards = Upward Ears
marking-PointyEarsTall-pointy_ears_tall = Tall Ears
marking-PointyEarsTall = Tall Ears
marking-PointyEarsSlanted-pointy_ears_slanted = Slanted Ears
marking-PointyEarsSlanted = Slanted Ears
marking-PointyEarsThin-pointy_ears_thin = Thin Ears
marking-PointyEarsThin = Thin Ears
marking-PointyEarsLarge-pointy_ears_large = Large Ears
marking-PointyEarsLarge = Large Ears
marking-PointyEarsNone-pointy_ears_none = No Ears
marking-PointyEarsNone = No Ears
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
- type: marking
id: OniTwoToedFeet
bodyPart: RFoot # Can't be LFoot to avoid visual glitches
markingCategory: Legs
speciesRestriction: [Oni]
coloring:
default:
type:
!type:SimpleColoring
color: "#454545"
sprites:
- sprite: Einstein-Engines/Mobs/Customization/oni_feet.rsi
state: two_toes
Loading

0 comments on commit d89a727

Please sign in to comment.