juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

4
Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
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

24
Resources/Prototypes/Entities/Clothing/OuterClothing/bio.yml
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

17
Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml
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

18
Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
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

36
Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml
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

4
Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml
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"

9
Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
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:

2
Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
View File

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