[Port] Better Lizards 2 #929
Conversation
WalkthroughThe changes in this pull request involve the addition of numerous new markings and states related to reptilian features across multiple localization and configuration files. New entries for lizard heads, shouts, tails, and chest spines have been introduced in both English and Russian localization files. Additionally, the YAML configuration for mob customization has been updated with new markings, while JSON files for textures have been modified to include new states and updated naming conventions for clarity. Changes
Poem
Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media? 🪧 TipsChatThere are 3 ways to chat with CodeRabbit:
Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments. CodeRabbit Commands (Invoked using PR comments)
Other keywords and placeholders
CodeRabbit Configuration File (
|
github-actions
bot
added
Changes: Sprites
|
RSI Diff Bot; head commit ce6bc20 merging into 37db6b0 Resources/Textures/Backmen/Mobs/Customization/reptilian_64x32.rsi
Resources/Textures/Backmen/Mobs/Customization/snouts.rsi
Resources/Textures/Backmen/Mobs/Customization/reptilian.rsi
|
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 7
🧹 Outside diff range and nitpick comments (5)
Resources/Locale/ru-RU/backmen/markings/reptilian.ftl (2)
5-17: Fix typo and standardize formatting
- Fix the typo in "Внутреняя" → "Внутренняя" (line 7, 11)
- Standardize spacing after equals signs for consistency
Apply these changes:
-marking-LizardShoutEasternDragon= Ящер, восточный дракон +marking-LizardShoutEasternDragon = Ящер, восточный дракон -marking-LizardShoutEasternDragon-cobra_hood_with_ears_overlay = Внутреняя часть +marking-LizardShoutEasternDragon-cobra_hood_with_ears_overlay = Внутренняя часть -marking-LizardShoutEasternDragonUsiki= Ящер, восточный дракон (Усики) +marking-LizardShoutEasternDragonUsiki = Ящер, восточный дракон (Усики) -marking-LizardShoutEasternDragonUsiki-eastern_dragon_overlay = Внутреняя часть +marking-LizardShoutEasternDragonUsiki-eastern_dragon_overlay = Внутренняя часть -marking-LizardShoutNoodle= Ящер, крокодил +marking-LizardShoutNoodle = Ящер, крокодил
Incorrect marking keys used in Russian translation for Eastern Dragon
The Russian translation for
marking-LizardShoutEasternDragonuses incorrect marking keys:
- Uses
cobra_hood_with_earsinstead of the correcteastern_dragon- Uses
cobra_hood_with_ears_overlayinstead of the correcteastern_dragon_overlayThis appears to be a copy-paste error where the cobra hood marking keys were accidentally used for the eastern dragon marking. The main label is correctly translated, but the component keys need to match the English version.
🔗 Analysis chain
Line range hint
1-76: Verify translation completeness against English versionLet's ensure all entries from the English version have corresponding Russian translations.
🏁 Scripts executed
The following scripts were executed for the analysis:
Script:
#!/bin/bash # Description: Compare English and Russian reptilian marking entries # Get all marking keys from both files echo "=== Comparing marking keys ===" echo "English keys:" rg "^marking-" "Resources/Locale/en-US/_backmen/markings/reptilian.ftl" | cut -d'=' -f1 | sort > /tmp/en_keys.txt echo "Russian keys:" rg "^marking-" "Resources/Locale/ru-RU/backmen/markings/reptilian.ftl" | cut -d'=' -f1 | sort > /tmp/ru_keys.txt # Show differences echo "=== Missing translations ===" diff /tmp/en_keys.txt /tmp/ru_keys.txtLength of output: 685
Script:
#!/bin/bash # Let's get the full context of these entries to understand the discrepancy echo "=== English version ===" rg "marking-LizardShoutEasternDragon" "Resources/Locale/en-US/_backmen/markings/reptilian.ftl" -A 2 echo -e "\n=== Russian version ===" rg "marking-LizardShoutEasternDragon" "Resources/Locale/ru-RU/backmen/markings/reptilian.ftl" -A 2Length of output: 1347
Resources/Locale/en-US/_backmen/markings/reptilian.ftl (1)
29-31: Standardize capitalization and wording in horn descriptionsThere are inconsistencies in the horn descriptions:
- Line 30: "The right horn" differs from the pattern "Right horn" used elsewhere
- Lines 41-42: "Horn" is capitalized while other entries use lowercase "horn"
Apply these changes for consistency:
-marking-LizardHornsShort-horns_short_r = The right horn +marking-LizardHornsShort-horns_short_r = Right horn -marking-LizardHornsAyrshire-horns_ayrshire_l = Left Horn -marking-LizardHornsAyrshire-horns_ayrshire_r = Right Horn +marking-LizardHornsAyrshire-horns_ayrshire_l = Left horn +marking-LizardHornsAyrshire-horns_ayrshire_r = Right hornAlso applies to: 41-42
Resources/Prototypes/_Backmen/Entities/Mobs/Customization/Markings/reptilian.yml (1)
21-57: Consider optimizing duplicate EasternDragon definitions
LizardShoutEasternDragonandLizardShoutEasternDragonUsikishare identical base sprites and states. Consider implementing a base marking type that can be extended or using a feature flag to toggle the additional usiki sprite.Resources/Textures/Backmen/Mobs/Customization/reptilian.rsi/meta.json (1)
14-17: Consider adding animation data for new spine statesThe existing tail states have detailed animation data with specific delay patterns. Consider whether the new spine states should also have animation frames for consistency with the tail animations.
If animation is needed, you can follow the same delay pattern as the tail states:
"delays": [ [0.125, 0.1, 0.075, 0.075, 0.075, 0.075, 0.075, 0.1, 0.125, 0.1, 0.075, 0.075, 0.075, 0.075, 0.075, 0.1], [0.125, 0.1, 0.075, 0.075, 0.075, 0.075, 0.075, 0.1, 0.125, 0.1, 0.075, 0.075, 0.075, 0.075, 0.075, 0.1], [0.125, 0.1, 0.075, 0.075, 0.075, 0.075, 0.075, 0.1, 0.125, 0.1, 0.075, 0.075, 0.075, 0.075, 0.075, 0.1], [0.125, 0.1, 0.075, 0.075, 0.075, 0.075, 0.075, 0.1, 0.125, 0.1, 0.075, 0.075, 0.075, 0.075, 0.075, 0.1] ]Also applies to: 22-25, 30-33, 38-41, 46-49
📜 Review details
Configuration used: CodeRabbit UI
Review profile: CHILL
⛔ Files ignored due to path filters (26)
Resources/Textures/Backmen/Mobs/Customization/reptilian.rsi/spines_aquatic_alt.pngis excluded by!**/*.pngResources/Textures/Backmen/Mobs/Customization/reptilian.rsi/spines_long_alt.pngis excluded by!**/*.pngResources/Textures/Backmen/Mobs/Customization/reptilian.rsi/spines_longmembrane_alt.pngis excluded by!**/*.pngResources/Textures/Backmen/Mobs/Customization/reptilian.rsi/spines_short_alt.pngis excluded by!**/*.pngResources/Textures/Backmen/Mobs/Customization/reptilian.rsi/spines_shortmembrane_alt.pngis excluded by!**/*.pngResources/Textures/Backmen/Mobs/Customization/reptilian_64x32.rsi/kangaroo.pngis excluded by!**/*.pngResources/Textures/Backmen/Mobs/Customization/reptilian_64x32.rsi/snake_large.pngis excluded by!**/*.pngResources/Textures/Backmen/Mobs/Customization/reptilian_64x32.rsi/snake_large_overlay.pngis excluded by!**/*.pngResources/Textures/Backmen/Mobs/Customization/reptilian_64x32.rsi/snake_large_wagging.pngis excluded by!**/*.pngResources/Textures/Backmen/Mobs/Customization/reptilian_64x32.rsi/snake_large_wagging_overlay.pngis excluded by!**/*.pngResources/Textures/Backmen/Mobs/Customization/reptilian_64x32.rsi/tail_kangaroo.pngis excluded by!**/*.pngResources/Textures/Backmen/Mobs/Customization/reptilian_64x32.rsi/tail_snakelarge.pngis excluded by!**/*.pngResources/Textures/Backmen/Mobs/Customization/reptilian_64x32.rsi/tail_snakelarge_overlay.pngis excluded by!**/*.pngResources/Textures/Backmen/Mobs/Customization/reptilian_64x32.rsi/tail_westerndragon_overlay.pngis excluded by!**/*.pngResources/Textures/Backmen/Mobs/Customization/reptilian_64x32.rsi/western_dragon.pngis excluded by!**/*.pngResources/Textures/Backmen/Mobs/Customization/reptilian_64x32.rsi/western_dragon_overlay.pngis excluded by!**/*.pngResources/Textures/Backmen/Mobs/Customization/snouts.rsi/eastern_dragon.pngis excluded by!**/*.pngResources/Textures/Backmen/Mobs/Customization/snouts.rsi/eastern_dragon_overlay.pngis excluded by!**/*.pngResources/Textures/Backmen/Mobs/Customization/snouts.rsi/eastern_dragon_usiki.pngis excluded by!**/*.pngResources/Textures/Backmen/Mobs/Customization/snouts.rsi/easterndnw_primary.pngis excluded by!**/*.pngResources/Textures/Backmen/Mobs/Customization/snouts.rsi/easterndnw_secondary.pngis excluded by!**/*.pngResources/Textures/Backmen/Mobs/Customization/snouts.rsi/easterndw_primary.pngis excluded by!**/*.pngResources/Textures/Backmen/Mobs/Customization/snouts.rsi/guilmon.pngis excluded by!**/*.pngResources/Textures/Backmen/Mobs/Customization/snouts.rsi/noodle.pngis excluded by!**/*.pngResources/Textures/Backmen/Mobs/Customization/snouts.rsi/noodle_overlay_1.pngis excluded by!**/*.pngResources/Textures/Backmen/Mobs/Customization/snouts.rsi/noodle_overlay_2.pngis excluded by!**/*.png
📒 Files selected for processing (6)
Resources/Locale/en-US/_backmen/markings/reptilian.ftl(1 hunks)Resources/Locale/ru-RU/backmen/markings/reptilian.ftl(2 hunks)Resources/Prototypes/_Backmen/Entities/Mobs/Customization/Markings/reptilian.yml(4 hunks)Resources/Textures/Backmen/Mobs/Customization/reptilian.rsi/meta.json(1 hunks)Resources/Textures/Backmen/Mobs/Customization/reptilian_64x32.rsi/meta.json(1 hunks)Resources/Textures/Backmen/Mobs/Customization/snouts.rsi/meta.json(2 hunks)
🔇 Additional comments (9)
Resources/Textures/Backmen/Mobs/Customization/snouts.rsi/meta.json (2)
8-8: LGTM! Well-documented attribution
The copyright information is thorough, including both the original source with commit reference and modification credits.
11-19: LGTM! Improved naming clarity
The state names have been improved to be more descriptive and consistent, making the code more maintainable.
Resources/Textures/Backmen/Mobs/Customization/reptilian_64x32.rsi/meta.json (3)
30-96: Animation timing looks good!
The snake tail wagging animation is well-implemented with:
- Consistent timing across all directions
- Good rhythm with quick wag motion (0.075s and 0.05s frames)
- Natural pause between wags (1s delay)
11-27: Verify state name changes for correctness
Some state renames appear potentially incorrect:
tail_kangaroois renamed towestern_dragon_overlaytail_snakelargeis renamed tokangaroo
Please confirm these mappings are intentional and not mixed up.
✅ Verification successful
State name changes appear to be correct
Based on the configuration files and directory contents, the state name changes are actually correct:
- The marking configuration shows
WesternDragonTailusing stateswestern_dragonandwestern_dragon_overlay - The marking configuration shows
KangarooTailusing statekangaroo - The marking configuration shows
SnakeLargeTailusing statessnake_largeandsnake_large_overlay - The .rsi directory contains all these state files with matching names
The new names align with their corresponding marking configurations and sprite files, indicating this is an intentional cleanup to make the naming more consistent.
🏁 Scripts executed
The following scripts were executed for the analysis:
Script:
#!/bin/bash
# Search for references to these state names in the codebase
echo "Searching for references to the new state names..."
rg "western_dragon_overlay|kangaroo" --type yaml --type json
# Check the original source file for state names
echo "Checking original state names in BlueMoon repository..."
gh api repos/BlueMoon-Labs/MOLOT-BlueMoon-Station/contents/modular_splurt/icons/mob/64_mam_tails.dmi
Length of output: 13623
Script:
#!/bin/bash
# Let's check the git history of the file to understand the state name changes
echo "Checking git history of the file..."
git log -p -- Resources/Textures/Backmen/Mobs/Customization/reptilian_64x32.rsi/meta.json
# Let's also check for any other references to these states in the codebase
echo "Searching for references to the old state names..."
rg "tail_westerndragon|tail_kangaroo|tail_snakelarge" --type yaml --type json
# Let's check for any related configuration or prototype files
echo "Checking for related configuration files..."
fd reptilian.yml
Length of output: 1018
Script:
#!/bin/bash
# Let's check the content of the relevant marking configuration files
echo "Checking reptilian marking configurations..."
cat Resources/Prototypes/_Backmen/Entities/Mobs/Customization/Markings/reptilian.yml
cat Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml
# Let's also check if there are any other files in the same directory that might provide context
echo "Checking other files in the same directory..."
ls -la Resources/Textures/Backmen/Mobs/Customization/reptilian_64x32.rsi/
Length of output: 14993
3-4: Verify license compatibility with source material
The license has been changed to remove the "Non-Commercial" restriction. Please verify that this change is compatible with the original source material from BlueMoon-Labs repository.
Resources/Locale/ru-RU/backmen/markings/reptilian.ftl (1)
2-4: LGTM: Head marking translation is consistent
The translation for the Guilmon head marking follows the established pattern and maintains consistency with existing entries.
Resources/Locale/en-US/_backmen/markings/reptilian.ftl (2)
50-61: LGTM! Well-structured tail markings section
The tail markings section maintains consistent naming conventions and clear inner/outer part distinctions.
1-76: Verify completeness of lizard variant localizations
The PR objectives mention four new lizard variants and a sigma tail, but I don't see localizations for the sigma tail variant.
Let's check if we're missing any localizations:
Resources/Textures/Backmen/Mobs/Customization/reptilian.rsi/meta.json (1)
14-49:
Remove duplicate state entry and verify texture files
The new spine states look good, but there are a couple of concerns:
- The state "spines_shortmembrane_alt" appears to be duplicated in the file.
- We should verify that all the new states have corresponding texture files in the .rsi directory.
Let's verify the texture files and remove the duplicate entry:
✅ Verification successful
All texture files present and no duplicate states found
The verification shows that:
- All new spine states (
spines_aquatic_alt,spines_long_alt,spines_longmembrane_alt,spines_short_alt,spines_shortmembrane_alt) have corresponding texture files in the .rsi directory - The
jqquery returned an empty array[], indicating there are no duplicate states in meta.json
🏁 Scripts executed
The following scripts were executed for the analysis:
Script:
#!/bin/bash
# Description: Check for texture files corresponding to new states
# List all texture files in the .rsi directory
echo "Checking for texture files..."
ls Resources/Textures/Backmen/Mobs/Customization/reptilian.rsi/*.png 2>/dev/null
# Check for states in meta.json
echo -e "\nChecking for duplicate states..."
jq '.states | map(.name) | group_by(.) | map(select(length > 1))' Resources/Textures/Backmen/Mobs/Customization/reptilian.rsi/meta.json
Length of output: 3359
| marking-LizardChestSpinesLongMembraneWithoutTail = Lizard, chest, spines (Long, Membrane, without tail) | ||
| marking-LizardChestSpinesLongMembraneWithoutTail-spines_longmembrane = spines | ||
|
|
There was a problem hiding this comment.
Fix critical issues in spikes section
Found two issues:
- Inconsistent capitalization: "spines" vs "Spikes"
- Duplicate marking ID:
-spines_shortis 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 = SpikesAlso applies to: 75-76
Resources/Prototypes/_Backmen/Entities/Mobs/Customization/Markings/reptilian.yml
Show resolved
Hide resolved
Resources/Prototypes/_Backmen/Entities/Mobs/Customization/Markings/reptilian.yml
Show resolved
Hide resolved
Resources/Prototypes/_Backmen/Entities/Mobs/Customization/Markings/reptilian.yml
Show resolved
Hide resolved
|
нихя ты живой |
|
ужас какой |
:( |
Описание PR
Taken from: space-syndicate/space-station-14-next#68
4 новых еблета, анимация для сигма-хвоста и версия наспинных шипов без шипов на хвосте.
Медиа
Тип PR
Изменения
Summary by CodeRabbit
Release Notes
New Features
Bug Fixes
Documentation