diff --git a/MonsterCards/Models/Monster+CoreDataClass.swift b/MonsterCards/Models/Monster+CoreDataClass.swift index b716073..068a195 100644 --- a/MonsterCards/Models/Monster+CoreDataClass.swift +++ b/MonsterCards/Models/Monster+CoreDataClass.swift @@ -631,8 +631,7 @@ public class Monster: NSManagedObject { get { // TODO: sort "bludgeoning, piercing, and slashing from nonmagical attacks" to the end and use ; as a separator before it. let sortedVulnerabilities = self.damageVulnerabilities?.sorted() ?? [] - - return StringHelper.oxfordJoin(sortedVulnerabilities, ", ", ", and ", " and ") + return StringHelper.oxfordJoin(sortedVulnerabilities) } } @@ -640,7 +639,7 @@ public class Monster: NSManagedObject { get { // TODO: sort "bludgeoning, piercing, and slashing from nonmagical attacks" to the end and use ; as a separator before it. let sortedResistances = self.damageResistances?.sorted() ?? [] - return StringHelper.oxfordJoin(sortedResistances, ", ", ", and ", " and ") + return StringHelper.oxfordJoin(sortedResistances) } } @@ -648,14 +647,14 @@ public class Monster: NSManagedObject { get { // TODO: sort "bludgeoning, piercing, and slashing from nonmagical attacks" to the end and use ; as a separator before it. let sortedImmunities = self.damageImmunities?.sorted() ?? [] - return StringHelper.oxfordJoin(sortedImmunities, ", ", ", and ", " and ") + return StringHelper.oxfordJoin(sortedImmunities) } } var conditionImmunitiesDescription: String { get { let sortedImmunities = self.conditionImmunities?.sorted() ?? [] - return StringHelper.oxfordJoin(sortedImmunities, ", ", ", and ", " and ") + return StringHelper.oxfordJoin(sortedImmunities) } }