Вещи Qillu #525
Open
Orvex07 wants to merge 3 commits into
Open
Conversation
github-actions
Bot
added
Несортированный
and removed
Статус: Требует Рассмотрения
labels
Contributor
|
RSI Diff Bot; head commit 895274e merging into 11274e2 Resources/Textures/_Lust/Clothing/Multiple/towel.rsi
Resources/Textures/_Lust/Clothing/Neck/Bedsheets/qillu.rsi
Resources/Textures/_Lust/Clothing/Neck/Misc/pins.rsi
Resources/Textures/_Lust/Interface/Misc/job_icons.rsi
Resources/Textures/_Lust/Objects/Misc/Handy_Flags/qillu_handy_flag.rsi
Resources/Textures/_Lust/Objects/Misc/doublebedsheets.rsi
Resources/Textures/_Lust/Structures/Furniture/Altars/Gods/qillu.rsi
Resources/Textures/_Lust/Structures/Wallmounts/flags.rsi
Resources/Textures/_Lust/Structures/Wallmounts/posters.rsi
|
Contributor
📝 WalkthroughWalkthroughДобавлена поддержка бренда корпорации Qillu посредством новых прототипов сущностей, локализации на английском и русском языках, рецептов крафта, текстурных ассетов и записей миграции. Новые предметы включают одежду, украшения, мебель и декоративные элементы с соответствующими описаниями и визуальными представлениями. Changes
Estimated code review effort🎯 3 (Moderate) | ⏱️ ~25 minutes 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: 16
Caution
Some comments are outside the diff and can’t be posted inline due to platform limitations.
⚠️ Outside diff range comments (1)
Resources/Prototypes/_Lust/Entities/Objects/Misc/centcom_id_cards_qillu.yml (1)
57-59:⚠️ Potential issue | 🟠 MajorНесоответствие брендинга:
jobIcon: JobIconNanotrasenдля Qillu-варианта.Пока спрайт-слой карты переведён на состояние
Qillu(строка 45),jobIconпо-прежнему используетJobIconNanotrasen. В пользовательском интерфейсе (PDA/ID-консоль) иконка профессии берётся изjobIcon, поэтому будет показываться логотип Nanotrasen вместо логотипа Qillu, что расходится с визуальным стилем карты. ПрототипJobIconQilluне существует в кодовой базе. Создайте соответствующийJobIconQillu-прототип или явно подтвердите намерение оставить Nanotrasen.🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed. In `@Resources/Prototypes/_Lust/Entities/Objects/Misc/centcom_id_cards_qillu.yml` around lines 57 - 59, В прототипе с типом IdCard указан слой состояния Qillu, но поле jobIcon всё ещё ссылается на JobIconNanotrasen, из‑за чего в UI будет показан логотип Nanotrasen вместо Qillu; исправьте это либо создав новый прототип иконки JobIconQillu (реализовать соответствующий прототип и ресурс), либо явно подтвердив намерение оставить Nanotrasen и обновив jobIcon/документацию; смотрите поля jobIcon, JobIconNanotrasen и добавить/зарегистрировать JobIconQillu или заменить значение jobIcon на корректное в записи IdCard.
🤖 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/en-US/_prototypes/_lust/entities/clothing/multiple/towel.ftl`:
- Line 1: Rename the entity key ent-TowelColorQillu to use all lowercase (e.g.,
ent-towelcolorqillu) while keeping the description text capitalized ("Qillu
brand towel"); update the FTL entry so the left-hand entity identifier is
lowercase and the right-hand description remains a sentence starting with a
capital letter to satisfy the /**/_prototypes/**/*.ftl guideline.
In `@Resources/Locale/en-US/_prototypes/_lust/entities/clothing/neck/pins.ftl`:
- Line 1: Change the FTL entity name ent-ClothingNeckQilluPin = Qillu pin so the
right-hand value is lowercase (e.g., "qillu pin") to comply with _prototypes
lowercase rule; also update the corresponding fallback YAML entry's name field
to the same lowercase phrase to keep FTL and YAML in sync, and ensure any .desc
keys remain capitalized sentences if present.
In
`@Resources/Locale/en-US/_prototypes/_lust/entities/structures/wallmounts/signs/flags.ftl`:
- Line 1: The entry ent-QilluFlag uses a capitalized entity name ("Qillu flag");
per _prototypes FTL guidelines the identifier ent-QilluFlag is fine but the
right-hand entity name must be lowercase—change the value to "qillu flag" (and
if you add a description use ent-QilluFlag.desc with a sentence-cased string).
In
`@Resources/Locale/en-US/_prototypes/_lust/entities/structures/wallmounts/signs/posters.ftl`:
- Around line 1-6: Convert the entity keys to lowercase: rename
ent-PosterLegitQilluLogo, ent-PosterLegitQilluTGC, and
ent-PosterLegitQilluVacation to ent-posterlegitqillulogo,
ent-posterlegitquillitgc (or ent-posterlegitqillu_tgc if you prefer underscores
for readability), and ent-posterlegitqilluvacation (or use consistent
separators) in this FTL file; keep the .desc values unchanged except ensure
descriptions still start with a capital letter and update any internal
references to these keys elsewhere in the codebase to match the new lowercase
names (search for the original keys to update usages).
In
`@Resources/Locale/ru-RU/_prototypes/_lust/entities/structures/wallmounts/signs/posters.ftl`:
- Line 6: The Russian text in the .desc entry uses ASCII single quotes around
'Корпоративные привилегии Qillu'; replace those with Russian guillemets so the
phrase reads «Корпоративные привилегии Qillu» to follow Russian typographic
rules, keeping the rest of the sentence intact (reference: .desc string in
posters.ftl).
In `@Resources/migration.yml`:
- Around line 1014-1017: Сейчас ключи сущностей последовательны: BedsheetNTQillu
содержит суффикс NT, а DoubleBedsheetQillu — нет; нужно привести имена к единому
формату: либо переименовать DoubleBedsheetQillu → DoubleBedsheetNTQillu, либо
переименовать BedsheetNTQillu → BedsheetQillu. Выберите один вариант и
последовательно обновите все ссылки: в этом миграционном фрагменте
(BedsheetNTQillu, DoubleBedsheetQillu), в doublebedsheets.yml, в FTL-шаблонах, в
рецептах и во всех местах, где используются эти идентификаторы; убедитесь, что
миграция и данные совпадают с новым именованием и пропустите/обновите все тесты
или ссылки, которые ожидают старое имя.
In `@Resources/Prototypes/_Lust/Entities/Clothing/Multiple/towel.yml`:
- Line 2: The prototype ID TowelColorQillu does not follow the fork-prefix
convention; rename the prototype ID to include your fork prefix (e.g.,
SunriseTowelColorQillu or ScpTowelColorQillu) and update all dependent
references: replace occurrences of TowelColorQillu in other prototypes,
localization keys, migration scripts, and any code or asset references that use
that ID (search for function/class names or keys referencing "TowelColorQillu"
to locate them) so the new ID is consistently used across the project.
In `@Resources/Prototypes/_Lust/Entities/Clothing/Neck/pins.yml`:
- Around line 16-19: This file duplicates the Tag block already declared on the
parent prototype ClothingNeckPinBase (tags WhitelistChameleon and OpenNeck);
remove the redundant "- type: Tag" block (and its tags) from
Resources/Prototypes/_Lust/Entities/Clothing/Neck/pins.yml so the child inherits
the parent's tags without duplication and to avoid future tag shadowing.
In `@Resources/Prototypes/_Lust/Entities/Objects/Misc/handy_flags.yml`:
- Around line 4-5: The YAML fallback 'name: qillu handheld flag' uses lowercase
'q' for the proper noun; update the YAML 'name' value to match the en-US FTL
capitalization ('Qillu handheld flag') so the corporation name 'Qillu' is
capitalized consistently across the YAML fallback (referencing the 'name' key)
and the corresponding en-US FTL entry ('Qillu handheld flag').
- Around line 7-11: The Item component lacks an inhandVisuals block so the flag
won't render in hands; update the Item entry for sprite
"_Lust/Objects/Misc/Handy_Flags/qillu_handy_flag.rsi" to add an inhandVisuals
mapping with left -> state: inhand-left and right -> state: inhand-right (mirror
the RSI states), ensuring the existing Sprite entry remains untouched and only
the Item block is augmented.
In `@Resources/Prototypes/_Lust/Entities/Structures/Wallmounts/Signs/posters.yml`:
- Around line 1-30: Remove unnecessary surrounding quotes from the name and
description fields for PosterLegitQilluLogo, PosterLegitQilluVacation (per
repository rule "Do not use quotes in YAML unless escaping is required") and
ensure the components list indentation matches the other entries (use the
4-space indentation style used by PosterLegitQilluTGC and
PosterLegitQilluVacation); keep quotes on PosterLegitQilluTGC's description
because it contains an apostrophe and therefore requires escaping/quoting.
In `@Resources/Prototypes/_Lust/Loadouts/Miscellaneous/trinkets.yml`:
- Line 3: The prototype ID "ClothingNeckQilluPin" is missing the required fork
prefix; rename the prototype ID to include the Sunrise prefix (e.g.,
"SunriseClothingNeckQilluPin") in the trinkets.yml entry and update every
reference to "ClothingNeckQilluPin" in loadout/startingGear groups and other
locations (there are 7 additional occurrences) so all links point to the new
"SunriseClothingNeckQilluPin" identifier; ensure you update the id field in the
prototype and all matching usage strings to keep names consistent.
In `@Resources/Prototypes/_Sunrise/Catalog/Fills/Crates/nanotrasen.yml`:
- Line 17: Поменяй fork-only prototype ID без префикса на префиксованный
вариант: замени TowelColorQillu на SunriseTowelColorQillu в этом прототипе и в
любых других местах в том же yml (включая связанные записи на тех же участках,
упомянутых в комментарии), затем обнови все ссылки/сериализации/миграционные
скрипты, которые создают или читают этот ID (поиск по символу TowelColorQillu),
чтобы использовать новый SunriseTowelColorQillu и убедиться, что нет конфликтов
с существующими ID.
In `@Resources/Textures/_Lust/Clothing/Multiple/towel.rsi/meta.json`:
- Around line 13-30: В массиве states выровнять отступы: заменить табы на
пробелы в объектах с "name": "iconstripe", "name": "Qillumono" и "name":
"equipped-HELMET" (и проверить соседние записи типа
"equipped-INNERCLOTHING"/"equipped-BELT") чтобы соответствовать стилю остальных
rsi meta.json — использовать те же количество пробелов для вложенности везде.
In `@Resources/Textures/_Lust/Clothing/Neck/Bedsheets/qillu.rsi/meta.json`:
- Around line 9-22: The meta.json for _Lust/Clothing/Neck/Bedsheets/qillu.rsi is
missing the state referenced by BedsheetNTQillu (state: sheetNTqillu), so add a
new state object with "name": "sheetNTqillu" (and appropriate "directions": 4 or
matching other states) to the "states" array in qillu.rsi/meta.json so the
sprite path _Lust/Clothing/Neck/Bedsheets/qillu.rsi can resolve the sheetNTqillu
state for ground rendering; ensure the added state name exactly matches the
state used in BedsheetNTQillu.
In `@Resources/Textures/_Lust/Structures/Wallmounts/flags.rsi/meta.json`:
- Around line 10-12: В этом meta.json значение ключа "name" использует 8
пробелов отступа вместо 6 — выровняйте отступ под остальные файлы в PR:
отступьте строку с "name": "qillu_flag" на 6 пробелов (т.е. сделайте её
одинаковой с прочими meta.json), сохранив ровно ту же содержательную строку без
других изменений.
---
Outside diff comments:
In `@Resources/Prototypes/_Lust/Entities/Objects/Misc/centcom_id_cards_qillu.yml`:
- Around line 57-59: В прототипе с типом IdCard указан слой состояния Qillu, но
поле jobIcon всё ещё ссылается на JobIconNanotrasen, из‑за чего в UI будет
показан логотип Nanotrasen вместо Qillu; исправьте это либо создав новый
прототип иконки JobIconQillu (реализовать соответствующий прототип и ресурс),
либо явно подтвердив намерение оставить Nanotrasen и обновив
jobIcon/документацию; смотрите поля jobIcon, JobIconNanotrasen и
добавить/зарегистрировать JobIconQillu или заменить значение jobIcon на
корректное в записи IdCard.
🪄 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: f6aaf8c0-3eed-4181-b270-35ee192e882c
⛔ Files ignored due to path filters (25)
Resources/Textures/_Lust/Clothing/Multiple/towel.rsi/Qillumono.pngis excluded by!**/*.pngResources/Textures/_Lust/Clothing/Multiple/towel.rsi/equipped-BELT.pngis excluded by!**/*.pngResources/Textures/_Lust/Clothing/Multiple/towel.rsi/equipped-HELMET.pngis excluded by!**/*.pngResources/Textures/_Lust/Clothing/Multiple/towel.rsi/equipped-INNERCLOTHING.pngis excluded by!**/*.pngResources/Textures/_Lust/Clothing/Multiple/towel.rsi/icon.pngis excluded by!**/*.pngResources/Textures/_Lust/Clothing/Multiple/towel.rsi/iconstripe.pngis excluded by!**/*.pngResources/Textures/_Lust/Clothing/Multiple/towel.rsi/inhand-left.pngis excluded by!**/*.pngResources/Textures/_Lust/Clothing/Multiple/towel.rsi/inhand-right.pngis excluded by!**/*.pngResources/Textures/_Lust/Clothing/Neck/Bedsheets/qillu.rsi/equipped-NECK.pngis excluded by!**/*.pngResources/Textures/_Lust/Clothing/Neck/Bedsheets/qillu.rsi/inhand-left.pngis excluded by!**/*.pngResources/Textures/_Lust/Clothing/Neck/Bedsheets/qillu.rsi/inhand-right.pngis excluded by!**/*.pngResources/Textures/_Lust/Clothing/Neck/Misc/pins.rsi/qillu-equipped.pngis excluded by!**/*.pngResources/Textures/_Lust/Clothing/Neck/Misc/pins.rsi/qillu.pngis excluded by!**/*.pngResources/Textures/_Lust/Interface/Misc/job_icons.rsi/Qillu.pngis excluded by!**/*.pngResources/Textures/_Lust/Objects/Misc/Handy_Flags/qillu_handy_flag.rsi/icon.pngis excluded by!**/*.pngResources/Textures/_Lust/Objects/Misc/Handy_Flags/qillu_handy_flag.rsi/inhand-left.pngis excluded by!**/*.pngResources/Textures/_Lust/Objects/Misc/Handy_Flags/qillu_handy_flag.rsi/inhand-right.pngis excluded by!**/*.pngResources/Textures/_Lust/Objects/Misc/doublebedsheets.rsi/sheetcaptain.pngis excluded by!**/*.pngResources/Textures/_Lust/Objects/Misc/doublebedsheets.rsi/sheetcentcom.pngis excluded by!**/*.pngResources/Textures/_Lust/Objects/Misc/doublebedsheets.rsi/sheetqillu.pngis excluded by!**/*.pngResources/Textures/_Lust/Structures/Furniture/Altars/Gods/qillu.rsi/qillu.pngis excluded by!**/*.pngResources/Textures/_Lust/Structures/Wallmounts/flags.rsi/qillu_flag.pngis excluded by!**/*.pngResources/Textures/_Lust/Structures/Wallmounts/posters.rsi/poster1_legit.pngis excluded by!**/*.pngResources/Textures/_Lust/Structures/Wallmounts/posters.rsi/poster2_legit.pngis excluded by!**/*.pngResources/Textures/_Lust/Structures/Wallmounts/posters.rsi/poster3_legit.pngis excluded by!**/*.png
📒 Files selected for processing (48)
Resources/Locale/en-US/_prototypes/_lust/entities/clothing/multiple/towel.ftlResources/Locale/en-US/_prototypes/_lust/entities/clothing/neck/pins.ftlResources/Locale/en-US/_prototypes/_lust/entities/objects/misc/bedsheets.ftlResources/Locale/en-US/_prototypes/_lust/entities/objects/misc/handy_flags.ftlResources/Locale/en-US/_prototypes/_lust/entities/structures/decoration/banners.ftlResources/Locale/en-US/_prototypes/_lust/entities/structures/furniture/altar.ftlResources/Locale/en-US/_prototypes/_lust/entities/structures/wallmounts/signs/flags.ftlResources/Locale/en-US/_prototypes/_lust/entities/structures/wallmounts/signs/posters.ftlResources/Locale/ru-RU/_prototypes/_lust/entities/clothing/multiple/towel.ftlResources/Locale/ru-RU/_prototypes/_lust/entities/clothing/neck/pins.ftlResources/Locale/ru-RU/_prototypes/_lust/entities/objects/misc/bedsheets.ftlResources/Locale/ru-RU/_prototypes/_lust/entities/objects/misc/handy_flags.ftlResources/Locale/ru-RU/_prototypes/_lust/entities/structures/decoration/banners.ftlResources/Locale/ru-RU/_prototypes/_lust/entities/structures/furniture/altar.ftlResources/Locale/ru-RU/_prototypes/_lust/entities/structures/wallmounts/signs/flags.ftlResources/Locale/ru-RU/_prototypes/_lust/entities/structures/wallmounts/signs/posters.ftlResources/Prototypes/Entities/Markers/Spawners/Random/bedsheet.ymlResources/Prototypes/Entities/Structures/Furniture/dresser.ymlResources/Prototypes/Recipes/Lathes/Packs/bedsheets.ymlResources/Prototypes/Recipes/Lathes/Packs/clothing.ymlResources/Prototypes/Roles/Jobs/CentComm/official.ymlResources/Prototypes/Roles/Jobs/Fun/misc_startinggear.ymlResources/Prototypes/_Lust/Entities/Clothing/Multiple/towel.ymlResources/Prototypes/_Lust/Entities/Clothing/Neck/pins.ymlResources/Prototypes/_Lust/Entities/Objects/Misc/bedsheets.ymlResources/Prototypes/_Lust/Entities/Objects/Misc/centcom_id_cards_qillu.ymlResources/Prototypes/_Lust/Entities/Objects/Misc/doublebedsheets.ymlResources/Prototypes/_Lust/Entities/Objects/Misc/handy_flags.ymlResources/Prototypes/_Lust/Entities/Structures/Decoration/banners.ymlResources/Prototypes/_Lust/Entities/Structures/Furniture/altar.ymlResources/Prototypes/_Lust/Entities/Structures/Wallmounts/Signs/flags.ymlResources/Prototypes/_Lust/Entities/Structures/Wallmounts/Signs/posters.ymlResources/Prototypes/_Lust/Loadouts/Miscellaneous/trinkets.ymlResources/Prototypes/_Lust/Recipes/Lathes/bedsheets.ymlResources/Prototypes/_Lust/Recipes/Lathes/clothing.ymlResources/Prototypes/_Sunrise/Catalog/Fills/Crates/nanotrasen.ymlResources/Prototypes/_Sunrise/Loadouts/Pools/Sunrise/Groups/miscellaneous.ymlResources/Prototypes/_Sunrise/Roles/Jobs/PlanetPrison/prison_inspector.ymlResources/Textures/_Lust/Clothing/Multiple/towel.rsi/meta.jsonResources/Textures/_Lust/Clothing/Neck/Bedsheets/qillu.rsi/meta.jsonResources/Textures/_Lust/Clothing/Neck/Misc/pins.rsi/meta.jsonResources/Textures/_Lust/Interface/Misc/job_icons.rsi/meta.jsonResources/Textures/_Lust/Objects/Misc/Handy_Flags/qillu_handy_flag.rsi/meta.jsonResources/Textures/_Lust/Objects/Misc/doublebedsheets.rsi/meta.jsonResources/Textures/_Lust/Structures/Furniture/Altars/Gods/qillu.rsi/meta.jsonResources/Textures/_Lust/Structures/Wallmounts/flags.rsi/meta.jsonResources/Textures/_Lust/Structures/Wallmounts/posters.rsi/meta.jsonResources/migration.yml
Contributor
There was a problem hiding this comment.
Actionable comments posted: 8
♻️ Duplicate comments (2)
Resources/Prototypes/_Lust/Entities/Objects/Misc/handy_flags.yml (1)
10-11:⚠️ Potential issue | 🟡 MinorДобавьте
inhandVisualsвItem, иначе флаг не будет отображаться в руках.На Line 10-11 у
Itemзадан толькоsprite, но нет маппинга состояний для рук. При наличииinhand-left/inhand-rightв RSI это приведёт к отсутствию корректного inhand-рендера.Предлагаемая правка
- type: Item sprite: _Lust/Objects/Misc/Handy_Flags/qillu_handy_flag.rsi + inhandVisuals: + left: + - state: inhand-left + right: + - state: inhand-right🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed. In `@Resources/Prototypes/_Lust/Entities/Objects/Misc/handy_flags.yml` around lines 10 - 11, The Item entry currently only sets sprite ("_Lust/Objects/Misc/Handy_Flags/qillu_handy_flag.rsi") but lacks an inhandVisuals mapping, so add an inhandVisuals block to the Item that maps the inhand-left and inhand-right states (matching the RSI's inhand-left/inhand-right frames) to ensure correct in-hand rendering; update the Item definition named "Item" in handy_flags.yml to include the inhandVisuals keys that reference the appropriate RSI states for left and right hands.Resources/Locale/ru-RU/_prototypes/_lust/entities/structures/wallmounts/signs/posters.ftl (1)
6-6:⚠️ Potential issue | 🟡 MinorЗамените ASCII-кавычки на ёлочные кавычки.
В русской типографике следует использовать «Корпоративные привилегии Qillu» вместо 'Корпоративные привилегии Qillu'.
Предлагаемое исправление
- .desc = На этом информационном плакате представлена информация о некоторых призах, которые можно получить в рамках программы 'Корпоративные привилегии Qillu', включая двухнедельный отпуск на двоих на планете-курорте Идиллус. + .desc = На этом информационном плакате представлена информация о некоторых призах, которые можно получить в рамках программы «Корпоративные привилегии Qillu», включая двухнедельный отпуск на двоих на планете-курорте Идиллус.🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed. In `@Resources/Locale/ru-RU/_prototypes/_lust/entities/structures/wallmounts/signs/posters.ftl` at line 6, The .desc string contains ASCII single quotes around the phrase 'Корпоративные привилегии Qillu'; replace those single quotes with Russian guillemets «Корпоративные привилегии Qillu» in the .desc value so the line reads with proper typographic quotes (keep the rest of the text unchanged and preserve encoding/escaping).
🤖 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/en-US/_prototypes/_lust/entities/objects/misc/bedsheets.ftl`:
- Line 5: The displayed English name for the Centcom bedsheets is misspelled as
"centcomm" and must match the entity IDs; update the string for
ent-BedsheetCentcomQillu to "centcom bedsheet" and likewise update the
corresponding DoubleBedsheetCentcomQillu entry to "double centcom bedsheet" (or
mirror the intended double-bed wording) so the visible names match the IDs and
the Centcom/centcom convention used elsewhere.
- Around line 9-14: The three double-bed entries ent-DoubleBedsheetCaptainQillu,
ent-DoubleBedsheetCentcomQillu and ent-DoubleBedsheetQillu currently use the
same visible names as their single-bed counterparts; update their display name
strings to include the word "double" (e.g., change "captain's bedsheet" to
"captain's double bedsheet", "centcomm bedsheet" to "centcomm double bedsheet",
and "Qillu bedsheet" to "double Qillu bedsheet") so they are distinguishable in
the UI while leaving the .desc lines unchanged.
In
`@Resources/Locale/en-US/_prototypes/_lust/entities/structures/furniture/altar.ftl`:
- Line 1: Поменяй значение строки для ключа ent-AltarQillu на нижний регистр:
замени "Qillu altar" на "qillu altar" в соответствующей en‑US _prototypes
локализации (обнови значение ключа ent-AltarQillu).
In `@Resources/Prototypes/_Lust/Entities/Clothing/Neck/pins.yml`:
- Around line 7-10: В объявлении Sprite ссылающемся на sprite:
_Lust/Clothing/Neck/Misc/pins.rsi уберите избыточный блок layers и перенесите
state: qillu на верхний уровень Sprite (т.е. оставить type: Sprite, sprite: ...
и state: qillu) чтобы упростить объявление и привести стиль в соответствие с
прототипами в Resources/Prototypes/Entities/Clothing/Neck/pins.yml.
In `@Resources/Prototypes/_Lust/Entities/Structures/Decoration/banners.yml`:
- Line 2: The prototype ID "BannerQillu" is missing the required fork prefix;
rename the id to include the fork prefix (e.g., change id BannerQillu to
SunriseBannerQillu) and then update all related references: any ent-* keys that
reference BannerQillu and the migration remap entries that map or migrate this
prototype must be updated to the new SunriseBannerQillu identifier so they
remain in sync.
In `@Resources/Prototypes/_Lust/Entities/Structures/Wallmounts/Signs/posters.yml`:
- Around line 7-10: Приведите отступы в списке components к единому стилю:
заменить 4-пробельные отступы на 2 пробела в блоках с перечислением компонентов
(включая записи с type: Sprite, sprite: _Lust/Structures/Wallmounts/posters.rsi
и state: poster1_legit и другие похожие прототипы), чтобы все элементы списка
components использовали 2 пробела перед дефисом и ключами внутри элемента.
- Line 5: Update the YAML "name" values in the poster prototype so they match
the English localization: change "Qillu logo" to "Qillu Logo", "Qillu tactical
game cards" to "Qillu Tactical Game Cards", and "Qillu corporate perks:
vacation" to "Qillu Corporate Perks: Vacation" in the poster entries (the "name"
keys in
Resources/Prototypes/_Lust/Entities/Structures/Wallmounts/Signs/posters.yml) so
the fallback content exactly matches the en-US localization.
In `@Resources/Prototypes/Recipes/Lathes/Packs/bedsheets.yml`:
- Around line 41-42: В списке прототипов поменяй местами записи
DoubleBedsheetQillu и BedsheetNTQillu так, чтобы BedsheetNTQillu (одиночная
простыня) шла перед DoubleBedsheetQillu (двойная), сохранив форматирование и
комментарии; найди эти идентификаторы в блоке со списком простыней и просто
переставь их строки в обратном порядке.
---
Duplicate comments:
In
`@Resources/Locale/ru-RU/_prototypes/_lust/entities/structures/wallmounts/signs/posters.ftl`:
- Line 6: The .desc string contains ASCII single quotes around the phrase
'Корпоративные привилегии Qillu'; replace those single quotes with Russian
guillemets «Корпоративные привилегии Qillu» in the .desc value so the line reads
with proper typographic quotes (keep the rest of the text unchanged and preserve
encoding/escaping).
In `@Resources/Prototypes/_Lust/Entities/Objects/Misc/handy_flags.yml`:
- Around line 10-11: The Item entry currently only sets sprite
("_Lust/Objects/Misc/Handy_Flags/qillu_handy_flag.rsi") but lacks an
inhandVisuals mapping, so add an inhandVisuals block to the Item that maps the
inhand-left and inhand-right states (matching the RSI's inhand-left/inhand-right
frames) to ensure correct in-hand rendering; update the Item definition named
"Item" in handy_flags.yml to include the inhandVisuals keys that reference the
appropriate RSI states for left and right hands.
🪄 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: f8af1288-4ecd-4600-84b4-7d2592a58a66
📒 Files selected for processing (11)
Resources/Locale/en-US/_prototypes/_lust/entities/clothing/neck/pins.ftlResources/Locale/en-US/_prototypes/_lust/entities/objects/misc/bedsheets.ftlResources/Locale/en-US/_prototypes/_lust/entities/structures/decoration/banners.ftlResources/Locale/en-US/_prototypes/_lust/entities/structures/furniture/altar.ftlResources/Locale/ru-RU/_prototypes/_lust/entities/structures/wallmounts/signs/posters.ftlResources/Prototypes/Recipes/Lathes/Packs/bedsheets.ymlResources/Prototypes/_Lust/Entities/Clothing/Neck/pins.ymlResources/Prototypes/_Lust/Entities/Objects/Misc/handy_flags.ymlResources/Prototypes/_Lust/Entities/Structures/Decoration/banners.ymlResources/Prototypes/_Lust/Entities/Structures/Furniture/altar.ymlResources/Prototypes/_Lust/Entities/Structures/Wallmounts/Signs/posters.yml
Contributor
|
Этот PR содержит конфликты, пожалуйста, разрешите их, прежде чем мы сможем его оценить. |
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
2 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.
Кратное описание
#349
По какой причине
Слава синдикату.
Медиа(Видео/Скриншоты)
Changelog
🆑 Orvex07, Gardsnake
Summary by CodeRabbit
Примечания к выпуску