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.

Sign up for GitHub

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

[Port] Better Lizards 2 #929

Merged
merged 1 commit into from
Nov 24, 2024
Merged

[Port] Better Lizards 2 #929

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
76 changes: 76 additions & 0 deletions Resources/Locale/en-US/_backmen/markings/reptilian.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
# HEAD
marking-LizardHeadGuilmon= Lizard, guilmon
marking-LizardHeadGuilmon-guilmon = Main

marking-LizardShoutEasternDragon= Lizard, eastern dragon
marking-LizardShoutEasternDragon-eastern_dragon = Outer
marking-LizardShoutEasternDragon-eastern_dragon_overlay = Inner

marking-LizardShoutEasternDragonUsiki= Lizard, eastern dragon (Tentacle)
marking-LizardShoutEasternDragonUsiki-eastern_dragon = Outer
marking-LizardShoutEasternDragonUsiki-eastern_dragon_overlay = Inner
marking-LizardShoutEasternDragonUsiki-eastern_dragon_usiki = Tentacle

marking-LizardShoutNoodle= Lizard, crocodile
marking-LizardShoutNoodle-noodle = Main
marking-LizardShoutNoodle-noodle_overlay_1 = Outer
marking-LizardShoutNoodle-noodle_overlay_2 = Inner

marking-LizardHeadCobraHood = Lizard, hood with ears (Cobra)
marking-LizardHeadCobraHood-cobra_hood_with_ears = Outer
marking-LizardHeadCobraHood-cobra_hood_with_ears_overlay = Inner

marking-LizardHornsCurled-horns_curled_l = Left horn
marking-LizardHornsCurled-horns_curled_r = Right horn

marking-LizardHornsRam-horns_ram_l = Left horn
marking-LizardHornsRam-horns_ram_r = Right horn

marking-LizardHornsShort-horns_short_l = Left horn
marking-LizardHornsShort-horns_short_r = The right horn

marking-LizardHornsSimple-horns_simple_l = Left horn
marking-LizardHornsSimple-horns_simple_r = Right horn

marking-LizardHornsDouble-horns_double_l = Left horns
marking-LizardHornsDouble-horns_double_r = Right horns

marking-LizardHornsArgali-horns_argali_l = Left horn
marking-LizardHornsArgali-horns_argali_r = Right horn

marking-LizardHornsAyrshire-horns_ayrshire_l = Left Horn
marking-LizardHornsAyrshire-horns_ayrshire_r = Right Horn

marking-LizardHornsMyrsore-horns_myrsore_l = Left horn
marking-LizardHornsMyrsore-horns_myrsore_r = Right horn

marking-LizardHornsBighorn-horns_bighorn_l = Left horn
marking-LizardHornsBighorn-horns_bighorn_r = Right horn

# TAILS
marking-SnakeLargeTail = Lizard, large snake tail
marking-SnakeLargeTail-tail_snakelarge = Inner
marking-SnakeLargeTail-tail_snakelarge_overlay = Outer

marking-WesternDragonTail = Lizard, western dragon tail
marking-WesternDragonTail-tail_westerndragon = Inner
marking-WesternDragonTail-tail_westerndragon_overlay = Outer

marking-KangarooTail = Lizard, kangaroo tail
marking-KangarooTail-tail_kangaroo = Main

# SPIKES
marking-LizardChestSpinesAquaticWithoutTail = Lizard, chest, spines (Aquatic, without tail)
marking-LizardChestSpinesAquaticWithoutTail-spines_aquatic = Spikes

marking-LizardChestSpinesLongWithoutTail = Lizard, chest, spines (Long, without tail)
marking-LizardChestSpinesLongWithoutTail-spines_long = Spikes

marking-LizardChestSpinesLongMembraneWithoutTail = Lizard, chest, spines (Long, Membrane, without tail)
marking-LizardChestSpinesLongMembraneWithoutTail-spines_longmembrane = spines

Comment on lines +69 to +71
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Fix critical issues in spikes section

Found two issues:

  1. Inconsistent capitalization: "spines" vs "Spikes"
  2. Duplicate marking ID: -spines_short is used for both short and short membrane variants

Apply these fixes:

-marking-LizardChestSpinesLongMembraneWithoutTail-spines_longmembrane = spines
+marking-LizardChestSpinesLongMembraneWithoutTail-spines_longmembrane = Spikes
-marking-LizardChestSpinesShortMembraneWithoutTail-spines_short = Spikes
+marking-LizardChestSpinesShortMembraneWithoutTail-spines_shortmembrane = Spikes

Also applies to: 75-76

marking-LizardChestSpinesShortWithoutTail = Lizard, chest, spines (Short, without tail)
marking-LizardChestSpinesShortWithoutTail-spines_short = Spikes

marking-LizardChestSpinesShortMembraneWithoutTail = Lizard, chest, spines (Short, Membrane, without tail)
marking-LizardChestSpinesShortMembraneWithoutTail-spines_short = Spikes
33 changes: 33 additions & 0 deletions Resources/Locale/ru-RU/backmen/markings/reptilian.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,21 @@
# ГОЛОВА
marking-LizardHeadGuilmon= Ящер, гилмон
marking-LizardHeadGuilmon-guilmon = Основная часть

marking-LizardShoutEasternDragon= Ящер, восточный дракон
marking-LizardShoutEasternDragon-cobra_hood_with_ears = Внешняя часть
marking-LizardShoutEasternDragon-cobra_hood_with_ears_overlay = Внутреняя часть

marking-LizardShoutEasternDragonUsiki= Ящер, восточный дракон (Усики)
marking-LizardShoutEasternDragonUsiki-eastern_dragon = Внешняя часть
marking-LizardShoutEasternDragonUsiki-eastern_dragon_overlay = Внутреняя часть
marking-LizardShoutEasternDragonUsiki-eastern_dragon_usiki = Усики

marking-LizardShoutNoodle= Ящер, крокодил
marking-LizardShoutNoodle-noodle = Основная часть
marking-LizardShoutNoodle-noodle_overlay_1 = Внешняя часть
marking-LizardShoutNoodle-noodle_overlay_2 = Внутреняя часть

marking-LizardHeadCobraHood = Ящер, воротник с ушами (Кобра)
marking-LizardHeadCobraHood-cobra_hood_with_ears = Внешняя часть
marking-LizardHeadCobraHood-cobra_hood_with_ears_overlay = Внутреняя часть
Expand Down Expand Up @@ -41,3 +58,19 @@ marking-WesternDragonTail-tail_westerndragon_overlay = Нижняя часть

marking-KangarooTail = Ящер, хвост кенгуру
marking-KangarooTail-tail_kangaroo = Верняя часть

# ШИПЫ
marking-LizardChestSpinesAquaticWithoutTail = Ящер, грудь, шипы на спине (Водный, без хвоста)
marking-LizardChestSpinesAquaticWithoutTail-spines_aquatic = Шипы

marking-LizardChestSpinesLongWithoutTail = Ящер, грудь, шипы на спине (Длинные, без хвоста)
marking-LizardChestSpinesLongWithoutTail-spines_long = Шипы

marking-LizardChestSpinesLongMembraneWithoutTail = Ящер, грудь, шипы на спине (Длинные, Мембрана, без хвоста)
marking-LizardChestSpinesLongMembraneWithoutTail-spines_longmembrane = Шипы

marking-LizardChestSpinesShortWithoutTail = Ящер, грудь, шипы на спине (Короткие, без хвоста)
marking-LizardChestSpinesShortWithoutTail-spines_short = Шипы

marking-LizardChestSpinesShortMembraneWithoutTail = Ящер, грудь, шипы на спине (Короткие, Мембрана, без хвоста)
marking-LizardChestSpinesShortMembraneWithoutTail-spines_short = Шипы
nomad0260 marked this conversation as resolved.
Show resolved Hide resolved
112 changes: 107 additions & 5 deletions Resources/Prototypes/_Backmen/Entities/Mobs/Customization/Markings/reptilian.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
- type: marking
id: LizardHeadGuilmon
bodyPart: Eyes
markingCategory: Head
speciesRestriction: [Reptilian]
sprites:
- sprite: Backmen/Mobs/Customization/snouts.rsi
state: guilmon

nomad0260 marked this conversation as resolved.
Show resolved Hide resolved
- type: marking
id: LizardHeadCobraHood
bodyPart: HeadSide
Expand All @@ -9,16 +18,64 @@
- sprite: Backmen/Mobs/Customization/reptilian_parts.rsi
state: cobra_hood_with_ears_overlay

- type: marking
id: LizardShoutEasternDragon
bodyPart: Snout
markingCategory: Snout
speciesRestriction: [Reptilian]
sprites:
- sprite: Backmen/Mobs/Customization/snouts.rsi
state: eastern_dragon
- sprite: Backmen/Mobs/Customization/snouts.rsi
state: eastern_dragon_overlay

- type: marking
id: LizardShoutEasternDragonUsiki
bodyPart: Snout
markingCategory: Snout
speciesRestriction: [Reptilian]
sprites:
- sprite: Backmen/Mobs/Customization/snouts.rsi
state: eastern_dragon
- sprite: Backmen/Mobs/Customization/snouts.rsi
state: eastern_dragon_overlay
- sprite: Backmen/Mobs/Customization/snouts.rsi
state: eastern_dragon_usiki

- type: marking
id: LizardShoutNoodle
bodyPart: Snout
markingCategory: Snout
speciesRestriction: [Reptilian]
sprites:
- sprite: Backmen/Mobs/Customization/snouts.rsi
state: noodle
- sprite: Backmen/Mobs/Customization/snouts.rsi
state: noodle_overlay_1
- sprite: Backmen/Mobs/Customization/snouts.rsi
state: noodle_overlay_2

- type: marking
id: SnakeLargeTail
bodyPart: Tail
markingCategory: Tail
speciesRestriction: [Reptilian]
sprites:
- sprite: Backmen/Mobs/Customization/reptilian_64x32.rsi
state: tail_snakelarge
state: snake_large
- sprite: Backmen/Mobs/Customization/reptilian_64x32.rsi
state: tail_snakelarge_overlay
state: snake_large_overlay

- type: marking
id: SnakeLargeTailAnimated
bodyPart: Tail
markingCategory: Tail
speciesRestriction: []
sprites:
- sprite: Backmen/Mobs/Customization/reptilian_64x32.rsi
state: snake_large_wagging
- sprite: Backmen/Mobs/Customization/reptilian_64x32.rsi
state: snake_large_wagging_overlay
nomad0260 marked this conversation as resolved.
Show resolved Hide resolved

- type: marking
id: WesternDragonTail
Expand All @@ -27,9 +84,9 @@
speciesRestriction: [Reptilian]
sprites:
- sprite: Backmen/Mobs/Customization/reptilian_64x32.rsi
state: tail_westerndragon
state: western_dragon
- sprite: Backmen/Mobs/Customization/reptilian_64x32.rsi
state: tail_westerndragon_overlay
state: western_dragon_overlay

- type: marking
id: KangarooTail
Expand All @@ -38,4 +95,49 @@
speciesRestriction: [Reptilian]
sprites:
- sprite: Backmen/Mobs/Customization/reptilian_64x32.rsi
state: tail_kangaroo
state: kangaroo

- type: marking
id: LizardChestSpinesAquaticWithoutTail
bodyPart: Chest
markingCategory: Chest
speciesRestriction: [Reptilian]
sprites:
- sprite: Backmen/Mobs/Customization/reptilian.rsi
state: spines_aquatic_alt

- type: marking
id: LizardChestSpinesLongWithoutTail
bodyPart: Chest
markingCategory: Chest
speciesRestriction: [Reptilian]
sprites:
- sprite: Backmen/Mobs/Customization/reptilian.rsi
state: spines_long_alt

- type: marking
id: LizardChestSpinesLongMembraneWithoutTail
bodyPart: Chest
markingCategory: Chest
speciesRestriction: [Reptilian]
sprites:
- sprite: Backmen/Mobs/Customization/reptilian.rsi
state: spines_longmembrane_alt

- type: marking
id: LizardChestSpinesShortWithoutTail
bodyPart: Chest
markingCategory: Chest
speciesRestriction: [Reptilian]
sprites:
- sprite: Backmen/Mobs/Customization/reptilian.rsi
state: spines_short_alt

- type: marking
id: LizardChestSpinesShortMembraneWithoutTail
bodyPart: Chest
markingCategory: Chest
speciesRestriction: [Reptilian]
sprites:
- sprite: Backmen/Mobs/Customization/reptilian.rsi
state: spines_shortmembrane_alt
nomad0260 marked this conversation as resolved.
Show resolved Hide resolved
21 changes: 20 additions & 1 deletion Resources/Textures/Backmen/Mobs/Customization/reptilian.rsi/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,23 +11,42 @@
"name": "spines_aqua",
"directions": 4
},
{
"name": "spines_aquatic_alt",
"directions": 4
},
{
"name": "spines_long",
"directions": 4
},
{
"name": "spines_long_alt",
"directions": 4
},
{
"name": "spines_longmeme",
"directions": 4
},
{
"name": "spines_longmembrane_alt",
"directions": 4
},
{
"name": "spines_short",
"directions": 4
},
{
"name": "spines_short_alt",
"directions": 4
},
{
"name": "spines_shortmeme",
"directions": 4
},

{
"name": "spines_shortmembrane_alt",
"directions": 4
},
nomad0260 marked this conversation as resolved.
Show resolved Hide resolved
{
"name": "spineswag_aqua",
"directions": 4,
Expand Down
Binary file added Resources/Textures/Backmen/Mobs/Customization/reptilian.rsi/spines_aquatic_alt.png
View file
Open in desktop
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 Resources/Textures/Backmen/Mobs/Customization/reptilian.rsi/spines_long_alt.png
View file
Open in desktop
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 ...s/Textures/Backmen/Mobs/Customization/reptilian.rsi/spines_longmembrane_alt.png
View file
Open in desktop
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 Resources/Textures/Backmen/Mobs/Customization/reptilian.rsi/spines_short_alt.png
View file
Open in desktop
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 .../Textures/Backmen/Mobs/Customization/reptilian.rsi/spines_shortmembrane_alt.png
View file
Open in desktop
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 Resources/Textures/Backmen/Mobs/Customization/reptilian_64x32.rsi/kangaroo.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading