Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Oni Horn Markings #726

Merged
merged 4 commits into from
Aug 14, 2024
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
dootythefrooty marked this conversation as resolved.
Show resolved Hide resolved
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
dootythefrooty marked this conversation as resolved.
Show resolved Hide resolved
- type: marking
id: OniHornTallBull
bodyPart: HeadTop
markingCategory: HeadTop
forcedColoring: false
speciesRestriction: [Oni]
sprites:
- sprite: Mobs/Customization/oni/oni_horns48x48.rsi
dootythefrooty marked this conversation as resolved.
Show resolved Hide resolved
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
dootythefrooty marked this conversation as resolved.
Show resolved Hide resolved
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
dootythefrooty marked this conversation as resolved.
Show resolved Hide resolved
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.
Loading