Добавление взаимодействий с крыльями и фиксы нелогичных взаимодействий #495
Open
Soragy-bot wants to merge 2 commits intospace-sunrise:masterfrom
Open
Добавление взаимодействий с крыльями и фиксы нелогичных взаимодействий #495Soragy-bot wants to merge 2 commits intospace-sunrise:masterfrom
Soragy-bot wants to merge 2 commits intospace-sunrise:masterfrom
Conversation
github-actions
bot
added
Статус: Требует Рассмотрения
size/M
Несортированный
Changes: Localisation
Changes: No C#
and removed
size/M
Несортированный
labels
Contributor
📝 WalkthroughWalkthroughДобавлены шесть новых взаимодействий на основе крыльев с локализацией на английском и русском языках, удалена категория взаимодействий Wings, добавлены ограничения на основе вида для хвоста-ориентированных взаимодействий (исключение Moth/Milira) и обновлены типы условий в существующих взаимодействиях. Changes
Estimated code review effort🎯 3 (Moderate) | ⏱️ ~25 minutes Suggested labels
Poem
🚥 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)
📝 Coding Plan
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: 1
🧹 Nitpick comments (1)
Resources/Prototypes/_Lust/Interactions/wings.yml (1)
17-43: Рекомендация: вынести повторяющийся markingWhitelist с помощью YAML-якорей.Список
markingWhitelistс ~28 записями повторяется 6 раз в файле. При добавлении новых маркировок крыльев придётся обновлять все 6 мест.♻️ Пример рефакторинга с YAML-якорями
В начале файла определить якорь:
.wing_markings: &wing_markings - MiliraWingBasic - MiliraWingBasicOpen - MiliraWingBasicFlight - MothWingsDefault # ... остальные маркировкиЗатем использовать во взаимодействиях:
- !type:HasMarkingCondition checkInitiator: false checkTarget: true markingWhitelist: *wing_markings🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed. In `@Resources/Prototypes/_Lust/Interactions/wings.yml` around lines 17 - 43, The repeated markingWhitelist block should be factored into a YAML anchor and reused; define a single anchor (e.g. &wing_markings) containing the full list of entries shown under markingWhitelist and then replace each repeated markingWhitelist: [...] occurrence with a reference to that anchor (markingWhitelist: *wing_markings) so HasMarkingCondition instances and any other places using markingWhitelist reuse the same list.
🤖 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/_Lust/Interactions/wings.yml`:
- Line 227: The interactions WingsPussyFuck and WingsAssFuck reference an
undefined icon id "WingScratch"; fix by either adding a new interactionIcon
entry with id "WingScratch" to the Interactions icons list (icons.yml) or
updating those interactions to use an existing icon id (e.g., WingKiss,
WingLick, WingStrokeCrotch, or WingsCockFap); ensure the chosen icon id exactly
matches the id used in the interactions and update icons.yml or the interactions
entries accordingly.
---
Nitpick comments:
In `@Resources/Prototypes/_Lust/Interactions/wings.yml`:
- Around line 17-43: The repeated markingWhitelist block should be factored into
a YAML anchor and reused; define a single anchor (e.g. &wing_markings)
containing the full list of entries shown under markingWhitelist and then
replace each repeated markingWhitelist: [...] occurrence with a reference to
that anchor (markingWhitelist: *wing_markings) so HasMarkingCondition instances
and any other places using markingWhitelist reuse the same list.
ℹ️ Review info
⚙️ Run configuration
Configuration used: Path: .coderabbit.yaml
Review profile: CHILL
Plan: Pro
Run ID: f9fbcab9-d8ac-440a-b71b-9d45706af40a
⛔ Files ignored due to path filters (4)
Resources/Textures/_Lust/Interactions/wing_kiss.pngis excluded by!**/*.pngResources/Textures/_Lust/Interactions/wing_lick.pngis excluded by!**/*.pngResources/Textures/_Lust/Interactions/wing_stroke_crotch.pngis excluded by!**/*.pngResources/Textures/_Lust/Interactions/wings_cock_fap.pngis excluded by!**/*.png
📒 Files selected for processing (15)
Resources/Locale/en-US/_lust/interactions/categories.ftlResources/Locale/en-US/_lust/interactions/icons.ftlResources/Locale/en-US/_lust/interactions/interactions.ftlResources/Locale/ru-RU/_lust/interactions/categories.ftlResources/Locale/ru-RU/_lust/interactions/icons.ftlResources/Locale/ru-RU/_lust/interactions/interactions.ftlResources/Prototypes/_Lust/Interactions/anal.ymlResources/Prototypes/_Lust/Interactions/boobs.ymlResources/Prototypes/_Lust/Interactions/butt.ymlResources/Prototypes/_Lust/Interactions/categories.ymlResources/Prototypes/_Lust/Interactions/cock.ymlResources/Prototypes/_Lust/Interactions/icons.ymlResources/Prototypes/_Lust/Interactions/pussy.ymlResources/Prototypes/_Lust/Interactions/wing_interactions.ymlResources/Prototypes/_Lust/Interactions/wings.yml
💤 Files with no reviewable changes (3)
- Resources/Locale/en-US/_lust/interactions/categories.ftl
- Resources/Locale/ru-RU/_lust/interactions/categories.ftl
- Resources/Prototypes/_Lust/Interactions/categories.yml
| - type: interaction | ||
| id: WingsPussyFuck | ||
| name: lust-interaction-WingsPussyFuck | ||
| icon: WingScratch |
Contributor
There was a problem hiding this comment.
Иконка "WingScratch" не определена в icons.yml.
Взаимодействия WingsPussyFuck (строка 227) и WingsAssFuck (строка 298) используют icon: WingScratch, но эта иконка отсутствует в Resources/Prototypes/_Lust/Interactions/icons.yml. Там определены только: WingKiss, WingLick, WingStrokeCrotch, WingsCockFap.
Необходимо добавить WingScratch в icons.yml или использовать существующую иконку.
🔧 Вариант исправления — использовать существующую иконку
- icon: WingScratch
+ icon: WingStrokeCrotchИли добавить новую иконку в icons.yml:
- type: interactionIcon
id: WingScratch
name: lust-interaction-icon-WingScratch📝 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
| icon: WingScratch | |
| icon: WingStrokeCrotch |
🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.
In `@Resources/Prototypes/_Lust/Interactions/wings.yml` at line 227, The
interactions WingsPussyFuck and WingsAssFuck reference an undefined icon id
"WingScratch"; fix by either adding a new interactionIcon entry with id
"WingScratch" to the Interactions icons list (icons.yml) or updating those
interactions to use an existing icon id (e.g., WingKiss, WingLick,
WingStrokeCrotch, or WingsCockFap); ensure the chosen icon id exactly matches
the id used in the interactions and update icons.yml or the interactions entries
accordingly.
Contributor
Author
There was a problem hiding this comment.
Нормально, они в другом PR
Contributor
There was a problem hiding this comment.
@Soragy-bot, понял! Раз WingScratch будет определена в зависимом PR (upstream #4044), всё логично — при мерже в правильном порядке иконка будет доступна. Спасибо за пояснение!
🧠 Learnings used
Learnt from: Orvex07
Repo: space-sunrise/lust-station PR: 442
File: Resources/Prototypes/_Lust/CP/Weapons/hl2_weapons.yml:56-105
Timestamp: 2025-12-31T16:02:40.555Z
Learning: В проекте space-sunrise/lust-station при анализе PR с контентом в директории _Lust/CP необходимо проверять существование прототипов не только в файлах PR, но и в upstream директории _Sunrise, так как _Lust может использовать прототипы оружия, магазинов и других предметов из _Sunrise (например, MagazineMP7 определён в Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml).
Learnt from: Esco-dev
Repo: space-sunrise/lust-station PR: 427
File: Resources/Prototypes/_Sunrise/Roles/Jobs/Command/nanotrasen_representative.yml:7-7
Timestamp: 2025-12-12T08:52:41.391Z
Learning: Сохраняйте комментарий '# Lust Edit' во всех YAML-файлах проекта-ответвления (fork) space-sunrise/lust-station. Эти комментарии помечают fork-специфические изменения по отношению к upstream sunrise-station и используются в системе документации изменений. Они не должны удаляться во время слияний/переносов изменений. При работе с файлами, где встречаются такие комментарии, сохраняйте их, чтобы сохранить контекст форка, и при необходимости добавляйте новые пометки вместо удаления.
Learnt from: Esco-dev
Repo: space-sunrise/lust-station PR: 427
File: Resources/Prototypes/_Sunrise/Roles/Jobs/Command/nanotrasen_representative.yml:7-7
Timestamp: 2025-12-12T08:52:27.300Z
Learning: In the repository space-sunrise/lust-station, preserve any comments that mark fork-specific changes, specifically the marker "#Lust Edit" in YAML files (e.g., Resources/Prototypes/_Sunrise/Roles/Jobs/Command/nanotrasen_representative.yml). These comments are part of the change-documented system relative to the upstream sunrise-station and must not be deleted, merged over, or removed during edits or merges.
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.
Кратное описание
Добавлены уникальные взаимодействия для персонажей с крыльями, а именно Мирил и Моли.
Убраны взаимодействия с хвостом Мирилы и Моли так как у них нет хвоста.
Обязательно мерджить после space-sunrise/sunrise-station#4044
По какой причине
Отсутствие взаимодействий с крыльями. А так, поскольку крылья у Мирил и Моли идут в слот Tail, у них был доступ ко всем взаимодействиям, связанным с хвостами, что нелогично.
Медиа(Видео/Скриншоты)
Можно тут глянуть первую часть: space-sunrise/sunrise-station#4044
Changelog
🆑 Soragy
Summary by CodeRabbit
Новые функции
Исправления ошибок
Реbalancing