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

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

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

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

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

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

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
 
@@ -274,6 +274,7 @@
     Radiation: 0.0
     Shock: 0.8
     Bloodloss: 0.4
+    Holy: 1
 
 - type: damageModifierSet
   id: Cockroach
@@ -307,3 +308,8 @@
   id: PotassiumIodide
   coefficients:
     Radiation: 0.1
+
+- type: damageModifierSet
+  id: ManifestedSpirit
+  coefficients:
+    Holy: 2

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
+

Resources/Prototypes/Entities/Mobs/NPCs/animals.yml

@@ -2763,7 +2763,7 @@
   - type: Bloodstream
     bloodReagent: DemonsBlood
   - type: Damageable
-    damageContainer: CorporealSpirit # Nyanotrasen - Corporeal Spirit allows Holy water to do damage
+    damageContainer: CorporealSpirit # DeltaV
     damageModifierSet: Infernal
   - type: Temperature
     heatDamageThreshold: 4000 #They come from hell, so..

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

Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml

@@ -16,16 +16,13 @@
     sprite: DeltaV/Mobs/Ghosts/revenant.rsi # DeltaV - Custom revenant sprite
     layers:
     - state: active
-  - type: Reactive # Nyanotrasen - Holy Water affects Revenants
-    groups:
-      Acidic: [Touch]
   - type: StatusEffects
     allowed:
     - Stun
     - Corporeal
-  - type: Damageable # Nyanotrasen - Corporeal Spirit allows Holy water to do damage
-    damageContainer: CorporealSpirit
-    damageModifierSet: CorporealSpirit
+  - type: Damageable
+    damageContainer: ManifestedSpirit
+    damageModifierSet: Spirit # DeltaV: Keep revenant extreme weakness to heat and bible
   - type: NoSlip
   - type: Eye
     drawFov: false
@@ -81,3 +78,6 @@
     - RevenantTheme
   - type: Speech
     speechVerb: Ghost
+  - type: Reactive
+    groups:
+      Acidic: [Touch]

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

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

Resources/Prototypes/Nyanotrasen/Damage/containers.yml

@@ -1,12 +0,0 @@
-- type: damageContainer
-  id: Spirit
-  supportedGroups:
-    - Burn
-    - Immaterial
-
-- type: damageContainer
-  id: CorporealSpirit
-  supportedGroups:
-    - Burn
-    - Brute
-    - Immaterial

Resources/Prototypes/Nyanotrasen/Damage/groups.yml

@@ -1,5 +0,0 @@
-- type: damageGroup
-  name: damage-group-immaterial
-  id: Immaterial
-  damageTypes:
-  - Holy

Resources/Prototypes/Nyanotrasen/Damage/types.yml

@@ -1,6 +0,0 @@
-# Only affects magical beings.
-- type: damageType
-  name: damage-group-holy
-  id: Holy
-  armorCoefficientPrice: 25
-  armorFlatPrice: 150

Resources/Prototypes/Nyanotrasen/Reagents/Consumable/Drink/drinks.yml

@@ -67,42 +67,3 @@
       - !type:AdjustReagent
         reagent: Nutriment
         amount: 0.1
-
-- type: reagent
-  id: HolyWater
-  name: reagent-name-holywater
-  parent: BaseDrink
-  desc: reagent-name-holywater
-  physicalDesc: reagent-physical-desc-translucent
-  flavor: holy
-  color: "#75b1f0"
-  boilingPoint: 100.0
-  meltingPoint: 0.0
-  reactiveEffects:
-    Acidic:
-      methods: [ Touch ]
-      effects:
-      - !type:HealthChange
-        scaleByQuantity: true
-        ignoreResistances: false
-        damage:
-          types:
-            Holy: 0.5
-  metabolisms: #Could nullify debuffs of feeding.
-    Drink:
-      effects:
-      - !type:SatiateThirst
-        factor: 3
-    Medicine:
-      effects:
-      - !type:ModifyBloodLevel
-        amount: 0.1
-      - !type:HealthChange
-        damage:
-          groups:
-            Burn: -0.5
-          types:
-            Holy: 1
-  plantMetabolism: #Heals plants a little with the holy power within it.
-    - !type:PlantAdjustHealth
-      amount: 0.1

Resources/Prototypes/Reagents/medicine.yml

@@ -1053,6 +1053,52 @@
           types:
             Poison: 4
 
+- type: reagent
+  id: Holywater
+  name: reagent-name-holywater
+  group: Medicine
+  desc: reagent-desc-holywater
+  physicalDesc: reagent-physical-desc-holy
+  flavor: holy
+  color: "#91C3F7"
+  metabolisms:
+    Drink:
+      effects:
+      - !type:SatiateThirst
+        factor: 3
+    Medicine:
+      effects:
+      - !type:HealthChange
+        conditions:
+        - !type:TotalDamage
+          max: 50
+        damage:
+          types:
+            Blunt: -0.2
+            Poison: -0.2
+            Heat: -0.2
+            Shock: -0.2
+            Cold: -0.2
+  reactiveEffects:
+    Extinguish:
+      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
+  tileReactions:
+  - !type:ExtinguishTileReaction { }
+
 - type: reagent
   id: Pyrazine
   name: reagent-name-pyrazine

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"
     }
   ]
 }