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 d49a1373f28f496368b93e3ad3bb3c691e06c6be..3080c3859df8ed9bd780aeb9956f26c773129766 100644 (file)
--- 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 057a999f1ccebfaffea1930e154d7ed6fbc99d51..72dc43e64fdf1ad9140f848dc5265a532ea77244 100644 (file)
--- 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 5c3cca156fd8f88c029af102af6fd84bdc5ea7b5..3b6256864f24e15aad9e4af8bd937e6891a08841 100644 (file)
--- 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 fb40e9b658fc3a41079d3bfe6411356390301cfb..9b90248e3d9230168095714171d36391518c721b 100644 (file)
--- 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 71e4acdaeaac5419ee608f7f1d655c366a5f5a06..3beeed7e6b2d76f4fdc9c14612710afb8960958d 100644 (file)
--- 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 d098c20fd60c534e6f80e2114721f1a5bb487745..f04858255f2eb96f4f09ec2f1d8fa90c11659035 100644 (file)
--- 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 0107da24823b8d108c9aaf95b7fcca7270f1dcd3..490add3b58dff14aca3ffe9db268256e79f018e1 100644 (file)
--- 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 99cc5367d33359f75eec7c59c259ac925de57bcb..f8fb3e34ce5400b6c6aee76f523f7042be7db86c 100644 (file)
--- 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 45fb6a12bdd4b97ed17edc75228fb85f1430c152..c0f7a58f48f18e196b7fd10b33c0e89c902d59ae 100644 (file)
--- 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 888011a5b5f83856a7d438f8ef16a8e0fcbe3068..a313a83fdb01f11c55fe45e2c7d598a77ffa756b 100644 (file)
--- 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 f5e91e4fd86820c4056d7d849c578fcae92d08ab..6539b4f8aa9efa44807dad60bdb1ad0212142eb5 100644 (file)
--- 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 2380e19d79f8717a7b1119282c8680d667427a8f..ff39bc7a576af3905fe8f88658c8e18041d2d14c 100644 (file)
--- 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 105ae11048710f73e17af100458f2d12f01d90e9..6937b20dd167de64c754358db43e49b75fc3189d 100644 (file)
--- 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 bbf78c0b886b0aa889e22b81398d333cd622dd5f..c9ae04fd7926bbb8d3ebe4b5bc3ba6d7b3e3638a 100644 (file)
--- 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 (file)
index 0000000..e666838
Binary files /dev/null and b/Resources/Textures/Objects/Devices/health_analyzer.rsi/metaphysical.png differ