Bodytypes(test version) в доработке на долго - #567
Draft
Fooksy2304 wants to merge 1 commit into
Draft
Fooksy2304 wants to merge 1 commit into
Fooksy2304 wants to merge 1 commit into
Conversation
Fooksy2304
marked this pull request as draft
July 29, 2026 19:05
Contributor
|
RSI Diff Bot; head commit b6a9888 merging into c71339f Resources/Textures/_Lust/Mobs/Species/Human/BodyTypes/apple.rsi
Resources/Textures/_Lust/Mobs/Species/Human/BodyTypes/apple_m.rsi
Resources/Textures/_Lust/Mobs/Species/Human/BodyTypes/breast.rsi
Resources/Textures/_Lust/Mobs/Species/Human/BodyTypes/displacement.rsi
Resources/Textures/_Lust/Mobs/Species/Human/BodyTypes/hourglass.rsi
Resources/Textures/_Lust/Mobs/Species/Human/BodyTypes/hourglass_m.rsi
Resources/Textures/_Lust/Mobs/Species/Human/BodyTypes/pear.rsi
Resources/Textures/_Lust/Mobs/Species/Human/BodyTypes/pear_m.rsi
|
Contributor
📝 WalkthroughWalkthroughДобавлена независимая кастомизация формы тела, груди и ягодиц: параметры профиля сохраняются в БД, редактируются тремя слайдерами и применяются к appearance. Добавлены новые прототипы, спрайты и шейдер для комбинированных displacement-карт в одежде. ChangesКастомизация тела и сохранение
Estimated code review effort: 5 (Critical) | ~90 minutes Suggested labels: Suggested reviewers: Sequence Diagram(s)sequenceDiagram
participant ProfileEditor
participant HumanoidAppearanceSystem
participant ClientClothingSystem
participant DisplacementMapSystem
ProfileEditor->>HumanoidAppearanceSystem: устанавливает BodyType, BreastSize и ButtSize
HumanoidAppearanceSystem->>ClientClothingSystem: передаёт appearance и слои тела
ClientClothingSystem->>DisplacementMapSystem: передаёт разрешённые displacement-карты
DisplacementMapSystem->>ClientClothingSystem: добавляет комбинированные слои шейдера
Important Pre-merge checks failedPlease resolve all errors before merging. Addressing warnings is optional. ❌ Failed checks (1 error, 1 warning, 1 inconclusive)
✅ Passed checks (8 passed)
✨ Finishing Touches 💡 1🛠️ Fix failing CI checks 💡
🧪 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: 12
🤖 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 `@Content.Client/Clothing/ClientClothingSystem.cs`:
- Around line 436-461: Pass the already computed displacementData as the first
argument to TryAddBodyCustomizationDisplacements instead of null, while
preserving the existing shapeDisplacement, breastDisplacement, and
buttDisplacement arguments and fallback behavior. This ensures the base clothing
displacement is combined with body customization in the clothing layering flow.
In `@Content.Client/DisplacementMap/DisplacementMapSystem.cs`:
- Around line 158-190: Set each use{Prefix}Displacement shader flag only after
successfully resolving the corresponding map in the displacement-layer loop.
Ensure missing layerSize and 32x32 fallback maps leave the flag disabled while
preserving the existing error and continue behavior, and remove or avoid the
earlier unconditional flag assignment in the data loop.
In `@Content.Client/Humanoid/HumanoidAppearanceSystem.cs`:
- Around line 88-101: Update the sprite selection logic in SetBodyType so
HumanoidVisualLayers.Chest uses a dedicated chest sprite dictionary rather than
bodyTypeProto.ButtSprites, and HumanoidVisualLayers.Breast resolves only through
the appropriate BreastSprites entry instead of the generic bodyTypeProto.Sprites
fallback. Preserve the existing customization checks and size-based lookup
behavior.
In `@Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs`:
- Around line 2273-2290: UpdateBodyTypes so it checks whether _bodyTypes is
empty before calling _bodyTypes.First(). If no body types remain after filtering
by sex, skip SetBodyType and continue safely to UpdateBodyCustomizationControls;
preserve the existing selection behavior when the list is non-empty.
In
`@Content.Server.Database/Migrations/Postgres/20260729085256_AddBodyCustomization.cs`:
- Around line 8-9: Синхронизируйте временную метку Postgres-миграции
AddBodyCustomization с Sqlite-версией 20260729085231, переименовав файл и
соответствующий класс AddBodyCustomization при необходимости; сохраните
одинаковые имя и timestamp в обеих директориях.
In
`@Content.Server.Database/Migrations/Sqlite/20260729085231_AddBodyCustomization.cs`:
- Around line 13-25: Переименуйте идентификатор SQLite-миграции
AddBodyCustomization с timestamp 20260729085231 на 20260729085256, сохранив имя
миграции без изменений, чтобы он совпадал с PostgreSQL-миграцией и порядок
миграций был синхронизирован.
In `@Content.Server/Database/ServerDbBase.cs`:
- Around line 335-338: Replace the direct casts in the profile conversion chain
for WithBreastSize and WithButtSize with the same Enum.TryParse-based validation
and explicit fallback used by the nearby Sex, Gender, Erp, and Virginity fields.
Ensure invalid database values are normalized immediately to the established
fallback enum values before constructing the profile.
In `@Content.Shared/_Lust/Humanoid/BodyCustomization.cs`:
- Around line 5-24: Добавьте XML-документацию через /// <summary> для BreastSize
и ButtSize в Content.Shared/_Lust/Humanoid/BodyCustomization.cs, описав смысл их
значений; также задокументируйте поля BreastSize/ButtSize в
HumanoidAppearanceComponent.cs и свойства BreastSize/ButtSize в
HumanoidCharacterProfile.cs. Для всех трёх указанных мест используйте краткие
описания назначения API.
In `@Content.Shared/_Sunrise/BodyType.cs`:
- Around line 21-30: Add concise /// <summary> XML documentation for the new
DataField contracts SupportsBodyCustomization, ButtSprites, and
ShapeDisplacement in Content.Shared/_Sunrise/BodyType.cs lines 21-30, and for
SupportsBodyCustomization, BreastSprites, BreastDisplacements, and
ButtDisplacements in Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
lines 63-74; document each public field directly above its declaration.
In `@Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs`:
- Around line 86-99: Защитите fallback в блоке выбора BodyType вокруг
`speciesPrototype.BodyTypes.FirstOrDefault(...)`: не вызывайте `First()` на
пустом списке и обработайте ситуацию, когда все типы запрещены для текущего
пола, без необработанного исключения. Сохраните выбор первого подходящего типа
для валидных прототипов и примените аналогичную защиту в
`HumanoidProfileEditor.UpdateBodyTypes()`.
In `@Resources/Locale/en-US/_lust/_strings/preferences/body-customization.ftl`:
- Around line 9-14: Update the locale validation configuration or supported
suppression mechanism for humanoid-profile-editor-breast-size-aa, -a, -b, -c,
-d, and -dd so these intentionally identical cup-size abbreviations are accepted
as translated. Keep the en-US and ru-RU string values unchanged and ensure the
CI validator no longer reports them as untranslated.
In `@Resources/Locale/ru-RU/_lust/_strings/preferences/body-customization.ftl`:
- Around line 9-14: Update the Russian breast-size localization entries
humanoid-profile-editor-breast-size-aa through
humanoid-profile-editor-breast-size-dd so the locale validator recognizes them
as translated, while preserving the displayed cup-size meanings and the ordering
used by the en-US version.
🪄 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 Plus
Run ID: 0082c045-abcf-46c0-9f00-5728a3b5800f
⛔ Files ignored due to path filters (97)
Resources/Textures/_Lust/Mobs/Species/Human/BodyTypes/apple.rsi/head_f.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/apple.rsi/l_arm.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/apple.rsi/l_foot.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/apple.rsi/l_hand.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/apple.rsi/l_leg_f.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/apple.rsi/r_arm.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/apple.rsi/r_foot.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/apple.rsi/r_hand.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/apple.rsi/r_leg_f.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/apple.rsi/torso_f.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/apple.rsi/torso_f_big.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/apple.rsi/torso_f_fit.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/apple_m.rsi/head_m.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/apple_m.rsi/l_arm.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/apple_m.rsi/l_foot.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/apple_m.rsi/l_hand.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/apple_m.rsi/l_leg.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/apple_m.rsi/r_arm.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/apple_m.rsi/r_foot.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/apple_m.rsi/r_hand.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/apple_m.rsi/r_leg.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/apple_m.rsi/torso_m.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/apple_m.rsi/torso_m_big.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/apple_m.rsi/torso_m_fit.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/breast.rsi/size_0.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/breast.rsi/size_1.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/breast.rsi/size_2.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/breast.rsi/size_3.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/breast.rsi/size_4.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/breast.rsi/size_5.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/breast.rsi/size_6.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/breast.rsi/size_7.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/displacement.rsi/breast_a.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/displacement.rsi/breast_aa.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/displacement.rsi/breast_b.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/displacement.rsi/breast_c.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/displacement.rsi/breast_d.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/displacement.rsi/breast_dd.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/displacement.rsi/breast_e.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/displacement.rsi/breast_f.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/displacement.rsi/butt_athletic.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/displacement.rsi/butt_large.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/displacement.rsi/butt_standard.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/displacement.rsi/shape_apple_f.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/displacement.rsi/shape_apple_m.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/displacement.rsi/shape_hourglass_f.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/displacement.rsi/shape_hourglass_m.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/displacement.rsi/shape_pear_f.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/displacement.rsi/shape_pear_m.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/hourglass.rsi/head_f.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/hourglass.rsi/l_arm.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/hourglass.rsi/l_foot.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/hourglass.rsi/l_hand.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/hourglass.rsi/l_leg_f.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/hourglass.rsi/r_arm.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/hourglass.rsi/r_foot.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/hourglass.rsi/r_hand.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/hourglass.rsi/r_leg_f.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/hourglass.rsi/torso_f.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/hourglass.rsi/torso_f_big.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/hourglass.rsi/torso_f_fit.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/hourglass_m.rsi/head_m.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/hourglass_m.rsi/l_arm.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/hourglass_m.rsi/l_foot.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/hourglass_m.rsi/l_hand.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/hourglass_m.rsi/l_leg.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/hourglass_m.rsi/r_arm.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/hourglass_m.rsi/r_foot.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/hourglass_m.rsi/r_hand.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/hourglass_m.rsi/r_leg.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/hourglass_m.rsi/torso_m.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/hourglass_m.rsi/torso_m_big.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/hourglass_m.rsi/torso_m_fit.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/pear.rsi/head_f.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/pear.rsi/l_arm.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/pear.rsi/l_foot.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/pear.rsi/l_hand.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/pear.rsi/l_leg_f.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/pear.rsi/r_arm.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/pear.rsi/r_foot.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/pear.rsi/r_hand.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/pear.rsi/r_leg_f.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/pear.rsi/torso_f.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/pear.rsi/torso_f_big.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/pear.rsi/torso_f_fit.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/pear_m.rsi/head_m.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/pear_m.rsi/l_arm.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/pear_m.rsi/l_foot.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/pear_m.rsi/l_hand.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/pear_m.rsi/l_leg.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/pear_m.rsi/r_arm.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/pear_m.rsi/r_foot.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/pear_m.rsi/r_hand.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/pear_m.rsi/r_leg.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/pear_m.rsi/torso_m.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/pear_m.rsi/torso_m_big.pngis excluded by!**/*.pngResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/pear_m.rsi/torso_m_fit.pngis excluded by!**/*.png
📒 Files selected for processing (36)
Content.Client/Clothing/ClientClothingSystem.csContent.Client/DisplacementMap/DisplacementMapSystem.csContent.Client/Humanoid/HumanoidAppearanceSystem.csContent.Client/Lobby/UI/HumanoidProfileEditor.xamlContent.Client/Lobby/UI/HumanoidProfileEditor.xaml.csContent.Server.Database/Migrations/Postgres/20260729085256_AddBodyCustomization.Designer.csContent.Server.Database/Migrations/Postgres/20260729085256_AddBodyCustomization.csContent.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.csContent.Server.Database/Migrations/Sqlite/20260729085231_AddBodyCustomization.Designer.csContent.Server.Database/Migrations/Sqlite/20260729085231_AddBodyCustomization.csContent.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.csContent.Server.Database/Model.csContent.Server/Database/ServerDbBase.csContent.Shared/Humanoid/HumanoidAppearanceComponent.csContent.Shared/Humanoid/HumanoidVisualLayers.csContent.Shared/Humanoid/HumanoidVisualLayersExtension.csContent.Shared/Humanoid/Prototypes/SpeciesPrototype.csContent.Shared/Humanoid/SharedHumanoidAppearanceSystem.csContent.Shared/Preferences/HumanoidCharacterProfile.csContent.Shared/_Lust/Humanoid/BodyCustomization.csContent.Shared/_Sunrise/BodyType.csResources/Locale/en-US/_lust/_strings/preferences/body-customization.ftlResources/Locale/ru-RU/_lust/_strings/preferences/body-customization.ftlResources/Prototypes/Entities/Mobs/Species/base.ymlResources/Prototypes/Species/human.ymlResources/Prototypes/_Lust/Shaders/body_displacement.ymlResources/Prototypes/_Lust/Species/human_bodytypes.ymlResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/apple.rsi/meta.jsonResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/apple_m.rsi/meta.jsonResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/breast.rsi/meta.jsonResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/displacement.rsi/meta.jsonResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/hourglass.rsi/meta.jsonResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/hourglass_m.rsi/meta.jsonResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/pear.rsi/meta.jsonResources/Textures/_Lust/Mobs/Species/Human/BodyTypes/pear_m.rsi/meta.jsonResources/Textures/_Lust/Shaders/body_displacement.swsl
Comment on lines
+436
to
461
| // Lust edit start - объединяем до четырёх карт в одном шейдере | ||
| if ((shapeDisplacement is not null | ||
| || breastDisplacement is not null | ||
| || buttDisplacement is not null) | ||
| && _displacement.TryAddBodyCustomizationDisplacements( | ||
| null, | ||
| shapeDisplacement, | ||
| breastDisplacement, | ||
| buttDisplacement, | ||
| (equipee, sprite), | ||
| index, | ||
| key, | ||
| out var bodyDisplacementKeys)) | ||
| { | ||
| foreach (var bodyDisplacementKey in bodyDisplacementKeys) | ||
| revealedLayers.Add(bodyDisplacementKey); | ||
| index += bodyDisplacementKeys.Count; | ||
| } | ||
| else if (displacementData is not null | ||
| && _displacement.TryAddDisplacement(displacementData, (equipee, sprite), index, key, out var displacementKey)) | ||
| { | ||
| revealedLayers.Add(displacementKey); | ||
| index++; | ||
| } | ||
| // Lust edit end | ||
| } |
Contributor
There was a problem hiding this comment.
🎯 Functional Correctness | 🟠 Major | ⚡ Quick win
baseData всегда null — видо-специфичная посадка одежды теряется при активной кастомизации тела.
_displacement.TryAddBodyCustomizationDisplacements(null, shapeDisplacement, breastDisplacement, buttDisplacement, ...) — первым аргументом жёстко передан null, хотя чуть выше уже вычислен displacementData (карта посадки одежды под конкретный вид/пол). И шейдер (useBaseDisplacement), и сама функция явно спроектированы для комбинирования base+shape+breast+butt в одном вызове. Из-за этого для слотов, где кастомизация тела активна (jumpsuit, bra, pants/socks), стандартная видо-специфичная деформация одежды (inventory.Displacements/MaleDisplacements/FemaleDisplacements) просто отбрасывается — одежда рискует «не сесть» на модель.
🐛 Предлагаемый фикс
if ((shapeDisplacement is not null
|| breastDisplacement is not null
|| buttDisplacement is not null)
&& _displacement.TryAddBodyCustomizationDisplacements(
- null,
+ displacementData,
shapeDisplacement,
breastDisplacement,
buttDisplacement,📝 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
| // Lust edit start - объединяем до четырёх карт в одном шейдере | |
| if ((shapeDisplacement is not null | |
| || breastDisplacement is not null | |
| || buttDisplacement is not null) | |
| && _displacement.TryAddBodyCustomizationDisplacements( | |
| null, | |
| shapeDisplacement, | |
| breastDisplacement, | |
| buttDisplacement, | |
| (equipee, sprite), | |
| index, | |
| key, | |
| out var bodyDisplacementKeys)) | |
| { | |
| foreach (var bodyDisplacementKey in bodyDisplacementKeys) | |
| revealedLayers.Add(bodyDisplacementKey); | |
| index += bodyDisplacementKeys.Count; | |
| } | |
| else if (displacementData is not null | |
| && _displacement.TryAddDisplacement(displacementData, (equipee, sprite), index, key, out var displacementKey)) | |
| { | |
| revealedLayers.Add(displacementKey); | |
| index++; | |
| } | |
| // Lust edit end | |
| } | |
| // Lust edit start - объединяем до четырёх карт в одном шейдере | |
| if ((shapeDisplacement is not null | |
| || breastDisplacement is not null | |
| || buttDisplacement is not null) | |
| && _displacement.TryAddBodyCustomizationDisplacements( | |
| displacementData, | |
| shapeDisplacement, | |
| breastDisplacement, | |
| buttDisplacement, | |
| (equipee, sprite), | |
| index, | |
| key, | |
| out var bodyDisplacementKeys)) | |
| { | |
| foreach (var bodyDisplacementKey in bodyDisplacementKeys) | |
| revealedLayers.Add(bodyDisplacementKey); | |
| index += bodyDisplacementKeys.Count; | |
| } | |
| else if (displacementData is not null | |
| && _displacement.TryAddDisplacement(displacementData, (equipee, sprite), index, key, out var displacementKey)) | |
| { | |
| revealedLayers.Add(displacementKey); | |
| index++; | |
| } | |
| // Lust edit end | |
| } |
🤖 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 `@Content.Client/Clothing/ClientClothingSystem.cs` around lines 436 - 461, Pass
the already computed displacementData as the first argument to
TryAddBodyCustomizationDisplacements instead of null, while preserving the
existing shapeDisplacement, breastDisplacement, and buttDisplacement arguments
and fallback behavior. This ensures the base clothing displacement is combined
with body customization in the clothing layering flow.
Comment on lines
+158
to
+190
| var shader = _prototype.Index(BodyDisplacedDrawShader).InstanceUnique(); | ||
| shader.SetParameter("displacementSize", 127f); | ||
| foreach (var (prefix, mapData) in data) | ||
| shader.SetParameter($"use{char.ToUpperInvariant(prefix[0])}{prefix[1..]}Displacement", mapData is not null); | ||
| sprite.Comp.LayerSetShader(index, shader); | ||
|
|
||
| var insertionIndex = index; | ||
| foreach (var (prefix, mapData) in data) | ||
| { | ||
| if (mapData is null) | ||
| continue; | ||
|
|
||
| if (!mapData.SizeMaps.TryGetValue(layerSize, out var map) | ||
| && !mapData.SizeMaps.TryGetValue(EyeManager.PixelsPerMeter, out map)) | ||
| { | ||
| Log.Error($"BODY DISPLACEMENT: {prefix} map for {targetKey} has no 32x32 fallback"); | ||
| continue; | ||
| } | ||
|
|
||
| var displacementLayer = _serialization.CreateCopy(map, notNullableOverride: true); | ||
| displacementLayer.CopyToShaderParameters = new PrototypeCopyToShaderParameters | ||
| { | ||
| LayerKey = targetKey, | ||
| ParameterTexture = $"{prefix}DisplacementMap", | ||
| ParameterUV = $"{prefix}DisplacementUV", | ||
| }; | ||
|
|
||
| var displacementKey = BuildBodyDisplacementLayerKey(key, prefix); | ||
| _sprite.AddLayer(sprite.AsNullable(), displacementLayer, insertionIndex); | ||
| _sprite.LayerMapSet(sprite.AsNullable(), displacementKey, insertionIndex); | ||
| displacementKeys.Add(displacementKey); | ||
| insertionIndex++; | ||
| } |
Contributor
There was a problem hiding this comment.
🎯 Functional Correctness | 🟠 Major | ⚡ Quick win
Флаги use*Displacement выставляются раньше, чем подтверждено наличие карты.
Цикл на строках 160-161 включает use{Prefix}Displacement для любого непустого DisplacementData?, а фактическое добавление слоя чуть ниже (170-175) может continue, если у карты нет ни layerSize, ни fallback 32×32 (Log.Error + continue). В этом случае шейдер получит useXDisplacement = true, но без забинженного xDisplacementMap/xDisplacementUV — в body_displacement.swsl это декодируется как смещение ≈(-1,-1)*127px, т.е. заметный визуальный артефакт вместо тихого отключения слоя. Для сравнения, старый TryAddDisplacement в этом же файле делает ранний return false при отсутствии карты 32×32, не успевая тронуть шейдер.
🐛 Предлагаемый фикс — выставлять флаг только после успешного резолва карты
var shader = _prototype.Index(BodyDisplacedDrawShader).InstanceUnique();
shader.SetParameter("displacementSize", 127f);
- foreach (var (prefix, mapData) in data)
- shader.SetParameter($"use{char.ToUpperInvariant(prefix[0])}{prefix[1..]}Displacement", mapData is not null);
sprite.Comp.LayerSetShader(index, shader);
var insertionIndex = index;
foreach (var (prefix, mapData) in data)
{
if (mapData is null)
+ {
+ shader.SetParameter($"use{char.ToUpperInvariant(prefix[0])}{prefix[1..]}Displacement", false);
continue;
+ }
if (!mapData.SizeMaps.TryGetValue(layerSize, out var map)
&& !mapData.SizeMaps.TryGetValue(EyeManager.PixelsPerMeter, out map))
{
Log.Error($"BODY DISPLACEMENT: {prefix} map for {targetKey} has no 32x32 fallback");
+ shader.SetParameter($"use{char.ToUpperInvariant(prefix[0])}{prefix[1..]}Displacement", false);
continue;
}
+ shader.SetParameter($"use{char.ToUpperInvariant(prefix[0])}{prefix[1..]}Displacement", true);
var displacementLayer = _serialization.CreateCopy(map, notNullableOverride: true);📝 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
| var shader = _prototype.Index(BodyDisplacedDrawShader).InstanceUnique(); | |
| shader.SetParameter("displacementSize", 127f); | |
| foreach (var (prefix, mapData) in data) | |
| shader.SetParameter($"use{char.ToUpperInvariant(prefix[0])}{prefix[1..]}Displacement", mapData is not null); | |
| sprite.Comp.LayerSetShader(index, shader); | |
| var insertionIndex = index; | |
| foreach (var (prefix, mapData) in data) | |
| { | |
| if (mapData is null) | |
| continue; | |
| if (!mapData.SizeMaps.TryGetValue(layerSize, out var map) | |
| && !mapData.SizeMaps.TryGetValue(EyeManager.PixelsPerMeter, out map)) | |
| { | |
| Log.Error($"BODY DISPLACEMENT: {prefix} map for {targetKey} has no 32x32 fallback"); | |
| continue; | |
| } | |
| var displacementLayer = _serialization.CreateCopy(map, notNullableOverride: true); | |
| displacementLayer.CopyToShaderParameters = new PrototypeCopyToShaderParameters | |
| { | |
| LayerKey = targetKey, | |
| ParameterTexture = $"{prefix}DisplacementMap", | |
| ParameterUV = $"{prefix}DisplacementUV", | |
| }; | |
| var displacementKey = BuildBodyDisplacementLayerKey(key, prefix); | |
| _sprite.AddLayer(sprite.AsNullable(), displacementLayer, insertionIndex); | |
| _sprite.LayerMapSet(sprite.AsNullable(), displacementKey, insertionIndex); | |
| displacementKeys.Add(displacementKey); | |
| insertionIndex++; | |
| } | |
| var shader = _prototype.Index(BodyDisplacedDrawShader).InstanceUnique(); | |
| shader.SetParameter("displacementSize", 127f); | |
| sprite.Comp.LayerSetShader(index, shader); | |
| var insertionIndex = index; | |
| foreach (var (prefix, mapData) in data) | |
| { | |
| if (mapData is null) | |
| { | |
| shader.SetParameter($"use{char.ToUpperInvariant(prefix[0])}{prefix[1..]}Displacement", false); | |
| continue; | |
| } | |
| if (!mapData.SizeMaps.TryGetValue(layerSize, out var map) | |
| && !mapData.SizeMaps.TryGetValue(EyeManager.PixelsPerMeter, out map)) | |
| { | |
| Log.Error($"BODY DISPLACEMENT: {prefix} map for {targetKey} has no 32x32 fallback"); | |
| shader.SetParameter($"use{char.ToUpperInvariant(prefix[0])}{prefix[1..]}Displacement", false); | |
| continue; | |
| } | |
| shader.SetParameter($"use{char.ToUpperInvariant(prefix[0])}{prefix[1..]}Displacement", true); | |
| var displacementLayer = _serialization.CreateCopy(map, notNullableOverride: true); | |
| displacementLayer.CopyToShaderParameters = new PrototypeCopyToShaderParameters | |
| { | |
| LayerKey = targetKey, | |
| ParameterTexture = $"{prefix}DisplacementMap", | |
| ParameterUV = $"{prefix}DisplacementUV", | |
| }; | |
| var displacementKey = BuildBodyDisplacementLayerKey(key, prefix); | |
| _sprite.AddLayer(sprite.AsNullable(), displacementLayer, insertionIndex); | |
| _sprite.LayerMapSet(sprite.AsNullable(), displacementKey, insertionIndex); | |
| displacementKeys.Add(displacementKey); | |
| insertionIndex++; | |
| } |
🤖 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 `@Content.Client/DisplacementMap/DisplacementMapSystem.cs` around lines 158 -
190, Set each use{Prefix}Displacement shader flag only after successfully
resolving the corresponding map in the displacement-layer loop. Ensure missing
layerSize and 32x32 fallback maps leave the flag disabled while preserving the
existing error and continue behavior, and remove or avoid the earlier
unconditional flag assignment in the data loop.
Comment on lines
+88
to
+101
| // Lust edit start - грудь и ягодицы выбираются независимо от формы тела | ||
| var id = defaultId; | ||
| if (bodyTypeProto.SupportsBodyCustomization | ||
| && key == HumanoidVisualLayers.Chest | ||
| && bodyTypeProto.ButtSprites.TryGetValue(component.ButtSize, out var buttSprite)) | ||
| { | ||
| id = buttSprite; | ||
| } | ||
| else if (bodyTypeProto.SupportsBodyCustomization | ||
| && key == HumanoidVisualLayers.Breast | ||
| && speciesProto.BreastSprites.TryGetValue(component.BreastSize, out var breastSprite)) | ||
| { | ||
| id = breastSprite; | ||
| } |
Contributor
There was a problem hiding this comment.
🎯 Functional Correctness | 🟡 Minor | ⚡ Quick win
🧩 Analysis chain
🏁 Script executed:
#!/bin/bash
rg -n "Chest|Breast|ButtSprites|BreastSprites" -g '*.cs' Content.Shared/Humanoid Content.Shared/_Sunrise 2>/dev/nullRepository: space-sunrise/lust-station
Length of output: 1780
🏁 Script executed:
#!/bin/bash
set -e
echo "== HumanoidVisualLayers.cs =="
cat -n Content.Shared/Humanoid/HumanoidVisualLayers.cs | sed -n '1,80p'
echo
echo "== HumanoidVisualLayersExtension.cs relevant =="
cat -n Content.Shared/Humanoid/HumanoidVisualLayersExtension.cs | sed -n '1,120p'
echo
echo "== SharedHumanoidAppearanceSystem.cs referenced section =="
cat -n Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs | sed -n '70,115p'
echo
echo "== BodyType extension around sprites =="
cat -n Content.Shared/_Sunrise/BodyType.cs | sed -n '1,70p'
echo
echo "== search HumanoidVisualLayers usage in Shared =="
rg -n "HumanoidVisualLayers\\.(Chest|Breast|Butt)|ChestSprites|ButtSprites|BreastSprites" Content.Shared -g '*.cs'Repository: space-sunrise/lust-station
Length of output: 11616
Исправить выбор спрайтов для слоёв груди.
HumanoidVisualLayers.Chest соответствует торсу (BodyPartType.Torso), а HumanoidVisualLayers.Breast — добавлен как отдельный слой груди. В SetBodyType() слой Chest не должен принимать bodyTypeProto.ButtSprites, а грудь нельзя отображать из общего базового спрайта bodyTypeProto.Sprites; добавьте/используйте отдельную справочник для Chest и выберите корректный спрайт для BreastSprites.
🤖 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 `@Content.Client/Humanoid/HumanoidAppearanceSystem.cs` around lines 88 - 101,
Update the sprite selection logic in SetBodyType so HumanoidVisualLayers.Chest
uses a dedicated chest sprite dictionary rather than bodyTypeProto.ButtSprites,
and HumanoidVisualLayers.Breast resolves only through the appropriate
BreastSprites entry instead of the generic bodyTypeProto.Sprites fallback.
Preserve the existing customization checks and size-based lookup behavior.
Comment on lines
2273
to
2290
| private void UpdateBodyTypes() | ||
| { | ||
| if (Profile is null) | ||
| return; | ||
|
|
||
| CBodyTypesButton.Clear(); | ||
| var species = _prototypeManager.Index(Profile.Species); | ||
| var sex = Profile.Sex; | ||
| _bodyTypes = species.BodyTypes.Select(protoId => _prototypeManager.Index<BodyTypePrototype>(protoId)) | ||
| .Where(proto => !proto.SexRestrictions.Contains(sex.ToString())) | ||
| .ToList(); | ||
|
|
||
| for (var i = 0; i < _bodyTypes.Count; i++) | ||
| { | ||
| CBodyTypesButton.AddItem(Loc.GetString(_bodyTypes[i].Name), i); | ||
| } | ||
|
|
||
| if (!_bodyTypes.Select(proto => proto.ID).Contains(Profile.BodyType)) | ||
| { | ||
| SetBodyType(_bodyTypes.First().ID); | ||
| } | ||
|
|
||
| CBodyTypesButton.Select(_bodyTypes.FindIndex(x => x.ID == Profile.BodyType)); | ||
| UpdateBodyCustomizationControls(species); // Lust added | ||
| } |
Contributor
There was a problem hiding this comment.
🩺 Stability & Availability | 🟡 Minor | ⚡ Quick win
_bodyTypes.First() без проверки на пустой список.
Если после фильтрации species.BodyTypes по SexRestrictions для текущего пола не останется ни одного элемента (например, вид сконфигурирован неверно), _bodyTypes.First() бросит InvalidOperationException прямо в редакторе профиля — до того, как сработает проверка _bodyTypes.Count == 0 в UpdateBodyCustomizationControls, которая идёт уже после.
🛡️ Пример защиты
_bodyTypes = species.BodyTypes.Select(protoId => _prototypeManager.Index<BodyTypePrototype>(protoId))
.Where(proto => !proto.SexRestrictions.Contains(sex.ToString()))
.ToList();
- if (!_bodyTypes.Select(proto => proto.ID).Contains(Profile.BodyType))
+ if (_bodyTypes.Count == 0)
+ {
+ _sawmill.Error($"У вида {species.ID} нет BodyTypes, доступных для пола {sex}");
+ }
+ else if (!_bodyTypes.Select(proto => proto.ID).Contains(Profile.BodyType))
{
SetBodyType(_bodyTypes.First().ID);
}Тот же паттерн — в SharedHumanoidAppearanceSystem.SetBodyType, см. консолидированный комментарий.
📝 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
| private void UpdateBodyTypes() | |
| { | |
| if (Profile is null) | |
| return; | |
| CBodyTypesButton.Clear(); | |
| var species = _prototypeManager.Index(Profile.Species); | |
| var sex = Profile.Sex; | |
| _bodyTypes = species.BodyTypes.Select(protoId => _prototypeManager.Index<BodyTypePrototype>(protoId)) | |
| .Where(proto => !proto.SexRestrictions.Contains(sex.ToString())) | |
| .ToList(); | |
| for (var i = 0; i < _bodyTypes.Count; i++) | |
| { | |
| CBodyTypesButton.AddItem(Loc.GetString(_bodyTypes[i].Name), i); | |
| } | |
| if (!_bodyTypes.Select(proto => proto.ID).Contains(Profile.BodyType)) | |
| { | |
| SetBodyType(_bodyTypes.First().ID); | |
| } | |
| CBodyTypesButton.Select(_bodyTypes.FindIndex(x => x.ID == Profile.BodyType)); | |
| UpdateBodyCustomizationControls(species); // Lust added | |
| } | |
| private void UpdateBodyTypes() | |
| { | |
| if (Profile is null) | |
| return; | |
| var species = _prototypeManager.Index(Profile.Species); | |
| var sex = Profile.Sex; | |
| _bodyTypes = species.BodyTypes.Select(protoId => _prototypeManager.Index<BodyTypePrototype>(protoId)) | |
| .Where(proto => !proto.SexRestrictions.Contains(sex.ToString())) | |
| .ToList(); | |
| if (_bodyTypes.Count == 0) | |
| { | |
| _sawmill.Error($"У вида {species.ID} нет BodyTypes, доступных для пола {sex}"); | |
| } | |
| else if (!_bodyTypes.Select(proto => proto.ID).Contains(Profile.BodyType)) | |
| { | |
| SetBodyType(_bodyTypes.First().ID); | |
| } | |
| UpdateBodyCustomizationControls(species); // Lust added | |
| } |
🤖 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 `@Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs` around lines 2273 -
2290, UpdateBodyTypes so it checks whether _bodyTypes is empty before calling
_bodyTypes.First(). If no body types remain after filtering by sex, skip
SetBodyType and continue safely to UpdateBodyCustomizationControls; preserve the
existing selection behavior when the list is non-empty.
Comment on lines
+8
to
+9
| public partial class AddBodyCustomization : Migration | ||
| { |
Contributor
There was a problem hiding this comment.
🗄️ Data Integrity & Integration | 🟡 Minor | ⚡ Quick win
Таймштамп миграции не совпадает с Sqlite-версией.
Postgres-миграция имеет метку 20260729085256, а Sqlite-контрагент (20260729085231_AddBodyCustomization) — 20260729085231. Имя класса совпадает, но метки отличаются на 25 секунд.
As per coding guidelines: "Migration files must be created with matching timestamps and names in both the Migrations/Sqlite and Migrations/Postgres directories to keep database schemas in sync across both engines."
🤖 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
`@Content.Server.Database/Migrations/Postgres/20260729085256_AddBodyCustomization.cs`
around lines 8 - 9, Синхронизируйте временную метку Postgres-миграции
AddBodyCustomization с Sqlite-версией 20260729085231, переименовав файл и
соответствующий класс AddBodyCustomization при необходимости; сохраните
одинаковые имя и timestamp в обеих директориях.
Source: Coding guidelines
Comment on lines
+5
to
+24
| [Serializable, NetSerializable] | ||
| public enum BreastSize : byte | ||
| { | ||
| AA, | ||
| A, | ||
| B, | ||
| C, | ||
| D, | ||
| DD, | ||
| E, | ||
| F, | ||
| } | ||
|
|
||
| [Serializable, NetSerializable] | ||
| public enum ButtSize : byte | ||
| { | ||
| Athletic, | ||
| Standard, | ||
| Large, | ||
| } |
Contributor
There was a problem hiding this comment.
📐 Maintainability & Code Quality | 🔵 Trivial | ⚡ Quick win
Новый публичный API BreastSize/ButtSize без XML-документации. Во всех трёх местах, где определяется или объявляется новая публичная кастомизация тела, отсутствуют /// <summary>-комментарии — единая причина, единое исправление.
Content.Shared/_Lust/Humanoid/BodyCustomization.cs#L5-L24: добавить/// <summary>к enumBreastSizeиButtSize, кратко описав семантику значений.Content.Shared/Humanoid/HumanoidAppearanceComponent.cs#L111-L118: добавить/// <summary>к полямBreastSize/ButtSizeкомпонента.Content.Shared/Preferences/HumanoidCharacterProfile.cs#L115-L122: добавить/// <summary>к[DataField]-свойствамBreastSize/ButtSizeпрофиля.
As per coding guidelines: "Each public field in a component must have XML documentation with a ///
/// <summary> as the main documentation format in C# and SWSL code".
📍 Affects 3 files
Content.Shared/_Lust/Humanoid/BodyCustomization.cs#L5-L24(this comment)Content.Shared/Humanoid/HumanoidAppearanceComponent.cs#L111-L118Content.Shared/Preferences/HumanoidCharacterProfile.cs#L115-L122
🤖 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 `@Content.Shared/_Lust/Humanoid/BodyCustomization.cs` around lines 5 - 24,
Добавьте XML-документацию через /// <summary> для BreastSize и ButtSize в
Content.Shared/_Lust/Humanoid/BodyCustomization.cs, описав смысл их значений;
также задокументируйте поля BreastSize/ButtSize в HumanoidAppearanceComponent.cs
и свойства BreastSize/ButtSize в HumanoidCharacterProfile.cs. Для всех трёх
указанных мест используйте краткие описания назначения API.
Source: Coding guidelines
Comment on lines
+21
to
+30
|
|
||
| // Lust added start - независимая кастомизация фигуры человека | ||
| [DataField] | ||
| public bool SupportsBodyCustomization; | ||
|
|
||
| [DataField] | ||
| public Dictionary<ButtSize, string> ButtSprites = new(); | ||
|
|
||
| [DataField] | ||
| public DisplacementData? ShapeDisplacement; |
Contributor
There was a problem hiding this comment.
📐 Maintainability & Code Quality | 🟠 Major | ⚡ Quick win
Добавьте XML-документацию ко всем новым DataField-контрактам.
В обоих прототипах добавлены публичные сериализуемые поля без /// <summary>. Добавьте краткие описания каждого нового поля:
Content.Shared/_Sunrise/BodyType.cs#L21-L30: документироватьSupportsBodyCustomization,ButtSpritesиShapeDisplacement.Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs#L63-L74: документироватьSupportsBodyCustomization,BreastSprites,BreastDisplacementsиButtDisplacements.
As per coding guidelines: публичные API и DataField-контракты должны документироваться через /// <summary>.
📍 Affects 2 files
Content.Shared/_Sunrise/BodyType.cs#L21-L30(this comment)Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs#L63-L74
🤖 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 `@Content.Shared/_Sunrise/BodyType.cs` around lines 21 - 30, Add concise ///
<summary> XML documentation for the new DataField contracts
SupportsBodyCustomization, ButtSprites, and ShapeDisplacement in
Content.Shared/_Sunrise/BodyType.cs lines 21-30, and for
SupportsBodyCustomization, BreastSprites, BreastDisplacements, and
ButtDisplacements in Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
lines 63-74; document each public field directly above its declaration.
Source: Coding guidelines
Comment on lines
+86
to
+99
| if (speciesPrototype.BodyTypes.Contains(bodyType) | ||
| && _proto.TryIndex<BodyTypePrototype>(bodyType, out var bodyTypePrototype) | ||
| && !bodyTypePrototype.SexRestrictions.Contains(humanoid.Sex.ToString())) | ||
| { | ||
| humanoid.BodyType = bodyType; | ||
| } | ||
| else | ||
| humanoid.BodyType = speciesPrototype.BodyTypes.First(); | ||
| { | ||
| // Lust edit - при смене пола Futanari получает женский набор, Male — мужской | ||
| humanoid.BodyType = speciesPrototype.BodyTypes | ||
| .FirstOrDefault(id => _proto.TryIndex<BodyTypePrototype>(id, out var prototype) | ||
| && !prototype.SexRestrictions.Contains(humanoid.Sex.ToString())) | ||
| ?? speciesPrototype.BodyTypes.First(); | ||
| } |
Contributor
There was a problem hiding this comment.
🩺 Stability & Availability | 🟡 Minor | ⚡ Quick win
Незащищённый .First() в конце фолбэка может уронить клиента/сервер.
Если для humanoid.Sex все элементы speciesPrototype.BodyTypes окажутся в SexRestrictions (или сам список пуст из-за некорректного прототипа вида), FirstOrDefault(...) вернёт null, а следующий speciesPrototype.BodyTypes.First() бросит InvalidOperationException — необработанное исключение при загрузке профиля/смене пола.
🛡️ Пример защиты
- humanoid.BodyType = speciesPrototype.BodyTypes
- .FirstOrDefault(id => _proto.TryIndex<BodyTypePrototype>(id, out var prototype)
- && !prototype.SexRestrictions.Contains(humanoid.Sex.ToString()))
- ?? speciesPrototype.BodyTypes.First();
+ var fallback = speciesPrototype.BodyTypes
+ .FirstOrDefault(id => _proto.TryIndex<BodyTypePrototype>(id, out var prototype)
+ && !prototype.SexRestrictions.Contains(humanoid.Sex.ToString()))
+ ?? speciesPrototype.BodyTypes.FirstOrDefault();
+ if (fallback == default)
+ {
+ Log.Error($"SetBodyType: у вида {humanoid.Species} нет доступных BodyTypes");
+ return;
+ }
+ humanoid.BodyType = fallback;Тот же паттерн повторяется в HumanoidProfileEditor.xaml.cs → UpdateBodyTypes(), см. консолидированный комментарий.
📝 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
| if (speciesPrototype.BodyTypes.Contains(bodyType) | |
| && _proto.TryIndex<BodyTypePrototype>(bodyType, out var bodyTypePrototype) | |
| && !bodyTypePrototype.SexRestrictions.Contains(humanoid.Sex.ToString())) | |
| { | |
| humanoid.BodyType = bodyType; | |
| } | |
| else | |
| humanoid.BodyType = speciesPrototype.BodyTypes.First(); | |
| { | |
| // Lust edit - при смене пола Futanari получает женский набор, Male — мужской | |
| humanoid.BodyType = speciesPrototype.BodyTypes | |
| .FirstOrDefault(id => _proto.TryIndex<BodyTypePrototype>(id, out var prototype) | |
| && !prototype.SexRestrictions.Contains(humanoid.Sex.ToString())) | |
| ?? speciesPrototype.BodyTypes.First(); | |
| } | |
| if (speciesPrototype.BodyTypes.Contains(bodyType) | |
| && _proto.TryIndex<BodyTypePrototype>(bodyType, out var bodyTypePrototype) | |
| && !bodyTypePrototype.SexRestrictions.Contains(humanoid.Sex.ToString())) | |
| { | |
| humanoid.BodyType = bodyType; | |
| } | |
| else | |
| { | |
| // Lust edit - при смене пола Futanari получает женский набор, Male — мужской | |
| var fallback = speciesPrototype.BodyTypes | |
| .FirstOrDefault(id => _proto.TryIndex<BodyTypePrototype>(id, out var prototype) | |
| && !prototype.SexRestrictions.Contains(humanoid.Sex.ToString())) | |
| ?? speciesPrototype.BodyTypes.FirstOrDefault(); | |
| if (fallback == default) | |
| { | |
| Log.Error($"SetBodyType: у вида {humanoid.Species} нет доступных BodyTypes"); | |
| return; | |
| } | |
| humanoid.BodyType = fallback; | |
| } |
🤖 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 `@Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs` around lines 86 -
99, Защитите fallback в блоке выбора BodyType вокруг
`speciesPrototype.BodyTypes.FirstOrDefault(...)`: не вызывайте `First()` на
пустом списке и обработайте ситуацию, когда все типы запрещены для текущего
пола, без необработанного исключения. Сохраните выбор первого подходящего типа
для валидных прототипов и примените аналогичную защиту в
`HumanoidProfileEditor.UpdateBodyTypes()`.
Comment on lines
+9
to
+14
| humanoid-profile-editor-breast-size-aa = AA | ||
| humanoid-profile-editor-breast-size-a = A | ||
| humanoid-profile-editor-breast-size-b = B | ||
| humanoid-profile-editor-breast-size-c = C | ||
| humanoid-profile-editor-breast-size-d = D | ||
| humanoid-profile-editor-breast-size-dd = DD |
Contributor
There was a problem hiding this comment.
🎯 Functional Correctness | 🟠 Major | ⚡ Quick win
Locale Validator валит пайплайн: строки помечены как «untranslated».
humanoid-profile-editor-breast-size-aa/a/b/c/d/dd — идентичны по содержимому en-US и ru-RU версии (латинские буквы размеров чашки одинаковы в обоих языках), из-за чего валидатор считает их непереведёнными. Нужно либо явно пометить эти строки как допустимо идентичные (если такой механизм в валидаторе есть), либо согласовать с CI-конфигом исключение для таких аббревиатур — иначе PR не пройдёт пайплайн.
🧰 Tools
🪛 GitHub Actions: Locale Validator / Validate Locales
[error] 9-9: Untranslated string: "humanoid-profile-editor-breast-size-aa". humanoid-profile-editor-breast-size-aa = AA
[error] 10-10: Untranslated string: "humanoid-profile-editor-breast-size-a". humanoid-profile-editor-breast-size-a = A
[error] 11-11: Untranslated string: "humanoid-profile-editor-breast-size-b". humanoid-profile-editor-breast-size-b = B
[error] 12-12: Untranslated string: "humanoid-profile-editor-breast-size-c". humanoid-profile-editor-breast-size-c = C
[error] 13-13: Untranslated string: "humanoid-profile-editor-breast-size-d". humanoid-profile-editor-breast-size-d = D
[error] 14-14: Untranslated string: "humanoid-profile-editor-breast-size-dd". humanoid-profile-editor-breast-size-dd = DD
🤖 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/en-US/_lust/_strings/preferences/body-customization.ftl`
around lines 9 - 14, Update the locale validation configuration or supported
suppression mechanism for humanoid-profile-editor-breast-size-aa, -a, -b, -c,
-d, and -dd so these intentionally identical cup-size abbreviations are accepted
as translated. Keep the en-US and ru-RU string values unchanged and ensure the
CI validator no longer reports them as untranslated.
Source: Pipeline failures
Comment on lines
+9
to
+14
| humanoid-profile-editor-breast-size-aa = AA | ||
| humanoid-profile-editor-breast-size-a = A | ||
| humanoid-profile-editor-breast-size-b = B | ||
| humanoid-profile-editor-breast-size-c = C | ||
| humanoid-profile-editor-breast-size-d = D | ||
| humanoid-profile-editor-breast-size-dd = DD |
Contributor
There was a problem hiding this comment.
🎯 Functional Correctness | 🟠 Major | ⚡ Quick win
Locale Validator валит пайплайн: строки помечены как «untranslated» (см. также en-US версию).
Причина та же: аббревиатуры размеров чашки (AA, A, B, C, D, DD) идентичны в обоих языках, и валидатор трактует это как непереведённый текст.
🧰 Tools
🪛 GitHub Actions: Locale Validator / Validate Locales
[error] 9-9: Untranslated string: "humanoid-profile-editor-breast-size-aa". humanoid-profile-editor-breast-size-aa = AA
[error] 10-10: Untranslated string: "humanoid-profile-editor-breast-size-a". humanoid-profile-editor-breast-size-a = A
[error] 11-11: Untranslated string: "humanoid-profile-editor-breast-size-b". humanoid-profile-editor-breast-size-b = B
[error] 12-12: Untranslated string: "humanoid-profile-editor-breast-size-c". humanoid-profile-editor-breast-size-c = C
[error] 13-13: Untranslated string: "humanoid-profile-editor-breast-size-d". humanoid-profile-editor-breast-size-d = D
[error] 14-14: Untranslated string: "humanoid-profile-editor-breast-size-dd". humanoid-profile-editor-breast-size-dd = DD
🤖 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/_lust/_strings/preferences/body-customization.ftl`
around lines 9 - 14, Update the Russian breast-size localization entries
humanoid-profile-editor-breast-size-aa through
humanoid-profile-editor-breast-size-dd so the locale validator recognizes them
as translated, while preserving the displayed cup-size meanings and the ordering
used by the en-US version.
Source: Pipeline failures
Contributor
|
Этот PR содержит конфликты, пожалуйста, разрешите их, прежде чем мы сможем его оценить. |
Member
|
богу стыдно |
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.
Краткое описание
Ссылка на багрепорт/Предложение
Медиа (Видео/Скриншоты)
Changelog
🆑 ВАШЕ_ИМЯ
Summary by CodeRabbit