v1.209.0

data/bestiary/bestiary-aitfr-dn.json

@@ -296,7 +296,7 @@
 					"name": "Petrifying Gaze",
 					"entries": [
 						"When a creature that can see Kyrilla's eyes starts its turn within 30 feet of her, Kyrilla can force it to make a {@dc 14} Constitution saving throw if Kyrilla isn't {@condition incapacitated} and can see the creature. If the saving throw fails by 5 or more, the creature is instantly {@condition petrified}. Otherwise, a creature that fails the save begins to turn to stone and is {@condition restrained}. The {@condition restrained} creature must repeat the saving throw at the end of its next turn, becoming {@condition petrified} on a failure or ending the effect on a success. The petrification lasts until the creature is freed by the {@spell greater restoration} spell or other magic.",
-						"Unless {@quickref Surprise|PHB|3|0|surprised}, a creature can avert its eyes to avoid the saving throw at the start of its turn. If the creature does so, it can't see Kyrilla until the start of its next turn, when it can avert its eyes again. If the creature looks at Kyrilla in the meantime, it must immediately make the save.",
+						"Unless {@status surprised}, a creature can avert its eyes to avoid the saving throw at the start of its turn. If the creature does so, it can't see Kyrilla until the start of its next turn, when it can avert its eyes again. If the creature looks at Kyrilla in the meantime, it must immediately make the save.",
 						"Kyrilla's accursed gaze does not affect undead or constructs. If Kyrilla sees herself reflected on a polished surface within 30 feet of her and in an area of bright light, she is, due to her curse, affected by her own gaze."
 					]
 				},

data/bestiary/bestiary-awm.json

@@ -348,7 +348,8 @@
 				}
 			],
 			"traitTags": [
-				"Amphibious"
+				"Amphibious",
+				"Mimicry"
 			],
 			"damageTags": [
 				"S"

data/bestiary/bestiary-bgdia.json

@@ -3071,6 +3071,7 @@
 				"I"
 			],
 			"miscTags": [
+				"CUR",
 				"MW"
 			],
 			"savingThrowForcedSpell": [

data/bestiary/bestiary-bgg.json

@@ -2867,6 +2867,7 @@
 			],
 			"miscTags": [
 				"AOE",
+				"CUR",
 				"MW",
 				"RCH",
 				"RW"
@@ -3566,6 +3567,7 @@
 			],
 			"miscTags": [
 				"AOE",
+				"CUR",
 				"MW",
 				"RCH"
 			],
@@ -4080,6 +4082,7 @@
 				"Y"
 			],
 			"miscTags": [
+				"CUR",
 				"MW",
 				"RCH"
 			],
@@ -4399,6 +4402,7 @@
 			],
 			"miscTags": [
 				"AOE",
+				"CUR",
 				"MLW",
 				"MW",
 				"RCH"

data/bestiary/bestiary-bmt.json

@@ -12,8 +12,7 @@
 				"DoSI": "BMT",
 				"MPMM": "BMT",
 				"WBtW": "BMT",
-				"BAM": "BMT",
-				"MOT": "BMT"
+				"BAM": "BMT"
 			}
 		}
 	},
@@ -870,6 +869,7 @@
 				"S"
 			],
 			"miscTags": [
+				"CUR",
 				"MLW",
 				"MW"
 			],
@@ -1015,6 +1015,7 @@
 				"P"
 			],
 			"miscTags": [
+				"CUR",
 				"MLW",
 				"MW",
 				"RW"
@@ -5876,6 +5877,7 @@
 				"S"
 			],
 			"miscTags": [
+				"CUR",
 				"MW",
 				"RW"
 			],

data/bestiary/bestiary-cm.json

@@ -1364,6 +1364,7 @@
 			],
 			"miscTags": [
 				"AOE",
+				"CUR",
 				"MW"
 			],
 			"conditionInflict": [
@@ -4535,6 +4536,7 @@
 			],
 			"miscTags": [
 				"AOE",
+				"CUR",
 				"MW"
 			],
 			"conditionInflict": [

data/bestiary/bestiary-coa.json

@@ -437,6 +437,7 @@
 				"S"
 			],
 			"miscTags": [
+				"DIS",
 				"MW",
 				"RCH"
 			],
@@ -5834,7 +5835,7 @@
 				{
 					"name": "Amnesia",
 					"entries": [
-						"Levistus selects a {@condition stunned} creature that he can see. The creature must succeed on a {@dc 23} Charisma saving throw or Levistus erases a specific memory from the target. The memory must be one that the target experienced in the last 24 hours and that lasted no more than 10 minutes. The memory can only be restored with a Remove Curse or a {@spell Greater Restoration} spell."
+						"Levistus selects a {@condition stunned} creature that he can see. The creature must succeed on a {@dc 23} Charisma saving throw or Levistus erases a specific memory from the target. The memory must be one that the target experienced in the last 24 hours and that lasted no more than 10 minutes. The memory can only be restored with a {@spell Remove Curse} or a {@spell Greater Restoration} spell."
 					]
 				},
 				{
@@ -5885,7 +5886,8 @@
 				"O"
 			],
 			"miscTags": [
-				"AOE"
+				"AOE",
+				"CUR"
 			],
 			"conditionInflict": [
 				"stunned"
@@ -7557,6 +7559,7 @@
 				"O"
 			],
 			"miscTags": [
+				"CUR",
 				"MLW",
 				"MW"
 			],
@@ -7995,6 +7998,7 @@
 				"P"
 			],
 			"miscTags": [
+				"DIS",
 				"MW",
 				"RCH"
 			],

data/bestiary/bestiary-cos.json

@@ -1395,6 +1395,7 @@
 				"CW"
 			],
 			"miscTags": [
+				"CUR",
 				"MLW",
 				"MW",
 				"RW",
@@ -2366,6 +2367,7 @@
 				"CC"
 			],
 			"miscTags": [
+				"CUR",
 				"MLW",
 				"MW"
 			],
@@ -2608,6 +2610,9 @@
 			"attachedItems": [
 				"dagger|phb"
 			],
+			"traitTags": [
+				"Mimicry"
+			],
 			"actionTags": [
 				"Multiattack"
 			],

data/bestiary/bestiary-crcotn.json

@@ -449,7 +449,7 @@
 				{
 					"name": "Divinely Blessed",
 					"entries": [
-						"Alyxian can't be {@quickref Surprise|PHB|3|0|surprised} and can't be changed into another form against his will."
+						"Alyxian can't be {@status surprised} and can't be changed into another form against his will."
 					]
 				},
 				{
@@ -635,7 +635,7 @@
 				{
 					"name": "Divinely Blessed",
 					"entries": [
-						"Alyxian can't be {@quickref Surprise|PHB|3|0|surprised} and can't be changed into another form against his will."
+						"Alyxian can't be {@status surprised} and can't be changed into another form against his will."
 					]
 				},
 				{
@@ -806,7 +806,7 @@
 				{
 					"name": "Divinely Blessed",
 					"entries": [
-						"Alyxian can't be {@quickref Surprise|PHB|3|0|surprised} and can't be changed into another form against his will."
+						"Alyxian can't be {@status surprised} and can't be changed into another form against his will."
 					]
 				},
 				{
@@ -1142,7 +1142,7 @@
 				{
 					"name": "Divinely Blessed",
 					"entries": [
-						"Alyxian can't be {@quickref Surprise|PHB|3|0|surprised} and can't be changed into another form against his will."
+						"Alyxian can't be {@status surprised} and can't be changed into another form against his will."
 					]
 				},
 				{

data/bestiary/bestiary-dodk.json

@@ -7,8 +7,7 @@
 		},
 		"otherSources": {
 			"monster": {
-				"MM": "DoDk",
-				"MOT": "DoDk"
+				"MM": "DoDk"
 			}
 		}
 	},

data/bestiary/bestiary-dsotdq.json

@@ -2757,6 +2757,7 @@
 			],
 			"miscTags": [
 				"AOE",
+				"DIS",
 				"MW"
 			],
 			"savingThrowForced": [
@@ -8949,6 +8950,7 @@
 				"O"
 			],
 			"miscTags": [
+				"CUR",
 				"MLW",
 				"MW"
 			],

data/bestiary/bestiary-egw.json

@@ -683,6 +683,7 @@
 				"I"
 			],
 			"miscTags": [
+				"CUR",
 				"MLW",
 				"MW",
 				"RNG",

data/bestiary/bestiary-erlw.json

@@ -1026,6 +1026,7 @@
 				"I"
 			],
 			"miscTags": [
+				"CUR",
 				"MW"
 			],
 			"conditionInflictSpell": [
@@ -1706,7 +1707,7 @@
 									"type": "entries",
 									"name": "All Around Vision",
 									"entries": [
-										"The Inspired can't be {@quickref Surprise|PHB|3|0|surprised}."
+										"The Inspired can't be {@status surprised}."
 									]
 								},
 								{
@@ -1799,7 +1800,7 @@
 							"items": {
 								"name": "All Around Vision",
 								"entries": [
-									"The Inspired can't be {@quickref Surprise|PHB|3|0|surprised}."
+									"The Inspired can't be {@status surprised}."
 								]
 							}
 						}
@@ -2035,7 +2036,7 @@
 				{
 					"name": "All-Around Vision",
 					"entries": [
-						"The quori can't be {@quickref Surprise|PHB|3|0|surprised} while it isn't {@condition incapacitated}."
+						"The quori can't be {@status surprised} while it isn't {@condition incapacitated}."
 					]
 				},
 				{
@@ -2118,7 +2119,8 @@
 				"P"
 			],
 			"miscTags": [
-				"AOE"
+				"AOE",
+				"CUR"
 			],
 			"conditionInflict": [
 				"blinded",
@@ -4258,7 +4260,8 @@
 			"conditionImmune": [
 				"charmed",
 				"exhaustion",
-				"frightened"
+				"frightened",
+				"disease"
 			],
 			"languages": [
 				"Common",
@@ -5435,6 +5438,9 @@
 			"resist": [
 				"poison"
 			],
+			"conditionImmune": [
+				"disease"
+			],
 			"languages": [
 				"Common"
 			],

data/bestiary/bestiary-ggr.json

@@ -186,7 +186,7 @@
 				{
 					"name": "Mount",
 					"entries": [
-						"If the archon isn't mounted, it can use a bonus action to magically teleport onto the creature serving as its mount, provided the archon and its mount are on the same plane of existence. When it teleports, the archon appears astride the mount along with any equipment it is wearing or carrying. While mounted and not {@condition incapacitated}, the archon can't be {@quickref Surprise|PHB|3|0|surprised}, and both it and its mount gain advantage on Dexterity saving throws. If the archon is reduced to 0 hit points while riding its mount, the mount is reduced to 0 hit points as well."
+						"If the archon isn't mounted, it can use a bonus action to magically teleport onto the creature serving as its mount, provided the archon and its mount are on the same plane of existence. When it teleports, the archon appears astride the mount along with any equipment it is wearing or carrying. While mounted and not {@condition incapacitated}, the archon can't be {@status surprised}, and both it and its mount gain advantage on Dexterity saving throws. If the archon is reduced to 0 hit points while riding its mount, the mount is reduced to 0 hit points as well."
 					]
 				}
 			],
@@ -1312,6 +1312,7 @@
 				"I"
 			],
 			"miscTags": [
+				"CUR",
 				"MLW",
 				"MW"
 			],
@@ -1707,6 +1708,9 @@
 					]
 				}
 			],
+			"traitTags": [
+				"Mimicry"
+			],
 			"senseTags": [
 				"SD"
 			],
@@ -4563,7 +4567,7 @@
 				{
 					"name": "Vigilant",
 					"entries": [
-						"The giant can't be {@quickref Surprise|PHB|3|0|surprised}."
+						"The giant can't be {@status surprised}."
 					]
 				}
 			],
@@ -4956,7 +4960,7 @@
 				{
 					"name": "Assassinate",
 					"entries": [
-						"During its first turn, the hybrid poisoner has advantage on attack rolls against any creature that hasn't taken a turn. Any hit the hybrid scores against a {@quickref Surprise|PHB|3|0|surprised} creature is a critical hit."
+						"During its first turn, the hybrid poisoner has advantage on attack rolls against any creature that hasn't taken a turn. Any hit the hybrid scores against a {@status surprised} creature is a critical hit."
 					]
 				},
 				{
@@ -7032,7 +7036,7 @@
 				{
 					"name": "Mount",
 					"entries": [
-						"If the specter isn't mounted, it can use a bonus action to magically teleport onto its gloamwing mount, provided the specter and the gloamwing are on the same plane of existence. When it teleports, the specter appears astride the gloamwing along with any equipment it is wearing or carrying. While mounted and not {@condition incapacitated}, the specter can't be {@quickref Surprise|PHB|3|0|surprised}, and both it and its mount gain advantage on Dexterity saving throws."
+						"If the specter isn't mounted, it can use a bonus action to magically teleport onto its gloamwing mount, provided the specter and the gloamwing are on the same plane of existence. When it teleports, the specter appears astride the gloamwing along with any equipment it is wearing or carrying. While mounted and not {@condition incapacitated}, the specter can't be {@status surprised}, and both it and its mount gain advantage on Dexterity saving throws."
 					]
 				}
 			],
@@ -10352,7 +10356,7 @@
 				{
 					"name": "Surprise Attack",
 					"entries": [
-						"During the first round of combat, the medusa has advantage on attack rolls against any creature that is {@quickref Surprise|PHB|3|0|surprised}, and it deals an extra 10 ({@dice 3d6}) damage each time it hits such a creature with an attack."
+						"During the first round of combat, the medusa has advantage on attack rolls against any creature that is {@status surprised}, and it deals an extra 10 ({@dice 3d6}) damage each time it hits such a creature with an attack."
 					]
 				}
 			],

data/bestiary/bestiary-ghloe.json

@@ -151,6 +151,7 @@
 				"R"
 			],
 			"miscTags": [
+				"CUR",
 				"HPR",
 				"MW"
 			],
@@ -1748,6 +1749,7 @@
 				"R"
 			],
 			"miscTags": [
+				"CUR",
 				"HPR",
 				"MW"
 			],
@@ -3322,6 +3324,7 @@
 				}
 			],
 			"traitTags": [
+				"Mimicry",
 				"Pack Tactics"
 			],
 			"damageTags": [
@@ -6633,6 +6636,7 @@
 				"I"
 			],
 			"miscTags": [
+				"CUR",
 				"MW"
 			],
 			"conditionInflictSpell": [
@@ -7596,7 +7600,7 @@
 				{
 					"name": "Infection",
 					"entries": [
-						"A creature that touches the morbus kobold or anything it has touched in the past 24 hours is exposed to a disease, usually sewer plague."
+						"A creature that touches the morbus kobold or anything it has touched in the past 24 hours is exposed to a disease, usually {@disease sewer plague}."
 					]
 				},
 				{
@@ -7653,6 +7657,7 @@
 			],
 			"miscTags": [
 				"AOE",
+				"DIS",
 				"MLW",
 				"MW",
 				"RW",
@@ -8313,6 +8318,7 @@
 				"S"
 			],
 			"miscTags": [
+				"CUR",
 				"MW",
 				"RCH"
 			],
@@ -8574,7 +8580,8 @@
 				}
 			],
 			"traitTags": [
-				"Incorporeal Movement"
+				"Incorporeal Movement",
+				"Mimicry"
 			],
 			"senseTags": [
 				"D"
@@ -9089,6 +9096,7 @@
 				"I"
 			],
 			"miscTags": [
+				"CUR",
 				"MW"
 			],
 			"savingThrowForcedSpell": [
@@ -9201,6 +9209,7 @@
 				"S"
 			],
 			"miscTags": [
+				"CUR",
 				"MW"
 			],
 			"hasToken": true,
@@ -9457,6 +9466,7 @@
 				"S"
 			],
 			"miscTags": [
+				"DIS",
 				"MW"
 			],
 			"savingThrowForced": [
@@ -11218,6 +11228,7 @@
 				"CD"
 			],
 			"miscTags": [
+				"CUR",
 				"MW"
 			],
 			"conditionInflictSpell": [
@@ -11383,6 +11394,7 @@
 				"S"
 			],
 			"miscTags": [
+				"CUR",
 				"MW"
 			],
 			"conditionInflict": [
@@ -11632,6 +11644,7 @@
 			],
 			"miscTags": [
 				"AOE",
+				"CUR",
 				"HPR",
 				"MW",
 				"RCH"

data/bestiary/bestiary-gos.json

@@ -3305,6 +3305,7 @@
 				"S"
 			],
 			"miscTags": [
+				"CUR",
 				"MW"
 			],
 			"savingThrowForced": [

data/bestiary/bestiary-idrotf.json

@@ -142,7 +142,7 @@
 				{
 					"name": "Divine Being",
 					"entries": [
-						"Auril can't be {@quickref Surprise|PHB|3|0|surprised} and can't be changed into another form against her will."
+						"Auril can't be {@status surprised} and can't be changed into another form against her will."
 					]
 				},
 				{
@@ -334,7 +334,7 @@
 				{
 					"name": "Divine Being",
 					"entries": [
-						"Auril can't be {@quickref Surprise|PHB|3|0|surprised} and can't be changed into another form against her will."
+						"Auril can't be {@status surprised} and can't be changed into another form against her will."
 					]
 				},
 				{
@@ -537,7 +537,7 @@
 				{
 					"name": "Divine Being",
 					"entries": [
-						"Auril can't be {@quickref Surprise|PHB|3|0|surprised} and can't be changed into another form against her will."
+						"Auril can't be {@status surprised} and can't be changed into another form against her will."
 					]
 				},
 				{
@@ -3342,6 +3342,7 @@
 				"S"
 			],
 			"miscTags": [
+				"CUR",
 				"MLW",
 				"MW"
 			],

data/bestiary/bestiary-imr.json

@@ -257,6 +257,9 @@
 			"damageTags": [
 				"P"
 			],
+			"miscTags": [
+				"CUR"
+			],
 			"hasToken": true
 		},
 		{
@@ -557,7 +560,7 @@
 					"name": "Petrifying Gaze",
 					"entries": [
 						"When a creature that can see the medusa's eyes starts its turn within 30 feet of the medusa, the medusa can force it to make a {@dc 14} Constitution saving throw if the medusa isn't {@condition incapacitated} and can see the creature. If the saving throw fails by 5 or more, the creature is instantly {@condition petrified}. Otherwise, a creature that fails the save begins to turn to metal, wood, or porcelain (the medusa's choice) and is {@condition restrained}. The {@condition restrained} creature must repeat the saving throw at the end of its next turn, becoming {@condition petrified} on a failure or ending the effect on a success. The petrification lasts until the creature is freed by the  {@spell greater restoration} spell or other magic.",
-						"Unless {@quickref Surprise|PHB|3|0|surprised}, a creature can avert its eyes to avoid the saving throw at the start of its turn. If the creature does so, it can't see the medusa until the start of its next turn, when it can avert its eyes again. If the creature looks at the medusa in the meantime, it must immediately make the save.",
+						"Unless {@status surprised}, a creature can avert its eyes to avoid the saving throw at the start of its turn. If the creature does so, it can't see the medusa until the start of its next turn, when it can avert its eyes again. If the creature looks at the medusa in the meantime, it must immediately make the save.",
 						"If the medusa sees itself reflected on a polished surface within 30 feet of it and in an area of bright light, the medusa is, due to its curse, affected by its own gaze."
 					]
 				}
@@ -1081,6 +1084,7 @@
 				"P"
 			],
 			"miscTags": [
+				"DIS",
 				"MW",
 				"RCH"
 			],

data/bestiary/bestiary-jttrc.json

@@ -242,6 +242,11 @@
 			"name": "Aurumvorax",
 			"source": "JttRC",
 			"page": 105,
+			"otherSources": [
+				{
+					"source": "QftIS"
+				}
+			],
 			"size": [
 				"S"
 			],
@@ -341,6 +346,11 @@
 			"name": "Aurumvorax Den Leader",
 			"source": "JttRC",
 			"page": 105,
+			"otherSources": [
+				{
+					"source": "QftIS"
+				}
+			],
 			"size": [
 				"M"
 			],
@@ -2510,6 +2520,7 @@
 			],
 			"miscTags": [
 				"AOE",
+				"DIS",
 				"MW"
 			],
 			"conditionInflict": [

data/bestiary/bestiary-llk.json

@@ -608,7 +608,7 @@
 					"name": "Petrifying Gaze",
 					"entries": [
 						"When a creature that can see the medusa's eyes starts its turn within 30 feet of the medusa, the medusa can force it to make a {@dc 14} Constitution saving throw if the medusa isn't {@condition incapacitated} and can see the creature. If the saving throw fails by 5 or more, the creature is instantly {@condition petrified}. Otherwise, a creature that fails the save begins to turn to glass and is {@condition restrained}. The {@condition restrained} creature must repeat the saving throw at the end of its next turn, becoming {@condition petrified} on a failure or ending the effect on a success. The petrification lasts until the creature is freed by the  {@spell greater restoration} spell or other magic.",
-						"Unless {@quickref Surprise|PHB|3|0|surprised}, a creature can avert its eyes to avoid the saving throw at the start of its turn. If the creature does so, it can't see the medusa until the start of its next turn, when it can avert its eyes again. If the creature looks at the medusa in the meantime, it must immediately make the save.",
+						"Unless {@status surprised}, a creature can avert its eyes to avoid the saving throw at the start of its turn. If the creature does so, it can't see the medusa until the start of its next turn, when it can avert its eyes again. If the creature looks at the medusa in the meantime, it must immediately make the save.",
 						"If the medusa sees itself reflected on a polished surface within 30 feet of it and in an area of bright light, the medusa is, due to its curse, affected by its own gaze."
 					]
 				}
@@ -899,7 +899,7 @@
 				{
 					"name": "Transparent",
 					"entries": [
-						"Even when an ooze-folk is in plain sight, it takes a {@dc 12} Wisdom ({@skill Perception}) check to spot an ooze-folk that has neither moved nor attacked. A creature that tries to enter the ooze-folk's space while unaware of the ooze-folk is {@quickref Surprise|PHB|3|0|surprised} by the ooze-folk."
+						"Even when an ooze-folk is in plain sight, it takes a {@dc 12} Wisdom ({@skill Perception}) check to spot an ooze-folk that has neither moved nor attacked. A creature that tries to enter the ooze-folk's space while unaware of the ooze-folk is {@status surprised} by the ooze-folk."
 					]
 				},
 				{

data/bestiary/bestiary-mabjov.json

@@ -4914,6 +4914,9 @@
 			"attachedItems": [
 				"greataxe|phb"
 			],
+			"traitTags": [
+				"Mimicry"
+			],
 			"senseTags": [
 				"D"
 			],
@@ -4936,6 +4939,7 @@
 				"O"
 			],
 			"miscTags": [
+				"CUR",
 				"MLW",
 				"MW"
 			],
@@ -6480,6 +6484,7 @@
 				"O"
 			],
 			"miscTags": [
+				"DIS",
 				"MW",
 				"RCH"
 			],
@@ -6864,6 +6869,7 @@
 				"O"
 			],
 			"miscTags": [
+				"CUR",
 				"MLW",
 				"MW"
 			],

data/bestiary/bestiary-mff.json

@@ -98,6 +98,7 @@
 				"P"
 			],
 			"miscTags": [
+				"DIS",
 				"MW"
 			],
 			"conditionInflict": [
@@ -1137,6 +1138,7 @@
 				"B"
 			],
 			"miscTags": [
+				"CUR",
 				"MW"
 			],
 			"hasToken": true,

data/bestiary/bestiary-mot.json

@@ -985,7 +985,7 @@
 				{
 					"name": "Mount",
 					"entries": [
-						"If the archon isn't mounted, it can use a bonus action to magically teleport onto the creature serving as its mount, provided the archon and its mount are on the same plane of existence. When it teleports, the archon appears astride the mount, along with any equipment it is wearing or carrying. While mounted and not {@condition incapacitated}, the archon can't be {@quickref Surprise|PHB|3|0|surprised}, and both it and its mount have advantage on Dexterity saving throws. If the archon is reduced to 0 hit points while riding its mount, the mount is reduced to 0 hit points as well."
+						"If the archon isn't mounted, it can use a bonus action to magically teleport onto the creature serving as its mount, provided the archon and its mount are on the same plane of existence. When it teleports, the archon appears astride the mount, along with any equipment it is wearing or carrying. While mounted and not {@condition incapacitated}, the archon can't be {@status surprised}, and both it and its mount have advantage on Dexterity saving throws. If the archon is reduced to 0 hit points while riding its mount, the mount is reduced to 0 hit points as well."
 					]
 				},
 				{
@@ -1165,7 +1165,7 @@
 					"name": "Mount",
 					"entries": [
 						"If the ashen rider isn't mounted, it can use a bonus action to magically teleport onto the creature serving as its mount, provided the ashen rider and its mount are on the same plane of existence. When it teleports, the ashen rider appears astride the mount along with any equipment it is wearing or carrying.",
-						"While mounted and not {@condition incapacitated}, the ashen rider can't be {@quickref Surprise|PHB|3|0|surprised}, and both it and its mount have advantage on Dexterity saving throws. If the ashen rider is reduced to 0 hit points while riding its mount, the mount is reduced to 0 hit points as well."
+						"While mounted and not {@condition incapacitated}, the ashen rider can't be {@status surprised}, and both it and its mount have advantage on Dexterity saving throws. If the ashen rider is reduced to 0 hit points while riding its mount, the mount is reduced to 0 hit points as well."
 					]
 				}
 			],
@@ -2766,7 +2766,7 @@
 				{
 					"name": "Vigilant",
 					"entries": [
-						"The giant can't be {@quickref Surprise|PHB|3|0|surprised}."
+						"The giant can't be {@status surprised}."
 					]
 				}
 			],
@@ -2918,7 +2918,7 @@
 				{
 					"name": "Petrifying Gaze",
 					"entries": [
-						"When a creature that can see Hythonia's eyes starts its turn within 30 feet of her, Hythonia can force it to make a {@dc 18} Constitution saving throw if she isn't {@condition incapacitated} and can see the creature. If the saving throw fails by 5 or more, the creature is instantly {@condition petrified}. Otherwise, on a failed save the creature begins to turn to stone and is {@condition restrained}. The {@condition restrained} creature must repeat the saving throw at the end of its next turn, becoming {@condition petrified} on a failure or ending the effect on a success. The petrification lasts until the creature is freed by the {@spell greater restoration} spell or other magic. Unless {@quickref Surprise|PHB|3|0|surprised}, a creature can avert its eyes to avoid the saving throw at the start of its turn. If the creature does so, it can't see Hythonia until the start of its next turn, when it can avert its eyes again. If the creature looks at Hythonia in the meantime, it must immediately make the save. If Hythonia sees herself reflected on a polished surface within 30 feet of her and in an area of bright light, she is affected by her own gaze."
+						"When a creature that can see Hythonia's eyes starts its turn within 30 feet of her, Hythonia can force it to make a {@dc 18} Constitution saving throw if she isn't {@condition incapacitated} and can see the creature. If the saving throw fails by 5 or more, the creature is instantly {@condition petrified}. Otherwise, on a failed save the creature begins to turn to stone and is {@condition restrained}. The {@condition restrained} creature must repeat the saving throw at the end of its next turn, becoming {@condition petrified} on a failure or ending the effect on a success. The petrification lasts until the creature is freed by the {@spell greater restoration} spell or other magic. Unless {@status surprised}, a creature can avert its eyes to avoid the saving throw at the start of its turn. If the creature does so, it can't see Hythonia until the start of its next turn, when it can avert its eyes again. If the creature looks at Hythonia in the meantime, it must immediately make the save. If Hythonia sees herself reflected on a polished surface within 30 feet of her and in an area of bright light, she is affected by her own gaze."
 					]
 				},
 				{
@@ -3434,17 +3434,6 @@
 			"name": "Medusa",
 			"source": "MOT",
 			"page": 206,
-			"otherSources": [
-				{
-					"source": "SatO"
-				},
-				{
-					"source": "BMT"
-				},
-				{
-					"source": "DoDk"
-				}
-			],
 			"_copy": {
 				"name": "Medusa",
 				"source": "MM",
@@ -4379,7 +4368,7 @@
 				{
 					"name": "Vigilant",
 					"entries": [
-						"The phylaskia can't be {@quickref Surprise|PHB|3|0|surprised}."
+						"The phylaskia can't be {@status surprised}."
 					]
 				}
 			],
@@ -6034,7 +6023,7 @@
 				{
 					"name": "Multiheaded",
 					"entries": [
-						"The cerberus can't be {@quickref Surprise|PHB|3|0|surprised}, and it has advantage on saving throws against being knocked {@condition unconscious}."
+						"The cerberus can't be {@status surprised}, and it has advantage on saving throws against being knocked {@condition unconscious}."
 					]
 				},
 				{
@@ -6279,7 +6268,7 @@
 				{
 					"name": "Multiheaded",
 					"entries": [
-						"The cerberus can't be {@quickref Surprise|PHB|3|0|surprised}, and it has advantage on saving throws against being knocked {@condition unconscious}."
+						"The cerberus can't be {@status surprised}, and it has advantage on saving throws against being knocked {@condition unconscious}."
 					]
 				},
 				{

data/bestiary/bestiary-mpmm.json

@@ -4894,7 +4894,7 @@
 					"name": "Death Gaze",
 					"entries": [
 						"When a creature that can see the bodak's eyes starts its turn within 30 feet of the bodak, the bodak can force it to make a {@dc 13} Constitution saving throw if the bodak isn't {@condition incapacitated} and can see the creature. If the saving throw fails by 5 or more, the creature is reduced to 0 hit points unless it is immune to the {@condition frightened} condition. Otherwise, a creature takes 16 ({@damage 3d10}) psychic damage on a failed save.",
-						"Unless {@quickref Surprise|PHB|3|0|surprised}, a creature can avert its eyes to avoid the saving throw at the start of its turn. If the creature does so, it has disadvantage on attack rolls against the bodak until the start of its next turn. If the creature looks at the bodak in the meantime, that creature must immediately make the saving throw."
+						"Unless {@status surprised}, a creature can avert its eyes to avoid the saving throw at the start of its turn. If the creature does so, it has disadvantage on attack rolls against the bodak until the start of its next turn. If the creature looks at the bodak in the meantime, that creature must immediately make the saving throw."
 					]
 				},
 				{
@@ -5481,6 +5481,7 @@
 				"P"
 			],
 			"miscTags": [
+				"DIS",
 				"HPR",
 				"MW"
 			],
@@ -5748,7 +5749,7 @@
 				{
 					"name": "Uncanny Senses",
 					"entries": [
-						"The canoloth can't be {@quickref Surprise|PHB|3|0|surprised} unless it's {@condition incapacitated}."
+						"The canoloth can't be {@status surprised} unless it's {@condition incapacitated}."
 					]
 				}
 			],
@@ -9251,6 +9252,9 @@
 				{
 					"source": "MTF",
 					"page": 158
+				},
+				{
+					"source": "QftIS"
 				}
 			],
 			"size": [
@@ -15614,6 +15618,9 @@
 				{
 					"source": "VGM",
 					"page": 145
+				},
+				{
+					"source": "QftIS"
 				}
 			],
 			"size": [
@@ -16096,7 +16103,7 @@
 					"name": "Stunning Gaze",
 					"entries": [
 						"When a creature that can see the gauth's central eye starts its turn within 30 feet of the gauth, the gauth can force it to make a {@dc 14} Wisdom saving throw if the gauth isn't {@condition incapacitated} and can see the creature. A creature that fails the save is {@condition stunned} until the start of its next turn.",
-						"Unless {@quickref Surprise|PHB|3|0|surprised}, a creature can avert its eyes at the start of its turn to avoid the saving throw. If the creature does so, it can't see the gauth until the start of its next turn, when it can avert its eyes again. If the creature looks at the gauth in the meantime, it must immediately make the save."
+						"Unless {@status surprised}, a creature can avert its eyes at the start of its turn to avoid the saving throw. If the creature does so, it can't see the gauth until the start of its next turn, when it can avert its eyes again. If the creature looks at the gauth in the meantime, it must immediately make the save."
 					]
 				},
 				{
@@ -16364,6 +16371,9 @@
 				"type": "internal",
 				"path": "bestiary/gazer.mp3"
 			},
+			"traitTags": [
+				"Mimicry"
+			],
 			"senseTags": [
 				"D"
 			],
@@ -21154,6 +21164,7 @@
 				"O"
 			],
 			"miscTags": [
+				"CUR",
 				"MW"
 			],
 			"conditionInflictSpell": [
@@ -22813,6 +22824,9 @@
 				"type": "internal",
 				"path": "bestiary/leucrotta.mp3"
 			},
+			"traitTags": [
+				"Mimicry"
+			],
 			"senseTags": [
 				"D"
 			],
@@ -29757,6 +29771,7 @@
 				"P"
 			],
 			"miscTags": [
+				"DIS",
 				"MW"
 			],
 			"conditionInflict": [
@@ -31947,6 +31962,7 @@
 				"S"
 			],
 			"miscTags": [
+				"DIS",
 				"MW"
 			],
 			"savingThrowForced": [
@@ -36254,6 +36270,7 @@
 				"P"
 			],
 			"miscTags": [
+				"CUR",
 				"MW"
 			],
 			"conditionInflict": [
@@ -37019,7 +37036,7 @@
 				{
 					"name": "Rapier",
 					"entries": [
-						"{@atk mw} {@hit 5} to hit, reach 5 ft., one target. {@h}7 ({@damage 1d8 + 3}) piercing damage plus 7 ({@damage 2d6}) piercing damage."
+						"{@atk mw} {@hit 5} to hit, reach 5 ft., one target. {@h}7 ({@damage 1d8 + 3}) piercing damage plus 7 ({@damage 2d6}) force damage."
 					]
 				},
 				{
@@ -37059,6 +37076,7 @@
 				"X"
 			],
 			"damageTags": [
+				"O",
 				"P",
 				"Y"
 			],
@@ -41069,6 +41087,7 @@
 			],
 			"miscTags": [
 				"AOE",
+				"DIS",
 				"MW",
 				"RCH"
 			],

data/bestiary/bestiary-mpp.json

@@ -574,6 +574,7 @@
 				"O"
 			],
 			"miscTags": [
+				"CUR",
 				"MW",
 				"RCH"
 			],
@@ -5217,6 +5218,7 @@
 				"S"
 			],
 			"miscTags": [
+				"CUR",
 				"MW"
 			],
 			"savingThrowForced": [
@@ -7499,6 +7501,7 @@
 				"Y"
 			],
 			"miscTags": [
+				"CUR",
 				"MW"
 			],
 			"conditionInflict": [

data/bestiary/bestiary-mtf.json

@@ -3248,6 +3248,7 @@
 				"P"
 			],
 			"miscTags": [
+				"DIS",
 				"HPR",
 				"MW"
 			],
@@ -3499,7 +3500,7 @@
 				{
 					"name": "Uncanny Senses",
 					"entries": [
-						"The canoloth can't be {@quickref Surprise|PHB|3|0|surprised} while it isn't {@condition incapacitated}."
+						"The canoloth can't be {@status surprised} while it isn't {@condition incapacitated}."
 					]
 				}
 			],
@@ -12573,6 +12574,7 @@
 				"I"
 			],
 			"miscTags": [
+				"CUR",
 				"MW"
 			],
 			"savingThrowForced": [
@@ -17595,6 +17597,7 @@
 				"P"
 			],
 			"miscTags": [
+				"DIS",
 				"MW"
 			],
 			"conditionInflict": [
@@ -24089,6 +24092,7 @@
 			],
 			"miscTags": [
 				"AOE",
+				"DIS",
 				"MW",
 				"RCH"
 			],

data/bestiary/bestiary-oota.json

@@ -360,7 +360,8 @@
 				"CS"
 			],
 			"miscTags": [
-				"AOE"
+				"AOE",
+				"DIS"
 			],
 			"conditionInflict": [
 				"incapacitated",
@@ -532,6 +533,7 @@
 			],
 			"miscTags": [
 				"AOE",
+				"DIS",
 				"MW"
 			],
 			"conditionInflict": [
@@ -5394,6 +5396,7 @@
 			],
 			"miscTags": [
 				"AOE",
+				"DIS",
 				"MW"
 			],
 			"savingThrowForced": [
@@ -5435,7 +5438,7 @@
 					"name": "Petrifying Gaze",
 					"entries": [
 						"If a creature starts its turn within 15 feet of the basilisk and the two of them can see each other, the basilisk can force the creature to make a {@dc 12} Constitution saving throw if the basilisk isn't {@condition incapacitated}. On a failed save, the creature magically begins to turn to stone and is {@condition restrained}. It must repeat the saving throw at the end of its next turn. On a success, the effect ends. On a failure, the creature is {@condition petrified} until freed by the  {@spell greater restoration} spell or other magic.",
-						"A creature that isn't {@quickref Surprise|PHB|3|0|surprised} can avert its eyes to avoid the saving throw at the start of its turn. If it does so, it can't see the basilisk until the start of its next turn, when it can avert its eyes again. If it looks at the basilisk in the meantime, it must immediately make the save.",
+						"A creature that isn't {@status surprised} can avert its eyes to avoid the saving throw at the start of its turn. If it does so, it can't see the basilisk until the start of its next turn, when it can avert its eyes again. If it looks at the basilisk in the meantime, it must immediately make the save.",
 						"If the basilisk sees its reflection within 30 feet of it in bright light, it mistakes itself for a rival and targets itself with its gaze."
 					]
 				}

data/bestiary/bestiary-pabtso.json

@@ -1350,13 +1350,15 @@
 					]
 				}
 			],
-			"reaction": [
+			"bonus": [
 				{
 					"name": "Nimble Escape",
 					"entries": [
 						"The goblin takes the Disengage or Hide action."
 					]
-				},
+				}
+			],
+			"reaction": [
 				{
 					"name": "Psionic Shield",
 					"entries": [

data/bestiary/bestiary-pota.json

@@ -2533,7 +2533,7 @@
 				{
 					"name": "Assassinate",
 					"entries": [
-						"During its first turn, Ghald has advantage on attack rolls against any creature that hasn't taken a turn. Any hit Ghald scores against a {@quickref Surprise|PHB|3|0|surprised} creature is a critical hit."
+						"During its first turn, Ghald has advantage on attack rolls against any creature that hasn't taken a turn. Any hit Ghald scores against a {@status surprised} creature is a critical hit."
 					]
 				},
 				{
@@ -3586,7 +3586,7 @@
 					"name": "Petrifying Gaze",
 					"entries": [
 						"When a creature that can see Marlos's eyes starts its turn within 30 feet of him, Marlos can force it to make a {@dc 14} Constitution saving throw if Marlos isn't {@condition incapacitated} and can see the creature. If the saving throw fails by 5 or more, the creature is instantly {@condition petrified}. Otherwise, a creature that fails the save begins to turn to stone and is {@condition restrained}. The {@condition restrained} creature must repeat the saving throw at the end of its next turn, becoming {@condition petrified} on a failure or ending the effect on a success. The petrification lasts until the creature is freed by the {@spell greater restoration} spell or other magic.",
-						"Unless {@quickref Surprise|PHB|3|0|surprised}, a creature can avert its eyes to avoid the saving throw at the start of its turn. If the creature does so, it can't see Marlos until the start of its next turn, when it can decide to avert its eyes again. If the creature looks at Marlos in the meantime, it must immediately make the save.",
+						"Unless {@status surprised}, a creature can avert its eyes to avoid the saving throw at the start of its turn. If the creature does so, it can't see Marlos until the start of its next turn, when it can decide to avert its eyes again. If the creature looks at Marlos in the meantime, it must immediately make the save.",
 						"If Marlos sees himself reflected on a polished surface within 30 feet of him and in an area of bright light, Marlos is, due to his curse, affected by his own gaze."
 					]
 				}

data/bestiary/bestiary-ps-x.json

@@ -1307,6 +1307,11 @@
 					]
 				}
 			},
+			"miscTags": [
+				"DIS",
+				"MLW",
+				"MW"
+			],
 			"hasToken": true,
 			"hasFluff": true,
 			"hasFluffImages": true

data/bestiary/bestiary-scc.json

@@ -825,6 +825,7 @@
 				"Y"
 			],
 			"miscTags": [
+				"CUR",
 				"RCH"
 			],
 			"conditionInflict": [

data/bestiary/bestiary-tce.json

@@ -2426,7 +2426,7 @@
 				{
 					"name": "Vigilant",
 					"entries": [
-						"The defender can't be {@quickref Surprise|PHB|3|0|surprised}."
+						"The defender can't be {@status surprised}."
 					]
 				}
 			],

data/bestiary/bestiary-tdcsr.json

@@ -3741,6 +3741,9 @@
 			"resist": [
 				"poison"
 			],
+			"conditionImmune": [
+				"disease"
+			],
 			"languages": [
 				"Common",
 				"Dwarvish"

data/bestiary/bestiary-tftyp.json

@@ -605,6 +605,7 @@
 				"P"
 			],
 			"miscTags": [
+				"CUR",
 				"MLW",
 				"MW",
 				"RCH"
@@ -2576,6 +2577,7 @@
 				"P"
 			],
 			"miscTags": [
+				"DIS",
 				"MW"
 			],
 			"savingThrowForced": [
@@ -3808,7 +3810,7 @@
 				{
 					"name": "Ambusher",
 					"entries": [
-						"In the first round of a combat, the doppelganger has advantage on attack rolls against any creature it has {@quickref Surprise|PHB|3|0|surprised}."
+						"In the first round of a combat, the doppelganger has advantage on attack rolls against any creature it has {@status surprised}."
 					]
 				},
 				{
@@ -5694,6 +5696,7 @@
 				"CW"
 			],
 			"miscTags": [
+				"CUR",
 				"MLW",
 				"MW",
 				"RW",

data/bestiary/bestiary-toa.json

@@ -304,6 +304,7 @@
 				"CW"
 			],
 			"miscTags": [
+				"CUR",
 				"MLW",
 				"MW"
 			],
@@ -1461,7 +1462,7 @@
 				{
 					"name": "Assassinate",
 					"entries": [
-						"During his first turn, Bag of Nails has advantage on attack rolls against any creature that hasn't taken a turn. Any hit Bag of Nails scores against a {@quickref Surprise|PHB|3|0|surprised} creature is a critical hit."
+						"During his first turn, Bag of Nails has advantage on attack rolls against any creature that hasn't taken a turn. Any hit Bag of Nails scores against a {@status surprised} creature is a critical hit."
 					]
 				},
 				{
@@ -1883,6 +1884,9 @@
 				"medicine": "+6"
 			},
 			"passive": 13,
+			"conditionImmune": [
+				"disease"
+			],
 			"languages": [
 				"understands Common but can't speak"
 			],

data/bestiary/bestiary-tob1-2023.json

@@ -4334,6 +4334,7 @@
 			],
 			"miscTags": [
 				"AOE",
+				"DIS",
 				"MW"
 			],
 			"conditionInflict": [
@@ -5322,6 +5323,7 @@
 				"P"
 			],
 			"miscTags": [
+				"DIS",
 				"MW",
 				"RCH"
 			],
@@ -8481,6 +8483,7 @@
 				"S"
 			],
 			"miscTags": [
+				"DIS",
 				"MW"
 			],
 			"savingThrowForced": [
@@ -8824,6 +8827,7 @@
 			],
 			"miscTags": [
 				"AOE",
+				"DIS",
 				"MW"
 			],
 			"conditionInflict": [
@@ -14129,6 +14133,7 @@
 				"S"
 			],
 			"miscTags": [
+				"DIS",
 				"MLW",
 				"MW"
 			],
@@ -16181,6 +16186,7 @@
 			],
 			"miscTags": [
 				"AOE",
+				"DIS",
 				"MW",
 				"RCH"
 			],
@@ -17741,6 +17747,7 @@
 				"P"
 			],
 			"miscTags": [
+				"DIS",
 				"MW"
 			],
 			"conditionInflict": [
@@ -24958,6 +24965,7 @@
 				"O"
 			],
 			"miscTags": [
+				"CUR",
 				"MLW",
 				"MW"
 			],
@@ -28356,6 +28364,7 @@
 				"S"
 			],
 			"miscTags": [
+				"DIS",
 				"MW",
 				"RW"
 			],
@@ -28682,6 +28691,7 @@
 				"S"
 			],
 			"miscTags": [
+				"DIS",
 				"MLW",
 				"MW",
 				"RCH",
@@ -31264,6 +31274,9 @@
 			"attachedItems": [
 				"club|phb"
 			],
+			"traitTags": [
+				"Mimicry"
+			],
 			"senseTags": [
 				"D"
 			],
@@ -31811,6 +31824,7 @@
 				"S"
 			],
 			"miscTags": [
+				"DIS",
 				"MW",
 				"RCH"
 			],
@@ -34440,6 +34454,7 @@
 			],
 			"miscTags": [
 				"AOE",
+				"DIS",
 				"MW"
 			],
 			"savingThrowForced": [
@@ -34887,6 +34902,7 @@
 				"O"
 			],
 			"miscTags": [
+				"CUR",
 				"MW"
 			],
 			"conditionInflict": [
@@ -37263,6 +37279,7 @@
 				"Y"
 			],
 			"miscTags": [
+				"DIS",
 				"MW",
 				"RCH"
 			],
@@ -41027,6 +41044,7 @@
 				"P"
 			],
 			"miscTags": [
+				"DIS",
 				"MW"
 			],
 			"savingThrowForced": [
@@ -41704,7 +41722,8 @@
 				"arctic"
 			],
 			"traitTags": [
-				"Magic Resistance"
+				"Magic Resistance",
+				"Mimicry"
 			],
 			"senseTags": [
 				"SD"
@@ -41831,6 +41850,9 @@
 				"longbow|phb",
 				"rapier|phb"
 			],
+			"traitTags": [
+				"Mimicry"
+			],
 			"senseTags": [
 				"SD"
 			],
@@ -41973,6 +41995,9 @@
 			"attachedItems": [
 				"longbow|phb"
 			],
+			"traitTags": [
+				"Mimicry"
+			],
 			"senseTags": [
 				"SD"
 			],
@@ -43508,6 +43533,7 @@
 				"N"
 			],
 			"miscTags": [
+				"DIS",
 				"MW"
 			],
 			"conditionInflict": [
@@ -43965,6 +43991,7 @@
 			],
 			"miscTags": [
 				"AOE",
+				"DIS",
 				"MW"
 			],
 			"conditionInflict": [
@@ -44413,7 +44440,8 @@
 				"desert"
 			],
 			"traitTags": [
-				"Magic Resistance"
+				"Magic Resistance",
+				"Mimicry"
 			],
 			"senseTags": [
 				"SD"
@@ -44847,6 +44875,7 @@
 			],
 			"miscTags": [
 				"AOE",
+				"CUR",
 				"MW"
 			],
 			"conditionInflict": [
@@ -50797,6 +50826,9 @@
 				"planar",
 				"urban"
 			],
+			"traitTags": [
+				"Mimicry"
+			],
 			"senseTags": [
 				"D"
 			],
@@ -53347,6 +53379,7 @@
 				"S"
 			],
 			"miscTags": [
+				"DIS",
 				"MLW",
 				"MW"
 			],
@@ -53545,7 +53578,8 @@
 				"urban"
 			],
 			"traitTags": [
-				"Amorphous"
+				"Amorphous",
+				"Mimicry"
 			],
 			"senseTags": [
 				"B"
@@ -54449,6 +54483,7 @@
 				"N"
 			],
 			"miscTags": [
+				"CUR",
 				"MW"
 			],
 			"conditionInflict": [
@@ -55116,6 +55151,7 @@
 			],
 			"miscTags": [
 				"AOE",
+				"CUR",
 				"MW"
 			],
 			"conditionInflict": [
@@ -55687,6 +55723,7 @@
 				"S"
 			],
 			"miscTags": [
+				"DIS",
 				"MW",
 				"RCH"
 			],
@@ -57078,6 +57115,7 @@
 			],
 			"miscTags": [
 				"AOE",
+				"DIS",
 				"MW"
 			],
 			"savingThrowForced": [
@@ -57591,6 +57629,7 @@
 				"N"
 			],
 			"miscTags": [
+				"DIS",
 				"MW"
 			],
 			"conditionInflict": [

data/bestiary/bestiary-veor.json

@@ -1573,6 +1573,7 @@
 				"Y"
 			],
 			"miscTags": [
+				"CUR",
 				"MW"
 			],
 			"conditionInflict": [

data/bestiary/bestiary-vgm.json

@@ -3522,7 +3522,7 @@
 					"name": "Death Gaze",
 					"entries": [
 						"When a creature that can see the bodak's eyes starts its turn within 30 feet of the bodak, the bodak can force it to make a {@dc 13} Constitution saving throw if the bodak isn't {@condition incapacitated} and can see the creature. If the saving throw fails by 5 or more, the creature is reduced to 0 hit points, unless it is immune to the {@condition frightened} condition. Otherwise, a creature takes 16 ({@damage 3d10}) psychic damage on a failed save.",
-						"Unless {@quickref Surprise|PHB|3|0|surprised}, a creature can avert its eyes to avoid the saving throw at the start of its turn. If the creature does so, it has disadvantage on attack rolls against the bodak until the start of its next turn. If the creature looks at the bodak in the meantime, it must immediately make the saving throw."
+						"Unless {@status surprised}, a creature can avert its eyes to avoid the saving throw at the start of its turn. If the creature does so, it has disadvantage on attack rolls against the bodak until the start of its next turn. If the creature looks at the bodak in the meantime, it must immediately make the saving throw."
 					]
 				},
 				{
@@ -8460,7 +8460,8 @@
 				"path": "bestiary/gazer.mp3"
 			},
 			"traitTags": [
-				"Aggressive"
+				"Aggressive",
+				"Mimicry"
 			],
 			"senseTags": [
 				"D"
@@ -12265,6 +12266,7 @@
 			},
 			"traitTags": [
 				"Keen Senses",
+				"Mimicry",
 				"Rampage"
 			],
 			"senseTags": [
@@ -15107,7 +15109,7 @@
 				{
 					"name": "Slayer",
 					"entries": [
-						"In the first round of a combat, the orc has advantage on attack rolls against any creature that hasn't taken a turn yet. If the orc hits a creature that round who was {@quickref Surprise|PHB|3|0|surprised}, the hit is automatically a critical hit."
+						"In the first round of a combat, the orc has advantage on attack rolls against any creature that hasn't taken a turn yet. If the orc hits a creature that round who was {@status surprised}, the hit is automatically a critical hit."
 					]
 				}
 			],
@@ -16323,7 +16325,7 @@
 				{
 					"name": "Ambusher",
 					"entries": [
-						"In the first round of a combat, the slithering tracker has advantage on attack rolls against any creature it {@quickref Surprise|PHB|3|0|surprised}."
+						"In the first round of a combat, the slithering tracker has advantage on attack rolls against any creature it {@status surprised}."
 					]
 				},
 				{
@@ -16525,6 +16527,7 @@
 				"S"
 			],
 			"miscTags": [
+				"DIS",
 				"MW"
 			],
 			"savingThrowForced": [
@@ -17244,6 +17247,7 @@
 				"P"
 			],
 			"miscTags": [
+				"DIS",
 				"MW"
 			],
 			"hasToken": true,
@@ -18318,6 +18322,7 @@
 				"P"
 			],
 			"miscTags": [
+				"CUR",
 				"MW"
 			],
 			"conditionInflict": [

data/bestiary/bestiary-vrgr.json

@@ -486,6 +486,7 @@
 			],
 			"miscTags": [
 				"AOE",
+				"DIS",
 				"MW"
 			],
 			"conditionInflict": [
@@ -578,6 +579,7 @@
 				"P"
 			],
 			"miscTags": [
+				"CUR",
 				"MW"
 			],
 			"conditionInflict": [
@@ -2408,6 +2410,7 @@
 				"S"
 			],
 			"miscTags": [
+				"CUR",
 				"MLW",
 				"MW"
 			],
@@ -3705,6 +3708,7 @@
 				"P"
 			],
 			"miscTags": [
+				"DIS",
 				"MW"
 			],
 			"conditionInflict": [
@@ -4536,6 +4540,7 @@
 				"shortsword|phb"
 			],
 			"traitTags": [
+				"Mimicry",
 				"Regeneration",
 				"Shapechanger"
 			],
@@ -4550,6 +4555,7 @@
 				"P"
 			],
 			"miscTags": [
+				"CUR",
 				"MLW",
 				"MW",
 				"RNG",

data/bestiary/bestiary-wbtw.json

@@ -148,6 +148,7 @@
 				"P"
 			],
 			"miscTags": [
+				"CUR",
 				"MLW",
 				"MW",
 				"RW",
@@ -866,6 +867,9 @@
 					]
 				}
 			],
+			"traitTags": [
+				"Mimicry"
+			],
 			"senseTags": [
 				"T"
 			],
@@ -1334,7 +1338,7 @@
 				{
 					"name": "Uncanny Awareness",
 					"entries": [
-						"Endelyn can't be {@quickref Surprise|PHB|3|0|surprised}."
+						"Endelyn can't be {@status surprised}."
 					]
 				}
 			],
@@ -3070,6 +3074,9 @@
 			"attachedItems": [
 				"dagger|phb"
 			],
+			"traitTags": [
+				"Mimicry"
+			],
 			"actionTags": [
 				"Multiattack"
 			],
@@ -5167,6 +5174,9 @@
 					]
 				}
 			],
+			"traitTags": [
+				"Mimicry"
+			],
 			"senseTags": [
 				"T"
 			],

data/bestiary/bestiary-wdh.json

@@ -2343,7 +2343,8 @@
 			"conditionImmune": [
 				"charmed",
 				"frightened",
-				"poisoned"
+				"poisoned",
+				"disease"
 			],
 			"languages": [
 				"all spoken languages"
@@ -7179,6 +7180,7 @@
 				"P"
 			],
 			"miscTags": [
+				"CUR",
 				"MLW",
 				"MW",
 				"RNG",
@@ -8444,7 +8446,7 @@
 				{
 					"name": "Assassinate",
 					"entries": [
-						"During its first turn, Urstul has advantage on attack rolls against any creature that hasn't taken a turn. Any hit Urstul scores against a {@quickref Surprise|PHB|3|0|surprised} creature is a critical hit."
+						"During its first turn, Urstul has advantage on attack rolls against any creature that hasn't taken a turn. Any hit Urstul scores against a {@status surprised} creature is a critical hit."
 					]
 				},
 				{

data/bestiary/bestiary-wdmm.json

@@ -5584,6 +5584,7 @@
 				"S"
 			],
 			"miscTags": [
+				"CUR",
 				"MLW",
 				"MW",
 				"RNG",

data/bestiary/fluff-bestiary-ggr.json

@@ -609,7 +609,7 @@
 												],
 												[
 													"5",
-													"Heightened Awareness. The krasis can't be {@quickref Surprise|PHB|3|0|surprised}, as a result of having sensitive barbels like a catfish, stereoscopic vision like a chameleon, a tongue like a snake, eye stalks like a lobster, or an array of several eyes."
+													"Heightened Awareness. The krasis can't be {@status surprised}, as a result of having sensitive barbels like a catfish, stereoscopic vision like a chameleon, a tongue like a snake, eye stalks like a lobster, or an array of several eyes."
 												],
 												[
 													"6",
@@ -742,7 +742,7 @@
 												],
 												[
 													"5",
-													"Heightened Awareness. The krasis can't be {@quickref Surprise|PHB|3|0|surprised}, as a result of having sensitive barbels like a catfish, stereoscopic vision like a chameleon, a tongue like a snake, eye stalks like a lobster, or an array of several eyes."
+													"Heightened Awareness. The krasis can't be {@status surprised}, as a result of having sensitive barbels like a catfish, stereoscopic vision like a chameleon, a tongue like a snake, eye stalks like a lobster, or an array of several eyes."
 												],
 												[
 													"6",
@@ -875,7 +875,7 @@
 												],
 												[
 													"5",
-													"Heightened Awareness. The krasis can't be {@quickref Surprise|PHB|3|0|surprised}, as a result of having sensitive barbels like a catfish, stereoscopic vision like a chameleon, a tongue like a snake, eye stalks like a lobster, or an array of several eyes."
+													"Heightened Awareness. The krasis can't be {@status surprised}, as a result of having sensitive barbels like a catfish, stereoscopic vision like a chameleon, a tongue like a snake, eye stalks like a lobster, or an array of several eyes."
 												],
 												[
 													"6",

data/bestiary/fluff-index.json

@@ -65,6 +65,7 @@
 	"PSX": "fluff-bestiary-ps-x.json",
 	"PSZ": "fluff-bestiary-ps-z.json",
 	"PotA": "fluff-bestiary-pota.json",
+	"QftIS": "fluff-bestiary-qftis.json",
 	"RMBRE": "fluff-bestiary-rmbre.json",
 	"RoT": "fluff-bestiary-rot.json",
 	"SADS": "fluff-bestiary-sads.json",

data/bestiary/index.json

@@ -76,6 +76,7 @@
 	"PSZ": "bestiary-ps-z.json",
 	"PHB": "bestiary-phb.json",
 	"PotA": "bestiary-pota.json",
+	"QftIS": "bestiary-qftis.json",
 	"RMBRE": "bestiary-rmbre.json",
 	"RoT": "bestiary-rot.json",
 	"RtG": "bestiary-rtg.json",

data/bestiary/legendarygroups.json

@@ -2799,6 +2799,49 @@
 				}
 			]
 		},
+		{
+			"name": "Froghemoth Elder",
+			"source": "QftIS",
+			"lairActions": [
+				"On initiative count 20 (losing initiative ties), the froghemoth can take one of the following lair actions; the froghemoth can't take the same lair action two rounds in a row:",
+				{
+					"type": "list",
+					"style": "list-hang-notitle",
+					"items": [
+						{
+							"type": "item",
+							"name": "Croak",
+							"entry": "The froghemoth lets out an ear-splitting croak. Each creature within 30 feet of it must make a DC 18 Wisdom saving throw. On a failed save, the creature has the deafened and frightened conditions until the end of its next turn."
+						},
+						{
+							"type": "item",
+							"name": "Hypnotic Visions",
+							"entry": "One creature of the froghemoth's choice within 60 feet of it must make a DC 15 Wisdom saving throw. On a failed save, the target is mesmerized by otherworldly visions and has the charmed condition until the end of the target's next turn. While charmed in this way, the target has the incapacitated condition, and its speed is 0."
+						}
+					]
+				}
+			],
+			"regionalEffects": [
+				"The region within 1 mile of a froghemoth elder's lair is altered by the froghemoth's unearthly presence, creating one or more of the following effects:",
+				{
+					"type": "list",
+					"style": "list-hang-notitle",
+					"items": [
+						{
+							"type": "item",
+							"name": "Alien Flora",
+							"entry": "Strange, invasive plants with bright colors and odd patterns sprout up around the lair."
+						},
+						{
+							"type": "item",
+							"name": "Mutations",
+							"entry": "Wildlife encountered near the lair often sport mutations, such as extra limbs or eyes, glowing secretions, or vestigial tentacles."
+						}
+					]
+				},
+				"If the froghemoth elder dies, these effects fade over the course of {@dice 1d10} days."
+			]
+		},
 		{
 			"name": "Gar Shatterkeel",
 			"source": "LR",
@@ -4784,6 +4827,59 @@
 				}
 			]
 		},
+		{
+			"name": "Nafas",
+			"source": "QftIS",
+			"lairActions": [
+				"On initiative count 20 (losing initiative ties), Nafas can take one of the following lair actions; he can't take the same lair action two rounds in a row:",
+				{
+					"type": "list",
+					"style": "list-hang-notitle",
+					"items": [
+						{
+							"type": "item",
+							"name": "Downdraft",
+							"entry": "Nafas targets one creature he can see within 120 feet of himself. A downward current of air surrounds the target, reducing its flying speed (if any) to 0 feet until the end of its next turn, and the target must succeed on a DC 21 Strength saving throw or have the prone condition."
+						},
+						{
+							"type": "item",
+							"name": "Lightning Strike",
+							"entry": "A bolt of lightning strikes a point Nafas can see within 120 feet of him. Each creature within 10 feet of that point must succeed on a DC 21 Dexterity saving throw or take 16 ({@dice 3d10}) lightning damage."
+						},
+						{
+							"type": "item",
+							"name": "Stardust",
+							"entry": "Nafas creates a 20-foot-radius sphere of multiversal dust centered on a point anywhere in his lair. The sphere spreads around corners, and its area is heavily obscured. The dust lasts until Nafas disperses it (no action required) or uses this lair action again, and it can't be dispersed by wind."
+						}
+					]
+				}
+			],
+			"regionalEffects": [
+				"The region containing Nafas's lair is warped by his magic, creating one or more of the following effects:",
+				{
+					"type": "list",
+					"style": "list-hang-notitle",
+					"items": [
+						{
+							"type": "item",
+							"name": "Mirages",
+							"entry": "Sapient creatures within 3 miles of the lair frequently see illusions of their hearts' desires, be they fame, fortune, or long-departed comrades. These mirages don't hold up to physical inspection and vanish after a brief interaction."
+						},
+						{
+							"type": "item",
+							"name": "Safe Descents",
+							"entry": "Within 3 miles of the lair, winds buoy creatures that fall, ushering them safely to the nearest staircase. Such creatures descend at a rate of 60 feet per round and take no damage from falling. Aberrations, Fiends, Undead, and creatures that fall due to Nafas's or his allies' actions don't gain this benefit, instead falling as normal."
+						},
+						{
+							"type": "item",
+							"name": "Wishful Winds",
+							"entry": "The wishes of creatures across the multiverse, including those within the Infinite Staircase, can be heard within 3 miles of the lair as fleeting voices carried on gentle breezes."
+						}
+					]
+				},
+				"If Nafas is destroyed, all these effects end immediately, resuming when he either gains a new body or is replaced by the creature that slays him (see the Last Wish trait in Nafas's stat block)."
+			]
+		},
 		{
 			"name": "Night Hag",
 			"source": "MM",
@@ -6238,6 +6334,68 @@
 				}
 			]
 		},
+		{
+			"name": "The Gardener",
+			"source": "QftIS",
+			"lairActions": [
+				"On initiative count 20 (losing initiative ties), the Gardener can take one of the following lair actions; they can't take the same lair action two rounds in a row:",
+				{
+					"type": "list",
+					"style": "list-hang-notitle",
+					"items": [
+						{
+							"type": "item",
+							"name": "Plant Walk",
+							"entry": "The Gardener moves up to their speed into the space of a Medium or larger plant within the lair, then teleports to an unoccupied space within 5 feet of any other Medium or larger plant within the lair."
+						},
+						{
+							"type": "item",
+							"name": "Vine Wall",
+							"entry": "A wall of grasping vines appears on the ground within 120 feet of the Gardener. The wall is up to 60 feet long, 10 feet high, and 5 feet thick, and it blocks line of sight. When the wall appears, each creature in its area must succeed on a DC 15 Dexterity saving throw or have the grappled condition (escape DC 15). A creature must make this saving throw when it starts its turn inside the wall or when it enters the wall for the first time on a turn. The wall's area is difficult terrain for a creature that isn't grappled. The wall sinks back into the ground, freeing all creatures grappled by it, when the Gardener uses this lair action again or when the Gardener dies."
+						}
+					]
+				}
+			],
+			"regionalEffects": [
+				"The Eternal Garden has the following features:",
+				{
+					"type": "list",
+					"style": "list-hang-notitle",
+					"items": [
+						{
+							"type": "item",
+							"name": "Boundary",
+							"entry": "At the border of the domain is a lightly obscuring mist, tinged with a sweet blossom scent and the colors of sunset. No matter how far a creature travels into the mist, the creature finds itself back where it entered the border, returning to the garden."
+						},
+						{
+							"type": "item",
+							"name": "Eternal Summer",
+							"entry": "The climate in the garden is a perpetual, lovely summer, but weather conditions reflect the emotional tone of creatures in the garden. In times of danger, thunderstorms shake the sky. During times of melancholy or mourning, chill rain patters throughout the domain."
+						},
+						{
+							"type": "item",
+							"name": "Gardener's Vigil",
+							"entry": "The Gardener senses when anything dies in the garden. If a creature dies in the garden, roll a {@dice d6}. On a 1, the Gardener appears on initiative count 20 of the next round (losing initiative ties) to investigate."
+						},
+						{
+							"type": "item",
+							"name": "Lighting",
+							"entry": "The sky above the garden is a perpetual twilight range of orange, red, pink, and yellow hues with no visible sun, moon, or stars. During daylight hours, it emits bright light, but at night, it never reaches full darkness, becoming dim light instead."
+						},
+						{
+							"type": "item",
+							"name": "Memory Loss",
+							"entry": "Unless otherwise stated, a creature that leaves the domain must make a DC 10 Wisdom saving throw; Fey creatures and creatures with the Fey Ancestry trait automatically succeed on the saving throw. On a failed save, the creature remembers nothing of its time in the garden or the Palace of Spires. On a successful save, the creature's memories remain intact, but they're hazy and dreamlike. A Remove Curse or Greater Restoration spell restores the creature's memories."
+						},
+						{
+							"type": "item",
+							"name": "Time",
+							"entry": "Time passes slower in the Eternal Garden relative to other planes. For each day spent in the garden, one year passes on the Material Plane."
+						}
+					]
+				}
+			]
+		},
 		{
 			"name": "Thessalkraken",
 			"source": "IMR",
@@ -6896,6 +7054,59 @@
 				}
 			]
 		},
+		{
+			"name": "Zargon the Returner",
+			"source": "QftIS",
+			"lairActions": [
+				"On initiative count 20 (losing initiative ties), Zargon can take one of the following lair actions; it can't take the same lair action two rounds in a row:",
+				{
+					"type": "list",
+					"style": "list-hang-notitle",
+					"items": [
+						{
+							"type": "item",
+							"name": "Dissolution",
+							"entry": "Zargon dissolves into a glob of slime, seeps to an unoccupied space anywhere in the lair without provoking opportunity attacks, then re-forms."
+						},
+						{
+							"type": "item",
+							"name": "Spell Breaker",
+							"entry": "Zargon targets up to two creatures it can see within the lair. All spells of 5th level or lower affecting the targets end."
+						},
+						{
+							"type": "item",
+							"name": "Sucking Slime",
+							"entry": "Zargon creates a 20-foot-radius puddle of slime on the ground centered on a point within the lair. The slime is difficult terrain, and each creature in that area when the slime appears has the grappled condition (escape DC 15). Aberrations and Oozes are unaffected by the slime. The slime lasts until Zargon dies or until it uses this lair action again."
+						}
+					]
+				}
+			],
+			"regionalEffects": [
+				"The region containing Zargon's lair is warped by Zargon's unnatural presence, creating one or more of the following effects:",
+				{
+					"type": "list",
+					"style": "list-hang-notitle",
+					"items": [
+						{
+							"type": "item",
+							"name": "Arcane Enervation",
+							"entry": "Enemies of Zargon within 1 mile of the lair have disadvantage on saving throws made to maintain concentration."
+						},
+						{
+							"type": "item",
+							"name": "Corrupted Water",
+							"entry": "Rain and water sources within 1 mile of the lair are tainted. A creature that drinks the water must succeed on a DC 15 Constitution saving throw or have the poisoned condition until it finishes a long rest."
+						},
+						{
+							"type": "item",
+							"name": "Eerie Weather",
+							"entry": "The area within 10 miles of the lair experiences strange weather patterns that defy the region's typical climate."
+						}
+					]
+				},
+				"If Zargon dies, these effects fade over the course of {@dice 1d10} days."
+			]
+		},
 		{
 			"name": "Zariel",
 			"source": "CoA",

data/bestiary/template.json

@@ -2885,6 +2885,12 @@
 								]
 							}
 						]
+					},
+					"miscTags": {
+						"mode": "appendIfNotExistsArr",
+						"items": [
+							"CUR"
+						]
 					}
 				}
 			}