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 2572789073..d48950eac2 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 @@ -19,5 +19,8 @@ cp14-reagent-desc-see-rainbow = Causes cheerful hallucinations, colors the whole cp14-reagent-name-basic-satiate-hunger = Saturating solution cp14-reagent-desc-basic-satiate-hunger = A mixture that effectively restores hunger. -cp14-reagent-name-basic-satiate-thirst = Life-giving moisture. -cp14-reagent-desc-basic-satiate-thirst = A liquid that tastes very much like water. It tastes strange, but it's a good thirst quencher. \ No newline at end of file +cp14-reagent-name-basic-satiate-thirst = Life-giving moisture +cp14-reagent-desc-basic-satiate-thirst = A liquid that tastes very much like water. It tastes strange, but it's a good thirst quencher. + +cp14-reagent-name-basic-emote-cough = Coughing solution +cp14-reagent-desc-basic-emote-cough = Coughs profusely, but harmlessly. \ 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 b16a33bcf6..c7bb2cd6d4 100644 --- a/Resources/Locale/en-US/_CP14/reagents/meta/biological.ftl +++ b/Resources/Locale/en-US/_CP14/reagents/meta/biological.ftl @@ -5,7 +5,10 @@ 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. +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. cp14-reagent-name-chromium-slime = chromium slime -cp14-reagent-desc-chromium-slime = A rare substance found in water streams, it has unique properties that allow it to invert the effects of reagents, but can completely ruin a potion if dosed incorrectly. \ No newline at end of file +cp14-reagent-desc-chromium-slime = A rare substance found in water streams, it has unique properties that allow it to invert the effects of reagents, but can completely ruin a potion if dosed incorrectly. + +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. 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 1119185da0..9d8c785fc3 100644 --- a/Resources/Locale/en-US/_CP14/reagents/meta/physical-desc.ftl +++ b/Resources/Locale/en-US/_CP14/reagents/meta/physical-desc.ftl @@ -1,4 +1,5 @@ cp14-reagent-physical-desc-ferrous = ferrous 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 +cp14-reagent-physical-desc-viscous = viscous +cp14-reagent-physical-desc-cloudy = cloudy 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 91bb3e2c97..2187d47b86 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 @@ -20,4 +20,7 @@ cp14-reagent-name-basic-satiate-hunger = Насыщающий раствор cp14-reagent-desc-basic-satiate-hunger = Смесь, эффективно восстанавливающая голод. cp14-reagent-name-basic-satiate-thirst = Живительная влага -cp14-reagent-desc-basic-satiate-thirst = Жилкость, очень похожая на воду. Странная на вкус, но неплохо восполняет жажду. \ No newline at end of file +cp14-reagent-desc-basic-satiate-thirst = Жидкость, очень похожая на воду. Странная на вкус, но неплохо восполняет жажду. + +cp14-reagent-name-basic-emote-cough = Откашливающий раствор +cp14-reagent-desc-basic-emote-cough = Вызывает обильный кашель, впрочем, безвредный для здоровья. \ 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 25b2041fe3..ab475a9ca9 100644 --- a/Resources/Locale/ru-RU/_CP14/reagents/meta/biological.ftl +++ b/Resources/Locale/ru-RU/_CP14/reagents/meta/biological.ftl @@ -8,4 +8,7 @@ cp14-reagent-name-agaric-shroom = сок мухомора cp14-reagent-desc-agaric-shroom = Именно этому соку мухоморы обязаны своей ядовитостью. Употребление вызывает сильные недомогания и галлюцинации, но опытные алхимики смогут найти этим грибам и другие применения. cp14-reagent-name-chromium-slime = хромиевая слизь -cp14-reagent-desc-chromium-slime = Редкая субстанция, которую можно встретить в водных потоках, имеет уникальные свойства, позволяющие инвертировать эффекты реагентов, но при неправильной дозировке может полностью испортить зелье. \ No newline at end of file +cp14-reagent-desc-chromium-slime = Редкая субстанция, которую можно встретить в водных потоках, имеет уникальные свойства, позволяющие инвертировать эффекты реагентов, но при неправильной дозировке может полностью испортить зелье. + +cp14-reagent-name-wild-sage-sap = сок дикого шалфея +cp14-reagent-desc-wild-sage-sap = Сок вездерастущего лечебного растения, неплохо заживляющий физические травмы, и вызывающий откашливание. 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 6c88dcb221..1a1ec6ed48 100644 --- a/Resources/Locale/ru-RU/_CP14/reagents/meta/physical-desc.ftl +++ b/Resources/Locale/ru-RU/_CP14/reagents/meta/physical-desc.ftl @@ -2,3 +2,4 @@ cp14-reagent-physical-desc-ferrous = черно-металлическое cp14-reagent-physical-desc-scarlet = мерцающе алое cp14-reagent-physical-desc-colorless = бесцветное cp14-reagent-physical-desc-viscous = вязкое +cp14-reagent-physical-desc-cloudy = мутное diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/herbals.yml b/Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/herbals.yml index 95f07882d7..9644db9483 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/herbals.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/herbals.yml @@ -64,14 +64,14 @@ juiceSolution: reagents: - ReagentId: CP14AgaricMushroom - Quantity: 5 + Quantity: 3 - type: SolutionContainerManager solutions: food: maxVol: 20 reagents: - ReagentId: CP14AgaricMushroom - Quantity: 5 + Quantity: 3 - type: entity id: CP14ChromiumSlime @@ -98,11 +98,46 @@ juiceSolution: reagents: - ReagentId: CP14ChromiumSlime - Quantity: 5 + Quantity: 7 - type: SolutionContainerManager solutions: food: maxVol: 20 reagents: - ReagentId: CP14ChromiumSlime - Quantity: 5 \ No newline at end of file + Quantity: 7 + +- type: entity + id: CP14WildSage + parent: FoodProduceBase + name: wild sage root + description: Root of a ubiquitous medicinal plant, not bad at healing physical injuries, and inducing coughing. + components: + - type: Item + size: Tiny + shape: + - 0,0,0,1 + - type: Produce + - type: Sprite + sprite: _CP14/Objects/Specific/Alchemy/Herbal/wild_sage.rsi + layers: + - state: base1 + map: ["random"] + - type: RandomSprite + available: + - random: + base1: "" + base2: "" + base3: "" + - type: Extractable + juiceSolution: + reagents: + - ReagentId: CP14WildSageSap + Quantity: 8 + - type: SolutionContainerManager + solutions: + food: + maxVol: 20 + reagents: + - ReagentId: CP14WildSageSap + Quantity: 8 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/vials.yml b/Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/vials.yml index e37191e4a3..c736bfaaea 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/vials.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/vials.yml @@ -111,6 +111,8 @@ - type: SolutionContainerVisuals maxFillLevels: 5 fillBaseName: liq- + - type: Injector + maxTransferAmount: 5 - type: entity id: CP14VialSmall @@ -140,13 +142,49 @@ # Filled - type: entity - id: CP14VialSmallVitalExtract + id: CP14VialSmallBloodgrassSap parent: CP14VialSmall - suffix: Vital extract + suffix: bloodgrass sap components: - type: SolutionContainerManager solutions: vial: reagents: - - ReagentId: CP14VitalExtract - Quantity: 10 \ No newline at end of file + - ReagentId: CP14BloodGrassSap + Quantity: 10 + +- type: entity + id: CP14VialSmallAgaricMushroom + parent: CP14VialSmall + suffix: fly agaric juice + components: + - type: SolutionContainerManager + solutions: + vial: + reagents: + - ReagentId: CP14AgaricMushroom + Quantity: 10 + +- type: entity + id: CP14VialSmallWildSage + parent: CP14VialSmall + suffix: wild sage sap + components: + - type: SolutionContainerManager + solutions: + vial: + reagents: + - ReagentId: CP14WildSageSap + Quantity: 10 + +- type: entity + id: CP14VialSmallChromiumSlime + parent: CP14VialTiny + suffix: chromium slime + components: + - type: SolutionContainerManager + solutions: + vial: + reagents: + - ReagentId: CP14ChromiumSlime + Quantity: 5 diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Specific/herbals.yml b/Resources/Prototypes/_CP14/Entities/Structures/Specific/herbals.yml index c0e133efee..7577bb56dc 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Specific/herbals.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Specific/herbals.yml @@ -28,6 +28,9 @@ behaviors: - !type:DoActsBehavior acts: [ "Destruction" ] + - type: Tag + tags: + - HideContextMenu # Bloodgrass @@ -152,9 +155,9 @@ - type: entityLootTable id: CP14GatherChromiumSlime entries: - - id: CP14ChromiumSlime #TODO + - id: CP14ChromiumSlime amount: 1 - maxAmount: 1 + maxAmount: 1 - type: entity id: CP14GatherableChromiumSlime @@ -174,9 +177,6 @@ - Hands loot: All: CP14GatherChromiumSlime - - type: Tag - tags: - - HideContextMenu - type: entity id: CP14GatherableChromiumSlime2 @@ -189,5 +189,44 @@ id: CP14GatherableChromiumSlime3 parent: CP14GatherableChromiumSlime components: + - type: Sprite + state: world3 + +# Wild sage + +- type: entityLootTable + id: CP14GatherWildSage + entries: + - id: CP14WildSage + amount: 1 + maxAmount: 1 + +- type: entity + id: CP14GatherableWildSage + parent: CP14GatherableHerbalBase + name: wild sage + description: Root of this ubiquitous medicinal plant not bad at healing physical injuries, and inducing coughing. + suffix: Gatherable + components: + - type: Sprite + snapCardinals: true + drawdepth: FloorTiles + sprite: _CP14/Objects/Specific/Alchemy/Herbal/wild_sage.rsi + state: world1 + - type: Gatherable + loot: + All: CP14GatherWildSage + +- type: entity + id: CP14GatherableWildSage2 + parent: CP14GatherableWildSage + components: + - type: Sprite + state: world2 + +- type: entity + id: CP14GatherableWildSage3 + parent: CP14GatherableWildSage + components: - type: Sprite state: world3 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Flavors/flavor.yml b/Resources/Prototypes/_CP14/Flavors/flavor.yml index 4bfa042f9a..5b8e9c9dcf 100644 --- a/Resources/Prototypes/_CP14/Flavors/flavor.yml +++ b/Resources/Prototypes/_CP14/Flavors/flavor.yml @@ -16,7 +16,7 @@ description: cp14-flavor-base-bitterly - type: flavor - id: CP14Sweely + id: CP14Sweetly flavorType: Base description: cp14-flavor-base-sweetly diff --git a/Resources/Prototypes/_CP14/Procedural/biomes_template_grasslands.yml b/Resources/Prototypes/_CP14/Procedural/biomes_template_grasslands.yml index 650e1b4e02..5c5ef5e684 100644 --- a/Resources/Prototypes/_CP14/Procedural/biomes_template_grasslands.yml +++ b/Resources/Prototypes/_CP14/Procedural/biomes_template_grasslands.yml @@ -121,6 +121,24 @@ - CP14GatherableBloodgrass3 - CP14GatherableBloodgrass4 - CP14GatherableBloodgrass5 + - !type:BiomeEntityLayer # Rare Wild sage + threshold: 0.85 + noise: + seed: 8 + noiseType: OpenSimplex2 + fractalType: Ridged + frequency: 0.015 + octaves: 3 + lacunarity: 1.8 + gain: 0.7 + domainWarpType: OpenSimplex2 + domainWarpAmp: 120 + allowedTiles: + - CP14FloorGrass + entities: + - CP14GatherableWildSage + - CP14GatherableWildSage2 + - CP14GatherableWildSage3 # Подбиомы лугов diff --git a/Resources/Prototypes/_CP14/Reagents/basic-effects.yml b/Resources/Prototypes/_CP14/Reagents/basic-effects.yml index 8a7ab190b2..abd063742c 100644 --- a/Resources/Prototypes/_CP14/Reagents/basic-effects.yml +++ b/Resources/Prototypes/_CP14/Reagents/basic-effects.yml @@ -17,6 +17,7 @@ physicalDesc: cp14-reagent-physical-desc-scarlet metabolisms: Medicine: + metabolismRate: 0.1 effects: - !type:HealthChange damage: @@ -33,6 +34,7 @@ physicalDesc: cp14-reagent-physical-desc-ferrous metabolisms: Medicine: + metabolismRate: 0.1 effects: - !type:HealthChange damage: @@ -49,6 +51,7 @@ physicalDesc: cp14-reagent-physical-desc-viscous metabolisms: Poison: + metabolismRate: 0.1 effects: - !type:HealthChange damage: @@ -65,6 +68,7 @@ physicalDesc: cp14-reagent-physical-desc-viscous metabolisms: Poison: + metabolismRate: 0.1 effects: - !type:HealthChange damage: @@ -81,6 +85,7 @@ physicalDesc: cp14-reagent-physical-desc-colorless metabolisms: Narcotic: + metabolismRate: 0.1 effects: - !type:GenericStatusEffect key: SeeingRainbows @@ -94,11 +99,12 @@ name: cp14-reagent-name-basic-satiate-hunger desc: cp14-reagent-desc-basic-satiate-hunger group: CP14BasicEffect - flavor: CP14Sweely + flavor: CP14Sweetly color: "#a35629" physicalDesc: cp14-reagent-physical-desc-viscous metabolisms: Food: + metabolismRate: 0.1 effects: - !type:SatiateHunger factor: 6 @@ -113,6 +119,24 @@ physicalDesc: cp14-reagent-physical-desc-colorless metabolisms: Drink: + metabolismRate: 0.1 effects: - !type:SatiateThirst - factor: 6 \ No newline at end of file + factor: 6 + +- type: reagent + id: CP14BasicEffectEmoteCough + name: cp14-reagent-name-basic-emote-cough + desc: cp14-reagent-desc-basic-emote-cough + group: CP14BasicEffect + flavor: CP14Water + color: "#2b7fed" + physicalDesc: cp14-reagent-physical-desc-colorless + metabolisms: + Medicine: + metabolismRate: 0.1 + effects: + - !type:Emote + showInChat: true + emote: Cough + probability: 0.3 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Reagents/biological.yml b/Resources/Prototypes/_CP14/Reagents/biological.yml index d9fe756aef..69cd139195 100644 --- a/Resources/Prototypes/_CP14/Reagents/biological.yml +++ b/Resources/Prototypes/_CP14/Reagents/biological.yml @@ -30,7 +30,7 @@ Food: effects: - !type:SatiateHunger - factor: 1.5 + factor: 2 Poison: effects: - !type:HealthChange @@ -79,4 +79,24 @@ effects: - !type:SatiateThirst - !type:ChemVomit - probability: 0.05 \ No newline at end of file + probability: 0.05 + +- type: reagent + id: CP14WildSageSap + group: CP14Biological + name: cp14-reagent-name-wild-sage-sap + desc: cp14-reagent-desc-wild-sage-sap + flavor: CP14Sweetly + color: "#6b462c" + physicalDesc: cp14-reagent-physical-desc-cloudy + metabolisms: + Medicine: + effects: + - !type:HealthChange + damage: + types: + Blunt: -1 + - !type:Emote + emote: Cough + showInChat: true + probability: 0.15 diff --git a/Resources/Prototypes/_CP14/Recipes/Reactions/biological.yml b/Resources/Prototypes/_CP14/Recipes/Reactions/biological.yml index 50dd8e5953..1f241df70d 100644 --- a/Resources/Prototypes/_CP14/Recipes/Reactions/biological.yml +++ b/Resources/Prototypes/_CP14/Recipes/Reactions/biological.yml @@ -1,18 +1,20 @@ -- type: reaction - id: CP14BloodGrassProcessing1 - minTemp: 350 - reactants: - CP14Blood: - amount: 1 - CP14BloodGrassSap: - amount: 2 - products: - CP14BasicEffectEmpty: 2.7 - CP14BasicEffectSatiateHunger: 0.2 - CP14BasicEffectHealBrute: 0.1 +# Simple brewing (~70% Empty) - type: reaction - id: CP14AgaricShroomProcessing1 + id: CP14BloodGrassBrewing + minTemp: 300 + reactants: + CP14Blood: + amount: 0.2 + CP14BloodGrassSap: + amount: 0.8 + products: + CP14BasicEffectEmpty: 0.8 + CP14BasicEffectSatiateHunger: 0.15 + CP14BasicEffectHealBrute: 0.05 + +- type: reaction + id: CP14AgaricShroomBrewing minTemp: 350 reactants: CP14AgaricMushroom: @@ -20,4 +22,32 @@ products: CP14BasicEffectEmpty: 0.7 CP14BasicEffectRainbow: 0.1 - CP14BasicEffectDamagePoison: 0.15 \ No newline at end of file + CP14BasicEffectDamagePoison: 0.2 + +- type: reaction + id: CP14WildSageSapBrewing + minTemp: 400 + reactants: + CP14WildSageSap: + amount: 1 + products: + CP14BasicEffectHealBrute: 0.2 + CP14BasicEffectEmpty: 0.7 + CP14BasicEffectEmoteCough: 0.1 + +# Complex brewing (2 reagents, ~50% empty) + +- type: reaction + id: CP14BloodGrassAndWildSageSapBrewing + minTemp: 350 + priority: 2 + reactants: + CP14BloodGrassSap: + amount: 0.5 + CP14WildSageSap: + amount: 0.5 + products: + CP14BasicEffectHealBrute: 0.25 + CP14BasicEffectSatiateHunger: 0.1 + CP14BasicEffectEmoteCough: 0.1 + CP14BasicEffectEmpty: 0.55 \ No newline at end of file diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/Herbal/wild_sage.rsi/base1.png b/Resources/Textures/_CP14/Objects/Specific/Alchemy/Herbal/wild_sage.rsi/base1.png new file mode 100644 index 0000000000..ffa5fc8b92 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Specific/Alchemy/Herbal/wild_sage.rsi/base1.png differ diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/Herbal/wild_sage.rsi/base2.png b/Resources/Textures/_CP14/Objects/Specific/Alchemy/Herbal/wild_sage.rsi/base2.png new file mode 100644 index 0000000000..33b00e7b07 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Specific/Alchemy/Herbal/wild_sage.rsi/base2.png differ diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/Herbal/wild_sage.rsi/base3.png b/Resources/Textures/_CP14/Objects/Specific/Alchemy/Herbal/wild_sage.rsi/base3.png new file mode 100644 index 0000000000..0d1d1241ee Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Specific/Alchemy/Herbal/wild_sage.rsi/base3.png differ diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/Herbal/wild_sage.rsi/meta.json b/Resources/Textures/_CP14/Objects/Specific/Alchemy/Herbal/wild_sage.rsi/meta.json new file mode 100644 index 0000000000..1aa0a0e717 --- /dev/null +++ b/Resources/Textures/_CP14/Objects/Specific/Alchemy/Herbal/wild_sage.rsi/meta.json @@ -0,0 +1,29 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Created by Prazar for CrystallPunk14", + "states": [ + { + "name": "base1" + }, + { + "name": "base2" + }, + { + "name": "base3" + }, + { + "name": "world1" + }, + { + "name": "world2" + }, + { + "name": "world3" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/Herbal/wild_sage.rsi/world1.png b/Resources/Textures/_CP14/Objects/Specific/Alchemy/Herbal/wild_sage.rsi/world1.png new file mode 100644 index 0000000000..1fa0cb82c3 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Specific/Alchemy/Herbal/wild_sage.rsi/world1.png differ diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/Herbal/wild_sage.rsi/world2.png b/Resources/Textures/_CP14/Objects/Specific/Alchemy/Herbal/wild_sage.rsi/world2.png new file mode 100644 index 0000000000..36b6f2f8f9 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Specific/Alchemy/Herbal/wild_sage.rsi/world2.png differ diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/Herbal/wild_sage.rsi/world3.png b/Resources/Textures/_CP14/Objects/Specific/Alchemy/Herbal/wild_sage.rsi/world3.png new file mode 100644 index 0000000000..970b416e73 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Specific/Alchemy/Herbal/wild_sage.rsi/world3.png differ