Skip to content

Commit

Permalink
Fix Sorcerer Bloodline Overlapping Variables
Browse files Browse the repository at this point in the history 
Having the same bloodline from multiple sources (levels in sorcerer and blood arcanist) doubles the number of uses of the 1st-level power.
  • Loading branch information
@Llisandur @LegacyKing
Llisandur authored and LegacyKing committed Jan 20, 2019
1 parent b8698a8 commit 954ec42
Show file tree
Hide file tree
Showing 39 changed files with 121 additions and 121 deletions.
2 changes: 1 addition & 1 deletion data/pathfinder/paizo/player_companion/blood_of_angels/boa_abilities.lst
View file
Expand Up @@ -137,7 +137,7 @@ Wolfscarred Face KEY:Dual-Oracle ~ Wolfscarred Face CATEGORY:Special Ability TYP
###Block: Martyred Sorcerer Bloodline
# Ability Name Unique Key Category of Ability Type Required Ability Var. Min. Value Define Description Ability Bonus Ability Pool Modify VAR Source Page Aspects List of Known Class Spells by Level
Martyred Bloodline KEY:Sorcerer Bloodline ~ Martyred CATEGORY:Special Ability TYPE:Class Feature.Sorcerer Class Feature.SpecialQuality.ClassSpecialization.Sorcerer Bloodline DEFINE:Sorcerer_Martyred_BloodlineLVL|0 DEFINE:Sorcerer_Martyred_BloodlineProgressionLVL|0 DEFINE:Sorcerer_Martyred_BloodlineArcana1|0 DEFINE:Sorcerer_Martyred_BloodlineSpells1|0 DEFINE:Sorcerer_Martyred_BloodlinePowers|0 DEFINE:Sorcerer_Martyred_BloodlinePower1|0 DEFINE:Sorcerer_Martyred_BloodlinePower3|0 DEFINE:Sorcerer_Martyred_BloodlinePower9|0 DEFINE:Sorcerer_Martyred_BloodlinePower15|0 DEFINE:Sorcerer_Martyred_BloodlinePower20|0 DEFINE:Sorcerer_Martyred_BloodlinePower1LVL|0 DEFINE:Sorcerer_Martyred_BloodlinePower3LVL|0 DEFINE:Sorcerer_Martyred_BloodlinePower9LVL|0 DEFINE:Sorcerer_Martyred_BloodlinePower15LVL|0 DEFINE:Sorcerer_Martyred_BloodlinePower20LVL|0 DEFINE:Sorcerer_Martyred_BloodlinePower1Times|0 DEFINE:Sorcerer_Martyred_BloodlineClassSkill1|0 DEFINE:Sorcerer_Martyred_Description|0 DESC:One of your ancestors paid the ultimate price for her beliefs. This distant relative martyred herself out of her devout belief in a cause, and that sacrifice echoed down to her descendants, infusing them with arcane power. Your bloodline confers abilities that allow you to endure pain, resist torture, and inspire others.|PREVAREQ:Sorcerer_Martyred_Description,0 ABILITY:Class Skill|AUTOMATIC|Perform (Oratory)|PREVARGTEQ:Sorcerer_Martyred_BloodlineClassSkill1,1 ABILITY:Special Ability|AUTOMATIC|Martyred Bloodline ~ Bloodline Arcana|PREVARGTEQ:Sorcerer_Martyred_BloodlineArcana1,1 ABILITY:Special Ability|AUTOMATIC|Martyred Bloodline ~ Bonus Spells|PREVARGTEQ:Sorcerer_Martyred_BloodlineSpells1,1 ABILITY:Special Ability|AUTOMATIC|Martyred Bloodline ~ Bloodline Powers|PREVARGTEQ:Sorcerer_Martyred_BloodlinePowers,1 ABILITY:Special Ability|AUTOMATIC|TYPE=Martyred Bloodline ~ Power LVL 01|PREVARGTEQ:Sorcerer_Martyred_BloodlinePower1,1 ABILITY:Special Ability|AUTOMATIC|TYPE=Martyred Bloodline ~ Power LVL 03|PREVARGTEQ:Sorcerer_Martyred_BloodlinePower3,1 ABILITY:Special Ability|AUTOMATIC|TYPE=Martyred Bloodline ~ Power LVL 09|PREVARGTEQ:Sorcerer_Martyred_BloodlinePower9,1 ABILITY:Special Ability|AUTOMATIC|TYPE=Martyred Bloodline ~ Power LVL 15|PREVARGTEQ:Sorcerer_Martyred_BloodlinePower15,1 ABILITY:Special Ability|AUTOMATIC|TYPE=Martyred Bloodline ~ Power LVL 20|PREVARGTEQ:Sorcerer_Martyred_BloodlinePower20,1 BONUS:VAR|Sorcerer_Martyred_BloodlinePower1LVL|Sorcerer_Martyred_BloodlineLVL+BloodlinePower1LVLBonus BONUS:VAR|Sorcerer_Martyred_BloodlinePower3LVL|Sorcerer_Martyred_BloodlineLVL+BloodlinePower3LVLBonus BONUS:VAR|Sorcerer_Martyred_BloodlinePower9LVL|Sorcerer_Martyred_BloodlineLVL+BloodlinePower9LVLBonus BONUS:VAR|Sorcerer_Martyred_BloodlinePower15LVL|Sorcerer_Martyred_BloodlineLVL+BloodlinePower15LVLBonus BONUS:VAR|Sorcerer_Martyred_BloodlinePower20LVL|Sorcerer_Martyred_BloodlineLVL+BloodlinePower20LVLBonus SOURCEPAGE:p.29 ASPECT:Bloodline|Martyred
Martyred Bloodline CATEGORY:Sorcerer Bloodline TYPE:SorcererBloodlineChoice ABILITY:Internal|AUTOMATIC|Martyred Bloodline ~ Feat Tracker ABILITY:Special Ability|AUTOMATIC|Sorcerer Bloodline ~ Martyred BONUS:ABILITYPOOL|Sorcerer Bloodline Feat|BloodlineFeatCount BONUS:VAR|Sorcerer_Martyred_BloodlineLVL|BloodlineLVL BONUS:VAR|Sorcerer_Martyred_BloodlineProgressionLVL|BloodlineProgressionLVL BONUS:VAR|Sorcerer_Martyred_BloodlineArcana1|if(Sorcerer_CF_BloodlineArcana==0,1,0) BONUS:VAR|Sorcerer_Martyred_BloodlineSpells1|if(Sorcerer_CF_BloodlineSpells==0,1,0) BONUS:VAR|Sorcerer_Martyred_BloodlineClassSkill1|if(Sorcerer_CF_BloodlineClassSkill==0,1,0) BONUS:VAR|Sorcerer_Martyred_BloodlinePowers|if(Sorcerer_CF_BloodlinePowers==0,1,0) BONUS:VAR|Sorcerer_Martyred_BloodlinePower1|if(Sorcerer_CF_BloodlinePower1==0,1,0) BONUS:VAR|Sorcerer_Martyred_BloodlinePower3|if((Sorcerer_CF_BloodlinePower3==0&&Sorcerer_Martyred_BloodlineProgressionLVL>=3),1,0) BONUS:VAR|Sorcerer_Martyred_BloodlinePower9|if((Sorcerer_CF_BloodlinePower9==0&&Sorcerer_Martyred_BloodlineProgressionLVL>=9),1,0) BONUS:VAR|Sorcerer_Martyred_BloodlinePower15|if((Sorcerer_CF_BloodlinePower15==0&&Sorcerer_Martyred_BloodlineProgressionLVL>=15),1,0) BONUS:VAR|Sorcerer_Martyred_BloodlinePower20|if((Sorcerer_CF_BloodlinePower20==0&&Sorcerer_Martyred_BloodlineProgressionLVL>=20),1,0) BONUS:VAR|Sorcerer_Martyred_BloodlinePower1Times|BloodlinePowerTimes+BloodlinePower1TimesBonus
Martyred Bloodline CATEGORY:Sorcerer Bloodline TYPE:SorcererBloodlineChoice ABILITY:Internal|AUTOMATIC|Martyred Bloodline ~ Feat Tracker ABILITY:Special Ability|AUTOMATIC|Sorcerer Bloodline ~ Martyred BONUS:ABILITYPOOL|Sorcerer Bloodline Feat|BloodlineFeatCount BONUS:VAR|Sorcerer_Martyred_BloodlineLVL|BloodlineLVL BONUS:VAR|Sorcerer_Martyred_BloodlineProgressionLVL|BloodlineProgressionLVL BONUS:VAR|Sorcerer_Martyred_BloodlineArcana1|if(Sorcerer_CF_BloodlineArcana==0,1,0) BONUS:VAR|Sorcerer_Martyred_BloodlineSpells1|if(Sorcerer_CF_BloodlineSpells==0,1,0) BONUS:VAR|Sorcerer_Martyred_BloodlineClassSkill1|if(Sorcerer_CF_BloodlineClassSkill==0,1,0) BONUS:VAR|Sorcerer_Martyred_BloodlinePowers|if(Sorcerer_CF_BloodlinePowers==0,1,0) BONUS:VAR|Sorcerer_Martyred_BloodlinePower1|if(Sorcerer_CF_BloodlinePower1==0,1,0) BONUS:VAR|Sorcerer_Martyred_BloodlinePower3|if((Sorcerer_CF_BloodlinePower3==0&&Sorcerer_Martyred_BloodlineProgressionLVL>=3),1,0) BONUS:VAR|Sorcerer_Martyred_BloodlinePower9|if((Sorcerer_CF_BloodlinePower9==0&&Sorcerer_Martyred_BloodlineProgressionLVL>=9),1,0) BONUS:VAR|Sorcerer_Martyred_BloodlinePower15|if((Sorcerer_CF_BloodlinePower15==0&&Sorcerer_Martyred_BloodlineProgressionLVL>=15),1,0) BONUS:VAR|Sorcerer_Martyred_BloodlinePower20|if((Sorcerer_CF_BloodlinePower20==0&&Sorcerer_Martyred_BloodlineProgressionLVL>=20),1,0) BONUS:VAR|Sorcerer_Martyred_BloodlinePower1Times|BloodlinePowerTimes+BloodlinePower1TimesBonus|TYPE=Base
# Martyred Bloodline Feat Tracker
Martyred Bloodline ~ Feat Tracker CATEGORY:Internal BONUS:VAR|Sorcerer_BloodlineFeat_Diehard|1 BONUS:VAR|Sorcerer_BloodlineFeat_Endurance|1 BONUS:VAR|Sorcerer_BloodlineFeat_HeroicDefiance|1 BONUS:VAR|Sorcerer_BloodlineFeat_HeroicRecovery|1 BONUS:VAR|Sorcerer_BloodlineFeat_Leadership|1 BONUS:VAR|Sorcerer_BloodlineFeat_Persuasive|1 BONUS:VAR|Sorcerer_BloodlineFeat_SkillFocusPerform|1 BONUS:VAR|Sorcerer_BloodlineFeat_Toughness|1
# Martyred Bloodline Bonus Spells
Expand Down
2 changes: 1 addition & 1 deletion data/pathfinder/paizo/player_companion/blood_of_angels/support/boa_abilities_class_acg.lst
View file
Expand Up @@ -6,4 +6,4 @@ SOURCELONG:Blood of Angels SOURCESHORT:BOA SOURCEWEB:http://paizo.com/products/b

# Ability Name Category of Ability Type Ability Modify VAR
Martyred Bloodline CATEGORY:Arcanist Bloodline Development TYPE:SorcererBloodlineChoice ABILITY:Special Ability|AUTOMATIC|TYPE=Martyred Bloodline ~ Power LVL 01 ABILITY:Special Ability|AUTOMATIC|Sorcerer Bloodline ~ Martyred BONUS:VAR|Sorcerer_Martyred_BloodlineLVL|1|!PREABILITY:1,CATEGORY=Sorcerer Bloodline,Martyred Bloodline|!PREABILITY:1,CATEGORY=Crossblooded Bloodline,Martyred Bloodline BONUS:VAR|Sorcerer_Martyred_BloodlineLVL|ArcanistLVL|PREMULT:1,[PREABILITY:1,CATEGORY=Sorcerer Bloodline,Martyred Bloodline],[PREABILITY:1,CATEGORY=Crossblooded Bloodline,Martyred Bloodline] BONUS:VAR|Sorcerer_Martyred_BloodlinePower1LVL|1|!PREABILITY:1,CATEGORY=Sorcerer Bloodline,Martyred Bloodline|!PREABILITY:1,CATEGORY=Crossblooded Bloodline,Martyred Bloodline
Martyred Bloodline CATEGORY:Blood Arcanist Bloodline TYPE:SorcererBloodlineChoice ABILITY:Special Ability|AUTOMATIC|Sorcerer Bloodline ~ Martyred BONUS:VAR|Sorcerer_Martyred_BloodlineLVL|BloodlineLVL BONUS:VAR|Sorcerer_Martyred_BloodlineProgressionLVL|BloodlineProgressionLVL BONUS:VAR|Sorcerer_Martyred_BloodlineArcana1|1 BONUS:VAR|Sorcerer_Martyred_BloodlinePowers|1 BONUS:VAR|Sorcerer_Martyred_BloodlinePower1|1 BONUS:VAR|Sorcerer_Martyred_BloodlinePower3|if(Sorcerer_Martyred_BloodlineProgressionLVL>=3,1,0) BONUS:VAR|Sorcerer_Martyred_BloodlinePower9|if(Sorcerer_Martyred_BloodlineProgressionLVL>=9,1,0) BONUS:VAR|Sorcerer_Martyred_BloodlinePower15|if(Sorcerer_Martyred_BloodlineProgressionLVL>=15,1,0) BONUS:VAR|Sorcerer_Martyred_BloodlinePower20|if(Sorcerer_Martyred_BloodlineProgressionLVL>=20,1,0) BONUS:VAR|Sorcerer_Martyred_BloodlinePower1Times|BloodlinePowerTimes+BloodlinePower1TimesBonus
Martyred Bloodline CATEGORY:Blood Arcanist Bloodline TYPE:SorcererBloodlineChoice ABILITY:Special Ability|AUTOMATIC|Sorcerer Bloodline ~ Martyred BONUS:VAR|Sorcerer_Martyred_BloodlineLVL|BloodlineLVL BONUS:VAR|Sorcerer_Martyred_BloodlineProgressionLVL|BloodlineProgressionLVL BONUS:VAR|Sorcerer_Martyred_BloodlineArcana1|1 BONUS:VAR|Sorcerer_Martyred_BloodlinePowers|1 BONUS:VAR|Sorcerer_Martyred_BloodlinePower1|1 BONUS:VAR|Sorcerer_Martyred_BloodlinePower3|if(Sorcerer_Martyred_BloodlineProgressionLVL>=3,1,0) BONUS:VAR|Sorcerer_Martyred_BloodlinePower9|if(Sorcerer_Martyred_BloodlineProgressionLVL>=9,1,0) BONUS:VAR|Sorcerer_Martyred_BloodlinePower15|if(Sorcerer_Martyred_BloodlineProgressionLVL>=15,1,0) BONUS:VAR|Sorcerer_Martyred_BloodlinePower20|if(Sorcerer_Martyred_BloodlineProgressionLVL>=20,1,0) BONUS:VAR|Sorcerer_Martyred_BloodlinePower1Times|BloodlinePowerTimes+BloodlinePower1TimesBonus|TYPE=Base
2 changes: 1 addition & 1 deletion data/pathfinder/paizo/player_companion/blood_of_angels/support/boa_abilities_class_um.lst
View file
Expand Up @@ -10,4 +10,4 @@ Martyred Bloodline CATEGORY:Crossblooded Bloodline TYPE:SorcererBloodlineChoice
###Block: Eldritch Heritage Bloodlines -- Goes in UM or UM support _abilities.lst

# Ability Name Category of Ability Type Required Ability Restricted Ability Ability Modify VAR
Martyred Bloodline CATEGORY:Eldritch Heritage Bloodline TYPE:SorcererBloodlineChoice PREABILITY:1,CATEGORY=FEAT,Skill Focus (Perform (Oratory)) !PREABILITY:1,CATEGORY=Sorcerer Bloodline,Martyred Bloodline !PREABILITY:1,CATEGORY=Crossblooded Bloodline,Martyred Bloodline ABILITY:Special Ability|AUTOMATIC|Sorcerer Bloodline ~ Martyred BONUS:VAR|Sorcerer_Martyred_BloodlineLVL|EldritchHeritageBloodlineLVL BONUS:VAR|Sorcerer_Martyred_BloodlinePower1|1 BONUS:VAR|Sorcerer_Martyred_BloodlinePower3|1|PREABILITY:1,CATEGORY=Eldritch Heritage Bloodline,Level 3 Ability BONUS:VAR|Sorcerer_Martyred_BloodlinePower9|1|PREABILITY:1,CATEGORY=Eldritch Heritage Bloodline,Level 9 Ability BONUS:VAR|Sorcerer_Martyred_BloodlinePower15|1|PREABILITY:1,CATEGORY=Eldritch Heritage Bloodline,Level 15 Ability BONUS:VAR|Sorcerer_Martyred_BloodlinePower20|1|PREABILITY:1,CATEGORY=Eldritch Heritage Bloodline,Level 20 Ability BONUS:VAR|Sorcerer_Martyred_BloodlinePower1LVL|EldrtichHeritageBloodlinePower1LVLBonus BONUS:VAR|Sorcerer_Martyred_BloodlinePower3LVL|EldrtichHeritageBloodlinePower3LVLBonus BONUS:VAR|Sorcerer_Martyred_BloodlinePower9LVL|EldrtichHeritageBloodlinePower9LVLBonus BONUS:VAR|Sorcerer_Martyred_BloodlinePower15LVL|EldrtichHeritageBloodlinePower15LVLBonus BONUS:VAR|Sorcerer_Martyred_BloodlinePower20LVL|EldrtichHeritageBloodlinePower20LVLBonus BONUS:VAR|Sorcerer_Martyred_BloodlinePower1Times|CHA+3+BloodlinePower1TimesBonus
Martyred Bloodline CATEGORY:Eldritch Heritage Bloodline TYPE:SorcererBloodlineChoice PREABILITY:1,CATEGORY=FEAT,Skill Focus (Perform (Oratory)) !PREABILITY:1,CATEGORY=Sorcerer Bloodline,Martyred Bloodline !PREABILITY:1,CATEGORY=Crossblooded Bloodline,Martyred Bloodline ABILITY:Special Ability|AUTOMATIC|Sorcerer Bloodline ~ Martyred BONUS:VAR|Sorcerer_Martyred_BloodlineLVL|EldritchHeritageBloodlineLVL BONUS:VAR|Sorcerer_Martyred_BloodlinePower1|1 BONUS:VAR|Sorcerer_Martyred_BloodlinePower3|1|PREABILITY:1,CATEGORY=Eldritch Heritage Bloodline,Level 3 Ability BONUS:VAR|Sorcerer_Martyred_BloodlinePower9|1|PREABILITY:1,CATEGORY=Eldritch Heritage Bloodline,Level 9 Ability BONUS:VAR|Sorcerer_Martyred_BloodlinePower15|1|PREABILITY:1,CATEGORY=Eldritch Heritage Bloodline,Level 15 Ability BONUS:VAR|Sorcerer_Martyred_BloodlinePower20|1|PREABILITY:1,CATEGORY=Eldritch Heritage Bloodline,Level 20 Ability BONUS:VAR|Sorcerer_Martyred_BloodlinePower1LVL|EldrtichHeritageBloodlinePower1LVLBonus BONUS:VAR|Sorcerer_Martyred_BloodlinePower3LVL|EldrtichHeritageBloodlinePower3LVLBonus BONUS:VAR|Sorcerer_Martyred_BloodlinePower9LVL|EldrtichHeritageBloodlinePower9LVLBonus BONUS:VAR|Sorcerer_Martyred_BloodlinePower15LVL|EldrtichHeritageBloodlinePower15LVLBonus BONUS:VAR|Sorcerer_Martyred_BloodlinePower20LVL|EldrtichHeritageBloodlinePower20LVLBonus BONUS:VAR|Sorcerer_Martyred_BloodlinePower1Times|CHA+3+BloodlinePower1TimesBonus|TYPE=Base

0 comments on commit 954ec42

Please sign in to comment.