holy

DeltaV-Station · Oct 8, 2023 · d89578b · d89578b
1 parent d8e4660
commit d89578b
Show file tree

Hide file tree

Showing 8 changed files with 55 additions and 3 deletions.
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -1965,7 +1965,7 @@
   - type: Bloodstream
     bloodReagent: DemonsBlood
   - type: Damageable
-    damageContainer: Biological
+    damageContainer: CorporealSpirit # Nyanotrasen - Corporeal Spirit allows Holy water to do damage
     damageModifierSet: Infernal
   - type: Temperature
     heatDamageThreshold: 4000 #They come from hell, so..

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml b/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
@@ -17,6 +17,9 @@
     sprite: Mobs/Ghosts/revenant.rsi
     layers:
     - state: active
+  - type: Reactive # Nyanotrasen - Holy Water affects Revenants
+    groups:
+      Acidic: [Touch]
   - type: Clickable
   - type: StatusEffects
     allowed:
@@ -35,8 +38,9 @@
         mask:
         - GhostImpassable
   - type: MovementIgnoreGravity
-  - type: Damageable
-    damageContainer: Biological
+  - type: Damageable # Nyanotrasen - Corporeal Spirit allows Holy water to do damage
+    damageContainer: CorporealSpirit
+    damageModifierSet: CorporealSpirit
   - type: Examiner
   - type: NoSlip
   - type: Actions

diff --git a/Resources/Prototypes/Entities/Mobs/Player/familiars.yml b/Resources/Prototypes/Entities/Mobs/Player/familiars.yml
@@ -23,6 +23,9 @@
   - type: Access
     tags:
     - Chapel
+  - type: Damageable # Nyanotrasen - Corporeal Spirit allows Holy water to do damage
+    damageContainer: CorporealSpirit
+    damageModifierSet: CorporealSpirit
   - type: MindContainer
     showExamineInfo: true
   - type: NpcFactionMember

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml b/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml
@@ -42,6 +42,11 @@
     interfaces:
     - key: enum.StorageUiKey.Key
       type: StorageBoundUserInterface
+  - type: MeleeWeapon # Nyanotrasen - Bibles do Holy damage
+    damage:
+      types:
+        Blunt: 3
+        Holy: 10
   - type: Tag
     tags:
     - Book

diff --git a/Resources/Prototypes/Nyanotrasen/Damage/containers.yml b/Resources/Prototypes/Nyanotrasen/Damage/containers.yml
@@ -0,0 +1,12 @@
+- type: damageContainer
+  id: Spirit
+  supportedGroups:
+    - Burn
+    - Immaterial
+
+- type: damageContainer
+  id: CorporealSpirit
+  supportedGroups:
+    - Burn
+    - Brute
+    - Immaterial
diff --git a/Resources/Prototypes/Nyanotrasen/Damage/groups.yml b/Resources/Prototypes/Nyanotrasen/Damage/groups.yml
@@ -0,0 +1,4 @@
+- type: damageGroup
+  id: Immaterial
+  damageTypes:
+  - Holy
diff --git a/Resources/Prototypes/Nyanotrasen/Damage/modifier_sets.yml b/Resources/Prototypes/Nyanotrasen/Damage/modifier_sets.yml
@@ -29,3 +29,22 @@
   id: CancerMouse
   coefficients:
     Radiation: -0.25
+
+- type: damageModifierSet
+  id: Spirit
+  coefficients:
+    Cold: 0.0
+    Shock: 0.2
+    Heat: 3.0
+    Holy: 5.0
+
+- type: damageModifierSet
+  id: CorporealSpirit
+  coefficients:
+    Cold: 0.0
+    Shock: 0.5
+    Blunt: 0.5
+    Slash: 0.5
+    Piercing: 0.5
+    Heat: 1.5
+    Holy: 3.0
diff --git a/Resources/Prototypes/Nyanotrasen/Damage/types.yml b/Resources/Prototypes/Nyanotrasen/Damage/types.yml
@@ -0,0 +1,5 @@
+# Only affects magical beings.
+- type: damageType
+  id: Holy
+  armorCoefficientPrice: 25
+  armorFlatPrice: 150