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

Adds damage types and condition immunities to core data so they are saved now.

Browse Source
This commit is contained in:
Tom Hicks
2021-03-23 23:12:01 -07:00
parent 5f4902305c
commit 0f6454ea41
2 changed files with 13 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
MonsterCards/Models/Monster+CoreDataClass.swift
View File

@@ -627,55 +627,31 @@ public class Monster: NSManagedObject {
// MARK: OTHER
var damageVulnerabilitiesArray: [String] {
get {
return ["Fire", "Poison", "Psychic"]
}
}
var damageVulnerabilitiesDescription: String {
get {
let sortedVulnerabilities = self.damageVulnerabilitiesArray.sorted()
let sortedVulnerabilities = self.damageVulnerabilities?.sorted() ?? []
return StringHelper.oxfordJoin(sortedVulnerabilities, ", ", ", and ", " and ")
}
}
var damageResistancesArray: [String] {
get {
return ["Ice", "Electric"]
}
}
var damageResistancesDescription: String {
get {
let sortedResistances = self.damageResistancesArray.sorted()
let sortedResistances = self.damageResistances?.sorted() ?? []
return StringHelper.oxfordJoin(sortedResistances, ", ", ", and ", " and ")
}
}
var damageImmunitiesArray: [String] {
get {
return ["Slashing"]
}
}
var damageImmunitiesDescription: String {
get {
let sortedImmunities = self.damageImmunitiesArray.sorted()
let sortedImmunities = self.damageImmunities?.sorted() ?? []
return StringHelper.oxfordJoin(sortedImmunities, ", ", ", and ", " and ")
}
}
var conditionImmunitiesArray: [String] {
get {
return []
}
}
var conditionImmunitiesDescription: String {
get {
let sortedImmunities = self.conditionImmunitiesArray.sorted()
let sortedImmunities = self.conditionImmunities?.sorted() ?? []
return StringHelper.oxfordJoin(sortedImmunities, ", ", ", and ", " and ")
}
}

12
MonsterCards/Models/MonsterViewModel.swift
View File

@@ -148,19 +148,19 @@ class MonsterViewModel: ObservableObject {
self.charismaSavingThrowProficiency = monster.charismaSavingThrowProficiencyEnum
self.skills = (monster.skills?.allObjects.map {SkillViewModel(($0 as! Skill))})!.sorted()
self.damageImmunities = monster.damageImmunitiesArray
self.damageImmunities = (monster.damageImmunities ?? [])
.map {DamageTypeViewModel($0)}
.sorted()
self.damageResistances = monster.damageResistancesArray
self.damageResistances = (monster.damageResistances ?? [])
.map {DamageTypeViewModel($0)}
.sorted()
self.damageVulnerabilities = monster.damageVulnerabilitiesArray
self.damageVulnerabilities = (monster.damageVulnerabilities ?? [])
.map {DamageTypeViewModel($0)}
.sorted()
self.conditionImmunities = monster.conditionImmunitiesArray
self.conditionImmunities = (monster.conditionImmunities ?? [])
.map {DamageTypeViewModel($0)}
.sorted()
}
@@ -234,5 +234,9 @@ class MonsterViewModel: ObservableObject {
func copyToRaw() {
monster.conditionImmunities = conditionImmunities.map {$0.name}
monster.damageImmunities = damageImmunities.map {$0.name}
monster.damageResistances = damageResistances.map {$0.name}
monster.damageVulnerabilities = damageVulnerabilities.map {$0.name}
}
}