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

Adds EditSkills view bound to the monster view model's skills.

Browse Source
This commit is contained in:
Tom Hicks
2021-03-21 16:18:04 -07:00
parent e25e37c871
commit 861bae24d6
7 changed files with 178 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -181,16 +181,16 @@ class MonsterViewModel: ObservableObject {
monster.charismaSavingThrowAdvantageEnum = charismaSavingThrowAdvantage
monster.charismaSavingThrowProficiencyEnum = charismaSavingThrowProficiency
// // Remove missing skills from raw monster
// monster.skills?.forEach {s in
// let skill = s as! Skill
// let skillVM = skills.first { $0.isEqualTo(rawSkill: skill) }
// if (skillVM != nil) {
// skillVM!.copyToSkill(skill: skill)
// } else {
// monster.removeFromSkills(skill)
// }
// }
// Remove missing skills from raw monster
monster.skills?.forEach {s in
let skill = s as! Skill
let skillVM = skills.first { $0.isEqualTo(rawSkill: skill) }
if (skillVM != nil) {
skillVM!.copyToSkill(skill: skill)
} else {
monster.removeFromSkills(skill)
}
}
// // Add new skills to raw monster
// skills.forEach {skillVM in
// if (!(monster.skills?.contains(

9
iOS/MonsterCards/Models/Skill+CoreDataClass.swift
View File

@@ -40,6 +40,15 @@ public class Skill: NSManagedObject {
}
}
var wrappedAdvantage: AdvantageType {
get {
return AdvantageType.init(rawValue: advantage ?? "") ?? .none
}
set {
advantage = newValue.rawValue
}
}
var modifier: Int64 {
get {
let proficiencyBonus = Double(monster?.proficiencyBonus ?? 0)

103
iOS/MonsterCards/Models/SkillViewModel.swift
View File

@@ -6,15 +6,59 @@
//
import Foundation
import CoreData
class SkillViewModel: ObservableObject {
class SkillViewModel: ObservableObject, Hashable, Identifiable {
static func == (lhs: SkillViewModel, rhs: SkillViewModel) -> Bool {
return lhs.abilityScore == rhs.abilityScore
&& lhs.advantage == rhs.advantage
&& lhs.name == rhs.name
&& lhs.proficiency == rhs.proficiency
}
func hash(into hasher: inout Hasher) {
hasher.combine(abilityScore)
hasher.combine(advantage)
hasher.combine(name)
hasher.combine(proficiency)
}
func isEqualTo(rawSkill: Skill?) -> Bool {
if (rawSkill == nil) {
return false;
} else if (abilityScore != rawSkill!.wrappedAbilityScore) {
return false;
} else if (advantage != rawSkill!.wrappedAdvantage) {
return false;
} else if (name != rawSkill!.name) {
return false;
} else if (proficiency != rawSkill!.wrappedProficiency) {
return false;
} else {
return true
}
}
func copyToSkill(skill: Skill) {
skill.wrappedAbilityScore = abilityScore
skill.wrappedAdvantage = advantage
skill.name = name
skill.wrappedProficiency = proficiency
}
init(_ rawSkill: Skill?) {
if (rawSkill != nil) {
self.rawSkill = rawSkill
_name = rawSkill!.name ?? ""
_abilityScore = AbilityScore(rawValue: rawSkill!.abilityScoreName ?? "") ?? .strength
_proficiency = ProficiencyType(rawValue: rawSkill!.proficiency ?? "") ?? .none
_advantage = AdvantageType(rawValue: rawSkill!.advantage ?? "") ?? .none
_advantage = .none
} else {
_name = ""
_abilityScore = .strength
_proficiency = .none
_advantage = .none
}
}
@@ -35,4 +79,61 @@ class SkillViewModel: ObservableObject {
}
}
}
private var _abilityScore: AbilityScore
var abilityScore: AbilityScore {
get {
return _abilityScore
}
set {
if (newValue != _abilityScore) {
_abilityScore = newValue
// Notify changed
}
if (rawSkill != nil) {
rawSkill!.wrappedAbilityScore = newValue
}
}
}
private var _proficiency: ProficiencyType
var proficiency: ProficiencyType {
get {
return _proficiency
}
set {
if (newValue != _proficiency) {
_proficiency = newValue
// Notify changed
}
if (rawSkill != nil) {
rawSkill!.wrappedProficiency = newValue
}
}
}
private var _advantage: AdvantageType
var advantage: AdvantageType {
get {
return _advantage
}
set {
if (newValue != _advantage) {
_advantage = newValue
// Notify changed
}
if (rawSkill != nil) {
rawSkill!.wrappedAdvantage = newValue
}
}
}
func buildRawSkill(context: NSManagedObjectContext?) -> Skill {
let newSkill = context == nil ? Skill.init() : Skill.init(context: context!)
newSkill.name = name
newSkill.wrappedAbilityScore = abilityScore
newSkill.wrappedProficiency = proficiency
newSkill.wrappedAdvantage = advantage
return newSkill
}
}

9
iOS/MonsterCards/MonsterCards.xcdatamodeld/MonsterCards.xcdatamodel/contents
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="17192" systemVersion="19H114" minimumToolsVersion="Automatic" sourceLanguage="Swift" usedWithCloudKit="YES" userDefinedModelVersionIdentifier="">
<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="17709" systemVersion="20D74" minimumToolsVersion="Automatic" sourceLanguage="Swift" usedWithCloudKit="YES" userDefinedModelVersionIdentifier="">
<entity name="Monster" representedClassName="Monster" syncable="YES" codeGenerationType="category">
<attribute name="alignment" attributeType="String" defaultValueString=""/>
<attribute name="armorType" attributeType="String" defaultValueString=""/>
@@ -52,13 +52,14 @@
<relationship name="skills" optional="YES" toMany="YES" deletionRule="Cascade" destinationEntity="Skill" inverseName="monster" inverseEntity="Skill"/>
</entity>
<entity name="Skill" representedClassName="Skill" syncable="YES" codeGenerationType="category">
<attribute name="abilityScoreName" attributeType="String" defaultValueString=""/>
<attribute name="abilityScoreName" attributeType="String" defaultValueString="strength"/>
<attribute name="advantage" attributeType="String" defaultValueString="none"/>
<attribute name="name" attributeType="String" defaultValueString=""/>
<attribute name="proficiency" attributeType="String" defaultValueString=""/>
<attribute name="proficiency" attributeType="String" defaultValueString="none"/>
<relationship name="monster" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Monster" inverseName="skills" inverseEntity="Monster"/>
</entity>
<elements>
<element name="Monster" positionX="-63" positionY="-18" width="128" height="778"/>
<element name="Skill" positionX="-63" positionY="135" width="128" height="103"/>
<element name="Skill" positionX="-63" positionY="135" width="128" height="14"/>
</elements>
</model>

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

@@ -39,6 +39,10 @@ struct EditMonster: View {
NavigationLink(
"Saving Throws",
destination: EditSavingThrows(monsterViewModel: monsterViewModel))
NavigationLink(
"Skills",
destination: EditSkills(monsterViewModel: monsterViewModel))
}
.onAppear(perform: copyMonsterToLocal)
.toolbar(content: {