From 91ddba9927420197812db984d976dba558e3afad Mon Sep 17 00:00:00 2001 From: Kevin Zheng Date: Sat, 13 Aug 2022 22:50:50 -0700 Subject: [PATCH] Add flower crown (#10301) --- .../Entities/Clothing/Head/misc.yml | 14 ++++++++++++++ .../Objects/Consumable/Food/produce.yml | 3 +++ .../Graphs/improvised/flowercrown.yml | 16 ++++++++++++++++ .../Recipes/Crafting/improvised.yml | 13 +++++++++++++ Resources/Prototypes/tags.yml | 3 +++ .../Misc/flower-crown.rsi/equipped-HELMET.png | Bin 0 -> 6540 bytes .../Head/Misc/flower-crown.rsi/icon.png | Bin 0 -> 5190 bytes .../Head/Misc/flower-crown.rsi/meta.json | 18 ++++++++++++++++++ 8 files changed, 67 insertions(+) create mode 100644 Resources/Prototypes/Recipes/Crafting/Graphs/improvised/flowercrown.yml create mode 100644 Resources/Textures/Clothing/Head/Misc/flower-crown.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/Clothing/Head/Misc/flower-crown.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Head/Misc/flower-crown.rsi/meta.json diff --git a/Resources/Prototypes/Entities/Clothing/Head/misc.yml b/Resources/Prototypes/Entities/Clothing/Head/misc.yml index f2324a861b..4bacc26b91 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/misc.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/misc.yml @@ -32,6 +32,20 @@ sprite: Clothing/Head/Misc/chickenhead.rsi - type: IngestionBlocker +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHatFlowerCrown + name: flower crown + description: A coronet of fresh and fragrant flowers. + components: + - type: Sprite + sprite: Clothing/Head/Misc/flower-crown.rsi + - type: Clothing + sprite: Clothing/Head/Misc/flower-crown.rsi + - type: Construction + graph: flowercrown + node: flowercrown + - type: entity parent: ClothingHeadBase id: ClothingHeadHatHairflower diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml index 2f72fa6ff7..d1d4de75fc 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml @@ -699,6 +699,9 @@ seedId: poppy - type: Extractable grindableSolutionName: food + - type: Tag + tags: + - Flower - type: entity name: lingzhi diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/flowercrown.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/flowercrown.yml new file mode 100644 index 0000000000..b5940491ab --- /dev/null +++ b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/flowercrown.yml @@ -0,0 +1,16 @@ +- 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 + doAfter: 10 + - node: flowercrown + entity: ClothingHeadHatFlowerCrown diff --git a/Resources/Prototypes/Recipes/Crafting/improvised.yml b/Resources/Prototypes/Recipes/Crafting/improvised.yml index b04a43c6fc..e146e21a0f 100644 --- a/Resources/Prototypes/Recipes/Crafting/improvised.yml +++ b/Resources/Prototypes/Recipes/Crafting/improvised.yml @@ -60,3 +60,16 @@ icon: sprite: Clothing/Eyes/Misc/blindfold.rsi state: icon + +- type: construction + name: flower crown + id: flowercrown + graph: flowercrown + startNode: start + targetNode: flowercrown + category: Misc + description: "A coronet of fresh and fragrant flowers." + icon: + sprite: Clothing/Head/Misc/flower-crown.rsi + state: icon + objectType: Item diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index 68780b7d09..c5c8fef176 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -195,6 +195,9 @@ - type: Tag id: Flashlight +- type: Tag + id: Flower + - type: Tag id: Folder diff --git a/Resources/Textures/Clothing/Head/Misc/flower-crown.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Misc/flower-crown.rsi/equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..be8a12d5a10224115cc2d54cf59dd12afe3af9a7 GIT binary patch literal 6540 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Misc/flower-crown.rsi/meta.json b/Resources/Textures/Clothing/Head/Misc/flower-crown.rsi/meta.json new file mode 100644 index 0000000000..2899868b90 --- /dev/null +++ b/Resources/Textures/Clothing/Head/Misc/flower-crown.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Kevin Zheng 2022", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +}