diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/base.yml b/Resources/Prototypes/_CP14/Entities/Mobs/base.yml index 22fad75bd9..a234e00bab 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/base.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/base.yml @@ -94,6 +94,8 @@ - type: entity id: CP14MobTemperature + abstract: true + categories: [ ForkFiltered ] components: - type: ThermalRegulator metabolismHeat: 800 diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/vials_filled_potions.yml b/Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/vials_filled_potions.yml index 24fe8bbc6f..11e81f08c7 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/vials_filled_potions.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/vials_filled_potions.yml @@ -29,21 +29,6 @@ - ReagentId: CP14BasicEffectHealPoison Quantity: 1 -- type: entity - id: CP14VialSmallHealingAirloss - parent: CP14VialSmall - name: "brad's airloss healing potion" - suffix: Healing airloss 10% - components: - - type: SolutionContainerManager - solutions: - vial: - reagents: - - ReagentId: CP14BasicEffectEmpty - Quantity: 9 - - ReagentId: CP14BasicEffectHealAirloss - Quantity: 1 - - type: entity id: CP14VialSmallHealingBlood parent: CP14VialSmall diff --git a/Resources/Prototypes/_CP14/Reagents/target_effects.yml b/Resources/Prototypes/_CP14/Reagents/target_effects.yml index 253e2b55ce..b5c78a7717 100644 --- a/Resources/Prototypes/_CP14/Reagents/target_effects.yml +++ b/Resources/Prototypes/_CP14/Reagents/target_effects.yml @@ -199,44 +199,6 @@ Poison: 3 pricePerUnit: 3.5 # Similar to healing but with Chaos instead of Order -- type: reagent - id: CP14BasicEffectHealAirloss - name: cp14-reagent-name-basic-heal-airloss - desc: cp14-reagent-desc-basic-heal-airloss - group: CP14BasicEffect - flavor: fizzy - color: "#e6f4f5" - worksOnTheDead: true - physicalDesc: reagent-physical-desc-milky - metabolisms: - Medicine: - metabolismRate: 0.05 - effects: - - !type:HealthChange - damage: - types: - Asphyxiation: -10 - pricePerUnit: 4.0 # 1×Life (0.2) + 1×Air (0.25) + 1×Order (0.25) + Water (0.1) = 0.8 → x5 - -- type: reagent - id: CP14BasicEffectDamageAirloss - name: cp14-reagent-name-basic-damage-airloss - desc: cp14-reagent-desc-basic-damage-airloss - group: CP14BasicEffect - flavor: horrible - color: "#73091e" - worksOnTheDead: true - physicalDesc: reagent-physical-desc-viscous - metabolisms: - Poison: - metabolismRate: 0.05 - effects: - - !type:HealthChange - damage: - types: - Asphyxiation: 3 - pricePerUnit: 4.0 # Similar to healing but with Chaos instead of Order - - type: reagent id: CP14BasicEffectHealManaDepletion name: cp14-reagent-name-basic-heal-manadepletion diff --git a/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/air_lily.yml b/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/air_lily.yml index 4641e92c9b..39538cf556 100644 --- a/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/air_lily.yml +++ b/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/air_lily.yml @@ -14,19 +14,3 @@ # Admixture: By adding raw precursor to a potion with target solutions, we can reduce the amount of empty solution by modifying the target solutions. -# Emote cough -> Heal airloss - -- type: reaction - id: CP14AirLilyAdmixture - minTemp: 500 - reactants: - CP14AirLily: - amount: 1 - CP14BasicEffectEmpty: - amount: 1 - CP14BasicEffectEmoteCough: - amount: 1 - products: - CP14BasicEffectHealAirloss: 2 - CP14BasicEffectDrunk: 1 - diff --git a/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/chromium_slime.yml b/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/chromium_slime.yml index f430d8eaf1..9466e94a6a 100644 --- a/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/chromium_slime.yml +++ b/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/chromium_slime.yml @@ -52,9 +52,6 @@ CP14BasicEffectSpeedDown: CP14BasicEffectSpeedUp CP14BasicEffectSpeedUp: CP14BasicEffectSpeedDown # - CP14BasicEffectDamageAirloss: CP14BasicEffectHealAirloss - CP14BasicEffectHealAirloss: CP14BasicEffectDamageAirloss - # CP14BasicEffectUnsleep: CP14BasicEffectSleep CP14BasicEffectSleep: CP14BasicEffectUnsleep # diff --git a/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/lumishroom.yml b/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/lumishroom.yml index 43b70a0406..d756e5972b 100644 --- a/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/lumishroom.yml +++ b/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/lumishroom.yml @@ -13,35 +13,3 @@ CP14EssenceEarth: 0.5 # Admixture: By adding raw precursor to a potion with target solutions, we can reduce the amount of empty solution by modifying the target solutions. - -# Idea: Full randomness - -#- type: reaction -# id: CP14LumiMushroomAdmixture -# minTemp: 500 -# reactants: -# CP14LumiMushroom: -# amount: 1 -# CP14BasicEffectEmpty: -# amount: 1 -# cp14RandomProducts: -# - CP14BasicEffectHealBrute: 2 -# - CP14BasicEffectDamageBrute: 2 -# - CP14BasicEffectHealHeat: 2 -# - CP14BasicEffectDamageHeat: 2 -# - CP14BasicEffectHealCold: 2 -# - CP14BasicEffectDamageCold: 2 -# - CP14BasicEffectHealPoison: 2 -# - CP14BasicEffectDamagePoison: 2 -# - CP14BasicEffectHealAirloss: 2 -# - CP14BasicEffectDamageAirloss: 2 -# - CP14BasicEffectBloodRestore: 2 -# - CP14BasicEffectBloodAbsorption: 2 -# - CP14BasicEffectSatiateHunger: 2 -# - CP14BasicEffectSatiateThirst: 2 -# - CP14BasicEffectHealMana: 2 -# - CP14BasicEffectDamageMana: 2 -# - CP14BasicEffectSpeedUp: 2 -# - CP14BasicEffectSpeedDown: 2 -# - CP14BasicEffectSleep: 2 -# - CP14BasicEffectUnsleep: 2 diff --git a/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/target_effect_creation_on_water.yml b/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/target_effect_creation_on_water.yml index 0e777b9597..799fe7aa06 100644 --- a/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/target_effect_creation_on_water.yml +++ b/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/target_effect_creation_on_water.yml @@ -166,48 +166,6 @@ - !type:CP14AffectSolutionTemperature addTemperature: -150 -- type: reaction - id: CP14WaterBrewingHealAirloss - minTemp: 500 - priority: 2 - reactants: - CP14EssenceLife: - amount: 1 - CP14EssenceAir: - amount: 1 - CP14EssenceOrder: - amount: 1 - Water: - amount: 1 - products: - CP14BasicEffectEmpty: 2 - CP14BasicEffectEmoteCough: 1 - CP14BasicEffectHealAirloss: 1 - effects: - - !type:CP14AffectSolutionTemperature - addTemperature: -150 - -- type: reaction - id: CP14WaterBrewingDamageAirloss - minTemp: 500 - priority: 2 - reactants: - CP14EssenceLife: - amount: 1 - CP14EssenceAir: - amount: 1 - CP14EssenceChaos: - amount: 1 - Water: - amount: 1 - products: - CP14BasicEffectEmpty: 2 - CP14BasicEffectEmoteCough: 1 - CP14BasicEffectDamageAirloss: 1 - effects: - - !type:CP14AffectSolutionTemperature - addTemperature: -150 - - type: reaction id: CP14WaterBrewingBloodRestore minTemp: 500 diff --git a/Resources/Prototypes/_CP14/Trading/SellRequests/brad_potions.yml b/Resources/Prototypes/_CP14/Trading/SellRequests/brad_potions.yml index bde71c6b45..ad35b42e5f 100644 --- a/Resources/Prototypes/_CP14/Trading/SellRequests/brad_potions.yml +++ b/Resources/Prototypes/_CP14/Trading/SellRequests/brad_potions.yml @@ -78,26 +78,6 @@ amount: 10 purity: 0.75 -- type: cp14TradingRequest - id: CP14BasicEffectHealAirloss - possibleFactions: - - BradPotions - requirements: - - !type:SolutionResource - reagent: CP14BasicEffectHealAirloss - amount: 10 - purity: 0.75 - -- type: cp14TradingRequest - id: CP14BasicEffectDamageAirloss - possibleFactions: - - BradPotions - requirements: - - !type:SolutionResource - reagent: CP14BasicEffectDamageAirloss - amount: 10 - purity: 0.75 - - type: cp14TradingRequest id: CP14BasicEffectHealManaDepletion possibleFactions: diff --git a/Resources/migration.yml b/Resources/migration.yml index 89dbde1d78..de1740ff3a 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -425,6 +425,7 @@ CP14CandlePurpleSmallInfinite: CP14CandleIgnited #2025-08-21 CP14SpellScrollResurrection: null +CP14VialSmallHealingAirloss: null # <---> CrystallEdge migration zone end