maj/MonsterCards
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adds damage immunities to the monster editor.

Browse Source
This commit is contained in:
Tom Hicks
2021-03-22 18:00:40 -07:00
parent c8f18a00dd
commit 09a16c85b7
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
iOS/MonsterCards/Models/MonsterViewModel.swift
View File

@@ -51,6 +51,7 @@ class MonsterViewModel: ObservableObject {
@Published var charismaSavingThrowProficiency: ProficiencyType @Published var charismaSavingThrowProficiency: ProficiencyType
@Published var charismaSavingThrowAdvantage: AdvantageType @Published var charismaSavingThrowAdvantage: AdvantageType
@Published var skills: [SkillViewModel] @Published var skills: [SkillViewModel]
@Published var damageImmunities: [DamageTypeViewModel]
@Published var conditionImmunities: [DamageTypeViewModel] @Published var conditionImmunities: [DamageTypeViewModel]
init(_ rawMonster: Monster?) { init(_ rawMonster: Monster?) {
@@ -93,6 +94,7 @@ class MonsterViewModel: ObservableObject {
self.charismaSavingThrowAdvantage = .none self.charismaSavingThrowAdvantage = .none
self.charismaSavingThrowProficiency = .none self.charismaSavingThrowProficiency = .none
self.skills = [] self.skills = []
self.damageImmunities = []
self.conditionImmunities = [] self.conditionImmunities = []
if (rawMonster != nil) { if (rawMonster != nil) {
@@ -141,6 +143,10 @@ class MonsterViewModel: ObservableObject {
self.charismaSavingThrowAdvantage = monster.charismaSavingThrowAdvantageEnum self.charismaSavingThrowAdvantage = monster.charismaSavingThrowAdvantageEnum
self.charismaSavingThrowProficiency = monster.charismaSavingThrowProficiencyEnum self.charismaSavingThrowProficiency = monster.charismaSavingThrowProficiencyEnum
self.skills = (monster.skills?.allObjects.map {SkillViewModel(($0 as! Skill))})!.sorted() self.skills = (monster.skills?.allObjects.map {SkillViewModel(($0 as! Skill))})!.sorted()
self.damageImmunities = monster.damageImmunitiesArray
.map {DamageTypeViewModel($0)}
.sorted()
self.conditionImmunities = monster.conditionImmunitiesArray self.conditionImmunities = monster.conditionImmunitiesArray
.map {DamageTypeViewModel($0)} .map {DamageTypeViewModel($0)}

4
iOS/MonsterCards/Views/EditMonster.swift
View File

@@ -44,6 +44,10 @@ struct EditMonster: View {
"Skills", "Skills",
destination: EditSkills(monsterViewModel: monsterViewModel)) destination: EditSkills(monsterViewModel: monsterViewModel))
NavigationLink(
"Damage Immunities",
destination: EditDamageTypes(viewModel: monsterViewModel, path: \.damageImmunities))
NavigationLink( NavigationLink(
"Condition Immunities", "Condition Immunities",
destination: EditDamageTypes(viewModel: monsterViewModel, path: \.conditionImmunities)) destination: EditDamageTypes(viewModel: monsterViewModel, path: \.conditionImmunities))