From e02a9951a76b380b81dbbcb369f204536b6ae60a Mon Sep 17 00:00:00 2001 From: Ed <96445749+TheShuEd@users.noreply.github.com> Date: Thu, 29 Aug 2024 00:31:09 +0500 Subject: [PATCH] Flowers + some love for Alchemy (#427) * red rose proto and sprite * 242 changed files guys * yellow dayflin * jitter + drunk solution, also refactor alchemy recipes * dyes entity * dye crafting, dye using * add flowers to generation --- .../reagents/meta/basic-effect-reagent.ftl | 8 +- .../en-US/_CP14/reagents/meta/biological.ftl | 8 +- .../_CP14/reagents/meta/physical-desc.ftl | 1 + .../ru-RU/_CP14/_PROTO/entities/entities.ftl | 2 +- .../reagents/meta/basic-effect-reagent.ftl | 8 +- .../ru-RU/_CP14/reagents/meta/biological.ftl | 8 +- .../_CP14/reagents/meta/physical-desc.ftl | 1 + Resources/Maps/_CP14/alchemy_test.yml | 1 - Resources/Maps/_CP14/alchemy_test_layer2.yml | 1 - Resources/Maps/_CP14/dev_map.yml | 1 - .../Markers/Spawners/Random/herbal_gather.yml | 2 +- .../Objects/Consumable/Food/produce.yml | 4 +- .../{Specific/Farming => Flora}/farm.yml | 2 +- .../_CP14/Entities/Objects/Flora/flowers.yml | 63 ++++++++++++++ .../{Specific/Farming => Flora}/herbals.yml | 22 ++--- .../_CP14/Entities/Objects/Materials/dye.yml | 77 ++++++++++++++++++ .../Objects/Specific/Thaumaturgy/crystal.yml | 6 +- .../Gatherable/Farm}/cabbage.yml | 4 +- .../Gatherable/Farm}/pumpkin.yml | 4 +- .../Gatherable/Farm}/wheat.yml | 4 +- .../Herbals => Flora/Gatherable}/base.yml | 0 .../Structures/Flora/Gatherable/flowers.yml | 70 ++++++++++++++++ .../Herbals => Flora/Gatherable}/wild.yml | 20 ++--- .../Structures/Flora/grasshighbush.yml | 4 +- .../Entities/Structures/{Flora => }/chasm.yml | 0 .../Structures/{Flora => }/crystal.yml | 0 .../Procedural/biomes_template_grasslands.yml | 36 ++++++++ .../Reagents/{ => Biological}/biological.yml | 47 +---------- .../_CP14/Reagents/Biological/blood.yml | 44 ++++++++++ .../_CP14/Reagents/Biological/flowers.yml | 19 +++++ .../_CP14/Reagents/basic-effects.yml | 29 ++++++- .../Reactions/Alchemy/brewing_bloodgrass.yml | 31 +++---- .../Reactions/Alchemy/brewing_complex.yml | 44 ---------- .../Reactions/Alchemy/brewing_simple.yml | 54 ++++++------ .../Reactions/Alchemy/chromium_inverse.yml | 4 +- .../Reactions/Alchemy/mixing_simple.yml | 71 +++++++--------- .../_CP14/Recipes/Reactions/dye_brewing.yml | 25 ++++++ .../_CP14/Recipes/Workbench/sewing_table.yml | 24 ++++++ .../Farm}/cabbage.rsi/base1.png | Bin .../Farm}/cabbage.rsi/base2.png | Bin .../Farm}/cabbage.rsi/base3.png | Bin .../Farm}/cabbage.rsi/meta.json | 0 .../Farm}/cabbage.rsi/slice1.png | Bin .../Farm}/cabbage.rsi/slice2.png | Bin .../Farm}/cabbage.rsi/slice3.png | Bin .../Farm}/cabbage.rsi/slice4.png | Bin .../Farm}/pumpkin.rsi/base1.png | Bin .../Farm}/pumpkin.rsi/base2.png | Bin .../Farm}/pumpkin.rsi/base3.png | Bin .../Farm}/pumpkin.rsi/base4.png | Bin .../Farm}/pumpkin.rsi/meta.json | 0 .../Farm}/pumpkin.rsi/slice1.png | Bin .../Farm}/pumpkin.rsi/slice2.png | Bin .../Farm}/pumpkin.rsi/slice3.png | Bin .../Farm}/pumpkin.rsi/slice4.png | Bin .../Farm}/wheat.rsi/base1.png | Bin .../Farm}/wheat.rsi/base2.png | Bin .../Farm}/wheat.rsi/meta.json | 0 .../Flora/Flowers/red_rose.rsi/base1.png | Bin 0 -> 423 bytes .../Flora/Flowers/red_rose.rsi/base2.png | Bin 0 -> 398 bytes .../Flora/Flowers/red_rose.rsi/meta.json | 17 ++++ .../Flowers/yellow_dayflin.rsi/base1.png | Bin 0 -> 357 bytes .../Flowers/yellow_dayflin.rsi/base2.png | Bin 0 -> 351 bytes .../Flowers/yellow_dayflin.rsi/meta.json | 17 ++++ .../Wild}/agaric.rsi/base1.png | Bin .../Wild}/agaric.rsi/base2.png | Bin .../Wild}/agaric.rsi/base3.png | Bin .../Wild}/agaric.rsi/base4.png | Bin .../Wild}/agaric.rsi/base5.png | Bin .../Wild}/agaric.rsi/meta.json | 0 .../Wild}/bloodgrass.rsi/base1.png | Bin .../Wild}/bloodgrass.rsi/base2.png | Bin .../Wild}/bloodgrass.rsi/base3.png | Bin .../Wild}/bloodgrass.rsi/base4.png | Bin .../Wild}/bloodgrass.rsi/base5.png | Bin .../Wild}/bloodgrass.rsi/meta.json | 0 .../Wild}/chromium_slime.rsi/base1.png | Bin .../Wild}/chromium_slime.rsi/base2.png | Bin .../Wild}/chromium_slime.rsi/base3.png | Bin .../Wild}/chromium_slime.rsi/meta.json | 0 .../Wild}/lumishroom.rsi/base1.png | Bin .../Wild}/lumishroom.rsi/base2.png | Bin .../Wild}/lumishroom.rsi/base3.png | Bin .../Wild}/lumishroom.rsi/base4.png | Bin .../Wild}/lumishroom.rsi/base5.png | Bin .../Wild}/lumishroom.rsi/meta.json | 0 .../Wild}/wild_sage.rsi/base1.png | Bin .../Wild}/wild_sage.rsi/base2.png | Bin .../Wild}/wild_sage.rsi/base3.png | Bin .../Wild}/wild_sage.rsi/meta.json | 0 .../_CP14/Objects/Materials/dye.rsi/base.png | Bin 0 -> 242 bytes .../_CP14/Objects/Materials/dye.rsi/meta.json | 17 ++++ .../Objects/Materials/dye.rsi/powder.png | Bin 0 -> 216 bytes .../Farm}/cabbage.rsi/death.png | Bin .../Farm}/cabbage.rsi/grow-1.png | Bin .../Farm}/cabbage.rsi/grow-2.png | Bin .../Farm}/cabbage.rsi/grow-3.png | Bin .../Farm}/cabbage.rsi/grow-4.png | Bin .../Farm}/cabbage.rsi/grow-5.png | Bin .../Farm}/cabbage.rsi/grow-6.png | Bin .../Farm}/cabbage.rsi/meta.json | 0 .../Farm}/pumpkin.rsi/death.png | Bin .../Farm}/pumpkin.rsi/grow-1.png | Bin .../Farm}/pumpkin.rsi/grow-2.png | Bin .../Farm}/pumpkin.rsi/grow-3.png | Bin .../Farm}/pumpkin.rsi/grow-4.png | Bin .../Farm}/pumpkin.rsi/grow-5.png | Bin .../Farm}/pumpkin.rsi/grow-6.png | Bin .../Farm}/pumpkin.rsi/meta.json | 0 .../Farm}/wheat.rsi/death.png | Bin .../Farm}/wheat.rsi/grow-1.png | Bin .../Farm}/wheat.rsi/grow-2.png | Bin .../Farm}/wheat.rsi/grow-3.png | Bin .../Farm}/wheat.rsi/grow-4.png | Bin .../Farm}/wheat.rsi/grow-5.png | Bin .../Farm}/wheat.rsi/meta.json | 0 .../Flora/Flowers/red_rose.rsi/meta.json | 20 +++++ .../Flora/Flowers/red_rose.rsi/world1.png | Bin 0 -> 782 bytes .../Flora/Flowers/red_rose.rsi/world2.png | Bin 0 -> 990 bytes .../Flora/Flowers/red_rose.rsi/world3.png | Bin 0 -> 1049 bytes .../Flowers/yellow_dayflin.rsi/meta.json | 20 +++++ .../Flowers/yellow_dayflin.rsi/world1.png | Bin 0 -> 971 bytes .../Flowers/yellow_dayflin.rsi/world2.png | Bin 0 -> 1203 bytes .../Flowers/yellow_dayflin.rsi/world3.png | Bin 0 -> 1079 bytes .../Wild}/agaric.rsi/meta.json | 0 .../Wild}/agaric.rsi/world1.png | Bin .../Wild}/agaric.rsi/world2.png | Bin .../Wild}/agaric.rsi/world3.png | Bin .../Wild}/agaric.rsi/world4.png | Bin .../Wild}/agaric.rsi/world5.png | Bin .../Wild}/agaric.rsi/world6.png | Bin .../Wild}/bloodgrass.rsi/grass1.png | Bin .../Wild}/bloodgrass.rsi/grass2.png | Bin .../Wild}/bloodgrass.rsi/grass3.png | Bin .../Wild}/bloodgrass.rsi/grass4.png | Bin .../Wild}/bloodgrass.rsi/grass5.png | Bin .../Wild}/bloodgrass.rsi/meta.json | 0 .../Wild}/chromium_slime.rsi/meta.json | 0 .../Wild}/chromium_slime.rsi/world1.png | Bin .../Wild}/chromium_slime.rsi/world2.png | Bin .../Wild}/chromium_slime.rsi/world3.png | Bin .../Wild}/lumishroom.rsi/meta.json | 0 .../Wild}/lumishroom.rsi/world1.png | Bin .../Wild}/lumishroom.rsi/world2.png | Bin .../Wild}/lumishroom.rsi/world3.png | Bin .../Wild}/lumishroom.rsi/world4.png | Bin .../Wild}/lumishroom.rsi/world5.png | Bin .../Wild}/lumishroom.rsi/world6.png | Bin .../Wild}/wild_sage.rsi/meta.json | 0 .../Wild}/wild_sage.rsi/world1.png | Bin .../Wild}/wild_sage.rsi/world2.png | Bin .../Wild}/wild_sage.rsi/world3.png | Bin .../grass_high_bush1.png | Bin .../grass_high_bush2.png | Bin .../grass_high_bush3.png | Bin .../grass_high_bush4.png | Bin .../meta.json | 0 157 files changed, 606 insertions(+), 234 deletions(-) rename Resources/Prototypes/_CP14/Entities/Objects/{Specific/Farming => Flora}/farm.yml (86%) create mode 100644 Resources/Prototypes/_CP14/Entities/Objects/Flora/flowers.yml rename Resources/Prototypes/_CP14/Entities/Objects/{Specific/Farming => Flora}/herbals.yml (91%) create mode 100644 Resources/Prototypes/_CP14/Entities/Objects/Materials/dye.yml rename Resources/Prototypes/_CP14/Entities/Structures/{Specific/Farming/Herbals/domesticated => Flora/Gatherable/Farm}/cabbage.yml (92%) rename Resources/Prototypes/_CP14/Entities/Structures/{Specific/Farming/Herbals/domesticated => Flora/Gatherable/Farm}/pumpkin.yml (92%) rename Resources/Prototypes/_CP14/Entities/Structures/{Specific/Farming/Herbals/domesticated => Flora/Gatherable/Farm}/wheat.yml (92%) rename Resources/Prototypes/_CP14/Entities/Structures/{Specific/Farming/Herbals => Flora/Gatherable}/base.yml (100%) create mode 100644 Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/flowers.yml rename Resources/Prototypes/_CP14/Entities/Structures/{Specific/Farming/Herbals => Flora/Gatherable}/wild.yml (87%) rename Resources/Prototypes/_CP14/Entities/Structures/{Flora => }/chasm.yml (100%) rename Resources/Prototypes/_CP14/Entities/Structures/{Flora => }/crystal.yml (100%) rename Resources/Prototypes/_CP14/Reagents/{ => Biological}/biological.yml (73%) create mode 100644 Resources/Prototypes/_CP14/Reagents/Biological/blood.yml create mode 100644 Resources/Prototypes/_CP14/Reagents/Biological/flowers.yml delete mode 100644 Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/brewing_complex.yml create mode 100644 Resources/Prototypes/_CP14/Recipes/Reactions/dye_brewing.yml rename Resources/Textures/_CP14/Objects/{Specific/Farming/Produce => Flora/Farm}/cabbage.rsi/base1.png (100%) rename Resources/Textures/_CP14/Objects/{Specific/Farming/Produce => Flora/Farm}/cabbage.rsi/base2.png (100%) rename Resources/Textures/_CP14/Objects/{Specific/Farming/Produce => Flora/Farm}/cabbage.rsi/base3.png (100%) rename Resources/Textures/_CP14/Objects/{Specific/Farming/Produce => Flora/Farm}/cabbage.rsi/meta.json (100%) rename Resources/Textures/_CP14/Objects/{Specific/Farming/Produce => Flora/Farm}/cabbage.rsi/slice1.png (100%) rename Resources/Textures/_CP14/Objects/{Specific/Farming/Produce => Flora/Farm}/cabbage.rsi/slice2.png (100%) rename Resources/Textures/_CP14/Objects/{Specific/Farming/Produce => Flora/Farm}/cabbage.rsi/slice3.png (100%) rename Resources/Textures/_CP14/Objects/{Specific/Farming/Produce => Flora/Farm}/cabbage.rsi/slice4.png (100%) rename Resources/Textures/_CP14/Objects/{Specific/Farming/Produce => Flora/Farm}/pumpkin.rsi/base1.png (100%) rename Resources/Textures/_CP14/Objects/{Specific/Farming/Produce => Flora/Farm}/pumpkin.rsi/base2.png (100%) rename Resources/Textures/_CP14/Objects/{Specific/Farming/Produce => Flora/Farm}/pumpkin.rsi/base3.png (100%) rename Resources/Textures/_CP14/Objects/{Specific/Farming/Produce => Flora/Farm}/pumpkin.rsi/base4.png (100%) rename Resources/Textures/_CP14/Objects/{Specific/Farming/Produce => Flora/Farm}/pumpkin.rsi/meta.json (100%) rename Resources/Textures/_CP14/Objects/{Specific/Farming/Produce => Flora/Farm}/pumpkin.rsi/slice1.png (100%) rename Resources/Textures/_CP14/Objects/{Specific/Farming/Produce => Flora/Farm}/pumpkin.rsi/slice2.png (100%) rename Resources/Textures/_CP14/Objects/{Specific/Farming/Produce => Flora/Farm}/pumpkin.rsi/slice3.png (100%) rename Resources/Textures/_CP14/Objects/{Specific/Farming/Produce => Flora/Farm}/pumpkin.rsi/slice4.png (100%) rename Resources/Textures/_CP14/Objects/{Specific/Farming/Produce => Flora/Farm}/wheat.rsi/base1.png (100%) rename Resources/Textures/_CP14/Objects/{Specific/Farming/Produce => Flora/Farm}/wheat.rsi/base2.png (100%) rename Resources/Textures/_CP14/Objects/{Specific/Farming/Produce => Flora/Farm}/wheat.rsi/meta.json (100%) create mode 100644 Resources/Textures/_CP14/Objects/Flora/Flowers/red_rose.rsi/base1.png create mode 100644 Resources/Textures/_CP14/Objects/Flora/Flowers/red_rose.rsi/base2.png create mode 100644 Resources/Textures/_CP14/Objects/Flora/Flowers/red_rose.rsi/meta.json create mode 100644 Resources/Textures/_CP14/Objects/Flora/Flowers/yellow_dayflin.rsi/base1.png create mode 100644 Resources/Textures/_CP14/Objects/Flora/Flowers/yellow_dayflin.rsi/base2.png create mode 100644 Resources/Textures/_CP14/Objects/Flora/Flowers/yellow_dayflin.rsi/meta.json rename Resources/Textures/_CP14/Objects/{Specific/Farming/Produce => Flora/Wild}/agaric.rsi/base1.png (100%) rename Resources/Textures/_CP14/Objects/{Specific/Farming/Produce => Flora/Wild}/agaric.rsi/base2.png (100%) rename Resources/Textures/_CP14/Objects/{Specific/Farming/Produce => Flora/Wild}/agaric.rsi/base3.png (100%) rename Resources/Textures/_CP14/Objects/{Specific/Farming/Produce => Flora/Wild}/agaric.rsi/base4.png (100%) rename Resources/Textures/_CP14/Objects/{Specific/Farming/Produce => Flora/Wild}/agaric.rsi/base5.png (100%) rename Resources/Textures/_CP14/Objects/{Specific/Farming/Produce => Flora/Wild}/agaric.rsi/meta.json (100%) rename Resources/Textures/_CP14/Objects/{Specific/Farming/Produce => Flora/Wild}/bloodgrass.rsi/base1.png (100%) rename Resources/Textures/_CP14/Objects/{Specific/Farming/Produce => Flora/Wild}/bloodgrass.rsi/base2.png (100%) rename Resources/Textures/_CP14/Objects/{Specific/Farming/Produce => Flora/Wild}/bloodgrass.rsi/base3.png (100%) rename Resources/Textures/_CP14/Objects/{Specific/Farming/Produce => Flora/Wild}/bloodgrass.rsi/base4.png (100%) rename Resources/Textures/_CP14/Objects/{Specific/Farming/Produce => Flora/Wild}/bloodgrass.rsi/base5.png (100%) rename Resources/Textures/_CP14/Objects/{Specific/Farming/Produce => Flora/Wild}/bloodgrass.rsi/meta.json (100%) rename Resources/Textures/_CP14/Objects/{Specific/Farming/Produce => Flora/Wild}/chromium_slime.rsi/base1.png (100%) rename Resources/Textures/_CP14/Objects/{Specific/Farming/Produce => Flora/Wild}/chromium_slime.rsi/base2.png (100%) rename Resources/Textures/_CP14/Objects/{Specific/Farming/Produce => Flora/Wild}/chromium_slime.rsi/base3.png (100%) rename Resources/Textures/_CP14/Objects/{Specific/Farming/Produce => Flora/Wild}/chromium_slime.rsi/meta.json (100%) rename Resources/Textures/_CP14/Objects/{Specific/Farming/Produce => Flora/Wild}/lumishroom.rsi/base1.png (100%) rename Resources/Textures/_CP14/Objects/{Specific/Farming/Produce => Flora/Wild}/lumishroom.rsi/base2.png (100%) rename Resources/Textures/_CP14/Objects/{Specific/Farming/Produce => Flora/Wild}/lumishroom.rsi/base3.png (100%) rename Resources/Textures/_CP14/Objects/{Specific/Farming/Produce => Flora/Wild}/lumishroom.rsi/base4.png (100%) rename Resources/Textures/_CP14/Objects/{Specific/Farming/Produce => Flora/Wild}/lumishroom.rsi/base5.png (100%) rename Resources/Textures/_CP14/Objects/{Specific/Farming/Produce => Flora/Wild}/lumishroom.rsi/meta.json (100%) rename Resources/Textures/_CP14/Objects/{Specific/Farming/Produce => Flora/Wild}/wild_sage.rsi/base1.png (100%) rename Resources/Textures/_CP14/Objects/{Specific/Farming/Produce => Flora/Wild}/wild_sage.rsi/base2.png (100%) rename Resources/Textures/_CP14/Objects/{Specific/Farming/Produce => Flora/Wild}/wild_sage.rsi/base3.png (100%) rename Resources/Textures/_CP14/Objects/{Specific/Farming/Produce => Flora/Wild}/wild_sage.rsi/meta.json (100%) create mode 100644 Resources/Textures/_CP14/Objects/Materials/dye.rsi/base.png create mode 100644 Resources/Textures/_CP14/Objects/Materials/dye.rsi/meta.json create mode 100644 Resources/Textures/_CP14/Objects/Materials/dye.rsi/powder.png rename Resources/Textures/_CP14/Structures/{Specific/Farming/Herbals => Flora/Farm}/cabbage.rsi/death.png (100%) rename Resources/Textures/_CP14/Structures/{Specific/Farming/Herbals => Flora/Farm}/cabbage.rsi/grow-1.png (100%) rename Resources/Textures/_CP14/Structures/{Specific/Farming/Herbals => Flora/Farm}/cabbage.rsi/grow-2.png (100%) rename Resources/Textures/_CP14/Structures/{Specific/Farming/Herbals => Flora/Farm}/cabbage.rsi/grow-3.png (100%) rename Resources/Textures/_CP14/Structures/{Specific/Farming/Herbals => Flora/Farm}/cabbage.rsi/grow-4.png (100%) rename Resources/Textures/_CP14/Structures/{Specific/Farming/Herbals => Flora/Farm}/cabbage.rsi/grow-5.png (100%) rename Resources/Textures/_CP14/Structures/{Specific/Farming/Herbals => Flora/Farm}/cabbage.rsi/grow-6.png (100%) rename Resources/Textures/_CP14/Structures/{Specific/Farming/Herbals => Flora/Farm}/cabbage.rsi/meta.json (100%) rename Resources/Textures/_CP14/Structures/{Specific/Farming/Herbals => Flora/Farm}/pumpkin.rsi/death.png (100%) rename Resources/Textures/_CP14/Structures/{Specific/Farming/Herbals => Flora/Farm}/pumpkin.rsi/grow-1.png (100%) rename Resources/Textures/_CP14/Structures/{Specific/Farming/Herbals => Flora/Farm}/pumpkin.rsi/grow-2.png (100%) rename Resources/Textures/_CP14/Structures/{Specific/Farming/Herbals => Flora/Farm}/pumpkin.rsi/grow-3.png (100%) rename Resources/Textures/_CP14/Structures/{Specific/Farming/Herbals => Flora/Farm}/pumpkin.rsi/grow-4.png (100%) rename Resources/Textures/_CP14/Structures/{Specific/Farming/Herbals => Flora/Farm}/pumpkin.rsi/grow-5.png (100%) rename Resources/Textures/_CP14/Structures/{Specific/Farming/Herbals => Flora/Farm}/pumpkin.rsi/grow-6.png (100%) rename Resources/Textures/_CP14/Structures/{Specific/Farming/Herbals => Flora/Farm}/pumpkin.rsi/meta.json (100%) rename Resources/Textures/_CP14/Structures/{Specific/Farming/Herbals => Flora/Farm}/wheat.rsi/death.png (100%) rename Resources/Textures/_CP14/Structures/{Specific/Farming/Herbals => Flora/Farm}/wheat.rsi/grow-1.png (100%) rename Resources/Textures/_CP14/Structures/{Specific/Farming/Herbals => Flora/Farm}/wheat.rsi/grow-2.png (100%) rename Resources/Textures/_CP14/Structures/{Specific/Farming/Herbals => Flora/Farm}/wheat.rsi/grow-3.png (100%) rename Resources/Textures/_CP14/Structures/{Specific/Farming/Herbals => Flora/Farm}/wheat.rsi/grow-4.png (100%) rename Resources/Textures/_CP14/Structures/{Specific/Farming/Herbals => Flora/Farm}/wheat.rsi/grow-5.png (100%) rename Resources/Textures/_CP14/Structures/{Specific/Farming/Herbals => Flora/Farm}/wheat.rsi/meta.json (100%) create mode 100644 Resources/Textures/_CP14/Structures/Flora/Flowers/red_rose.rsi/meta.json create mode 100644 Resources/Textures/_CP14/Structures/Flora/Flowers/red_rose.rsi/world1.png create mode 100644 Resources/Textures/_CP14/Structures/Flora/Flowers/red_rose.rsi/world2.png create mode 100644 Resources/Textures/_CP14/Structures/Flora/Flowers/red_rose.rsi/world3.png create mode 100644 Resources/Textures/_CP14/Structures/Flora/Flowers/yellow_dayflin.rsi/meta.json create mode 100644 Resources/Textures/_CP14/Structures/Flora/Flowers/yellow_dayflin.rsi/world1.png create mode 100644 Resources/Textures/_CP14/Structures/Flora/Flowers/yellow_dayflin.rsi/world2.png create mode 100644 Resources/Textures/_CP14/Structures/Flora/Flowers/yellow_dayflin.rsi/world3.png rename Resources/Textures/_CP14/Structures/{Specific/Farming/Herbals => Flora/Wild}/agaric.rsi/meta.json (100%) rename Resources/Textures/_CP14/Structures/{Specific/Farming/Herbals => Flora/Wild}/agaric.rsi/world1.png (100%) rename Resources/Textures/_CP14/Structures/{Specific/Farming/Herbals => Flora/Wild}/agaric.rsi/world2.png (100%) rename Resources/Textures/_CP14/Structures/{Specific/Farming/Herbals => Flora/Wild}/agaric.rsi/world3.png (100%) rename Resources/Textures/_CP14/Structures/{Specific/Farming/Herbals => Flora/Wild}/agaric.rsi/world4.png (100%) rename Resources/Textures/_CP14/Structures/{Specific/Farming/Herbals => Flora/Wild}/agaric.rsi/world5.png (100%) rename Resources/Textures/_CP14/Structures/{Specific/Farming/Herbals => Flora/Wild}/agaric.rsi/world6.png (100%) rename Resources/Textures/_CP14/Structures/{Specific/Farming/Herbals => Flora/Wild}/bloodgrass.rsi/grass1.png (100%) rename Resources/Textures/_CP14/Structures/{Specific/Farming/Herbals => Flora/Wild}/bloodgrass.rsi/grass2.png (100%) rename Resources/Textures/_CP14/Structures/{Specific/Farming/Herbals => Flora/Wild}/bloodgrass.rsi/grass3.png (100%) rename Resources/Textures/_CP14/Structures/{Specific/Farming/Herbals => Flora/Wild}/bloodgrass.rsi/grass4.png (100%) rename Resources/Textures/_CP14/Structures/{Specific/Farming/Herbals => Flora/Wild}/bloodgrass.rsi/grass5.png (100%) rename Resources/Textures/_CP14/Structures/{Specific/Farming/Herbals => Flora/Wild}/bloodgrass.rsi/meta.json (100%) rename Resources/Textures/_CP14/Structures/{Specific/Farming/Herbals => Flora/Wild}/chromium_slime.rsi/meta.json (100%) rename Resources/Textures/_CP14/Structures/{Specific/Farming/Herbals => Flora/Wild}/chromium_slime.rsi/world1.png (100%) rename Resources/Textures/_CP14/Structures/{Specific/Farming/Herbals => Flora/Wild}/chromium_slime.rsi/world2.png (100%) rename Resources/Textures/_CP14/Structures/{Specific/Farming/Herbals => Flora/Wild}/chromium_slime.rsi/world3.png (100%) rename Resources/Textures/_CP14/Structures/{Specific/Farming/Herbals => Flora/Wild}/lumishroom.rsi/meta.json (100%) rename Resources/Textures/_CP14/Structures/{Specific/Farming/Herbals => Flora/Wild}/lumishroom.rsi/world1.png (100%) rename Resources/Textures/_CP14/Structures/{Specific/Farming/Herbals => Flora/Wild}/lumishroom.rsi/world2.png (100%) rename Resources/Textures/_CP14/Structures/{Specific/Farming/Herbals => Flora/Wild}/lumishroom.rsi/world3.png (100%) rename Resources/Textures/_CP14/Structures/{Specific/Farming/Herbals => Flora/Wild}/lumishroom.rsi/world4.png (100%) rename Resources/Textures/_CP14/Structures/{Specific/Farming/Herbals => Flora/Wild}/lumishroom.rsi/world5.png (100%) rename Resources/Textures/_CP14/Structures/{Specific/Farming/Herbals => Flora/Wild}/lumishroom.rsi/world6.png (100%) rename Resources/Textures/_CP14/Structures/{Specific/Farming/Herbals => Flora/Wild}/wild_sage.rsi/meta.json (100%) rename Resources/Textures/_CP14/Structures/{Specific/Farming/Herbals => Flora/Wild}/wild_sage.rsi/world1.png (100%) rename Resources/Textures/_CP14/Structures/{Specific/Farming/Herbals => Flora/Wild}/wild_sage.rsi/world2.png (100%) rename Resources/Textures/_CP14/Structures/{Specific/Farming/Herbals => Flora/Wild}/wild_sage.rsi/world3.png (100%) rename Resources/Textures/_CP14/Structures/Flora/{GrassHighBush.rsi => high_bush.rsi}/grass_high_bush1.png (100%) rename Resources/Textures/_CP14/Structures/Flora/{GrassHighBush.rsi => high_bush.rsi}/grass_high_bush2.png (100%) rename Resources/Textures/_CP14/Structures/Flora/{GrassHighBush.rsi => high_bush.rsi}/grass_high_bush3.png (100%) rename Resources/Textures/_CP14/Structures/Flora/{GrassHighBush.rsi => high_bush.rsi}/grass_high_bush4.png (100%) rename Resources/Textures/_CP14/Structures/Flora/{GrassHighBush.rsi => high_bush.rsi}/meta.json (100%) diff --git a/Resources/Locale/en-US/_CP14/reagents/meta/basic-effect-reagent.ftl b/Resources/Locale/en-US/_CP14/reagents/meta/basic-effect-reagent.ftl index ee9e39a460..d3d1b87993 100644 --- a/Resources/Locale/en-US/_CP14/reagents/meta/basic-effect-reagent.ftl +++ b/Resources/Locale/en-US/_CP14/reagents/meta/basic-effect-reagent.ftl @@ -32,4 +32,10 @@ cp14-reagent-name-basic-damage-cold = Ice solution cp14-reagent-desc-basic-damage-cold = Dangerous substance that causes severe frostbite. cp14-reagent-name-basic-vomit = Vomit solution -cp14-reagent-desc-basic-vomit = A substance that causes severe vomiting spasms. May help with food poisoning. \ No newline at end of file +cp14-reagent-desc-basic-vomit = A substance that causes severe vomiting spasms. May help with food poisoning. + +cp14-reagent-name-basic-drunk = Booze solution +cp14-reagent-desc-basic-drunk = A substance that causes dizziness and slurred speech. + +cp14-reagent-name-basic-jitter = Jitter solution +cp14-reagent-desc-basic-jitter = A substance that causes uncontrollable but safe spasms throughout the body. \ No newline at end of file diff --git a/Resources/Locale/en-US/_CP14/reagents/meta/biological.ftl b/Resources/Locale/en-US/_CP14/reagents/meta/biological.ftl index 400e5e09eb..44bd7e85aa 100644 --- a/Resources/Locale/en-US/_CP14/reagents/meta/biological.ftl +++ b/Resources/Locale/en-US/_CP14/reagents/meta/biological.ftl @@ -23,4 +23,10 @@ cp14-reagent-name-grounded-quartz = Ground quartz cp14-reagent-desc-grounded-quartz = A powder obtained from grinding quartz fragments. It has weak cleaning properties. cp14-reagent-name-lumi-shroom = Lumishroom sap -cp14-reagent-desc-lumi-shroom = A faintly shimmering slurry extracted from lumigrib. Often used by alchemists as a means of concentrating solutions. \ No newline at end of file +cp14-reagent-desc-lumi-shroom = A faintly shimmering slurry extracted from lumigrib. Often used by alchemists as a means of concentrating solutions. + +cp14-reagent-name-yellow-red-rose-pulp = Red rose pulp +cp14-reagent-desc-yellow-red-rose-pulp = Crushed red rose petals + +cp14-reagent-name-yellow-dayflin-pulp = Yellow dayfline pulp +cp14-reagent-desc-yellow-dayflin-pulp = Crushed flowers of sunny dayflines \ No newline at end of file diff --git a/Resources/Locale/en-US/_CP14/reagents/meta/physical-desc.ftl b/Resources/Locale/en-US/_CP14/reagents/meta/physical-desc.ftl index 48bb8d77af..049d8ee599 100644 --- a/Resources/Locale/en-US/_CP14/reagents/meta/physical-desc.ftl +++ b/Resources/Locale/en-US/_CP14/reagents/meta/physical-desc.ftl @@ -4,3 +4,4 @@ cp14-reagent-physical-desc-colorless = colorless cp14-reagent-physical-desc-viscous = viscous cp14-reagent-physical-desc-cloudy = cloudy cp14-reagent-physical-desc-sparkling = sparkling +cp14-reagent-physical-desc-pureed = pureed diff --git a/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl b/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl index b1e9cd606a..3b2d1e9813 100644 --- a/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl +++ b/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl @@ -133,7 +133,7 @@ ent-CP14ClothingDressBlack = черное платье ent-CP14ClothingPantsMercenaryTrousers = брюки наемника .desc = Разноцветные брюки наемника. Не порвите их. -ent-CP14ClothingPantsSouthernMagician = Платье южного фокусника +ent-CP14ClothingPantsSouthernMagician = платье южного фокусника .desc = Традиционная юбка южного мага, довольно свободная. ent-CP14ClothingShirtCottonBlue = хлопковая синяя рубаха diff --git a/Resources/Locale/ru-RU/_CP14/reagents/meta/basic-effect-reagent.ftl b/Resources/Locale/ru-RU/_CP14/reagents/meta/basic-effect-reagent.ftl index c2ad3334b7..7e760e01d0 100644 --- a/Resources/Locale/ru-RU/_CP14/reagents/meta/basic-effect-reagent.ftl +++ b/Resources/Locale/ru-RU/_CP14/reagents/meta/basic-effect-reagent.ftl @@ -32,4 +32,10 @@ cp14-reagent-name-basic-damage-cold = Ледяной раствор cp14-reagent-desc-basic-damage-cold = Опасное вещество, вызывающее сильные обморожения. cp14-reagent-name-basic-vomit = Рвотный раствор -cp14-reagent-desc-basic-vomit = Вещество, вызывающее сильные рвотные спазмы. Может помочь при пищевом отравлении. \ No newline at end of file +cp14-reagent-desc-basic-vomit = Вещество, вызывающее сильные рвотные спазмы. Может помочь при пищевом отравлении. + +cp14-reagent-name-basic-drunk = Пьянящий раствор +cp14-reagent-desc-basic-drunk = Вещество, вызывающее головокружение и несвязную речь. + +cp14-reagent-name-basic-jitter = Раствор трясучки +cp14-reagent-desc-basic-jitter = Вещество, вызывающее неконтролируемые, но безопасные спазмы во всем теле. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_CP14/reagents/meta/biological.ftl b/Resources/Locale/ru-RU/_CP14/reagents/meta/biological.ftl index 67fb6900d4..03a4d5b026 100644 --- a/Resources/Locale/ru-RU/_CP14/reagents/meta/biological.ftl +++ b/Resources/Locale/ru-RU/_CP14/reagents/meta/biological.ftl @@ -23,4 +23,10 @@ cp14-reagent-name-grounded-quartz = Размолотый кварц cp14-reagent-desc-grounded-quartz = Порошок, получаемый из размалывания осколков кварца. Имеет слабые очищающие свойства. cp14-reagent-name-lumi-shroom = Сок люмигриба -cp14-reagent-desc-lumi-shroom = Слабо мерцающая жижа, добытая из люмигриба. Часто используется алхимиками, как средство концентрации растворов. \ No newline at end of file +cp14-reagent-desc-lumi-shroom = Слабо мерцающая жижа, добытая из люмигриба. Часто используется алхимиками, как средство концентрации растворов. + +cp14-reagent-name-red-rose-pulp = Мякоть красных роз +cp14-reagent-desc-red-rose-pulp = Измельченные лепестки красных роз + +cp14-reagent-name-yellow-dayflin-pulp = Мякоть желтых днефлаев +cp14-reagent-desc-yellow-dayflin-pulp = Измельченные цветы солнечных днефлаев \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_CP14/reagents/meta/physical-desc.ftl b/Resources/Locale/ru-RU/_CP14/reagents/meta/physical-desc.ftl index d3e6b4f2d0..5d7aa09606 100644 --- a/Resources/Locale/ru-RU/_CP14/reagents/meta/physical-desc.ftl +++ b/Resources/Locale/ru-RU/_CP14/reagents/meta/physical-desc.ftl @@ -4,3 +4,4 @@ cp14-reagent-physical-desc-colorless = бесцветное cp14-reagent-physical-desc-viscous = вязкое cp14-reagent-physical-desc-cloudy = мутное cp14-reagent-physical-desc-sparkling = искрящееся +cp14-reagent-physical-desc-pureed = пюреобразное diff --git a/Resources/Maps/_CP14/alchemy_test.yml b/Resources/Maps/_CP14/alchemy_test.yml index f29cb1d4eb..03c3b0f5bf 100644 --- a/Resources/Maps/_CP14/alchemy_test.yml +++ b/Resources/Maps/_CP14/alchemy_test.yml @@ -23,7 +23,6 @@ entities: name: Map Entity - type: Transform - type: Map - mapPaused: True - type: PhysicsMap - type: GridTree - type: MovedGrids diff --git a/Resources/Maps/_CP14/alchemy_test_layer2.yml b/Resources/Maps/_CP14/alchemy_test_layer2.yml index 99cb3858df..522acc1dc7 100644 --- a/Resources/Maps/_CP14/alchemy_test_layer2.yml +++ b/Resources/Maps/_CP14/alchemy_test_layer2.yml @@ -15,7 +15,6 @@ entities: name: Map Entity - type: Transform - type: Map - mapPaused: True - type: PhysicsMap - type: GridTree - type: MovedGrids diff --git a/Resources/Maps/_CP14/dev_map.yml b/Resources/Maps/_CP14/dev_map.yml index b01adae6c6..3aa7244587 100644 --- a/Resources/Maps/_CP14/dev_map.yml +++ b/Resources/Maps/_CP14/dev_map.yml @@ -23,7 +23,6 @@ entities: - type: MapLight ambientLightColor: '#111111FF' - type: Map - mapPaused: True - type: PhysicsMap - type: GridTree - type: MovedGrids diff --git a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/herbal_gather.yml b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/herbal_gather.yml index 4f25fde063..6b5f11b2c2 100644 --- a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/herbal_gather.yml +++ b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/herbal_gather.yml @@ -8,7 +8,7 @@ - type: Sprite layers: - state: red - - sprite: _CP14/Structures/Specific/Farming/Herbals/agaric.rsi + - sprite: _CP14/Structures/Flora/Wild/agaric.rsi state: world1 - type: RandomSpawner prototypes: diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/produce.yml index 4bdf0c6a9d..d2faed360c 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/produce.yml @@ -10,7 +10,7 @@ flavors: - cabbage - type: Sprite - sprite: _CP14/Objects/Specific/Farming/Produce/cabbage.rsi + sprite: _CP14/Objects/Flora/Farm/cabbage.rsi layers: - state: base1 map: [ "random" ] @@ -75,7 +75,7 @@ flavors: - pumpkin - type: Sprite - sprite: _CP14/Objects/Specific/Farming/Produce/pumpkin.rsi + sprite: _CP14/Objects/Flora/Farm/pumpkin.rsi layers: - state: base1 map: [ "random" ] diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Specific/Farming/farm.yml b/Resources/Prototypes/_CP14/Entities/Objects/Flora/farm.yml similarity index 86% rename from Resources/Prototypes/_CP14/Entities/Objects/Specific/Farming/farm.yml rename to Resources/Prototypes/_CP14/Entities/Objects/Flora/farm.yml index 486d0c3095..112cf9d7bd 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Specific/Farming/farm.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Flora/farm.yml @@ -8,7 +8,7 @@ size: Tiny - type: Produce - type: Sprite - sprite: _CP14/Objects/Specific/Farming/Produce/wheat.rsi + sprite: _CP14/Objects/Flora/Farm/wheat.rsi layers: - state: base1 map: ["random"] diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Flora/flowers.yml b/Resources/Prototypes/_CP14/Entities/Objects/Flora/flowers.yml new file mode 100644 index 0000000000..5807ef8dee --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Objects/Flora/flowers.yml @@ -0,0 +1,63 @@ +- type: entity + id: CP14FlowersBase + parent: FoodProduceBase + abstract: true + components: + - type: Tag + tags: + - CP14FitInMortar + - type: BadFood + - type: Item + size: Tiny + - type: Produce + - type: Sprite + layers: + - state: base1 + map: ["random"] + - type: RandomSprite + available: + - random: + base1: "" + base2: "" + +- type: entity + id: CP14FlowersRed + parent: CP14FlowersBase + name: red rose + description: Beautiful red roses. Can be used to create red dye. + components: + - type: Sprite + sprite: _CP14/Objects/Flora/Flowers/red_rose.rsi + - type: Extractable + juiceSolution: + reagents: + - ReagentId: CP14RedRosePulp + Quantity: 4 + - type: SolutionContainerManager + solutions: + food: + maxVol: 5 + reagents: + - ReagentId: CP14RedRosePulp + Quantity: 4 + +- type: entity + id: CP14FlowersYellow + parent: CP14FlowersBase + name: yellow dayflin + description: A yellow sun flower that smells like melted milk. Can be processed into a yellow dye. + components: + - type: Sprite + sprite: _CP14/Objects/Flora/Flowers/yellow_dayflin.rsi + - type: Extractable + juiceSolution: + reagents: + - ReagentId: CP14YellowDayflinPulp + Quantity: 4 + - type: SolutionContainerManager + solutions: + food: + maxVol: 5 + reagents: + - ReagentId: CP14YellowDayflinPulp + Quantity: 4 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Specific/Farming/herbals.yml b/Resources/Prototypes/_CP14/Entities/Objects/Flora/herbals.yml similarity index 91% rename from Resources/Prototypes/_CP14/Entities/Objects/Specific/Farming/herbals.yml rename to Resources/Prototypes/_CP14/Entities/Objects/Flora/herbals.yml index 0bf85076a9..9534443125 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Specific/Farming/herbals.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Flora/herbals.yml @@ -12,7 +12,7 @@ size: Tiny - type: Produce - type: Sprite - sprite: _CP14/Objects/Specific/Farming/Produce/bloodgrass.rsi + sprite: _CP14/Objects/Flora/Wild/bloodgrass.rsi layers: - state: base1 map: ["random"] @@ -35,7 +35,7 @@ - type: SolutionContainerManager solutions: food: - maxVol: 20 + maxVol: 8 reagents: - ReagentId: CP14BloodGrassSap Quantity: 5 @@ -54,7 +54,7 @@ size: Tiny - type: Produce - type: Sprite - sprite: _CP14/Objects/Specific/Farming/Produce/agaric.rsi + sprite: _CP14/Objects/Flora/Wild/agaric.rsi layers: - state: base1 map: ["random"] @@ -74,7 +74,7 @@ - type: SolutionContainerManager solutions: food: - maxVol: 20 + maxVol: 5 reagents: - ReagentId: CP14AgaricMushroom Quantity: 3 @@ -93,7 +93,7 @@ size: Tiny - type: Produce - type: Sprite - sprite: _CP14/Objects/Specific/Farming/Produce/chromium_slime.rsi + sprite: _CP14/Objects/Flora/Wild/chromium_slime.rsi layers: - state: base1 map: ["random"] @@ -111,7 +111,7 @@ - type: SolutionContainerManager solutions: food: - maxVol: 20 + maxVol: 10 reagents: - ReagentId: CP14ChromiumSlime Quantity: 7 @@ -131,7 +131,7 @@ - 0,0,0,1 - type: Produce - type: Sprite - sprite: _CP14/Objects/Specific/Farming/Produce/wild_sage.rsi + sprite: _CP14/Objects/Flora/Wild/wild_sage.rsi layers: - state: base1 map: ["random"] @@ -149,7 +149,7 @@ - type: SolutionContainerManager solutions: food: - maxVol: 20 + maxVol: 10 reagents: - ReagentId: CP14WildSageSap Quantity: 8 @@ -197,7 +197,7 @@ size: Tiny - type: Produce - type: Sprite - sprite: _CP14/Objects/Specific/Farming/Produce/lumishroom.rsi + sprite: _CP14/Objects/Flora/Wild/lumishroom.rsi layers: - state: base1 map: ["random"] @@ -220,7 +220,7 @@ - type: SolutionContainerManager solutions: food: - maxVol: 20 + maxVol: 5 reagents: - ReagentId: CP14LumiMushroom - Quantity: 4 + Quantity: 4 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Materials/dye.yml b/Resources/Prototypes/_CP14/Entities/Objects/Materials/dye.yml new file mode 100644 index 0000000000..489387caf8 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Objects/Materials/dye.yml @@ -0,0 +1,77 @@ +- type: entity + id: CP14BaseDye + parent: BaseItem + abstract: true + name: dye + description: A bright, colorful dye used to paint various things. + components: + - type: Item + size: Tiny + - type: Sprite + sprite: _CP14/Objects/Materials/dye.rsi + +- type: entity + id: CP14DyeRed + parent: CP14BaseDye + name: red dye + components: + - type: Sprite + layers: + - state: base + - state: powder + color: "#bd2b26" + +- type: entity + id: CP14DyeYellow + parent: CP14BaseDye + name: yellow dye + components: + - type: Sprite + layers: + - state: base + - state: powder + color: "#ffe269" + +- type: entity + id: CP14DyeBlue + parent: CP14BaseDye + name: blue dye + components: + - type: Sprite + layers: + - state: base + - state: powder + color: "#5eabeb" + +- type: entity + id: CP14DyeGreen + parent: CP14BaseDye + name: green dye + components: + - type: Sprite + layers: + - state: base + - state: powder + color: "#85903e" + +- type: entity + id: CP14DyePurple + parent: CP14BaseDye + name: purple dye + components: + - type: Sprite + layers: + - state: base + - state: powder + color: "#8241cc" + +- type: entity + id: CP14DyeBlack + parent: CP14BaseDye + name: black dye + components: + - type: Sprite + layers: + - state: base + - state: powder + color: "#242329" \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Specific/Thaumaturgy/crystal.yml b/Resources/Prototypes/_CP14/Entities/Objects/Specific/Thaumaturgy/crystal.yml index 334e000b39..fa96bcd6a8 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Specific/Thaumaturgy/crystal.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Specific/Thaumaturgy/crystal.yml @@ -2,7 +2,7 @@ id: CP14EnergyCrystalBase parent: BaseItem abstract: true - description: Shards of one of the Khyber dragon, used to bind and control elemental energy. + description: A crystal shard capable of storing magical energy. components: - type: CP14MagicEnergyCrystal - type: Item @@ -15,7 +15,7 @@ - type: entity id: CP14EnergyCrystalSmall parent: CP14EnergyCrystalBase - name: small Khyber shard + name: small energyshard suffix: Full components: - type: Sprite @@ -46,7 +46,7 @@ - type: entity id: CP14EnergyCrystalMedium parent: CP14EnergyCrystalBase - name: Khyber shard + name: energyshard suffix: Full components: - type: PointLight diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Specific/Farming/Herbals/domesticated/cabbage.yml b/Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/Farm/cabbage.yml similarity index 92% rename from Resources/Prototypes/_CP14/Entities/Structures/Specific/Farming/Herbals/domesticated/cabbage.yml rename to Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/Farm/cabbage.yml index 68e83bca17..8050fc66b3 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Specific/Farming/Herbals/domesticated/cabbage.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/Farm/cabbage.yml @@ -5,7 +5,7 @@ description: OOO # TODO components: - type: Sprite - sprite: _CP14/Structures/Specific/Farming/Herbals/cabbage.rsi + sprite: _CP14/Structures/Flora/Farm/cabbage.rsi layers: - state: grow-1 map: ["enum.PlantVisualLayers.Base"] @@ -54,7 +54,7 @@ parent: CP14GatherableBase components: - type: Sprite - sprite: _CP14/Structures/Specific/Farming/Herbals/cabbage.rsi + sprite: _CP14/Structures/Flora/Farm/cabbage.rsi state: death - type: Gatherable toolWhitelist: diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Specific/Farming/Herbals/domesticated/pumpkin.yml b/Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/Farm/pumpkin.yml similarity index 92% rename from Resources/Prototypes/_CP14/Entities/Structures/Specific/Farming/Herbals/domesticated/pumpkin.yml rename to Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/Farm/pumpkin.yml index eca2605dad..c7f232ecda 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Specific/Farming/Herbals/domesticated/pumpkin.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/Farm/pumpkin.yml @@ -5,7 +5,7 @@ description: OOO # TODO components: - type: Sprite - sprite: _CP14/Structures/Specific/Farming/Herbals/pumpkin.rsi + sprite: _CP14/Structures/Flora/Farm/pumpkin.rsi layers: - state: grow-1 map: ["enum.PlantVisualLayers.Base"] @@ -54,7 +54,7 @@ parent: CP14GatherableBase components: - type: Sprite - sprite: _CP14/Structures/Specific/Farming/Herbals/pumpkin.rsi + sprite: _CP14/Structures/Flora/Farm/pumpkin.rsi state: death - type: Gatherable toolWhitelist: diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Specific/Farming/Herbals/domesticated/wheat.yml b/Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/Farm/wheat.yml similarity index 92% rename from Resources/Prototypes/_CP14/Entities/Structures/Specific/Farming/Herbals/domesticated/wheat.yml rename to Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/Farm/wheat.yml index fa5d25a0e6..877c22621d 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Specific/Farming/Herbals/domesticated/wheat.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/Farm/wheat.yml @@ -5,7 +5,7 @@ description: Most popular crop. Unpretentious, it opens the way to an abundance of flour products. components: - type: Sprite - sprite: _CP14/Structures/Specific/Farming/Herbals/wheat.rsi + sprite: _CP14/Structures/Flora/Farm/wheat.rsi layers: - state: grow-1 map: ["enum.PlantVisualLayers.Base"] @@ -55,7 +55,7 @@ parent: CP14GatherableBase components: - type: Sprite - sprite: _CP14/Structures/Specific/Farming/Herbals/wheat.rsi + sprite: _CP14/Structures/Flora/Farm/wheat.rsi state: death - type: Gatherable toolWhitelist: diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Specific/Farming/Herbals/base.yml b/Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/base.yml similarity index 100% rename from Resources/Prototypes/_CP14/Entities/Structures/Specific/Farming/Herbals/base.yml rename to Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/base.yml diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/flowers.yml b/Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/flowers.yml new file mode 100644 index 0000000000..a6f5f54e35 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/flowers.yml @@ -0,0 +1,70 @@ +- type: entity + id: CP14GatherableFlowersRed + parent: CP14GatherableWildBase + name: red rose + description: Beautiful red roses. Can be used to create red dye. + suffix: Gatherable + components: + - type: Sprite + drawdepth: FloorTiles + sprite: _CP14/Structures/Flora/Flowers/red_rose.rsi + layers: + - state: world1 + map: ["random"] + - type: RandomSprite + available: + - random: + world1: "" + world2: "" + world3: "" + - type: Gatherable + loot: + All: CP14GatherFlowersRed + toolWhitelist: + tags: + - CP14HerbalGathering + components: + - Hands + +- type: entityLootTable + id: CP14GatherFlowersRed + entries: + - id: CP14FlowersRed + amount: 1 + maxAmount: 2 + + +- type: entity + id: CP14GatherableFlowersYellow + parent: CP14GatherableWildBase + name: yellow dayflin + description: A yellow sun flower that smells like melted milk. Can be processed into a yellow dye. + suffix: Gatherable + components: + - type: Sprite + drawdepth: FloorTiles + sprite: _CP14/Structures/Flora/Flowers/yellow_dayflin.rsi + layers: + - state: world1 + map: ["random"] + - type: RandomSprite + available: + - random: + world1: "" + world2: "" + world3: "" + - type: Gatherable + loot: + All: CP14GatherFlowersYellow + toolWhitelist: + tags: + - CP14HerbalGathering + components: + - Hands + +- type: entityLootTable + id: CP14GatherFlowersYellow + entries: + - id: CP14FlowersYellow + amount: 1 + maxAmount: 2 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Specific/Farming/Herbals/wild.yml b/Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/wild.yml similarity index 87% rename from Resources/Prototypes/_CP14/Entities/Structures/Specific/Farming/Herbals/wild.yml rename to Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/wild.yml index a67cb59e16..b292728c95 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Specific/Farming/Herbals/wild.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/wild.yml @@ -17,7 +17,7 @@ components: - type: Sprite drawdepth: FloorTiles - sprite: _CP14/Structures/Specific/Farming/Herbals/bloodgrass.rsi + sprite: _CP14/Structures/Flora/Wild/bloodgrass.rsi layers: - state: grass1 map: ["random"] @@ -51,7 +51,7 @@ components: - type: Sprite drawdepth: FloorTiles - sprite: _CP14/Structures/Specific/Farming/Herbals/agaric.rsi + sprite: _CP14/Structures/Flora/Wild/agaric.rsi layers: - state: world1 map: ["random"] @@ -65,11 +65,6 @@ world5: "" world6: "" - type: Gatherable - toolWhitelist: - tags: - - CP14HerbalGathering - components: - - Hands loot: All: CP14GatherFlyAgaric @@ -91,7 +86,7 @@ components: - type: Sprite drawdepth: FloorTiles - sprite: _CP14/Structures/Specific/Farming/Herbals/chromium_slime.rsi + sprite: _CP14/Structures/Flora/Wild/chromium_slime.rsi layers: - state: world1 map: ["random"] @@ -126,7 +121,7 @@ components: - type: Sprite drawdepth: FloorTiles - sprite: _CP14/Structures/Specific/Farming/Herbals/wild_sage.rsi + sprite: _CP14/Structures/Flora/Wild/wild_sage.rsi layers: - state: world1 map: ["random"] @@ -158,7 +153,7 @@ components: - type: Sprite drawdepth: FloorTiles - sprite: _CP14/Structures/Specific/Farming/Herbals/lumishroom.rsi + sprite: _CP14/Structures/Flora/Wild/lumishroom.rsi layers: - state: world1 map: ["random"] @@ -175,10 +170,5 @@ color: "#36c98f" radius: 1.5 - type: Gatherable - toolWhitelist: - tags: - - CP14HerbalGathering - components: - - Hands loot: All: CP14GatherLumiMushroom \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Flora/grasshighbush.yml b/Resources/Prototypes/_CP14/Entities/Structures/Flora/grasshighbush.yml index e3c833ab9c..752b14f4d3 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Flora/grasshighbush.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Flora/grasshighbush.yml @@ -10,7 +10,7 @@ - type: Clickable - type: Sprite noRot: true - sprite: _CP14/Structures/Flora/GrassHighBush.rsi + sprite: _CP14/Structures/Flora/high_bush.rsi drawdepth: Mobs offset: 0,0.3 layers: @@ -88,7 +88,7 @@ - type: Sprite layers: - state: red - - sprite: _CP14/Structures/Flora/GrassHighBush.rsi + - sprite: _CP14/Structures/Flora/high_bush.rsi state: grass_high_bush1 - type: RandomSpawner prototypes: diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Flora/chasm.yml b/Resources/Prototypes/_CP14/Entities/Structures/chasm.yml similarity index 100% rename from Resources/Prototypes/_CP14/Entities/Structures/Flora/chasm.yml rename to Resources/Prototypes/_CP14/Entities/Structures/chasm.yml diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Flora/crystal.yml b/Resources/Prototypes/_CP14/Entities/Structures/crystal.yml similarity index 100% rename from Resources/Prototypes/_CP14/Entities/Structures/Flora/crystal.yml rename to Resources/Prototypes/_CP14/Entities/Structures/crystal.yml diff --git a/Resources/Prototypes/_CP14/Procedural/biomes_template_grasslands.yml b/Resources/Prototypes/_CP14/Procedural/biomes_template_grasslands.yml index 349e623a7d..c05d05c0cd 100644 --- a/Resources/Prototypes/_CP14/Procedural/biomes_template_grasslands.yml +++ b/Resources/Prototypes/_CP14/Procedural/biomes_template_grasslands.yml @@ -98,6 +98,42 @@ - CP14GrassBushes7 - CP14GrassBushes8 - CP14GrassBushes9 + - !type:BiomeEntityLayer # flowers + threshold: 0.7 + noise: + seed: 45 + noiseType: OpenSimplex2 + fractalType: Ridged + frequency: 0.035 + octaves: 3 + lacunarity: 1.8 + gain: 0.7 + domainWarpType: OpenSimplex2 + domainWarpAmp: 120 + allowedTiles: + - CP14FloorGrass + - CP14FloorGrassLight + - CP14FloorGrassTall + entities: + - CP14GatherableFlowersRed + - !type:BiomeEntityLayer # flowers + threshold: 0.7 + noise: + seed: 34 + noiseType: OpenSimplex2 + fractalType: Ridged + frequency: 0.035 + octaves: 3 + lacunarity: 1.8 + gain: 0.7 + domainWarpType: OpenSimplex2 + domainWarpAmp: 120 + allowedTiles: + - CP14FloorGrass + - CP14FloorGrassLight + - CP14FloorGrassTall + entities: + - CP14GatherableFlowersYellow - !type:BiomeEntityLayer # Tall grass! threshold: 0.3 noise: diff --git a/Resources/Prototypes/_CP14/Reagents/biological.yml b/Resources/Prototypes/_CP14/Reagents/Biological/biological.yml similarity index 73% rename from Resources/Prototypes/_CP14/Reagents/biological.yml rename to Resources/Prototypes/_CP14/Reagents/Biological/biological.yml index 7e3187f4d4..77dbbcc340 100644 --- a/Resources/Prototypes/_CP14/Reagents/biological.yml +++ b/Resources/Prototypes/_CP14/Reagents/Biological/biological.yml @@ -1,48 +1,3 @@ -- type: reagent - id: CP14Blood - group: CP14Biological - name: cp14-reagent-name-blood - desc: cp14-reagent-desc-blood - flavor: CP14Metallic - color: "#800000" - recognizable: true - physicalDesc: cp14-reagent-physical-desc-ferrous - slippery: false - footstepSound: - collection: FootstepBlood - params: - volume: 6 - -- type: reagent - id: CP14BloodTiefling - group: CP14Biological - desc: cp14-reagent-desc-blood-tiefling - name: cp14-reagent-name-blood-tiefling - flavor: CP14Metallic - color: "#803300" - recognizable: true - physicalDesc: cp14-reagent-physical-desc-ferrous - slippery: false - footstepSound: - collection: FootstepBlood - params: - volume: 6 - -- type: reagent - id: CP14BloodElf - group: CP14Biological - desc: cp14-reagent-desc-blood-elf - name: cp14-reagent-name-blood-elf - flavor: CP14Metallic - color: "#80003e" - recognizable: true - physicalDesc: cp14-reagent-physical-desc-ferrous - slippery: false - footstepSound: - collection: FootstepBlood - params: - volume: 6 - - type: reagent id: CP14BloodGrassSap group: CP14Biological @@ -170,4 +125,4 @@ component: SeeingRainbows type: Add time: 6 - refresh: false \ No newline at end of file + refresh: false diff --git a/Resources/Prototypes/_CP14/Reagents/Biological/blood.yml b/Resources/Prototypes/_CP14/Reagents/Biological/blood.yml new file mode 100644 index 0000000000..4f8f9a4b68 --- /dev/null +++ b/Resources/Prototypes/_CP14/Reagents/Biological/blood.yml @@ -0,0 +1,44 @@ +- type: reagent + id: CP14Blood + group: CP14Biological + name: cp14-reagent-name-blood + desc: cp14-reagent-desc-blood + flavor: CP14Metallic + color: "#800000" + recognizable: true + physicalDesc: cp14-reagent-physical-desc-ferrous + slippery: false + footstepSound: + collection: FootstepBlood + params: + volume: 6 + +- type: reagent + id: CP14BloodTiefling + group: CP14Biological + desc: cp14-reagent-desc-blood-tiefling + name: cp14-reagent-name-blood-tiefling + flavor: CP14Metallic + color: "#803300" + recognizable: true + physicalDesc: cp14-reagent-physical-desc-ferrous + slippery: false + footstepSound: + collection: FootstepBlood + params: + volume: 6 + +- type: reagent + id: CP14BloodElf + group: CP14Biological + desc: cp14-reagent-desc-blood-elf + name: cp14-reagent-name-blood-elf + flavor: CP14Metallic + color: "#80003e" + recognizable: true + physicalDesc: cp14-reagent-physical-desc-ferrous + slippery: false + footstepSound: + collection: FootstepBlood + params: + volume: 6 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Reagents/Biological/flowers.yml b/Resources/Prototypes/_CP14/Reagents/Biological/flowers.yml new file mode 100644 index 0000000000..21d746a3f2 --- /dev/null +++ b/Resources/Prototypes/_CP14/Reagents/Biological/flowers.yml @@ -0,0 +1,19 @@ +- type: reagent + id: CP14RedRosePulp + group: CP14Biological + name: cp14-reagent-name-red-rose-pulp + desc: cp14-reagent-desc-red-rose-pulp + flavor: CP14Sweetly + color: "#d74722" + physicalDesc: cp14-reagent-physical-desc-pureed + slippery: false + +- type: reagent + id: CP14YellowDayflinPulp + group: CP14Biological + name: cp14-reagent-name-yellow-dayflin-pulp + desc: cp14-reagent-desc-yellow-dayflin-pulp + flavor: CP14Sweetly + color: "#ffe269" + physicalDesc: cp14-reagent-physical-desc-pureed + slippery: false \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Reagents/basic-effects.yml b/Resources/Prototypes/_CP14/Reagents/basic-effects.yml index 6e32effb9d..c384cd0fdf 100644 --- a/Resources/Prototypes/_CP14/Reagents/basic-effects.yml +++ b/Resources/Prototypes/_CP14/Reagents/basic-effects.yml @@ -184,4 +184,31 @@ Food: effects: - !type:ChemVomit - probability: 0.25 \ No newline at end of file + probability: 0.25 + +- type: reagent + id: CP14BasicEffectDrunk + name: cp14-reagent-name-basic-drunk + desc: cp14-reagent-desc-basic-drunk + group: CP14BasicEffect + flavor: CP14Vomit + color: "#ae64c4" + physicalDesc: cp14-reagent-physical-desc-colorless + metabolisms: + Food: + effects: + - !type:Drunk + boozePower: 15 + +- type: reagent + id: CP14BasicEffectJitter + name: cp14-reagent-name-basic-jitter + desc: cp14-reagent-desc-basic-jitter + group: CP14BasicEffect + flavor: CP14Vomit + color: "#347d70" + physicalDesc: cp14-reagent-physical-desc-colorless + metabolisms: + Food: + effects: + - !type:Jitter \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/brewing_bloodgrass.yml b/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/brewing_bloodgrass.yml index 435cdd3169..13c9d42705 100644 --- a/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/brewing_bloodgrass.yml +++ b/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/brewing_bloodgrass.yml @@ -1,12 +1,6 @@ # Idea: # bloodgrass is a special reagent that can yield different base reagents, depending on the type of blood it is mixed with. -# Rules: -# 1) all values must be multiples of 0.25 -# 2) 25% products must be occupied by the empty solution -# 3) bloodgrass should mix with ALL blood variants -# 4) all reactions should take place at a temperature of 500, and reduce the temperature by 250. - - type: reaction id: CP14BloodGrassBrewingBlood minTemp: 500 @@ -16,13 +10,12 @@ amount: 0.5 CP14BloodGrassSap: amount: 0.5 + CP14GroundQuartz: + amount: 0.5 products: - CP14BasicEffectEmpty: 0.25 - CP14BasicEffectSatiateHunger: 0.25 + CP14BasicEffectEmpty: 0.75 + CP14BasicEffectSatiateHunger: 0.5 CP14BasicEffectHealBrute: 0.25 - cp14RandomProducts: - - CP14BasicEffectSatiateHunger: 0.25 - - CP14BasicEffectHealBrute: 0.25 effects: - !type:CP14AffectSolutionTemperature addTemperature: -250 @@ -36,13 +29,12 @@ amount: 0.5 CP14BloodGrassSap: amount: 0.5 + CP14GroundQuartz: + amount: 0.5 products: - CP14BasicEffectEmpty: 0.25 - CP14BasicEffectSatiateHunger: 0.25 + CP14BasicEffectEmpty: 0.75 + CP14BasicEffectSatiateHunger: 0.5 CP14BasicEffectHealCold: 0.25 - cp14RandomProducts: - - CP14BasicEffectSatiateHunger: 0.25 - - CP14BasicEffectHealCold: 0.25 effects: - !type:CP14AffectSolutionTemperature addTemperature: -250 @@ -56,13 +48,12 @@ amount: 0.5 CP14BloodGrassSap: amount: 0.5 + CP14GroundQuartz: + amount: 0.5 products: - CP14BasicEffectEmpty: 0.25 + CP14BasicEffectEmpty: 0.75 CP14BasicEffectSatiateHunger: 0.25 CP14BasicEffectHealPoison: 0.25 - cp14RandomProducts: - - CP14BasicEffectSatiateHunger: 0.25 - - CP14BasicEffectHealPoison: 0.25 effects: - !type:CP14AffectSolutionTemperature addTemperature: -250 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/brewing_complex.yml b/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/brewing_complex.yml deleted file mode 100644 index 35348f8b6d..0000000000 --- a/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/brewing_complex.yml +++ /dev/null @@ -1,44 +0,0 @@ -# Idea: -# A more comprehensive way to get the base effects from several ingredients at once. Can give rarer effects, but at the cost of a large number of different effects in the pile. - -# Rules: -# 1) all values must be multiples of 0.25 -# 2) 25% products must be occupied by the empty solution -# 3) there should be 3 different effects as a result. One of them is very useful, the second useful, the third useless. -# 4) all reactions should take place at a temperature of 500, and reduce the temperature by 250. -# 5) the priority should be higher than that of a simple brewing reaction - -- type: reaction - id: CP14BloodGrassAndWildSageSapBrewing - minTemp: 500 - priority: 3 - reactants: - CP14BloodGrassSap: - amount: 0.5 - CP14WildSageSap: - amount: 0.5 - products: - CP14BasicEffectEmpty: 0.25 - CP14BasicEffectHealBrute: 0.25 - CP14BasicEffectEmoteCough: 0.25 - CP14BasicEffectSatiateHunger: 0.25 - effects: - - !type:CP14AffectSolutionTemperature - addTemperature: -250 - -- type: reaction - id: CP14QuartzAndAgaricBrewing - minTemp: 500 - priority: 3 - reactants: - CP14AgaricMushroom: - amount: 0.5 - CP14GroundQuartz: - amount: 0.5 - products: - CP14BasicEffectEmpty: 0.25 - CP14BasicEffectDamagePoison: 0.5 - CP14BasicEffectVomit: 0.25 - effects: - - !type:CP14AffectSolutionTemperature - addTemperature: -250 diff --git a/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/brewing_simple.yml b/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/brewing_simple.yml index 0f7a872a37..cbef8da0da 100644 --- a/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/brewing_simple.yml +++ b/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/brewing_simple.yml @@ -1,11 +1,6 @@ # Idea: # The easiest way to get basic effects from various herbs. Has the highest level of empty solution. -# Rules: -# 1) all values must be multiples of 0.25 -# 2) 50%+ products must be occupied by the empty solution -# 3) one result must be useful, the other useless. -# 4) all reactions should take place at a temperature of 500, and reduce the temperature by 250. - type: reaction id: CP14AgaricShroomBrewing @@ -14,12 +9,19 @@ reactants: CP14AgaricMushroom: amount: 1 + CP14GroundQuartz: + amount: 1 products: - CP14BasicEffectEmpty: 0.5 - CP14BasicEffectDamagePoison: 0.25 + CP14BasicEffectEmpty: 0.75 + CP14BasicEffectDamagePoison: 0.5 + CP14BasicEffectRainbow: 0.25 cp14RandomProducts: - CP14BasicEffectVomit: 0.25 - - CP14BasicEffectRainbow: 0.25 + CP14BasicEffectDamageBrute: 0.25 + - CP14BasicEffectSatiateHunger: 0.25 + CP14BasicEffectRainbow: 0.25 + - CP14BasicEffectSatiateThirst: 0.25 + CP14BasicEffectVomit: 0.25 effects: - !type:CP14AffectSolutionTemperature addTemperature: -250 @@ -31,25 +33,19 @@ reactants: CP14WildSageSap: amount: 1 - products: - CP14BasicEffectEmpty: 0.5 - CP14BasicEffectHealBrute: 0.25 - cp14RandomProducts: - - CP14BasicEffectEmoteCough: 0.25 - - CP14BasicEffectHealCold: 0.25 - effects: - - !type:CP14AffectSolutionTemperature - addTemperature: -250 - -- type: reaction - id: CP14GroundQuartzBrewing - minTemp: 500 - priority: 2 - reactants: CP14GroundQuartz: amount: 1 products: - CP14BasicEffectEmpty: 1 + CP14BasicEffectEmpty: 0.75 + CP14BasicEffectHealBrute: 0.5 + CP14BasicEffectEmoteCough: 0.25 + cp14RandomProducts: + - CP14BasicEffectRainbow: 0.25 + CP14BasicEffectHealCold: 0.25 + - CP14BasicEffectEmoteCough: 0.25 + CP14BasicEffectHealPoison: 0.25 + - CP14BasicEffectEmoteCough: 0.25 + CP14BasicEffectHealPoison: 0.25 effects: - !type:CP14AffectSolutionTemperature addTemperature: -250 @@ -61,12 +57,12 @@ reactants: CP14LumiMushroom: amount: 1 + CP14GroundQuartz: + amount: 1 products: - CP14BasicEffectEmpty: 0.5 - CP14BasicEffectVomit: 0.25 - cp14RandomProducts: - - CP14BasicEffectRainbow: 0.25 - - CP14BasicEffectEmoteCough: 0.25 + CP14BasicEffectEmpty: 0.75 + CP14BasicEffectVomit: 0.5 + CP14BasicEffectRainbow: 0.5 effects: - !type:CP14AffectSolutionTemperature addTemperature: -250 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/chromium_inverse.yml b/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/chromium_inverse.yml index 9b46017c8b..72a3be5109 100644 --- a/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/chromium_inverse.yml +++ b/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/chromium_inverse.yml @@ -12,10 +12,8 @@ reactants: CP14ChromiumSlime: amount: 1 - CP14BasicEffectEmpty: - amount: 1 products: - CP14BasicEffectEmpty: 2 + CP14BasicEffectEmpty: 1 effects: - !type:CP14InverseEffect inversion: diff --git a/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/mixing_simple.yml b/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/mixing_simple.yml index e2afe8744d..5c592cef84 100644 --- a/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/mixing_simple.yml +++ b/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/mixing_simple.yml @@ -9,113 +9,100 @@ - type: reaction id: CP14DamagePoisonSplitting + minTemp: 450 priority: 3 reactants: CP14BasicEffectDamagePoison: amount: 0.5 CP14BloodGrassSap: - amount: 0.25 - CP14BasicEffectEmpty: - amount: 0.25 + amount: 0.5 products: - CP14BasicEffectDamageBrute: 0.25 + CP14BasicEffectDamageBrute: 0.5 cp14RandomProducts: - - CP14BasicEffectRainbow: 0.25 - - CP14BasicEffectDamageBrute: 0.25 + - CP14BasicEffectRainbow: 0.5 + - CP14BasicEffectDamageCold: 0.5 + - CP14BasicEffectDrunk: 0.5 - type: reaction id: CP14HealBruteSplitting + minTemp: 450 priority: 3 reactants: CP14BasicEffectHealBrute: amount: 0.5 CP14AgaricMushroom: - amount: 0.25 - CP14BasicEffectEmpty: - amount: 0.25 + amount: 0.5 products: - CP14BasicEffectSatiateHunger: 0.25 - CP14BasicEffectSatiateThirst: 0.25 + CP14BasicEffectSatiateHunger: 0.5 + CP14BasicEffectSatiateThirst: 0.5 - type: reaction id: CP14SatiateHungerSplitting + minTemp: 450 priority: 3 reactants: CP14BasicEffectSatiateHunger: amount: 0.5 CP14WildSageSap: - amount: 0.25 - CP14BasicEffectEmpty: - amount: 0.25 + amount: 0.5 products: - CP14BasicEffectHealBrute: 0.25 + CP14BasicEffectHealBrute: 0.5 cp14RandomProducts: - - CP14BasicEffectEmoteCough: 0.25 - - CP14BasicEffectHealBrute: 0.25 + - CP14BasicEffectEmoteCough: 0.5 + - CP14BasicEffectDrunk: 0.5 + - CP14BasicEffectJitter: 0.5 - type: reaction id: CP14SatiateThirstSplitting + minTemp: 450 priority: 3 reactants: CP14BasicEffectSatiateThirst: amount: 0.5 CP14WildSageSap: - amount: 0.25 - CP14BasicEffectEmpty: - amount: 0.25 + amount: 0.5 products: CP14BasicEffectHealBrute: 0.25 - cp14RandomProducts: - - CP14BasicEffectEmoteCough: 0.25 - - CP14BasicEffectHealBrute: 0.25 + CP14BasicEffectEmoteCough: 0.25 - type: reaction id: CP14EmoteCoughSplitting + minTemp: 450 priority: 3 reactants: CP14BasicEffectEmoteCough: amount: 0.5 - CP14GroundQuartz: - amount: 0.25 - CP14BasicEffectEmpty: - amount: 0.25 + CP14BloodElf: + amount: 0.5 products: CP14BasicEffectSatiateThirst: 0.25 - cp14RandomProducts: - - CP14BasicEffectSatiateThirst: 0.25 - - CP14BasicEffectHealBrute: 0.25 + CP14BasicEffectHealBrute: 0.25 - type: reaction id: CP14RainbowSplitting + minTemp: 450 priority: 3 reactants: CP14BasicEffectRainbow: amount: 0.5 CP14BloodTiefling: - amount: 0.25 - CP14BasicEffectEmpty: - amount: 0.25 + amount: 0.5 products: CP14BasicEffectHealCold: 0.25 - cp14RandomProducts: - - CP14BasicEffectSatiateThirst: 0.25 - - CP14BasicEffectHealCold: 0.25 + CP14BasicEffectSatiateThirst: 0.25 - type: reaction id: CP14VomitSplitting + minTemp: 450 priority: 3 reactants: CP14BasicEffectVomit: amount: 0.5 CP14BloodTiefling: - amount: 0.25 - CP14BasicEffectEmpty: - amount: 0.25 + amount: 0.5 products: CP14BasicEffectDamagePoison: 0.25 - cp14RandomProducts: - - CP14BasicEffectEmoteCough: 0.25 - - CP14BasicEffectDamagePoison: 0.25 + CP14BasicEffectEmoteCough: 0.25 - type: reaction id: CP14EmptySplitting diff --git a/Resources/Prototypes/_CP14/Recipes/Reactions/dye_brewing.yml b/Resources/Prototypes/_CP14/Recipes/Reactions/dye_brewing.yml new file mode 100644 index 0000000000..13e85e4d3f --- /dev/null +++ b/Resources/Prototypes/_CP14/Recipes/Reactions/dye_brewing.yml @@ -0,0 +1,25 @@ +- type: reaction + id: CP14RedRoseBrewing + impact: Low + quantized: true + conserveEnergy: false + minTemp: 500 + reactants: + CP14RedRosePulp: + amount: 10 + effects: + - !type:CreateEntityReactionEffect + entity: CP14DyeRed + +- type: reaction + id: CP14YellowDayflinBrewing + impact: Low + quantized: true + conserveEnergy: false + minTemp: 500 + reactants: + CP14YellowDayflinPulp: + amount: 10 + effects: + - !type:CreateEntityReactionEffect + entity: CP14DyeYellow \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/sewing_table.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/sewing_table.yml index 9996d25512..659bc7e237 100644 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/sewing_table.yml +++ b/Resources/Prototypes/_CP14/Recipes/Workbench/sewing_table.yml @@ -3,6 +3,7 @@ craftTime: 2 entities: CP14String: 1 + CP14DyeBlue: 1 stacks: CP14Cloth: 2 result: CP14ClothingShirtCottonBlue @@ -12,6 +13,7 @@ craftTime: 2 entities: CP14String: 1 + CP14DyeBlack: 1 stacks: CP14Cloth: 3 result: CP14ClothingShirtCottonBlack @@ -21,6 +23,7 @@ craftTime: 2 entities: CP14String: 1 + CP14DyePurple: 1 stacks: CP14Cloth: 3 result: CP14ClothingShirtCottonPurple @@ -30,6 +33,7 @@ craftTime: 2 entities: CP14String: 1 + CP14DyeRed: 1 stacks: CP14Cloth: 3 result: CP14ClothingShirtCottonRed @@ -48,6 +52,7 @@ craftTime: 2 entities: CP14String: 1 + CP14DyeYellow: 1 stacks: CP14Cloth: 3 result: CP14ClothingShirtCottonYellow @@ -57,6 +62,8 @@ craftTime: 2 entities: CP14String: 1 + CP14DyeBlue: 1 + CP14DyeRed: 1 stacks: CP14Cloth: 3 result: CP14ClothingShirtMercenary @@ -66,6 +73,9 @@ craftTime: 2 entities: CP14String: 1 + CP14DyeYellow: 1 + CP14DyeBlue: 1 + CP14DyeRed: 1 stacks: CP14Cloth: 3 result: CP14ClothingShirtYellowWizard @@ -75,6 +85,7 @@ craftTime: 2 entities: CP14String: 1 + CP14DyeBlue: 1 stacks: CP14Cloth: 3 result: CP14ClothingCloakSimpleDarkBlue @@ -102,6 +113,7 @@ craftTime: 2 entities: CP14String: 1 + CP14DyeBlue: 1 stacks: CP14Cloth: 2 result: CP14ClothingPantsTrouserDarkBlue @@ -111,6 +123,7 @@ craftTime: 2 entities: CP14String: 1 + CP14DyeBlack: 1 stacks: CP14Cloth: 2 result: CP14ClothingDressBlack @@ -120,6 +133,7 @@ craftTime: 2 entities: CP14String: 1 + CP14DyeYellow: 1 stacks: CP14Cloth: 2 result: CP14ClothingPantsSouthernMagician @@ -129,6 +143,8 @@ craftTime: 2 entities: CP14String: 1 + CP14DyeBlue: 1 + CP14DyeRed: 1 stacks: CP14Cloth: 2 result: CP14ClothingPantsMercenaryTrousers @@ -138,6 +154,7 @@ craftTime: 2 entities: CP14String: 1 + CP14DyeRed: 1 stacks: CP14Cloth: 1 result: CP14ClothingHeadRedBeret @@ -147,6 +164,7 @@ craftTime: 2 entities: CP14String: 1 + CP14DyePurple: 1 stacks: CP14Cloth: 1 result: CP14ClothingHeadPurpleBeret @@ -156,6 +174,7 @@ craftTime: 2 entities: CP14String: 1 + CP14DyeYellow: 1 stacks: CP14Cloth: 1 result: CP14ClothingHeadYellowBeret @@ -165,6 +184,7 @@ craftTime: 2 entities: CP14String: 1 + CP14DyeBlue: 1 stacks: CP14Cloth: 1 result: CP14ClothingHeadBlueBeret @@ -174,6 +194,7 @@ craftTime: 2 entities: CP14String: 1 + CP14DyeBlack: 1 stacks: CP14Cloth: 1 result: CP14ClothingHeadBlackBeret @@ -183,6 +204,7 @@ craftTime: 2 entities: CP14String: 1 + CP14DyeYellow: 1 stacks: CP14Cloth: 2 result: CP14ClothingHeadYellowHat @@ -192,6 +214,8 @@ craftTime: 2 entities: CP14String: 1 + CP14DyeRed: 1 + CP14DyeBlue: 1 stacks: CP14Cloth: 2 result: CP14ClothingHeadMercenaryBeret \ No newline at end of file diff --git a/Resources/Textures/_CP14/Objects/Specific/Farming/Produce/cabbage.rsi/base1.png b/Resources/Textures/_CP14/Objects/Flora/Farm/cabbage.rsi/base1.png similarity index 100% rename from Resources/Textures/_CP14/Objects/Specific/Farming/Produce/cabbage.rsi/base1.png rename to Resources/Textures/_CP14/Objects/Flora/Farm/cabbage.rsi/base1.png diff --git a/Resources/Textures/_CP14/Objects/Specific/Farming/Produce/cabbage.rsi/base2.png b/Resources/Textures/_CP14/Objects/Flora/Farm/cabbage.rsi/base2.png similarity index 100% rename from Resources/Textures/_CP14/Objects/Specific/Farming/Produce/cabbage.rsi/base2.png rename to Resources/Textures/_CP14/Objects/Flora/Farm/cabbage.rsi/base2.png diff --git a/Resources/Textures/_CP14/Objects/Specific/Farming/Produce/cabbage.rsi/base3.png b/Resources/Textures/_CP14/Objects/Flora/Farm/cabbage.rsi/base3.png similarity index 100% rename from Resources/Textures/_CP14/Objects/Specific/Farming/Produce/cabbage.rsi/base3.png rename to Resources/Textures/_CP14/Objects/Flora/Farm/cabbage.rsi/base3.png diff --git a/Resources/Textures/_CP14/Objects/Specific/Farming/Produce/cabbage.rsi/meta.json b/Resources/Textures/_CP14/Objects/Flora/Farm/cabbage.rsi/meta.json similarity index 100% rename from Resources/Textures/_CP14/Objects/Specific/Farming/Produce/cabbage.rsi/meta.json rename to Resources/Textures/_CP14/Objects/Flora/Farm/cabbage.rsi/meta.json diff --git a/Resources/Textures/_CP14/Objects/Specific/Farming/Produce/cabbage.rsi/slice1.png b/Resources/Textures/_CP14/Objects/Flora/Farm/cabbage.rsi/slice1.png similarity index 100% rename from Resources/Textures/_CP14/Objects/Specific/Farming/Produce/cabbage.rsi/slice1.png rename to Resources/Textures/_CP14/Objects/Flora/Farm/cabbage.rsi/slice1.png diff --git a/Resources/Textures/_CP14/Objects/Specific/Farming/Produce/cabbage.rsi/slice2.png b/Resources/Textures/_CP14/Objects/Flora/Farm/cabbage.rsi/slice2.png similarity index 100% rename from Resources/Textures/_CP14/Objects/Specific/Farming/Produce/cabbage.rsi/slice2.png rename to Resources/Textures/_CP14/Objects/Flora/Farm/cabbage.rsi/slice2.png diff --git a/Resources/Textures/_CP14/Objects/Specific/Farming/Produce/cabbage.rsi/slice3.png b/Resources/Textures/_CP14/Objects/Flora/Farm/cabbage.rsi/slice3.png similarity index 100% rename from Resources/Textures/_CP14/Objects/Specific/Farming/Produce/cabbage.rsi/slice3.png rename to Resources/Textures/_CP14/Objects/Flora/Farm/cabbage.rsi/slice3.png diff --git a/Resources/Textures/_CP14/Objects/Specific/Farming/Produce/cabbage.rsi/slice4.png b/Resources/Textures/_CP14/Objects/Flora/Farm/cabbage.rsi/slice4.png similarity index 100% rename from Resources/Textures/_CP14/Objects/Specific/Farming/Produce/cabbage.rsi/slice4.png rename to Resources/Textures/_CP14/Objects/Flora/Farm/cabbage.rsi/slice4.png diff --git a/Resources/Textures/_CP14/Objects/Specific/Farming/Produce/pumpkin.rsi/base1.png b/Resources/Textures/_CP14/Objects/Flora/Farm/pumpkin.rsi/base1.png similarity index 100% rename from Resources/Textures/_CP14/Objects/Specific/Farming/Produce/pumpkin.rsi/base1.png rename to Resources/Textures/_CP14/Objects/Flora/Farm/pumpkin.rsi/base1.png diff --git a/Resources/Textures/_CP14/Objects/Specific/Farming/Produce/pumpkin.rsi/base2.png b/Resources/Textures/_CP14/Objects/Flora/Farm/pumpkin.rsi/base2.png similarity index 100% rename from Resources/Textures/_CP14/Objects/Specific/Farming/Produce/pumpkin.rsi/base2.png rename to Resources/Textures/_CP14/Objects/Flora/Farm/pumpkin.rsi/base2.png diff --git a/Resources/Textures/_CP14/Objects/Specific/Farming/Produce/pumpkin.rsi/base3.png b/Resources/Textures/_CP14/Objects/Flora/Farm/pumpkin.rsi/base3.png similarity index 100% rename from Resources/Textures/_CP14/Objects/Specific/Farming/Produce/pumpkin.rsi/base3.png rename to Resources/Textures/_CP14/Objects/Flora/Farm/pumpkin.rsi/base3.png diff --git a/Resources/Textures/_CP14/Objects/Specific/Farming/Produce/pumpkin.rsi/base4.png b/Resources/Textures/_CP14/Objects/Flora/Farm/pumpkin.rsi/base4.png similarity index 100% rename from Resources/Textures/_CP14/Objects/Specific/Farming/Produce/pumpkin.rsi/base4.png rename to Resources/Textures/_CP14/Objects/Flora/Farm/pumpkin.rsi/base4.png diff --git a/Resources/Textures/_CP14/Objects/Specific/Farming/Produce/pumpkin.rsi/meta.json b/Resources/Textures/_CP14/Objects/Flora/Farm/pumpkin.rsi/meta.json similarity index 100% rename from Resources/Textures/_CP14/Objects/Specific/Farming/Produce/pumpkin.rsi/meta.json rename to Resources/Textures/_CP14/Objects/Flora/Farm/pumpkin.rsi/meta.json diff --git a/Resources/Textures/_CP14/Objects/Specific/Farming/Produce/pumpkin.rsi/slice1.png b/Resources/Textures/_CP14/Objects/Flora/Farm/pumpkin.rsi/slice1.png similarity index 100% rename from Resources/Textures/_CP14/Objects/Specific/Farming/Produce/pumpkin.rsi/slice1.png rename to Resources/Textures/_CP14/Objects/Flora/Farm/pumpkin.rsi/slice1.png diff --git a/Resources/Textures/_CP14/Objects/Specific/Farming/Produce/pumpkin.rsi/slice2.png b/Resources/Textures/_CP14/Objects/Flora/Farm/pumpkin.rsi/slice2.png similarity index 100% rename from Resources/Textures/_CP14/Objects/Specific/Farming/Produce/pumpkin.rsi/slice2.png rename to Resources/Textures/_CP14/Objects/Flora/Farm/pumpkin.rsi/slice2.png diff --git a/Resources/Textures/_CP14/Objects/Specific/Farming/Produce/pumpkin.rsi/slice3.png b/Resources/Textures/_CP14/Objects/Flora/Farm/pumpkin.rsi/slice3.png similarity index 100% rename from Resources/Textures/_CP14/Objects/Specific/Farming/Produce/pumpkin.rsi/slice3.png rename to Resources/Textures/_CP14/Objects/Flora/Farm/pumpkin.rsi/slice3.png diff --git a/Resources/Textures/_CP14/Objects/Specific/Farming/Produce/pumpkin.rsi/slice4.png b/Resources/Textures/_CP14/Objects/Flora/Farm/pumpkin.rsi/slice4.png similarity index 100% rename from Resources/Textures/_CP14/Objects/Specific/Farming/Produce/pumpkin.rsi/slice4.png rename to Resources/Textures/_CP14/Objects/Flora/Farm/pumpkin.rsi/slice4.png diff --git a/Resources/Textures/_CP14/Objects/Specific/Farming/Produce/wheat.rsi/base1.png b/Resources/Textures/_CP14/Objects/Flora/Farm/wheat.rsi/base1.png similarity index 100% rename from Resources/Textures/_CP14/Objects/Specific/Farming/Produce/wheat.rsi/base1.png rename to Resources/Textures/_CP14/Objects/Flora/Farm/wheat.rsi/base1.png diff --git a/Resources/Textures/_CP14/Objects/Specific/Farming/Produce/wheat.rsi/base2.png b/Resources/Textures/_CP14/Objects/Flora/Farm/wheat.rsi/base2.png similarity index 100% rename from Resources/Textures/_CP14/Objects/Specific/Farming/Produce/wheat.rsi/base2.png rename to Resources/Textures/_CP14/Objects/Flora/Farm/wheat.rsi/base2.png diff --git a/Resources/Textures/_CP14/Objects/Specific/Farming/Produce/wheat.rsi/meta.json b/Resources/Textures/_CP14/Objects/Flora/Farm/wheat.rsi/meta.json similarity index 100% rename from Resources/Textures/_CP14/Objects/Specific/Farming/Produce/wheat.rsi/meta.json rename to Resources/Textures/_CP14/Objects/Flora/Farm/wheat.rsi/meta.json diff --git a/Resources/Textures/_CP14/Objects/Flora/Flowers/red_rose.rsi/base1.png b/Resources/Textures/_CP14/Objects/Flora/Flowers/red_rose.rsi/base1.png new file mode 100644 index 0000000000000000000000000000000000000000..e8ff1da4ff29ec0c36b0a1fbaa0384f354087357 GIT binary patch literal 423 zcmV;Y0a*TtP)Px$VM#cBpkpOQ|?CgeM>ykez151_O_p_mr{rLrcPZNcs8 zcm^s~%5&u|($BC|*2JLiV3;;{H}}$Uq&jeUwHHWoX@Tx*ERf{j^9l;Zyg1lN(rgRr zk1u4mR#;qCxIV9ja|Le2hG|o;He!ZpGw3^%%9^LGH@5(c+dnPjO3327b;l>W!Z7WL zfOO^`d~L!)F)w;=U-ZlY^{V$}GYj7{@L_!hkyoCqwjn)me-YS!AR;0{mT#jplh7wl R87u$*002ovPDHLkV1gn5xyJwi literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/Flora/Flowers/red_rose.rsi/base2.png b/Resources/Textures/_CP14/Objects/Flora/Flowers/red_rose.rsi/base2.png new file mode 100644 index 0000000000000000000000000000000000000000..1302bb3c5f4a76e3f82a1e5c5700b216207f9fd9 GIT binary patch literal 398 zcmV;90df9`P)Px$NJ&INR9J=WmA^{EP#8x~gF{=%P!R&^Af4i*OUDu+gKv<*p)U~n2xjpad;tds z-$7_+7vs`S;$VfK5F}JP$h{7d7{y|5ZtT*WDdhe+zkGc61}Z8lR-Ky4Ylm340#-vXm^L%{*3NqtZYcqxx38(G z{PAH;#|x-z;qdQ2ruJR> s93_OqaV literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/Flora/Flowers/red_rose.rsi/meta.json b/Resources/Textures/_CP14/Objects/Flora/Flowers/red_rose.rsi/meta.json new file mode 100644 index 0000000000..9d30296431 --- /dev/null +++ b/Resources/Textures/_CP14/Objects/Flora/Flowers/red_rose.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "All rights reserved for the CrystallPunk14 project only", + "copyright": "Created by TheShuEd (Github) for CrystallPunk14", + "states": [ + { + "name": "base1" + }, + { + "name": "base2" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_CP14/Objects/Flora/Flowers/yellow_dayflin.rsi/base1.png b/Resources/Textures/_CP14/Objects/Flora/Flowers/yellow_dayflin.rsi/base1.png new file mode 100644 index 0000000000000000000000000000000000000000..dc2c3c471eaf3fd513989349771768f6b42f1db3 GIT binary patch literal 357 zcmV-r0h<1aP)Px$A4x<(R9J=WlA&tDP!xv0J7yLdR~U3J5LXi@%nZhSRAn9@ezJ0M?@%$uf#@NcTq7Ty5aUYOyuz&4K&dE2PdOiUQV~gNqa@ zx2LqTSiPx$8A(JzR9J=WlCes|Kp4k=CoTrF1%wXHc>qOl^aVQAEf0`)aP%Dnm+p4z16b%% z2z9xwWDHy+P;|IJJ9!RzlHig{N~ilRAKZO>|Ns5J1CPh!@i=0N)acpRm?AZYn0MmR ztY>2baDFqQ&dQdlW_97TYoi@*g|$=wln+;?&Pq&?nx?6)bWT8AK8ZRj(NdwMBFO~+ zNiNV*@&3I2x%*A&;06G~$y_A4U>XIj^Jx^2XLn2y} z6C_v{Cy4Yk1scpb(08-)zvtD%9=zS+W=H>vPk++>*)~XBFjtS;RA&i`z}tpxJoo=! z3UcB(A;#TZaQJ5a{TkKNj6O>u`gkVjwtq}aTC#+7kxTPx%$Vo&&R9J=Wmb;GHKoo|5gAw3`NJvN&5mI0k;f|zmV=6)s37OUf9dD3#*az8; zf_7KiLAHS+2x+NsiiC|=QCURVa1k*uDV(v4Grn-yE=NL^$1`)jIS2p0fip%kFOoyo zgwC1#{oCIML!1SmnHR}u7sK?4$Dt4>12pp@$;5Z47oKsy5HNk>G1|od02Ngt)rRZ| zb232vyT;MP6oMxIAjf^z^QQs;z}4dehd1vCz5;`?fOH~^=zJS!ttWuJe0SG9&OS!( zX$;B&N<|*&Zv^^$i&BxtbjD%5FpdMLHe^yN+8#G#vR)Xl#u_rQL#!7Drn3n2`3C7k z7yzJYOSD`4Jy2&b{{t0OBDrh?-Qfn^;Re&0xrZnU)|^t2->Xo&)#o&AiCi`UeZIBU z_yrT7-Rg7WiFw*|B8>6Gu&xxS(_8&h-gc{BqY!^jU-JWCwxHUONiG|~bOsbI0euK0 zQy~;C%~N%UhU@0-R=);Sx(SjTaH+t0Vc^%#9W-r;PH%;~>t1aSs$;3BT|FJjc`yI~L@y%vQHw#J zZ-LL|m|ODha0Bz|y=R~nm^#m)ROF%0w@4?#h<$p6L0NE}3t;c+W=fs_w0BgR0U(_S zTUyWBlzIY{?oyHWG$nsGwDqw&+yH=G>s=iunKI92GbIHKWn@;s*~jQb#CjIMXcTHn z$yCVKlw7^Qt&c%njzaj&buD2@~ M07*qoM6N<$f|vbe9RL6T literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Structures/Flora/Flowers/red_rose.rsi/world2.png b/Resources/Textures/_CP14/Structures/Flora/Flowers/red_rose.rsi/world2.png new file mode 100644 index 0000000000000000000000000000000000000000..5dfe896b060281d9dc38f8e53612bd186f971c70 GIT binary patch literal 990 zcmV<410np0P)Px&m`OxIR9J=GR!vVDQ4~D`Gl~P)XeW|rNQ#X*o0htmE@06pI|Ex5ESmTa`~ywe zU*e{9!J-?DizXO1lC+dIHZe|Zls4)lCKOr){1}+&V&+XB;|v0}8*eh15AM6?yn8SA zJm4Iy3m_1Div5s&^2BZ@rm;kN}&h~%Ggz`^xc z-hRM$H6QL@v@jh}G4|;SZ(AM=`Umi3uZdr$8q`NV>`$=x`O$;#Du?16k9Tk0Gfwe( zD#6O6sE39$WM)pWS?8@9=dy*AEH?lE@hFSnh!NJeG>ppgdx(TNkp8$8fy{x-5MV+A z01|0wbv`y^`IQb;tS{$N8~Jm{asy{o4VQJ*G3K?jEG)+K_2oQcf2QrlgC{xw6z6yd z0WZq67UEGBTiZ=s)>Y)Pg%s_dNK32cx3!K0NH>!}^RXdpZ8u>jLHxe%>lV0DVIa#5 zH~=Nh`!#TY`WMjP#@)%?u*yCyQ94u+kFuS1Wp#ce%+aaup8&DohzCNzOYbUa_py`c7aVAB z!X#jHtSIvKUAfhfCfBjn-B^-biL|8C@7)Hl&--rV*j`^Ju&#DS^x^Zj0b~wj#{TZM z&fWudu&%&q1tezxT8=xJ(j< z+f5YbcuOBP>%1jIW=}bq>v@1)M1qjfOj|BnU|{~HR2ck71yQcG002T&vy`!C0)u|e z5*Q)i#h{;aB`S(MlnO9Ds$)aGz(mN0a;=4Ot%c*03*@qe6v><^R#sEqD95zgxsB$t zss>qZU?YEyT(*!R{_!Y_K|hB?T3RLVqR6*p*EIv(3QjItU=nFbCqpZdmR2KS&dP`o z@S+S@rHh2yGwDiz)K(OElnzw{E6yb_eXmW-v#N%zL$enGUIa%xMv3z6o9K8ZEbS=8 z;m}xS>YPx&(@8`@R9J<@SIutXRv0}7yCDvVGzcjYBNikY;T;-P?gAFmj(3s0^&-2x!8}9f z1^Nb&s)_|$P}&I#bHDrj z0sPO9p2Nt&Q8@&FljF9;-rtYLXx2JQIi4)w;HVr{N-_YT)t%seG{)QVCIGLfcLSBLE0l7?wY&wZvBm@8od1a-I#8U(i4Eh0D-3fZbDYEG#3V8*Uk}TYP zbx#YQO+d5Ou^h)oabH3quOORF;_CVixl9Pxlb~rT3|ps!)jchI{pxE>girvllE3HS zdJ=M(5WV3P&05DgZQsIid<^;lHnx-)xqB(&Q;?!I=YoU0_{U%0;qbE~@%I9L)3EjW z#+HJU^*Khs7JXmolzz6Z1j%DM(@WGQjIsUr|L| z^#U}SwGK<%01$IM2}YLuY^37-myc3xM~1D3nx-Q2>pxU2`A)stL908VxxNY{JzL$$ zEIWo%R7x`Lez^evy#Ml10v5!;ho4lOjZ~^S^==2QHw!efGg55$YaT4Q>q%(;pipu^ z5Cev-hi}W9a6Jiwet_O^N)2tlNWgJ?Y;4Waj4eF8cZfI7FUH8GlPK;>IBnm~rDcLA z*EE$z_0{zq&FkX6G)G=3$u!D&G;1BnaeNf=3VOpSTu*#*b4M`f2XGvpsI_{-Da~tO zR^Q1r`+Ywei$qvNL{yY4{vF{F@Gl-5mFrPsu>dp-TMu9Ers&yfO;a)G2Q)5-xFz=H$QKD%1-dIuQ+d~l1T4j)djUCL(YZbZkDUih!Px3~z%9z_l?9$-u7qT(V#bx#WyG^w?a;K`R27ZEw%-yaGYAjM@yx~jOa|C8W1Jkf zC4MMfr=m4P@xiT`B(-yykdRsTk;s?3sii6YTrdq=52G2e=kBn6kGcj_B~u4 TfZ5?N00000NkvXXu0mjfdso|` literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Structures/Flora/Flowers/yellow_dayflin.rsi/meta.json b/Resources/Textures/_CP14/Structures/Flora/Flowers/yellow_dayflin.rsi/meta.json new file mode 100644 index 0000000000..d96f4144d2 --- /dev/null +++ b/Resources/Textures/_CP14/Structures/Flora/Flowers/yellow_dayflin.rsi/meta.json @@ -0,0 +1,20 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "All rights reserved for the CrystallPunk14 project only", + "copyright": "Created by TheShuEd for CrystallPunk14", + "states": [ + { + "name": "world1" + }, + { + "name": "world2" + }, + { + "name": "world3" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_CP14/Structures/Flora/Flowers/yellow_dayflin.rsi/world1.png b/Resources/Textures/_CP14/Structures/Flora/Flowers/yellow_dayflin.rsi/world1.png new file mode 100644 index 0000000000000000000000000000000000000000..6c2082eb64362599bc0d003f1aac22b16e7eda27 GIT binary patch literal 971 zcmV;+12p`JP)Px&g-Jv~R9J=8R=;Z^K^T3T>}nFVxDW_YEbQ#I$#UR!ZYLX3Wm8=tguwj|fot*? zTp141Csi=m#ZKWcjh);T!pUw35iQneavJA~btbdAyY5}&AP>a-F+1s{SgiWJ&$-aj39AvCD5ZR&V{Wjpwk~Cla{=QuboIq==8@dO4D(3N0ZNsOj<&< z;fT}>g(Od%@va=Wxv1|on}b>MYwpJ)l}Sr1N?xFes>-ixe1053l|^K;8!VURl8}m+ z4S5Km4D=*XadaD_F$vYi*fp1ze4V?#_R*kEiAo$f8><-#$!0fT_a^A{UjR5cllZWL ze*wcQ^t3MVbi)rM0i%=;(L8o|S5#cUrr)zr^Jgi{BcRa4gs1E!9WQ&eh0 z08TGJBf)vUuZ3%dQsVoE={sN3ay2BC+7MRPX~Ci~390QhwAv$V#aCHNwkV`wiWv`n zG93U4#axL-!s-fWwMVS!0Kob}pZUBDCeX6^jk*Th**qoNtJH>QHV3eKlSNrQOSZ6H tctO_;g|_Hk9`0?UONN(U`+N9%#vj|JAFj$Ikl_FT002ovPDHLkV1oKz!7Km( literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Structures/Flora/Flowers/yellow_dayflin.rsi/world2.png b/Resources/Textures/_CP14/Structures/Flora/Flowers/yellow_dayflin.rsi/world2.png new file mode 100644 index 0000000000000000000000000000000000000000..3c4873fafa78115f5461979668eff11ac7cbcca0 GIT binary patch literal 1203 zcmV;k1WfyhP)Px(ZAnByR9J3b8FZU6wJ zvzr%@sMJfWEW3BQ?%iW!Qv`hjfT}wo621@fbe}bhBz~=Yf%F>*w@nS-{w82!Q;cN4 z$~XX+V*!JqjY3|;U}ysX3V9Lz{vEn)jh_|s9?~$9D9Z_0x`F9?6Wb>We);NoDKVef zxbEG<91Bo&2ZN!FTsqEw%W?vPq3tssB0$U=MiM_66Wlg6v~sCu5$LwHYPYRb>9%D# zfy|bB{NAnrb1a~c7kxPa1d z0Jv)Ps`HxC0f3z^KMS4ZBQT%YFvlWBQwO}Siord5Lxf55UK(%34(NXBbWed zb)ay;M~rQK^^MyC2`OU@b3k2;lIbrZ9RZ_&KzzN@-}`OIF{d~|aOg4|DM)kk;8$UB@w zWEB9wK}}(Wya-iypz03Sgktegn#*z`B&|UNW8W~6$Q)k?FY>_0-x;s((ewepV`l@f zHrt6Hb;Y2^R(haPFR?;iggF+lx9jf7Y{gKP6W-2N4N7a&1qkz*9r9Q#xPksKpV=4; z-RHV@kE>RXce;ScgwzdiLrCxBEy|rp0>suESNbj%Q#hz8ovT)_dfmJC*7;?yC(t)d zL#pn;nk=XwcyizYQnkBbS6#U%O@a`F{JqA2BpS@joYRRSJ zF#h}pQkKCS3lsvMtEICW;kKzEb9^DtDAzEO`2NG+xNT}^7)d$VCOY7k;=_ZQ(pgHZue6qv%#)fyweF2OVU>!m z)$+hvWVv}rvSKlX!O-SC!#j@Ch%RLxBdO}n)6M9)@a6~^e~ya&Zv?OmAsMIAm9h+~ z?)YxMbbl3CBgL-)RnvTC!Px&@kvBMR9J=0R=;cGNEH4iww%OqiVKDi8y9Aab*CocK!Pn+ok-Z~eAN~LlfPk$ zl-d5c@>ocH-s-T~&gm3boJO6v#)XlN<&451$GcwJnJwfQPe!t1=UDC@7+Irv^S<}% zdjtH(LjH}iS=Z?Ho&o^)aCuDtz_N8JzJE6WW?iGTS{|hX3IMpe{*3KC1%{dh066Y+ zEf8Bz1;E5{r*PaUw)Yei3mE`F5E4`?3e37jzZ-x~vr9a01VhcDT8WJhhBG+s6w&Sd z+UG0<5S$-Vmd`X{DF{M>(gB74=?jX545}3c&z})^-Uyv$_jGLl!TB*a7QKH(kIpo_ zD}UuhW!AL>py>7M)PXV?!FQ3o&eT>u)bRulk~>vx)6ez=@kL(QY%$`I!O9F6Nu^Q%tW7f5npwnjIkGlgX9Z)##6xE8t$M(Esxz1Xw zX4!fxrO#7Y&#Y^-e7FPu(-$5s%hp?r%!G&~NGnw=Tc>Y-c|lhVB^lWK9&jT5%(_N} zbuKH%79%GSecDh;12KOl(k87vQ48%m6FBehKTfBIwNJ7(fWBpPQVA~K%X^D^J3MB-855r~b&A!fZVl1Q&VNem^% z_YFUX->vupBahp)BOuaouRlStkl`(}jC25?;pbqeSwyan;m07J`5Qz+Ou-5BzF5d$ z|A)mV24dMIGYAP9eh$C-x2d