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

[Tweak] Better Lizards #164

Merged
merged 7 commits into from
Dec 16, 2024

Conversation

PuroSlavKing
Copy link
Member

@PuroSlavKing PuroSlavKing commented Dec 14, 2024

Описание PR

Респрайты тела ящера, маркингов ящера, сигма ноги для ящеров, с картой смещений, для автоматической генерации одежды под них, сигма хвост для меня, нормальные рога и всё такое.

для работы нужен: #165

портировал то, портировал это, взял от туда, сунул сюда.

Taken from:


Медиа

Список

270912798-24c119fc-e156-4070-b66f-4b7cfc54f3c7
270912823-feb34238-399f-47ed-acde-e850c6cdac4c


Изменения

🆑 PuroSlavKing

  • add: Добавлены новые кастомизации для ящеров.
  • tweak: Изменены спрайты ящеров. Свободная покраска рогов под любой цвет, изменённая форма ног, улучшенный окрас частей тела и остальных кастомизаций.
  • tweak: Изменено количество очков кастомизации груди ящера, 1 > 3.
  • remove: Удалена диета ящеров, больше невидимая сила не запрещает им совать гадости в пасть. Неправильная еда всё ещё травит их.

Copy link
Contributor

coderabbitai bot commented Dec 14, 2024

Обзор

Walkthrough

Изменения включают в себя обширное обновление системы маркировок и спрайтов для рептилий в игре. Добавлены новые локализационные файлы для английского и русского языков, обновлены прототипы сущностей, текстуры и спрайты. Изменения затрагивают различные аспекты, включая анатомические особенности, маркировки головы, рогов, хвостов и позвоночника для рептилий. Также были изменены метаданные для текстур и добавлены новые текстовые файлы для улучшения визуального представления рептилий.

Changes

Файл Краткое описание изменений
Resources/Locale/en-US/_white/markings/reptilian.ftl Добавлены новые локализационные маркировки для рептилий
Resources/Locale/ru-RU/_white/markings/reptilian.ftl Добавлены русские переводы новых маркировок
Resources/Prototypes/Body/Organs/reptilian.yml Удалено свойство specialDigestible у сущности OrganReptilianStomach
Resources/Prototypes/Entities/Clothing/Shoes/specific.yml Добавлены новые состояния для обуви, специфичные для рептилий
Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml Обновлены спрайты маркировок с разделением на левые и правые варианты
Resources/Prototypes/Entities/Mobs/Species/reptilian.yml Обновлены параметры инвентаря для сущностей Urisst' Mzhand и MobReptilianDummy
Resources/Prototypes/Species/reptilian.yml Обновлены параметры высоты, ширины и спрайтов для рептилий
Resources/Textures/Mobs/Customization/reptilian_parts.rsi/meta.json Обновлено поле copyright в метаданных
Resources/Textures/Mobs/Species/Reptilian/parts.rsi/meta.json Обновлено поле copyright с новым URL
Resources/Textures/_White/Mobs/Customization/reptilian.rsi/meta.json Добавлен новый файл метаданных для модели рептилий
Resources/Textures/_White/Mobs/Customization/reptilian_64x32.rsi/meta.json Добавлен новый файл метаданных для текстуры рептилий
Resources/Textures/_White/Mobs/Species/Reptilian/parts.rsi/meta.json Добавлен новый файл метаданных для частей тела рептилий
Resources/Textures/_White/Mobs/Species/displacement.rsi/meta.json Добавлен новый файл метаданных для графического ресурса

Suggested reviewers

  • Remuchi
  • Spatison

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?

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

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)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR. (Beta)
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Copy link
Contributor

github-actions bot commented Dec 14, 2024

RSI Diff Bot; head commit 9656ce5 merging into db97317
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Mobs/Customization/reptilian_parts.rsi

State Old New Status
body_backspikes Modified
body_tiger Modified
body_underbelly Modified
frills_aquatic Modified
frills_axolotl Modified
frills_big Modified
frills_divinity Modified
frills_hood_primary Modified
frills_hood_secondary Modified
frills_neckfull Modified
frills_short Modified
frills_simple Modified
head_tiger Modified
horns_angler Modified
horns_argali Modified
horns_ayrshire Modified
horns_bighorn Modified
horns_curled Modified
horns_double Modified
horns_floppy_kobold_ears Modified
horns_kobold_ears Modified
horns_myrsore Modified
horns_ram Modified
horns_short Modified
horns_simple Modified
l_arm_tiger Modified
l_leg_tiger Modified
r_arm_tiger Modified
r_leg_tiger Modified
snout_round Modified
snout_roundlight Modified
snout_sharp Modified
snout_sharplight Modified
snout_splotch_primary Modified
snout_splotch_secondary Modified
tail_dtiger Modified
tail_dtiger_behind Modified
tail_dtiger_front Modified
tail_dtiger_wagging Modified
tail_large Modified
tail_large_behind Modified
tail_large_front Modified
tail_ltiger Modified
tail_ltiger_behind Modified
tail_ltiger_front Modified
tail_ltiger_wagging Modified
tail_smooth Modified
tail_smooth_behind Modified
tail_smooth_behind_primary Modified
tail_smooth_behind_secondary Modified
tail_smooth_front Modified
tail_smooth_primary Modified
tail_smooth_secondary Modified
tail_smooth_wagging_primary Modified
tail_smooth_wagging_secondary Modified
tail_spikes Modified
tail_spikes_behind Modified
tail_spikes_front Modified
tail_spikes_wagging Modified

Resources/Textures/Mobs/Species/Reptilian/parts.rsi

State Old New Status
head_f Modified
head_m Modified
l_arm Modified
l_foot Modified
l_hand Modified
l_leg Modified
r_arm Modified
r_foot Modified
r_hand Modified
r_leg Modified
torso_f Modified
torso_m Modified

Resources/Textures/Clothing/Shoes/Specific/large_clown.rsi

State Old New Status
equipped-FEET-reptilian Added

Resources/Textures/Clothing/Shoes/Specific/skates.rsi

State Old New Status
equipped-FEET-reptilian Added

Resources/Textures/_White/Mobs/Customization/reptilian.rsi

State Old New Status
spines_aquatic Added
spines_aquatic_alt Added
spines_long Added
spines_long_alt Added
spines_longmembrane Added
spines_longmembrane_alt Added
spines_short Added
spines_short_alt Added
spines_shortmembrane Added
spines_shortmembrane_alt Added
spineswag_aquatic Added
spineswag_long Added
spineswag_longmembrane Added
spineswag_short Added
spineswag_shortmembrane Added

Resources/Textures/_White/Mobs/Customization/reptilian_64x32.rsi

State Old New Status
snake_large Added
snake_large_overlay Added
snake_large_wagging Added
snake_large_wagging_overlay Added

Resources/Textures/_White/Mobs/Customization/reptilian_parts.rsi

State Old New Status
cobra_hood_with_ears Added
cobra_hood_with_ears_overlay Added
horns_argali_l Added
horns_argali_r Added
horns_ayrshire_l Added
horns_ayrshire_r Added
horns_bighorn_l Added
horns_bighorn_r Added
horns_curled_l Added
horns_curled_r Added
horns_double_l Added
horns_double_r Added
horns_myrsore_l Added
horns_myrsore_r Added
horns_ram_l Added
horns_ram_r Added
horns_short_l Added
horns_short_r Added
horns_simple_l Added
horns_simple_r Added

Resources/Textures/_White/Mobs/Customization/snouts.rsi

State Old New Status
eastern_dragon Added
eastern_dragon_overlay Added
eastern_dragon_usiki Added
guilmon Added

Resources/Textures/_White/Mobs/Species/Reptilian/parts.rsi

State Old New Status
l_foot_digi Added
l_leg_digi Added
r_foot_digi Added
r_leg_digi Added

Resources/Textures/_White/Mobs/Species/displacement.rsi

State Old New Status
jumpsuit-female Added
jumpsuit Added
shoes Added

Edit: diff updated after 9656ce5

@PuroSlavKing PuroSlavKing marked this pull request as ready for review December 14, 2024 21:24
Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 2

🧹 Outside diff range and nitpick comments (4)
Resources/Locale/en-US/_white/markings/reptilian.ftl (1)

24-25: Исправьте несогласованность в капитализации

Обнаружены несоответствия в капитализации:

  • "The right horn" vs "Right horn"
  • "Left Horn"/"Right Horn" vs "Left horn"/"Right horn"

Рекомендуется использовать единый стиль.

-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 horn

Also applies to: 36-37

Resources/Locale/ru-RU/_white/markings/reptilian.ftl (1)

1-1: Обеспечьте единообразие в заголовках секций

Заголовки секций должны быть оформлены единообразно.

-# ГОЛОВА
+# Голова
-# ХВОСТЫ
+# Хвосты
-# ШИПЫ
+# Шипы

Also applies to: 45-45, 50-50

Resources/Textures/_White/Mobs/Customization/reptilian.rsi/meta.json (1)

53-98: Оптимизируйте повторяющиеся значения задержек

Значения задержек анимации повторяются для всех состояний. Рекомендуется вынести их в отдельную константу или конфигурационный параметр.

+    "commonDelays": [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],
     "states": [
         {
             "name": "spineswag_aquatic",
             "directions": 4,
             "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]
+                ["@commonDelays"],
+                ["@commonDelays"],
+                ["@commonDelays"],
+                ["@commonDelays"]
             ]
         }
Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml (1)

Требуется ограничение по видам для анимированных хвостов

Анализ показывает, что большинство маркировок хвостов в кодовой базе имеют явные ограничения по видам (speciesRestriction). Отсутствие ограничений (speciesRestriction: []) для анимированных хвостов рептилий является исключением из общего паттерна и может привести к нежелательному поведению.

  • Рекомендуется добавить ограничение speciesRestriction: [Reptilian, Human] для следующих маркировок:
    • LizardTailSpikesAnimated
    • LizardTailLTigerAnimated
    • LizardTailDTigerAnimated
🔗 Analysis chain

Line range hint 366-411: Проверьте анимированные состояния хвостов!

Анимированные маркировки хвостов не имеют ограничений по видам (speciesRestriction: []). Убедитесь, что это намеренное решение.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Поиск других анимированных маркировок для сравнения
rg "state: .*_wagging" Resources/Prototypes/

Length of output: 935


Script:

#!/bin/bash
# Поиск всех маркировок хвостов с ограничениями по видам
rg "markingCategory: Tail" -A 2 Resources/Prototypes/

Length of output: 38323

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 683e101 and ca0e2b4.

⛔ Files ignored due to path filters (121)
  • Resources/Textures/Mobs/Customization/reptilian_parts.rsi/body_backspikes.png is excluded by !**/*.png
  • Resources/Textures/Mobs/Customization/reptilian_parts.rsi/body_tiger.png is excluded by !**/*.png
  • Resources/Textures/Mobs/Customization/reptilian_parts.rsi/body_underbelly.png is excluded by !**/*.png
  • Resources/Textures/Mobs/Customization/reptilian_parts.rsi/frills_aquatic.png is excluded by !**/*.png
  • Resources/Textures/Mobs/Customization/reptilian_parts.rsi/frills_axolotl.png is excluded by !**/*.png
  • Resources/Textures/Mobs/Customization/reptilian_parts.rsi/frills_big.png is excluded by !**/*.png
  • Resources/Textures/Mobs/Customization/reptilian_parts.rsi/frills_divinity.png is excluded by !**/*.png
  • Resources/Textures/Mobs/Customization/reptilian_parts.rsi/frills_hood_primary.png is excluded by !**/*.png
  • Resources/Textures/Mobs/Customization/reptilian_parts.rsi/frills_hood_secondary.png is excluded by !**/*.png
  • Resources/Textures/Mobs/Customization/reptilian_parts.rsi/frills_neckfull.png is excluded by !**/*.png
  • Resources/Textures/Mobs/Customization/reptilian_parts.rsi/frills_short.png is excluded by !**/*.png
  • Resources/Textures/Mobs/Customization/reptilian_parts.rsi/frills_simple.png is excluded by !**/*.png
  • Resources/Textures/Mobs/Customization/reptilian_parts.rsi/head_tiger.png is excluded by !**/*.png
  • Resources/Textures/Mobs/Customization/reptilian_parts.rsi/horns_angler.png is excluded by !**/*.png
  • Resources/Textures/Mobs/Customization/reptilian_parts.rsi/horns_argali.png is excluded by !**/*.png
  • Resources/Textures/Mobs/Customization/reptilian_parts.rsi/horns_ayrshire.png is excluded by !**/*.png
  • Resources/Textures/Mobs/Customization/reptilian_parts.rsi/horns_bighorn.png is excluded by !**/*.png
  • Resources/Textures/Mobs/Customization/reptilian_parts.rsi/horns_curled.png is excluded by !**/*.png
  • Resources/Textures/Mobs/Customization/reptilian_parts.rsi/horns_double.png is excluded by !**/*.png
  • Resources/Textures/Mobs/Customization/reptilian_parts.rsi/horns_floppy_kobold_ears.png is excluded by !**/*.png
  • Resources/Textures/Mobs/Customization/reptilian_parts.rsi/horns_kobold_ears.png is excluded by !**/*.png
  • Resources/Textures/Mobs/Customization/reptilian_parts.rsi/horns_myrsore.png is excluded by !**/*.png
  • Resources/Textures/Mobs/Customization/reptilian_parts.rsi/horns_ram.png is excluded by !**/*.png
  • Resources/Textures/Mobs/Customization/reptilian_parts.rsi/horns_short.png is excluded by !**/*.png
  • Resources/Textures/Mobs/Customization/reptilian_parts.rsi/horns_simple.png is excluded by !**/*.png
  • Resources/Textures/Mobs/Customization/reptilian_parts.rsi/l_arm_tiger.png is excluded by !**/*.png
  • Resources/Textures/Mobs/Customization/reptilian_parts.rsi/l_leg_tiger.png is excluded by !**/*.png
  • Resources/Textures/Mobs/Customization/reptilian_parts.rsi/r_arm_tiger.png is excluded by !**/*.png
  • Resources/Textures/Mobs/Customization/reptilian_parts.rsi/r_leg_tiger.png is excluded by !**/*.png
  • Resources/Textures/Mobs/Customization/reptilian_parts.rsi/snout_round.png is excluded by !**/*.png
  • Resources/Textures/Mobs/Customization/reptilian_parts.rsi/snout_roundlight.png is excluded by !**/*.png
  • Resources/Textures/Mobs/Customization/reptilian_parts.rsi/snout_sharp.png is excluded by !**/*.png
  • Resources/Textures/Mobs/Customization/reptilian_parts.rsi/snout_sharplight.png is excluded by !**/*.png
  • Resources/Textures/Mobs/Customization/reptilian_parts.rsi/snout_splotch_primary.png is excluded by !**/*.png
  • Resources/Textures/Mobs/Customization/reptilian_parts.rsi/snout_splotch_secondary.png is excluded by !**/*.png
  • Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_dtiger.png is excluded by !**/*.png
  • Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_dtiger_behind.png is excluded by !**/*.png
  • Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_dtiger_front.png is excluded by !**/*.png
  • Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_dtiger_wagging.png is excluded by !**/*.png
  • Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_large.png is excluded by !**/*.png
  • Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_large_behind.png is excluded by !**/*.png
  • Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_large_front.png is excluded by !**/*.png
  • Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_ltiger.png is excluded by !**/*.png
  • Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_ltiger_behind.png is excluded by !**/*.png
  • Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_ltiger_front.png is excluded by !**/*.png
  • Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_ltiger_wagging.png is excluded by !**/*.png
  • Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_smooth.png is excluded by !**/*.png
  • Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_smooth_behind.png is excluded by !**/*.png
  • Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_smooth_behind_primary.png is excluded by !**/*.png
  • Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_smooth_behind_secondary.png is excluded by !**/*.png
  • Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_smooth_front.png is excluded by !**/*.png
  • Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_smooth_primary.png is excluded by !**/*.png
  • Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_smooth_secondary.png is excluded by !**/*.png
  • Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_smooth_wagging_primary.png is excluded by !**/*.png
  • Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_smooth_wagging_secondary.png is excluded by !**/*.png
  • Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_spikes.png is excluded by !**/*.png
  • Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_spikes_behind.png is excluded by !**/*.png
  • Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_spikes_front.png is excluded by !**/*.png
  • Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_spikes_wagging.png is excluded by !**/*.png
  • Resources/Textures/Mobs/Species/Reptilian/parts.rsi/head_f.png is excluded by !**/*.png
  • Resources/Textures/Mobs/Species/Reptilian/parts.rsi/head_m.png is excluded by !**/*.png
  • Resources/Textures/Mobs/Species/Reptilian/parts.rsi/l_arm.png is excluded by !**/*.png
  • Resources/Textures/Mobs/Species/Reptilian/parts.rsi/l_foot.png is excluded by !**/*.png
  • Resources/Textures/Mobs/Species/Reptilian/parts.rsi/l_hand.png is excluded by !**/*.png
  • Resources/Textures/Mobs/Species/Reptilian/parts.rsi/l_leg.png is excluded by !**/*.png
  • Resources/Textures/Mobs/Species/Reptilian/parts.rsi/r_arm.png is excluded by !**/*.png
  • Resources/Textures/Mobs/Species/Reptilian/parts.rsi/r_foot.png is excluded by !**/*.png
  • Resources/Textures/Mobs/Species/Reptilian/parts.rsi/r_hand.png is excluded by !**/*.png
  • Resources/Textures/Mobs/Species/Reptilian/parts.rsi/r_leg.png is excluded by !**/*.png
  • Resources/Textures/Mobs/Species/Reptilian/parts.rsi/torso_f.png is excluded by !**/*.png
  • Resources/Textures/Mobs/Species/Reptilian/parts.rsi/torso_m.png is excluded by !**/*.png
  • Resources/Textures/_White/Mobs/Customization/reptilian.rsi/spines_aquatic.png is excluded by !**/*.png
  • Resources/Textures/_White/Mobs/Customization/reptilian.rsi/spines_aquatic_alt.png is excluded by !**/*.png
  • Resources/Textures/_White/Mobs/Customization/reptilian.rsi/spines_long.png is excluded by !**/*.png
  • Resources/Textures/_White/Mobs/Customization/reptilian.rsi/spines_long_alt.png is excluded by !**/*.png
  • Resources/Textures/_White/Mobs/Customization/reptilian.rsi/spines_longmembrane.png is excluded by !**/*.png
  • Resources/Textures/_White/Mobs/Customization/reptilian.rsi/spines_longmembrane_alt.png is excluded by !**/*.png
  • Resources/Textures/_White/Mobs/Customization/reptilian.rsi/spines_short.png is excluded by !**/*.png
  • Resources/Textures/_White/Mobs/Customization/reptilian.rsi/spines_short_alt.png is excluded by !**/*.png
  • Resources/Textures/_White/Mobs/Customization/reptilian.rsi/spines_shortmembrane.png is excluded by !**/*.png
  • Resources/Textures/_White/Mobs/Customization/reptilian.rsi/spines_shortmembrane_alt.png is excluded by !**/*.png
  • Resources/Textures/_White/Mobs/Customization/reptilian.rsi/spineswag_aquatic.png is excluded by !**/*.png
  • Resources/Textures/_White/Mobs/Customization/reptilian.rsi/spineswag_long.png is excluded by !**/*.png
  • Resources/Textures/_White/Mobs/Customization/reptilian.rsi/spineswag_longmembrane.png is excluded by !**/*.png
  • Resources/Textures/_White/Mobs/Customization/reptilian.rsi/spineswag_short.png is excluded by !**/*.png
  • Resources/Textures/_White/Mobs/Customization/reptilian.rsi/spineswag_shortmembrane.png is excluded by !**/*.png
  • Resources/Textures/_White/Mobs/Customization/reptilian_64x32.rsi/snake_large.png is excluded by !**/*.png
  • Resources/Textures/_White/Mobs/Customization/reptilian_64x32.rsi/snake_large_overlay.png is excluded by !**/*.png
  • Resources/Textures/_White/Mobs/Customization/reptilian_64x32.rsi/snake_large_wagging.png is excluded by !**/*.png
  • Resources/Textures/_White/Mobs/Customization/reptilian_64x32.rsi/snake_large_wagging_overlay.png is excluded by !**/*.png
  • Resources/Textures/_White/Mobs/Customization/reptilian_parts.rsi/cobra_hood_with_ears.png is excluded by !**/*.png
  • Resources/Textures/_White/Mobs/Customization/reptilian_parts.rsi/cobra_hood_with_ears_overlay.png is excluded by !**/*.png
  • Resources/Textures/_White/Mobs/Customization/reptilian_parts.rsi/horns_argali_l.png is excluded by !**/*.png
  • Resources/Textures/_White/Mobs/Customization/reptilian_parts.rsi/horns_argali_r.png is excluded by !**/*.png
  • Resources/Textures/_White/Mobs/Customization/reptilian_parts.rsi/horns_ayrshire_l.png is excluded by !**/*.png
  • Resources/Textures/_White/Mobs/Customization/reptilian_parts.rsi/horns_ayrshire_r.png is excluded by !**/*.png
  • Resources/Textures/_White/Mobs/Customization/reptilian_parts.rsi/horns_bighorn_l.png is excluded by !**/*.png
  • Resources/Textures/_White/Mobs/Customization/reptilian_parts.rsi/horns_bighorn_r.png is excluded by !**/*.png
  • Resources/Textures/_White/Mobs/Customization/reptilian_parts.rsi/horns_curled_l.png is excluded by !**/*.png
  • Resources/Textures/_White/Mobs/Customization/reptilian_parts.rsi/horns_curled_r.png is excluded by !**/*.png
  • Resources/Textures/_White/Mobs/Customization/reptilian_parts.rsi/horns_double_l.png is excluded by !**/*.png
  • Resources/Textures/_White/Mobs/Customization/reptilian_parts.rsi/horns_double_r.png is excluded by !**/*.png
  • Resources/Textures/_White/Mobs/Customization/reptilian_parts.rsi/horns_myrsore_l.png is excluded by !**/*.png
  • Resources/Textures/_White/Mobs/Customization/reptilian_parts.rsi/horns_myrsore_r.png is excluded by !**/*.png
  • Resources/Textures/_White/Mobs/Customization/reptilian_parts.rsi/horns_ram_l.png is excluded by !**/*.png
  • Resources/Textures/_White/Mobs/Customization/reptilian_parts.rsi/horns_ram_r.png is excluded by !**/*.png
  • Resources/Textures/_White/Mobs/Customization/reptilian_parts.rsi/horns_short_l.png is excluded by !**/*.png
  • Resources/Textures/_White/Mobs/Customization/reptilian_parts.rsi/horns_short_r.png is excluded by !**/*.png
  • Resources/Textures/_White/Mobs/Customization/reptilian_parts.rsi/horns_simple_l.png is excluded by !**/*.png
  • Resources/Textures/_White/Mobs/Customization/reptilian_parts.rsi/horns_simple_r.png is excluded by !**/*.png
  • Resources/Textures/_White/Mobs/Customization/snouts.rsi/eastern_dragon.png is excluded by !**/*.png
  • Resources/Textures/_White/Mobs/Customization/snouts.rsi/eastern_dragon_overlay.png is excluded by !**/*.png
  • Resources/Textures/_White/Mobs/Customization/snouts.rsi/eastern_dragon_usiki.png is excluded by !**/*.png
  • Resources/Textures/_White/Mobs/Customization/snouts.rsi/guilmon.png is excluded by !**/*.png
  • Resources/Textures/_White/Mobs/Species/Reptilian/parts.rsi/l_foot_digi.png is excluded by !**/*.png
  • Resources/Textures/_White/Mobs/Species/Reptilian/parts.rsi/l_leg_digi.png is excluded by !**/*.png
  • Resources/Textures/_White/Mobs/Species/Reptilian/parts.rsi/r_foot_digi.png is excluded by !**/*.png
  • Resources/Textures/_White/Mobs/Species/Reptilian/parts.rsi/r_leg_digi.png is excluded by !**/*.png
  • Resources/Textures/_White/Mobs/Species/displacement.rsi/jumpsuit-female.png is excluded by !**/*.png
  • Resources/Textures/_White/Mobs/Species/displacement.rsi/jumpsuit.png is excluded by !**/*.png
  • Resources/Textures/_White/Mobs/Species/displacement.rsi/shoes.png is excluded by !**/*.png
📒 Files selected for processing (17)
  • Resources/Locale/en-US/_white/markings/reptilian.ftl (1 hunks)
  • Resources/Locale/ru-RU/_white/markings/reptilian.ftl (1 hunks)
  • Resources/Prototypes/Body/Organs/reptilian.yml (1 hunks)
  • Resources/Prototypes/Entities/Clothing/Shoes/specific.yml (2 hunks)
  • Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml (2 hunks)
  • Resources/Prototypes/Entities/Mobs/Species/reptilian.yml (2 hunks)
  • Resources/Prototypes/Species/reptilian.yml (2 hunks)
  • Resources/Prototypes/_White/Entities/Mobs/Customization/Markings/reptilian.yml (1 hunks)
  • Resources/Prototypes/_White/Species/reptilian.yml (1 hunks)
  • Resources/Textures/Mobs/Customization/reptilian_parts.rsi/meta.json (2 hunks)
  • Resources/Textures/Mobs/Species/Reptilian/parts.rsi/meta.json (1 hunks)
  • Resources/Textures/_White/Mobs/Customization/reptilian.rsi/meta.json (1 hunks)
  • Resources/Textures/_White/Mobs/Customization/reptilian_64x32.rsi/meta.json (1 hunks)
  • Resources/Textures/_White/Mobs/Customization/reptilian_parts.rsi/meta.json (1 hunks)
  • Resources/Textures/_White/Mobs/Customization/snouts.rsi/meta.json (1 hunks)
  • Resources/Textures/_White/Mobs/Species/Reptilian/parts.rsi/meta.json (1 hunks)
  • Resources/Textures/_White/Mobs/Species/displacement.rsi/meta.json (1 hunks)
✅ Files skipped from review due to trivial changes (5)
  • Resources/Textures/_White/Mobs/Species/displacement.rsi/meta.json
  • Resources/Textures/Mobs/Customization/reptilian_parts.rsi/meta.json
  • Resources/Textures/Mobs/Species/Reptilian/parts.rsi/meta.json
  • Resources/Textures/_White/Mobs/Customization/reptilian_64x32.rsi/meta.json
  • Resources/Textures/_White/Mobs/Species/Reptilian/parts.rsi/meta.json
🔇 Additional comments (15)
Resources/Prototypes/Body/Organs/reptilian.yml (1)

7-14: Проверьте влияние на игровой баланс после удаления пищевых ограничений.

Удаление specialDigestible позволяет рептилиям потреблять любую пищу. Хотя это соответствует целям PR, необходимо убедиться, что:

  1. Система отравления по-прежнему работает корректно
  2. Это изменение не нарушает игровой баланс
✅ Verification successful

Let me check the digestive system implementation for reptilians by examining the related organ files.


Let me check if there are any other systems that might be affected by this change, particularly looking at food-related components and digestion mechanics.


Based on the examination of the codebase, I can now provide the final response:

Изменение безопасно для игрового баланса

Удаление specialDigestible из OrganReptilianStomach является безопасным изменением, так как:

  • Компонент Stomach остается активным, сохраняя базовую функциональность пищеварения
  • Ограничения были чисто декоративными и не влияли на механику отравления
  • Изменение соответствует общей цели PR по улучшению настройки рептилоидов
🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Проверка связанных изменений в системе пищеварения
rg -l "Stomach|Digestible|Food" Resources/Prototypes/

Length of output: 15327


Script:

#!/bin/bash
# Check reptilian organ and species implementation
rg -A 10 "specialDigestible|Stomach" Resources/Prototypes/Body/Organs/reptilian.yml Resources/Prototypes/Body/Prototypes/reptilian.yml

Length of output: 2039


Script:

#!/bin/bash
# Check for food digestion and stomach-related components
ast-grep --pattern 'class $_ : IComponent {
  $$$
  Stomach
  $$$
}'

# Also check for food-related tests
rg -l "ReptilianFood|specialDigestible" Content.Tests/

Length of output: 127

Resources/Prototypes/_White/Species/reptilian.yml (1)

1-23: Структура спрайтов корректна, требуется проверка ресурсов.

Определения базовых спрайтов для цифровых конечностей рептилий выглядят правильно. Необходимо проверить:

  1. Наличие всех указанных состояний в RSI файле
  2. Корректность отображения спрайтов в игре
✅ Verification successful

Спрайты рептилий корректно определены и присутствуют

Проверка подтвердила, что:

  • Все необходимые состояния спрайтов (l_leg_digi, l_foot_digi, r_leg_digi, r_foot_digi) присутствуют в RSI файле
  • Каждый спрайт имеет 4 направления отображения
  • Метаданные файла корректно оформлены с указанием лицензии и авторства
🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Проверка наличия необходимых спрайтов
rg -l "l_leg_digi|l_foot_digi|r_leg_digi|r_foot_digi" Resources/Textures/_White/Mobs/Species/Reptilian/

Length of output: 174


Script:

#!/bin/bash
# Проверим содержимое meta.json файла для подтверждения наличия состояний
cat "Resources/Textures/_White/Mobs/Species/Reptilian/parts.rsi/meta.json" | jq '.states | keys' 

Length of output: 119


Script:

#!/bin/bash
# Проверим полное содержимое meta.json для просмотра состояний спрайтов
cat "Resources/Textures/_White/Mobs/Species/Reptilian/parts.rsi/meta.json"

Length of output: 714

Resources/Textures/_White/Mobs/Customization/snouts.rsi/meta.json (2)

7-8: Лицензия и авторские права указаны корректно.

Файл правильно указывает лицензию CC-BY-SA-3.0 и содержит ссылку на оригинальный источник с указанием изменений.


9-26: Проверьте наличие всех необходимых состояний спрайтов.

Определены четыре состояния с поддержкой 4 направлений:

  • eastern_dragon
  • eastern_dragon_overlay
  • eastern_dragon_usiki
  • guilmon

Рекомендуется проверить:

  1. Наличие всех файлов текстур
  2. Корректность отображения во всех направлениях
✅ Verification successful

Все необходимые файлы текстур присутствуют

Проверка показала наличие всех требуемых файлов текстур в директории:

  • eastern_dragon.png
  • eastern_dragon_overlay.png
  • eastern_dragon_usiki.png
  • guilmon.png

Все состояния, определенные в meta.json, имеют соответствующие файлы текстур. Для полной уверенности в корректности отображения во всех направлениях рекомендуется провести визуальную проверку в игре.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Проверка наличия файлов текстур для всех состояний
for state in "eastern_dragon" "eastern_dragon_overlay" "eastern_dragon_usiki" "guilmon"; do
    echo "Checking state: $state"
    fd "$state" Resources/Textures/_White/Mobs/Customization/snouts.rsi/
done

Length of output: 1443

Resources/Textures/_White/Mobs/Customization/reptilian_parts.rsi/meta.json (2)

19-80: Состояния рогов следуют правильной схеме именования

Все состояния рогов правильно разделены на левую и правую части, что облегчает их использование в системе кастомизации.


3-4: Проверьте атрибуцию авторских прав

Необходимо убедиться, что все указанные ссылки на исходные репозитории актуальны и содержат оригинальные ассеты.

✅ Verification successful

Let me verify the specific commit and file referenced in the copyright attribution.


Атрибуция авторских прав подтверждена

Проверка показала, что все указанные репозитории и коммиты существуют и доступны:

  • Skyrat-SS13/Skyrat-tg коммит 40e3cdbb15b8
  • Bubberstation/Bubberstation коммит 8bc6b83404

Указанные источники корректно атрибутированы в соответствии с лицензией CC-BY-SA-3.0.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Проверка существования указанных репозиториев
gh repo view Skyrat-SS13/Skyrat-tg
gh repo view Bubberstation/Bubberstation

Length of output: 14364


Script:

#!/bin/bash
# Check if the specific commit exists in Skyrat repo
gh api repos/Skyrat-SS13/Skyrat-tg/commits/40e3cdbb15b8bc0d5ef2fb46133adf805bda5297 --jq '.sha'

# Check if the specific Bubberstation commit exists
gh api repos/Bubberstation/Bubberstation/commits/8bc6b83404803466a560b694bf22ef3c0ac266a2 --jq '.sha'

Length of output: 279

Resources/Locale/en-US/_white/markings/reptilian.ftl (1)

1-1: Хорошая организация секций

Разделение маркировок на секции (HEAD, TAILS, SPINES) улучшает читаемость и поддерживаемость файла.

Also applies to: 45-45, 50-50

Resources/Prototypes/Species/reptilian.yml (2)

65-65: Обоснуйте увеличение количества точек разметки

Увеличение количества точек разметки груди с 1 до 3 может повлиять на баланс системы кастомизации. Пожалуйста, объясните необходимость этого изменения.


35-38: Проверьте наличие новых спрайтов

Убедитесь, что новые спрайты MobReptilianLLegDigi, MobReptilianRLegDigi, MobReptilianLFootDigi, и MobReptilianRFootDigi существуют в ресурсах игры.

Resources/Textures/_White/Mobs/Customization/reptilian.rsi/meta.json (1)

7-8: Проверьте соответствие лицензии

Файл использует ассеты из TGStation под лицензией CC-BY-SA-3.0. Убедитесь, что:

  1. Все необходимые атрибуции сохранены
  2. Лицензия совместима с вашим проектом
✅ Verification successful

Лицензионное соответствие подтверждено

В README.md проекта явно указано, что большинство ресурсов лицензировано под CC-BY-SA 3.0, что соответствует лицензии используемых ассетов из TGStation. Атрибуция источника (TGStation) корректно указана в метаданных файла.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Проверка наличия лицензионной информации в других файлах проекта
rg "CC-BY-SA-3.0" "README*"
rg "tgstation" "LICENSE*"

Length of output: 150


Script:

#!/bin/bash
# Поиск файлов лицензий в корне проекта и подкаталогах
fd -t f -i "license|copying"

# Поиск упоминаний лицензий в любых файлах
rg -i "license" -g "!*.rsi"

# Поиск упоминаний tgstation в любых файлах
rg -i "tgstation" -g "!*.rsi"

Length of output: 65893

Resources/Prototypes/_White/Entities/Mobs/Customization/Markings/reptilian.yml (3)

1-46: Проверьте корректность маркировок головы!

Маркировки головы правильно определены и имеют соответствующие ограничения по видам. Структура YAML корректна.


Line range hint 277-313: Проверьте симметричность спрайтов рогов!

Убедитесь, что левые и правые варианты рогов (_l и _r) симметричны и правильно отображаются.


90-137: Необходимо проверить наличие спрайтов рогов!

Изменения в путях спрайтов рогов требуют проверки наличия соответствующих файлов.

Resources/Prototypes/Entities/Clothing/Shoes/specific.yml (1)

242-243: Проверьте корректность смещений для рептилоидной обуви!

Добавлены состояния equipped-FEET-reptilian с корректными смещениями для больших клоунских ботинок и коньков. Убедитесь, что смещения визуально корректны в игре.

Also applies to: 265-266

Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml (1)

Line range hint 1-69: Проверьте ограничения видов для базовых маркировок!

Базовые маркировки имеют корректные ограничения для Reptilian и Human. Структура определений правильная.

Resources/Prototypes/Entities/Mobs/Species/reptilian.yml Outdated Show resolved Hide resolved
Resources/Locale/ru-RU/_white/markings/reptilian.ftl Outdated Show resolved Hide resolved
Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 1

🧹 Nitpick comments (1)
Resources/Textures/Clothing/Shoes/Specific/large_clown.rsi/meta.json (1)

Line range hint 3-4: Необходимо обновить информацию об авторских правах

Учитывая добавление новых спрайтов для рептилий, следует обновить поле copyright, указав автора этих изменений.

-  "copyright": "Made by Purka based on sprite from TG",
+  "copyright": "Made by Purka based on sprite from TG, reptilian variant by DreamlyJack",
📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 118e225 and 9656ce5.

⛔ Files ignored due to path filters (2)
  • Resources/Textures/Clothing/Shoes/Specific/large_clown.rsi/equipped-FEET-reptilian.png is excluded by !**/*.png
  • Resources/Textures/Clothing/Shoes/Specific/skates.rsi/equipped-FEET-reptilian.png is excluded by !**/*.png
📒 Files selected for processing (2)
  • Resources/Textures/Clothing/Shoes/Specific/large_clown.rsi/meta.json (1 hunks)
  • Resources/Textures/Clothing/Shoes/Specific/skates.rsi/meta.json (2 hunks)
🔇 Additional comments (2)
Resources/Textures/Clothing/Shoes/Specific/large_clown.rsi/meta.json (1)

17-20: Корректное добавление состояния для рептилий

Новое состояние equipped-FEET-reptilian правильно определено и соответствует структуре других состояний в файле.

Resources/Textures/Clothing/Shoes/Specific/skates.rsi/meta.json (1)

4-4: Корректное обновление авторских прав

Правильно добавлена информация об авторе варианта для рептилий в поле copyright.

@PuroSlavKing
Copy link
Member Author

r2m

@Spatison Spatison merged commit b604491 into WWhiteDreamProject:master Dec 16, 2024
11 of 12 checks passed
@PuroSlavKing PuroSlavKing deleted the BetterLizards branch December 17, 2024 09:57
PuroSlavKing pushed a commit to PuroSlavKing/skibidi-white that referenced this pull request Dec 17, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants