diff --git a/MonsterCards/Models/Monster.h b/MonsterCards/Models/Monster.h index d8afc72..d7884f9 100644 --- a/MonsterCards/Models/Monster.h +++ b/MonsterCards/Models/Monster.h @@ -21,7 +21,6 @@ NS_ASSUME_NONNULL_BEGIN @interface Monster : NSManagedObject -@property NSString *otherArmorDescription; @property NSString *hpText; @property NSString *speed; @property NSString *burrowSpeed; diff --git a/MonsterCards/Models/Monster.m b/MonsterCards/Models/Monster.m index 69c77e8..634f197 100644 --- a/MonsterCards/Models/Monster.m +++ b/MonsterCards/Models/Monster.m @@ -27,7 +27,6 @@ @synthesize hpText; @synthesize isBlind; @synthesize naturalArmorBonus; -@synthesize otherArmorDescription; @synthesize shieldBonus; @synthesize speed; @synthesize swimSpeed; @@ -71,6 +70,7 @@ self.subtype = [jsonRoot objectForKey:@"tag"] ?: @""; self.alignment = [jsonRoot objectForKey:@"alignment"] ?: @""; self.armorName = [jsonRoot objectForKey:@"armorName"] ?: @""; + self.otherArmorDescription = [jsonRoot objectForKey:@"otherArmorDesc"] ?: @""; tempNumber = [jsonRoot objectForKey:@"strPoints"]; if (tempNumber != nil && [tempNumber isKindOfClass:[NSNumber class]]) { self.strengthScore = tempNumber.intValue; @@ -367,6 +367,7 @@ self.wisdomScore = monster.wisdomScore; self.charismaScore = monster.charismaScore; self.armorName = monster.armorName; + self.otherArmorDescription = monster.otherArmorDescription; } @end diff --git a/MonsterCards/MonsterCards.xcdatamodeld/MonsterCards.xcdatamodel/contents b/MonsterCards/MonsterCards.xcdatamodeld/MonsterCards.xcdatamodel/contents index d2b1834..9ae689f 100644 --- a/MonsterCards/MonsterCards.xcdatamodeld/MonsterCards.xcdatamodel/contents +++ b/MonsterCards/MonsterCards.xcdatamodeld/MonsterCards.xcdatamodel/contents @@ -8,6 +8,7 @@ + @@ -15,6 +16,6 @@ - + \ No newline at end of file