v0.7.6

data/archetypes.json

@@ -1598,7 +1598,7 @@
 				"Marshals are leaders, first and foremost. Marshals can come from any class or background, though they all share a willingness to sacrifice their own glory for the greater good of the team. Some marshals lead from the front, sword and shield raised, while others may call instructions and encouragements from the rear while providing allied spellcasters with skilled support. Regardless of their preferred method of combat, marshals' ability to bring the best out in every ally is a valuable addition to any group."
 			],
 			"extraFeats": [
-				"8|Attack of Opportunity (Champion)|CRB"
+				"8|Attack of Opportunity (Barbarian)|CRB"
 			],
 			"dedicationLevel": 2
 		},

data/changelog.json

@@ -237,6 +237,11 @@
 			"ver": "0.7.5",
 			"date": "2022-12-05",
 			"txt": "- Added Lost Omens: Impossible Lands\n- Added Hero Points deck (contributed by Spappz)\n- Added Gifts and Relics page (contributed by Spappz)\n- Made indexes a little smaller in size and more consistent\n- Added \"Found In\" bestiary filter\n- Added the original name to search results of aliases, ex. Action: Push -> Action: Push (Shove)\n- Added 5e aliases to certain actions, ex. Strike = Attack\n- Recoloured LOTG, LOGM, LOCG, LOWG, LOL, LOPSG, and LOAG sources\n- ([Lots of] Typos/Tags)"
+		},
+		{
+			"ver": "0.7.6",
+			"date": "2022-12-15",
+			"txt": "- (Typos/Tags)"
 		}
 	]
 }

data/feats/feats-apg.json

@@ -6005,7 +6005,7 @@
 			"leadsTo": [
 				"Familiar Conduit|APG",
 				"Familiar Mascot|APG",
-				"Improved Familiar|APG",
+				"Improved Familiar (Familiar Master)|APG",
 				"Mutable Familiar|APG"
 			]
 		},
@@ -7900,6 +7900,7 @@
 			"name": "Improved Familiar",
 			"source": "APG",
 			"page": 174,
+			"add_hash": "Familiar Master",
 			"level": 6,
 			"featType": {
 				"archetype": [

data/feats/feats-crb.json

@@ -905,7 +905,8 @@
 			},
 			"level": 2,
 			"traits": [
-				"fighter"
+				"fighter",
+				"press"
 			],
 			"requirements": "You are wielding a ranged weapon",
 			"entries": [
@@ -1061,8 +1062,8 @@
 			],
 			"prerequisites": "expert in a skill with the {@action Recall Knowledge} action, {@feat Assurance} in that skill",
 			"entries": [
-				"You know basic facts off the top of your head. Choose a skill you're an expert in that has the {@action Recall Knowledge} action and for which you have the Assurance feat. You can use the {@action Recall Knowledge} action with that skill as a free action once per round.",
-				"If you do, you must use Assurance on the skill check."
+				"You know basic facts off the top of your head. Choose a skill you're an expert in that has the {@action Recall Knowledge} action and for which you have the {@feat Assurance} feat. You can use the {@action Recall Knowledge} action with that skill as a free action once per round.",
+				"If you do, you must use {@feat Assurance} on the skill check."
 			],
 			"special": [
 				"You can select this feat multiple times, choosing a different skill each time. You can use Automatic Knowledge with any skills you have chosen, but you can still use Automatic Knowledge only once per round."
@@ -7829,7 +7830,7 @@
 			],
 			"prerequisites": "legendary in {@skill Lore}",
 			"entries": [
-				"Your fame has spread throughout the lands (for instance, if you have {@skill Lore||Warfare Lore}, you might be a legendary general or tactician). This works as Legendary Performer above, except you gain higher-level jobs when you {@action Earn Income} with {@skill Lore}."
+				"Your fame has spread throughout the lands (for instance, if you have {@skill Lore||Warfare Lore}, you might be a legendary general or tactician). This works as {@feat Legendary Performer}, except you gain higher-level jobs when you {@action Earn Income} with {@skill Lore}."
 			]
 		},
 		{

data/feats/feats-som.json

@@ -1092,6 +1092,7 @@
 			"name": "Enhanced Familiar",
 			"source": "SoM",
 			"page": 42,
+			"add_hash": "Magus",
 			"level": 2,
 			"traits": [
 				"magus"

data/items/items-som.json

@@ -239,8 +239,8 @@
 				"Weapon"
 			],
 			"entries": [
-				"A bane rune causes a weapon to grant you improved understanding of creatures of a particular type, allowing you to deal more damage to those creatures. The crafter chooses aberration, animal, beast, celestial, construct, dragon, elemental, fey, fiend, giant, monitor, ooze, or both fungus and plant. The weapon deals {@damage 1d6} additional damage of the weapon's damage type to creatures with the chosen trait or traits. The benefit doesn't apply against creatures of the chosen type disguised as other creatures. It's up to GM discretion whether the bane rune applies against a creature disguised as a creature of the chosen type.",
-				"The GM might allow bane runes for other creature traits, such as astral, dream, or demon. However, humanoids, undead, and specific types of humanoids (such as elves) are never a valid option."
+				"A bane rune causes a weapon to grant you improved understanding of creatures of a particular type, allowing you to deal more damage to those creatures. The crafter chooses {@trait aberration}, {@trait animal}, {@trait beast}, {@trait celestial}, {@trait construct}, {@trait dragon}, {@trait elemental}, {@trait fey}, {@trait fiend}, {@trait giant}, {@trait monitor}, {@trait ooze}, or both {@trait fungus} and {@trait plant}. The weapon deals {@damage 1d6} additional damage of the weapon's damage type to creatures with the chosen trait or traits. The benefit doesn't apply against creatures of the chosen type disguised as other creatures. It's up to GM discretion whether the bane rune applies against a creature disguised as a creature of the chosen type.",
+				"The GM might allow bane runes for other creature traits, such as {@trait astral}, {@trait dream}, or {@trait demon}. However, {@trait humanoid||humanoids}, {@trait undead}, and specific types of {@trait humanoid||humanoids} (such as {@trait elf||elves}) are never a valid option."
 			]
 		},
 		{

data/spells/spells-som.json

@@ -7270,14 +7270,14 @@
 				"unit": "minute"
 			},
 			"entries": [
-				"Your unarmed attacks or weapon gain the benefits of a weapon rune you choose when you cast this spell: corrosive, flaming, frost, ghost touch, returning, shock, or thundering. If you cast {@spell runic impression|SoM} on a weapon, this spell ends if you cease holding the weapon.",
+				"Your unarmed attacks or weapon gain the benefits of a weapon rune you choose when you cast this spell: {@item corrosive}, {@item flaming}, {@item frost}, {@item ghost touch}, {@item returning}, {@item shock}, or {@item thundering}. If you cast runic impression on a weapon, this spell ends if you cease holding the weapon.",
 				"If this spell would give a weapon more property runes than its normal maximum, one of the existing property runes (you choose) is suppressed until the spell ends.",
 				"For unarmed attacks, if this spell would give you more property runes than you could have from {@item handwraps of mighty blows (generic)|CRB|handwraps of mighty blows}, one of the existing property runes is similarly suppressed."
 			],
 			"heightened": {
 				"X": {
 					"8": [
-						"Add keen to the list of runes you can choose as well as the greater types of corrosive, flaming, frost, shock, and thundering."
+						"Add {@item keen} to the list of runes you can choose as well as the greater types of {@item greater corrosive||corrosive}, {@item greater flaming||flaming}, {@item greater frost||frost}, {@item greater shock||shock}, and {@item greater thundering||thundering}."
 					]
 				}
 			}

data/traits.json

@@ -297,6 +297,7 @@
 		{
 			"name": "Additive",
 			"source": "CRB",
+			"variable": true,
 			"page": 75,
 			"entries": [
 				"Feats with the additive trait allow you to spend actions to add special substances to bombs or elixirs. You can add only one additive to a single alchemical item, and attempting to add another spoils the item. You can typically use actions with the additive trait only when you're creating an {@trait infused} {@trait alchemical} item, and some can be used only with the {@action Quick Alchemy|CRB} action. The additive trait is always followed by a level, such as additive <2>. An additive adds its level to the level of the alchemical item you're modifying; the result is the new level of the mixture. The mixture's item level must be no higher than your advanced alchemy level."

data/variantrules.json

@@ -8593,7 +8593,7 @@
 								},
 								{
 									"type": "pf2-h3",
-									"level": 6,
+									"level": 7,
 									"name": "Branch Feat",
 									"entries": [
 										"At 7th level in a branch, you become so immersed in your branch's secrets that you gain access to special training only offered to other members of your branch. You gain the 6th-level Magaambyan attendant archetype feat requiring affiliation with your branch (such as {@feat Uzunjati Storytelling|LOCG} for the Uzunjati). You must still meet any skill prerequisites the feat has. If you already have that feat, you gain an additional 6th-level class feat (even if your branch's feat was not a class feat).",

js/utils.js

@@ -5,7 +5,7 @@ if (typeof module !== "undefined") require("./parser.js");
 
 // in deployment, `IS_DEPLOYED = "<version number>";` should be set below.
 IS_DEPLOYED = undefined;
-VERSION_NUMBER = /* PF2ETOOLS_VERSION__OPEN */"0.7.5"/* PF2ETOOLS_VERSION__CLOSE */;
+VERSION_NUMBER = /* PF2ETOOLS_VERSION__OPEN */"0.7.6"/* PF2ETOOLS_VERSION__CLOSE */;
 DEPLOYED_STATIC_ROOT = ""; // ""; // FIXME re-enable this when we have a CDN again
 IS_VTT = false;
 

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "pf2etools",
 	"author": "Pf2eTools",
-	"version": "0.7.5",
+	"version": "0.7.6",
 	"license": "MIT",
 	"description": "A site dedicated to making playing games with your friends as easy as possible.",
 	"scripts": {

test/schema-template/_generated/traits.json

@@ -13,9 +13,6 @@
 				{
 					"$ref": "#/definitions/equipmentTrait"
 				},
-				{
-					"$ref": "#/definitions/variableTraits"
-				},
 				{
 					"$ref": "#/definitions/morphicTrait"
 				},
@@ -64,6 +61,9 @@
 				{
 					"$ref": "#/definitions/unknownTrait"
 				},
+				{
+					"$ref": "#/definitions/variableTraits"
+				},
 				{
 					"$ref": "#/definitions/energyElementTrait"
 				},
@@ -471,6 +471,72 @@
 				"water"
 			]
 		},
+		"variableTraits": {
+			"type": "string",
+			"description": "A list of all traits with variable values, enclosed in <these 'brackets'>.",
+			"anyOf": [
+				{
+					"type": "string",
+					"pattern": "^additive <.*>$"
+				},
+				{
+					"type": "string",
+					"pattern": "^attached <.*>$"
+				},
+				{
+					"type": "string",
+					"pattern": "^capacity <.*>$"
+				},
+				{
+					"type": "string",
+					"pattern": "^deadly <.*>$"
+				},
+				{
+					"type": "string",
+					"pattern": "^fatal <.*>$"
+				},
+				{
+					"type": "string",
+					"pattern": "^fatal aim <.*>$"
+				},
+				{
+					"type": "string",
+					"pattern": "^jousting <.*>$"
+				},
+				{
+					"type": "string",
+					"pattern": "^modular <.*>$"
+				},
+				{
+					"type": "string",
+					"pattern": "^reach <.*>$"
+				},
+				{
+					"type": "string",
+					"pattern": "^scatter <.*>$"
+				},
+				{
+					"type": "string",
+					"pattern": "^thrown <.*>$"
+				},
+				{
+					"type": "string",
+					"pattern": "^two-hand <.*>$"
+				},
+				{
+					"type": "string",
+					"pattern": "^two-handed <.*>$"
+				},
+				{
+					"type": "string",
+					"pattern": "^versatile <.*>$"
+				},
+				{
+					"type": "string",
+					"pattern": "^volley <.*>$"
+				}
+			]
+		},
 		"unknownTrait": {
 			"type": "string",
 			"description": "A list of all Unknown traits.",
@@ -822,16 +888,6 @@
 				"sentient"
 			]
 		},
-		"variableTraits": {
-			"type": "string",
-			"description": "A list of all traits with variable values, enclosed in <these 'brackets'>.",
-			"anyOf": [
-				{
-					"type": "string",
-					"pattern": "^scatter <.*>$"
-				}
-			]
-		},
 		"equipmentTrait": {
 			"type": "string",
 			"description": "A list of all Equipment traits.",