From 55c77af33cad8e173c6281286fc66f3a67579eb5 Mon Sep 17 00:00:00 2001 From: lzk <124214523+lzk228@users.noreply.github.com> Date: Sun, 31 Mar 2024 10:52:52 +0200 Subject: [PATCH] Combine flower crown and wreath (#26605) * Combine flower crown and wreath * huh * huuh :trollface: --- .../Entities/Clothing/Head/misc.yml | 17 +++++++----- .../Entities/Clothing/Neck/misc.yml | 14 ---------- .../Entities/Objects/Decoration/present.yml | 2 +- .../Graphs/improvised/flowercrown.yml | 26 ------------------ .../Graphs/improvised/flowerwreath.yml | 2 +- .../Recipes/Crafting/improvised.yml | 19 ++----------- .../Head/Misc/flower-crown.rsi/icon.png | Bin 5190 -> 0 bytes .../equipped-HELMET.png | Bin .../Misc/flower-wreath.rsi/equipped-NECK.png | Bin .../Misc/flower-wreath.rsi/icon.png | Bin .../meta.json | 6 +++- .../Neck/Misc/flower-wreath.rsi/meta.json | 19 ------------- Resources/migration.yml | 4 +++ 13 files changed, 24 insertions(+), 85 deletions(-) delete mode 100644 Resources/Prototypes/Recipes/Crafting/Graphs/improvised/flowercrown.yml delete mode 100644 Resources/Textures/Clothing/Head/Misc/flower-crown.rsi/icon.png rename Resources/Textures/Clothing/Head/Misc/{flower-crown.rsi => flower-wreath.rsi}/equipped-HELMET.png (100%) rename Resources/Textures/Clothing/{Neck => Head}/Misc/flower-wreath.rsi/equipped-NECK.png (100%) rename Resources/Textures/Clothing/{Neck => Head}/Misc/flower-wreath.rsi/icon.png (100%) rename Resources/Textures/Clothing/Head/Misc/{flower-crown.rsi => flower-wreath.rsi}/meta.json (59%) delete mode 100644 Resources/Textures/Clothing/Neck/Misc/flower-wreath.rsi/meta.json 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 e1e80b9293d449cd5f31588a33d99fcafc8e8f20..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5190 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 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 -- 2.51.2