Fix Caustic damage group, Health Analyzer damage groups, change caustic to a damage type, add resistances (#14218)

This commit is contained in:
Maxtone
2023-03-22 22:38:35 -05:00
committed by GitHub
parent 55fb37e696
commit 33cf53d6cf
24 changed files with 230 additions and 38 deletions

View File

@@ -14,6 +14,7 @@ health-analyzer-window-damage-group-Burn = Burn
health-analyzer-window-damage-type-Heat = Heat
health-analyzer-window-damage-type-Shock = Shock
health-analyzer-window-damage-type-Cold = Cold
health-analyzer-window-damage-type-Caustic = Caustic
health-analyzer-window-damage-group-Airloss = Airloss
health-analyzer-window-damage-type-Asphyxiation = Asphyxiation
@@ -25,5 +26,3 @@ health-analyzer-window-damage-type-Radiation = Radiation
health-analyzer-window-damage-group-Genetic = Genetic
health-analyzer-window-damage-type-Cellular = Cellular
health-analyzer-window-damage-group-Caustic = Caustic

View File

@@ -4,3 +4,4 @@ generic-reagent-effect-burning-insides = You feel your insides burning up!
generic-reagent-effect-burning-eyes = Your eyes begin to slightly burn.
generic-reagent-effect-burning-eyes-a-bit = Your eyes burn a bit.
generic-reagent-effect-tearing-up = Your eyes start to tear up.
generic-reagent-effect-nauseous = You feel nauseous.

View File

@@ -3,3 +3,6 @@ reagent-desc-acetone = A slick, slightly carcinogenic liquid. Has a multitude of
reagent-name-phenol = phenol
reagent-desc-phenol = An aromatic ring of carbon with a hydroxyl group. A useful precursor to some medicines, but has no healing properties on its own.
reagent-name-sodium-carbonate = Sodium Carbonate
reagent-desc-sodium-carbonate = A white, odorless, water-soluble salt that yields an alkaline solution in water. Also known as soda ash.

View File

@@ -96,3 +96,6 @@ reagent-desc-ethyloxyephedrine = An unstable medicine derived from desoxyephedri
reagent-name-diphenylmethylamine = diphenylmethylamine
reagent-desc-diphenylmethylamine = A more stable medicine than ethyloxyephedrine. Useful for keeping someone awake.
reagent-name-sigynate = sigynate
reagent-desc-sigynate = A thick pink syrup useful for neutralizing acids and soothing trauma caused by acids. Tastes sweet!

View File

@@ -34,7 +34,7 @@
sprite: Clothing/OuterClothing/Armor/riot.rsi
state: icon
product: CrateSecurityRiot
cost: 2800
cost: 2900
category: Security
group: market

View File

@@ -11,6 +11,7 @@
- Heat
- Shock
- Cold
- Caustic
# Airloss (sometimes called oxyloss)
# Caused by asphyxiation or bloodloss.
@@ -34,9 +35,3 @@
id: Genetic
damageTypes:
- Cellular
- type: damageGroup
id: Caustic
damageTypes:
- Heat
- Poison

View File

@@ -24,6 +24,11 @@
armorCoefficientPrice: 5
armorFlatPrice: 30
- type: damageType
id: Caustic
armorCoefficientPrice: 5
armorFlatPrice: 30
- type: damageType
id: Cold
armorCoefficientPrice: 2.5

View File

@@ -39,7 +39,7 @@
- !type:DiseaseHealthChange
probability: 0.015
damage:
groups:
types:
Caustic: 1
cures:
- !type:DiseaseBedrestCure
@@ -88,7 +88,7 @@
- !type:DiseaseHealthChange
probability: 0.05
damage:
groups:
types:
Caustic: 1
cures:
- !type:DiseaseBedrestCure

View File

@@ -73,6 +73,7 @@
Piercing: 0.2
Heat: 0.5
Radiation: 0
Caustic: 0.75
- type: GroupExamine
- type: entity
@@ -136,6 +137,7 @@
Slash: 0.4
Piercing: 0.9
Heat: 0.9
Caustic: 0.9
- type: ExplosionResistance
damageCoefficient: 0.9
- type: GroupExamine
@@ -157,6 +159,7 @@
Slash: 0.7
Piercing: 0.4
Heat: 0.9
Caustic: 0.9
- type: ExplosionResistance
damageCoefficient: 0.8
- type: GroupExamine
@@ -178,6 +181,7 @@
Slash: 0.5
Piercing: 0.6
Heat: 0.5
Caustic: 0.9
- type: ExplosionResistance
damageCoefficient: 0.65
- type: GroupExamine

View File

@@ -11,6 +11,10 @@
sprite: Clothing/OuterClothing/Bio/general.rsi
- type: DiseaseProtection
protection: 0.2
- type: Armor
modifiers:
coefficients:
Caustic: 0.5
- type: entity
parent: ClothingOuterBaseLarge
@@ -25,6 +29,10 @@
sprite: Clothing/OuterClothing/Bio/cmo.rsi
- type: DiseaseProtection
protection: 0.3
- type: Armor
modifiers:
coefficients:
Caustic: 0.5
- type: entity
parent: ClothingOuterBioGeneral
@@ -37,6 +45,10 @@
sprite: Clothing/OuterClothing/Bio/janitor.rsi
- type: Clothing
sprite: Clothing/OuterClothing/Bio/janitor.rsi
- type: Armor
modifiers:
coefficients:
Caustic: 0.5
- type: entity
parent: ClothingOuterBioGeneral
@@ -49,6 +61,10 @@
sprite: Clothing/OuterClothing/Bio/scientist.rsi
- type: Clothing
sprite: Clothing/OuterClothing/Bio/scientist.rsi
- type: Armor
modifiers:
coefficients:
Caustic: 0.5
- type: entity
parent: ClothingOuterBioGeneral
@@ -61,6 +77,10 @@
sprite: Clothing/OuterClothing/Bio/security.rsi
- type: Clothing
sprite: Clothing/OuterClothing/Bio/security.rsi
- type: Armor
modifiers:
coefficients:
Caustic: 0.5
- type: entity
parent: ClothingOuterBioCmo
@@ -73,3 +93,7 @@
sprite: Clothing/OuterClothing/Bio/virology.rsi
- type: Clothing
sprite: Clothing/OuterClothing/Bio/virology.rsi
- type: Armor
modifiers:
coefficients:
Caustic: 0.5

View File

@@ -91,6 +91,10 @@
sprite: Clothing/OuterClothing/Coats/labcoat.rsi
- type: Clothing
sprite: Clothing/OuterClothing/Coats/labcoat.rsi
- type: Armor
modifiers:
coefficients:
Caustic: 0.9
- type: entity
parent: ClothingOuterStorageBase
@@ -102,6 +106,10 @@
sprite: Clothing/OuterClothing/Coats/labcoat_chem.rsi
- type: Clothing
sprite: Clothing/OuterClothing/Coats/labcoat_chem.rsi
- type: Armor
modifiers:
coefficients:
Caustic: 0.75
- type: entity
parent: ClothingOuterStorageBase
@@ -113,6 +121,11 @@
sprite: Clothing/OuterClothing/Coats/labcoat_viro.rsi
- type: Clothing
sprite: Clothing/OuterClothing/Coats/labcoat_viro.rsi
- type: Armor
modifiers:
coefficients:
Caustic: 0.9
- type: entity
parent: ClothingOuterStorageBase
@@ -124,6 +137,10 @@
sprite: Clothing/OuterClothing/Coats/labcoat_cmo.rsi
- type: Clothing
sprite: Clothing/OuterClothing/Coats/labcoat_cmo.rsi
- type: Armor
modifiers:
coefficients:
Caustic: 0.75
- type: entity
parent: ClothingOuterStorageBase

View File

@@ -22,6 +22,7 @@
Piercing: 0.9
Heat: 0.2
Radiation: 0.25
Caustic: 0.85
- type: TemperatureProtection
coefficient: 0.001
- type: ExplosionResistance
@@ -53,6 +54,7 @@
Piercing: 0.75
Heat: 0.3
Radiation: 0.1
Caustic: 0.6
- type: ExplosionResistance
damageCoefficient: 0.5
- type: ToggleableClothing
@@ -82,6 +84,7 @@
Piercing: 0.2
Heat: 0.2
Radiation: 0.2
Caustic: 0.2
- type: ExplosionResistance
damageCoefficient: 0.2
- type: ToggleableClothing
@@ -111,6 +114,7 @@
Piercing: 0.85
Heat: 0.7
Radiation: 0.35
Caustic: 0.85
- type: ExplosionResistance
damageCoefficient: 0.2
- type: ToggleableClothing
@@ -140,6 +144,7 @@
Piercing: 0.8
Heat: 0.4
Radiation: 0.0
Caustic: 0.85
- type: ExplosionResistance
damageCoefficient: 0.2
- type: ToggleableClothing
@@ -223,6 +228,7 @@
coefficients:
Heat: 0.90
Radiation: 0.25
Caustic: 0.1
- type: ToggleableClothing
clothingPrototype: ClothingHeadHelmetHardsuitMedical
@@ -247,6 +253,7 @@
Piercing: 0.95
Heat: 0.3
Radiation: 0.1
Caustic: 0.25
- type: ClothingSpeedModifier
walkModifier: 0.75
sprintModifier: 0.75
@@ -283,6 +290,7 @@
Piercing: 0.7
Heat: 0.85
Radiation: 0.5
Caustic: 0.75
- type: ExplosionResistance
damageCoefficient: 0.3
- type: ToggleableClothing
@@ -309,6 +317,7 @@
Piercing: 0.6
Heat: 0.8
Radiation: 0.25
Caustic: 0.75
- type: ExplosionResistance
damageCoefficient: 0.4
- type: ToggleableClothing
@@ -338,6 +347,7 @@
Piercing: 0.6
Heat: 0.8
Radiation: 0.25
Caustic: 0.6
- type: ExplosionResistance
damageCoefficient: 0.6
- type: ToggleableClothing
@@ -393,6 +403,7 @@
Piercing: 0.5
Heat: 0.4
Radiation: 0.20
Caustic: 0.75
- type: ExplosionResistance
damageCoefficient: 0.5
- type: ToggleableClothing
@@ -422,6 +433,7 @@
Piercing: 0.4
Heat: 0.25
Radiation: 0.20
Caustic: 0.75
- type: ExplosionResistance
damageCoefficient: 0.5
- type: ToggleableClothing
@@ -480,6 +492,7 @@
Piercing: 0.95
Heat: 0.9
Radiation: 0.5
Caustic: 0.9
- type: ToggleableClothing
clothingPrototype: ClothingHeadHelmetHardsuitSpatio
@@ -509,6 +522,7 @@
Slash: 0.95
Heat: 0.90
Radiation: 0.75
Caustic: 0.5
- type: GroupExamine
- type: entity
@@ -535,6 +549,7 @@
Piercing: 0.1
Heat: 0.1
Radiation: 0.1
Caustic: 0.35
- type: ExplosionResistance
damageCoefficient: 0.8
- type: ToggleableClothing
@@ -564,6 +579,7 @@
Piercing: 0.3
Heat: 0.3
Radiation: 0.20
Caustic: 0.4
- type: ExplosionResistance
damageCoefficient: 0.5
- type: ToggleableClothing
@@ -595,6 +611,7 @@
Piercing: 0.4
Heat: 0.2
Radiation: 0.20
Caustic: 0.5
- type: ExplosionResistance
damageCoefficient: 0.3
- type: ToggleableClothing
@@ -628,6 +645,7 @@
Cold: 0.1
Shock: 0.1
Radiation: 0.1
Caustic: 0.1
- type: ExplosionResistance
damageCoefficient: 0.7
- type: ToggleableClothing

View File

@@ -98,6 +98,10 @@
sprite: Clothing/OuterClothing/WinterCoats/coatchem.rsi
- type: Clothing
sprite: Clothing/OuterClothing/WinterCoats/coatchem.rsi
- type: Armor
modifiers:
coefficients:
Caustic: 0.75
- type: entity
parent: ClothingOuterWinterCoat
@@ -108,6 +112,10 @@
sprite: Clothing/OuterClothing/WinterCoats/coatcmo.rsi
- type: Clothing
sprite: Clothing/OuterClothing/WinterCoats/coatcmo.rsi
- type: Armor
modifiers:
coefficients:
Caustic: 0.75
- type: entity
parent: ClothingOuterWinterCoat
@@ -138,6 +146,10 @@
sprite: Clothing/OuterClothing/WinterCoats/coatgen.rsi
- type: Clothing
sprite: Clothing/OuterClothing/WinterCoats/coatgen.rsi
- type: Armor
modifiers:
coefficients:
Caustic: 0.9
- type: entity
parent: ClothingOuterWinterCoat
@@ -178,6 +190,10 @@
sprite: Clothing/OuterClothing/WinterCoats/coatjani.rsi
- type: Clothing
sprite: Clothing/OuterClothing/WinterCoats/coatjani.rsi
- type: Armor
modifiers:
coefficients:
Caustic: 0.9
- type: entity
parent: ClothingOuterWinterCoat
@@ -188,6 +204,10 @@
sprite: Clothing/OuterClothing/WinterCoats/coatmed.rsi
- type: Clothing
sprite: Clothing/OuterClothing/WinterCoats/coatmed.rsi
- type: Armor
modifiers:
coefficients:
Caustic: 0.9
- type: entity
parent: ClothingOuterWinterCoat
@@ -218,6 +238,10 @@
sprite: Clothing/OuterClothing/WinterCoats/coatparamed.rsi
- type: Clothing
sprite: Clothing/OuterClothing/WinterCoats/coatparamed.rsi
- type: Armor
modifiers:
coefficients:
Caustic: 0.9
- type: entity
parent: ClothingOuterWinterCoat
@@ -238,6 +262,10 @@
sprite: Clothing/OuterClothing/WinterCoats/coatrd.rsi
- type: Clothing
sprite: Clothing/OuterClothing/WinterCoats/coatrd.rsi
- type: Armor
modifiers:
coefficients:
Caustic: 0.9
- type: entity
parent: ClothingOuterWinterCoat
@@ -258,6 +286,10 @@
sprite: Clothing/OuterClothing/WinterCoats/coatsci.rsi
- type: Clothing
sprite: Clothing/OuterClothing/WinterCoats/coatsci.rsi
- type: Armor
modifiers:
coefficients:
Caustic: 0.9
- type: entity
parent: ClothingOuterWinterCoat
@@ -278,6 +310,10 @@
sprite: Clothing/OuterClothing/WinterCoats/coatviro.rsi
- type: Clothing
sprite: Clothing/OuterClothing/WinterCoats/coatviro.rsi
- type: Armor
modifiers:
coefficients:
Caustic: 0.9
- type: entity
parent: ClothingOuterWinterCoat

View File

@@ -52,14 +52,14 @@
components:
- type: Bible
damage:
groups:
types:
Caustic: 20 ## ~15 dps
damageOnFail:
groups:
Brute: 15
Airloss: 25
damageOnUntrainedUse:
groups:
types:
Caustic: 50
failChance: 0
locPrefix: "necro"

View File

@@ -14,7 +14,7 @@
- type: entity
name: ointment
description: Used to treat those nasty burns.
description: Used to treat those nasty burns. Less effective on caustic burns.
parent: BaseHealingItem
id: Ointment
components:
@@ -28,8 +28,11 @@
- type: Healing
damageContainer: Biological
damage:
groups:
Burn: -15 # 5 for each type in the group
types:
Heat: -5
Cold: -5
Shock: -5
Caustic: -1.5
healingBeginSound:
path: "/Audio/Items/Medical/ointment_begin.ogg"
healingEndSound:

View File

@@ -499,7 +499,7 @@
components:
- type: Projectile
damage:
groups:
types:
Caustic: 5
- type: Sprite
sprite: Objects/Weapons/Guns/Projectiles/xeno_toxic.rsi

View File

@@ -123,7 +123,7 @@
- !type:ReagentThreshold
min: 5
damage:
groups:
types:
Caustic: 1
- !type:ChemVomit
probability: 0.04

View File

@@ -160,7 +160,7 @@
- !type:ReagentThreshold
min: 5
damage:
groups:
types:
Caustic: 1
- !type:PopupMessage
type: Local

View File

@@ -179,7 +179,7 @@
effects:
- !type:HealthChange
damage:
groups:
types:
Caustic: 1
- type: reagent
@@ -209,5 +209,5 @@
effects:
- !type:HealthChange
damage:
groups:
types:
Caustic: 1

View File

@@ -42,3 +42,10 @@
desc: reagent-desc-ash
physicalDesc: reagent-physical-desc-powdery
color: white
- type: reagent
id: SodiumCarbonate
name: reagent-name-sodium-carbonate
desc: reagent-desc-sodium-carbonate
physicalDesc: reagent-physical-desc-powdery
color: white

View File

@@ -140,7 +140,7 @@
groups:
Airloss: -6
Brute: -4
Burn: -4
Burn: -6
Toxin: -4
- type: reagent
@@ -156,8 +156,10 @@
effects:
- !type:HealthChange
damage:
groups:
Burn: -3
types:
Heat: -1
Shock: -1
Cold: -1
- !type:HealthChange
conditions:
- !type:ReagentThreshold
@@ -353,8 +355,10 @@
effects:
- !type:HealthChange
damage:
groups:
Burn: -1
types:
Heat: -0.33
Shock: -0.33
Cold: -0.33
- type: reagent
id: Leporazine
@@ -493,7 +497,7 @@
effects:
- !type:HealthChange
damage:
groups:
types:
Caustic: -5
- type: reagent
@@ -600,10 +604,12 @@
max: 50
damage:
groups:
Burn: -1
Brute: -1
types:
Poison: -0.5 ##Should be about what it was when it healed the toxin group
Heat: -0.33
Shock: -0.33
Cold: -0.33
- type: reagent
id: Lipozine
@@ -757,3 +763,43 @@
messages: ["ethyloxyephedrine-effect-feeling-awake", "ethyloxyephedrine-effect-clear-mind"]
type: Local
probability: 0.1
- type: reagent
id: Sigynate
name: reagent-name-sigynate
group: Medicine
desc: reagent-desc-sigynate
physicalDesc: reagent-physical-desc-thick
flavor: sweet
color: "#e0a5b9"
metabolisms:
Medicine:
effects:
- !type:HealthChange
damage:
types:
Caustic: -3
- !type:HealthChange
conditions:
- !type:ReagentThreshold
min: 16
damage:
types:
Heat: 2
- !type:Jitter
conditions:
- !type:ReagentThreshold
min: 20
- !type:PopupMessage
conditions:
- !type:ReagentThreshold
min: 20
type: Local
visualType: Medium
messages: [ "generic-reagent-effect-nauseous" ]
probability: 0.2
- !type:ChemVomit
conditions:
- !type:ReagentThreshold
min: 30
probability: 0.02

View File

@@ -132,7 +132,7 @@
scaleByQuantity: true
ignoreResistances: false
damage:
groups:
types:
Caustic: 0.5
- !type:Emote
emote: Scream
@@ -142,7 +142,7 @@
effects:
- !type:HealthChange
damage:
groups:
types:
Caustic: 2
- !type:PopupMessage
type: Local
@@ -168,7 +168,7 @@
scaleByQuantity: true
ignoreResistances: false
damage:
groups:
types:
Caustic: 0.3
- !type:Emote
emote: Scream
@@ -178,7 +178,7 @@
effects:
- !type:HealthChange
damage:
groups:
types:
Caustic: 2
- !type:PopupMessage
type: Local
@@ -211,7 +211,7 @@
scaleByQuantity: true
ignoreResistances: false
damage:
groups:
types:
Caustic: 0.1
- !type:Emote
emote: Scream
@@ -222,7 +222,7 @@
- !type:HealthChange
damage:
types:
Poison: 2
Caustic: 2
- !type:PopupMessage
type: Local
visualType: Large

View File

@@ -388,3 +388,18 @@
amount: 1
products:
Diphenylmethylamine: 2
- type: reaction
id: SodiumCarbonate
impact: Medium
reactants:
Ammonia:
amount: 1
TableSalt:
amount: 1
Carbon:
amount: 1
Oxygen:
amount: 1
products:
SodiumCarbonate: 4

View File

@@ -356,3 +356,19 @@
amount: 1
products:
Cognizine: 1
- type: reaction
id: Sigynate
impact: Medium
minTemp: 370
reactants:
SodiumCarbonate:
amount: 1
Kelotane:
amount: 1
Water:
amount: 1
Sugar:
amount: 1
products:
Sigynate: 4