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

Fixes how we check which saving throws to show.

Browse Source
This commit is contained in:
Tom Hicks
2020-10-04 00:46:12 -07:00
parent e057f6f12e
commit ec921aa705
1 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
MonsterCards/Models/Monster.m
View File

@@ -383,7 +383,10 @@ NSString *const kAdvantageTypeDisadvantage = @"disadvantage";
NSString *name; NSString *name;
NSString *advantage; NSString *advantage;
int bonus; int bonus;
if (self.strengthSavingThrowProficiency != kProficiencyTypeNone || self.strengthSavingThrowAdvantage != kAdvantageTypeNone) { if (
![kProficiencyTypeNone isEqualToString:self.strengthSavingThrowProficiency] ||
![kAdvantageTypeNone isEqualToString:self.strengthSavingThrowAdvantage]
) {
name = NSLocalizedString(@"Strength", @""); name = NSLocalizedString(@"Strength", @"");
bonus = self.strengthModifier + [self proficiencyBonusForType:self.strengthSavingThrowProficiency]; bonus = self.strengthModifier + [self proficiencyBonusForType:self.strengthSavingThrowProficiency];
advantage = [Monster advantageLabelStringForType:self.strengthSavingThrowAdvantage]; advantage = [Monster advantageLabelStringForType:self.strengthSavingThrowAdvantage];
@@ -392,7 +395,10 @@ NSString *const kAdvantageTypeDisadvantage = @"disadvantage";
} }
[parts addObject:[NSString stringWithFormat:@"%@ %+d%@", name, bonus, advantage]]; [parts addObject:[NSString stringWithFormat:@"%@ %+d%@", name, bonus, advantage]];
} }
if (self.dexteritySavingThrowProficiency != kProficiencyTypeNone) { if (
![kProficiencyTypeNone isEqualToString:self.dexteritySavingThrowProficiency] ||
![kAdvantageTypeNone isEqualToString:self.dexteritySavingThrowAdvantage]
) {
name = NSLocalizedString(@"Dexterity", @""); name = NSLocalizedString(@"Dexterity", @"");
bonus = self.dexterityModifier + [self proficiencyBonusForType:self.dexteritySavingThrowProficiency]; bonus = self.dexterityModifier + [self proficiencyBonusForType:self.dexteritySavingThrowProficiency];
advantage = [Monster advantageLabelStringForType:self.dexteritySavingThrowAdvantage]; advantage = [Monster advantageLabelStringForType:self.dexteritySavingThrowAdvantage];
@@ -401,7 +407,10 @@ NSString *const kAdvantageTypeDisadvantage = @"disadvantage";
} }
[parts addObject:[NSString stringWithFormat:@"%@ %+d%@", name, bonus, advantage]]; [parts addObject:[NSString stringWithFormat:@"%@ %+d%@", name, bonus, advantage]];
} }
if (self.constitutionSavingThrowProficiency != kProficiencyTypeNone) { if (
![kProficiencyTypeNone isEqualToString:self.constitutionSavingThrowProficiency] ||
![kAdvantageTypeNone isEqualToString:self.constitutionSavingThrowAdvantage]
) {
name = NSLocalizedString(@"Constitution", @""); name = NSLocalizedString(@"Constitution", @"");
bonus = self.constitutionModifier + [self proficiencyBonusForType:self.constitutionSavingThrowProficiency]; bonus = self.constitutionModifier + [self proficiencyBonusForType:self.constitutionSavingThrowProficiency];
advantage = [Monster advantageLabelStringForType:self.constitutionSavingThrowAdvantage]; advantage = [Monster advantageLabelStringForType:self.constitutionSavingThrowAdvantage];
@@ -410,7 +419,10 @@ NSString *const kAdvantageTypeDisadvantage = @"disadvantage";
} }
[parts addObject:[NSString stringWithFormat:@"%@ %+d%@", name, bonus, advantage]]; [parts addObject:[NSString stringWithFormat:@"%@ %+d%@", name, bonus, advantage]];
} }
if (self.intelligenceSavingThrowProficiency != kProficiencyTypeNone) { if (
![kProficiencyTypeNone isEqualToString:self.intelligenceSavingThrowProficiency] ||
![kAdvantageTypeNone isEqualToString:self.intelligenceSavingThrowAdvantage]
) {
name = NSLocalizedString(@"Intelligence", @""); name = NSLocalizedString(@"Intelligence", @"");
bonus = self.intelligenceModifier + [self proficiencyBonusForType:self.intelligenceSavingThrowProficiency]; bonus = self.intelligenceModifier + [self proficiencyBonusForType:self.intelligenceSavingThrowProficiency];
advantage = [Monster advantageLabelStringForType:self.intelligenceSavingThrowAdvantage]; advantage = [Monster advantageLabelStringForType:self.intelligenceSavingThrowAdvantage];
@@ -419,7 +431,10 @@ NSString *const kAdvantageTypeDisadvantage = @"disadvantage";
} }
[parts addObject:[NSString stringWithFormat:@"%@ %+d%@", name, bonus, advantage]]; [parts addObject:[NSString stringWithFormat:@"%@ %+d%@", name, bonus, advantage]];
} }
if (self.wisdomSavingThrowProficiency != kProficiencyTypeNone) { if (
![kProficiencyTypeNone isEqualToString:self.wisdomSavingThrowProficiency] ||
![kAdvantageTypeNone isEqualToString:self.wisdomSavingThrowAdvantage]
) {
name = NSLocalizedString(@"Wisdom", @""); name = NSLocalizedString(@"Wisdom", @"");
bonus = self.wisdomModifier + [self proficiencyBonusForType:self.wisdomSavingThrowProficiency]; bonus = self.wisdomModifier + [self proficiencyBonusForType:self.wisdomSavingThrowProficiency];
advantage = [Monster advantageLabelStringForType:self.wisdomSavingThrowAdvantage]; advantage = [Monster advantageLabelStringForType:self.wisdomSavingThrowAdvantage];
@@ -428,7 +443,10 @@ NSString *const kAdvantageTypeDisadvantage = @"disadvantage";
} }
[parts addObject:[NSString stringWithFormat:@"%@ %+d%@", name, bonus, advantage]]; [parts addObject:[NSString stringWithFormat:@"%@ %+d%@", name, bonus, advantage]];
} }
if (self.charismaSavingThrowProficiency != kProficiencyTypeNone) { if (
![kProficiencyTypeNone isEqualToString:self.charismaSavingThrowProficiency] ||
![kAdvantageTypeNone isEqualToString:self.charismaSavingThrowAdvantage]
) {
name = NSLocalizedString(@"Charisma", @""); name = NSLocalizedString(@"Charisma", @"");
bonus = self.charismaModifier + [self proficiencyBonusForType:self.charismaSavingThrowProficiency]; bonus = self.charismaModifier + [self proficiencyBonusForType:self.charismaSavingThrowProficiency];
advantage = [Monster advantageLabelStringForType:self.charismaSavingThrowAdvantage]; advantage = [Monster advantageLabelStringForType:self.charismaSavingThrowAdvantage];