Skip to content

feat: Ношение страпона на поясе теперь открывает доступ к взаимодействиям #499

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Soragy-bot wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat: Ношение страпона на поясе теперь открывает доступ к взаимодействиям #499

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions Resources/Prototypes/_Lust/Interactions/toyInteractions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@
- !type:ItemCondition
checkInitiator: true
checkTarget: false
checkEquipped: true
equipmentSlots:
- belt
Comment on lines +12 to +14
Copy link
Contributor

@coderabbitai coderabbitai bot Mar 18, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🔴 Critical

checkEquipped/equipmentSlots не сработают с текущим ItemCondition.

На Line 12-14 и Line 65-67 добавлены поля, которых сейчас нет в ItemCondition (Content.Shared/_Sunrise/InteractionsPanel/Data/Conditions/ItemCondition.cs). Из-за этого belt-проверка не будет применена (или сломает чтение прототипа), и логика останется проверкой предмета только в руках.

Also applies to: 65-67

🤖 Prompt for AI Agents 
Verify each finding against the current code and only fix it if needed.

In `@Resources/Prototypes/_Lust/Interactions/toyInteractions.yml` around lines 12
- 14, The prototype fields checkEquipped and equipmentSlots are not defined in
ItemCondition, so add corresponding properties to
Content.Shared/_Sunrise/InteractionsPanel/Data/Conditions/ItemCondition.cs
(e.g., public bool CheckEquipped { get; set; } and public string[]
EquipmentSlots { get; set; }) and update the condition evaluation (the method
that currently checks the held item, e.g., Matches/Evaluate in ItemCondition)
to, when CheckEquipped is true, search the actor's equipment slots listed in
EquipmentSlots (e.g., "belt") for the item instead of only checking the hand;
ensure proper serialization/attribute annotations so prototype deserialization
succeeds and unknown fields won’t break loading.

itemWhiteList:
- ERPNormalDildo
- ERPDildoAvian
Expand All @@ -18,6 +21,7 @@
- ERPDildoKnot
- ERPDildoTentacle
- PlushieAshito
- ERPStrapOn
- !type:BodyAreaTagCondition
checkInitiator: false
checkTarget: true
Expand Down Expand Up @@ -58,6 +62,9 @@
- !type:ItemCondition
checkInitiator: true
checkTarget: false
checkEquipped: true
equipmentSlots:
- belt
itemWhiteList:
- ERPNormalDildo
- ERPDildoAvian
Expand All @@ -67,6 +74,7 @@
- ERPDildoKnot
- ERPDildoTentacle
- PlushieAshito
- ERPStrapOn
- !type:BodyAreaTagCondition
checkInitiator: false
checkTarget: true
Expand Down Expand Up @@ -208,6 +216,7 @@
- ERPDildoKnot
- ERPDildoTentacle
- PlushieAshito
- ERPStrapOn
Copy link
Contributor

@coderabbitai coderabbitai bot Mar 18, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟠 Major

Для self-dildo взаимодействий belt-гейт не добавлен.

На Line 219 и Line 268 ERPStrapOn добавлен в whitelist, но в этих двух ItemCondition нет checkEquipped: true + equipmentSlots: [belt]. Даже после backend-поддержки слотов self-варианты не откроются при ношении на поясе.

Предложение для обоих self-блоков (`ERPSelftoyPlaceholderDildo*`) 
   - !type:ItemCondition
     checkInitiator: true
     checkTarget: false
+    checkEquipped: true
+    equipmentSlots:
+    - belt
     itemWhiteList:
     - ERPNormalDildo
     - ERPDildoAvian
     - ERPDildoDragon
     - ERPDildoDouble
     - ERPDildoEquine
     - ERPDildoKnot
     - ERPDildoTentacle
     - PlushieAshito
     - ERPStrapOn

Also applies to: 268-268

🤖 Prompt for AI Agents 
Verify each finding against the current code and only fix it if needed.

In `@Resources/Prototypes/_Lust/Interactions/toyInteractions.yml` at line 219, The
whitelist entries include ERPStrapOn for the self-dildo interactions, but the
corresponding ItemCondition blocks for the ERPSelftoyPlaceholderDildo*
interactions are missing the required equipment checks, so self-variants won't
activate when worn on the belt; update each ERPSelftoyPlaceholderDildo*
ItemCondition to include checkEquipped: true and equipmentSlots: [belt] (i.e.,
add these keys to the ItemCondition that references ERPStrapOn) so the self toy
opens when equipped in the belt slot.

interactionMessages:
- "%user вставляет дилдо себе в анал"
- "%user вводит дилдо в свой анал"
Expand Down Expand Up @@ -256,6 +265,7 @@
- ERPDildoKnot
- ERPDildoTentacle
- PlushieAshito
- ERPStrapOn
interactionMessages:
- "%user вставляет дилдо в вагину"
- "%user вводит дилдо в вагину"
Expand Down
Loading