From bead4f8ee5c59374152ff365c6ce5f85e0408183 Mon Sep 17 00:00:00 2001
From: Tom Hicks <headhunter3@gmail.com>
Date: Sun, 13 Sep 2020 04:25:08 -0700
Subject: [PATCH] Adds otherArmorDescription to Monster entity. Adds tests for
 otherArmorDescription.

---
 MonsterCards/Models/Monster.h                                  | 1 -
 MonsterCards/Models/Monster.m                                  | 3 ++-
 .../MonsterCards.xcdatamodel/contents                          | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

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 @@
         <attribute name="dexterityScore" optional="YES" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="YES"/>
         <attribute name="intelligenceScore" optional="YES" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="YES"/>
         <attribute name="name" attributeType="String" defaultValueString=""/>
+        <attribute name="otherArmorDescription" optional="YES" attributeType="String" defaultValueString=""/>
         <attribute name="size" attributeType="String" defaultValueString=""/>
         <attribute name="strengthScore" optional="YES" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="YES"/>
         <attribute name="subtype" attributeType="String" defaultValueString=""/>
@@ -15,6 +16,6 @@
         <attribute name="wisdomScore" optional="YES" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="YES"/>
     </entity>
     <elements>
-        <element name="Monster" positionX="-63" positionY="-18" width="128" height="223"/>
+        <element name="Monster" positionX="-63" positionY="-18" width="128" height="238"/>
     </elements>
 </model>
\ No newline at end of file