Merge branch 'master' into Arcadia21

adventure/Adult Swim; Tigtone & The Never-Stopping Prophecy.json

@@ -27,8 +27,8 @@
 		},
 		"status": "ready",
 		"dateAdded": 1706971134,
-		"dateLastModified": 1715034260,
-		"_dateLastModifiedHash": "46b094a09c"
+		"dateLastModified": 1726352683,
+		"_dateLastModifiedHash": "00b512709a"
 	},
 	"item": [
 		{
@@ -93,7 +93,7 @@
 			"name": "Globe of Proof",
 			"source": "TTNSP",
 			"page": 10,
-			"type": "$A",
+			"type": "$A|DMG",
 			"rarity": "unknown (magic)",
 			"value": 200,
 			"entries": [
@@ -157,7 +157,7 @@
 			"name": "Oracle Doll",
 			"source": "TTNSP",
 			"page": 10,
-			"type": "$",
+			"type": "$|DMG",
 			"rarity": "unknown (magic)",
 			"value": 60,
 			"entries": [
@@ -316,7 +316,7 @@
 			"name": "Relax Wax",
 			"source": "TTNSP",
 			"page": 10,
-			"type": "$",
+			"type": "$|DMG",
 			"rarity": "none",
 			"value": 5,
 			"entries": [
@@ -412,7 +412,7 @@
 			"name": "Stationery Statuary",
 			"source": "TTNSP",
 			"page": 10,
-			"type": "$A",
+			"type": "$A|DMG",
 			"rarity": "none",
 			"weight": 5,
 			"value": 30,
@@ -521,7 +521,7 @@
 	"magicvariant": [
 		{
 			"name": "Sword that Cuts Nothing",
-			"type": "GV",
+			"type": "GV|DMG",
 			"requires": [
 				{
 					"sword": true

adventure/Arcanum Worlds; Odyssey of the Dragonlords.json

@@ -32,8 +32,8 @@
 		],
 		"status": "wip",
 		"dateAdded": 1704124655,
-		"dateLastModified": 1715034260,
-		"_dateLastModifiedHash": "bb28d2ebc1"
+		"dateLastModified": 1726352683,
+		"_dateLastModifiedHash": "9d4f7f3904"
 	},
 	"subclass": [
 		{
@@ -6164,7 +6164,7 @@
 	"magicvariant": [
 		{
 			"name": "Dragon Slayer",
-			"type": "GV",
+			"type": "GV|DMG",
 			"requires": [
 				{
 					"type": "M"
@@ -6185,7 +6185,7 @@
 		},
 		{
 			"name": "Weapon of Fire",
-			"type": "GV",
+			"type": "GV|DMG",
 			"requires": [
 				{
 					"type": "M"

adventure/D&D Duet; Third Times the Charm.json

@@ -19,8 +19,8 @@
 			}
 		],
 		"dateAdded": 0,
-		"dateLastModified": 1705266948,
-		"_dateLastModifiedHash": "7a94daecb6"
+		"dateLastModified": 1726352683,
+		"_dateLastModifiedHash": "eb57fb3c57"
 	},
 	"adventure": [
 		{
@@ -1143,7 +1143,7 @@
 			"name": "Ring of Mage Hand",
 			"source": "ThirdTimesTheCharm",
 			"page": 23,
-			"type": "RG",
+			"type": "RG|DMG",
 			"rarity": "uncommon",
 			"wondrous": true,
 			"reqAttune": false,

adventure/JVC Parry; Call from the Deep.json

@@ -22,8 +22,8 @@
 		},
 		"status": "ready",
 		"dateAdded": 1579711362,
-		"dateLastModified": 1715034260,
-		"_dateLastModifiedHash": "5225c546be"
+		"dateLastModified": 1726352683,
+		"_dateLastModifiedHash": "c72b2bf49d"
 	},
 	"adventure": [
 		{
@@ -21210,7 +21210,7 @@
 			"name": "Cursed Ring of Shooting Stars",
 			"source": "CallfromtheDeep",
 			"page": 147,
-			"type": "RG",
+			"type": "RG|DMG",
 			"tier": "major",
 			"rarity": "very rare",
 			"reqAttune": "outdoors at night",
@@ -21294,7 +21294,7 @@
 			"name": "Cursed Gold Coin",
 			"source": "CallfromtheDeep",
 			"page": 138,
-			"type": "$",
+			"type": "$|DMG",
 			"value": 100,
 			"rarity": "unknown (magic)",
 			"entries": [
@@ -21500,7 +21500,7 @@
 			"name": "Lhammaruntosz's Wand of Fireballs",
 			"source": "CallfromtheDeep",
 			"page": 110,
-			"type": "WD",
+			"type": "WD|DMG",
 			"tier": "major",
 			"rarity": "rare",
 			"reqAttune": "by a spellcaster",
@@ -22592,7 +22592,7 @@
 		},
 		{
 			"name": "Wand of Diminution",
-			"type": "WD",
+			"type": "WD|DMG",
 			"tier": "major",
 			"rarity": "uncommon",
 			"source": "CallfromtheDeep",
@@ -22613,7 +22613,7 @@
 		},
 		{
 			"name": "Wand of Stone Shape",
-			"type": "WD",
+			"type": "WD|DMG",
 			"tier": "major",
 			"rarity": "uncommon",
 			"reqAttune": "by a spellcaster",
@@ -48723,7 +48723,7 @@
 	"magicvariant": [
 		{
 			"name": "+1 Adamantine Weapon",
-			"type": "GV",
+			"type": "GV|DMG",
 			"entries": [
 				"You have a +1 bonus to attack and damage rolls made with this magic weapon.",
 				"Melee weapons made of or coated with adamantine are unusually effective when used to break objects. Whenever an adamantine weapon hits an object, the hit is a critical hit.",
@@ -48752,7 +48752,7 @@
 		},
 		{
 			"name": "+3 Adamantine Weapon",
-			"type": "GV",
+			"type": "GV|DMG",
 			"entries": [
 				"You have a +3 bonus to attack and damage rolls made with this magic weapon.",
 				"Melee weapons made of or coated with adamantine are unusually effective when used to break objects. Whenever an adamantine weapon hits an object, the hit is a critical hit.",
@@ -48781,7 +48781,7 @@
 		},
 		{
 			"name": "Black Ice Armour",
-			"type": "GV",
+			"type": "GV|DMG",
 			"entries": [
 				"Sourced from Icewind Dale, black ice is a substance formed from the dust of Crenshinibon, the crystal shard, a source of supreme evil. When Crenshinibon was destroyed, the remnants of the crystal were flung far and wide, tainting the nearby ice, causing it to become metallic and corrupting. Black ice is mined by the dwarves of Icewind Dale, who are oblivious, or choose it ignore, its maddening properties.",
 				"Armour made of black ice confers resistance to cold damage. Any character in possession of an item forged of black ice must make a DC 12 Wisdom saving throw each dawn. On a failed save, the character develops an {@table indefinite madness|dmg} (see \"{@variantrule Madness}\" in chapter 8 of the {@i Dungeon Master's Guide})."
@@ -48810,7 +48810,7 @@
 		},
 		{
 			"name": "Black Ice Weapon",
-			"type": "GV",
+			"type": "GV|DMG",
 			"entries": [
 				"Sourced from Icewind Dale, black ice is a substance formed from the dust of Crenshinibon, the crystal shard, a source of supreme evil. When Crenshinibon was destroyed, the remnants of the crystal were flung far and wide, tainting the nearby ice, causing it to become metallic and corrupting. Black ice is mined by the dwarves of Icewind Dale, who are oblivious, or choose it ignore, its maddening properties.",
 				"A weapon made of black ice deals an extra {@damage 1d6} damage on a hit. Any character in possession of an item forged of black ice must make a DC 12 Wisdom saving throw each dawn. On a failed save, the character develops an {@table indefinite madness|dmg} (see \"{@variantrule Madness}\" in chapter 8 of the {@i Dungeon Master's Guide})."
@@ -48836,7 +48836,7 @@
 		},
 		{
 			"name": "+1 Black Ice Weapon",
-			"type": "GV",
+			"type": "GV|DMG",
 			"entries": [
 				"Sourced from Icewind Dale, black ice is a substance formed from the dust of Crenshinibon, the crystal shard, a source of supreme evil. When Crenshinibon was destroyed, the remnants of the crystal were flung far and wide, tainting the nearby ice, causing it to become metallic and corrupting. Black ice is mined by the dwarves of Icewind Dale, who are oblivious, or choose it ignore, its maddening properties.",
 				"You have a +1 bonus to attack and damage rolls made with this magic weapon. A weapon made of black ice deals an extra {@damage 1d6} damage on a hit. Any character in possession of an item forged of black ice must make a DC 12 Wisdom saving throw each dawn. On a failed save, the character develops an {@table indefinite madness|dmg} (see \"{@variantrule Madness}\" in chapter 8 of the {@i Dungeon Master's Guide})."
@@ -48863,7 +48863,7 @@
 		},
 		{
 			"name": "Moonbow",
-			"type": "GV",
+			"type": "GV|DMG",
 			"requires": [
 				{
 					"name": "Shortbow"

adventure/Kobold Press; Book of Lairs.json

@@ -17,8 +17,8 @@
 			}
 		],
 		"dateAdded": 1557517754,
-		"dateLastModified": 1693666789,
-		"_dateLastModifiedHash": "8cd08c0989"
+		"dateLastModified": 1726352683,
+		"_dateLastModifiedHash": "eb0dcf058c"
 	},
 	"adventure": [
 		{
@@ -5282,7 +5282,7 @@
 	"item": [
 		{
 			"name": "Wand of Plant Destruction",
-			"type": "WD",
+			"type": "WD|DMG",
 			"weight": 1,
 			"rarity": "rare",
 			"reqAttune": true,

adventure/Kobold Press; Scarlet Citadel.json

@@ -38,8 +38,8 @@
 		],
 		"status": "ready",
 		"dateAdded": 1703673674,
-		"dateLastModified": 1715034260,
-		"_dateLastModifiedHash": "9e592a9922"
+		"dateLastModified": 1726352683,
+		"_dateLastModifiedHash": "242e026e6e"
 	},
 	"item": [
 		{
@@ -295,7 +295,7 @@
 			"name": "Bronze Cylinder",
 			"source": "KPSC",
 			"page": 86,
-			"type": "$",
+			"type": "$|DMG",
 			"rarity": "unknown (magic)",
 			"weight": 220,
 			"entries": [
@@ -307,7 +307,7 @@
 			"name": "Bronze Hook",
 			"source": "KPSC",
 			"page": 86,
-			"type": "$",
+			"type": "$|DMG",
 			"rarity": "unknown (magic)",
 			"entries": [
 				"A special bronze hook (which can be found in the fountain in Area 327) that's magically paired with the {@item bronze cylinder|KPSC}. When the hook is lowered to the cylinder, it automatically catches in the fish's open mouth so the cylinder can be hauled up with a rope.",
@@ -346,7 +346,7 @@
 			"name": "Chansar's Crown",
 			"source": "KPSC",
 			"page": 78,
-			"type": "$",
+			"type": "$|DMG",
 			"rarity": "unknown",
 			"value": 600000,
 			"entries": [
@@ -403,7 +403,7 @@
 			"name": "Earring of Protection",
 			"source": "KPSC",
 			"page": 107,
-			"type": "RG",
+			"type": "RG|DMG",
 			"tier": "major",
 			"rarity": "rare",
 			"reqAttune": true,
@@ -526,7 +526,7 @@
 			"name": "Gerhardt's Bargain",
 			"source": "KPSC",
 			"page": 188,
-			"type": "RG",
+			"type": "RG|DMG",
 			"rarity": "artifact",
 			"reqAttune": true,
 			"curse": true,
@@ -575,7 +575,7 @@
 			"name": "Golden Disk",
 			"source": "KPSC",
 			"page": 89,
-			"type": "$",
+			"type": "$|DMG",
 			"rarity": "unknown (magic)",
 			"entries": [
 				"A 5-inch-diameter golden disk embossed with a Dwarvish rune that means \"safe entrance.\" A character carrying this disk can unlock the doors to the tombs on this level automatically and can open them safely without setting off any {@spell glyph of warding}."
@@ -603,7 +603,7 @@
 			"name": "Hammer of Thor",
 			"source": "KPSC",
 			"page": 83,
-			"type": "$",
+			"type": "$|DMG",
 			"rarity": "unknown (magic)",
 			"entries": [
 				"A tiny representation of the hammer of Thor, about 5 inches long, rests atop the anvil. It's plated in the same gold as the anvil and appears to be part of it. If the gold plating is scraped away, the hammer comes free; it's a separate piece resting in a shallow indentation in the anvil and encased in the same gold plating.",
@@ -632,7 +632,7 @@
 			"name": "Incense Jar",
 			"source": "KPSC",
 			"page": 78,
-			"type": "$",
+			"type": "$|DMG",
 			"rarity": "unknown (magic)",
 			"entries": [
 				"Tucked behind the northern brazier is a ceramic jar containing peppercorns, juniper sprigs, dill, caraway seeds, powdered iron, and slivered rams' horn, all dry and crumbling."
@@ -674,7 +674,7 @@
 			"name": "Llagfel's Phylactery",
 			"source": "KPSC",
 			"page": 144,
-			"type": "$",
+			"type": "$|DMG",
 			"rarity": "unknown (magic)",
 			"entries": [
 				"{@creature Llagfel|KPSC|Llagfel's} phylactery, which is immune to damage, is hidden inside the statue. To find it, the statue must be tipped over to reveal a hollow space in its base. Inside the hollow is a mummified {@creature quipper|MM} with gold and silver accents sewn along its fins and gills and with aquamarine stones in its eye sockets."
@@ -797,7 +797,7 @@
 			"name": "Purple Amethyst Brooch",
 			"source": "KPSC",
 			"page": 67,
-			"type": "$",
+			"type": "$|DMG",
 			"rarity": "unknown",
 			"entries": [
 				"The amethyst brooch is significant on deeper levels of the citadel, where it indicates its wearer is a person of importance to {@creature Gellert the Gruesome|KPSC} and shouldn't be murdered without good reason. It is not, however, a guarantee of safe passage under all circumstances. Creatures on the lower levels understand symbols can be stolen and used by their enemies, and allowing the wrong person through just because they had a brooch is worse than not allowing the right person through because they didn't. For example, trollkin in the dwarven barracks (Level 3) won't defer to a character just because they have the brooch. It must be brandished as a sign of authority, and the wearer must behave as if they understand its significance. Otherwise, the trollkin assume the characters are murderers and thieves who should be dealt with as harshly as possible. The most likely way for characters to figure this out is by seeing leaders on lower levels wearing similar brooches."
@@ -807,7 +807,7 @@
 			"name": "Purple Worm Tooth",
 			"source": "KPSC",
 			"page": 136,
-			"type": "$",
+			"type": "$|DMG",
 			"rarity": "unknown (magic)",
 			"entries": [
 				"The only way to open the sarcophagus without divine aid is with the key, which is the enchanted tooth of a purple worm. As a reminder of her subservience to Vardesain (who finds liches useful but doesn't entirely trust them), {@creature Llagfel|KPSC} was commanded to wear the key always around her neck. Placing the enchanted tooth into the depression of the missing tooth in the carving breaks the {@spell arcane lock} and releases the {@creature shadow river lord|CCodex}."
@@ -841,7 +841,7 @@
 			"name": "Ring of Being Anchored in Time",
 			"source": "KPSC",
 			"page": 191,
-			"type": "RG",
+			"type": "RG|DMG",
 			"rarity": "rare",
 			"reqAttune": true,
 			"entries": [
@@ -875,7 +875,7 @@
 			"name": "Scar's Brooch",
 			"source": "KPSC",
 			"page": 44,
-			"type": "$",
+			"type": "$|DMG",
 			"rarity": "unknown",
 			"value": 40000,
 			"entries": [
@@ -914,7 +914,7 @@
 			"name": "Soapstone Carving",
 			"source": "KPSC",
 			"page": 82,
-			"type": "$A",
+			"type": "$A|DMG",
 			"rarity": "unknown (magic)",
 			"entries": [
 				"A beautiful soapstone carving of a horse's head. (Part of the key to Area 315.)"
@@ -1084,7 +1084,7 @@
 	"magicvariant": [
 		{
 			"name": "Weapon of Nightmares",
-			"type": "GV",
+			"type": "GV|DMG",
 			"requires": [
 				{
 					"type": "M"