From e8a046f99c371d4b626c8bc4860c08169dba1f06 Mon Sep 17 00:00:00 2001
From: Chris Jennewein <christopher.jennewein@gmail.com>
Date: Mon, 10 Feb 2020 11:56:41 -0700
Subject: [PATCH] feature: Validate counter in feature

- Fix Tome of Beasts monster type
- Update UA monster for consistency
---
 .../Sources/ThirdParty/TomeOfBeasts.xml       | 16 ++++++------
 .../2020-02-04_2020SubclassesPart2.xml        | 25 +++++++++++--------
 Utilities/compendium.xsd                      | 16 ++++++++++++
 3 files changed, 38 insertions(+), 19 deletions(-)

diff --git a/FightClub5eXML/Sources/ThirdParty/TomeOfBeasts.xml b/FightClub5eXML/Sources/ThirdParty/TomeOfBeasts.xml
index 55672df..df20bd8 100644
--- a/FightClub5eXML/Sources/ThirdParty/TomeOfBeasts.xml
+++ b/FightClub5eXML/Sources/ThirdParty/TomeOfBeasts.xml
@@ -20984,7 +20984,7 @@ whirlwind by using its action to repeat the saving throw; on a success, it moves
 	<monster>
 		<name>Bandit Lord</name>
 		<size>M</size>
-		<type>Humanoid (Any Race),tome of Beasts</type>
+		<type>humanoid (Any Race),tome of Beasts</type>
 		<alignment>any non-lawful</alignment>
 		<ac>16 (breastplate)</ac>
 		<hp>91 (14d8+28)</hp>
@@ -21035,7 +21035,7 @@ whirlwind by using its action to repeat the saving throw; on a success, it moves
 	<monster>		
 		<name>Black Knight Commander</name>
 		<size>M</size>
-		<type>Humanoid (Any Race),tome of Beasts</type>
+		<type>humanoid (Any Race),tome of Beasts</type>
 		<alignment>lawful evil</alignment>
 		<ac>18 (plate)</ac>
 		<hp>78 (12d8+24)</hp>
@@ -21088,7 +21088,7 @@ whirlwind by using its action to repeat the saving throw; on a success, it moves
 	<monster>
 		<name>City Watch Captian</name>
 		<size>M</size>
-		<type>Humanoid (Any Race),tome of Beasts</type>
+		<type>humanoid (Any Race),tome of Beasts</type>
 		<alignment>lawful neutral</alignment>
 		<ac>17 (scale mail)</ac>
 		<hp>91 (14d8+28)</hp>
@@ -21139,7 +21139,7 @@ whirlwind by using its action to repeat the saving throw; on a success, it moves
 	<monster>
 		<name>Devilbound Gnomish Prince</name>
 		<size>S</size>
-		<type>Humanoid (gnome),tome of Beasts</type>
+		<type>humanoid (gnome),tome of Beasts</type>
 		<alignment>any evil</alignment>
 		<ac>12 (15 with mage armor)</ac>
 		<hp>104 (19d6+38)</hp>
@@ -21195,7 +21195,7 @@ whirlwind by using its action to repeat the saving throw; on a success, it moves
 	<monster>
 		<name>Dwarven Ringmage</name>
 		<size>M</size>
-		<type>Humanoid (dwarf),tome of Beasts</type>
+		<type>humanoid (dwarf),tome of Beasts</type>
 		<alignment>any</alignment>
 		<ac>16 (breastplate)</ac>
 		<hp>82 (15d8+15)</hp>
@@ -21248,7 +21248,7 @@ whirlwind by using its action to repeat the saving throw; on a success, it moves
 	<monster>
 		<name>Elvish Veteran Archer</name>
 		<size>M</size>
-		<type>Humanoid (elf),tome of Beasts</type>
+		<type>humanoid (elf),tome of Beasts</type>
 		<alignment>chaotic good or chaotic neutral</alignment>
 		<ac>15 (studded leather)</ac>
 		<hp>77 (14d8+14)</hp>
@@ -21459,7 +21459,7 @@ whirlwind by using its action to repeat the saving throw; on a success, it moves
 	<monster>
 		<name>Wolf Reaver Dwarf</name>
 		<size>M</size>
-		<type>Humanoid (dwarf),tome of Beasts</type>
+		<type>humanoid (dwarf),tome of Beasts</type>
 		<alignment>any chaotic</alignment>
 		<ac>16 (chain shirt, shield)</ac>
 		<hp>76 (9d8+36)</hp>
@@ -21515,7 +21515,7 @@ whirlwind by using its action to repeat the saving throw; on a success, it moves
 	<monster>
 		<name>Emerald Order Cult Leader</name>
 		<size>M</size>
-		<type>Humanoid (any race),tome of Beasts</type>
+		<type>humanoid (any race),tome of Beasts</type>
 		<alignment>lawful neutral or evil</alignment>
 		<ac>14 (breastplate)</ac>
 		<hp>117 (18d8+36)</hp>
diff --git a/FightClub5eXML/Sources/UnearthedArcana/2020-02-04_2020SubclassesPart2.xml b/FightClub5eXML/Sources/UnearthedArcana/2020-02-04_2020SubclassesPart2.xml
index 7054693..1a59814 100644
--- a/FightClub5eXML/Sources/UnearthedArcana/2020-02-04_2020SubclassesPart2.xml
+++ b/FightClub5eXML/Sources/UnearthedArcana/2020-02-04_2020SubclassesPart2.xml
@@ -227,11 +227,11 @@
     <monster>
         <name>Dancing Item</name>
         <size>L</size>
-        <type>Large or smaller construct</type>
-        <alignment>neutral</alignment>
+        <type>construct</type>
+        <alignment>Neutral</alignment>
         <ac>16 (natural armor)</ac>
-        <hp>0</hp>
-        <speed>40 ft.</speed>
+        <hp>3</hp>
+        <speed>walk 40 ft.</speed>
         <str>18</str>
         <dex>14</dex>
         <con>16</con>
@@ -240,16 +240,17 @@
         <cha>6</cha>
         <save></save>
         <skill></skill>
-        <resist></resist>
-        <immune>poison</immune>
-        <conditionImmune>charmed, exhaustion, poisoned, frightened</conditionImmune>
-        <senses>darkvision 60 ft., passive Perception 10</senses>
         <passive>10</passive>
         <languages>understands the languages you speak</languages>
-        <cr>0</cr>
+        <cr></cr>
+        <resist></resist>
+        <immune>poison</immune>
+        <vulnerable></vulnerable>
+        <conditionImmune>charmed, exhaustion, poisoned, frightened</conditionImmune>
+        <senses>darkvision 60 ft.</senses>
         <trait>
             <name>Hit Points</name>
-            <text>Hit Points equal the dancing item’s Constitution modifier + your Charisma modifier + five times your level in this class.</text>
+            <text>equal the dancing item's Constitution modifier + your Charisma modifier + five times your level in this class</text>
         </trait>
         <trait>
             <name>Endless Waltz</name>
@@ -261,7 +262,9 @@
         </trait>
         <action>
             <name>Force-Empowered Slam</name>
-            <text>Melee Weapon Attack (Requires Your Bonus Action): your spell attack modifier to hit, reach 5 ft., one target you can see. Hit: 1d10 + your Charisma modifier force damage.</text>
+            <text>Melee Weapon Attack: your spell attack modifier to hit, reach 5 ft., one target you can see. 1d10 + your Charisma modifier force damage.</text>
         </action>
+        <description>Source: Unearthed Arcana: 2020 Subclasses Pt2 p. 2</description>
+        <environment></environment>
     </monster>
 </compendium>
diff --git a/Utilities/compendium.xsd b/Utilities/compendium.xsd
index 50d666e..11a0fab 100644
--- a/Utilities/compendium.xsd
+++ b/Utilities/compendium.xsd
@@ -208,6 +208,13 @@
         </xs:restriction>
     </xs:simpleType>
     
+    <xs:simpleType name="resetEnum">
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="L"/>
+            <xs:enumeration value="S"/>
+        </xs:restriction>
+    </xs:simpleType>
+    
     <xs:simpleType name="modifierValue">
         <xs:restriction base="xs:string">
             <xs:pattern value="([Pp]assive )?([Ss]trength|[Dd]exterity|[Cc]onstitution|[Ii]ntelligence|[Ww]isdom|[Cc]harisma|[Hh][Pp]) ?[+-]? ?([0-9]*|%0|prof)"/>
@@ -353,10 +360,19 @@
         <xs:attribute type="boolean" name="optional" use="optional"/>
     </xs:complexType>
     
+    <xs:complexType name="counterType">
+        <xs:choice maxOccurs="unbounded" minOccurs="0">
+            <xs:element type="xs:string" name="name"/>
+            <xs:element type="xs:integer" name="value"/>
+            <xs:element type="resetEnum" name="reset"/>
+        </xs:choice>
+    </xs:complexType>
+    
     <xs:complexType name="autolevelType" mixed="true">
         <xs:choice maxOccurs="unbounded">
             <xs:element type="featureType" name="feature" maxOccurs="unbounded" minOccurs="0"/>
             <xs:element type="slotsType" name="slots" minOccurs="0"/>
+            <xs:element type="counterType" name="counter" minOccurs="0"/>
         </xs:choice>
         <xs:attribute type="xs:integer" name="level" use="required"/>
         <xs:attribute type="boolean" name="scoreImprovement" use="optional"/>