Open
Conversation
github-actions
bot
added
Status: Needs Review
size/M
Changes: Sprites
Contributor
|
RSI Diff Bot; head commit 543e4f5 merging into d16cf09 Resources/Textures/ADT/Clothing/Head/Misc/blackrose-wreath.rsi
Resources/Textures/ADT/Clothing/Head/Misc/dandelion-wreat.rsi
Resources/Textures/ADT/Clothing/Head/Misc/mac-wreat.rsi
Resources/Textures/ADT/Clothing/Head/Misc/rose-wreat.rsi
|
Contributor
WalkthroughДобавлены четыре новых предмета одежды — венки (чёрных роз, маков, одуванчиков и красных роз). Внесены определения прототипов для этих предметов, русская локализация, метаданные текстур и новые записи загрузок/групп загрузок. Изменения носят формальный характер данных и не затрагивают логику исполнения. Possibly related PRs
Suggested labels
Suggested reviewers
🚥 Pre-merge checks | ✅ 3✅ Passed checks (3 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
Actionable comments posted: 3
🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.
Inline comments:
In `@Resources/Locale/ru-RU/ADT/clothing/misc.ftl`:
- Around line 1-2: Поломанная строка описания для
ent-ADTClothingHeadHatBlackroseFlowerWreath содержит опечатку ".desc = вено" —
исправь значение .desc для ключа ent-ADTClothingHeadHatBlackroseFlowerWreath,
заменив "вено" на корректное слово "венок" или на полный осмысленный текст
(например "венок из чёрных роз") чтобы описание отображалось правильно в
интерфейсе.
- Around line 3-8: The string values for the listed localization keys use
sentence-case; change them to lowercase to match .ftl conventions: update
ent-ADTClothingHeadHatMacFlowerWreath,
ent-ADTClothingHeadHatDandelionFlowerWreath, and
ent-ADTClothingHeadHatRoseFlowerWreath values and their .desc entries so the
visible names and descriptions start with lowercase letters (e.g., "маковый
венок" stays but ensure first character is lowercase, "Желтый венок" -> "желтый
венок", "Венок состоящий из ромашек" -> "венок состоящий из ромашек", etc.),
preserving existing wording and punctuation.
In `@Resources/Prototypes/ADT/Loadouts/Miscellaneous/trinkets.yml`:
- Around line 76-103: The four loadout prototypes ADTFlowerWreath1,
ADTFlowerWreath2, ADTFlowerWreath3 and ADTFlowerWreath4 currently place the
wreath items under storage.back; change each to use an equipment section instead
so the wreaths are equipped to the proper clothing slot (e.g., HEAD or neck as
declared on the Clothing prototypes) rather than stored in the back slot.
Specifically, replace the storage.back entries with an equipment mapping that
references the same item IDs (ADTClothingHeadHatBlackroseFlowerWreath,
ADTClothingHeadHatMacFlowerWreath, ADTClothingHeadHatRoseFlowerWreath,
ADTClothingHeadHatDandelionFlowerWreath) so the engine will equip them to the
Clothing slots (HEAD/neck) declared on those Clothing prototypes.
ℹ️ Review info
⚙️ Run configuration
Configuration used: Repository UI
Review profile: CHILL
Plan: Pro
Run ID: 5ff89dfc-1be3-49b3-9e33-798502bcf2be
⛔ Files ignored due to path filters (16)
Resources/Textures/ADT/Clothing/Head/Misc/blackrose-wreath.rsi/equipped-HELMET-vox.pngis excluded by!**/*.png,!**/*.pngResources/Textures/ADT/Clothing/Head/Misc/blackrose-wreath.rsi/equipped-HELMET.pngis excluded by!**/*.png,!**/*.pngResources/Textures/ADT/Clothing/Head/Misc/blackrose-wreath.rsi/equipped-NECK.pngis excluded by!**/*.png,!**/*.pngResources/Textures/ADT/Clothing/Head/Misc/blackrose-wreath.rsi/icon.pngis excluded by!**/*.png,!**/*.pngResources/Textures/ADT/Clothing/Head/Misc/dandelion-wreat.rsi/equipped-HELMET-vox.pngis excluded by!**/*.png,!**/*.pngResources/Textures/ADT/Clothing/Head/Misc/dandelion-wreat.rsi/equipped-HELMET.pngis excluded by!**/*.png,!**/*.pngResources/Textures/ADT/Clothing/Head/Misc/dandelion-wreat.rsi/equipped-NECK.pngis excluded by!**/*.png,!**/*.pngResources/Textures/ADT/Clothing/Head/Misc/dandelion-wreat.rsi/icon.pngis excluded by!**/*.png,!**/*.pngResources/Textures/ADT/Clothing/Head/Misc/mac-wreat.rsi/equipped-HELMET-vox.pngis excluded by!**/*.png,!**/*.pngResources/Textures/ADT/Clothing/Head/Misc/mac-wreat.rsi/equipped-HELMET.pngis excluded by!**/*.png,!**/*.pngResources/Textures/ADT/Clothing/Head/Misc/mac-wreat.rsi/equipped-NECK.pngis excluded by!**/*.png,!**/*.pngResources/Textures/ADT/Clothing/Head/Misc/mac-wreat.rsi/icon.pngis excluded by!**/*.png,!**/*.pngResources/Textures/ADT/Clothing/Head/Misc/rose-wreat.rsi/equipped-HELMET-vox.pngis excluded by!**/*.png,!**/*.pngResources/Textures/ADT/Clothing/Head/Misc/rose-wreat.rsi/equipped-HELMET.pngis excluded by!**/*.png,!**/*.pngResources/Textures/ADT/Clothing/Head/Misc/rose-wreat.rsi/equipped-NECK.pngis excluded by!**/*.png,!**/*.pngResources/Textures/ADT/Clothing/Head/Misc/rose-wreat.rsi/icon.pngis excluded by!**/*.png,!**/*.png
📒 Files selected for processing (8)
Resources/Locale/ru-RU/ADT/clothing/misc.ftlResources/Prototypes/ADT/Entities/Clothing/Head/misc.ymlResources/Prototypes/ADT/Loadouts/Miscellaneous/trinkets.ymlResources/Prototypes/Loadouts/loadout_groups.ymlResources/Textures/ADT/Clothing/Head/Misc/blackrose-wreath.rsi/meta.jsonResources/Textures/ADT/Clothing/Head/Misc/dandelion-wreat.rsi/meta.jsonResources/Textures/ADT/Clothing/Head/Misc/mac-wreat.rsi/meta.jsonResources/Textures/ADT/Clothing/Head/Misc/rose-wreat.rsi/meta.json
Comment on lines
+1
to
+2
| ent-ADTClothingHeadHatBlackroseFlowerWreath = венок из черных роз | ||
| .desc = вено |
Contributor
There was a problem hiding this comment.
Опечатка в описании чёрного венка.
На Line 2 слово вено выглядит как обрезанная опечатка. В текущем виде строка попадёт игроку прямо в интерфейс.
Предлагаемая правка
ent-ADTClothingHeadHatBlackroseFlowerWreath = венок из черных роз
- .desc = вено
+ .desc = венок📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.
Suggested change
| ent-ADTClothingHeadHatBlackroseFlowerWreath = венок из черных роз | |
| .desc = вено | |
| ent-ADTClothingHeadHatBlackroseFlowerWreath = венок из черных роз | |
| .desc = венок |
🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.
In `@Resources/Locale/ru-RU/ADT/clothing/misc.ftl` around lines 1 - 2, Поломанная
строка описания для ent-ADTClothingHeadHatBlackroseFlowerWreath содержит
опечатку ".desc = вено" — исправь значение .desc для ключа
ent-ADTClothingHeadHatBlackroseFlowerWreath, заменив "вено" на корректное слово
"венок" или на полный осмысленный текст (например "венок из чёрных роз") чтобы
описание отображалось правильно в интерфейсе.
Comment on lines
+3
to
+8
| ent-ADTClothingHeadHatMacFlowerWreath = маковый венок | ||
| .desc = Венок состоящий из мака | ||
| ent-ADTClothingHeadHatDandelionFlowerWreath = Желтый венок | ||
| .desc = Венок состоящий из ромашек | ||
| ent-ADTClothingHeadHatRoseFlowerWreath = Красный венок | ||
| .desc = Венок состоящий из красных роз |
Contributor
There was a problem hiding this comment.
Приведите локализацию к нижнему регистру.
Здесь названия и описания местами начинаются с заглавной буквы, что выбивается из принятого оформления .ftl в проекте.
Предлагаемая правка
ent-ADTClothingHeadHatMacFlowerWreath = маковый венок
- .desc = Венок состоящий из мака
+ .desc = венок состоящий из мака
- ent-ADTClothingHeadHatDandelionFlowerWreath = Желтый венок
+ ent-ADTClothingHeadHatDandelionFlowerWreath = желтый венок
- .desc = Венок состоящий из ромашек
+ .desc = венок состоящий из ромашек
- ent-ADTClothingHeadHatRoseFlowerWreath = Красный венок
+ ent-ADTClothingHeadHatRoseFlowerWreath = красный венок
- .desc = Венок состоящий из красных роз
+ .desc = венок состоящий из красных розBased on learnings: В локализации файлов формата .ftl имена сущностей должны быть написаны в нижнем регистре.
📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.
Suggested change
| ent-ADTClothingHeadHatMacFlowerWreath = маковый венок | |
| .desc = Венок состоящий из мака | |
| ent-ADTClothingHeadHatDandelionFlowerWreath = Желтый венок | |
| .desc = Венок состоящий из ромашек | |
| ent-ADTClothingHeadHatRoseFlowerWreath = Красный венок | |
| .desc = Венок состоящий из красных роз | |
| ent-ADTClothingHeadHatMacFlowerWreath = маковый венок | |
| .desc = венок состоящий из мака | |
| ent-ADTClothingHeadHatDandelionFlowerWreath = желтый венок | |
| .desc = венок состоящий из ромашек | |
| ent-ADTClothingHeadHatRoseFlowerWreath = красный венок | |
| .desc = венок состоящий из красных роз |
🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.
In `@Resources/Locale/ru-RU/ADT/clothing/misc.ftl` around lines 3 - 8, The string
values for the listed localization keys use sentence-case; change them to
lowercase to match .ftl conventions: update
ent-ADTClothingHeadHatMacFlowerWreath,
ent-ADTClothingHeadHatDandelionFlowerWreath, and
ent-ADTClothingHeadHatRoseFlowerWreath values and their .desc entries so the
visible names and descriptions start with lowercase letters (e.g., "маковый
венок" stays but ensure first character is lowercase, "Желтый венок" -> "желтый
венок", "Венок состоящий из ромашек" -> "венок состоящий из ромашек", etc.),
preserving existing wording and punctuation.
Comment on lines
+76
to
+103
| # Flowers | ||
| - type: loadout | ||
| id: ADTFlowerWreath1 | ||
| storage: | ||
| back: | ||
| - ADTClothingHeadHatBlackroseFlowerWreath | ||
| groupBy: "flowerwreath" | ||
|
|
||
| - type: loadout | ||
| id: ADTFlowerWreath2 | ||
| storage: | ||
| back: | ||
| - ADTClothingHeadHatMacFlowerWreath | ||
| groupBy: "flowerwreath" | ||
|
|
||
| - type: loadout | ||
| id: ADTFlowerWreath3 | ||
| storage: | ||
| back: | ||
| - ADTClothingHeadHatRoseFlowerWreath | ||
| groupBy: "flowerwreath" | ||
|
|
||
| - type: loadout | ||
| id: ADTFlowerWreath4 | ||
| storage: | ||
| back: | ||
| - ADTClothingHeadHatDandelionFlowerWreath | ||
| groupBy: "flowerwreath" |
Contributor
There was a problem hiding this comment.
Здесь нужен equipment, а не storage.back.
Сейчас венки добавляются как содержимое слота back, а не как экипируемый предмет. Для этих прототипов это ломает ожидаемое поведение лодаута: венок не будет надет на голову, хотя сами сущности объявлены как Clothing со слотами HEAD/neck.
Предлагаемая правка
# Flowers
- type: loadout
id: ADTFlowerWreath1
- storage:
- back:
- - ADTClothingHeadHatBlackroseFlowerWreath
+ equipment:
+ head: ADTClothingHeadHatBlackroseFlowerWreath
groupBy: "flowerwreath"
- type: loadout
id: ADTFlowerWreath2
- storage:
- back:
- - ADTClothingHeadHatMacFlowerWreath
+ equipment:
+ head: ADTClothingHeadHatMacFlowerWreath
groupBy: "flowerwreath"
- type: loadout
id: ADTFlowerWreath3
- storage:
- back:
- - ADTClothingHeadHatRoseFlowerWreath
+ equipment:
+ head: ADTClothingHeadHatRoseFlowerWreath
groupBy: "flowerwreath"
- type: loadout
id: ADTFlowerWreath4
- storage:
- back:
- - ADTClothingHeadHatDandelionFlowerWreath
+ equipment:
+ head: ADTClothingHeadHatDandelionFlowerWreath
groupBy: "flowerwreath"📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.
Suggested change
| # Flowers | |
| - type: loadout | |
| id: ADTFlowerWreath1 | |
| storage: | |
| back: | |
| - ADTClothingHeadHatBlackroseFlowerWreath | |
| groupBy: "flowerwreath" | |
| - type: loadout | |
| id: ADTFlowerWreath2 | |
| storage: | |
| back: | |
| - ADTClothingHeadHatMacFlowerWreath | |
| groupBy: "flowerwreath" | |
| - type: loadout | |
| id: ADTFlowerWreath3 | |
| storage: | |
| back: | |
| - ADTClothingHeadHatRoseFlowerWreath | |
| groupBy: "flowerwreath" | |
| - type: loadout | |
| id: ADTFlowerWreath4 | |
| storage: | |
| back: | |
| - ADTClothingHeadHatDandelionFlowerWreath | |
| groupBy: "flowerwreath" | |
| # Flowers | |
| - type: loadout | |
| id: ADTFlowerWreath1 | |
| equipment: | |
| head: ADTClothingHeadHatBlackroseFlowerWreath | |
| groupBy: "flowerwreath" | |
| - type: loadout | |
| id: ADTFlowerWreath2 | |
| equipment: | |
| head: ADTClothingHeadHatMacFlowerWreath | |
| groupBy: "flowerwreath" | |
| - type: loadout | |
| id: ADTFlowerWreath3 | |
| equipment: | |
| head: ADTClothingHeadHatRoseFlowerWreath | |
| groupBy: "flowerwreath" | |
| - type: loadout | |
| id: ADTFlowerWreath4 | |
| equipment: | |
| head: ADTClothingHeadHatDandelionFlowerWreath | |
| groupBy: "flowerwreath" |
🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.
In `@Resources/Prototypes/ADT/Loadouts/Miscellaneous/trinkets.yml` around lines 76
- 103, The four loadout prototypes ADTFlowerWreath1, ADTFlowerWreath2,
ADTFlowerWreath3 and ADTFlowerWreath4 currently place the wreath items under
storage.back; change each to use an equipment section instead so the wreaths are
equipped to the proper clothing slot (e.g., HEAD or neck as declared on the
Clothing prototypes) rather than stored in the back slot. Specifically, replace
the storage.back entries with an equipment mapping that references the same item
IDs (ADTClothingHeadHatBlackroseFlowerWreath, ADTClothingHeadHatMacFlowerWreath,
ADTClothingHeadHatRoseFlowerWreath, ADTClothingHeadHatDandelionFlowerWreath) so
the engine will equip them to the Clothing slots (HEAD/neck) declared on those
Clothing prototypes.
Contributor
There was a problem hiding this comment.
Actionable comments posted: 1
🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.
Inline comments:
In `@Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml`:
- Line 17: Добавьте обязательный маркер комментария для изменения вне папки
/ADT/: перед строкой содержащей ключ groupBy: "flowerwreath" в файле
trinkets.yml вставьте одиночную строку комментария вида # ADT-Tweak: <краткая
причина изменения> (например, # ADT-Tweak: исправлена группировка для венков),
чтобы пометить изменение согласно правилам проекта.
ℹ️ Review info
⚙️ Run configuration
Configuration used: Repository UI
Review profile: CHILL
Plan: Pro
Run ID: f023c9d6-fa32-4228-b2b0-4ad89c11e427
📒 Files selected for processing (1)
Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml
| storage: | ||
| back: | ||
| - ClothingHeadHatFlowerWreath | ||
| groupBy: "flowerwreath" |
Contributor
There was a problem hiding this comment.
Отсутствует обязательный комментарий ADT-Tweak.
Изменение находится вне папки /ADT/, поэтому согласно правилам проекта необходимо добавить маркер # ADT-Tweak: для одиночной строки.
🔧 Предлагаемое исправление
- type: loadout
id: FlowerWreath
storage:
back:
- ClothingHeadHatFlowerWreath
- groupBy: "flowerwreath"
+ groupBy: "flowerwreath" # ADT-Tweak: группировка с ADT венкамиСогласно coding guidelines: "Все изменения вне папок /ADT/ должны быть прокомментированы... Одиночные строки можно просто помечать как # ADT-Tweak:"
🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.
In `@Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml` at line 17,
Добавьте обязательный маркер комментария для изменения вне папки /ADT/: перед
строкой содержащей ключ groupBy: "flowerwreath" в файле trinkets.yml вставьте
одиночную строку комментария вида # ADT-Tweak: <краткая причина изменения>
(например, # ADT-Tweak: исправлена группировка для венков), чтобы пометить
изменение согласно правилам проекта.
Смена локализации на нормальную.
Unlumy
requested changes
Mar 11, 2026
Collaborator
Unlumy
left a comment
Unlumy
left a comment
There was a problem hiding this comment.
Крафты.
Добавляя одежду её надо доставать игрокам и не только через лодауты.
А в остальном всё хорошо.
И говорили они, что ВП - не ерп билд...
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Описание PR
Добавлено 4 новых венка.
Почему / Баланс
Увеличиваем количество растительности.
Техническая информация
Чейнджлог
🆑 Muns, Prazat