From 3d398e89ab904e260907ca5144d27ae6484bd9db Mon Sep 17 00:00:00 2001 From: Ed <96445749+TheShuEd@users.noreply.github.com> Date: Thu, 27 Feb 2025 15:12:30 +0300 Subject: [PATCH] integration whistler poison into alchemy (#950) --- .../reagents/meta/basic-effect-reagent.ftl | 6 +++ .../en-US/_CP14/reagents/meta/biological.ftl | 2 +- .../reagents/meta/basic-effect-reagent.ftl | 6 +++ .../ru-RU/_CP14/reagents/meta/biological.ftl | 4 +- .../Entities/Objects/Misc/monster_parts.yml | 5 +- .../Weapons/Ranged/Ammunition/spike.yml | 2 +- .../Reagents/Biological/animal_origin.yml | 6 +-- .../_CP14/Reagents/basic-effects.yml | 54 +++++++++++++++++++ .../Reactions/Alchemy/chromium_slime.yml | 7 ++- .../Reactions/Alchemy/whistler_poison.yml | 34 ++++++++++++ 10 files changed, 116 insertions(+), 10 deletions(-) create mode 100644 Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/whistler_poison.yml 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 3764fc641e..be5a701513 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 @@ -81,3 +81,9 @@ cp14-reagent-desc-basic-drunk = A substance that causes dizziness and slurred sp cp14-reagent-name-basic-jitter = Jitter solution cp14-reagent-desc-basic-jitter = A substance that causes uncontrollable but safe spasms throughout the body. + +cp14-reagent-name-basic-sleep = Sleeping solution +cp14-reagent-desc-basic-sleep = Dangerous substance, even in small doses, that sends you to sleep. + +cp14-reagent-name-basic-unsleep = Awakening solution +cp14-reagent-desc-basic-unsleep = A substance that stimulates the body and instantly brings it out of any sleep. \ 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 2ac7be3160..06ccb04613 100644 --- a/Resources/Locale/en-US/_CP14/reagents/meta/biological.ftl +++ b/Resources/Locale/en-US/_CP14/reagents/meta/biological.ftl @@ -31,5 +31,5 @@ cp14-reagent-desc-lumi-shroom = A faintly shimmering slurry extracted from lumig 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-sleepy-poison = Sleepy poison +cp14-reagent-name-sleepy-poison = Whistler poison cp14-reagent-desc-sleepy-poison = A poison secreted by dangerous magical monsters to quickly put their victim to sleep. 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 72c6983fea..ec7efb5042 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 @@ -81,3 +81,9 @@ cp14-reagent-desc-basic-drunk = Вещество, вызывающее голо cp14-reagent-name-basic-jitter = Раствор трясучки cp14-reagent-desc-basic-jitter = Вещество, вызывающее неконтролируемые, но безопасные спазмы во всем теле. + +cp14-reagent-name-basic-sleep = Усыпляющий раствор +cp14-reagent-desc-basic-sleep = Опасное вещество, даже в малых дозах оправляющее в сон. + +cp14-reagent-name-basic-unsleep = Пробуждающий раствор +cp14-reagent-desc-basic-unsleep = Вещество, стимулирующее организм, и моментально выводящее из любого сна. \ 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 f7b4946a0d..449e2d930d 100644 --- a/Resources/Locale/ru-RU/_CP14/reagents/meta/biological.ftl +++ b/Resources/Locale/ru-RU/_CP14/reagents/meta/biological.ftl @@ -31,5 +31,5 @@ cp14-reagent-desc-lumi-shroom = Слабо мерцающая жижа, добы cp14-reagent-name-wild-sage-sap = Сок дикого шалфея cp14-reagent-desc-wild-sage-sap = Сок вездерастущего лечебного растения, неплохо заживляющий физические травмы, и вызывающий откашливание. -cp14-reagent-name-sleepy-poison = Сонный яд -cp14-reagent-desc-sleepy-poison = Яд, выделяемый опасными магическими монстрами, чтобы быстро усыпить свою жертву. +cp14-reagent-name-whistler-poison = Яд свистуна +cp14-reagent-desc-whistler-poison = Яд, выделяемый опасным магическим монстром, чтобы быстро усыпить свою жертву. diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Misc/monster_parts.yml b/Resources/Prototypes/_CP14/Entities/Objects/Misc/monster_parts.yml index 7d24804b52..c5935a0a54 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Misc/monster_parts.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Misc/monster_parts.yml @@ -23,7 +23,10 @@ food: maxVol: 15 reagents: - - ReagentId: CP14SleepyPoison + - ReagentId: CP14WhistlerPoison Quantity: 15 - type: Extractable grindableSolutionName: food + - type: Tag + tags: + - CP14FitInMortar \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Ranged/Ammunition/spike.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Ranged/Ammunition/spike.yml index f9c8154da2..cb22baa4b4 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Ranged/Ammunition/spike.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Ranged/Ammunition/spike.yml @@ -17,7 +17,7 @@ melee: maxVol: 4 reagents: - - ReagentId: CP14SleepyPoison + - ReagentId: CP14WhistlerPoison Quantity: 4 - type: SolutionInjectOnEmbed transferAmount: 4 diff --git a/Resources/Prototypes/_CP14/Reagents/Biological/animal_origin.yml b/Resources/Prototypes/_CP14/Reagents/Biological/animal_origin.yml index 49d81dd0c9..858cd5b91e 100644 --- a/Resources/Prototypes/_CP14/Reagents/Biological/animal_origin.yml +++ b/Resources/Prototypes/_CP14/Reagents/Biological/animal_origin.yml @@ -1,10 +1,10 @@ # Poison - type: reagent - id: CP14SleepyPoison + id: CP14WhistlerPoison group: CP14Biological - name: cp14-reagent-name-sleepy-poison - desc: cp14-reagent-desc-sleepy-poison + name: cp14-reagent-name-whistler-poison + desc: cp14-reagent-desc-whistler-poison flavor: CP14VerySweet color: "#6bb4bf" physicalDesc: reagent-physical-desc-powdery diff --git a/Resources/Prototypes/_CP14/Reagents/basic-effects.yml b/Resources/Prototypes/_CP14/Reagents/basic-effects.yml index 64b57a8905..9504dd51f0 100644 --- a/Resources/Prototypes/_CP14/Reagents/basic-effects.yml +++ b/Resources/Prototypes/_CP14/Reagents/basic-effects.yml @@ -396,6 +396,60 @@ - !type:GenericStatusEffect key: Stutter component: StutteringAccent + +- type: reagent + id: CP14BasicEffectSleep + name: cp14-reagent-name-basic-sleep + desc: cp14-reagent-desc-basic-sleep + group: CP14BasicEffect + flavor: CP14VerySweet + color: "#425e8a" + physicalDesc: cp14-reagent-physical-desc-viscous + metabolisms: + Narcotic: + metabolismRate: 0.1 + effects: + - !type:Emote + emote: Yawn + showInChat: true + probability: 0.2 + - !type:GenericStatusEffect + key: ForcedSleep + component: ForcedSleeping + type: Add + +- type: reagent + id: CP14BasicEffectUnsleep + name: cp14-reagent-name-basic-unsleep + desc: cp14-reagent-desc-basic-unsleep + group: CP14BasicEffect + flavor: CP14VerySweet + color: "#6bc97e" + physicalDesc: cp14-reagent-physical-desc-viscous + metabolisms: + Narcotic: + metabolismRate: 0.1 + effects: + - !type:ResetNarcolepsy + - !type:GenericStatusEffect + key: Stun + time: 3 + type: Remove + - !type:GenericStatusEffect + key: KnockedDown + time: 3 + type: Remove + - !type:GenericStatusEffect + key: ForcedSleep + time: 3 + type: Remove + - !type:AdjustReagent + conditions: + - !type:ReagentThreshold + reagent: CP14BasicEffectSleep + min: 1 + reagent: CP14BasicEffectSleep + amount: -10 # Gimmick solutions, otherwise doesn't give a mechanical benefit diff --git a/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/chromium_slime.yml b/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/chromium_slime.yml index 9552947a74..537b5eabe8 100644 --- a/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/chromium_slime.yml +++ b/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/chromium_slime.yml @@ -45,8 +45,11 @@ CP14BasicEffectDamageAirloss: CP14BasicEffectHealAirloss CP14BasicEffectHealAirloss: CP14BasicEffectDamageAirloss # - # CP14BasicEffectRainbow: - # CP14BasicEffectEmoteCough: + CP14BasicEffectUnsleep: CP14BasicEffectSleep + CP14BasicEffectSleep: CP14BasicEffectUnsleep + # + CP14BasicEffectRainbow: CP14BasicEffectEmoteCough + CP14BasicEffectEmoteCough: CP14BasicEffectRainbow # Simple brewing diff --git a/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/whistler_poison.yml b/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/whistler_poison.yml new file mode 100644 index 0000000000..ee1387930a --- /dev/null +++ b/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/whistler_poison.yml @@ -0,0 +1,34 @@ +# Simple brewing + +- type: reaction + id: CP14WhistlerPoisonBrewing + minTemp: 530 + priority: 2 + reactants: + CP14WhistlerPoison: + amount: 1 + CP14BasicEffectSimpleBase: + amount: 1 + products: + CP14BasicEffectEmpty: 1 + CP14BasicEffectSleep: 0.5 + CP14BasicEffectSpeedDown: 0.25 + cp14RandomProducts: + - CP14BasicEffectSpeedDown: 0.25 + - CP14BasicEffectDrunk: 0.25 + - CP14BasicEffectUnstable: 0.25 + +# Splitting + +- type: reaction + id: CP14WhistlerPoisonSplitting + minTemp: 450 + priority: 3 + reactants: + CP14BasicEffectDamageHeat: + amount: 0.5 + CP14WhistlerPoison: + amount: 0.5 + products: + CP14BasicEffectRainbow: 0.5 + CP14BasicEffectSpeedUp: 0.5 \ No newline at end of file