From d998e6bf9a50fdb176ee946892b3547cd08704c1 Mon Sep 17 00:00:00 2001 From: Ed <96445749+TheShuEd@users.noreply.github.com> Date: Sat, 8 Jun 2024 01:03:21 +0300 Subject: [PATCH] Lumishroom (#226) * added lumishroom art * lumishroom * Update migration.yml * fix * fix x2 * Update alchemy_test_layer2.yml * worldgen * Update chromium_inverse.yml * add new barrels and vials --- .../en-US/_CP14/reagents/meta/biological.ftl | 5 +- .../ru-RU/_CP14/reagents/meta/biological.ftl | 5 +- Resources/Maps/_CP14/alchemy_test.yml | 24 +-- Resources/Maps/_CP14/alchemy_test_layer2.yml | 2 +- .../Markers/Spawners/Random/herbal_gather.yml | 26 --- .../Objects/Specific/Alchemy/herbals.yml | 44 ++++- .../Objects/Specific/Alchemy/vials.yml | 32 +++- .../Entities/Structures/Flora/floorWater.yml | 2 - .../Entities/Structures/Furniture/barrel.yml | 12 ++ .../Entities/Structures/Specific/herbals.yml | 172 +++++++++--------- .../_CP14/Procedural/biome_template.yml | 31 ++++ .../Procedural/biomes_template_grasslands.yml | 8 +- .../Prototypes/_CP14/Reagents/biological.yml | 29 ++- .../Reactions/Alchemy/brewing_simple.yml | 16 +- .../Reactions/Alchemy/chromium_inverse.yml | 30 +-- .../Reactions/Alchemy/mixing_simple.yml | 12 ++ .../Alchemy/Herbal/lumishroom.rsi/base1.png | Bin 0 -> 367 bytes .../Alchemy/Herbal/lumishroom.rsi/base2.png | Bin 0 -> 380 bytes .../Alchemy/Herbal/lumishroom.rsi/base3.png | Bin 0 -> 467 bytes .../Alchemy/Herbal/lumishroom.rsi/base4.png | Bin 0 -> 375 bytes .../Alchemy/Herbal/lumishroom.rsi/base5.png | Bin 0 -> 379 bytes .../Alchemy/Herbal/lumishroom.rsi/meta.json | 44 +++++ .../Alchemy/Herbal/lumishroom.rsi/world1.png | Bin 0 -> 590 bytes .../Alchemy/Herbal/lumishroom.rsi/world2.png | Bin 0 -> 625 bytes .../Alchemy/Herbal/lumishroom.rsi/world3.png | Bin 0 -> 517 bytes .../Alchemy/Herbal/lumishroom.rsi/world4.png | Bin 0 -> 529 bytes .../Alchemy/Herbal/lumishroom.rsi/world5.png | Bin 0 -> 329 bytes .../Alchemy/Herbal/lumishroom.rsi/world6.png | Bin 0 -> 372 bytes Resources/migration.yml | 6 + 29 files changed, 340 insertions(+), 160 deletions(-) create mode 100644 Resources/Textures/_CP14/Objects/Specific/Alchemy/Herbal/lumishroom.rsi/base1.png create mode 100644 Resources/Textures/_CP14/Objects/Specific/Alchemy/Herbal/lumishroom.rsi/base2.png create mode 100644 Resources/Textures/_CP14/Objects/Specific/Alchemy/Herbal/lumishroom.rsi/base3.png create mode 100644 Resources/Textures/_CP14/Objects/Specific/Alchemy/Herbal/lumishroom.rsi/base4.png create mode 100644 Resources/Textures/_CP14/Objects/Specific/Alchemy/Herbal/lumishroom.rsi/base5.png create mode 100644 Resources/Textures/_CP14/Objects/Specific/Alchemy/Herbal/lumishroom.rsi/meta.json create mode 100644 Resources/Textures/_CP14/Objects/Specific/Alchemy/Herbal/lumishroom.rsi/world1.png create mode 100644 Resources/Textures/_CP14/Objects/Specific/Alchemy/Herbal/lumishroom.rsi/world2.png create mode 100644 Resources/Textures/_CP14/Objects/Specific/Alchemy/Herbal/lumishroom.rsi/world3.png create mode 100644 Resources/Textures/_CP14/Objects/Specific/Alchemy/Herbal/lumishroom.rsi/world4.png create mode 100644 Resources/Textures/_CP14/Objects/Specific/Alchemy/Herbal/lumishroom.rsi/world5.png create mode 100644 Resources/Textures/_CP14/Objects/Specific/Alchemy/Herbal/lumishroom.rsi/world6.png diff --git a/Resources/Locale/en-US/_CP14/reagents/meta/biological.ftl b/Resources/Locale/en-US/_CP14/reagents/meta/biological.ftl index 6f3386b4ad..400e5e09eb 100644 --- a/Resources/Locale/en-US/_CP14/reagents/meta/biological.ftl +++ b/Resources/Locale/en-US/_CP14/reagents/meta/biological.ftl @@ -20,4 +20,7 @@ cp14-reagent-name-wild-sage-sap = Wild sage juice cp14-reagent-desc-wild-sage-sap = Juice of a ubiquitous medicinal plant, not bad at healing physical injuries, and inducing coughing. cp14-reagent-name-grounded-quartz = Ground quartz -cp14-reagent-desc-grounded-quartz = A powder obtained from grinding quartz fragments. It has weak cleaning properties. \ No newline at end of file +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 diff --git a/Resources/Locale/ru-RU/_CP14/reagents/meta/biological.ftl b/Resources/Locale/ru-RU/_CP14/reagents/meta/biological.ftl index 44f2f98241..67fb6900d4 100644 --- a/Resources/Locale/ru-RU/_CP14/reagents/meta/biological.ftl +++ b/Resources/Locale/ru-RU/_CP14/reagents/meta/biological.ftl @@ -20,4 +20,7 @@ cp14-reagent-name-wild-sage-sap = Сок дикого шалфея cp14-reagent-desc-wild-sage-sap = Сок вездерастущего лечебного растения, неплохо заживляющий физические травмы, и вызывающий откашливание. cp14-reagent-name-grounded-quartz = Размолотый кварц -cp14-reagent-desc-grounded-quartz = Порошок, получаемый из размалывания осколков кварца. Имеет слабые очищающие свойства. \ No newline at end of file +cp14-reagent-desc-grounded-quartz = Порошок, получаемый из размалывания осколков кварца. Имеет слабые очищающие свойства. + +cp14-reagent-name-lumi-shroom = Сок люмигриба +cp14-reagent-desc-lumi-shroom = Слабо мерцающая жижа, добытая из люмигриба. Часто используется алхимиками, как средство концентрации растворов. \ No newline at end of file diff --git a/Resources/Maps/_CP14/alchemy_test.yml b/Resources/Maps/_CP14/alchemy_test.yml index 8b86ebce9a..319a6f6171 100644 --- a/Resources/Maps/_CP14/alchemy_test.yml +++ b/Resources/Maps/_CP14/alchemy_test.yml @@ -45458,7 +45458,7 @@ entities: rot: 1.5707963267948966 rad pos: -16.5,-11.5 parent: 2 -- proto: CP14GatherableBloodgrass2 +- proto: CP14GatherableBloodgrass entities: - uid: 582 components: @@ -45466,7 +45466,7 @@ entities: rot: 1.5707963267948966 rad pos: -16.5,-12.5 parent: 2 -- proto: CP14GatherableBloodgrass3 +- proto: CP14GatherableBloodgrass entities: - uid: 583 components: @@ -45474,7 +45474,7 @@ entities: rot: 1.5707963267948966 rad pos: -15.5,-12.5 parent: 2 -- proto: CP14GatherableBloodgrass4 +- proto: CP14GatherableBloodgrass entities: - uid: 586 components: @@ -45488,7 +45488,7 @@ entities: rot: 1.5707963267948966 rad pos: -16.5,-10.5 parent: 2 -- proto: CP14GatherableBloodgrass5 +- proto: CP14GatherableBloodgrass entities: - uid: 585 components: @@ -45504,7 +45504,7 @@ entities: rot: 1.5707963267948966 rad pos: -13.5,-11.5 parent: 2 -- proto: CP14GatherableChromiumSlime2 +- proto: CP14GatherableChromiumSlime entities: - uid: 601 components: @@ -45518,7 +45518,7 @@ entities: rot: 1.5707963267948966 rad pos: -11.5,-12.5 parent: 2 -- proto: CP14GatherableChromiumSlime3 +- proto: CP14GatherableChromiumSlime entities: - uid: 599 components: @@ -45540,7 +45540,7 @@ entities: rot: 1.5707963267948966 rad pos: -11.5,-7.5 parent: 2 -- proto: CP14GatherableFlyAgaric3 +- proto: CP14GatherableFlyAgaric entities: - uid: 576 components: @@ -45548,7 +45548,7 @@ entities: rot: 1.5707963267948966 rad pos: -12.5,-7.5 parent: 2 -- proto: CP14GatherableFlyAgaric4 +- proto: CP14GatherableFlyAgaric entities: - uid: 575 components: @@ -45562,7 +45562,7 @@ entities: rot: 1.5707963267948966 rad pos: -11.5,-8.5 parent: 2 -- proto: CP14GatherableFlyAgaric5 +- proto: CP14GatherableFlyAgaric entities: - uid: 170 components: @@ -45575,7 +45575,7 @@ entities: rot: 1.5707963267948966 rad pos: -13.5,-6.5 parent: 2 -- proto: CP14GatherableFlyAgaric6 +- proto: CP14GatherableFlyAgaric entities: - uid: 171 components: @@ -45614,7 +45614,7 @@ entities: rot: 1.5707963267948966 rad pos: -14.5,-7.5 parent: 2 -- proto: CP14GatherableWildSage2 +- proto: CP14GatherableWildSage entities: - uid: 567 components: @@ -45622,7 +45622,7 @@ entities: rot: 1.5707963267948966 rad pos: -16.5,-6.5 parent: 2 -- proto: CP14GatherableWildSage3 +- proto: CP14GatherableWildSage entities: - uid: 568 components: diff --git a/Resources/Maps/_CP14/alchemy_test_layer2.yml b/Resources/Maps/_CP14/alchemy_test_layer2.yml index e068dcd711..305fd8f655 100644 --- a/Resources/Maps/_CP14/alchemy_test_layer2.yml +++ b/Resources/Maps/_CP14/alchemy_test_layer2.yml @@ -18170,7 +18170,7 @@ entities: rot: 3.141592653589793 rad pos: 4.5,-4.5 parent: 2 -- proto: CP14GatherableFlyAgaric2 +- proto: CP14GatherableFlyAgaric entities: - uid: 834 components: 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 587d1c4d77..6dc65152ef 100644 --- a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/herbal_gather.yml +++ b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/herbal_gather.yml @@ -1,24 +1,3 @@ -- type: entity - id: CP14RandomSpawnerGatherGloodgrass - name: bloodgrass spawner - parent: MarkerBase - categories: - - Spawner - 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 @@ -34,9 +13,4 @@ - 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 f1aa55b139..9f1cb6fa73 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/herbals.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/herbals.yml @@ -181,4 +181,46 @@ juiceSolution: reagents: - ReagentId: CP14GroundQuartz - Quantity: 3 \ No newline at end of file + Quantity: 3 + +- type: entity + id: CP14LumiMushroom + parent: FoodProduceBase + name: lumishroom + description: A faintly luminous mushroom. Often used by alchemists as a means of concentrating solutions. + components: + - type: Tag + tags: + - CP14FitInMortar + - type: BadFood + - type: Item + size: Tiny + - type: Produce + - type: Sprite + sprite: _CP14/Objects/Specific/Alchemy/Herbal/lumishroom.rsi + layers: + - state: base1 + map: ["random"] + - type: RandomSprite + available: + - random: + base1: "" + base2: "" + base3: "" + base4: "" + base5: "" + - type: Extractable + juiceSolution: + reagents: + - ReagentId: CP14LumiMushroom + Quantity: 4 + - type: PointLight + color: "#36c98f" + radius: 1.2 + - type: SolutionContainerManager + solutions: + food: + maxVol: 20 + reagents: + - ReagentId: CP14LumiMushroom + Quantity: 4 diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/vials.yml b/Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/vials.yml index c736bfaaea..2b6d854350 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/vials.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/vials.yml @@ -144,7 +144,7 @@ - type: entity id: CP14VialSmallBloodgrassSap parent: CP14VialSmall - suffix: bloodgrass sap + suffix: Bloodgrass sap components: - type: SolutionContainerManager solutions: @@ -156,7 +156,7 @@ - type: entity id: CP14VialSmallAgaricMushroom parent: CP14VialSmall - suffix: fly agaric juice + suffix: Fly agaric juice components: - type: SolutionContainerManager solutions: @@ -165,10 +165,22 @@ - ReagentId: CP14AgaricMushroom Quantity: 10 +- type: entity + id: CP14VialSmallGroundQuartz + parent: CP14VialSmall + suffix: Ground Quartz + components: + - type: SolutionContainerManager + solutions: + vial: + reagents: + - ReagentId: CP14GroundQuartz + Quantity: 10 + - type: entity id: CP14VialSmallWildSage parent: CP14VialSmall - suffix: wild sage sap + suffix: Wild sage Sap components: - type: SolutionContainerManager solutions: @@ -180,7 +192,7 @@ - type: entity id: CP14VialSmallChromiumSlime parent: CP14VialTiny - suffix: chromium slime + suffix: Chromium Slime components: - type: SolutionContainerManager solutions: @@ -188,3 +200,15 @@ reagents: - ReagentId: CP14ChromiumSlime Quantity: 5 + +- type: entity + id: CP14VialSmallLumiMushroom + parent: CP14VialTiny + suffix: LumiShroom + components: + - type: SolutionContainerManager + solutions: + vial: + reagents: + - ReagentId: CP14LumiMushroom + Quantity: 5 diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Flora/floorWater.yml b/Resources/Prototypes/_CP14/Entities/Structures/Flora/floorWater.yml index cfb79cd642..720ac1105f 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Flora/floorWater.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Flora/floorWater.yml @@ -61,8 +61,6 @@ - type: RandomSpawner prototypes: - CP14GatherableChromiumSlime - - CP14GatherableChromiumSlime2 - - CP14GatherableChromiumSlime3 chance: 0.01 deleteSpawnerAfterSpawn: false - type: Tag diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/barrel.yml b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/barrel.yml index fa179a3dd8..d582ee76ca 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/barrel.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/barrel.yml @@ -198,4 +198,16 @@ barrel: reagents: - ReagentId: CP14GroundQuartz + Quantity: 300 + +- type: entity + id: CP14BarrelLumiMushroom + parent: CP14BaseBarrel + suffix: LumiShroom + components: + - type: SolutionContainerManager + solutions: + barrel: + reagents: + - ReagentId: CP14LumiMushroom Quantity: 300 \ 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 7577bb56dc..5c57c2e789 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Specific/herbals.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Specific/herbals.yml @@ -52,39 +52,21 @@ snapCardinals: true drawdepth: FloorTiles sprite: _CP14/Objects/Specific/Alchemy/Herbal/bloodgrass.rsi - state: grass1 + layers: + - state: grass1 + map: ["random"] + - type: RandomSprite + available: + - random: + grass1: "" + grass2: "" + grass3: "" + grass4: "" + grass5: "" - type: Gatherable loot: All: CP14GatherBloodgrass -- type: entity - id: CP14GatherableBloodgrass2 - parent: CP14GatherableBloodgrass - components: - - type: Sprite - state: grass2 - -- type: entity - id: CP14GatherableBloodgrass3 - parent: CP14GatherableBloodgrass - components: - - type: Sprite - state: grass3 - -- type: entity - id: CP14GatherableBloodgrass4 - parent: CP14GatherableBloodgrass - components: - - type: Sprite - state: grass4 - -- type: entity - id: CP14GatherableBloodgrass5 - parent: CP14GatherableBloodgrass - components: - - type: Sprite - state: grass5 - # Fly agaric - type: entityLootTable @@ -105,7 +87,18 @@ snapCardinals: true drawdepth: FloorTiles sprite: _CP14/Objects/Specific/Alchemy/Herbal/agaric.rsi - state: world1 + layers: + - state: world1 + map: ["random"] + - type: RandomSprite + available: + - random: + world1: "" + world2: "" + world3: "" + world4: "" + world5: "" + world6: "" - type: Gatherable toolWhitelist: tags: @@ -115,41 +108,6 @@ 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 - # Chromium slime - type: entityLootTable @@ -170,7 +128,15 @@ snapCardinals: true drawdepth: FloorTiles sprite: _CP14/Objects/Specific/Alchemy/Herbal/chromium_slime.rsi - state: world1 + layers: + - state: world1 + map: ["random"] + - type: RandomSprite + available: + - random: + world1: "" + world2: "" + world3: "" - type: Gatherable toolWhitelist: components: @@ -178,20 +144,6 @@ loot: All: CP14GatherChromiumSlime -- type: entity - id: CP14GatherableChromiumSlime2 - parent: CP14GatherableChromiumSlime - components: - - type: Sprite - state: world2 - -- type: entity - id: CP14GatherableChromiumSlime3 - parent: CP14GatherableChromiumSlime - components: - - type: Sprite - state: world3 - # Wild sage - type: entityLootTable @@ -212,21 +164,59 @@ snapCardinals: true drawdepth: FloorTiles sprite: _CP14/Objects/Specific/Alchemy/Herbal/wild_sage.rsi - state: world1 + layers: + - state: world1 + map: ["random"] + - type: RandomSprite + available: + - random: + world1: "" + world2: "" + world3: "" - type: Gatherable loot: All: CP14GatherWildSage + +# Wild sage + +- type: entityLootTable + id: CP14GatherLumiMushroom + entries: + - id: CP14LumiMushroom + amount: 1 + maxAmount: 1 - type: entity - id: CP14GatherableWildSage2 - parent: CP14GatherableWildSage + id: CP14GatherableLumiMushroom + parent: CP14GatherableHerbalBase + name: lumishroom + description: A faintly luminous mushroom. Often used by alchemists as a means of concentrating solutions. + suffix: Gatherable components: - type: Sprite - state: world2 - -- type: entity - id: CP14GatherableWildSage3 - parent: CP14GatherableWildSage - components: - - type: Sprite - state: world3 \ No newline at end of file + snapCardinals: true + drawdepth: FloorTiles + sprite: _CP14/Objects/Specific/Alchemy/Herbal/lumishroom.rsi + layers: + - state: world1 + map: ["random"] + - type: RandomSprite + available: + - random: + world1: "" + world2: "" + world3: "" + world4: "" + world5: "" + world6: "" + - type: PointLight + 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/Procedural/biome_template.yml b/Resources/Prototypes/_CP14/Procedural/biome_template.yml index fc4baf2d2e..b057eda164 100644 --- a/Resources/Prototypes/_CP14/Procedural/biome_template.yml +++ b/Resources/Prototypes/_CP14/Procedural/biome_template.yml @@ -70,6 +70,37 @@ - CP14CrystalDiamondsSmall - CP14CrystalDiamondsMedium - CP14CrystalDiamondsBig + - !type:BiomeEntityLayer # lumishroom sage + threshold: 0.6 + noise: + seed: 8 + noiseType: OpenSimplex2 + fractalType: Ridged + frequency: 0.015 + octaves: 3 + lacunarity: 1.8 + gain: 0.7 + domainWarpType: OpenSimplex2 + domainWarpAmp: 120 + allowedTiles: + - CP14FloorBase + entities: + - CP14GatherableLumiMushroom + # Lakes start + - !type:BiomeEntityLayer + allowedTiles: + - CP14FloorBase + threshold: 0.8 + noise: + seed: 14 + noiseType: OpenSimplex2 + fractalType: FBm + frequency: 0.01 + domainWarpType: OpenSimplex2 + domainWarpAmp: 150 + entities: + - CP14FloorWater + # Lakes end #Walls - !type:BiomeEntityLayer threshold: -0.75 diff --git a/Resources/Prototypes/_CP14/Procedural/biomes_template_grasslands.yml b/Resources/Prototypes/_CP14/Procedural/biomes_template_grasslands.yml index d06b846b81..8ef224dfed 100644 --- a/Resources/Prototypes/_CP14/Procedural/biomes_template_grasslands.yml +++ b/Resources/Prototypes/_CP14/Procedural/biomes_template_grasslands.yml @@ -117,12 +117,8 @@ - CP14FloorGrass entities: - CP14GatherableBloodgrass - - CP14GatherableBloodgrass2 - - CP14GatherableBloodgrass3 - - CP14GatherableBloodgrass4 - - CP14GatherableBloodgrass5 - !type:BiomeEntityLayer # Rare Wild sage - threshold: 0.85 + threshold: 0.8 noise: seed: 8 noiseType: OpenSimplex2 @@ -137,8 +133,6 @@ - CP14FloorGrass entities: - CP14GatherableWildSage - - CP14GatherableWildSage2 - - CP14GatherableWildSage3 # Подбиомы лугов diff --git a/Resources/Prototypes/_CP14/Reagents/biological.yml b/Resources/Prototypes/_CP14/Reagents/biological.yml index 311c780595..7e3187f4d4 100644 --- a/Resources/Prototypes/_CP14/Reagents/biological.yml +++ b/Resources/Prototypes/_CP14/Reagents/biological.yml @@ -143,4 +143,31 @@ Food: effects: - !type:ChemVomit - probability: 0.05 \ No newline at end of file + probability: 0.05 + +- type: reagent + id: CP14LumiMushroom + group: CP14Biological + name: cp14-reagent-name-lumi-shroom + desc: cp14-reagent-desc-lumi-shroom + flavor: CP14Vomit + color: "#36c98f" + physicalDesc: cp14-reagent-physical-desc-colorless + slippery: false + metabolisms: + Poison: + effects: + - !type:HealthChange + damage: + types: + Poison: 0.5 + - !type:ChemVomit + probability: 0.04 + 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/Alchemy/brewing_simple.yml b/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/brewing_simple.yml index db54d00a7b..b15ac60f78 100644 --- a/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/brewing_simple.yml +++ b/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/brewing_simple.yml @@ -45,7 +45,21 @@ CP14GroundQuartz: amount: 1 products: - CP14BasicEffectEmpty: 0.75 + CP14BasicEffectEmpty: 1 + effects: + - !type:CP14AffectSolutionTemperature + addTemperature: -250 + +- type: reaction + id: CP14LumiMushroomBrewing + minTemp: 500 + priority: 2 + reactants: + CP14LumiMushroom: + amount: 1 + products: + CP14BasicEffectEmpty: 0.5 + CP14BasicEffectRainbow: 0.25 CP14BasicEffectVomit: 0.25 effects: - !type:CP14AffectSolutionTemperature diff --git a/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/chromium_inverse.yml b/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/chromium_inverse.yml index 298651b8a8..d73646fd2e 100644 --- a/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/chromium_inverse.yml +++ b/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/chromium_inverse.yml @@ -8,6 +8,7 @@ - type: reaction id: CP14ChromiumInverseEffectHealBruteGroup + quantized: true minTemp: 350 conserveEnergy: false reactants: @@ -16,14 +17,15 @@ CP14ChromiumSlime: amount: 0.5 products: - CP14BasicEffectDamageBrute: 0.5 - CP14BasicEffectEmpty: 0.25 + CP14BasicEffectDamageBrute: 0.25 + CP14BasicEffectEmpty: 0.75 effects: - !type:CP14AffectSolutionTemperature addTemperature: -350 - type: reaction id: CP14ChromiumInverseEffectDamageBruteGroup + quantized: true minTemp: 350 conserveEnergy: false reactants: @@ -32,8 +34,8 @@ CP14ChromiumSlime: amount: 0.5 products: - CP14BasicEffectHealBrute: 0.5 - CP14BasicEffectEmpty: 0.25 + CP14BasicEffectHealBrute: 0.25 + CP14BasicEffectEmpty: 0.75 effects: - !type:CP14AffectSolutionTemperature addTemperature: -350 @@ -42,6 +44,7 @@ - type: reaction id: CP14ChromiumInverseEffectHealPoison + quantized: true minTemp: 350 conserveEnergy: false reactants: @@ -50,14 +53,15 @@ CP14ChromiumSlime: amount: 0.5 products: - CP14BasicEffectDamagePoison: 0.5 - CP14BasicEffectEmpty: 0.25 + CP14BasicEffectDamagePoison: 0.25 + CP14BasicEffectEmpty: 0.75 effects: - !type:CP14AffectSolutionTemperature addTemperature: -350 - type: reaction id: CP14ChromiumInverseEffectDamagePoison + quantized: true minTemp: 350 conserveEnergy: false reactants: @@ -66,8 +70,8 @@ CP14ChromiumSlime: amount: 0.5 products: - CP14BasicEffectHealPoison: 0.5 - CP14BasicEffectEmpty: 0.25 + CP14BasicEffectHealPoison: 0.25 + CP14BasicEffectEmpty: 0.75 effects: - !type:CP14AffectSolutionTemperature addTemperature: -350 @@ -76,6 +80,7 @@ - type: reaction id: CP14ChromiumInverseEffectDamageCold + quantized: true minTemp: 350 conserveEnergy: false reactants: @@ -84,14 +89,15 @@ CP14ChromiumSlime: amount: 0.5 products: - CP14BasicEffectHealCold: 0.5 - CP14BasicEffectEmpty: 0.25 + CP14BasicEffectHealCold: 0.25 + CP14BasicEffectEmpty: 0.75 effects: - !type:CP14AffectSolutionTemperature addTemperature: -350 - type: reaction id: CP14ChromiumInverseEffectHealCold + quantized: true minTemp: 350 conserveEnergy: false reactants: @@ -100,8 +106,8 @@ CP14ChromiumSlime: amount: 0.5 products: - CP14BasicEffectDamageCold: 0.5 - CP14BasicEffectEmpty: 0.25 + CP14BasicEffectDamageCold: 0.25 + CP14BasicEffectEmpty: 0.75 effects: - !type:CP14AffectSolutionTemperature addTemperature: -350 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/mixing_simple.yml b/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/mixing_simple.yml index 8dd82cfaae..f84e8d3ac2 100644 --- a/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/mixing_simple.yml +++ b/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/mixing_simple.yml @@ -104,3 +104,15 @@ products: CP14BasicEffectEmoteCough: 0.25 CP14BasicEffectDamagePoison: 0.25 + +- type: reaction + id: CP14EmptySplitting + priority: 3 + reactants: + CP14BasicEffectEmpty: + amount: 0.5 + CP14LumiMushroom: + amount: 0.5 + effects: + - !type:CP14AffectSolutionTemperature + addTemperature: -250 \ No newline at end of file diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/Herbal/lumishroom.rsi/base1.png b/Resources/Textures/_CP14/Objects/Specific/Alchemy/Herbal/lumishroom.rsi/base1.png new file mode 100644 index 0000000000000000000000000000000000000000..308076c7aee4247654e9de42d771aa2889fd76a5 GIT binary patch literal 367 zcmV-#0g(QQP)Px$DM>^@R9J=WlCes|Kp4k=iUd5w5KJIYf*^{WTzn26p_}O7)CcI~19Wmw-1;0o zf=d?_-7@qbC!r!Ibcxf2gr=BYKm_l%eRs$Gf8Tuv4u`|>-`QB_@b=wJ5yp$gJtaN9 zF0R(P??(X>sH8_VcyH$efS0$B<3k0&`{%Be%*sR6ZcShm%*k?pDOgFbtgA9@L{@H| zT#ky@)3~-4#tZsMT3gFDK$YQe zQ~*3^Xp(9ZY}m390N6k1aVB&0lVm(z4w|;SXVX>yAc_No5ao;5U?m`g03egOZLYmQ zQ@2XZeow$)y4PAWncQ1_W-9@uW@xQzbr-D62ZQr+3|+c+I2?{Y!8goAcwN?ZhmZgO N002ovPDHLkV1h*=pWFZd literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/Herbal/lumishroom.rsi/base2.png b/Resources/Textures/_CP14/Objects/Specific/Alchemy/Herbal/lumishroom.rsi/base2.png new file mode 100644 index 0000000000000000000000000000000000000000..75eb4c47ea67c3be0428ff7d7c193c32cc0065cf GIT binary patch literal 380 zcmV-?0fYXDP)Px$Hc3Q5R9J=Wk}+z-FcgOWbTC91gRu=-yrm>lmy#`4$yVB-lMmpj2k?}kA)9Z| zdvxj4(xy;MsUR}J#;B0Ron#su63Gc<(Kkr~>HqZJ0}KX(!Ek1Jx)=KMS?$wJ>zp$S zzqj|=?$ymH{#CGyJAlDSX`9}YN1VFu1DcyPx$jY&j7R9J=Wl(9;~P!xv0iWGVYN^OdP5(`z)$;HR;8Qeq#r?_Y817vcrxcLUY zhl`6XR-rA@3%MmUXoW6uGMK2`G$10CsnHK%5T zOkP$JdrFphJ3h-)Cl`Qy<3#{9BTTGMURF@D%+8jI<2*o1x&$T50Mx5fdVMo)R5QZ3 zdA&Mi*B((bLQHE;rE?Kw1z6T4Y~M^W#5Z>t0Wyth z@5GHB_AP)!qqHYJrnSfwENq_7FlnXXdVNz1lgqu1<3>UVX0sUpp4Tqzow(8Z>1&+h z2de;D2(1TxQr)WJOJaz-%XX=<|J8iD326TU9Yng>`5@%J>z-pOto`+K&df8h&XPx8u&86mjOzR zGuO#I0f589qiADeGqE-tK5~71^?UEYcMzZBMVc2XRH)Fu&^vo5nyPx$F-b&0R9J=Wl)Fj;K@^66MFz4g0ht6AWD#T~RyLB(S4k&YSmgmy`2bs`Fr>>H z8IxG>7{|shHTC3+lYtbxRfy|f%&p-)~$#j{S?wqK}z5( zOwfu5wLw3tihWRZVI5>;gk=O=wqMQpBnd%En7wBE4U;6a$qRr*3(jwP+4DsJ0Hrb) zTL7R`5mExD4+@X>ca`z2XP{{0H*AGBHt-$YZZA7NIl@dWptVLE+Y9Gd4dGAXp69tf z|GNPIXaD Vacf?d8c+ZL002ovPDHLkV1lX3n>7Fc literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/Herbal/lumishroom.rsi/base5.png b/Resources/Textures/_CP14/Objects/Specific/Alchemy/Herbal/lumishroom.rsi/base5.png new file mode 100644 index 0000000000000000000000000000000000000000..249a61f6466735f49761ad5d535aa4f48905177d GIT binary patch literal 379 zcmV->0fhdEP)Px$HAzH4R9J=Wm9a|0P!xv0iWIzv5=d4NnlKqm*KTb`#& zr-~v-5Ce^rh+H8{96~f{(tt?hT#Lz+(%fnotvJku5 z$PF!I?pd5#9>y>c8CnQ{F-+FEXA$`QT%EzxXSTsn+JUocCw@9N0VtdKDub!d?Ebda zcxxTX1}TzVh~#-Zt|!e>I)aov|w(Z271#sO-Pf7{=b)gBZMv(1-l(MiZRW$k+WEqVvf7|Z5lh*YV3WcI` ZegKDic4rfb^xOad002ovPDHLkV1hFNq8R`H literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/Herbal/lumishroom.rsi/meta.json b/Resources/Textures/_CP14/Objects/Specific/Alchemy/Herbal/lumishroom.rsi/meta.json new file mode 100644 index 0000000000..5446984454 --- /dev/null +++ b/Resources/Textures/_CP14/Objects/Specific/Alchemy/Herbal/lumishroom.rsi/meta.json @@ -0,0 +1,44 @@ +{ + "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" + }, + { + "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/lumishroom.rsi/world1.png b/Resources/Textures/_CP14/Objects/Specific/Alchemy/Herbal/lumishroom.rsi/world1.png new file mode 100644 index 0000000000000000000000000000000000000000..7d8f41ade57aa01ed2893b9ea5a32781db05395f GIT binary patch literal 590 zcmV-U0Px%2uVaiR9J=Wl}$?mK^VvXMFc`5l7biaV$cf|h32U)LDw#I=rXrOf(XhFVAvNZ z2q8r1u-Cfu0X%i;g~Eds=pnrbYe*6ZU8Y0MGVRXnxMFnK9|+^TJkOu!`Ohri_Qv?S&-RS!$Dl8b7y^YnWtAgDr-@WjnH-RKz%HVP zm7KwQrJLRx;m&0fsiY;oUatYbF@Q3FieVI=T?KGL=Gd4&#I4grDv5{Nd#lgAGdr3V z&jP^hwrO3*g^R|#JMcHDx21oZrn)wDQ(-z8SH z$sTLq3fO$&NX+eXw24Rf4)jAW;T0kJmMl4gnNfsm1vVZtlo{x0{m4_b_#0twm0=W* zlmhr~g3Lf3g#a$Cl8RtIuZaaBgs9#DR|5?L>9>I4W}so9dWu~Q^k)JDLIAG@8WwH_ c^6?o4-&0-`&nIW=O8@`>07*qoM6N<$f*FzsyZ`_I literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/Herbal/lumishroom.rsi/world2.png b/Resources/Textures/_CP14/Objects/Specific/Alchemy/Herbal/lumishroom.rsi/world2.png new file mode 100644 index 0000000000000000000000000000000000000000..43c8441f08ad1bb7d9c4ad3ef8f7957e0e4f54db GIT binary patch literal 625 zcmV-%0*?KOP)Px%D@jB_R9J=WmQ8EaP!xtAKPU{84#5e`CfQ7(t%4}6{Q*LML8r^R3nGXh-4N9u)crVXYr; z+IW z03nEQ{kwugPA4oo+tm&L%FT9Ft+v^&HUKF=V9HXfY*l7}f6jga+|LEhDJ2O400000 LNkvXXu0mjf%JvxT literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/Herbal/lumishroom.rsi/world3.png b/Resources/Textures/_CP14/Objects/Specific/Alchemy/Herbal/lumishroom.rsi/world3.png new file mode 100644 index 0000000000000000000000000000000000000000..0b90b153b66fa308f151ec100cc1f96cbd4e6ebc GIT binary patch literal 517 zcmV+g0{Z=lP)Px$zez+vR9J=Wls!wsP!xtAtqOuziYaulOBY@IYVD*5f~$*N?-pE~^am)qxVgDV zx4Y^u5M1iyS0#g5Xb01!QYAzL(IqY>)Q_0NWDv|d-5l;c?{iP?IS?z>e^*!71pRxv zmXdkpzSW14d3EB=#Z_OqLjl<4Lj#YbQzmUA2|%r`I51uykyOB5&rCO*c-u(w@HEJM ztB>d96<43o0Jelst^L`_FY%wu0eYeW09d#$x&t116a8~`+%yee z=HR0O3)MBt?(fU_jc@l0p^kQbdztzMum{b^aFe!?q*hlv+bXC$lXVW7pym@tn-)Mi zWpX&V^X*yBE+|#1Y`-KZRjNU}9q@F@l-l^F-QGpCCGaVc^O|4H7F>tiP)_wPCCQFH(rE00000NkvXX Hu0mjf$E4!o literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/Herbal/lumishroom.rsi/world4.png b/Resources/Textures/_CP14/Objects/Specific/Alchemy/Herbal/lumishroom.rsi/world4.png new file mode 100644 index 0000000000000000000000000000000000000000..4a146d770b921a303213f5d6fae8a224543370fe GIT binary patch literal 529 zcmV+s0`C2ZP)Px$%Sl8*R9J=WmOo3wP!z>~S}hbr5f!@Vq985?>z_#xgsv`jaLHC&oa_g%;NmJs zp-8u^`YF1%lEEt2!FGwXB}4?#B`&_0rb#NPPnVwQar1cRy!-CCH!#Ey|BMmY1c|GH zJ)8Uhpt*n2!#66EI9<)z%S&zAM%;;c_esfsxb@7$3v<(!6TffH(>CI~9UVKo(w@NY zwm=v8pWx!MXkT0weZ_#p8URq$tPRjIOlR#yOcL>dqNEOi-SJog0LwB_l+>uAq-J!z zQWJZ7-a`~n+lV9V1O683CjwaYgmq0T-M9l?hkC2GWljO`@Hk7DmqSFXh_$AbYJPis zGa%O6n{_ANGNCV0 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/Herbal/lumishroom.rsi/world5.png b/Resources/Textures/_CP14/Objects/Specific/Alchemy/Herbal/lumishroom.rsi/world5.png new file mode 100644 index 0000000000000000000000000000000000000000..9f7e37a5f4c9c729fa030d43141cfe5f4c7c46da GIT binary patch literal 329 zcmV-P0k-~$P)Px$14%?dR9J=WlfP=hP!z_0t*s!GiWniU(4|tfPDE7?0!}oFjfFS&LPKt`P_qWutx2(b{mc7mO z#ptPU&PagFym_&q)kuiqIsmh|m4`7A%py`>rq^1{e8(Qtn%~lSSp0puu@Js z8Q%QT%bEk6={7!pZ3qG%*Bu+Xe}Gfn#+KbM>8l?=DJSjrdq**cf;XU)a}QhtFWr8R zD2xFJ0w3TN@PJR(9Z$;ysQgv%ypL(S-B|+b^GfY5(~~4NW)2#^Kq=>He{aH65ClOG b1Yw^YjABfN5H29400000NkvXXu0mjf0RNBh literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/Herbal/lumishroom.rsi/world6.png b/Resources/Textures/_CP14/Objects/Specific/Alchemy/Herbal/lumishroom.rsi/world6.png new file mode 100644 index 0000000000000000000000000000000000000000..fcee09a6541548c9a35357f3c8ee1cb5b1050f7a GIT binary patch literal 372 zcmV-)0gL{LP)Px$E=fc|R9J=Wm9a_#K@f&N6#{7tf`ZMZQHVA^gpemN?RJNaT^_(d8cPEq5W;m^ z+xQB3fD;>SY?9{SP7Xm3Z8p^g3EqXv%_+iu)$PH|{5!MzFE|_y#~-sLk)$1VO`J9W zcsTDB%DG*(czrT5&vTE1y|?AMNW4e~z8C$ty!zb^0Cc7yH=jFnreWb&5di>klx`GP zY6MF87r+^C-E1BKFq^#q^tBFpl?(Vm2*9J(!JS0jO+@@ZL`JZRcYkXDlBl-!T8iBQ zi}i#gs?j=5Xop>sXHKFWs82>_|L}_wZ@&B&rwv};cQd;oK7y>>7Inzd42EMf7>?Jz z3*u)0Kq=o?XH?416(QP|JZB`spv330;)<3`cdYDSDCM8pZ>@u;s_Hl#rC9&~w`OPt SsByIb0000 CrystallPunk migration zone end