cleaned v1.0.0

.gitignore

@@ -1 +1,2 @@
 module.zip
+Development Notes.txt

battlemaster macros/Battlemaster Superiority Die.js

@@ -5,16 +5,12 @@ USEAGE : PASSIVE
 This item must be on the character for Manuevers to function.  
 It does not do anything directly but is a helper effect to determine the Battle Master Hit Die (d8, d10, d12) based on level.
  
-MANEUVER DESCRIPTION:
-You learn maneuvers that are fueled by superiority dice. 
-Maneuvers enhance an attack in some way. You have 5d8 superiority dice per short rest.
-
-v0.6 March 25 2022 jbowens #0415 (Discord) https://github.com/jbowensii/More-Automated-Spells-Items-and-Feats.git 
+v1.2 May 7 2022 jbowens #0415 (Discord) https://github.com/jbowensii/More-Automated-Spells-Items-and-Feats.git 
 *****/
 
 if (args[0] === "on") {
     const pcActor = await fromUuid(args[args.length - 1].actorUuid);
-    let fighterLevel = testClass (pcActor, "fighter", "Battle Master", 3)?.levels ?? 0;
+    let fighterLevel = testClass(pcActor, "fighter", "battle-master", 3).levels ?? 0;
     if (!fighterLevel) {
         ui.notifications.error("You are not a fighter battle master of at least 3rd level.");
         return;
@@ -23,19 +19,20 @@ if (args[0] === "on") {
     if (fighterLevel > 17) flagData = "+ 1d12";
     else if (fighterLevel > 9) flagData = "+ 1d10";
     else if (fighterLevel > 0) flagData = "+ 1d8";
-    pcActor.setFlag("dae", "SuperiorityDie", flagData)    
+    pcActor.setFlag("dae", "SuperiorityDie", flagData)
 
 } else if (args[0] === "off") {
+    const pcActor = await fromUuid(args[args.length - 1].actorUuid);
     pcActor.unsetFlag("dae", "SuperiorityDie");
 }
 
 // Test PC Class, Subclass and Class Level
 // RETURN the class object (TRUE) or null (FALSE)
-function testClass (testActor, className, subClassName, levels) {
-    let theClass = testActor.data.data.classes[className] ;
+function testClass(testActor, className, subClassName, levels) {
+    let theClass = testActor.data.data.classes[className];
     if (theClass) {
         if ((levels > 0) && (theClass.levels >= levels)) {
-            if (subClassName === null || (theClass.subclass === subClassName)) {
+            if (subClassName === null || (theClass.subclass.identifier.toLowerCase() === subClassName.toLowerCase())) {
                 return theClass;
             }
         }

battlemaster macros/Maneuvers Bait and Switch.js

@@ -6,13 +6,7 @@ This is a utility Maneuver and can be used whenever your character can take an a
 This will setup any bonuses and effects on the TARGET actor.  
 A Superiority Die will be expended immediately.
 
-MANEUVER DESCRIPTION:
-When you’re within 5 feet of a creature on your turn, you can expend one superiority die and switch places with that creature, 
-provided you spend at least 5 feet of movement and the creature is willing and isn’t incapacitated. 
-This movement doesn’t provoke opportunity attacks.  Roll the superiority die. Until the start of your next turn, 
-you or the other creature (your choice) gains a bonus to AC equal to the number rolled.
-
-v0.7 March 26 2022 jbowens #0415 (Discord) https://github.com/jbowensii/More-Automated-Spells-Items-and-Feats.git 
+v1.2 May 7 2022 jbowens #0415 (Discord) https://github.com/jbowensii/More-Automated-Spells-Items-and-Feats.git 
 *****/
 
 // Activate on preActiveEffects

battlemaster macros/Maneuvers Grappling Strike.js

@@ -6,13 +6,7 @@ This Maneuver must be activated AFTER the character makes an attack and knows th
 This will activate any bonuses, saves, effects and extra damage to the TARGET.  
 A Superiority Die will be expended immediately.
 
- 
-MANEUVER DESCRIPTION:
-Immediately after you hit a creature with a melee attack on your turn, you can expend one superiority die 
-and then try to grapple the target as a bonus action (see the Player’s Handbook for rules on grappling). 
-Add the superiority die to your Strength (Athletics) check.
-
-v0.5 March 31 2022 jbowens #0415 (Discord) https://github.com/jbowensii/More-Automated-Spells-Items-and-Feats.git 
+v1.2 May 7 2022 jbowens #0415 (Discord) https://github.com/jbowensii/More-Automated-Spells-Items-and-Feats.git 
 *****/
 
 if (args[0].macroPass === "preSave") {

battlemaster macros/Maneuvers Lunging Attack.js

@@ -7,13 +7,8 @@ USEAGE : ACTIVATE BEFORE ATTACK
 This Maneuver must be activated BEFORE the character makes an attack.  
 This will setup any bonuses and effects on the TARGET character.  
 A Superiority Die will be expended immediately.
- 
-MANEUVER DESCRIPTION:
-When you make a melee weapon attack on your turn, you can expend one 
-superiority die to increase your reach for that attack by 5 feet. 
-If you hit, you add the superiority die to the attack’s damage roll.
 
-v0.4 March 31 2022 jbowens #0415 (Discord) https://github.com/jbowensii/More-Automated-Spells-Items-and-Feats.git 
+v1.2 May 7 2022 jbowens #0415 (Discord) https://github.com/jbowensii/More-Automated-Spells-Items-and-Feats.git 
 *****/
 
 // Activate on preActiveEffects

battlemaster macros/Maneuvers Precision Attack.js

@@ -5,13 +5,8 @@ USEAGE : PLACE HOLDER
 This item should be placed on the character that has the Precision Attack Manuever.  
 This items places an effect on the Actor that allows the rolling of a Superiority Die to 
 be added to the attack Roll before the TO HIT is evaluated.
- 
-MANEUVER DESCRIPTION:
-When you make a weapon attack roll against a creature, you can expend one superiority die 
-to add it to the roll. You can use this maneuver before or after making the attack roll, 
-but before any effects of the attack are applied.
 
-v0.8 March 28 2022 jbowens #0415 (Discord) https://github.com/jbowensii/More-Automated-Spells-Items-and-Feats.git 
+v1.2 May 7 2022 jbowens #0415 (Discord) https://github.com/jbowensii/More-Automated-Spells-Items-and-Feats.git 
 *****/
 const workflow = MidiQOL.Workflow.getWorkflow(args[0].uuid);
 

battlemaster macros/Maneuvers Pushing Attack.js

@@ -5,14 +5,8 @@ USEAGE : ACTIVATE AFTER ATTACK
 This Maneuver must be activated AFTER the character makes an attack and knows that a 
 HIT was successful.  This will activate any bonuses, saves, effects and extra damage 
 to the TARGET.  A Superiority Die will be expended immediately.
- 
-MANEUVER DESCRIPTION:
-When you hit a creature with a weapon attack, you can expend one superiority die to 
-attempt to drive the target back. You add the superiority die to the attack’s damage 
-roll, and if the target is Large or smaller, it must make a Strength saving throw. 
-On a failed save, you push the target up to 15 feet away from you.
 
-v0.5 March 30 2022 jbowens #0415 (Discord) https://github.com/jbowensii/More-Automated-Spells-Items-and-Feats.git 
+v1.2 May 7 2022 jbowens #0415 (Discord) https://github.com/jbowensii/More-Automated-Spells-Items-and-Feats.git 
 *****/
 
 if (args[0].macroPass === "postSave") {