Skip to content

Новые веночки. #2610

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
Munsik-dev wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Новые веночки. #2610

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bf0cddb
wreath
Munsik-dev Mar 11, 2026
7a5408f
Update trinkets.yml
Munsik-dev Mar 11, 2026
1de32a3
Merge branch 'master' into new-wreath
Darkiich Mar 11, 2026
f41a5ca
Изменение локализации
Munsik-dev Mar 11, 2026
543e4f5
Фикс
Munsik-dev Mar 11, 2026
5087bb2
Merge branch 'master' into new-wreath
Darkiich Mar 19, 2026
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
8 changes: 8 additions & 0 deletions Resources/Locale/ru-RU/ADT/clothing/misc.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
ent-ADTClothingHeadHatBlackroseFlowerWreath = венок из черных роз
.desc = Венок из черных роз, переплетенных темной зеленью.
ent-ADTClothingHeadHatMacFlowerWreath = маковый венок
.desc = Венок сплетенный из алых маков, переплетенных между собой.
ent-ADTClothingHeadHatDandelionFlowerWreath = солнечный венок
.desc = Венок из ярко-желтых одуванчиков, плотно прилегающих друг к другу.
ent-ADTClothingHeadHatRoseFlowerWreath = венок из красных роз
.desc = Венок из красных роз с бархатистыми лепестками и темно-зелеными листьями.
58 changes: 57 additions & 1 deletion Resources/Prototypes/ADT/Entities/Clothing/Head/misc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,60 @@
volume: -10
range: 10 #радиус голоса
sound:
path: /Audio/ADT/Ambience/Music/robotnik.ogg
path: /Audio/ADT/Ambience/Music/robotnik.ogg

- type: entity
parent: ClothingHeadBase
id: ADTClothingHeadHatBlackroseFlowerWreath
name: ClothingHeadHatBlackroseFlowerWreath-name
description: ClothingHeadHatBlackroseFlowerWreath-desc
components:
- type: Sprite
sprite: ADT/Clothing/Head/Misc/blackrose-wreath.rsi
- type: Clothing
sprite: ADT/Clothing/Head/Misc/blackrose-wreath.rsi
slots:
- HEAD
- neck

- type: entity
parent: ClothingHeadBase
id: ADTClothingHeadHatMacFlowerWreath
name: ClothingHeadHatMacFlowerWreath-name
description: ClothingHeadHatMacFlowerWreath-desc
components:
- type: Sprite
sprite: ADT/Clothing/Head/Misc/mac-wreat.rsi
- type: Clothing
sprite: ADT/Clothing/Head/Misc/mac-wreat.rsi
slots:
- HEAD
- neck

- type: entity
parent: ClothingHeadBase
id: ADTClothingHeadHatRoseFlowerWreath
name: ClothingHeadHatRoseFlowerWreath-name
description: ClothingHeadHatRoseFlowerWreath-desc
components:
- type: Sprite
sprite: ADT/Clothing/Head/Misc/rose-wreat.rsi
- type: Clothing
sprite: ADT/Clothing/Head/Misc/rose-wreat.rsi
slots:
- HEAD
- neck

- type: entity
parent: ClothingHeadBase
id: ADTClothingHeadHatDandelionFlowerWreath
name: ClothingHeadHatDandelionFlowerWreath-name
description: ClothingHeadHatDandelionFlowerWreath-desc
components:
- type: Sprite
sprite: ADT/Clothing/Head/Misc/dandelion-wreat.rsi
- type: Clothing
sprite: ADT/Clothing/Head/Misc/dandelion-wreat.rsi
slots:
- HEAD
- neck
31 changes: 30 additions & 1 deletion Resources/Prototypes/ADT/Loadouts/Miscellaneous/trinkets.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,38 @@
storage:
back:
- ADTClothingMaskPaperBlank

- type: loadout
id: ADTHandheldStationMapUnpowered
storage:
back:
- HandheldStationMapUnpowered

# Flowers
- type: loadout
id: ADTFlowerWreath1
storage:
back:
- ADTClothingHeadHatBlackroseFlowerWreath
groupBy: "flowerwreath"

- type: loadout
id: ADTFlowerWreath2
storage:
back:
- ADTClothingHeadHatMacFlowerWreath
groupBy: "flowerwreath"

- type: loadout
id: ADTFlowerWreath3
storage:
back:
- ADTClothingHeadHatRoseFlowerWreath
groupBy: "flowerwreath"

- type: loadout
id: ADTFlowerWreath4
storage:
back:
- ADTClothingHeadHatDandelionFlowerWreath
groupBy: "flowerwreath"
Comment on lines +76 to +103
Copy link
Contributor

@coderabbitai coderabbitai bot Mar 11, 2026

Choose a reason for hiding this comment

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

⚠️ Potential issue | 🟠 Major

Здесь нужен equipment, а не storage.back.

Сейчас венки добавляются как содержимое слота back, а не как экипируемый предмет. Для этих прототипов это ломает ожидаемое поведение лодаута: венок не будет надет на голову, хотя сами сущности объявлены как Clothing со слотами HEAD/neck.

Предлагаемая правка 
 # Flowers
 - type: loadout
   id: ADTFlowerWreath1
-  storage:
-    back:
-    - ADTClothingHeadHatBlackroseFlowerWreath
+  equipment:
+    head: ADTClothingHeadHatBlackroseFlowerWreath
   groupBy: "flowerwreath"

 - type: loadout
   id: ADTFlowerWreath2
-  storage:
-    back:
-    - ADTClothingHeadHatMacFlowerWreath
+  equipment:
+    head: ADTClothingHeadHatMacFlowerWreath
   groupBy: "flowerwreath"

 - type: loadout
   id: ADTFlowerWreath3
-  storage:
-    back:
-    - ADTClothingHeadHatRoseFlowerWreath
+  equipment:
+    head: ADTClothingHeadHatRoseFlowerWreath
   groupBy: "flowerwreath"

 - type: loadout
   id: ADTFlowerWreath4
-  storage:
-    back:
-    - ADTClothingHeadHatDandelionFlowerWreath
+  equipment:
+    head: ADTClothingHeadHatDandelionFlowerWreath
   groupBy: "flowerwreath"
📝 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
# Flowers
- type: loadout
id: ADTFlowerWreath1
storage:
back:
- ADTClothingHeadHatBlackroseFlowerWreath
groupBy: "flowerwreath"
- type: loadout
id: ADTFlowerWreath2
storage:
back:
- ADTClothingHeadHatMacFlowerWreath
groupBy: "flowerwreath"
- type: loadout
id: ADTFlowerWreath3
storage:
back:
- ADTClothingHeadHatRoseFlowerWreath
groupBy: "flowerwreath"
- type: loadout
id: ADTFlowerWreath4
storage:
back:
- ADTClothingHeadHatDandelionFlowerWreath
groupBy: "flowerwreath"
# Flowers
- type: loadout
id: ADTFlowerWreath1
equipment:
head: ADTClothingHeadHatBlackroseFlowerWreath
groupBy: "flowerwreath"
- type: loadout
id: ADTFlowerWreath2
equipment:
head: ADTClothingHeadHatMacFlowerWreath
groupBy: "flowerwreath"
- type: loadout
id: ADTFlowerWreath3
equipment:
head: ADTClothingHeadHatRoseFlowerWreath
groupBy: "flowerwreath"
- type: loadout
id: ADTFlowerWreath4
equipment:
head: ADTClothingHeadHatDandelionFlowerWreath
groupBy: "flowerwreath"
🤖 Prompt for AI Agents 
Verify each finding against the current code and only fix it if needed.

In `@Resources/Prototypes/ADT/Loadouts/Miscellaneous/trinkets.yml` around lines 76
- 103, The four loadout prototypes ADTFlowerWreath1, ADTFlowerWreath2,
ADTFlowerWreath3 and ADTFlowerWreath4 currently place the wreath items under
storage.back; change each to use an equipment section instead so the wreaths are
equipped to the proper clothing slot (e.g., HEAD or neck as declared on the
Clothing prototypes) rather than stored in the back slot. Specifically, replace
the storage.back entries with an equipment mapping that references the same item
IDs (ADTClothingHeadHatBlackroseFlowerWreath, ADTClothingHeadHatMacFlowerWreath,
ADTClothingHeadHatRoseFlowerWreath, ADTClothingHeadHatDandelionFlowerWreath) so
the engine will equip them to the Clothing slots (HEAD/neck) declared on those
Clothing prototypes.

1 change: 1 addition & 0 deletions Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
storage:
back:
- ClothingHeadHatFlowerWreath
groupBy: "flowerwreath" #ADT-Tweak

- type: loadout
id: Hairflower
Expand Down
4 changes: 4 additions & 0 deletions Resources/Prototypes/Loadouts/loadout_groups.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,10 @@
- ADTHandheldStationMapUnpowered
- ADTModStorageVoucher
- ADTClothingGeorgeRibbonPin
- ADTFlowerWreath1
- ADTFlowerWreath2
- ADTFlowerWreath3
- ADTFlowerWreath4
# ADT-Tweak-End

- type: loadoutGroup
Expand Down
Binary file added ...es/Textures/ADT/Clothing/Head/Misc/blackrose-wreath.rsi/equipped-HELMET-vox.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/ADT/Clothing/Head/Misc/blackrose-wreath.rsi/equipped-HELMET.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/ADT/Clothing/Head/Misc/blackrose-wreath.rsi/equipped-NECK.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/ADT/Clothing/Head/Misc/blackrose-wreath.rsi/icon.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
26 changes: 26 additions & 0 deletions Resources/Textures/ADT/Clothing/Head/Misc/blackrose-wreath.rsi/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"version": 1,
"license": "CC-BY-SA-4.0",
"copyright": "made by Prazat",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-NECK",
"directions": 4
},
{
"name": "equipped-HELMET",
"directions": 4
},
{
"name": "equipped-HELMET-vox",
"directions": 4
}
]
}
Binary file added ...ces/Textures/ADT/Clothing/Head/Misc/dandelion-wreat.rsi/equipped-HELMET-vox.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/ADT/Clothing/Head/Misc/dandelion-wreat.rsi/equipped-HELMET.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/ADT/Clothing/Head/Misc/dandelion-wreat.rsi/equipped-NECK.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/ADT/Clothing/Head/Misc/dandelion-wreat.rsi/icon.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
26 changes: 26 additions & 0 deletions Resources/Textures/ADT/Clothing/Head/Misc/dandelion-wreat.rsi/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"version": 1,
"license": "CC-BY-SA-4.0",
"copyright": "made by Prazat",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-NECK",
"directions": 4
},
{
"name": "equipped-HELMET",
"directions": 4
},
{
"name": "equipped-HELMET-vox",
"directions": 4
}
]
}
Binary file added Resources/Textures/ADT/Clothing/Head/Misc/mac-wreat.rsi/equipped-HELMET-vox.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/ADT/Clothing/Head/Misc/mac-wreat.rsi/equipped-HELMET.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/ADT/Clothing/Head/Misc/mac-wreat.rsi/equipped-NECK.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/ADT/Clothing/Head/Misc/mac-wreat.rsi/icon.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
26 changes: 26 additions & 0 deletions Resources/Textures/ADT/Clothing/Head/Misc/mac-wreat.rsi/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"version": 1,
"license": "CC-BY-SA-4.0",
"copyright": "made by Prazat",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-NECK",
"directions": 4
},
{
"name": "equipped-HELMET",
"directions": 4
},
{
"name": "equipped-HELMET-vox",
"directions": 4
}
]
}
Binary file added Resources/Textures/ADT/Clothing/Head/Misc/rose-wreat.rsi/equipped-HELMET-vox.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/ADT/Clothing/Head/Misc/rose-wreat.rsi/equipped-HELMET.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/ADT/Clothing/Head/Misc/rose-wreat.rsi/equipped-NECK.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/ADT/Clothing/Head/Misc/rose-wreat.rsi/icon.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
26 changes: 26 additions & 0 deletions Resources/Textures/ADT/Clothing/Head/Misc/rose-wreat.rsi/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"version": 1,
"license": "CC-BY-SA-4.0",
"copyright": "made by Prazat",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-NECK",
"directions": 4
},
{
"name": "equipped-HELMET",
"directions": 4
},
{
"name": "equipped-HELMET-vox",
"directions": 4
}
]
}
Loading