-
Notifications
You must be signed in to change notification settings - Fork 146
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
# 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
1 parent
66a7260
commit 5f25d1b
Showing
13 changed files
with
129 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |
53 changes: 53 additions & 0 deletions
53
Resources/Prototypes/Entities/Mobs/Customization/Markings/oni_horns.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |
Binary file added
BIN
+197 Bytes
Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/crowned.png
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
15
Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/meta.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 | ||
} | ||
] | ||
} |
43 changes: 43 additions & 0 deletions
43
Resources/Textures/Mobs/Customization/Oni/oni_horns48x48.rsi/meta.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 | ||
} | ||
] | ||
} |
Binary file added
BIN
+527 Bytes
Resources/Textures/Mobs/Customization/Oni/oni_horns48x48.rsi/tall_bull.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+362 Bytes
Resources/Textures/Mobs/Customization/Oni/oni_horns48x48.rsi/tall_bull_3tone_1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+308 Bytes
Resources/Textures/Mobs/Customization/Oni/oni_horns48x48.rsi/tall_bull_3tone_2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+274 Bytes
Resources/Textures/Mobs/Customization/Oni/oni_horns48x48.rsi/tall_bull_3tone_3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+535 Bytes
Resources/Textures/Mobs/Customization/Oni/oni_horns48x48.rsi/tall_curved.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+260 Bytes
...rces/Textures/Mobs/Customization/Oni/oni_horns48x48.rsi/tall_curved_3tone_1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+302 Bytes
...rces/Textures/Mobs/Customization/Oni/oni_horns48x48.rsi/tall_curved_3tone_2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+323 Bytes
...rces/Textures/Mobs/Customization/Oni/oni_horns48x48.rsi/tall_curved_3tone_3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.