From d89578b94d6fb573214b1420703f12c650d035ec Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Sun, 8 Oct 2023 14:46:17 +0200 Subject: [PATCH 1/2] holy --- .../Prototypes/Entities/Mobs/NPCs/animals.yml | 2 +- .../Entities/Mobs/NPCs/revenant.yml | 8 ++++++-- .../Entities/Mobs/Player/familiars.yml | 3 +++ .../Objects/Specific/Chapel/bibles.yml | 5 +++++ .../Nyanotrasen/Damage/containers.yml | 12 ++++++++++++ .../Prototypes/Nyanotrasen/Damage/groups.yml | 4 ++++ .../Nyanotrasen/Damage/modifier_sets.yml | 19 +++++++++++++++++++ .../Prototypes/Nyanotrasen/Damage/types.yml | 5 +++++ 8 files changed, 55 insertions(+), 3 deletions(-) create mode 100644 Resources/Prototypes/Nyanotrasen/Damage/containers.yml create mode 100644 Resources/Prototypes/Nyanotrasen/Damage/groups.yml create mode 100644 Resources/Prototypes/Nyanotrasen/Damage/types.yml diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index a76b68aced3..b1a7da51c46 100644 --- 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 index 866e15735fe..de7361c14d3 100644 --- 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 index 65a47987e90..dfc3d03f261 100644 --- 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 index 19414d09973..662234ff129 100644 --- 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 new file mode 100644 index 00000000000..988a3436d1d --- /dev/null +++ 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 new file mode 100644 index 00000000000..d2f9906f451 --- /dev/null +++ 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 index 5c26f19f799..ddca42d4253 100644 --- 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 new file mode 100644 index 00000000000..f9aba7e2ac8 --- /dev/null +++ b/Resources/Prototypes/Nyanotrasen/Damage/types.yml @@ -0,0 +1,5 @@ +# Only affects magical beings. +- type: damageType + id: Holy + armorCoefficientPrice: 25 + armorFlatPrice: 150 From a0b408134df44849b32df7da628f95d69bd062b2 Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Sun, 8 Oct 2023 14:51:20 +0200 Subject: [PATCH 2/2] Locale --- .../medical/components/health-analyzer-component.ftl | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 Resources/Locale/en-US/nyanotrasen/medical/components/health-analyzer-component.ftl diff --git a/Resources/Locale/en-US/nyanotrasen/medical/components/health-analyzer-component.ftl b/Resources/Locale/en-US/nyanotrasen/medical/components/health-analyzer-component.ftl new file mode 100644 index 00000000000..22f2442355a --- /dev/null +++ b/Resources/Locale/en-US/nyanotrasen/medical/components/health-analyzer-component.ftl @@ -0,0 +1,2 @@ +health-analyzer-window-damage-group-Immaterial = Immaterial +health-analyzer-window-damage-type-Holy = Holy