Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Holy damage type #127

Merged
merged 4 commits into from
Oct 10, 2023
Merged

Holy damage type #127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d89578b
holy
FluffiestFloof Oct 8, 2023
a0b4081
Locale
FluffiestFloof Oct 8, 2023
a925374
Merge branch 'master' into holydamage
FluffiestFloof Oct 9, 2023
21c7a6c
Merge branch 'DeltaV-Station:master' into holydamage
FluffiestFloof Oct 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Resources/Locale/en-US/nyanotrasen/medical/components/health-analyzer-component.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
health-analyzer-window-damage-group-Immaterial = Immaterial
health-analyzer-window-damage-type-Holy = Holy
2 changes: 1 addition & 1 deletion Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1966,7 +1966,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..
Expand Down
8 changes: 6 additions & 2 deletions Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down
3 changes: 3 additions & 0 deletions Resources/Prototypes/Entities/Mobs/Player/familiars.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 12 additions & 0 deletions Resources/Prototypes/Nyanotrasen/Damage/containers.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
- type: damageContainer
id: Spirit
supportedGroups:
- Burn
- Immaterial

- type: damageContainer
id: CorporealSpirit
supportedGroups:
- Burn
- Brute
- Immaterial
4 changes: 4 additions & 0 deletions Resources/Prototypes/Nyanotrasen/Damage/groups.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
- type: damageGroup
id: Immaterial
damageTypes:
- Holy
19 changes: 19 additions & 0 deletions Resources/Prototypes/Nyanotrasen/Damage/modifier_sets.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 0 additions & 1 deletion Resources/Prototypes/Nyanotrasen/Damage/types.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,3 @@
id: Holy
armorCoefficientPrice: 25
armorFlatPrice: 150

Loading