DATA-4215 - PF1e: Witch class has lost Witch Patron

data/pathfinder/paizo/roleplaying_game/advanced_players_guide/apg__datacontrols.lst

@@ -406,7 +406,7 @@ FACTDEF:ABILITY|Witch_CF_PatronSpell12				DATAFORMAT:BOOLEAN	REQUIRED:NO	SELECTA
 FACTDEF:ABILITY|Witch_CF_PatronSpell14				DATAFORMAT:BOOLEAN	REQUIRED:NO	SELECTABLE:NO	VISIBLE:YES	DISPLAYNAME:Hex14				EXPLANATION:Remove Witch Hex14
 FACTDEF:ABILITY|Witch_CF_PatronSpell16				DATAFORMAT:BOOLEAN	REQUIRED:NO	SELECTABLE:NO	VISIBLE:YES	DISPLAYNAME:Hex16				EXPLANATION:Remove Witch Hex16
 FACTDEF:ABILITY|Witch_CF_PatronSpell18				DATAFORMAT:BOOLEAN	REQUIRED:NO	SELECTABLE:NO	VISIBLE:YES	DISPLAYNAME:Hex18				EXPLANATION:Remove Witch Hex18
-FACTDEF:ABILITY|Witch_CF_Patron					DATAFORMAT:BOOLEAN	REQUIRED:NO	SELECTABLE:NO	VISIBLE:YES	DISPLAYNAME:Hex18				EXPLANATION:Remove Witch Patron
+FACTDEF:ABILITY|Witch_CF_Patron					DATAFORMAT:BOOLEAN	REQUIRED:NO	SELECTABLE:NO	VISIBLE:YES	DISPLAYNAME:WitchPatron			EXPLANATION:Remove Witch Patron
 
 
 

data/pathfinder/paizo/roleplaying_game/advanced_players_guide/apg_abilities_class.lst

@@ -851,7 +851,7 @@ Witch's Familiar						KEY:Witch ~ Familiar			CATEGORY:Special Ability	TYPE:Witch
 Witch Patron Spells					KEY:Witch ~ Patron Spells		CATEGORY:Special Ability	TYPE:WitchClassFeatures.SpecialQuality																					DESC:At 1st level, when a witch gains her familiar, she must also select a patron. This patron is a vague and mysterious force, granting the witch power for reasons that she might not entirely understand. While these forces need not be named, they typically hold influence over one of the following forces. At 2nd level, and every two levels thereafter, a witch's patron adds new spells to a witch's list of spells known. These spells are also automatically added to the list of spells stored by the familiar. Spells marked with an asterisk (*) appear in Chapter 5 of this book. The spells gained depend upon the patron chosen. Each patron is listed by its theme. Its actual name is up to the GM and the witch to decide.																								
 Hex								KEY:Witch ~ Hex				CATEGORY:Special Ability	TYPE:WitchClassFeatures.SpecialQuality					DEFINE:WitchHexStat|0	DEFINE:WitchHexAbilityLVL|0	DEFINE:WitchHexDC|0	DEFINE:WitchIntelligenceScore|0	DEFINE:WitchMinorHexQualify|0	DEFINE:WitchMajorHexQualify|0	DEFINE:WitchGrandHexQualify|0		DESC:Witches learn a number of magic tricks, called hexes, that grant them powers or weaken foes. At 1st level, a witch gains one hex of her choice. She gains an additional hex at 2nd level and for every 2 levels attained after 2nd level, as noted on Table 2-10. A witch cannot select an individual hex more than once. Unless otherwise noted, using a hex is a standard action that does not provoke an attack of opportunity. The save to resist a hex is equal to 10 + 1/2 the witch's level + the witch's Intelligence modifier.	DESC:Witches learn a number of magic tricks, called hexes, that grant them powers or weaken foes. Unless otherwise noted, using a hex is a standard action that does not provoke an attack of opportunity. The save to resist a hex is %1.|WitchHexDC																																																																																																																																																																																																																																								BONUS:VAR|WitchIntelligenceScore|INTSCORE	BONUS:VAR|WitchIntelligenceScore|CONSCORE-INTSCORE|TYPE=Base	BONUS:VAR|WitchHexStat|INT|TYPE=Base	BONUS:VAR|WitchHexAbilityLVL|WitchLVL|TYPE=Base	BONUS:VAR|WitchHexDC|10+WitchHexStat+(WitchHexAbilityLVL/2)|TYPE=Base	BONUS:VAR|WitchHexDC|2|PREABILITY:1,CATEGORY=FEAT,Ability Focus (Witch Hex)	BONUS:VAR|WitchMinorHexQualify|1	BONUS:VAR|WitchMajorHexQualify|(WitchLVL>=10)	BONUS:VAR|WitchGrandHexQualify|(WitchLVL>=18)
 
-CATEGORY=Class|Witch.MOD	BONUS:ABILITYPOOL|Witch Patron|WitchPatronCount	DEFINE:WitchPatronCount|0	BONUS:VAR|WitchPatronCount|1	BONUS:VAR|WitchPatronCount|-1|!PREFACT:1,ABILITIES,Witch_CF_Patron=True
+CATEGORY=Class|Witch.MOD	BONUS:ABILITYPOOL|Witch Patron|WitchPatronCount	DEFINE:WitchPatronCount|0	BONUS:VAR|WitchPatronCount|1|TYPE=Base	BONUS:VAR|WitchPatronCount|-1|PREFACT:1,ABILITIES,Witch_CF_Patron=True
 CATEGORY=Class|Witch.MOD	BONUS:VAR|WitchPatronLVL|WitchLVL	DEFINE:WitchPatronLVL|0	DEFINE:FamiliarMasterLVL|0
 CATEGORY=Class|Witch.MOD	BONUS:SPELLKNOWN|CLASS=Witch;LEVEL=1|-1|PREMULT:2,[PREVARGTEQ:WitchPatronLVL,2],[!PREABILITY:1,CATEGORY=Archetype,TYPE.WitchPatronSpell2]	
 CATEGORY=Class|Witch.MOD	BONUS:SPELLKNOWN|CLASS=Witch;LEVEL=2|-1|PREMULT:2,[PREVARGTEQ:WitchPatronLVL,4],[!PREABILITY:1,CATEGORY=Archetype,TYPE.WitchPatronSpell4]