From f8564b3661ee43a71b25d4c26e530fea8557e54b Mon Sep 17 00:00:00 2001 From: Ed <96445749+TheShuEd@users.noreply.github.com> Date: Sat, 25 May 2024 13:30:33 +0300 Subject: [PATCH] Agaric shroom! (#172) * agaric shrooms! * add agaric reagents * add agaric into worldgen --- .../en-US/_CP14/flavors/flavor-profiles.ftl | 2 + ...basic-alchemy.ftl => backlog-extracts.ftl} | 0 .../reagents/meta/basic-effect-reagent.ftl | 12 +++ .../en-US/_CP14/reagents/meta/biological.ftl | 8 +- .../_CP14/reagents/meta/physical-desc.ftl | 4 +- .../ru-RU/_CP14/flavors/flavor-profiles.ftl | 2 + ...basic-alchemy.ftl => backlog-extracts.ftl} | 0 .../reagents/meta/basic-effect-reagent.ftl | 12 +++ .../ru-RU/_CP14/reagents/meta/biological.ftl | 5 +- .../_CP14/reagents/meta/physical-desc.ftl | 4 +- .../Markers/Spawners/Random/herbal_gather.yml | 39 ++++++++ .../Objects/Specific/Alchemy/herbals.yml | 38 ++++++++ .../Entities/Structures/Flora/floorWater.yml | 22 ++--- .../Entities/Structures/Specific/herbals.yml | 67 +++++++++++++- Resources/Prototypes/_CP14/Flavors/flavor.yml | 10 +++ .../Procedural/biomes_template_grasslands.yml | 15 ++++ ...basic-alchemy.yml => backlog-extracts.yml} | 0 .../_CP14/Reagents/basic-effects.yml | 84 +++++++++++++++--- .../Prototypes/_CP14/Reagents/biological.yml | 56 ++++++------ .../_CP14/Recipes/Reactions/biological.yml | 29 +++--- .../Alchemy/Herbal/agaric.rsi/base1.png | Bin 0 -> 447 bytes .../Alchemy/Herbal/agaric.rsi/base2.png | Bin 0 -> 488 bytes .../Alchemy/Herbal/agaric.rsi/base3.png | Bin 0 -> 450 bytes .../Alchemy/Herbal/agaric.rsi/base4.png | Bin 0 -> 572 bytes .../Alchemy/Herbal/agaric.rsi/base5.png | Bin 0 -> 368 bytes .../Alchemy/Herbal/agaric.rsi/meta.json | 44 +++++++++ .../Alchemy/Herbal/agaric.rsi/world1.png | Bin 0 -> 910 bytes .../Alchemy/Herbal/agaric.rsi/world2.png | Bin 0 -> 692 bytes .../Alchemy/Herbal/agaric.rsi/world3.png | Bin 0 -> 709 bytes .../Alchemy/Herbal/agaric.rsi/world4.png | Bin 0 -> 644 bytes .../Alchemy/Herbal/agaric.rsi/world5.png | Bin 0 -> 806 bytes .../Alchemy/Herbal/agaric.rsi/world6.png | Bin 0 -> 566 bytes 32 files changed, 384 insertions(+), 69 deletions(-) rename Resources/Locale/en-US/_CP14/reagents/meta/{basic-alchemy.ftl => backlog-extracts.ftl} (100%) rename Resources/Locale/ru-RU/_CP14/reagents/meta/{basic-alchemy.ftl => backlog-extracts.ftl} (100%) create mode 100644 Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/herbal_gather.yml rename Resources/Prototypes/_CP14/Reagents/{basic-alchemy.yml => backlog-extracts.yml} (100%) create mode 100644 Resources/Textures/_CP14/Objects/Specific/Alchemy/Herbal/agaric.rsi/base1.png create mode 100644 Resources/Textures/_CP14/Objects/Specific/Alchemy/Herbal/agaric.rsi/base2.png create mode 100644 Resources/Textures/_CP14/Objects/Specific/Alchemy/Herbal/agaric.rsi/base3.png create mode 100644 Resources/Textures/_CP14/Objects/Specific/Alchemy/Herbal/agaric.rsi/base4.png create mode 100644 Resources/Textures/_CP14/Objects/Specific/Alchemy/Herbal/agaric.rsi/base5.png create mode 100644 Resources/Textures/_CP14/Objects/Specific/Alchemy/Herbal/agaric.rsi/meta.json create mode 100644 Resources/Textures/_CP14/Objects/Specific/Alchemy/Herbal/agaric.rsi/world1.png create mode 100644 Resources/Textures/_CP14/Objects/Specific/Alchemy/Herbal/agaric.rsi/world2.png create mode 100644 Resources/Textures/_CP14/Objects/Specific/Alchemy/Herbal/agaric.rsi/world3.png create mode 100644 Resources/Textures/_CP14/Objects/Specific/Alchemy/Herbal/agaric.rsi/world4.png create mode 100644 Resources/Textures/_CP14/Objects/Specific/Alchemy/Herbal/agaric.rsi/world5.png create mode 100644 Resources/Textures/_CP14/Objects/Specific/Alchemy/Herbal/agaric.rsi/world6.png diff --git a/Resources/Locale/en-US/_CP14/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/_CP14/flavors/flavor-profiles.ftl index 26aded1213..464fb9fe2e 100644 --- a/Resources/Locale/en-US/_CP14/flavors/flavor-profiles.ftl +++ b/Resources/Locale/en-US/_CP14/flavors/flavor-profiles.ftl @@ -2,6 +2,8 @@ cp14-flavor-base-metallic = metallic cp14-flavor-base-invigorating = invigorating +cp14-flavor-base-bitterly = bitter +cp14-flavor-base-sweetly = sweet # Complex diff --git a/Resources/Locale/en-US/_CP14/reagents/meta/basic-alchemy.ftl b/Resources/Locale/en-US/_CP14/reagents/meta/backlog-extracts.ftl similarity index 100% rename from Resources/Locale/en-US/_CP14/reagents/meta/basic-alchemy.ftl rename to Resources/Locale/en-US/_CP14/reagents/meta/backlog-extracts.ftl 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 437df1f011..61e97ef6b7 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 @@ -1,3 +1,6 @@ +cp14-reagent-name-basic-empty = Empty solution +cp14-reagent-desc-basic-empty = Natural solvent. Essentially a useless liquid that dilutes useful effects. Getting rid of it will give you much more concentrated solutions. + cp14-reagent-name-basic-heal-blunt = Healing solution for bruises cp14-reagent-desc-basic-heal-blunt = Effectively treats bones and bruises. @@ -7,6 +10,15 @@ cp14-reagent-desc-basic-heal-piercing = Effectively heals puncture wounds. cp14-reagent-name-basic-heal-slash = Healing solution for cuts. cp14-reagent-desc-basic-heal-slash = Effectively heals torn tissue. +cp14-reagent-name-basic-heal-brute = Healing general solution +cp14-reagent-desc-basic-heal-brute = Less efficacious than specialized solutions, but can heal all types of physical damage. + +cp14-reagent-name-basic-damage-poison = Poisonous solution +cp14-reagent-desc-basic-damage-poison = Capable of causing extreme indigestion, ulcers, intoxication, and in sufficient dosage to cause death. + +cp14-reagent-name-see-rainbow = Rainbow solution +cp14-reagent-desc-see-rainbow = Causes cheerful hallucinations, colors the whole world in rainbow bright colors. + cp14-reagent-name-basic-satiate-hunger = Saturating solution cp14-reagent-desc-basic-satiate-hunger = A mixture that effectively restores hunger. diff --git a/Resources/Locale/en-US/_CP14/reagents/meta/biological.ftl b/Resources/Locale/en-US/_CP14/reagents/meta/biological.ftl index 45915c66aa..709b1ffccb 100644 --- a/Resources/Locale/en-US/_CP14/reagents/meta/biological.ftl +++ b/Resources/Locale/en-US/_CP14/reagents/meta/biological.ftl @@ -1,2 +1,8 @@ cp14-reagent-name-blood = blood -cp14-reagent-desc-blood = The life energy of a living warm-blooded creatures. \ No newline at end of file +cp14-reagent-desc-blood = The life energy of a living warm-blooded creatures. + +cp14-reagent-name-bloodgrasssap = bloodgrass sap +cp14-reagent-desc-bloodgrasssap = A squeeze from the ubiquitous blood grass. It has no particular remarkable qualities, but with proper skill can be prepared into a nutritious food. + +cp14-reagent-name-agaric-shroom = fly agaric juice +cp14-reagent-desc-agaric-shroom = It is this juice that the fly mushrooms owe their poisonousness to. Consumption causes severe ailments and hallucinations, but experienced alchemists can find other uses for these mushrooms. \ 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 9f02823119..1119185da0 100644 --- a/Resources/Locale/en-US/_CP14/reagents/meta/physical-desc.ftl +++ b/Resources/Locale/en-US/_CP14/reagents/meta/physical-desc.ftl @@ -1,2 +1,4 @@ cp14-reagent-physical-desc-ferrous = ferrous -cp14-reagent-physical-desc-scarlet = shimmering scarlet \ No newline at end of file +cp14-reagent-physical-desc-scarlet = shimmering scarlet +cp14-reagent-physical-desc-colorless = colorless +cp14-reagent-physical-desc-viscous = viscous \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_CP14/flavors/flavor-profiles.ftl b/Resources/Locale/ru-RU/_CP14/flavors/flavor-profiles.ftl index fe25e2c787..f3a0733231 100644 --- a/Resources/Locale/ru-RU/_CP14/flavors/flavor-profiles.ftl +++ b/Resources/Locale/ru-RU/_CP14/flavors/flavor-profiles.ftl @@ -2,6 +2,8 @@ cp14-flavor-base-metallic = металлически cp14-flavor-base-invigorating = живительно +cp14-flavor-base-bitterly = горько +cp14-flavor-base-sweetly = сладко # Complex diff --git a/Resources/Locale/ru-RU/_CP14/reagents/meta/basic-alchemy.ftl b/Resources/Locale/ru-RU/_CP14/reagents/meta/backlog-extracts.ftl similarity index 100% rename from Resources/Locale/ru-RU/_CP14/reagents/meta/basic-alchemy.ftl rename to Resources/Locale/ru-RU/_CP14/reagents/meta/backlog-extracts.ftl 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 9d0e28fa9c..80200b0eac 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 @@ -1,3 +1,6 @@ +cp14-reagent-name-basic-empty = Пустой раствор +cp14-reagent-desc-basic-empty = Природный растворитель. По сути бесполезная жидкость, разбавляющая полезные эффекты. Избавившись от нее, вы получите куда более концентрированные растворы. + cp14-reagent-name-basic-heal-blunt = Лечебный раствор от ушибов cp14-reagent-desc-basic-heal-blunt = Эффективно лечит кости и ушибы. @@ -7,6 +10,15 @@ cp14-reagent-desc-basic-heal-piercing = Эффективно заращивае cp14-reagent-name-basic-heal-slash = Лечебный раствор от порезов cp14-reagent-desc-basic-heal-slash = Эффективно залечивает разорванные ткани. +cp14-reagent-name-basic-heal-brute = Общий лечебный раствор +cp14-reagent-desc-basic-heal-brute = Менее эффкетивный, чем специализированные растворы, но способен залечивать все виды физических повреждений. + +cp14-reagent-name-basic-damage-poison = Ядовитый раствор +cp14-reagent-desc-basic-damage-poison = Способен вызвать крайне сильное несварение, язвы, интоксикацию, и при достаточной дозировке привести к смерти. + +cp14-reagent-name-see-rainbow = Радужный раствор +cp14-reagent-desc-see-rainbow = Вызывает веселые галлюцинации, окрашивает весь мир в радужные яркие тона. + cp14-reagent-name-basic-satiate-hunger = Насыщающий раствор cp14-reagent-desc-basic-satiate-hunger = Смесь, эффективно восстанавливающая голод. diff --git a/Resources/Locale/ru-RU/_CP14/reagents/meta/biological.ftl b/Resources/Locale/ru-RU/_CP14/reagents/meta/biological.ftl index e171174101..716247c428 100644 --- a/Resources/Locale/ru-RU/_CP14/reagents/meta/biological.ftl +++ b/Resources/Locale/ru-RU/_CP14/reagents/meta/biological.ftl @@ -2,4 +2,7 @@ cp14-reagent-name-blood = кровь cp14-reagent-desc-blood = Жизненная энергия живого теплокровного существа. cp14-reagent-name-bloodgrasssap = сок кровьтравы -cp14-reagent-desc-bloodgrasssap = Выжимка из повсеместно растущей кровьтравы. Не имеет особых примечательных качеств, но при должной сноровке может быть приготовлена в питательную пищу. \ No newline at end of file +cp14-reagent-desc-bloodgrasssap = Выжимка из повсеместно растущей кровьтравы. Не имеет особых примечательных качеств, но при должной сноровке может быть приготовлена в питательную пищу. + +cp14-reagent-name-agaric-shroom = сок мухомора +cp14-reagent-desc-agaric-shroom = Именно этому соку мухоморы обязаны своей ядовитостью. Употребление вызывает сильные недомогания и галлюцинации, но опытные алхимики смогут найти этим грибам и другие применения. \ 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 ea4d0b2213..6c88dcb221 100644 --- a/Resources/Locale/ru-RU/_CP14/reagents/meta/physical-desc.ftl +++ b/Resources/Locale/ru-RU/_CP14/reagents/meta/physical-desc.ftl @@ -1,2 +1,4 @@ cp14-reagent-physical-desc-ferrous = черно-металлическое -cp14-reagent-physical-desc-scarlet = мерцающе алое \ No newline at end of file +cp14-reagent-physical-desc-scarlet = мерцающе алое +cp14-reagent-physical-desc-colorless = бесцветное +cp14-reagent-physical-desc-viscous = вязкое diff --git a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/herbal_gather.yml b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/herbal_gather.yml new file mode 100644 index 0000000000..51024b4444 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/herbal_gather.yml @@ -0,0 +1,39 @@ +- type: entity + id: CP14RandomSpawnerGatherGloodgrass + name: bloodgrass spawner + parent: MarkerBase + components: + - type: Sprite + layers: + - state: red + - sprite: _CP14/Objects/Specific/Alchemy/Herbal/bloodgrass.rsi + state: grass1 + - type: RandomSpawner + prototypes: + - CP14GatherableBloodgrass + - CP14GatherableBloodgrass2 + - CP14GatherableBloodgrass3 + - CP14GatherableBloodgrass4 + - CP14GatherableBloodgrass5 + chance: 1 + +- type: entity + id: CP14RandomSpawnerGatherAgaricShroom + name: agaric shroom spawner + parent: MarkerBase + components: + - type: Sprite + layers: + - state: red + - sprite: _CP14/Objects/Specific/Alchemy/Herbal/agaric.rsi + state: world1 + - type: RandomSpawner + prototypes: + - CP14GatherableFlyAgaric + - CP14GatherableFlyAgaric2 + - CP14GatherableFlyAgaric3 + - CP14GatherableFlyAgaric4 + - CP14GatherableFlyAgaric5 + - CP14GatherableFlyAgaric6 + chance: 0.05 + diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/herbals.yml b/Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/herbals.yml index 8ac0150d55..75d542311f 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/herbals.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/herbals.yml @@ -34,4 +34,42 @@ maxVol: 20 reagents: - ReagentId: CP14BloodGrassSap + Quantity: 5 + +- type: entity + id: CP14AgaricMushroom + parent: FoodProduceBase + name: fly agaric + description: This poisonous mushroom can often be found near bodies of water or other wet areas. It is not recommended for consumption. + components: + - type: Item + size: Tiny + - type: Produce + - type: Sprite + sprite: _CP14/Objects/Specific/Alchemy/Herbal/agaric.rsi + layers: + - state: base1 + map: ["random"] + - type: RandomSprite + available: + - random: + base1: "" + base2: "" + base3: "" + base4: "" + base5: "" + - type: FlavorProfile + flavors: + - CP14Metallic #TODO + - type: Extractable + juiceSolution: + reagents: + - ReagentId: CP14AgaricMushroom + Quantity: 5 + - type: SolutionContainerManager + solutions: + food: + maxVol: 20 + reagents: + - ReagentId: CP14AgaricMushroom Quantity: 5 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Flora/floorWater.yml b/Resources/Prototypes/_CP14/Entities/Structures/Flora/floorWater.yml index 63411a84da..1c7372a59c 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Flora/floorWater.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Flora/floorWater.yml @@ -45,14 +45,14 @@ collection: FootstepWater params: volume: 8 - #- type: SolutionContainerManager - # solutions: - # pool: - # maxVol: 9999999 #.inf seems to break the whole yaml file, but would definitely be preferable. - # reagents: - # - ReagentId: CP14Water - # Quantity: 9999999 - #- type: DrainableSolution - # solution: pool - #- type: Drink - # solution: pool \ No newline at end of file + - type: SolutionContainerManager + solutions: + pool: + maxVol: 9999999 #.inf seems to break the whole yaml file, but would definitely be preferable. + reagents: + - ReagentId: CP14Water + Quantity: 9999999 + - type: DrainableSolution + solution: pool + - type: Drink + solution: pool \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Specific/herbals.yml b/Resources/Prototypes/_CP14/Entities/Structures/Specific/herbals.yml index 31505ab4b3..116a2a7441 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Specific/herbals.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Specific/herbals.yml @@ -80,4 +80,69 @@ parent: CP14GatherableBloodgrass components: - type: Sprite - state: grass5 \ No newline at end of file + state: grass5 + +# Fly agaric + +- type: entityLootTable + id: CP14GatherFlyAgaric + entries: + - id: CP14AgaricMushroom + amount: 1 + maxAmount: 2 + +- type: entity + id: CP14GatherableFlyAgaric + parent: CP14GatherableHerbalBase + name: fly agaric + description: This poisonous mushroom can often be found near bodies of water or other wet areas. It is not recommended for consumption. + suffix: Gatherable + components: + - type: Sprite + snapCardinals: true + drawdepth: FloorTiles + sprite: _CP14/Objects/Specific/Alchemy/Herbal/agaric.rsi + state: world1 + - type: Gatherable + toolWhitelist: + tags: + - CP14HerbalGathering + components: + - Hands + loot: + All: CP14GatherFlyAgaric + +- type: entity + id: CP14GatherableFlyAgaric2 + parent: CP14GatherableFlyAgaric + components: + - type: Sprite + state: world2 + +- type: entity + id: CP14GatherableFlyAgaric3 + parent: CP14GatherableFlyAgaric + components: + - type: Sprite + state: world3 + +- type: entity + id: CP14GatherableFlyAgaric4 + parent: CP14GatherableFlyAgaric + components: + - type: Sprite + state: world4 + +- type: entity + id: CP14GatherableFlyAgaric5 + parent: CP14GatherableFlyAgaric + components: + - type: Sprite + state: world5 + +- type: entity + id: CP14GatherableFlyAgaric6 + parent: CP14GatherableFlyAgaric + components: + - type: Sprite + state: world6 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Flavors/flavor.yml b/Resources/Prototypes/_CP14/Flavors/flavor.yml index 3e7624f941..58d8c9e27d 100644 --- a/Resources/Prototypes/_CP14/Flavors/flavor.yml +++ b/Resources/Prototypes/_CP14/Flavors/flavor.yml @@ -10,6 +10,16 @@ flavorType: Base description: cp14-flavor-base-invigorating +- type: flavor + id: CP14Bitterly + flavorType: Base + description: cp14-flavor-base-bitterly + +- type: flavor + id: CP14Sweely + flavorType: Base + description: cp14-flavor-base-sweetly + # Complex - type: flavor diff --git a/Resources/Prototypes/_CP14/Procedural/biomes_template_grasslands.yml b/Resources/Prototypes/_CP14/Procedural/biomes_template_grasslands.yml index c460071320..650e1b4e02 100644 --- a/Resources/Prototypes/_CP14/Procedural/biomes_template_grasslands.yml +++ b/Resources/Prototypes/_CP14/Procedural/biomes_template_grasslands.yml @@ -211,6 +211,21 @@ gain: 0.12 fractalType: Ridged octaves: 1 + - !type:BiomeEntityLayer + allowedTiles: + - CP14FloorDirt + - CP14FloorGrass + threshold: 0.91 + noise: + seed: 3 + noiseType: OpenSimplex2 + frequency: 0.003 + lacunarity: 1.50 + gain: 0.12 + fractalType: Ridged + octaves: 1 + entities: + - CP14RandomSpawnerGatherAgaricShroom - !type:BiomeEntityLayer allowedTiles: - CP14FloorDirt diff --git a/Resources/Prototypes/_CP14/Reagents/basic-alchemy.yml b/Resources/Prototypes/_CP14/Reagents/backlog-extracts.yml similarity index 100% rename from Resources/Prototypes/_CP14/Reagents/basic-alchemy.yml rename to Resources/Prototypes/_CP14/Reagents/backlog-extracts.yml diff --git a/Resources/Prototypes/_CP14/Reagents/basic-effects.yml b/Resources/Prototypes/_CP14/Reagents/basic-effects.yml index 74c91d0e26..a5dd6a47d5 100644 --- a/Resources/Prototypes/_CP14/Reagents/basic-effects.yml +++ b/Resources/Prototypes/_CP14/Reagents/basic-effects.yml @@ -1,9 +1,19 @@ +- type: reagent + id: CP14BasicEffectEmpty + name: cp14-reagent-name-basic-empty + desc: cp14-reagent-desc-basic-empty + group: CP14BasicEffect + flavor: CP14Bitterly + color: "#858585" + physicalDesc: cp14-reagent-physical-desc-colorless + + - type: reagent id: CP14BasicEffectHealBlunt name: cp14-reagent-name-basic-heal-blunt desc: cp14-reagent-desc-basic-heal-blunt group: CP14BasicEffect - flavor: medicine + flavor: CP14Metallic color: "#c71aaa" physicalDesc: cp14-reagent-physical-desc-scarlet metabolisms: @@ -12,14 +22,14 @@ - !type:HealthChange damage: types: - Blunt: -1 + Blunt: -10 - type: reagent id: CP14BasicEffectHealPiercing name: cp14-reagent-name-basic-heal-piercing desc: cp14-reagent-desc-basic-heal-piercing group: CP14BasicEffect - flavor: medicine + flavor: CP14Metallic color: "#e03895" physicalDesc: cp14-reagent-physical-desc-scarlet metabolisms: @@ -28,14 +38,14 @@ - !type:HealthChange damage: types: - Piercing: -1 + Piercing: -10 - type: reagent id: CP14BasicEffectHealSlash name: cp14-reagent-name-basic-heal-slash desc: cp14-reagent-desc-basic-heal-slash group: CP14BasicEffect - flavor: medicine + flavor: CP14Metallic color: "#cf153a" physicalDesc: cp14-reagent-physical-desc-scarlet metabolisms: @@ -44,30 +54,82 @@ - !type:HealthChange damage: types: - Slash: -1 + Slash: -10 + +- type: reagent + id: CP14BasicEffectHealBruteGroup + name: cp14-reagent-name-basic-heal-brute + desc: cp14-reagent-desc-basic-heal-brute + group: CP14BasicEffect + flavor: CP14Metallic + color: "#e31010" + physicalDesc: cp14-reagent-physical-desc-scarlet + metabolisms: + Medicine: + effects: + - !type:HealthChange + damage: + groups: + Brute: -3 + +- type: reagent + id: CP14BasicEffectDamagePoison + name: cp14-reagent-name-basic-damage-poison + desc: cp14-reagent-desc-basic-damage-poison + group: CP14BasicEffect + flavor: CP14Bitterly + color: "#768551" + physicalDesc: cp14-reagent-physical-desc-viscous + metabolisms: + Poison: + effects: + - !type:HealthChange + damage: + types: + Poison: 10 + +- type: reagent + id: CP14BasicEffectRainbow + name: cp14-reagent-name-see-rainbow + desc: cp14-reagent-desc-see-rainbow + group: CP14BasicEffect + flavor: CP14Bitterly + color: "#d442db" + physicalDesc: cp14-reagent-physical-desc-colorless + metabolisms: + Narcotic: + effects: + - !type:GenericStatusEffect + key: SeeingRainbows + component: SeeingRainbows + type: Add + time: 25 + refresh: false - type: reagent id: CP14BasicEffectSatiateHunger name: cp14-reagent-name-basic-satiate-hunger desc: cp14-reagent-desc-basic-satiate-hunger group: CP14BasicEffect - flavor: nutriment + flavor: CP14Sweely color: "#a35629" - physicalDesc: cp14-reagent-physical-desc-scarlet #TODO + physicalDesc: cp14-reagent-physical-desc-viscous metabolisms: Food: effects: - !type:SatiateHunger + factor: 6 - type: reagent id: CP14BasicEffectSatiateThirst name: cp14-reagent-name-basic-satiate-thirst desc: cp14-reagent-desc-basic-satiate-thirst group: CP14BasicEffect - flavor: nutriment + flavor: CP14Water color: "#2b7fed" - physicalDesc: cp14-reagent-physical-desc-scarlet #TODO + physicalDesc: cp14-reagent-physical-desc-colorless metabolisms: Drink: effects: - - !type:SatiateThirst \ No newline at end of file + - !type:SatiateThirst + factor: 6 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Reagents/biological.yml b/Resources/Prototypes/_CP14/Reagents/biological.yml index 9385f679e7..eb80a49e47 100644 --- a/Resources/Prototypes/_CP14/Reagents/biological.yml +++ b/Resources/Prototypes/_CP14/Reagents/biological.yml @@ -12,30 +12,6 @@ collection: FootstepBlood params: volume: 6 -# metabolisms: -# Drink: -# effects: -# - !type:SatiateThirst -# factor: 1.5 -# conditions: -# - !type:OrganType -# type: Human -# shouldHave: false -# Food: -# effects: -# - !type:AdjustReagent -# reagent: UncookedAnimalProteins -# amount: 0.5 -# Medicine: -# effects: -# - !type:HealthChange -# conditions: -# - !type:OrganType -# type: Bloodsucker -# damage: -# groups: -# Brute: -3 -# Burn: -1.25 - type: reagent id: CP14BloodGrassSap @@ -54,11 +30,37 @@ Food: effects: - !type:SatiateHunger - factor: 0.5 - Medicine: + factor: 1.5 + Poison: effects: - !type:HealthChange damage: types: Poison: 0.25 - \ No newline at end of file + +- type: reagent + id: CP14AgaricMushroom + group: CP14Biological + name: cp14-reagent-name-agaric-shroom + desc: cp14-reagent-desc-agaric-shroom + flavor: CP14Bitterly + color: "#89a195" + physicalDesc: cp14-reagent-physical-desc-colorless + slippery: false + metabolisms: + Poison: + effects: + - !type:HealthChange + damage: + types: + Poison: 1.5 + - !type:ChemVomit + probability: 0.02 + Narcotic: + effects: + - !type:GenericStatusEffect + key: SeeingRainbows + component: SeeingRainbows + type: Add + time: 6 + refresh: false \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Reactions/biological.yml b/Resources/Prototypes/_CP14/Recipes/Reactions/biological.yml index ab4bde8da1..98dbdc0b82 100644 --- a/Resources/Prototypes/_CP14/Recipes/Reactions/biological.yml +++ b/Resources/Prototypes/_CP14/Recipes/Reactions/biological.yml @@ -7,19 +7,18 @@ CP14BloodGrassSap: amount: 2 products: - CP14BasicEffectSatiateHunger: 2 - CP14BasicEffectHealSlash: 0.5 - CP14BasicEffectHealPiercing: 0.5 + CP14BasicEffectEmpty: 2.7 + CP14BasicEffectSatiateHunger: 0.2 + CP14BasicEffectHealSlash: 0.05 + CP14BasicEffectHealPiercing: 0.05 -#- type: reaction -# id: CP14BloodGrassProcessingFail1 -# minTemp: 450 -# reactants: -# CP14VitalExtract: -# amount: 1 -# effects: -# - !type:AreaReactionEffect -# duration: 20 -# prototypeId: CP14MistVitalExtract -# sound: -# path: /Audio/Effects/smoke.ogg \ No newline at end of file +- type: reaction + id: CP14AgaricShroomProcessing1 + minTemp: 350 + reactants: + CP14AgaricMushroom: + amount: 1 + products: + CP14BasicEffectEmpty: 0.7 + CP14BasicEffectRainbow: 0.1 + CP14BasicEffectDamagePoison: 0.15 \ No newline at end of file diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/Herbal/agaric.rsi/base1.png b/Resources/Textures/_CP14/Objects/Specific/Alchemy/Herbal/agaric.rsi/base1.png new file mode 100644 index 0000000000000000000000000000000000000000..f975819995b19148c8ca8acf95a8c93980fdd7cf GIT binary patch literal 447 zcmV;w0YLtVP)Px$c}YY;R9J=WmA^{@VHn51MusTVVT4$D1d-4+L_?&ITLd{94btLL(CSu#5stbw z*x(jTL3?fm_6I~k5Wxi}X6pG9F}Sxu?np7-Sd4u`|}V=UCb zxJP2f`u&NVhZGq1NX##^jD1eElO@I|L4KhHM=A+NDv46l2EWki>Bu0A4;s)d)cyL; zw?_a#scD1Ps*%QGx^4Hj*DM=}!E4owvzM=*270X;#B>7k!7-*CZPQ~hC7{o|)U-iN zCyx6qOHZ p8v5U`f998W52JmC91iE-@C_?2h6B!iJkP)Px$qDe$SR9J=Wl)XzrQ5eR5Nr@@cr3g{bMH0MQG?Y|hK@ClXL^wORy16*iSX)qY zG(=lVe?UVm)zSwQePB?STGz^(D0mvAixt$p$FciN=f3CM=lOBYdk)yLWy{uoS6izF znSd&c@!hFqzm@$3?%&jf} zP)wxBCerkJ>{|fNH&pXpufuI zsmm0E^et$H0f;I(LBGQQ+SWT+xjOsP-%=AcOY?U#9-jnYYkdc9VNYw!<(GgD%8 zVhDhjl4ig>Px$d`Uz>R9J=Wlut{-U;u|7B}H>jEXG!vx62EnnZzbmo_F{wi$KV1A}*ry}#%Ez1s^O9v&Y5jBk*aH)rOB zIliwAG?%OJYNafym9p4dNC>Np6Z~$&^GX+hr<+rr-$EGoPO)8^b%m)w@5l2<_??57 zVaHoxs{v!hsX)&Rzx?!@7eKgFBo*kHTVq$imhIZ?oQQt-$SYmKr6Q574Nk6trig(d z=cEnWbr}){d8JD{)?eVA-Xk9Kvs(+%3<|cd&wo$AN% zrfKR8j*c(b**|nO*N~fFfJ`>cRAL%gm59d10fZX~M*;;cCoJ26* z#++sY4i2J%mJ>@W8nP-Os}dul3XiuBrifb{HPF->=D6MJAgdDfv-;nB1K$B+5lE(! s00W1Ei@%_t<@!#!LBc&eJUjrt056l1%zrkK3jhEB07*qoM6N<$f`8S*W&i*H literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/Herbal/agaric.rsi/base4.png b/Resources/Textures/_CP14/Objects/Specific/Alchemy/Herbal/agaric.rsi/base4.png new file mode 100644 index 0000000000000000000000000000000000000000..40cd803d23d0e26d1bd686663e03d1832d035923 GIT binary patch literal 572 zcmV-C0>k}@P)Px$_DMuRR9J=WmA`8faTvxwS4@fdd7)f}D;4Q!Byp-;5+u8*I0+r{2Xtu1Ze1$Q zj#=D`WDttDIaX+~SSZ*FDnY1tr8(22O?pO!d>t+cSE}3(1(*9w$9-R(=Xu|I?+!vj zLPGvC(!Um5n<SyijzBg+iY>p!T>%F7nK4Z|+qaPala~WWZJ@2H4$B#rxy)YNIZF zyqcn>N2%#iO0oq&E;6{VAHTzOL`zy;JcxbcifU)A=~2u{LA6nr09GE}73#EtqGmCT zCXJVGSibh117pAo>+-nnPq;n;=a>Ps<$I)zCY9Z^Sl`^102DP#GLv9$XMbpD?}(eZ zrvOf&O1UUBVD{!L#uxKkO)4#4sP}@mO&PMjxh?JO?2}5%sM87nheyW%oSt<2NCgWp z;`F40qGqX-i(>xP4U(Az-F9yr#t*(;!x7zfk7Opno%`kSJ=16gk@6ql@aP!TVK(YM zD82&>H($(SZ-2Ml!!(+_-F-hg^F`pFQKeiw_mK%=9ug7~0`Ln#p1+!GESGKo0000< KMNUMnLSTYB;{^@? literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/Herbal/agaric.rsi/base5.png b/Resources/Textures/_CP14/Objects/Specific/Alchemy/Herbal/agaric.rsi/base5.png new file mode 100644 index 0000000000000000000000000000000000000000..89e769a5b6e4b637043b368de7bebddfeaa75165 GIT binary patch literal 368 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^TQSbYe zu{GtXJgbbdpelF{r G5}E*+J(iRJ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/Herbal/agaric.rsi/meta.json b/Resources/Textures/_CP14/Objects/Specific/Alchemy/Herbal/agaric.rsi/meta.json new file mode 100644 index 0000000000..f564b2b98b --- /dev/null +++ b/Resources/Textures/_CP14/Objects/Specific/Alchemy/Herbal/agaric.rsi/meta.json @@ -0,0 +1,44 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Created by TheShuEd (Github) for CrystallPunk14", + "states": [ + { + "name": "base1" + }, + { + "name": "base2" + }, + { + "name": "base3" + }, + { + "name": "base4" + }, + { + "name": "base5" + }, + { + "name": "world1" + }, + { + "name": "world2" + }, + { + "name": "world3" + }, + { + "name": "world4" + }, + { + "name": "world5" + }, + { + "name": "world6" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/Herbal/agaric.rsi/world1.png b/Resources/Textures/_CP14/Objects/Specific/Alchemy/Herbal/agaric.rsi/world1.png new file mode 100644 index 0000000000000000000000000000000000000000..e413de3befad140fcb2c86d9cf01424dc68a2fa5 GIT binary patch literal 910 zcmV;919AL`P)Px&NJ&INR9J=Wl|M{VQ5eO455<(CSOqj13pN!9l^B5-+vuwcQG*U0Gz{IGOmqPm zC8;59N+$*#*oZM|!axk7ODTpj_$M&|#gHHxno3$L+NP1D*THw6h4)_l+l@2b-hTI; z^S*QL_h17Xut3P^5h15Xl$xi^ioCHrkI#{%)FKQ5LQaqHIkL>HmQguyv*aQS0+zQ3 zk{KIao*bE;D;4Ben{8IKx^N#k$hI9@nH-;n z`Pnu9OG`rUXNn5@ow_v^1XZs;sCozDi4*`|K7A#gND)-M13}g62bg^PK=>S48q4!V zvmvw8G1OnQ&Y(;q3beO1bw7LlCai6b3`b)V@}U4zX*)hgmZ`Me@P>tTvev2#1`CFx zu?b*85*O_00j;jg(dEgJ?7hkI#j92?M>1mr(7RFb#$r#S+z(Ii}Kf-tMnD0R#XFLaLKX6wVPT3NW1~rUFK8UlTR17M@(_Lkg+8 zb)6>{`lJYez;HCyV|E^(_gtswJb#Ln&uJ#dr@3+e;qTpokkcb-TrK+Vxz#cn%k!EY zcKt>KRj(EIAHksNlDk9Cgyer98=uji-w8%ds3(z5YGBcSeq%JPM%aWo$GG zaALh(h7JtQ&nmc^1=$K}XV&^yj9gAiAW#@ofaRr+av6}FlR_*X*n6&196x!Ks_hOQ z-g{)}p@onD!0EGU_t3q^Mx$Y1MEkZF zZVOm{3nHh_ssL=;u@!*H@oD0Tl)=Md2&!JcCdhAfPAM$bmI0u7r1C8}Qt(7sfHojW?@a}(*gGC4nf;7U3B1CJezSGN%>LI3~&07*qoM6N<$f-7mGIsgCw literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/Herbal/agaric.rsi/world2.png b/Resources/Textures/_CP14/Objects/Specific/Alchemy/Herbal/agaric.rsi/world2.png new file mode 100644 index 0000000000000000000000000000000000000000..2ab530e5c5dcaa236c8915b2f2cfc4c4dcf13abf GIT binary patch literal 692 zcmV;l0!#ggP)Px%Zb?KzR9J=WmA`9KQ5?lTiMFH(NU#=BOlzpL^dZ_GLlZRZQaaQnLm@-{1YJzK z7M>KxHaIxw(5-`mkfB3B5Mq=DM372GyYm)u9O4{pNO(zkcytxa}o|x~j;EFtv+ZbtuAZF9EQbv*Naw z*vwf`zkO`T(Y6X?x&_&y1puE?#^;rgCnBvm#HS`@y@p4`DbOw zhq|it+RCUX;-rXraXn*BMrS9<9~3CO{Qx`LM#nd{K=(CXF=Ja@!EG-cYcBo$%-S-l zLlLR;KKX+J0IBpoevfO_?{Q7FEI{|wr<5rM7RVMYHDBwSt{7O*KM966qQOk^J3tT! ztw&?88gUqUbegZa0KM@5;uSNWub!I*yz9|e!02p{n1Y@$CxiFyFuLTUXUvICKC`x5 zBac_i^gnsX=#mfZ#vvJUXwZb3civQbpPNAbpiuLbuRpc2TZmWw+~I=r`cV=_W77H3 zaHB3_Vtn}iyZ4`h+H%OA{1Le&1iiL0{g;mfB$8FKMGJ3CCaLk$(Qpj4a_UVKs#`NL zI3oITRyK1-FEiZ&Of*F$}SGhCI2-r&O?QSLZc5e(^ zIRtWF;)&R`p#gVzBO0VC+=b#{kmJp2h?YCn?{Q5{j1Nb&@eBc8B%-(N&}}jL>2%P+ aKa1ZU0~W4IP6zY=0000Px%e@R3^R9J=Wl)+1raTv!xs~npeF3h0VoO59Lno|qWL9UC~b+;Y-10+0zlTKm0 zAl;%J!b2Btb~AS9ka@BRE<997j-(MT+n8f>$nzA`JCw18O^78Whc%IMi zdA`pNYO1NGDo8d-LN-a_pA}zToEHn-Z52VBs|JMPo&>;dNK-DvsQ_e?Bs%I2h$}kc zimsv@rvm7ma?$$Y2^+sNY2u2G;o0f3x=<3Jn89R|BraQS=KfU(bsQ(vg;K>k>JDgb z*hfYZ^7nO(8jEQKp|M9aH|*n*GQ~sT%s67&liNU3EFhaCVK<~%N!BwwJB{L=WF=Wo zKE$}SQvkI5`kN-E70d(!Me`n2(GkS7g1Dl?CGDfQCkx(eCK%A@`z-WMxo|ukBQ?-g zR&h9H1T(>a25YC-Sl8u%%1wSM004cT1#5p77cVuk{PsNr1G(7f(4YfY>gn%dcP9nF zosj_m5s4=5&iVZBDh9|VcSfQKdVt-X6p?6x(V@X-z&GF%-~@<;w`sX{B?l3SCIFnW zNm>F9d8UvGdLT>h1w66vHg8`0Jb(xA&iVY$v&X!EC;TI(#&hTHKYlo2H>ByPJ1F@k zl$>ey*4{j@{FsAGC%l03_O0s^KVPk4H>3erN!FuoQmIZH2jDnKT>Xw)JH^ZP8)Bim zO$6?>i{-_6p{{EoRo&Gpg!(p=+MZ*#pi=4kEcA{Hu)C8Ywfgzc_8isuY8D>tf<$}~y)BmeK$Gi-us&S literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/Herbal/agaric.rsi/world4.png b/Resources/Textures/_CP14/Objects/Specific/Alchemy/Herbal/agaric.rsi/world4.png new file mode 100644 index 0000000000000000000000000000000000000000..aacd4d1451d73eba6105877b637b56bd81f68d99 GIT binary patch literal 644 zcmV-~0(Px%K1oDDR9J=WltE~cVHn4MvlPo{E{jMsH(G{LQtOZ(%XNtsqr(P;2T$!%(IK|g zsTM|bTl3NmUAm1R8hCKwS{J939oi+>%Hbi4jS!n_`&1_Qb(mixk?r#{h``_JgZF)& z|Ns5J-}6F)1`Qh2f#2$s{8p#*&%~!rv`Vq*iMmW^)QStn9020rkXmi^24pg#o{Xr+ zt}UT9g_;fctxoCuvxj6vJphTKhQm)EadOzJMqgb5a_ouXX8HcM!67oDp0uv1)^^lh0o**|kPfVGmZo(Z2Omq$*W6E)0f5_=d!(K#-TYk1 z5_|ogk(aMj^{Q(MDpB(=DRLc~o{--34+F5!y7%0ngZm<9FPs5jb$Jbdb-3OeydYTUAv22TS74AxN-kZWa;}4R+rcQ5EqO&5=9M$(Z>kJoZ^Yt z)<9Y(VKNjrb#xto=hyE61j3(e@kvE+P{&*Sbo z-El1PVfJ$X2m-yv#gzehGURY%#Y-Ll z!l5WYpxXXQwoE|gW9r+KeA+5&UtBgz9>_ND*(F3HvjHHkL>%gPh^kReDhQxN{I65K ejs^|>FMa`Wliri5XDUAc00001KIqEP)Px%;7LS5R9J=WmS0FyVHn1Lvy{07iWXvQE)y(QO)bKWJnP0RtcyW~7rU>(Ak^+E z8hD%ARkz+*Hwj)ySYFu-4e1|d;z+_J8#*>uZYl|$F6Pmx$KyF}UIadH;Bff9_j$he zywCf7aDe{}9Sn5|;A;^k;1ugqP=QMgF9M5q?vFCDE_L$YKYx}-3hqDvoWfHh4}>G*%)rY?ge_g{Uh(>$N`dV?SNs& z*s3zHM$ilRBB43@`}{t@Cr6%+Xi`r!si!h`b;m5I%0QY3iL5v6+a`F-Rou5B(D z8t4(TJ#dt;NtHBg0E&&v7`>g;U%9C%OK!pLEG;P-tZ%FXQauBpzt0bFd20c0azP|d z#9>GkPcQ^8?>*K;y!Pq}&&Jk?0V1I}>DA>H?7)VFx1CNZAT_;SL5K_B+6|$#zt8V0 zEh%aZ&&GVn^bg(Ejin_;t<@LL@O5+?X_J!g)7Tx2+IP#nE-kR3*9QYBqb z0Gh2S$L!^Tl2IeldO?xHUWU;+@@vbfX{=*mK0#u19Hu5T$2hbXVz*#-+AO9AiR6-_ ztgIA(FP|r|Sxf~si)m>rI5WMk0>*+f(>9A~35fp)1V;*vPx$@JU2LR9J=WmAy+_Q5eR5#u_xKG!h(?d=M0iw-9SZ%*Dp7&Xx`i*_;H2Qrl4> z|3H$de}Z%p96FThWCAMES}0W%9Q;7Bm#AP8FABL`ay06_!D~LKaDU_B@V?J^&-0uE z78d^_QLm&$y^>aoUN*hvT@86;SB_eUxFI0wl{DFvW9!m}Gajpnh#LYFyGAD9GII)E-#ubF8mYSTQ{8Il?Mt9=75B9@Rx62lL;X4 z(B`T6Sxt83=xWH9G_tNTaq1#rrVwcYSUPneyK*d@I&>#-#{&f(bZUV}liR5>DygJD z#ZbnlboW-x;rC6G(FDq-sW-sO;Q`K0GGtc&7^bPd(v2hG&`{9td7sIi%RXNl0Ke8Y z3Hm+Hf_~5W@7?{K;{B$tAT>X$EsRYA#_Galph zn|Gx|0F2BemnV&Cn(}~R*N`15zIGeC2k^zf*>D}-NH|oors*pX?yl57ac>g}bG3A~ z%iV7WN#`#KxZS$OGK1+86kbUv^RX(6B7<32SUi6I0YDnZn|?*HXaE2J07*qoM6N<$ Ef