From: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com> Date: Mon, 16 Dec 2024 15:33:32 +0000 (+0100) Subject: Add Holy damage (#32755) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=95328dab6897d4c10c589ca2355536dafd2e9003;p=space-station-14.git Add Holy damage (#32755) * Initial commit * hoili moili * now to add sherlock and doctor who * funny stick * Oops it was meant to be called metaphysical * Attribution * Even BETTER attribution --- diff --git a/Resources/Locale/en-US/armor/armor-examine.ftl b/Resources/Locale/en-US/armor/armor-examine.ftl index d49a1373f2..3080c3859d 100644 --- a/Resources/Locale/en-US/armor/armor-examine.ftl +++ b/Resources/Locale/en-US/armor/armor-examine.ftl @@ -17,3 +17,4 @@ armor-damage-type-cold = Cold armor-damage-type-poison = Poison armor-damage-type-shock = Shock armor-damage-type-structural = Structural +armor-damage-type-holy = Holy diff --git a/Resources/Locale/en-US/damage/damage-groups.ftl b/Resources/Locale/en-US/damage/damage-groups.ftl index 057a999f1c..72dc43e64f 100644 --- a/Resources/Locale/en-US/damage/damage-groups.ftl +++ b/Resources/Locale/en-US/damage/damage-groups.ftl @@ -3,3 +3,4 @@ damage-group-burn = Burn damage-group-airloss = Airloss damage-group-toxin = Toxin damage-group-genetic = Genetic +damage-group-metaphysical = Metaphysical diff --git a/Resources/Locale/en-US/damage/damage-types.ftl b/Resources/Locale/en-US/damage/damage-types.ftl index 5c3cca156f..3b6256864f 100644 --- a/Resources/Locale/en-US/damage/damage-types.ftl +++ b/Resources/Locale/en-US/damage/damage-types.ftl @@ -11,3 +11,4 @@ damage-type-radiation = Radiation damage-type-shock = Shock damage-type-slash = Slash damage-type-structural = Structural +damage-type-holy = Holy diff --git a/Resources/Prototypes/Damage/containers.yml b/Resources/Prototypes/Damage/containers.yml index fb40e9b658..9b90248e3d 100644 --- a/Resources/Prototypes/Damage/containers.yml +++ b/Resources/Prototypes/Damage/containers.yml @@ -52,3 +52,23 @@ id: ShadowHaze supportedTypes: - Heat + +- type: damageContainer + id: ManifestedSpirit + supportedGroups: + - Metaphysical + - Brute + supportedTypes: + - Heat + - Shock + - Caustic + +- type: damageContainer + id: BiologicalMetaphysical + supportedGroups: + - Brute + - Burn + - Toxin + - Airloss + - Genetic + - Metaphysical diff --git a/Resources/Prototypes/Damage/groups.yml b/Resources/Prototypes/Damage/groups.yml index 71e4acdaea..3beeed7e6b 100644 --- a/Resources/Prototypes/Damage/groups.yml +++ b/Resources/Prototypes/Damage/groups.yml @@ -40,3 +40,11 @@ name: damage-group-genetic damageTypes: - Cellular + +# Metaphysical damage types should be used very sparingly, and likely not affect normal crew entities. +# Revenants and other ghost-like/demonic creatures are more fitting. Healing should never be available via medicine. +- type: damageGroup + id: Metaphysical + name: damage-group-metaphysical + damageTypes: + - Holy diff --git a/Resources/Prototypes/Damage/modifier_sets.yml b/Resources/Prototypes/Damage/modifier_sets.yml index d098c20fd6..f04858255f 100644 --- a/Resources/Prototypes/Damage/modifier_sets.yml +++ b/Resources/Prototypes/Damage/modifier_sets.yml @@ -171,7 +171,7 @@ Piercing: 0.8 Cold: 0.8 Heat: 0.2 -# Holy: 3 If we ever get some holy or magic sort of damage type they should be vulnerable + Holy: 1.5 flatReductions: Heat: 3 @@ -273,6 +273,7 @@ Radiation: 0.0 Shock: 0.8 Bloodloss: 0.4 + Holy: 1 - type: damageModifierSet id: Cockroach @@ -306,3 +307,8 @@ id: PotassiumIodide coefficients: Radiation: 0.1 + +- type: damageModifierSet + id: ManifestedSpirit + coefficients: + Holy: 2 diff --git a/Resources/Prototypes/Damage/types.yml b/Resources/Prototypes/Damage/types.yml index 0107da2482..490add3b58 100644 --- a/Resources/Prototypes/Damage/types.yml +++ b/Resources/Prototypes/Damage/types.yml @@ -21,19 +21,19 @@ name: damage-type-blunt armorCoefficientPrice: 2 armorFlatPrice: 10 - + - type: damageType id: Cellular name: damage-type-cellular armorCoefficientPrice: 5 armorFlatPrice: 30 - + - type: damageType id: Caustic name: damage-type-caustic armorCoefficientPrice: 5 armorFlatPrice: 30 - + - type: damageType id: Cold name: damage-type-cold @@ -84,3 +84,11 @@ name: damage-type-structural armorCoefficientPrice: 1 armorFlatPrice: 1 + +# Metaphysical damage. Damage represents supernatural injuries that emphasize the fantasy elements in the game +- type: damageType + id: Holy + name: damage-type-holy + armorCoefficientPrice: 1 + armorFlatPrice: 1 + diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index 99cc5367d3..f8fb3e34ce 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -2796,7 +2796,7 @@ - type: Bloodstream bloodReagent: DemonsBlood - type: Damageable - damageContainer: Biological + damageContainer: BiologicalMetaphysical damageModifierSet: Infernal - type: Temperature heatDamageThreshold: 4000 #They come from hell, so.. diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/hellspawn.yml b/Resources/Prototypes/Entities/Mobs/NPCs/hellspawn.yml index 45fb6a12bd..c0f7a58f48 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/hellspawn.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/hellspawn.yml @@ -28,7 +28,7 @@ - type: Body prototype: Animal - type: Damageable - damageContainer: Biological + damageContainer: BiologicalMetaphysical damageModifierSet: HellSpawn - type: MovementSpeedModifier baseWalkSpeed: 2 diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml b/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml index 888011a5b5..a313a83fdb 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml @@ -21,7 +21,8 @@ - Stun - Corporeal - type: Damageable - damageContainer: Biological + damageContainer: ManifestedSpirit + damageModifierSet: ManifestedSpirit - type: NoSlip - type: Eye drawFov: false @@ -76,3 +77,6 @@ - RevenantTheme - type: Speech speechVerb: Ghost + - type: Reactive + groups: + Acidic: [Touch] diff --git a/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml b/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml index f5e91e4fd8..6539b4f8aa 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml @@ -18,6 +18,13 @@ damageOnUntrainedUse: ## What a non-chaplain takes when attempting to heal someone groups: Burn: 10 + - type: MeleeWeapon + soundHit: + collection: Punch + damage: + types: + Holy: 25 + Blunt: 1 - type: Prayable bibleUserOnly: true - type: Summonable diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/gohei.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/gohei.yml index 2380e19d79..ff39bc7a57 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/gohei.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/gohei.yml @@ -11,7 +11,7 @@ wideAnimationRotation: -150 damage: types: - Blunt: 0 + Holy: 4 - type: Item size: Small sprite: Objects/Weapons/Melee/gohei.rsi diff --git a/Resources/Prototypes/Reagents/medicine.yml b/Resources/Prototypes/Reagents/medicine.yml index 105ae11048..6937b20dd1 100644 --- a/Resources/Prototypes/Reagents/medicine.yml +++ b/Resources/Prototypes/Reagents/medicine.yml @@ -1075,6 +1075,15 @@ methods: [ Touch ] effects: - !type:ExtinguishReaction + Acidic: + methods: [ Touch ] + effects: + - !type:HealthChange + scaleByQuantity: true + ignoreResistances: false + damage: + types: + Holy: 0.5 plantMetabolism: - !type:PlantAdjustWater amount: 1 diff --git a/Resources/Textures/Objects/Devices/health_analyzer.rsi/meta.json b/Resources/Textures/Objects/Devices/health_analyzer.rsi/meta.json index bbf78c0b88..c9ae04fd79 100644 --- a/Resources/Textures/Objects/Devices/health_analyzer.rsi/meta.json +++ b/Resources/Textures/Objects/Devices/health_analyzer.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "airloss, brute, toxin and burn edited from /tg/station https://github.com/tgstation/tgstation/tree/master genetic edited from https://iconscout.com/free-icon/dna-2130814 with license CC BY 4.0. malnutrition from https://github.com/space-wizards/space-station-14/tree/73d7837fabb31a7691a1db47ff64903cbec5dd32/Resources/Textures/Interface/Alerts/hunger.rsi", + "copyright": "airloss, brute, toxin and burn edited from /tg/station https://github.com/tgstation/tgstation/tree/master genetic edited from https://iconscout.com/free-icon/dna-2130814 with license CC BY 4.0. malnutrition from https://github.com/space-wizards/space-station-14/tree/73d7837fabb31a7691a1db47ff64903cbec5dd32/Resources/Textures/Interface/Alerts/hunger.rsi, metaphysical created by SlamBamActionman at https://github.com/space-wizards/space-station-14/pull/32755", "states": [ { "name": "airloss" @@ -27,6 +27,9 @@ }, { "name": "malnutrition" + }, + { + "name": "metaphysical" } ] } diff --git a/Resources/Textures/Objects/Devices/health_analyzer.rsi/metaphysical.png b/Resources/Textures/Objects/Devices/health_analyzer.rsi/metaphysical.png new file mode 100644 index 0000000000..e666838913 Binary files /dev/null and b/Resources/Textures/Objects/Devices/health_analyzer.rsi/metaphysical.png differ