From: lzk <124214523+lzk228@users.noreply.github.com>
Date: Sun, 31 Mar 2024 08:52:52 +0000 (+0200)
Subject: Combine flower crown and wreath (#26605)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=55c77af33cad8e173c6281286fc66f3a67579eb5;p=space-station-14.git

Combine flower crown and wreath (#26605)

* Combine flower crown and wreath

* huh

* huuh :trollface:
---

diff --git a/Resources/Prototypes/Entities/Clothing/Head/misc.yml b/Resources/Prototypes/Entities/Clothing/Head/misc.yml
index 1149224fc3..c7ba6e0b32 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/misc.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/misc.yml
@@ -35,17 +35,20 @@
 
 - type: entity
   parent: ClothingHeadBase
-  id: ClothingHeadHatFlowerCrown
-  name: flower crown
-  description: A coronet of fresh and fragrant flowers.
+  id: ClothingHeadHatFlowerWreath
+  name: flower wreath
+  description: A wreath of colourful flowers. Can be worn both on head and neck.
   components:
   - type: Sprite
-    sprite: Clothing/Head/Misc/flower-crown.rsi
+    sprite: Clothing/Head/Misc/flower-wreath.rsi
   - type: Clothing
-    sprite: Clothing/Head/Misc/flower-crown.rsi
+    sprite: Clothing/Head/Misc/flower-wreath.rsi
+    slots:
+    - HEAD
+    - neck
   - type: Construction
-    graph: flowercrown
-    node: flowercrown
+    graph: flowerwreath
+    node: flowerwreath
 
 - type: entity
   parent: ClothingHeadLightBase
diff --git a/Resources/Prototypes/Entities/Clothing/Neck/misc.yml b/Resources/Prototypes/Entities/Clothing/Neck/misc.yml
index 6b4be3c9f8..51325c0bbb 100644
--- a/Resources/Prototypes/Entities/Clothing/Neck/misc.yml
+++ b/Resources/Prototypes/Entities/Clothing/Neck/misc.yml
@@ -79,17 +79,3 @@
     event: !type:StethoscopeActionEvent
     checkCanInteract: false
     priority: -1
-
-- type: entity
-  parent: ClothingNeckBase
-  id: ClothingNeckFlowerWreath
-  name: flower wreath
-  description: A wreath of colourful flowers.
-  components:
-  - type: Sprite
-    sprite: Clothing/Neck/Misc/flower-wreath.rsi
-  - type: Clothing
-    sprite: Clothing/Neck/Misc/flower-wreath.rsi
-  - type: Construction
-    graph: flowerwreath
-    node: flowerwreath
diff --git a/Resources/Prototypes/Entities/Objects/Decoration/present.yml b/Resources/Prototypes/Entities/Objects/Decoration/present.yml
index a417fdf076..3fb5675f83 100644
--- a/Resources/Prototypes/Entities/Objects/Decoration/present.yml
+++ b/Resources/Prototypes/Entities/Objects/Decoration/present.yml
@@ -292,7 +292,7 @@
         orGroup: GiftPool
       - id: ClothingHeadHatBunny
         orGroup: GiftPool
-      - id: ClothingHeadHatFlowerCrown
+      - id: ClothingHeadHatFlowerWreath
         orGroup: GiftPool
       - id: FoodPoppy
         orGroup: GiftPool
diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/flowercrown.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/flowercrown.yml
deleted file mode 100644
index cba454b663..0000000000
--- a/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/flowercrown.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-- type: constructionGraph
-  id: flowercrown
-  start: start
-  graph:
-    - node: start
-      edges:
-        - to: flowercrown
-          steps:
-            - tag: Flower
-              name: flower
-              icon:
-                sprite: Objects/Specific/Hydroponics/poppy.rsi
-                state: produce
-            - tag: Flower
-              name: flower
-              icon:
-                sprite: Objects/Specific/Hydroponics/poppy.rsi
-                state: produce
-            - tag: Ambrosia
-              name: ambrosia
-              icon:
-                sprite: Objects/Specific/Hydroponics/ambrosia_vulgaris.rsi
-                state: produce
-              doAfter: 10
-    - node: flowercrown
-      entity: ClothingHeadHatFlowerCrown
diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/flowerwreath.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/flowerwreath.yml
index a0a87a14d8..b8e580230d 100644
--- a/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/flowerwreath.yml
+++ b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/flowerwreath.yml
@@ -23,4 +23,4 @@
                 state: produce
               doAfter: 10
     - node: flowerwreath
-      entity: ClothingNeckFlowerWreath
+      entity: ClothingHeadHatFlowerWreath
diff --git a/Resources/Prototypes/Recipes/Crafting/improvised.yml b/Resources/Prototypes/Recipes/Crafting/improvised.yml
index 2c55e4fc26..38d254c141 100644
--- a/Resources/Prototypes/Recipes/Crafting/improvised.yml
+++ b/Resources/Prototypes/Recipes/Crafting/improvised.yml
@@ -98,19 +98,6 @@
     sprite: Clothing/Eyes/Misc/blindfold.rsi
     state: icon
 
-- type: construction
-  name: flower crown
-  id: flowercrown
-  graph: flowercrown
-  startNode: start
-  targetNode: flowercrown
-  category: construction-category-clothing
-  description: "A coronet of fresh and fragrant flowers."
-  icon:
-    sprite: Clothing/Head/Misc/flower-crown.rsi
-    state: icon
-  objectType: Item
-
 - type: construction
   name: flower wreath
   id: flowerwreath
@@ -118,9 +105,9 @@
   startNode: start
   targetNode: flowerwreath
   category: construction-category-clothing
-  description: "A wreath of colourful flowers."
+  description: A wreath of colourful flowers. Can be worn both on head and neck.
   icon:
-    sprite: Clothing/Neck/Misc/flower-wreath.rsi
+    sprite: Clothing/Head/Misc/flower-wreath.rsi
     state: icon
   objectType: Item
 
@@ -226,4 +213,4 @@
   description: An improvised explosive made from pipes and wire.
   icon:
     sprite: Objects/Weapons/Bombs/pipebomb.rsi
-    state: icon
\ No newline at end of file
+    state: icon
diff --git a/Resources/Textures/Clothing/Head/Misc/flower-crown.rsi/icon.png b/Resources/Textures/Clothing/Head/Misc/flower-crown.rsi/icon.png
deleted file mode 100644
index e1e80b9293..0000000000
Binary files a/Resources/Textures/Clothing/Head/Misc/flower-crown.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Misc/flower-crown.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Misc/flower-wreath.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Misc/flower-crown.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Misc/flower-wreath.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Neck/Misc/flower-wreath.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Head/Misc/flower-wreath.rsi/equipped-NECK.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Misc/flower-wreath.rsi/equipped-NECK.png
rename to Resources/Textures/Clothing/Head/Misc/flower-wreath.rsi/equipped-NECK.png
diff --git a/Resources/Textures/Clothing/Neck/Misc/flower-wreath.rsi/icon.png b/Resources/Textures/Clothing/Head/Misc/flower-wreath.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Misc/flower-wreath.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Misc/flower-wreath.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/Misc/flower-crown.rsi/meta.json b/Resources/Textures/Clothing/Head/Misc/flower-wreath.rsi/meta.json
similarity index 59%
rename from Resources/Textures/Clothing/Head/Misc/flower-crown.rsi/meta.json
rename to Resources/Textures/Clothing/Head/Misc/flower-wreath.rsi/meta.json
index 2899868b90..c3dc06f19c 100644
--- a/Resources/Textures/Clothing/Head/Misc/flower-crown.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Misc/flower-wreath.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-4.0",
-  "copyright": "Kevin Zheng 2022",
+  "copyright": "Kevin Zheng 2022 | equipped-NECK and icon Drawn by Ubaser.",
   "size": {
     "x": 32,
     "y": 32
@@ -10,6 +10,10 @@
     {
       "name": "icon"
     },
+    {
+      "name": "equipped-NECK",
+      "directions": 4
+    },
     {
       "name": "equipped-HELMET",
       "directions": 4
diff --git a/Resources/Textures/Clothing/Neck/Misc/flower-wreath.rsi/meta.json b/Resources/Textures/Clothing/Neck/Misc/flower-wreath.rsi/meta.json
deleted file mode 100644
index 71f798f2c4..0000000000
--- a/Resources/Textures/Clothing/Neck/Misc/flower-wreath.rsi/meta.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Drawn by Ubaser.",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-
-  "states": [
-    {
-      "name": "equipped-NECK",
-      "directions": 4
-    },
-    {
-      "name": "icon"
-    }
-  ]
-}
diff --git a/Resources/migration.yml b/Resources/migration.yml
index 8c0fe2064f..f5306c8b7c 100644
--- a/Resources/migration.yml
+++ b/Resources/migration.yml
@@ -257,3 +257,7 @@ RPED: null
 # These are technically not equivalent, but it probably makes more sense to replace any existing SCAF stuff with SOME kind of armor, instead of just deleting it outright.
 ClothingHeadHelmetScaf: ClothingHeadHelmetBasic
 ClothingOuterArmorScaf: ClothingOuterArmorBasic
+
+# 2024-03-31
+ClothingNeckFlowerWreath: ClothingHeadHatFlowerWreath
+ClothingHeadHatFlowerCrown: ClothingHeadHatFlowerWreath