From 29f5ef991eec511ee1e5f6b6c4f74d7f9167b332 Mon Sep 17 00:00:00 2001
From: Tom Hicks <headhunter3@gmail.com>
Date: Sun, 20 Sep 2020 03:19:24 -0700
Subject: [PATCH] Exposes constants used by Monster internally for values.

---
 iOS/MonsterCards/Models/Monster.h | 33 ++++++++++++++++
 iOS/MonsterCards/Models/Monster.m | 62 +++++++++++++++----------------
 2 files changed, 64 insertions(+), 31 deletions(-)

diff --git a/iOS/MonsterCards/Models/Monster.h b/iOS/MonsterCards/Models/Monster.h
index 6b36c20..05d09aa 100644
--- a/iOS/MonsterCards/Models/Monster.h
+++ b/iOS/MonsterCards/Models/Monster.h
@@ -17,6 +17,39 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
+
+extern const int kArmorClassUnarmored;
+extern const int kArmorClassMageArmor;
+extern const int kArmorClassPadded;
+extern const int kArmorClassLeather;
+extern const int kArmorClassStudded;
+extern const int kArmorClassHide;
+extern const int kArmorClassChainShirt;
+extern const int kArmorClassScaleMail;
+extern const int kArmorClassBreastplate;
+extern const int kArmorClassHalfPlate;
+extern const int kArmorClassRingMail;
+extern const int kArmorClassChainMail;
+extern const int kArmorClassSplintMail;
+extern const int kArmorClassPlate;
+
+extern NSString* const kArmorNameNone;
+extern NSString* const kArmorNameNaturalArmor;
+extern NSString* const kArmorNameMageArmor;
+extern NSString* const kArmorNamePadded;
+extern NSString* const kArmorNameLeather;
+extern NSString* const kArmorNameStuddedLeather;
+extern NSString* const kArmorNameHide;
+extern NSString* const kArmorNameChainShirt;
+extern NSString* const kArmorNameScaleMail;
+extern NSString* const kArmorNameBreastplate;
+extern NSString* const kArmorNameHalfPlate;
+extern NSString* const kArmorNameRingMail;
+extern NSString* const kArmorNameChainMail;
+extern NSString* const kArmorNameSplintMail;
+extern NSString* const kArmorNamePlateMail;
+extern NSString* const kArmorNameOther;
+
 @class Skill;
 
 @interface Monster : NSManagedObject
diff --git a/iOS/MonsterCards/Models/Monster.m b/iOS/MonsterCards/Models/Monster.m
index 907567d..9dd35de 100644
--- a/iOS/MonsterCards/Models/Monster.m
+++ b/iOS/MonsterCards/Models/Monster.m
@@ -35,6 +35,37 @@
 @synthesize truesightDistance;
 @synthesize understandsBut;
 
+const int kArmorClassUnarmored = 10;
+const int kArmorClassMageArmor = kArmorClassUnarmored + 3;
+const int kArmorClassPadded = kArmorClassUnarmored + 1;
+const int kArmorClassLeather = kArmorClassUnarmored + 1;
+const int kArmorClassStudded = kArmorClassUnarmored + 2;
+const int kArmorClassHide = kArmorClassUnarmored + 2;
+const int kArmorClassChainShirt = kArmorClassUnarmored + 3;
+const int kArmorClassScaleMail = kArmorClassUnarmored + 4;
+const int kArmorClassBreastplate = kArmorClassUnarmored + 4;
+const int kArmorClassHalfPlate = kArmorClassUnarmored + 5;
+const int kArmorClassRingMail = kArmorClassUnarmored + 4;
+const int kArmorClassChainMail = kArmorClassUnarmored + 6;
+const int kArmorClassSplintMail = kArmorClassUnarmored + 7;
+const int kArmorClassPlate = kArmorClassUnarmored + 8;
+
+NSString* const kArmorNameNone = @"none";
+NSString* const kArmorNameNaturalArmor = @"natural armor";
+NSString* const kArmorNameMageArmor = @"mage armor";
+NSString* const kArmorNamePadded = @"padded";
+NSString* const kArmorNameLeather = @"leather";
+NSString* const kArmorNameStuddedLeather = @"studded";
+NSString* const kArmorNameHide = @"hide";
+NSString* const kArmorNameChainShirt = @"chain shirt";
+NSString* const kArmorNameScaleMail = @"scale mail";
+NSString* const kArmorNameBreastplate = @"breastplate";
+NSString* const kArmorNameHalfPlate = @"half plate";
+NSString* const kArmorNameRingMail = @"ring mail";
+NSString* const kArmorNameChainMail = @"chain mail";
+NSString* const kArmorNameSplintMail = @"splint";
+NSString* const kArmorNamePlateMail = @"plate";
+NSString* const kArmorNameOther = @"other";
 +(int)abilityModifierForScore: (int)score {
     return (int)floor((score - 10) / 2.0);
 }
@@ -144,37 +175,6 @@
     return [Monster abilityModifierForScore:self.charismaScore];
 }
 
-const int kArmorClassUnarmored = 10;
-const int kArmorClassMageArmor = kArmorClassUnarmored + 3;
-const int kArmorClassPadded = kArmorClassUnarmored + 1;
-const int kArmorClassLeather = kArmorClassUnarmored + 1;
-const int kArmorClassStudded = kArmorClassUnarmored + 2;
-const int kArmorClassHide = kArmorClassUnarmored + 2;
-const int kArmorClassChainShirt = kArmorClassUnarmored + 3;
-const int kArmorClassScaleMail = kArmorClassUnarmored + 4;
-const int kArmorClassBreastplate = kArmorClassUnarmored + 4;
-const int kArmorClassHalfPlate = kArmorClassUnarmored + 5;
-const int kArmorClassRingMail = kArmorClassUnarmored + 4;
-const int kArmorClassChainMail = kArmorClassUnarmored + 6;
-const int kArmorClassSplintMail = kArmorClassUnarmored + 7;
-const int kArmorClassPlate = kArmorClassUnarmored + 8;
-
-NSString const *kArmorNameNone = @"none";
-NSString const *kArmorNameNaturalArmor = @"natural armor";
-NSString const *kArmorNameMageArmor = @"mage armor";
-NSString const *kArmorNamePadded = @"padded";
-NSString const *kArmorNameLeather = @"leather";
-NSString const *kArmorNameStuddedLeather = @"studded";
-NSString const *kArmorNameHide = @"hide";
-NSString const *kArmorNameChainShirt = @"chain shirt";
-NSString const *kArmorNameScaleMail = @"scale mail";
-NSString const *kArmorNameBreastplate = @"breastplate";
-NSString const *kArmorNameHalfPlate = @"half plate";
-NSString const *kArmorNameRingMail = @"ring mail";
-NSString const *kArmorNameChainMail = @"chain mail";
-NSString const *kArmorNameSplintMail = @"splint";
-NSString const *kArmorNamePlateMail = @"plate";
-NSString const *kArmorNameOther = @"other";
 
 //getArmorClass
 -(NSString*)armorClassDescription {