Новые пешки для ерп ивента DoVaPot - #560
Open
Nordstream17 wants to merge 15 commits into
Open
Conversation
Contributor
|
RSI Diff Bot; head commit 2810f7f merging into c71339f Resources/Textures/_Lust/Mobs/Events/moth.rsi
Resources/Textures/_Lust/Mobs/Events/ulubastik.rsi
Resources/Textures/_Lust/Mobs/Events/vulpkanin_one.rsi
Resources/Textures/_Lust/Mobs/Events/vulpkanin_two.rsi
|
Contributor
📝 WalkthroughWalkthroughДобавлена иерархия event-мобов с вариантами Moth, Vulpkanin, Smiling demon и Ulubastik. Настроены компоненты, наследование, спрайты, RSI-метаданные и локализация на английском и русском языках. ChangesEvent-мобы
Estimated code review effort: 3 (Moderate) | ~20 minutes Suggested labels: Suggested reviewers: Important Pre-merge checks failedPlease resolve all errors before merging. Addressing warnings is optional. ❌ Failed checks (3 errors)
✅ Passed checks (8 passed)
✨ 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: 4
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In
`@Resources/Locale/en-US/_lust/prototypes/entities/mobs/events/erp_event_mobs.ftl`:
- Line 19: Remove the standalone Russian sentence from the English Fluent
localization, or translate it to English and attach it with valid indentation to
the appropriate message key; do not leave unkeyed text that can break parsing.
In
`@Resources/Locale/ru-RU/_lust/prototypes/entities/mobs/events/erp_event_mobs.ftl`:
- Around line 1-7: В локализованных сущностях приведите названия и описания к
требованиям: в
Resources/Locale/ru-RU/_lust/prototypes/entities/mobs/events/erp_event_mobs.ftl
на участках 1-7, 15-18 и 24-29 задайте названия «смертомоль», «особь номер 7114»
и «улыбающиеся» соответственно и сократите каждое описание до не более трёх
предложений; в
Resources/Locale/en-US/_lust/prototypes/entities/mobs/events/erp_event_mobs.ftl
на участках 1-2 и 10-11 используйте названия «moth of death» и «object № 7114»
соответственно.
In `@Resources/Prototypes/_Lust/Entities/Mobs/Events/erp_event_mobs.yml`:
- Around line 3-5: Обновите все идентификаторы прототипов в файле, включая
BaseSimpleEventMobVulpkanin и Lust-специфичные сущности вроде
ERPEventMothNakedFolded, добавив префикс Lust. Также измените ссылки на эти
прототипы в полях parent и других зависимостях, чтобы они использовали новые ID.
- Around line 238-242: Update the ERPEventUlubastik prototype with non-empty
English fallback values for name and description, then add the matching
ent-ERPEventUlubastik localization key and translations to the appropriate FTL
files, preserving prototype/localization parity.
🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
- Push a commit to this branch (recommended)
- Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: Path: .coderabbit.yaml
Review profile: ASSERTIVE
Plan: Pro
Run ID: 964a5d57-5e6c-467c-b469-89b5a53d9ff5
⛔ Files ignored due to path filters (12)
Resources/Textures/_Lust/Mobs/Events/moth.rsi/moth_1_1.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Events/moth.rsi/moth_1_2.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Events/moth.rsi/moth_2_1.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Events/moth.rsi/moth_2_2.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Events/ulubastik.rsi/ulubastik.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Events/vulpkanin_one.rsi/light.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Events/vulpkanin_one.rsi/vulpkanin_1.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Events/vulpkanin_one.rsi/vulpkanin_2.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Events/vulpkanin_one.rsi/vulpkanin_3.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Events/vulpkanin_two.rsi/light.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Events/vulpkanin_two.rsi/vulpkanin_1.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Events/vulpkanin_two.rsi/vulpkanin_2.pngis excluded by!**/*.png
📒 Files selected for processing (7)
Resources/Locale/en-US/_lust/prototypes/entities/mobs/events/erp_event_mobs.ftlResources/Locale/ru-RU/_lust/prototypes/entities/mobs/events/erp_event_mobs.ftlResources/Prototypes/_Lust/Entities/Mobs/Events/erp_event_mobs.ymlResources/Textures/_Lust/Mobs/Events/moth.rsi/meta.jsonResources/Textures/_Lust/Mobs/Events/ulubastik.rsi/meta.jsonResources/Textures/_Lust/Mobs/Events/vulpkanin_one.rsi/meta.jsonResources/Textures/_Lust/Mobs/Events/vulpkanin_two.rsi/meta.json
Contributor
Author
|
Пока на доработке |
Contributor
Author
|
Завершено |
Collaborator
|
ещё раз повторю, меньше спорить с кролем, добавить описания |
Contributor
Author
Да что я-то сделаю? Я спросил у автора ивента, он попросил не добавлять описание летающей улыбке. |
Contributor
Author
|
Поменял ID и добавил описания. Названия сущностей сделал с маленькой буквы. |
KaiserMaus
reviewed
Jul 25, 2026
KaiserMaus
left a comment
KaiserMaus
left a comment
Collaborator
There was a problem hiding this comment.
Где девочки с членами?!
Contributor
Author
Им нельзя дать пол!!! плачет |
Contributor
Author
|
@KaiserMaus Что надо доделать для мёрджа? |
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.
Добавлены новые персонажи
В силу особенностей спрайтов персонажи в разной одежде представлены отдельными прототипами. Для всех прототипов добавлены локализации.
Ссылка на багрепорт/Предложение | Related Issue/Bug Report
Медиа (Видео/Скриншоты) | Media (Video/Screenshots)
_._._DoVaPot_compressed.mp4
🆑 Nordstream17
Summary by CodeRabbit
Новые возможности
Локализация