Skip to content

Commit

Permalink
Oni Horn Markings (#726)
Browse files Browse the repository at this point in the history
# 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.
  • Loading branch information
dootythefrooty authored Aug 14, 2024
1 parent 66a7260 commit 5f25d1b
Show file tree
Hide file tree
Showing 13 changed files with 129 additions and 0 deletions.
18 changes: 18 additions & 0 deletions Resources/Locale/en-US/markings/oni.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
- type: marking
id: OniHornTallCurved
bodyPart: HeadTop
markingCategory: HeadTop
forcedColoring: false
speciesRestriction: [Oni]
sprites:
- sprite: Mobs/Customization/Oni/oni_horns48x48.rsi
state: tall_curved
- type: marking
id: OniHornTallCurved3Tone
bodyPart: HeadTop
markingCategory: HeadTop
forcedColoring: false
speciesRestriction: [Oni]
sprites:
- sprite: Mobs/Customization/Oni/oni_horns48x48.rsi
state: tall_curved_3tone_1
- sprite: Mobs/Customization/Oni/oni_horns48x48.rsi
state: tall_curved_3tone_2
- sprite: Mobs/Customization/Oni/oni_horns48x48.rsi
state: tall_curved_3tone_3
- type: marking
id: OniHornTallBull
bodyPart: HeadTop
markingCategory: HeadTop
forcedColoring: false
speciesRestriction: [Oni]
sprites:
- sprite: Mobs/Customization/Oni/oni_horns48x48.rsi
state: tall_bull
- type: marking
id: OniHornTallBull3Tone
bodyPart: HeadTop
markingCategory: HeadTop
forcedColoring: false
speciesRestriction: [Oni]
sprites:
- sprite: Mobs/Customization/Oni/oni_horns48x48.rsi
state: tall_bull_3tone_1
- sprite: Mobs/Customization/Oni/oni_horns48x48.rsi
state: tall_bull_3tone_2
- sprite: Mobs/Customization/Oni/oni_horns48x48.rsi
state: tall_bull_3tone_3
- type: marking
id: OniHornCrowned
bodyPart: HeadTop
markingCategory: HeadTop
forcedColoring: false
speciesRestriction: [Oni]
sprites:
- sprite: Mobs/Customization/Oni/oni_horns.rsi
state: crowned
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 15 additions & 0 deletions Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "crowned by dootythefrooty",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "crowned",
"directions": 4
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "tall_curved & tall_bull by dootythefrooty",
"size": {
"x": 48,
"y": 48
},
"states": [
{
"name": "tall_curved",
"directions": 4
},
{
"name": "tall_curved_3tone_1",
"directions": 4
},
{
"name": "tall_curved_3tone_2",
"directions": 4
},
{
"name": "tall_curved_3tone_3",
"directions": 4
},
{
"name": "tall_bull",
"directions": 4
},
{
"name": "tall_bull_3tone_1",
"directions": 4
},
{
"name": "tall_bull_3tone_2",
"directions": 4
},
{
"name": "tall_bull_3tone_3",
"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.
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 5f25d1b

Please sign in to comment.