Добавление базовой версии SCP-3288 "Аристократы"#1053
Open
666XxttimurkaxX666 wants to merge 6 commits into
Open
Добавление базовой версии SCP-3288 "Аристократы"#1053666XxttimurkaxX666 wants to merge 6 commits into
666XxttimurkaxX666 wants to merge 6 commits into
Conversation
Contributor
|
RSI Diff Bot; head commit 45be589 merging into 0ce6a7f Resources/Textures/_Scp/Mobs/Scp/scp-3288.rsi
Resources/Textures/_Scp/Mobs/scp-3288-servant.rsi
|
Contributor
|
Warning Review limit reached
More reviews will be available in 21 minutes and 18 seconds. Learn how PR review limits work. Your organization has run out of usage credits. Purchase more in the billing tab. ⌛ How to resolve this issue?After more reviews become available, a review can be triggered using the We recommend that you space out your commits to avoid hitting the rate limit. 🚦 How do rate limits work?CodeRabbit enforces hourly rate limits for each developer per organization. Our paid plans include higher PR review limits than trial, open-source, and free plans. In all cases, reviews become available again over time. During sustained high-volume PR review activity, CodeRabbit may temporarily slow when the next review becomes available. Please see our Fair Usage Limits Policy for further information. ℹ️ Review info⚙️ Run configurationConfiguration used: Path: .coderabbit.yaml Review profile: ASSERTIVE Plan: Pro Run ID: 📒 Files selected for processing (8)
📝 WalkthroughWalkthroughДобавлена полная реализация SCP-3288: новый NPC моб с тремя игровыми вариантами (Слуга, Аристократ, Рыцарь), игровая сущность с механиками девуратора и тяги, церемониальное оружие, ролевые определения (призрачные роли и раундстартовая должность), инвентарные шаблоны, спрайты и локализация на английском и русском. ChangesSCP-3288 Feature
Estimated code review effort🎯 3 (Moderate) | ⏱️ ~25 minutes Suggested labels
Suggested reviewers
Poem
Important Pre-merge checks failedPlease resolve all errors before merging. Addressing warnings is optional. ❌ Failed checks (2 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: 10
Caution
Some comments are outside the diff and can’t be posted inline due to platform limitations.
⚠️ Outside diff range comments (1)
Resources/Locale/ru-RU/_prototypes/_scp/catalog/fills/items/belt.ftl (1)
39-41:⚠️ Potential issue | 🟡 Minor | ⚡ Quick winДобавьте
.suffixдля выравнивания с en-US записью.В en-US для этого ключа есть
.suffix = SCP-3288, а в ru-RU суффикс отсутствует. Лучше держать одинаковую структуру ключа в обеих локалях.As per coding guidelines: "Keep ... fallback strings aligned with the English localization intent."
🤖 Prompt for 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. In `@Resources/Locale/ru-RU/_prototypes/_scp/catalog/fills/items/belt.ftl` around lines 39 - 41, The ru-RU localization for the key ent-ClothingBeltSheathFilledScp3288 is missing the .suffix entry present in en-US; add a .suffix for ent-ClothingBeltSheathFilledScp3288 with the same fallback value "SCP-3288" so the key structure matches (keep it aligned with ent-ClothingBeltSheathFilled.desc and the English localization).Source: Coding guidelines
🤖 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/_prototypes/_scp/entities/mobs/player/scp/main/scp3288.ftl`:
- Line 1: Replace the placeholder value "???" for the localization key
ent-Scp3288 with the correct English name/title for SCP-3288 (e.g., the
canonical "SCP-3288" or the official English article title); update the string
value for ent-Scp3288 in
Resources/Locale/en-US/_prototypes/_scp/entities/mobs/player/scp/main/scp3288.ftl
and ensure the formatting matches other entries (plain text string, no extra
markup).
In
`@Resources/Locale/en-US/_prototypes/_scp/entities/objects/weapons/melee/sword.ftl`:
- Line 2: The .desc string currently reads "A ceremonial weapon belonging to the
Habsburgs family." which is unnatural for en-US; update the localization entry
(the .desc key in sword.ftl) to use "the Habsburg family" (e.g., "A ceremonial
weapon belonging to the Habsburg family.") to conform to
ss14-localization-strings review criteria and natural English usage.
In `@Resources/Locale/en-US/_strings/_scp/roles/scp.ftl`:
- Around line 15-16: Localization keys use CamelCase suffixes (e.g.,
job-name-scp3288Alpha, job-description-scp3288Alpha/Servant/Knight/Aristocrat)
but must be kebab-case; rename keys in
Resources/Locale/en-US/_strings/_scp/roles/scp.ftl to job-name-scp3288-alpha,
job-description-scp3288-servant/job-description-scp3288-knight/job-description-scp3288-aristocrat
(as appropriate) and then update all corresponding references to those keys in
Resources/Prototypes/_Scp/Roles/Jobs/SCP/roundstart.yml and
Resources/Prototypes/_Scp/Roles/Jobs/SCP/ghostrole.yml so they match the new
kebab-case keys.
In `@Resources/Locale/en-US/_strings/_scp/scp/scp3288.ftl`:
- Around line 3-5: The three ghost role description entries
(ghost-role-information-scp3288-aristocrat-description,
ghost-role-information-scp3288-knight-description,
ghost-role-information-scp3288-servant-description) lack the required OOC:
marker; update each value to begin with "OOC:" followed by the existing
instruction text, and make the same mirrored change in the corresponding Russian
file (Resources/Locale/ru-RU/_strings/_scp/scp/scp3288.ftl) so both locales
remain consistent.
In
`@Resources/Locale/ru-RU/_prototypes/_scp/entities/mobs/npcs/scp/scp3288monster.ftl`:
- Line 1: Замените заглушку "???" для ключа ent-BaseMobScp3288Monster на
корректную русскую локализацию, например «Базовый монстр SCP-3288» (или другой
согласованный с командой вариант), чтобы строка ent-BaseMobScp3288Monster
содержала человекочитаемое название вместо плейсхолдера.
In
`@Resources/Locale/ru-RU/_prototypes/_scp/entities/mobs/player/scp/main/scp3288.ftl`:
- Line 1: Замените заглушку ent-Scp3288 = ??? на корректную русскую строку для
названия SCP-3288: присвоьте ent-Scp3288 значение с реальным русским названием
сущности (например, если нет отдельного перевода, используйте "SCP-3288") в
файле с локализацией, сохраняя формат строки и кодировку.
In
`@Resources/Locale/ru-RU/_prototypes/_scp/entities/objects/weapons/melee/sword.ftl`:
- Line 2: Update the .desc entry so the Russian sentence includes the missing
comma: change the string value for .desc in the sword.ftl prototype from
"Церемониальное оружие принадлежащее роду Габсбургов." to include the comma
after "орудие" (i.e., "Церемониальное оружие, принадлежащее роду Габсбургов.")
to comply with ss14-localization-strings guidelines.
In `@Resources/Prototypes/_Scp/Entities/Mobs/NPCs/Scp/scp3288.yml`:
- Around line 10-11: Remove the placeholder "name: ???" from the abstract base
prototype (scp3288.yml) so the base prototype does not supply a default name;
ensure each concrete prototype (Scp3288Aristocrat, Scp3288Knight,
Scp3288Servant) declares its own name and description fields directly in their
YAMLs following SS14 convention (keep name/description in the concrete
prototypes and leave the base as abstract without a name).
In `@Resources/Prototypes/_Scp/Entities/Mobs/Player/Scp/Main/scp3288.yml`:
- Around line 31-32: В файле где объявлен блок "type: Inventory" с "templateId:
scp082" замените неправильный шаблон на один из новых для SCP-3288 (например
"scp3288Servant" или "scp3288Knight") — найдите блок с type:
Inventory/templateId и подставьте корректный идентификатор шаблона,
соответствующий роли (см. объявленные шаблоны в
Resources/Prototypes/_Scp/InventoryTemplates/scp3288_servant.yml) чтобы
инвентарь соответствовал SCP-3288.
In `@Resources/Prototypes/_Scp/Roles/Jobs/SCP/roundstart.yml`:
- Around line 117-131: The job definition for Scp3288Alpha currently reuses the
SCP-106 icon (icon: JobIconScp106); replace that with a dedicated icon name
(icon: JobIconScp3288) in the Scp3288Alpha job block or, if the SCP-3288 asset
is not ready, add a clear TODO comment next to the icon line indicating a
placeholder and the intended new icon name so it can be updated later; ensure
you update the icon reference for the Scp3288Alpha job (id: Scp3288Alpha,
jobEntity: Scp3288) accordingly.
---
Outside diff comments:
In `@Resources/Locale/ru-RU/_prototypes/_scp/catalog/fills/items/belt.ftl`:
- Around line 39-41: The ru-RU localization for the key
ent-ClothingBeltSheathFilledScp3288 is missing the .suffix entry present in
en-US; add a .suffix for ent-ClothingBeltSheathFilledScp3288 with the same
fallback value "SCP-3288" so the key structure matches (keep it aligned with
ent-ClothingBeltSheathFilled.desc and the English localization).
🪄 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: 443ceba7-f1a3-4e29-bc62-8e83eac6b96f
⛔ Files ignored due to path filters (7)
Resources/Textures/_Scp/Mobs/Scp/scp-3288.rsi/base.pngis excluded by!**/*.pngResources/Textures/_Scp/Mobs/Scp/scp-3288.rsi/dead.pngis excluded by!**/*.pngResources/Textures/_Scp/Mobs/Scp/scp-3288.rsi/frenzy.pngis excluded by!**/*.pngResources/Textures/_Scp/Mobs/Scp/scp-3288.rsi/sleep.pngis excluded by!**/*.pngResources/Textures/_Scp/Mobs/scp-3288-servant.rsi/aristocrat.pngis excluded by!**/*.pngResources/Textures/_Scp/Mobs/scp-3288-servant.rsi/knight.pngis excluded by!**/*.pngResources/Textures/_Scp/Mobs/scp-3288-servant.rsi/servant.pngis excluded by!**/*.png
📒 Files selected for processing (22)
Resources/Locale/en-US/_prototypes/_scp/catalog/fills/items/belt.ftlResources/Locale/en-US/_prototypes/_scp/entities/mobs/npcs/scp3288monster.ftlResources/Locale/en-US/_prototypes/_scp/entities/mobs/player/scp/main/scp3288.ftlResources/Locale/en-US/_prototypes/_scp/entities/objects/weapons/melee/sword.ftlResources/Locale/en-US/_strings/_scp/roles/scp.ftlResources/Locale/en-US/_strings/_scp/scp/scp3288.ftlResources/Locale/ru-RU/_prototypes/_scp/catalog/fills/items/belt.ftlResources/Locale/ru-RU/_prototypes/_scp/entities/mobs/npcs/scp/scp3288monster.ftlResources/Locale/ru-RU/_prototypes/_scp/entities/mobs/player/scp/main/scp3288.ftlResources/Locale/ru-RU/_prototypes/_scp/entities/objects/weapons/melee/sword.ftlResources/Locale/ru-RU/_strings/_scp/roles/scp.ftlResources/Locale/ru-RU/_strings/_scp/scp/scp3288.ftlResources/Prototypes/_Scp/Catalog/Fills/Items/belt.ymlResources/Prototypes/_Scp/Entities/Mobs/NPCs/Scp/scp3288.ymlResources/Prototypes/_Scp/Entities/Mobs/Player/Scp/Main/scp3288.ymlResources/Prototypes/_Scp/Entities/Objects/Weapons/Melee/sword.ymlResources/Prototypes/_Scp/InventoryTemplates/scp3288_servant.ymlResources/Prototypes/_Scp/Roles/Jobs/SCP/ghostrole.ymlResources/Prototypes/_Scp/Roles/Jobs/SCP/roundstart.ymlResources/Prototypes/_Scp/Roles/play_time_trackers.ymlResources/Textures/_Scp/Mobs/Scp/scp-3288.rsi/meta.jsonResources/Textures/_Scp/Mobs/scp-3288-servant.rsi/meta.json
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
1 participant
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.
Краткое описание | Short description
ну типо 3288 которого приняли 3 месяца назад в конкурсе
Ссылка на багрепорт/Предложение | Related Issue/Bug Report
Медиа (Видео/Скриншоты) | Media (Video/Screenshots)
Changelog
🆑 timur
Summary by CodeRabbit
Release Notes