From 83c24eb596d2463d76d9494b66328a7b9c5249b0 Mon Sep 17 00:00:00 2001
From: George Taray <gtaray@hotmail.com>
Date: Mon, 2 May 2022 16:07:22 -0700
Subject: [PATCH 1/8] Added event that fires when powers are used, a condition
 to test power data, and an action to apply healing

---
 campaign/4e/char_power.xml               | 51 ++++++++++++++
 extension.xml                            |  6 ++
 scripts/manager_action_damage_4e_tmt.lua | 90 ++++++++++++++++++++++++
 scripts/manager_char_4e_tmt.lua          | 74 +++++++++++++++++++
 strings/strings.xml                      | 17 +++++
 triggers/scripts/parametercombobox.lua   |  2 +-
 6 files changed, 239 insertions(+), 1 deletion(-)
 create mode 100644 campaign/4e/char_power.xml
 create mode 100644 scripts/manager_action_damage_4e_tmt.lua
 create mode 100644 scripts/manager_char_4e_tmt.lua

diff --git a/campaign/4e/char_power.xml b/campaign/4e/char_power.xml
new file mode 100644
index 0000000..095eb5f
--- /dev/null
+++ b/campaign/4e/char_power.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  Please see the license.html file included with this distribution for 
+  attribution and copyright information.
+-->
+
+<root>
+    <windowclass name="char_power" merge="join" ruleset="4E">
+		<script>
+            local fActivatePowerOriginal;
+            function onInit()
+                fActivatePowerOriginal = super.activatePower;
+                super.activatePower = activatePower;
+
+                if super and super.onInit then
+                    super.onInit()
+                end
+            end
+
+            function activatePower()
+                fActivatePowerOriginal();
+                local node = getDatabaseNode();
+
+                local charnode = node.getChild("...");
+                local rActor = ActorManager.resolveActor(charnode);
+
+                local sName = DB.getValue(node, "name", "");
+                local sRange = DB.getValue(node, "range", "");
+                local sRecharge = DB.getValue(node, "recharge", "");
+                local sAction = DB.getValue(node, "action", "");
+                local sKeywords = DB.getValue(node, "keywords", "");
+
+                local rPower = { 
+                    sName = sName, 
+                    sRange = sRange,
+                    sRecharge = sRecharge,
+                    sAction = sAction,
+                    sKeywords = sKeywords
+                };
+                local rEventData = {
+                    rSource = rActor,
+                    rPower = rPower
+                };
+                
+                TriggerManager.fireEvent(
+                    CharPowerTMT_4E.rPowerUsedEvent.sName, 
+                    rEventData);
+            end
+        </script>
+	</windowclass> 
+</root>
\ No newline at end of file
diff --git a/extension.xml b/extension.xml
index d18b89b..84b289d 100644
--- a/extension.xml
+++ b/extension.xml
@@ -47,6 +47,12 @@ Wood Board Vectors by Vecteezy
 		<script name="TriggerData" file="scripts/data_trigger.lua" />
 		<script name="TriggerManager" file="scripts/manager_trigger.lua" />
 
+		<!-- 4E -->
+		<script name="CharPowerTMT_4E" file="scripts/manager_char_4e_tmt.lua" ruleset="4E" />
+		<script name="ActionDamageTMT_4E" file="scripts/manager_action_damage_4e_tmt.lua" ruleset="4E" />
+		<includefile source="campaign/4e/char_power.xml" ruleset="4E" />
+
+		<!-- TMT -->
 		<includefile source="triggers/triggers.xml" />
 		<includefile source="triggers/template_triggers.xml" />
 
diff --git a/scripts/manager_action_damage_4e_tmt.lua b/scripts/manager_action_damage_4e_tmt.lua
new file mode 100644
index 0000000..f1da9f9
--- /dev/null
+++ b/scripts/manager_action_damage_4e_tmt.lua
@@ -0,0 +1,90 @@
+-- 
+-- Please see the license.txt file included with this distribution for 
+-- attribution and copyright information.
+--
+
+rApplyHpCombatantAction = nil;
+
+function onInit()
+    initializeActions();
+end
+
+function initializeActions()
+    -- TODO: Add more parameters to this action
+    -- For spending healing surges, maybe adding dice instead of a flat value
+    rApplyHpCombatantAction = {
+        sName = "apply_heal_to_combatant_action",
+        fAction = applyHpToCombatant,
+        aConfigurableParameters = {
+            {
+				sName = "sCombatant",
+				sDisplay = "combatant_parameter",
+				sType = "combo",
+				aDefinedValues = {
+					{
+						sValue = "source_subject",
+						aRequiredParameters = {"rSource"}
+					},
+					{
+						sValue = "target_subject",
+						aRequiredParameters = {"rTarget"}
+					},
+				}
+			},
+            {
+                sName = "sLabel",
+                sDisplay = "apply_heal_label_parameter",
+                sType = "string"
+            },
+            {
+                sName = "sType",
+                sDisplay = "apply_heal_type_parameter",
+                sType = "combo",
+                aDefinedValues = {
+                    "apply_heal_type_hitpoints",
+                    "apply_heal_type_temphitpoints"
+                }
+            },
+            {
+                sName = "nValue",
+                sDisplay = "apply_heal_value_parameter",
+                sType = "number"
+            }
+        }
+    }
+
+    TriggerManager.defineAction(rApplyHpCombatantAction);
+end
+
+function applyHpToCombatant(rTriggerData, rEventData)
+    local rActor = nil;
+    if rTriggerData.sCombatant == "source_subject" then
+		rActor = rEventData.rSource;
+	elseif rTriggerData.sCombatant == "target_subject" then
+		rActor = rEventData.rTarget;
+	end
+
+    local rAction = {};
+    rAction.type = "heal";
+    rAction.name = rTriggerData.sLabel or "";
+    rAction.order = 0;
+    rAction.range = "";
+    rAction.sTargeting = "self";
+    rAction.clauses = {};
+
+    local rHealClause = {};
+    rHealClause.dicestr = "" .. rTriggerData.nValue;
+    rHealClause.cost = 0;
+    rHealClause.basemult = 0;
+    rHealClause.stat = {};
+
+    if rTriggerData.sType == "apply_heal_type_hitpoints" then
+        rHealClause.subtype = "";
+    elseif rTriggerData.sType == "apply_heal_type_temphitpoints" then
+        rHealClause.subtype = "temp";
+    end
+
+    table.insert(rAction.clauses, rHealClause);
+    
+    ActionHeal.performRoll(nil, rActor, rAction)
+end
\ No newline at end of file
diff --git a/scripts/manager_char_4e_tmt.lua b/scripts/manager_char_4e_tmt.lua
new file mode 100644
index 0000000..a4d166a
--- /dev/null
+++ b/scripts/manager_char_4e_tmt.lua
@@ -0,0 +1,74 @@
+-- 
+-- Please see the license.txt file included with this distribution for 
+-- attribution and copyright information.
+--
+
+rPowerUsedCondition = nil;
+rPowerUsedEvent = {
+    sName = "power_used_event",
+    aParameters = { 
+        "rSource",
+        "rPower"
+    };
+};
+
+function onInit()
+    TriggerManager.defineEvent(rPowerUsedEvent);
+    initializeConditions();
+end
+
+function initializeConditions()
+    rPowerUsedCondition = {
+        sName = "power_used_contains_data",
+        fCondition  = powerContainsDataCondition,
+        aRequiredParameters = {
+            "rSource",
+            "rPower"
+        },
+        aConfigurableParameters = {
+            {
+                sName = "sPowerProperty",
+                sDisplay = "power_used_property_parameter",
+                sType = "combo",
+                aDefinedValues = {
+                    "power_used_property_name",
+                    "power_used_property_keywords",
+                    "power_used_property_recharge",
+                    "power_used_property_action",
+                    "power_used_property_range",
+                }
+            },
+            {
+                sName = "sPowerContains",
+                sDisplay = "power_used_contains_parameter",
+                sType = "string"
+            }
+        }
+    }
+
+    TriggerManager.defineCondition(rPowerUsedCondition)
+end
+
+function powerContainsDataCondition(rTriggerData, rEventData)
+    -- If contain property is empty, return true
+    if (rTriggerData.sPowerContains or "") == "" then
+        return true;
+    end
+
+    local sData = "";
+    if rTriggerData.sPowerProperty == "power_used_property_name" then
+        sData = rEventData.rPower.sName;
+    elseif rTriggerData.sPowerProperty == "power_used_property_keywords" then
+        sData = rEventData.rPower.sKeywords;
+    elseif rTriggerData.sPowerProperty == "power_used_property_recharge" then
+        sData = rEventData.rPower.sRecharge;
+    elseif rTriggerData.sPowerProperty == "power_used_property_action" then
+        sData = rEventData.rPower.sAction;
+    elseif rTriggerData.sPowerProperty == "power_used_property_range" then
+        sData = rEventData.rPower.sRange;
+    end
+    if string.find(sData:lower(), rTriggerData.sPowerContains:lower()) then
+        return true;
+    end
+    return false;
+end
\ No newline at end of file
diff --git a/strings/strings.xml b/strings/strings.xml
index 8a1d1ec..83071f5 100644
--- a/strings/strings.xml
+++ b/strings/strings.xml
@@ -21,6 +21,7 @@
 
 	<string name="before_damage_taken_event">Before Damage Taken</string>
 	<string name="dice_rolled_event">Dice Rolled</string>
+	<string name="power_used_event">Power Used</string>
 
 	<string name="combatant_has_effect_condition">Combatant Has Effect</string>
 	<string name="creature_has_trait_condition">Creature Has Trait</string>
@@ -68,6 +69,22 @@
 	<string name="lowest_dice">Lowest</string>
 	<string name="matching_dice">Matching</string>
 	<string name="sum_dice">Sum</string>
+	
+	<string name="power_used_contains_data">Power Contains Data</string>
+	<string name="power_used_property_parameter">Property</string>
+	<string name="power_used_contains_parameter">Contains</string>
+	<string name="power_used_property_name">Name</string>
+	<string name="power_used_property_keywords">Keywords</string>
+	<string name="power_used_property_recharge">Recharge</string>
+	<string name="power_used_property_action">Action</string>
+	<string name="power_used_property_range">Range</string>
+
+	<string name="apply_heal_to_combatant_action">Apply Healing to Combatant</string>
+	<string name="apply_heal_label_parameter">Label</string>
+	<string name="apply_heal_type_parameter">Healing Type</string>
+	<string name="apply_heal_value_parameter">Value</string>
+	<string name="apply_heal_type_hitpoints">HP</string>
+	<string name="apply_heal_type_temphitpoints">Temp HP</string>
 
 	<string name="trait_type_all">All</string>
 	<string name="trait_type_feat">Feat</string>
diff --git a/triggers/scripts/parametercombobox.lua b/triggers/scripts/parametercombobox.lua
index af214aa..6951ed2 100644
--- a/triggers/scripts/parametercombobox.lua
+++ b/triggers/scripts/parametercombobox.lua
@@ -23,7 +23,7 @@ function configure(rParameterInfo, aEventParameters)
 			end
 		end
 	end
-	Debug.chat("configure", rParameterInfo, aEventParameters, node.getValue());
+	-- Debug.chat("configure", rParameterInfo, aEventParameters, node.getValue());
 	setComboValue(node.getValue());
 end
 

From b5c0600cc1f1109a0bc0ff85a33625a2566c516e Mon Sep 17 00:00:00 2001
From: George Taray <gtaray@hotmail.com>
Date: Mon, 16 May 2022 08:03:23 -0700
Subject: [PATCH 2/8] Added after attack trigger for 5e, and a send chat
 message action

---
 campaign/5e/record_power.xml             | 59 +++++++++++++++++
 extension.xml                            | 11 +++-
 scripts/manager_action_attack_4e_tmt.lua | 81 ++++++++++++++++++++++++
 scripts/manager_action_attack_5e_tmt.lua | 81 ++++++++++++++++++++++++
 scripts/manager_char_4e_tmt.lua          |  6 +-
 scripts/manager_char_5e_tmt.lua          | 75 ++++++++++++++++++++++
 scripts/manager_chat_tmt.lua             | 36 +++++++++++
 strings/strings.xml                      | 20 ++++++
 8 files changed, 364 insertions(+), 5 deletions(-)
 create mode 100644 campaign/5e/record_power.xml
 create mode 100644 scripts/manager_action_attack_4e_tmt.lua
 create mode 100644 scripts/manager_action_attack_5e_tmt.lua
 create mode 100644 scripts/manager_chat_tmt.lua

diff --git a/campaign/5e/record_power.xml b/campaign/5e/record_power.xml
new file mode 100644
index 0000000..66aef4e
--- /dev/null
+++ b/campaign/5e/record_power.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  Please see the license.html file included with this distribution for 
+  attribution and copyright information.
+-->
+
+<root>
+    <windowclass name="power_item" merge="join" ruleset="5E">
+        <script>
+            local fUsePowerOriginal;
+
+            function onInit()
+                fUsePowerOriginal = super.usePower;
+                super.usePower = usePower;
+
+                if super and super.onInit then
+                    super.onInit();
+                end
+            end
+
+            function usePower(bShowFull)
+                fUsePowerOriginal(bShowFull);
+                
+                local node = getDatabaseNode();
+
+                local charnode = node.getChild("...");
+                local rActor = ActorManager.resolveActor(charnode);
+
+                local sName = DB.getValue(node, "name", "");
+                local nLevel = DB.getValue(node, "level", 0);
+                local sSchool = DB.getValue(node, "school", "");
+                local sCastingTime = DB.getValue(node, "castingtime", "");
+                local sComponents = DB.getValue(node, "components", "");
+                local sDuration = DB.getValue(node, "duration", "");
+                local sGroup = DB.getValue(node, "group", "");
+                local sRange = DB.getValue(node, "range", "");
+
+                local rPower = { 
+                    sName = sName, 
+                    nLevel = nLevel,
+                    sSchool = sSchool,
+                    sCastingTime = sCastingTime,
+                    sComponents = sComponents,
+                    sDuration = sDuration,
+                    sGroup = sGroup,
+                    sRange = sRange
+                };
+                local rEventData = {
+                    rSource = rActor,
+                    rPower = rPower
+                };
+                
+                TriggerManager.fireEvent(
+                    CharDamageTMT_5E.rPowerUsedEvent.sName, 
+                    rEventData);
+            end
+        </script>
+    </windowclass>
+</root>
\ No newline at end of file
diff --git a/extension.xml b/extension.xml
index 84b289d..39831a0 100644
--- a/extension.xml
+++ b/extension.xml
@@ -38,18 +38,25 @@ Wood Board Vectors by Vecteezy
 
 	<base>
 		<script name="ActionsManagerTMT" file="scripts/manager_actions_tmt.lua" />
-		<script name="ActionDamageTMT_5E" file="scripts/manager_action_damage_5e_tmt.lua" ruleset="5E" />
+		
 		<script name="CampaignDataManagerTMT" file="scripts/manager_campaigndata_tmt.lua" />
-		<script name="CharDamageTMT_5E" file="scripts/manager_char_5e_tmt.lua" ruleset="5E" />
 		<script name="DesktopManagerTMT" file="scripts/manager_desktop_tmt.lua" />
 		<script name="EffectManagerTMT" file="scripts/manager_effect_tmt.lua" />
+		<script name="ChatManagerTMT" file="scripts/manager_chat_tmt.lua" />
 		<script name="LibraryDataTMT" file="scripts/data_library_tmt.lua" />
 		<script name="TriggerData" file="scripts/data_trigger.lua" />
 		<script name="TriggerManager" file="scripts/manager_trigger.lua" />
 
+		<!-- 5E -->
+		<script name="CharDamageTMT_5E" file="scripts/manager_char_5e_tmt.lua" ruleset="5E" />
+		<script name="ActionDamageTMT_5E" file="scripts/manager_action_damage_5e_tmt.lua" ruleset="5E" />
+		<script name="ActionAttackTMT_5E" file="scripts/manager_action_attack_5e_tmt.lua" ruleset="5E" />
+		<includefile source="campaign/5e/record_power.xml" ruleset="5E" />
+
 		<!-- 4E -->
 		<script name="CharPowerTMT_4E" file="scripts/manager_char_4e_tmt.lua" ruleset="4E" />
 		<script name="ActionDamageTMT_4E" file="scripts/manager_action_damage_4e_tmt.lua" ruleset="4E" />
+		<script name="ActionAttackTMT_4E" file="scripts/manager_action_attack_4e_tmt.lua" ruleset="4E" />
 		<includefile source="campaign/4e/char_power.xml" ruleset="4E" />
 
 		<!-- TMT -->
diff --git a/scripts/manager_action_attack_4e_tmt.lua b/scripts/manager_action_attack_4e_tmt.lua
new file mode 100644
index 0000000..5f2a425
--- /dev/null
+++ b/scripts/manager_action_attack_4e_tmt.lua
@@ -0,0 +1,81 @@
+-- 
+-- Please see the license.txt file included with this distribution for 
+-- attribution and copyright information.
+--
+
+rAfterAttackRollEvent = {
+    sName = "after_attack_event",
+    aParameters = {
+        "rSource",
+        "rTarget",
+        "nAttack",
+        "sDesc",
+        "sResults"
+    }
+}
+rAttackResultCondition = nil;
+
+local fApplyAttackOriginal;
+
+function onInit()
+    fApplyAttackOriginal = ActionAttack.applyAttack;
+    ActionAttack.applyAttack = applyAttack;
+
+    initializeConditions();
+    TriggerManager.defineEvent(rAfterAttackRollEvent);
+end
+
+function initializeConditions()
+    rAttackResultCondition = {
+        sName = "attack_result_condition",
+        fCondition = attackMatchesResultCondition,
+        aRequriedParameters = {
+            "rSource",
+            "rTarget",
+            "nAttack",
+            "sResults"
+        },
+        aConfigurableParameters = {
+            {
+                sName = "sAttackResult",
+                sDisplay = "attack_result_property_parameter",
+                sType = "combo",
+                aDefinedValues = {
+                    "attack_result_property_hit",
+                    "attack_result_property_miss",
+                    "attack_result_property_critical",
+                    "attack_result_property_fumble"
+                }
+            }
+        }
+    }
+
+    TriggerManager.defineCondition(rAttackResultCondition);
+end
+
+function attackMatchesResultCondition(rTriggerData, rEventData)
+    if rTriggerData.sAttackResult == "attack_result_property_hit" then
+        return string.match(rEventData.sResults, "%[HIT%]") ~= nil or string.match(rEventData.sResults, "%[AUTOMATIC HIT%]") ~= nil;
+    elseif rTriggerData.sAttackResult == "attack_result_property_critical" then
+        return string.match(rEventData.sResults, "%[CRITICAL HIT%]") ~= nil;
+    elseif rTriggerData.sAttackResult == "attack_result_property_miss" then
+        return string.match(rEventData.sResults, "%[MISS%]") ~= nil
+    elseif rTriggerData.sAttackResult == "attack_result_property_fumble" then
+        return string.match(rEventData.sResults, "%[AUTOMATIC MISS%]") ~= nil or string.match(rEventData.sResults, "%[FUMBLE%]") ~= nil
+    end
+
+    return false;
+end
+
+function applyAttack(rSource, rTarget, sDesc, nTotal, sResults, bSecret)
+    fApplyAttackOriginal(rSource, rTarget, sDesc, nTotal, sResults, bSecret);
+
+    local rEventData = {
+        rSource = rSource,
+        rTarget = rTarget,
+        nAttack = nTotal,
+        sDesc = sDesc,
+        sResults = sResults
+    }
+    TriggerManager.fireEvent(rAfterAttackRollEvent.sName, rEventData);
+end
\ No newline at end of file
diff --git a/scripts/manager_action_attack_5e_tmt.lua b/scripts/manager_action_attack_5e_tmt.lua
new file mode 100644
index 0000000..6ab952a
--- /dev/null
+++ b/scripts/manager_action_attack_5e_tmt.lua
@@ -0,0 +1,81 @@
+-- 
+-- Please see the license.txt file included with this distribution for 
+-- attribution and copyright information.
+--
+
+rAfterAttackRollEvent = {
+    sName = "after_attack_event",
+    aParameters = {
+        "rSource",
+        "rTarget",
+        "nAttack",
+        "sDesc",
+        "sResults"
+    }
+}
+rAttackResultCondition = nil;
+
+local fApplyAttackOriginal;
+
+function onInit()
+    fApplyAttackOriginal = ActionAttack.applyAttack;
+    ActionAttack.applyAttack = applyAttack;
+
+    initializeConditions();
+    TriggerManager.defineEvent(rAfterAttackRollEvent);
+end
+
+function initializeConditions()
+    rAttackResultCondition = {
+        sName = "attack_result_condition",
+        fCondition = attackMatchesResultCondition,
+        aRequriedParameters = {
+            "rSource",
+            "rTarget",
+            "nAttack",
+            "sResults"
+        },
+        aConfigurableParameters = {
+            {
+                sName = "sAttackResult",
+                sDisplay = "attack_result_property_parameter",
+                sType = "combo",
+                aDefinedValues = {
+                    "attack_result_property_hit",
+                    "attack_result_property_miss",
+                    "attack_result_property_critical",
+                    "attack_result_property_fumble"
+                }
+            }
+        }
+    }
+
+    TriggerManager.defineCondition(rAttackResultCondition);
+end
+
+function attackMatchesResultCondition(rTriggerData, rEventData)
+    if rTriggerData.sAttackResult == "attack_result_property_hit" then
+        return string.match(rEventData.sResults, "%[HIT%]") ~= nil or string.match(rEventData.sResults, "%[AUTOMATIC HIT%]") ~= nil;
+    elseif rTriggerData.sAttackResult == "attack_result_property_critical" then
+        return string.match(rEventData.sResults, "%[CRITICAL HIT%]") ~= nil;
+    elseif rTriggerData.sAttackResult == "attack_result_property_miss" then
+        return string.match(rEventData.sResults, "%[MISS%]") ~= nil
+    elseif rTriggerData.sAttackResult == "attack_result_property_fumble" then
+        return string.match(rEventData.sResults, "%[AUTOMATIC MISS%]") ~= nil or string.match(rEventData.sResults, "%[FUMBLE%]") ~= nil
+    end
+
+    return false;
+end
+
+function applyAttack(rSource, rTarget, bSecret, sAttackType, sDesc, nTotal, sResults)
+    fApplyAttackOriginal(rSource, rTarget, bSecret, sAttackType, sDesc, nTotal, sResults);
+
+    local rEventData = {
+        rSource = rSource,
+        rTarget = rTarget,
+        nAttack = nTotal,
+        sDesc = sDesc,
+        sResults = sResults
+    }
+    TriggerManager.fireEvent(rAfterAttackRollEvent.sName, rEventData);
+end
\ No newline at end of file
diff --git a/scripts/manager_char_4e_tmt.lua b/scripts/manager_char_4e_tmt.lua
index a4d166a..a8aceaa 100644
--- a/scripts/manager_char_4e_tmt.lua
+++ b/scripts/manager_char_4e_tmt.lua
@@ -3,7 +3,7 @@
 -- attribution and copyright information.
 --
 
-rPowerUsedCondition = nil;
+rPowerContainsDataCondition = nil;
 rPowerUsedEvent = {
     sName = "power_used_event",
     aParameters = { 
@@ -18,7 +18,7 @@ function onInit()
 end
 
 function initializeConditions()
-    rPowerUsedCondition = {
+    rPowerContainsDataCondition = {
         sName = "power_used_contains_data",
         fCondition  = powerContainsDataCondition,
         aRequiredParameters = {
@@ -46,7 +46,7 @@ function initializeConditions()
         }
     }
 
-    TriggerManager.defineCondition(rPowerUsedCondition)
+    TriggerManager.defineCondition(rPowerContainsDataCondition);
 end
 
 function powerContainsDataCondition(rTriggerData, rEventData)
diff --git a/scripts/manager_char_5e_tmt.lua b/scripts/manager_char_5e_tmt.lua
index 4bf9b64..24a3a8e 100644
--- a/scripts/manager_char_5e_tmt.lua
+++ b/scripts/manager_char_5e_tmt.lua
@@ -4,8 +4,19 @@
 --
 
 rCreatureHasTraitCondition = nil;
+rPowerContainsDataCondition = nil;
+
+rPowerUsedEvent = {
+    sName = "power_used_event",
+    aParameters = { 
+        "rSource",
+        "rPower"
+    };
+};
 
 function onInit()
+	TriggerManager.defineEvent(rPowerUsedEvent);
+
 	initializeConditions();
 end
 
@@ -50,6 +61,39 @@ function initializeConditions()
 	};
 
 	TriggerManager.defineCondition(rCreatureHasTraitCondition);
+
+	rPowerContainsDataCondition = {
+        sName = "power_used_contains_data",
+        fCondition  = powerContainsDataCondition,
+        aRequiredParameters = {
+            "rSource",
+            "rPower"
+        },
+        aConfigurableParameters = {
+            {
+                sName = "sPowerProperty",
+                sDisplay = "power_used_property_parameter",
+                sType = "combo",
+                aDefinedValues = {
+                    "power_used_property_name",
+                    "power_used_property_level",
+                    "power_used_property_school",
+                    "power_used_property_castingtime",
+					"power_used_property_components",
+					"power_used_property_duration",
+					"power_used_property_group",
+                    "power_used_property_range",
+                }
+            },
+            {
+                sName = "sPowerContains",
+                sDisplay = "power_used_contains_parameter",
+                sType = "string"
+            }
+        }
+    }
+
+    TriggerManager.defineCondition(rPowerContainsDataCondition);
 end
 
 function creatureHasTraitCondition(rTriggerData, rEventData)
@@ -89,4 +133,35 @@ function hasTrait(rActor, sTrait)
 		end
 		return false;
 	end
+end
+
+function powerContainsDataCondition(rTriggerData, rEventData)
+    -- If contain property is empty, return true
+    if (rTriggerData.sPowerContains or "") == "" then
+        return true;
+    end
+
+    local sData = "";
+    if rTriggerData.sPowerProperty == "power_used_property_name" then
+        sData = rEventData.rPower.sName;
+    elseif rTriggerData.sPowerProperty == "power_used_property_level" then
+        sData = tostring(rEventData.rPower.nLevel);
+    elseif rTriggerData.sPowerProperty == "power_used_property_school" then
+        sData = rEventData.rPower.sSchool;
+    elseif rTriggerData.sPowerProperty == "power_used_property_castingtime" then
+        sData = rEventData.rPower.sCastingTime;
+	elseif rTriggerData.sPowerProperty == "power_used_property_components" then
+		sData = rEventData.rPower.sComponents;
+	elseif rTriggerData.sPowerProperty == "power_used_property_duration" then
+		sData = rEventData.rPower.sDuration;
+	elseif rTriggerData.sPowerProperty == "power_used_property_group" then
+		sData = rEventData.rPower.sGroup;
+    elseif rTriggerData.sPowerProperty == "power_used_property_range" then
+        sData = rEventData.rPower.sRange;
+    end
+    if string.find(sData:lower(), rTriggerData.sPowerContains:lower()) then
+        return true;
+    end
+
+    return false;
 end
\ No newline at end of file
diff --git a/scripts/manager_chat_tmt.lua b/scripts/manager_chat_tmt.lua
new file mode 100644
index 0000000..842908b
--- /dev/null
+++ b/scripts/manager_chat_tmt.lua
@@ -0,0 +1,36 @@
+-- 
+-- Please see the license.txt file included with this distribution for 
+-- attribution and copyright information.
+--
+
+rSendChatMessageAction = nil;
+
+function onInit()
+    initializeActions();
+end
+
+function initializeActions()
+    rSendChatMessageAction = {
+        sName = "send_chat_message_action",
+        fAction = sendChatMessage,
+        aConfigurableParameters = {
+            {
+                sName = "sMessage",
+                sDisplay = "chat_message_parameter",
+                sType = "string"   
+            }
+        }
+    }
+
+    TriggerManager.defineAction(rSendChatMessageAction);
+end
+
+function sendChatMessage(rTriggerData, rEventData)
+    local msg = {
+        sender = "",
+        font = "msgfont",
+        text = rTriggerData.sMessage,
+        icon = "TriggerMeTimbers"
+    }
+    Comm.deliverChatMessage(msg);
+end
\ No newline at end of file
diff --git a/strings/strings.xml b/strings/strings.xml
index 83071f5..ab4b676 100644
--- a/strings/strings.xml
+++ b/strings/strings.xml
@@ -22,6 +22,7 @@
 	<string name="before_damage_taken_event">Before Damage Taken</string>
 	<string name="dice_rolled_event">Dice Rolled</string>
 	<string name="power_used_event">Power Used</string>
+	<string name="after_attack_event">After Attack Roll</string>
 
 	<string name="combatant_has_effect_condition">Combatant Has Effect</string>
 	<string name="creature_has_trait_condition">Creature Has Trait</string>
@@ -33,11 +34,14 @@
 	<string name="target_has_current_hit_points_condition">Target Has Current Hit Points</string>
 	<string name="combatant_has_temporary_hit_points_condition">Combatant Has Temporary Hit Points</string>
 
+	<!-- Actions -->
 	<string name="ensure_target_has_remaining_hit_points_action">Ensure Target Has Remaining Hit Points</string>
 	<string name="remove_effect_from_combatant_action">Remove Effect From Combatant</string>
 	<string name="replace_dice_action">Replace Dice</string>
 	<string name="reroll_dice_action">Reroll Dice</string>
+	<string name="send_chat_message_action">Send Chat Message</string>
 
+	<!-- Parameters -->
 	<string name="chat_message_parameter">Chat Message</string>
 	<string name="combatant_parameter">Combatant</string>
 	<string name="comparison_parameter">Comparison</string>
@@ -70,6 +74,7 @@
 	<string name="matching_dice">Matching</string>
 	<string name="sum_dice">Sum</string>
 	
+	<!-- Power contains data condition -->
 	<string name="power_used_contains_data">Power Contains Data</string>
 	<string name="power_used_property_parameter">Property</string>
 	<string name="power_used_contains_parameter">Contains</string>
@@ -78,7 +83,22 @@
 	<string name="power_used_property_recharge">Recharge</string>
 	<string name="power_used_property_action">Action</string>
 	<string name="power_used_property_range">Range</string>
+	<string name="power_used_property_level">Level</string>
+	<string name="power_used_property_school">School</string>
+	<string name="power_used_property_castingtime">Casting Time</string>
+	<string name="power_used_property_components">Components</string>
+	<string name="power_used_property_duration">Duration</string>
+	<string name="power_used_property_group">Group</string>
 
+	<!-- Attack result condition -->
+	<string name="attack_result_condition">Attack Roll Is Result</string>
+	<string name="attack_result_property_parameter">Result</string>
+	<string name="attack_result_property_hit">Hit</string>
+	<string name="attack_result_property_miss">Miss</string>
+	<string name="attack_result_property_critical">Critical Hit</string>
+	<string name="attack_result_property_fumble">Automatic Miss</string>
+
+	<!-- Apply healing action -->
 	<string name="apply_heal_to_combatant_action">Apply Healing to Combatant</string>
 	<string name="apply_heal_label_parameter">Label</string>
 	<string name="apply_heal_type_parameter">Healing Type</string>

From 49865fc883d42acc02730e7f4c750c9e7124931e Mon Sep 17 00:00:00 2001
From: George Taray <gtaray@hotmail.com>
Date: Mon, 16 May 2022 15:57:30 -0700
Subject: [PATCH 3/8] Convert spaces to tab. Move scripts to lua files.

---
 campaign/4e/char_power.xml               |  48 +---------
 campaign/4e/scripts/char_power.lua       |  39 ++++++++
 campaign/5e/record_power.xml             |  58 ++----------
 campaign/5e/scripts/record_power.lua     |  47 ++++++++++
 scripts/manager_action_attack_4e_tmt.lua | 110 +++++++++++------------
 scripts/manager_action_attack_5e_tmt.lua | 110 +++++++++++------------
 scripts/manager_action_damage_4e_tmt.lua | 104 ++++++++++-----------
 scripts/manager_char_4e_tmt.lua          | 107 +++++++++++-----------
 scripts/manager_chat_tmt.lua             |  40 ++++-----
 9 files changed, 328 insertions(+), 335 deletions(-)
 create mode 100644 campaign/4e/scripts/char_power.lua
 create mode 100644 campaign/5e/scripts/record_power.lua

diff --git a/campaign/4e/char_power.xml b/campaign/4e/char_power.xml
index 095eb5f..72a8c04 100644
--- a/campaign/4e/char_power.xml
+++ b/campaign/4e/char_power.xml
@@ -1,51 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- 
-  Please see the license.html file included with this distribution for 
-  attribution and copyright information.
+	Please see the license.html file included with this distribution for 
+	attribution and copyright information.
 -->
 
 <root>
-    <windowclass name="char_power" merge="join" ruleset="4E">
-		<script>
-            local fActivatePowerOriginal;
-            function onInit()
-                fActivatePowerOriginal = super.activatePower;
-                super.activatePower = activatePower;
-
-                if super and super.onInit then
-                    super.onInit()
-                end
-            end
-
-            function activatePower()
-                fActivatePowerOriginal();
-                local node = getDatabaseNode();
-
-                local charnode = node.getChild("...");
-                local rActor = ActorManager.resolveActor(charnode);
-
-                local sName = DB.getValue(node, "name", "");
-                local sRange = DB.getValue(node, "range", "");
-                local sRecharge = DB.getValue(node, "recharge", "");
-                local sAction = DB.getValue(node, "action", "");
-                local sKeywords = DB.getValue(node, "keywords", "");
-
-                local rPower = { 
-                    sName = sName, 
-                    sRange = sRange,
-                    sRecharge = sRecharge,
-                    sAction = sAction,
-                    sKeywords = sKeywords
-                };
-                local rEventData = {
-                    rSource = rActor,
-                    rPower = rPower
-                };
-                
-                TriggerManager.fireEvent(
-                    CharPowerTMT_4E.rPowerUsedEvent.sName, 
-                    rEventData);
-            end
-        </script>
+	<windowclass name="char_power" merge="join" ruleset="4E">
+		<script file="campaign/4e/scripts/char_power.lua" />
 	</windowclass> 
 </root>
\ No newline at end of file
diff --git a/campaign/4e/scripts/char_power.lua b/campaign/4e/scripts/char_power.lua
new file mode 100644
index 0000000..15cd281
--- /dev/null
+++ b/campaign/4e/scripts/char_power.lua
@@ -0,0 +1,39 @@
+local fActivatePowerOriginal;
+function onInit()
+	fActivatePowerOriginal = super.activatePower;
+	super.activatePower = activatePower;
+
+	if super and super.onInit then
+		super.onInit()
+	end
+end
+
+function activatePower()
+	fActivatePowerOriginal();
+	local node = getDatabaseNode();
+
+	local charnode = node.getChild("...");
+	local rActor = ActorManager.resolveActor(charnode);
+
+	local sName = DB.getValue(node, "name", "");
+	local sRange = DB.getValue(node, "range", "");
+	local sRecharge = DB.getValue(node, "recharge", "");
+	local sAction = DB.getValue(node, "action", "");
+	local sKeywords = DB.getValue(node, "keywords", "");
+
+	local rPower = { 
+		sName = sName, 
+		sRange = sRange,
+		sRecharge = sRecharge,
+		sAction = sAction,
+		sKeywords = sKeywords
+	};
+	local rEventData = {
+		rSource = rActor,
+		rPower = rPower
+	};
+	
+	TriggerManager.fireEvent(
+		CharPowerTMT_4E.rPowerUsedEvent.sName, 
+		rEventData);
+end
\ No newline at end of file
diff --git a/campaign/5e/record_power.xml b/campaign/5e/record_power.xml
index 66aef4e..0d19a57 100644
--- a/campaign/5e/record_power.xml
+++ b/campaign/5e/record_power.xml
@@ -1,59 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- 
-  Please see the license.html file included with this distribution for 
-  attribution and copyright information.
+	Please see the license.html file included with this distribution for 
+	attribution and copyright information.
 -->
 
 <root>
-    <windowclass name="power_item" merge="join" ruleset="5E">
-        <script>
-            local fUsePowerOriginal;
-
-            function onInit()
-                fUsePowerOriginal = super.usePower;
-                super.usePower = usePower;
-
-                if super and super.onInit then
-                    super.onInit();
-                end
-            end
-
-            function usePower(bShowFull)
-                fUsePowerOriginal(bShowFull);
-                
-                local node = getDatabaseNode();
-
-                local charnode = node.getChild("...");
-                local rActor = ActorManager.resolveActor(charnode);
-
-                local sName = DB.getValue(node, "name", "");
-                local nLevel = DB.getValue(node, "level", 0);
-                local sSchool = DB.getValue(node, "school", "");
-                local sCastingTime = DB.getValue(node, "castingtime", "");
-                local sComponents = DB.getValue(node, "components", "");
-                local sDuration = DB.getValue(node, "duration", "");
-                local sGroup = DB.getValue(node, "group", "");
-                local sRange = DB.getValue(node, "range", "");
-
-                local rPower = { 
-                    sName = sName, 
-                    nLevel = nLevel,
-                    sSchool = sSchool,
-                    sCastingTime = sCastingTime,
-                    sComponents = sComponents,
-                    sDuration = sDuration,
-                    sGroup = sGroup,
-                    sRange = sRange
-                };
-                local rEventData = {
-                    rSource = rActor,
-                    rPower = rPower
-                };
-                
-                TriggerManager.fireEvent(
-                    CharDamageTMT_5E.rPowerUsedEvent.sName, 
-                    rEventData);
-            end
-        </script>
-    </windowclass>
+	<windowclass name="power_item" merge="join" ruleset="5E">
+		<script file="campaign/5e/scripts/record_power.lua" />
+	</windowclass>
 </root>
\ No newline at end of file
diff --git a/campaign/5e/scripts/record_power.lua b/campaign/5e/scripts/record_power.lua
new file mode 100644
index 0000000..8a6c9c1
--- /dev/null
+++ b/campaign/5e/scripts/record_power.lua
@@ -0,0 +1,47 @@
+local fUsePowerOriginal;
+
+function onInit()
+	fUsePowerOriginal = super.usePower;
+	super.usePower = usePower;
+
+	if super and super.onInit then
+		super.onInit();
+	end
+end
+
+function usePower(bShowFull)
+	fUsePowerOriginal(bShowFull);
+	
+	local node = getDatabaseNode();
+
+	local charnode = node.getChild("...");
+	local rActor = ActorManager.resolveActor(charnode);
+
+	local sName = DB.getValue(node, "name", "");
+	local nLevel = DB.getValue(node, "level", 0);
+	local sSchool = DB.getValue(node, "school", "");
+	local sCastingTime = DB.getValue(node, "castingtime", "");
+	local sComponents = DB.getValue(node, "components", "");
+	local sDuration = DB.getValue(node, "duration", "");
+	local sGroup = DB.getValue(node, "group", "");
+	local sRange = DB.getValue(node, "range", "");
+
+	local rPower = { 
+		sName = sName, 
+		nLevel = nLevel,
+		sSchool = sSchool,
+		sCastingTime = sCastingTime,
+		sComponents = sComponents,
+		sDuration = sDuration,
+		sGroup = sGroup,
+		sRange = sRange
+	};
+	local rEventData = {
+		rSource = rActor,
+		rPower = rPower
+	};
+	
+	TriggerManager.fireEvent(
+		CharDamageTMT_5E.rPowerUsedEvent.sName, 
+		rEventData);
+end
\ No newline at end of file
diff --git a/scripts/manager_action_attack_4e_tmt.lua b/scripts/manager_action_attack_4e_tmt.lua
index 5f2a425..68ca7d3 100644
--- a/scripts/manager_action_attack_4e_tmt.lua
+++ b/scripts/manager_action_attack_4e_tmt.lua
@@ -4,78 +4,78 @@
 --
 
 rAfterAttackRollEvent = {
-    sName = "after_attack_event",
-    aParameters = {
-        "rSource",
-        "rTarget",
-        "nAttack",
-        "sDesc",
-        "sResults"
-    }
+	sName = "after_attack_event",
+	aParameters = {
+		"rSource",
+		"rTarget",
+		"nAttack",
+		"sDesc",
+		"sResults"
+	}
 }
 rAttackResultCondition = nil;
 
 local fApplyAttackOriginal;
 
 function onInit()
-    fApplyAttackOriginal = ActionAttack.applyAttack;
-    ActionAttack.applyAttack = applyAttack;
+	fApplyAttackOriginal = ActionAttack.applyAttack;
+	ActionAttack.applyAttack = applyAttack;
 
-    initializeConditions();
-    TriggerManager.defineEvent(rAfterAttackRollEvent);
+	initializeConditions();
+	TriggerManager.defineEvent(rAfterAttackRollEvent);
 end
 
 function initializeConditions()
-    rAttackResultCondition = {
-        sName = "attack_result_condition",
-        fCondition = attackMatchesResultCondition,
-        aRequriedParameters = {
-            "rSource",
-            "rTarget",
-            "nAttack",
-            "sResults"
-        },
-        aConfigurableParameters = {
-            {
-                sName = "sAttackResult",
-                sDisplay = "attack_result_property_parameter",
-                sType = "combo",
-                aDefinedValues = {
-                    "attack_result_property_hit",
-                    "attack_result_property_miss",
-                    "attack_result_property_critical",
-                    "attack_result_property_fumble"
-                }
-            }
-        }
-    }
+	rAttackResultCondition = {
+		sName = "attack_result_condition",
+		fCondition = attackMatchesResultCondition,
+		aRequriedParameters = {
+			"rSource",
+			"rTarget",
+			"nAttack",
+			"sResults"
+		},
+		aConfigurableParameters = {
+			{
+				sName = "sAttackResult",
+				sDisplay = "attack_result_property_parameter",
+				sType = "combo",
+				aDefinedValues = {
+					"attack_result_property_hit",
+					"attack_result_property_miss",
+					"attack_result_property_critical",
+					"attack_result_property_fumble"
+				}
+			}
+		}
+	}
 
-    TriggerManager.defineCondition(rAttackResultCondition);
+	TriggerManager.defineCondition(rAttackResultCondition);
 end
 
 function attackMatchesResultCondition(rTriggerData, rEventData)
-    if rTriggerData.sAttackResult == "attack_result_property_hit" then
-        return string.match(rEventData.sResults, "%[HIT%]") ~= nil or string.match(rEventData.sResults, "%[AUTOMATIC HIT%]") ~= nil;
-    elseif rTriggerData.sAttackResult == "attack_result_property_critical" then
-        return string.match(rEventData.sResults, "%[CRITICAL HIT%]") ~= nil;
-    elseif rTriggerData.sAttackResult == "attack_result_property_miss" then
-        return string.match(rEventData.sResults, "%[MISS%]") ~= nil
-    elseif rTriggerData.sAttackResult == "attack_result_property_fumble" then
-        return string.match(rEventData.sResults, "%[AUTOMATIC MISS%]") ~= nil or string.match(rEventData.sResults, "%[FUMBLE%]") ~= nil
-    end
+	if rTriggerData.sAttackResult == "attack_result_property_hit" then
+		return string.match(rEventData.sResults, "%[HIT%]") ~= nil or string.match(rEventData.sResults, "%[AUTOMATIC HIT%]") ~= nil;
+	elseif rTriggerData.sAttackResult == "attack_result_property_critical" then
+		return string.match(rEventData.sResults, "%[CRITICAL HIT%]") ~= nil;
+	elseif rTriggerData.sAttackResult == "attack_result_property_miss" then
+		return string.match(rEventData.sResults, "%[MISS%]") ~= nil
+	elseif rTriggerData.sAttackResult == "attack_result_property_fumble" then
+		return string.match(rEventData.sResults, "%[AUTOMATIC MISS%]") ~= nil or string.match(rEventData.sResults, "%[FUMBLE%]") ~= nil
+	end
 
-    return false;
+	return false;
 end
 
 function applyAttack(rSource, rTarget, sDesc, nTotal, sResults, bSecret)
-    fApplyAttackOriginal(rSource, rTarget, sDesc, nTotal, sResults, bSecret);
+	fApplyAttackOriginal(rSource, rTarget, sDesc, nTotal, sResults, bSecret);
 
-    local rEventData = {
-        rSource = rSource,
-        rTarget = rTarget,
-        nAttack = nTotal,
-        sDesc = sDesc,
-        sResults = sResults
-    }
-    TriggerManager.fireEvent(rAfterAttackRollEvent.sName, rEventData);
+	local rEventData = {
+		rSource = rSource,
+		rTarget = rTarget,
+		nAttack = nTotal,
+		sDesc = sDesc,
+		sResults = sResults
+	}
+	TriggerManager.fireEvent(rAfterAttackRollEvent.sName, rEventData);
 end
\ No newline at end of file
diff --git a/scripts/manager_action_attack_5e_tmt.lua b/scripts/manager_action_attack_5e_tmt.lua
index 6ab952a..ff72e3c 100644
--- a/scripts/manager_action_attack_5e_tmt.lua
+++ b/scripts/manager_action_attack_5e_tmt.lua
@@ -4,78 +4,78 @@
 --
 
 rAfterAttackRollEvent = {
-    sName = "after_attack_event",
-    aParameters = {
-        "rSource",
-        "rTarget",
-        "nAttack",
-        "sDesc",
-        "sResults"
-    }
+	sName = "after_attack_event",
+	aParameters = {
+		"rSource",
+		"rTarget",
+		"nAttack",
+		"sDesc",
+		"sResults"
+	}
 }
 rAttackResultCondition = nil;
 
 local fApplyAttackOriginal;
 
 function onInit()
-    fApplyAttackOriginal = ActionAttack.applyAttack;
-    ActionAttack.applyAttack = applyAttack;
+	fApplyAttackOriginal = ActionAttack.applyAttack;
+	ActionAttack.applyAttack = applyAttack;
 
-    initializeConditions();
-    TriggerManager.defineEvent(rAfterAttackRollEvent);
+	initializeConditions();
+	TriggerManager.defineEvent(rAfterAttackRollEvent);
 end
 
 function initializeConditions()
-    rAttackResultCondition = {
-        sName = "attack_result_condition",
-        fCondition = attackMatchesResultCondition,
-        aRequriedParameters = {
-            "rSource",
-            "rTarget",
-            "nAttack",
-            "sResults"
-        },
-        aConfigurableParameters = {
-            {
-                sName = "sAttackResult",
-                sDisplay = "attack_result_property_parameter",
-                sType = "combo",
-                aDefinedValues = {
-                    "attack_result_property_hit",
-                    "attack_result_property_miss",
-                    "attack_result_property_critical",
-                    "attack_result_property_fumble"
-                }
-            }
-        }
-    }
+	rAttackResultCondition = {
+		sName = "attack_result_condition",
+		fCondition = attackMatchesResultCondition,
+		aRequriedParameters = {
+			"rSource",
+			"rTarget",
+			"nAttack",
+			"sResults"
+		},
+		aConfigurableParameters = {
+			{
+				sName = "sAttackResult",
+				sDisplay = "attack_result_property_parameter",
+				sType = "combo",
+				aDefinedValues = {
+					"attack_result_property_hit",
+					"attack_result_property_miss",
+					"attack_result_property_critical",
+					"attack_result_property_fumble"
+				}
+			}
+		}
+	}
 
-    TriggerManager.defineCondition(rAttackResultCondition);
+	TriggerManager.defineCondition(rAttackResultCondition);
 end
 
 function attackMatchesResultCondition(rTriggerData, rEventData)
-    if rTriggerData.sAttackResult == "attack_result_property_hit" then
-        return string.match(rEventData.sResults, "%[HIT%]") ~= nil or string.match(rEventData.sResults, "%[AUTOMATIC HIT%]") ~= nil;
-    elseif rTriggerData.sAttackResult == "attack_result_property_critical" then
-        return string.match(rEventData.sResults, "%[CRITICAL HIT%]") ~= nil;
-    elseif rTriggerData.sAttackResult == "attack_result_property_miss" then
-        return string.match(rEventData.sResults, "%[MISS%]") ~= nil
-    elseif rTriggerData.sAttackResult == "attack_result_property_fumble" then
-        return string.match(rEventData.sResults, "%[AUTOMATIC MISS%]") ~= nil or string.match(rEventData.sResults, "%[FUMBLE%]") ~= nil
-    end
+	if rTriggerData.sAttackResult == "attack_result_property_hit" then
+		return string.match(rEventData.sResults, "%[HIT%]") ~= nil or string.match(rEventData.sResults, "%[AUTOMATIC HIT%]") ~= nil;
+	elseif rTriggerData.sAttackResult == "attack_result_property_critical" then
+		return string.match(rEventData.sResults, "%[CRITICAL HIT%]") ~= nil;
+	elseif rTriggerData.sAttackResult == "attack_result_property_miss" then
+		return string.match(rEventData.sResults, "%[MISS%]") ~= nil
+	elseif rTriggerData.sAttackResult == "attack_result_property_fumble" then
+		return string.match(rEventData.sResults, "%[AUTOMATIC MISS%]") ~= nil or string.match(rEventData.sResults, "%[FUMBLE%]") ~= nil
+	end
 
-    return false;
+	return false;
 end
 
 function applyAttack(rSource, rTarget, bSecret, sAttackType, sDesc, nTotal, sResults)
-    fApplyAttackOriginal(rSource, rTarget, bSecret, sAttackType, sDesc, nTotal, sResults);
+	fApplyAttackOriginal(rSource, rTarget, bSecret, sAttackType, sDesc, nTotal, sResults);
 
-    local rEventData = {
-        rSource = rSource,
-        rTarget = rTarget,
-        nAttack = nTotal,
-        sDesc = sDesc,
-        sResults = sResults
-    }
-    TriggerManager.fireEvent(rAfterAttackRollEvent.sName, rEventData);
+	local rEventData = {
+		rSource = rSource,
+		rTarget = rTarget,
+		nAttack = nTotal,
+		sDesc = sDesc,
+		sResults = sResults
+	}
+	TriggerManager.fireEvent(rAfterAttackRollEvent.sName, rEventData);
 end
\ No newline at end of file
diff --git a/scripts/manager_action_damage_4e_tmt.lua b/scripts/manager_action_damage_4e_tmt.lua
index f1da9f9..99135b7 100644
--- a/scripts/manager_action_damage_4e_tmt.lua
+++ b/scripts/manager_action_damage_4e_tmt.lua
@@ -6,17 +6,17 @@
 rApplyHpCombatantAction = nil;
 
 function onInit()
-    initializeActions();
+	initializeActions();
 end
 
 function initializeActions()
-    -- TODO: Add more parameters to this action
-    -- For spending healing surges, maybe adding dice instead of a flat value
-    rApplyHpCombatantAction = {
-        sName = "apply_heal_to_combatant_action",
-        fAction = applyHpToCombatant,
-        aConfigurableParameters = {
-            {
+	-- TODO: Add more parameters to this action
+	-- For spending healing surges, maybe adding dice instead of a flat value
+	rApplyHpCombatantAction = {
+		sName = "apply_heal_to_combatant_action",
+		fAction = applyHpToCombatant,
+		aConfigurableParameters = {
+			{
 				sName = "sCombatant",
 				sDisplay = "combatant_parameter",
 				sType = "combo",
@@ -31,60 +31,60 @@ function initializeActions()
 					},
 				}
 			},
-            {
-                sName = "sLabel",
-                sDisplay = "apply_heal_label_parameter",
-                sType = "string"
-            },
-            {
-                sName = "sType",
-                sDisplay = "apply_heal_type_parameter",
-                sType = "combo",
-                aDefinedValues = {
-                    "apply_heal_type_hitpoints",
-                    "apply_heal_type_temphitpoints"
-                }
-            },
-            {
-                sName = "nValue",
-                sDisplay = "apply_heal_value_parameter",
-                sType = "number"
-            }
-        }
-    }
+			{
+				sName = "sLabel",
+				sDisplay = "apply_heal_label_parameter",
+				sType = "string"
+			},
+			{
+				sName = "sType",
+				sDisplay = "apply_heal_type_parameter",
+				sType = "combo",
+				aDefinedValues = {
+					"apply_heal_type_hitpoints",
+					"apply_heal_type_temphitpoints"
+				}
+			},
+			{
+				sName = "nValue",
+				sDisplay = "apply_heal_value_parameter",
+				sType = "number"
+			}
+		}
+	}
 
-    TriggerManager.defineAction(rApplyHpCombatantAction);
+	TriggerManager.defineAction(rApplyHpCombatantAction);
 end
 
 function applyHpToCombatant(rTriggerData, rEventData)
-    local rActor = nil;
-    if rTriggerData.sCombatant == "source_subject" then
+	local rActor = nil;
+	if rTriggerData.sCombatant == "source_subject" then
 		rActor = rEventData.rSource;
 	elseif rTriggerData.sCombatant == "target_subject" then
 		rActor = rEventData.rTarget;
 	end
 
-    local rAction = {};
-    rAction.type = "heal";
-    rAction.name = rTriggerData.sLabel or "";
-    rAction.order = 0;
-    rAction.range = "";
-    rAction.sTargeting = "self";
-    rAction.clauses = {};
+	local rAction = {};
+	rAction.type = "heal";
+	rAction.name = rTriggerData.sLabel or "";
+	rAction.order = 0;
+	rAction.range = "";
+	rAction.sTargeting = "self";
+	rAction.clauses = {};
 
-    local rHealClause = {};
-    rHealClause.dicestr = "" .. rTriggerData.nValue;
-    rHealClause.cost = 0;
-    rHealClause.basemult = 0;
-    rHealClause.stat = {};
+	local rHealClause = {};
+	rHealClause.dicestr = "" .. rTriggerData.nValue;
+	rHealClause.cost = 0;
+	rHealClause.basemult = 0;
+	rHealClause.stat = {};
 
-    if rTriggerData.sType == "apply_heal_type_hitpoints" then
-        rHealClause.subtype = "";
-    elseif rTriggerData.sType == "apply_heal_type_temphitpoints" then
-        rHealClause.subtype = "temp";
-    end
+	if rTriggerData.sType == "apply_heal_type_hitpoints" then
+		rHealClause.subtype = "";
+	elseif rTriggerData.sType == "apply_heal_type_temphitpoints" then
+		rHealClause.subtype = "temp";
+	end
 
-    table.insert(rAction.clauses, rHealClause);
-    
-    ActionHeal.performRoll(nil, rActor, rAction)
+	table.insert(rAction.clauses, rHealClause);
+	
+	ActionHeal.performRoll(nil, rActor, rAction)
 end
\ No newline at end of file
diff --git a/scripts/manager_char_4e_tmt.lua b/scripts/manager_char_4e_tmt.lua
index a8aceaa..ca997c6 100644
--- a/scripts/manager_char_4e_tmt.lua
+++ b/scripts/manager_char_4e_tmt.lua
@@ -5,70 +5,65 @@
 
 rPowerContainsDataCondition = nil;
 rPowerUsedEvent = {
-    sName = "power_used_event",
-    aParameters = { 
-        "rSource",
-        "rPower"
-    };
+	sName = "power_used_event",
+	aParameters = { 
+		"rSource",
+		"rPower"
+	};
 };
 
 function onInit()
-    TriggerManager.defineEvent(rPowerUsedEvent);
-    initializeConditions();
+	TriggerManager.defineEvent(rPowerUsedEvent);
+	initializeConditions();
 end
 
 function initializeConditions()
-    rPowerContainsDataCondition = {
-        sName = "power_used_contains_data",
-        fCondition  = powerContainsDataCondition,
-        aRequiredParameters = {
-            "rSource",
-            "rPower"
-        },
-        aConfigurableParameters = {
-            {
-                sName = "sPowerProperty",
-                sDisplay = "power_used_property_parameter",
-                sType = "combo",
-                aDefinedValues = {
-                    "power_used_property_name",
-                    "power_used_property_keywords",
-                    "power_used_property_recharge",
-                    "power_used_property_action",
-                    "power_used_property_range",
-                }
-            },
-            {
-                sName = "sPowerContains",
-                sDisplay = "power_used_contains_parameter",
-                sType = "string"
-            }
-        }
-    }
+	rPowerContainsDataCondition = {
+		sName = "power_used_contains_data",
+		fCondition  = powerContainsDataCondition,
+		aRequiredParameters = {
+			"rSource",
+			"rPower"
+		},
+		aConfigurableParameters = {
+			{
+				sName = "sPowerProperty",
+				sDisplay = "power_used_property_parameter",
+				sType = "combo",
+				aDefinedValues = {
+					"power_used_property_name",
+					"power_used_property_keywords",
+					"power_used_property_recharge",
+					"power_used_property_action",
+					"power_used_property_range",
+				}
+			},
+			{
+				sName = "sPowerContains",
+				sDisplay = "power_used_contains_parameter",
+				sType = "string"
+			}
+		}
+	}
 
-    TriggerManager.defineCondition(rPowerContainsDataCondition);
+	TriggerManager.defineCondition(rPowerContainsDataCondition);
 end
 
 function powerContainsDataCondition(rTriggerData, rEventData)
-    -- If contain property is empty, return true
-    if (rTriggerData.sPowerContains or "") == "" then
-        return true;
-    end
-
-    local sData = "";
-    if rTriggerData.sPowerProperty == "power_used_property_name" then
-        sData = rEventData.rPower.sName;
-    elseif rTriggerData.sPowerProperty == "power_used_property_keywords" then
-        sData = rEventData.rPower.sKeywords;
-    elseif rTriggerData.sPowerProperty == "power_used_property_recharge" then
-        sData = rEventData.rPower.sRecharge;
-    elseif rTriggerData.sPowerProperty == "power_used_property_action" then
-        sData = rEventData.rPower.sAction;
-    elseif rTriggerData.sPowerProperty == "power_used_property_range" then
-        sData = rEventData.rPower.sRange;
-    end
-    if string.find(sData:lower(), rTriggerData.sPowerContains:lower()) then
-        return true;
-    end
-    return false;
+	local sData = "";
+	if rTriggerData.sPowerProperty == "power_used_property_name" then
+		sData = rEventData.rPower.sName;
+	elseif rTriggerData.sPowerProperty == "power_used_property_keywords" then
+		sData = rEventData.rPower.sKeywords;
+	elseif rTriggerData.sPowerProperty == "power_used_property_recharge" then
+		sData = rEventData.rPower.sRecharge;
+	elseif rTriggerData.sPowerProperty == "power_used_property_action" then
+		sData = rEventData.rPower.sAction;
+	elseif rTriggerData.sPowerProperty == "power_used_property_range" then
+		sData = rEventData.rPower.sRange;
+	end
+	if string.find(sData:lower(), rTriggerData.sPowerContains:lower()) then
+		return true;
+	end
+	return false;
 end
\ No newline at end of file
diff --git a/scripts/manager_chat_tmt.lua b/scripts/manager_chat_tmt.lua
index 842908b..9336ab9 100644
--- a/scripts/manager_chat_tmt.lua
+++ b/scripts/manager_chat_tmt.lua
@@ -6,31 +6,31 @@
 rSendChatMessageAction = nil;
 
 function onInit()
-    initializeActions();
+	initializeActions();
 end
 
 function initializeActions()
-    rSendChatMessageAction = {
-        sName = "send_chat_message_action",
-        fAction = sendChatMessage,
-        aConfigurableParameters = {
-            {
-                sName = "sMessage",
-                sDisplay = "chat_message_parameter",
-                sType = "string"   
-            }
-        }
-    }
+	rSendChatMessageAction = {
+		sName = "send_chat_message_action",
+		fAction = sendChatMessage,
+		aConfigurableParameters = {
+			{
+				sName = "sMessage",
+				sDisplay = "chat_message_parameter",
+				sType = "string"   
+			}
+		}
+	}
 
-    TriggerManager.defineAction(rSendChatMessageAction);
+	TriggerManager.defineAction(rSendChatMessageAction);
 end
 
 function sendChatMessage(rTriggerData, rEventData)
-    local msg = {
-        sender = "",
-        font = "msgfont",
-        text = rTriggerData.sMessage,
-        icon = "TriggerMeTimbers"
-    }
-    Comm.deliverChatMessage(msg);
+	local msg = {
+		sender = "",
+		font = "msgfont",
+		text = rTriggerData.sMessage,
+		icon = "TriggerMeTimbers"
+	}
+	Comm.deliverChatMessage(msg);
 end
\ No newline at end of file

From 7a1e790eb3e25649bd991777aa667a33c7ac452e Mon Sep 17 00:00:00 2001
From: Shane Parker <shane.tim.parker@ea.com>
Date: Tue, 17 May 2022 16:12:47 -0400
Subject: [PATCH 4/8] Added support for event descriptions

---
 scripts/manager_action_damage_5e_tmt.lua |  1 +
 scripts/manager_chat_tmt.lua             |  2 +-
 strings/strings.xml                      |  1 +
 triggers/scripts/tooltipcombobox.lua     | 70 ++++++++++++++++++++++++
 triggers/scripts/triggerevent.lua        |  5 +-
 triggers/template_triggers.xml           |  6 ++
 triggers/triggers.xml                    | 16 +++---
 7 files changed, 90 insertions(+), 11 deletions(-)
 create mode 100644 triggers/scripts/tooltipcombobox.lua

diff --git a/scripts/manager_action_damage_5e_tmt.lua b/scripts/manager_action_damage_5e_tmt.lua
index 38c372f..eb42336 100644
--- a/scripts/manager_action_damage_5e_tmt.lua
+++ b/scripts/manager_action_damage_5e_tmt.lua
@@ -17,6 +17,7 @@ local rDamageOutput = nil;
 local bPrepareForBeforeDamageEvent = false;
 
 rBeforeDamageTakenEvent = {
+	sDescription = "before_damage_taken_event_description",
 	sName = "before_damage_taken_event",
 	aParameters = {"rSource", "rTarget", "nDamage", "nWounds", "nHitpoints", "nTemporaryHitpoints"}
 };
diff --git a/scripts/manager_chat_tmt.lua b/scripts/manager_chat_tmt.lua
index 9336ab9..330a7ce 100644
--- a/scripts/manager_chat_tmt.lua
+++ b/scripts/manager_chat_tmt.lua
@@ -17,7 +17,7 @@ function initializeActions()
 			{
 				sName = "sMessage",
 				sDisplay = "chat_message_parameter",
-				sType = "string"   
+				sType = "string"
 			}
 		}
 	}
diff --git a/strings/strings.xml b/strings/strings.xml
index d47cf35..a2f0a20 100644
--- a/strings/strings.xml
+++ b/strings/strings.xml
@@ -20,6 +20,7 @@
 	<string name="trigger_label_parameters">Parameters</string>
 
 	<string name="before_damage_taken_event">Before Damage Taken</string>
+	<string name="before_damage_taken_event_description">An event that occurs after accounting for any reistances, vulnerabilities, etc, and before the target has any adjustments made to their hit points.</string>
 	<string name="dice_rolled_event">Dice Rolled</string>
 	<string name="power_used_event">Power Used</string>
 	<string name="after_attack_event">After Attack Roll</string>
diff --git a/triggers/scripts/tooltipcombobox.lua b/triggers/scripts/tooltipcombobox.lua
new file mode 100644
index 0000000..d090b8a
--- /dev/null
+++ b/triggers/scripts/tooltipcombobox.lua
@@ -0,0 +1,70 @@
+-- 
+-- Please see the license.html file included with this distribution for 
+-- attribution and copyright information.
+--
+
+local showListOriginal;
+local setListValueOriginal;
+
+local tTooltips = {};
+
+function onInit()
+	showListOriginal = super.showList;
+	super.showList = showList;
+	setListValueOriginal = super.setListValue;
+	super.setListValue = setListValue;
+
+	super.onInit();
+end
+
+function showList()
+	local bShouldUpdateAll = getListControl() == nil;
+	showListOriginal();
+
+	if bShouldUpdateAll then
+		setItemTooltip(getListControl());
+	end
+end
+
+function setListValue(sValue)
+	setListValueOriginal(sValue);
+	local sTooltip = tTooltips[getSelectedValue()];
+	if (sTooltip or "") ~= "" then
+		setTooltipText(sTooltip);
+	end
+end
+
+function addTooltip(sValue, sTooltip)
+	if (sTooltip or "") == "" then
+		return;
+	end
+
+	tTooltips[sValue] = sTooltip;
+	local listControl = getListControl();
+	setItemTooltip(listControl, sValue, sTooltip);
+end
+
+function getListControl()
+	local sName = getName() or "";
+	local sList = sName .. "_cblist";
+	return window[sList];
+end
+
+function setItemTooltip(listControl, sValue, sTooltip)
+	if not listControl then
+		return;
+	end
+
+	for _,winItem in ipairs(listControl.getWindows()) do
+		if sValue then
+			if sValue == winItem.Value.getValue() then
+				winItem.Text.setTooltipText(sTooltip);
+			end
+		else
+			sTooltip = tTooltips[winItem.Value.getValue()];
+			if sTooltip then
+				winItem.Text.setTooltipText(sTooltip);
+			end
+		end
+	end
+end
\ No newline at end of file
diff --git a/triggers/scripts/triggerevent.lua b/triggers/scripts/triggerevent.lua
index 77241a1..7234bb8 100644
--- a/triggers/scripts/triggerevent.lua
+++ b/triggers/scripts/triggerevent.lua
@@ -41,8 +41,9 @@ function getEventName()
 end
 
 function initializeEventList()
-	for sEventName,_ in pairs(TriggerManager.getEventDefinitions()) do
-		eventname.add(sEventName, Interface.getString(sEventName));
+	for _,rEvent in pairs(TriggerManager.getEventDefinitions()) do
+		eventname.add(rEvent.sName, Interface.getString(rEvent.sName));
+		eventname.addTooltip(rEvent.sName, Interface.getString(rEvent.sDescription))
 	end
 
 	local sEventName = DB.getValue(getDatabaseNode(), "eventname");
diff --git a/triggers/template_triggers.xml b/triggers/template_triggers.xml
index 42abacb..65067e4 100644
--- a/triggers/template_triggers.xml
+++ b/triggers/template_triggers.xml
@@ -22,4 +22,10 @@
 			<skipempty />
 		</windowlist>
 	</template>
+
+	<template name="tooltipcomboboxc">
+		<comboboxc>
+			<script file="triggers/scripts/tooltipcombobox.lua" />
+		</comboboxc>
+	</template>
 </root>
\ No newline at end of file
diff --git a/triggers/triggers.xml b/triggers/triggers.xml
index 6131894..2098436 100644
--- a/triggers/triggers.xml
+++ b/triggers/triggers.xml
@@ -127,7 +127,7 @@
 				</anchored>
 			</button_idelete>
 			<!-- TODO changing event likely invalidates conditions, handle or make explicit at creation of event? -->
-			<comboboxc name="eventname">
+			<tooltipcomboboxc name="eventname">
 				<anchored height="20">
 					<left parent="label_event_name" anchor="right" offset="10" />
 					<top />
@@ -135,7 +135,7 @@
 				</anchored>
 				<listmaxsize>12</listmaxsize>
 				<listdirection>down</listdirection>
-			</comboboxc>
+			</tooltipcomboboxc>
 
 			<label name="label_conditions">
 				<anchored to="label_event_name">
@@ -211,7 +211,7 @@
 				</anchored>
 				<static textres="trigger_label_inverted" />
 			</label>
-			<comboboxc name="conditionname">
+			<tooltipcomboboxc name="conditionname">
 				<anchored height="20">
 					<left parent="label_condition_name" anchor="right" offset="10" />
 					<top />
@@ -219,7 +219,7 @@
 				</anchored>
 				<listmaxsize>12</listmaxsize>
 				<listdirection>down</listdirection>
-			</comboboxc>
+			</tooltipcomboboxc>
 			<parameterlist />
 		</sheetdata>
 	</windowclass>
@@ -249,7 +249,7 @@
 					<right offset="-5"/>
 				</anchored>
 			</button_idelete>
-			<comboboxc name="actionname">
+			<tooltipcomboboxc name="actionname">
 				<anchored height="20">
 					<left parent="label_action_name" anchor="right" offset="10" />
 					<top />
@@ -257,7 +257,7 @@
 				</anchored>
 				<listmaxsize>12</listmaxsize>
 				<listdirection>down</listdirection>
-			</comboboxc>
+			</tooltipcomboboxc>
 			<parameterlist />
 
 			<line_column name="divider">
@@ -316,7 +316,7 @@
 					<top anchor="bottom" relation="current" offset="7" />
 				</anchored>
 			</label>
-			<comboboxc name="value">
+			<tooltipcomboboxc name="value">
 				<script file="triggers/scripts/parametercombobox.lua" />
 				<anchored to="contentanchor">
 					<left offset="110" />
@@ -325,7 +325,7 @@
 				</anchored>
 				<listdirection>down</listdirection>
 				<listmaxsize>6</listmaxsize>
-			</comboboxc>
+			</tooltipcomboboxc>
 		</sheetdata>
 	</windowclass>
 

From e234c57f7298cae892ad515d778f22cbb4fbbb72 Mon Sep 17 00:00:00 2001
From: Shane Parker <shane.tim.parker@ea.com>
Date: Wed, 18 May 2022 03:15:43 -0400
Subject: [PATCH 5/8] Added support for condition, action, parameter, and combo
 parameter value descriptions.

---
 scripts/data_trigger.lua                 | 19 ++++++++++++++
 scripts/manager_action_damage_4e_tmt.lua | 16 +-----------
 scripts/manager_action_damage_5e_tmt.lua | 16 +-----------
 scripts/manager_char_5e_tmt.lua          | 16 +-----------
 scripts/manager_effect_tmt.lua           | 32 ++----------------------
 strings/strings.xml                      |  3 +++
 triggers/scripts/parametercombobox.lua   |  1 +
 triggers/scripts/triggeraction.lua       |  1 +
 triggers/scripts/triggercondition.lua    |  1 +
 triggers/scripts/triggerparameter.lua    |  1 +
 10 files changed, 31 insertions(+), 75 deletions(-)

diff --git a/scripts/data_trigger.lua b/scripts/data_trigger.lua
index 785fa38..ccc3251 100644
--- a/scripts/data_trigger.lua
+++ b/scripts/data_trigger.lua
@@ -6,6 +6,25 @@
 rIsSourceCondition = nil;
 rIsTargetCondition = nil;
 
+rCombatantParameter = {
+	sName = "sCombatant",
+	sDisplay = "combatant_parameter",
+	sDescription = "combatant_parameter_description",
+	sType = "combo",
+	aDefinedValues = {
+		{
+			sValue = "source_subject",
+			sDescription = "source_subject_description",
+			aRequiredParameters = {"rSource"}
+		},
+		{
+			sValue = "target_subject",
+			sDescription = "target_subject_description",
+			aRequiredParameters = {"rTarget"}
+		},
+	}
+};
+
 rComparisonParameter = {
 	sName = "sComparison",
 	sDisplay = "comparison_parameter",
diff --git a/scripts/manager_action_damage_4e_tmt.lua b/scripts/manager_action_damage_4e_tmt.lua
index 99135b7..a4e5a22 100644
--- a/scripts/manager_action_damage_4e_tmt.lua
+++ b/scripts/manager_action_damage_4e_tmt.lua
@@ -16,21 +16,7 @@ function initializeActions()
 		sName = "apply_heal_to_combatant_action",
 		fAction = applyHpToCombatant,
 		aConfigurableParameters = {
-			{
-				sName = "sCombatant",
-				sDisplay = "combatant_parameter",
-				sType = "combo",
-				aDefinedValues = {
-					{
-						sValue = "source_subject",
-						aRequiredParameters = {"rSource"}
-					},
-					{
-						sValue = "target_subject",
-						aRequiredParameters = {"rTarget"}
-					},
-				}
-			},
+			TriggerData.rCombatantParameter,
 			{
 				sName = "sLabel",
 				sDisplay = "apply_heal_label_parameter",
diff --git a/scripts/manager_action_damage_5e_tmt.lua b/scripts/manager_action_damage_5e_tmt.lua
index eb42336..0a8781a 100644
--- a/scripts/manager_action_damage_5e_tmt.lua
+++ b/scripts/manager_action_damage_5e_tmt.lua
@@ -71,21 +71,7 @@ function initializeConditions()
 		sName = "combatant_has_temporary_hit_points_condition",
 		fCondition = combatantHasTemporaryHitpoints,
 		aConfigurableParameters = {
-			{
-				sName = "sCombatant",
-				sDisplay = "combatant_parameter",
-				sType = "combo",
-				aDefinedValues = {
-					{
-						sValue = "source_subject",
-						aRequiredParameters = {"rSource"}
-					},
-					{
-						sValue = "target_subject",
-						aRequiredParameters = {"rTarget"}
-					},
-				}
-			},
+			TriggerData.rCombatantParameter,
 			TriggerData.rComparisonParameter,
 			{
 				sName = "nCompareAgainst",
diff --git a/scripts/manager_char_5e_tmt.lua b/scripts/manager_char_5e_tmt.lua
index 24a3a8e..3654682 100644
--- a/scripts/manager_char_5e_tmt.lua
+++ b/scripts/manager_char_5e_tmt.lua
@@ -26,21 +26,7 @@ function initializeConditions()
 		fCondition = creatureHasTraitCondition,
 		aRequiredParameters = {},
 		aConfigurableParameters = {
-			{
-				sName = "sCreature",
-				sDisplay = "creature_parameter",
-				sType = "combo",
-				aDefinedValues = {
-					{
-						sValue = "source_subject",
-						aRequiredParameters = {"rSource"}
-					},
-					{
-						sValue = "target_subject",
-						aRequiredParameters = {"rTarget"}
-					},
-				}
-			},
+			TriggerData.rCombatantParameter, -- TODO either rename the condition or duplicate the parameter and change the name
 			{
 				sName = "sTraitName",
 				sDisplay = "trait_name_parameter",
diff --git a/scripts/manager_effect_tmt.lua b/scripts/manager_effect_tmt.lua
index 19e904f..940f449 100644
--- a/scripts/manager_effect_tmt.lua
+++ b/scripts/manager_effect_tmt.lua
@@ -17,21 +17,7 @@ function initializeConditions()
 		sName = "combatant_has_effect_condition",
 		fCondition = combatantHasEffectCondition,
 		aConfigurableParameters = {
-			{
-				sName = "sCombatant",
-				sDisplay = "combatant_parameter",
-				sType = "combo",
-				aDefinedValues = {
-					{
-						sValue = "source_subject",
-						aRequiredParameters = {"rSource"}
-					},
-					{
-						sValue = "target_subject",
-						aRequiredParameters = {"rTarget"}
-					},
-				}
-			},
+			TriggerData.rCombatantParameter,
 			{
 				sName = "sEffectName",
 				sDisplay = "effect_name_parameter",
@@ -48,21 +34,7 @@ function initializeActions()
 		sName = "remove_effect_from_combatant_action",
 		fAction = removeCombatantEffect,
 		aConfigurableParameters = {
-			{
-				sName = "sCombatant",
-				sDisplay = "combatant_parameter",
-				sType = "combo",
-				aDefinedValues = {
-					{
-						sValue = "source_subject",
-						aRequiredParameters = {"rSource"}
-					},
-					{
-						sValue = "target_subject",
-						aRequiredParameters = {"rTarget"}
-					},
-				}
-			},
+			TriggerData.rCombatantParameter,
 			{
 				sName = "sEffectName",
 				sDisplay = "effect_name_parameter",
diff --git a/strings/strings.xml b/strings/strings.xml
index a2f0a20..c60c297 100644
--- a/strings/strings.xml
+++ b/strings/strings.xml
@@ -46,6 +46,7 @@
 	<!-- Parameters -->
 	<string name="chat_message_parameter">Chat Message</string>
 	<string name="combatant_parameter">Combatant</string>
+	<string name="combatant_parameter_description">Indicates which combatant is to be used.</string>
 	<string name="comparison_parameter">Comparison</string>
 	<string name="compare_against_parameter">Compare Against</string>
 	<string name="creature_parameter">Creature</string>
@@ -122,7 +123,9 @@
 	<string name="trait_type_trait">Trait</string>
 
 	<string name="source_subject">Source</string>
+	<string name="source_subject_description">The source of the event. E.g. the attacker.</string>
 	<string name="target_subject">Target</string>
+	<string name="target_subject_description">The target of the event. E.g. the defender.</string>
 
 	<string name="unknown_event_error">ERROR: Unknown event ID: %s</string>
 	<string name="unknown_condition_error">ERROR: Unknown condition ID: %s</string>
diff --git a/triggers/scripts/parametercombobox.lua b/triggers/scripts/parametercombobox.lua
index 0198ee7..8294043 100644
--- a/triggers/scripts/parametercombobox.lua
+++ b/triggers/scripts/parametercombobox.lua
@@ -20,6 +20,7 @@ function configure(rParameterInfo, aEventParameters)
 		else
 			if TriggerManager.hasRequiredParameters(vDefinition.aRequiredParameters or {}, aEventParameters) then
 				addValue(vDefinition.sValue);
+				addTooltip(vDefinition.sValue, Interface.getString(vDefinition.sDescription));
 			end
 		end
 	end
diff --git a/triggers/scripts/triggeraction.lua b/triggers/scripts/triggeraction.lua
index c8a5eed..6d90f57 100644
--- a/triggers/scripts/triggeraction.lua
+++ b/triggers/scripts/triggeraction.lua
@@ -23,6 +23,7 @@ function updateEvents(aEventNames)
 	aEventParameters = TriggerManager.getCommonParametersForEvents(aEventNames);
 	for _,rActionDefinition in pairs(TriggerManager.getActionDefinitionsForCommonEventParameters(aEventParameters)) do
 		actionname.add(rActionDefinition.sName, Interface.getString(rActionDefinition.sName));
+		actionname.addTooltip(rActionDefinition.sName, Interface.getString(rActionDefinition.sDescription));
 	end
 
 	local sActionName = DB.getValue(getDatabaseNode(), "actionname");
diff --git a/triggers/scripts/triggercondition.lua b/triggers/scripts/triggercondition.lua
index d2e8ff2..f8b1acb 100644
--- a/triggers/scripts/triggercondition.lua
+++ b/triggers/scripts/triggercondition.lua
@@ -25,6 +25,7 @@ function setEventName(sEventName)
 	aEventParameters = TriggerManager.getParametersForEvent(sEventName)
 	for _,rConditionDefinition in pairs(TriggerManager.getConditionDefinitionsForEventParameters(aEventParameters)) do
 		conditionname.add(rConditionDefinition.sName, Interface.getString(rConditionDefinition.sName));
+		conditionname.addTooltip(rConditionDefinition.sName, Interface.getString(rConditionDefinition.sDescription));
 	end
 
 	local sConditionName = DB.getValue(getDatabaseNode(), "conditionname");
diff --git a/triggers/scripts/triggerparameter.lua b/triggers/scripts/triggerparameter.lua
index ef8f38e..6b323b9 100644
--- a/triggers/scripts/triggerparameter.lua
+++ b/triggers/scripts/triggerparameter.lua
@@ -19,6 +19,7 @@ function configure(rNewParameterInfo, sNewEventParameters)
 	rParameterInfo = rNewParameterInfo;
 	aEventParameters = sNewEventParameters;
 	label.setValue(Interface.getString(rParameterInfo.sDisplay));
+	label.setTooltipText(Interface.getString(rParameterInfo.sDescription));
 	if value.configure then
 		value.configure(rParameterInfo, aEventParameters);
 	end

From 8fd64ac40661942cbac48ecfa27261a117f1af14 Mon Sep 17 00:00:00 2001
From: Shane Parker <shane.tim.parker@ea.com>
Date: Wed, 18 May 2022 05:38:48 -0400
Subject: [PATCH 6/8] Added missing match_against_parameter string

---
 scripts/manager_actions_tmt.lua | 16 +++++++++++++---
 strings/strings.xml             |  8 +++++++-
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/scripts/manager_actions_tmt.lua b/scripts/manager_actions_tmt.lua
index 00f01b8..fc66a60 100644
--- a/scripts/manager_actions_tmt.lua
+++ b/scripts/manager_actions_tmt.lua
@@ -53,11 +53,21 @@ function initializeConditions()
 			{
 				sName = "sMatchAgainst",
 				sDisplay = "match_against_parameter",
+				sDescription = "match_against_parameter_description",
 				sType = "combo",
 				aDefinedValues = {
-					"any_dice",
-					"all_dice",
-					"sum_dice",
+					{
+						sValue = "any_dice",
+						sDescription = "any_dice_description",
+					},
+					{
+						sValue = "all_dice",
+						sDescription = "all_dice_match_against_description",
+					},
+					{
+						sValue = "sum_dice",
+						sDescription = "sum_dice_description",
+					},
 				},
 			},
 			TriggerData.rComparisonParameter,
diff --git a/strings/strings.xml b/strings/strings.xml
index c60c297..4094467 100644
--- a/strings/strings.xml
+++ b/strings/strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <root>
+	<!-- TODO Ensure consistent description "voice" -->
 	<string name="library_recordtype_label_activetrigger">Active Triggers</string>
 	<string name="library_recordtype_empty_activetrigger">&#171; New Trigger &#187;</string>
 	<string name="library_recordtype_label_trigger">Triggers</string>
@@ -55,6 +56,8 @@
 	<string name="effect_name_parameter">Effect Name</string>
 	<string name="include_advantage_parameter">Include Advantage</string>
 	<string name="include_modifiers_parameter">Include Modifiers</string>
+	<string name="match_against_parameter">Compare Against</string>
+	<string name="match_against_parameter_description">How are the dice compared during evaluation?</string>
 	<string name="minimum_parameter">Minimum</string>
 	<string name="modification_parameter">Modification</string>
 	<string name="number_parameter">Number</string>
@@ -73,12 +76,15 @@
 	<string name="less_than_equal_comparison">≤</string>
 
 	<string name="all_dice">All</string>
+	<string name="all_dice_match_against_description">All dice in the roll must satisfy the comparison.</string>
 	<string name="any_dice">Any</string>
+	<string name="any_dice_description">Any one of the dice in the roll must satisfy the comparison.</string>
 	<string name="highest_dice">Highest</string>
 	<string name="lowest_dice">Lowest</string>
 	<string name="matching_dice">Matching</string>
 	<string name="sum_dice">Sum</string>
-	
+	<string name="sum_dice_description">The sum of all dice in the roll must satisfy the comparison.</string>
+
 	<!-- Power contains data condition -->
 	<string name="power_used_contains_data">Power Contains Data</string>
 	<string name="power_used_property_parameter">Property</string>

From 132be41e65f3d640454b7477066a07842bd05347 Mon Sep 17 00:00:00 2001
From: Shane Parker <shane.tim.parker@ea.com>
Date: Thu, 19 May 2022 04:20:07 -0400
Subject: [PATCH 7/8] Fixed dice changing, luacheck cleanup

---
 triggers/scripts/parametercombobox.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/triggers/scripts/parametercombobox.lua b/triggers/scripts/parametercombobox.lua
index 8294043..ab2d63d 100644
--- a/triggers/scripts/parametercombobox.lua
+++ b/triggers/scripts/parametercombobox.lua
@@ -1,5 +1,5 @@
--- 
--- Please see the license.html file included with this distribution for 
+--
+-- Please see the license.html file included with this distribution for
 -- attribution and copyright information.
 --
 

From 415b97cd0fd2ed7cb10e3d7b4bc32c223e096efd Mon Sep 17 00:00:00 2001
From: Shane Parker <shane.tim.parker@ea.com>
Date: Thu, 19 May 2022 04:21:08 -0400
Subject: [PATCH 8/8] For unknown reasons the vast majority of the files were
 uncommitted last time

---
 campaign/4e/char_power.xml                        |  4 ++--
 campaign/4e/scripts/char_power.lua                |  9 +++++++--
 campaign/5e/record_power.xml                      |  4 ++--
 campaign/5e/scripts/record_power.lua              | 15 ++++++++++-----
 graphics/graphics_icons.xml                       |  4 ++++
 scripts/data_library_tmt.lua                      |  4 ++--
 scripts/data_trigger.lua                          |  6 +++---
 scripts/manager_action_attack_4e_tmt.lua          |  4 ++--
 scripts/manager_action_attack_5e_tmt.lua          |  4 ++--
 scripts/manager_action_damage_4e_tmt.lua          |  6 +++---
 scripts/manager_action_damage_5e_tmt.lua          |  7 +++----
 scripts/manager_actions_tmt.lua                   | 15 +++++++++------
 scripts/manager_campaigndata_tmt.lua              |  4 ++--
 scripts/manager_char_4e_tmt.lua                   |  6 +++---
 scripts/manager_char_5e_tmt.lua                   |  6 +++---
 scripts/manager_chat_tmt.lua                      |  4 ++--
 scripts/manager_desktop_tmt.lua                   |  4 ++--
 scripts/manager_effect_tmt.lua                    |  4 ++--
 scripts/manager_trigger.lua                       | 13 ++++++-------
 strings/strings.xml                               |  4 ++++
 .../scripts/masterindextriggeritem_window.lua     | 10 +++++-----
 triggers/scripts/parameterlist.lua                |  4 ++--
 triggers/scripts/tooltipcombobox.lua              |  4 ++--
 triggers/scripts/trigger.lua                      |  4 ++--
 triggers/scripts/trigger_content.lua              | 10 +++++-----
 triggers/scripts/triggeraction.lua                |  8 ++++----
 triggers/scripts/triggercondition.lua             |  8 ++++----
 triggers/scripts/triggerevent.lua                 |  6 +++---
 triggers/scripts/triggerparameter.lua             |  4 ++--
 triggers/template_triggers.xml                    |  4 ++++
 triggers/triggers.xml                             |  4 ++++
 31 files changed, 110 insertions(+), 83 deletions(-)

diff --git a/campaign/4e/char_power.xml b/campaign/4e/char_power.xml
index 72a8c04..bf59fba 100644
--- a/campaign/4e/char_power.xml
+++ b/campaign/4e/char_power.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-	Please see the license.html file included with this distribution for 
+<!--
+	Please see the license.html file included with this distribution for
 	attribution and copyright information.
 -->
 
diff --git a/campaign/4e/scripts/char_power.lua b/campaign/4e/scripts/char_power.lua
index 15cd281..808c9d1 100644
--- a/campaign/4e/scripts/char_power.lua
+++ b/campaign/4e/scripts/char_power.lua
@@ -1,3 +1,8 @@
+--
+-- Please see the license.txt file included with this distribution for
+-- attribution and copyright information.
+--
+
 local fActivatePowerOriginal;
 function onInit()
 	fActivatePowerOriginal = super.activatePower;
@@ -32,8 +37,8 @@ function activatePower()
 		rSource = rActor,
 		rPower = rPower
 	};
-	
+
 	TriggerManager.fireEvent(
-		CharPowerTMT_4E.rPowerUsedEvent.sName, 
+		CharPowerTMT_4E.rPowerUsedEvent.sName,
 		rEventData);
 end
\ No newline at end of file
diff --git a/campaign/5e/record_power.xml b/campaign/5e/record_power.xml
index 0d19a57..6cc2382 100644
--- a/campaign/5e/record_power.xml
+++ b/campaign/5e/record_power.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-	Please see the license.html file included with this distribution for 
+<!--
+	Please see the license.html file included with this distribution for
 	attribution and copyright information.
 -->
 
diff --git a/campaign/5e/scripts/record_power.lua b/campaign/5e/scripts/record_power.lua
index 8a6c9c1..487bc02 100644
--- a/campaign/5e/scripts/record_power.lua
+++ b/campaign/5e/scripts/record_power.lua
@@ -1,3 +1,8 @@
+--
+-- Please see the license.txt file included with this distribution for
+-- attribution and copyright information.
+--
+
 local fUsePowerOriginal;
 
 function onInit()
@@ -11,7 +16,7 @@ end
 
 function usePower(bShowFull)
 	fUsePowerOriginal(bShowFull);
-	
+
 	local node = getDatabaseNode();
 
 	local charnode = node.getChild("...");
@@ -26,8 +31,8 @@ function usePower(bShowFull)
 	local sGroup = DB.getValue(node, "group", "");
 	local sRange = DB.getValue(node, "range", "");
 
-	local rPower = { 
-		sName = sName, 
+	local rPower = {
+		sName = sName,
 		nLevel = nLevel,
 		sSchool = sSchool,
 		sCastingTime = sCastingTime,
@@ -40,8 +45,8 @@ function usePower(bShowFull)
 		rSource = rActor,
 		rPower = rPower
 	};
-	
+
 	TriggerManager.fireEvent(
-		CharDamageTMT_5E.rPowerUsedEvent.sName, 
+		CharDamageTMT_5E.rPowerUsedEvent.sName,
 		rEventData);
 end
\ No newline at end of file
diff --git a/graphics/graphics_icons.xml b/graphics/graphics_icons.xml
index f2d4774..1f72df7 100644
--- a/graphics/graphics_icons.xml
+++ b/graphics/graphics_icons.xml
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+	Please see the license.html file included with this distribution for
+	attribution and copyright information.
+-->
 
 <root>
 	<icon name="TriggerMeTimbers" file="graphics/icons/TriggerMeTimbers.png" />
diff --git a/scripts/data_library_tmt.lua b/scripts/data_library_tmt.lua
index 7b60131..19a4d60 100644
--- a/scripts/data_library_tmt.lua
+++ b/scripts/data_library_tmt.lua
@@ -1,5 +1,5 @@
--- 
--- Please see the license.txt file included with this distribution for 
+--
+-- Please see the license.txt file included with this distribution for
 -- attribution and copyright information.
 --
 
diff --git a/scripts/data_trigger.lua b/scripts/data_trigger.lua
index ccc3251..55d07ae 100644
--- a/scripts/data_trigger.lua
+++ b/scripts/data_trigger.lua
@@ -1,5 +1,5 @@
--- 
--- Please see the license.txt file included with this distribution for 
+--
+-- Please see the license.txt file included with this distribution for
 -- attribution and copyright information.
 --
 
@@ -54,7 +54,7 @@ function initializeConditions()
 		fCondition = isTarget,
 		aRequiredParameters = {"rTarget"}
 	};
-	
+
 	-- TODO flesh out before re-enabling
 	-- TriggerManager.defineCondition(rIsSourceCondition);
 	-- TriggerManager.defineCondition(rIsTargetCondition);
diff --git a/scripts/manager_action_attack_4e_tmt.lua b/scripts/manager_action_attack_4e_tmt.lua
index 68ca7d3..870d65b 100644
--- a/scripts/manager_action_attack_4e_tmt.lua
+++ b/scripts/manager_action_attack_4e_tmt.lua
@@ -1,5 +1,5 @@
--- 
--- Please see the license.txt file included with this distribution for 
+--
+-- Please see the license.txt file included with this distribution for
 -- attribution and copyright information.
 --
 
diff --git a/scripts/manager_action_attack_5e_tmt.lua b/scripts/manager_action_attack_5e_tmt.lua
index ff72e3c..488db73 100644
--- a/scripts/manager_action_attack_5e_tmt.lua
+++ b/scripts/manager_action_attack_5e_tmt.lua
@@ -1,5 +1,5 @@
--- 
--- Please see the license.txt file included with this distribution for 
+--
+-- Please see the license.txt file included with this distribution for
 -- attribution and copyright information.
 --
 
diff --git a/scripts/manager_action_damage_4e_tmt.lua b/scripts/manager_action_damage_4e_tmt.lua
index a4e5a22..14720a3 100644
--- a/scripts/manager_action_damage_4e_tmt.lua
+++ b/scripts/manager_action_damage_4e_tmt.lua
@@ -1,5 +1,5 @@
--- 
--- Please see the license.txt file included with this distribution for 
+--
+-- Please see the license.txt file included with this distribution for
 -- attribution and copyright information.
 --
 
@@ -71,6 +71,6 @@ function applyHpToCombatant(rTriggerData, rEventData)
 	end
 
 	table.insert(rAction.clauses, rHealClause);
-	
+
 	ActionHeal.performRoll(nil, rActor, rAction)
 end
\ No newline at end of file
diff --git a/scripts/manager_action_damage_5e_tmt.lua b/scripts/manager_action_damage_5e_tmt.lua
index 0a8781a..36105ea 100644
--- a/scripts/manager_action_damage_5e_tmt.lua
+++ b/scripts/manager_action_damage_5e_tmt.lua
@@ -1,5 +1,5 @@
--- 
--- Please see the license.txt file included with this distribution for 
+--
+-- Please see the license.txt file included with this distribution for
 -- attribution and copyright information.
 --
 
@@ -226,7 +226,6 @@ end
 function applyDamage(rSource, rTarget, bSecret, sDamage, nTotal)
 	rActiveSource = rSource;
 	rActiveTarget = rTarget;
-	initialHitPoints = getCurrentHitPoints(rTarget);
 	bPrepareForBeforeDamageEvent = true;
 	applyDamageOriginal(rSource, rTarget, bSecret, sDamage, nTotal);
 end
@@ -319,7 +318,7 @@ function getWounds(rActor, sType, nodeActor)
 		return 0;
 	end
 
-	local nTotal, nWounds;
+	local nWounds;
 	if sType == "pc" then
 		nWounds = DB.getValue(nodeActor, "hp.wounds", 0);
 	else
diff --git a/scripts/manager_actions_tmt.lua b/scripts/manager_actions_tmt.lua
index fc66a60..cd7f918 100644
--- a/scripts/manager_actions_tmt.lua
+++ b/scripts/manager_actions_tmt.lua
@@ -1,5 +1,5 @@
--- 
--- Please see the license.txt file included with this distribution for 
+--
+-- Please see the license.txt file included with this distribution for
 -- attribution and copyright information.
 --
 
@@ -19,7 +19,7 @@ local resolveActionOriginal;
 function onInit()
 	resolveActionOriginal = ActionsManager.resolveAction;
 	ActionsManager.resolveAction = resolveAction;
-	
+
 	TriggerManager.defineEvent(rDiceRolledEvent);
 
 	initializeConditions();
@@ -93,7 +93,7 @@ function initializeConditions()
 			fCheckVisibility = checkAdvantageInclusionVisibility,
 		});
 	end
-	
+
 	TriggerManager.defineCondition(rRollIsTypeCondition);
 	TriggerManager.defineCondition(rRollValueCondition);
 end
@@ -189,7 +189,7 @@ function rollIsValue(rTriggerData, rEventData)
 		if not rTriggerData.bIncludeModifiers then
 			nTotal = nTotal - rEventData.rRoll.nMod;
 		end
-	
+
 		bResult = TriggerData.resolveComparison(nTotal, rTriggerData.nCompareAgainst, rTriggerData.sComparison);
 	end
 
@@ -201,7 +201,7 @@ function rerollDice(rTriggerData, rEventData)
 end
 
 function replaceDice(rTriggerData, rEventData)
-	changeDice(rTriggerData, rEventData, "REPLACE", function(sDieType) return rTriggerData.sReplacement; end)
+	changeDice(rTriggerData, rEventData, "REPLACE", function() return rTriggerData.sReplacement; end)
 end
 
 function changeDice(rTriggerData, rEventData, sDisplay, fGetResult)
@@ -241,7 +241,10 @@ function changeDice(rTriggerData, rEventData, sDisplay, fGetResult)
 		local rDie = rEventData.rRoll.aDice[nIndex];
 		rEventData.rRoll.sDesc = rEventData.rRoll.sDesc .. " [" .. sDisplay .. " " .. rDie.result .. "]";
 		rDie.result = fGetResult(rDie.type);
+		rDie.value = rDie.result;
 	end
+
+	rEventData.rRoll.aDice.total = Utility.getDiceTotal(rEventData.rRoll.aDice);
 end
 
 function checkModifierInclusionVisibility(rConditionData)
diff --git a/scripts/manager_campaigndata_tmt.lua b/scripts/manager_campaigndata_tmt.lua
index 58d5cce..3d1c99c 100644
--- a/scripts/manager_campaigndata_tmt.lua
+++ b/scripts/manager_campaigndata_tmt.lua
@@ -1,5 +1,5 @@
--- 
--- Please see the license.txt file included with this distribution for 
+--
+-- Please see the license.txt file included with this distribution for
 -- attribution and copyright information.
 --
 
diff --git a/scripts/manager_char_4e_tmt.lua b/scripts/manager_char_4e_tmt.lua
index ca997c6..6ddf1a0 100644
--- a/scripts/manager_char_4e_tmt.lua
+++ b/scripts/manager_char_4e_tmt.lua
@@ -1,12 +1,12 @@
--- 
--- Please see the license.txt file included with this distribution for 
+--
+-- Please see the license.txt file included with this distribution for
 -- attribution and copyright information.
 --
 
 rPowerContainsDataCondition = nil;
 rPowerUsedEvent = {
 	sName = "power_used_event",
-	aParameters = { 
+	aParameters = {
 		"rSource",
 		"rPower"
 	};
diff --git a/scripts/manager_char_5e_tmt.lua b/scripts/manager_char_5e_tmt.lua
index 3654682..acf8d2a 100644
--- a/scripts/manager_char_5e_tmt.lua
+++ b/scripts/manager_char_5e_tmt.lua
@@ -1,5 +1,5 @@
--- 
--- Please see the license.txt file included with this distribution for 
+--
+-- Please see the license.txt file included with this distribution for
 -- attribution and copyright information.
 --
 
@@ -8,7 +8,7 @@ rPowerContainsDataCondition = nil;
 
 rPowerUsedEvent = {
     sName = "power_used_event",
-    aParameters = { 
+    aParameters = {
         "rSource",
         "rPower"
     };
diff --git a/scripts/manager_chat_tmt.lua b/scripts/manager_chat_tmt.lua
index 330a7ce..a846046 100644
--- a/scripts/manager_chat_tmt.lua
+++ b/scripts/manager_chat_tmt.lua
@@ -1,5 +1,5 @@
--- 
--- Please see the license.txt file included with this distribution for 
+--
+-- Please see the license.txt file included with this distribution for
 -- attribution and copyright information.
 --
 
diff --git a/scripts/manager_desktop_tmt.lua b/scripts/manager_desktop_tmt.lua
index 5409740..9872cfb 100644
--- a/scripts/manager_desktop_tmt.lua
+++ b/scripts/manager_desktop_tmt.lua
@@ -1,5 +1,5 @@
--- 
--- Please see the license.txt file included with this distribution for 
+--
+-- Please see the license.txt file included with this distribution for
 -- attribution and copyright information.
 --
 
diff --git a/scripts/manager_effect_tmt.lua b/scripts/manager_effect_tmt.lua
index 940f449..7142a7d 100644
--- a/scripts/manager_effect_tmt.lua
+++ b/scripts/manager_effect_tmt.lua
@@ -1,5 +1,5 @@
--- 
--- Please see the license.txt file included with this distribution for 
+--
+-- Please see the license.txt file included with this distribution for
 -- attribution and copyright information.
 --
 
diff --git a/scripts/manager_trigger.lua b/scripts/manager_trigger.lua
index d837f68..070f7c7 100644
--- a/scripts/manager_trigger.lua
+++ b/scripts/manager_trigger.lua
@@ -1,5 +1,5 @@
--- 
--- Please see the license.txt file included with this distribution for 
+--
+-- Please see the license.txt file included with this distribution for
 -- attribution and copyright information.
 --
 
@@ -32,7 +32,7 @@ function onActiveTriggerUpdated(nodeParent, bListchanged)
 end
 
 function onActiveTriggerDeleted(nodeToBeDeleted)
-	unregisterTrigger(nodeTrigger);
+	unregisterTrigger(nodeToBeDeleted);
 end
 
 function defineEvent(rEvent)
@@ -88,7 +88,7 @@ function getConditionDefinitions()
 end
 
 function getConditionDefinitionsForEvent(vEvent)
-	return getConditionDefinitionsForCommonEventParameters(getParametersForEvent(vEvent));
+	return getConditionDefinitionsForEventParameters(getParametersForEvent(vEvent));
 end
 
 function getConditionDefinitionsForEventParameters(aEventParameters)
@@ -140,7 +140,7 @@ function hasRequiredParameters(aRequiredParameters, aEventParameters)
 		end
 	end
 	return bHasRequirements;
-end	
+end
 
 function registerTrigger(nodeTrigger)
 	local rTrigger = loadTriggerFromNode(nodeTrigger);
@@ -161,7 +161,7 @@ function unregisterTrigger(nodeTrigger)
 	if not rTrigger then
 		return;
 	end
-	
+
 	for sEventName,_ in pairs(rTrigger.tEventLists) do
 		local tEventTriggers = tRegisteredEventTriggers[sEventName];
 		if tEventTriggers then
@@ -206,7 +206,6 @@ function loadTriggerEventFromNode(nodeEvent)
 end
 
 function loadTriggerConditionFromNode(nodeCondition)
-	-- TODO invertibility
 	local rCondition = {
 		sName = DB.getValue(nodeCondition, "conditionname", "");
 		rData = loadParametersFromNode(nodeCondition),
diff --git a/strings/strings.xml b/strings/strings.xml
index 4094467..da98e86 100644
--- a/strings/strings.xml
+++ b/strings/strings.xml
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+	Please see the license.html file included with this distribution for
+	attribution and copyright information.
+-->
 
 <root>
 	<!-- TODO Ensure consistent description "voice" -->
diff --git a/triggers/scripts/masterindextriggeritem_window.lua b/triggers/scripts/masterindextriggeritem_window.lua
index 599e73c..79c5d15 100644
--- a/triggers/scripts/masterindextriggeritem_window.lua
+++ b/triggers/scripts/masterindextriggeritem_window.lua
@@ -1,5 +1,5 @@
--- 
--- Please see the license.html file included with this distribution for 
+--
+-- Please see the license.html file included with this distribution for
 -- attribution and copyright information.
 --
 
@@ -20,16 +20,16 @@ function setRecordType(sNewRecordType)
 	if m_sRecordType == sNewRecordType then
 		return;
 	end
-		
+
 	m_sRecordType = sNewRecordType
-	
+
 	local sRecordDisplayClass = LibraryData.getRecordDisplayClass(m_sRecordType, m_vNode);
 	local sPath = "";
 	if m_vNode then
 		sPath = m_vNode.getPath();
 	end
 	link.setValue(sRecordDisplayClass, sPath);
-	
+
 	local sEmptyNameText = LibraryData.getEmptyNameText(m_sRecordType);
 	name.setEmptyText(sEmptyNameText);
 end
diff --git a/triggers/scripts/parameterlist.lua b/triggers/scripts/parameterlist.lua
index 632f50a..5530381 100644
--- a/triggers/scripts/parameterlist.lua
+++ b/triggers/scripts/parameterlist.lua
@@ -1,5 +1,5 @@
--- 
--- Please see the license.html file included with this distribution for 
+--
+-- Please see the license.html file included with this distribution for
 -- attribution and copyright information.
 --
 
diff --git a/triggers/scripts/tooltipcombobox.lua b/triggers/scripts/tooltipcombobox.lua
index d090b8a..7273273 100644
--- a/triggers/scripts/tooltipcombobox.lua
+++ b/triggers/scripts/tooltipcombobox.lua
@@ -1,5 +1,5 @@
--- 
--- Please see the license.html file included with this distribution for 
+--
+-- Please see the license.html file included with this distribution for
 -- attribution and copyright information.
 --
 
diff --git a/triggers/scripts/trigger.lua b/triggers/scripts/trigger.lua
index 05a817f..cfb9d06 100644
--- a/triggers/scripts/trigger.lua
+++ b/triggers/scripts/trigger.lua
@@ -1,5 +1,5 @@
--- 
--- Please see the license.html file included with this distribution for 
+--
+-- Please see the license.html file included with this distribution for
 -- attribution and copyright information.
 --
 
diff --git a/triggers/scripts/trigger_content.lua b/triggers/scripts/trigger_content.lua
index 15af0b8..1aee05b 100644
--- a/triggers/scripts/trigger_content.lua
+++ b/triggers/scripts/trigger_content.lua
@@ -1,5 +1,5 @@
--- 
--- Please see the license.html file included with this distribution for 
+--
+-- Please see the license.html file included with this distribution for
 -- attribution and copyright information.
 --
 
@@ -54,14 +54,14 @@ function onEventChanged()
 		return;
 	end
 
-	aEvents = getEvents();
+	local aEvents = getEvents();
 	for _,winAction in ipairs(actions.getWindows()) do
 		winAction.updateEvents(aEvents);
 	end
 end
 
 function getEvents()
-	aEvents = {};
+	local aEvents = {};
 	for _,winEvent in ipairs(events.getWindows()) do
 		table.insert(aEvents, winEvent.getEventName());
 	end
@@ -69,6 +69,6 @@ function getEvents()
 end
 
 function onActionAdded(winAction)
-	aEvents = getEvents();
+	local aEvents = getEvents();
 	winAction.updateEvents(aEvents);
 end
\ No newline at end of file
diff --git a/triggers/scripts/triggeraction.lua b/triggers/scripts/triggeraction.lua
index 6d90f57..a7e87d1 100644
--- a/triggers/scripts/triggeraction.lua
+++ b/triggers/scripts/triggeraction.lua
@@ -1,8 +1,8 @@
--- 
--- Please see the license.html file included with this distribution for 
+--
+-- Please see the license.html file included with this distribution for
 -- attribution and copyright information.
 --
-local rActionData = {};
+local bUpdatingName = false;
 local aEventParameters;
 
 function onInit()
@@ -34,7 +34,7 @@ function onActionNameChanged(nodeActionName)
 	setActionName(nodeActionName.getValue(), true);
 end
 
-function onActionNameSelected(sSelection)
+function onActionNameSelected()
 	bUpdatingName = true;
 	DB.deleteChild(getDatabaseNode(), "parameters");
 	-- combobox defaults to display value, not data value
diff --git a/triggers/scripts/triggercondition.lua b/triggers/scripts/triggercondition.lua
index f8b1acb..b0758f6 100644
--- a/triggers/scripts/triggercondition.lua
+++ b/triggers/scripts/triggercondition.lua
@@ -1,9 +1,9 @@
--- 
--- Please see the license.html file included with this distribution for 
+--
+-- Please see the license.html file included with this distribution for
 -- attribution and copyright information.
 --
 
-local rConditionData = {};
+local bUpdatingName = false;
 local aEventParameters;
 
 function onInit()
@@ -36,7 +36,7 @@ function onConditionNameChanged(nodeConditionName)
 	setConditionName(nodeConditionName.getValue(), true);
 end
 
-function onConditionNameSelected(sSelection)
+function onConditionNameSelected()
 	bUpdatingName = true;
 	-- combobox defaults to display value, not data value
 	DB.setValue(getDatabaseNode(), "conditionname", "string", conditionname.getSelectedValue());
diff --git a/triggers/scripts/triggerevent.lua b/triggers/scripts/triggerevent.lua
index 7234bb8..c10fcf5 100644
--- a/triggers/scripts/triggerevent.lua
+++ b/triggers/scripts/triggerevent.lua
@@ -1,5 +1,5 @@
--- 
--- Please see the license.html file included with this distribution for 
+--
+-- Please see the license.html file included with this distribution for
 -- attribution and copyright information.
 --
 
@@ -80,7 +80,7 @@ function setEventName(sEventName)
 	windowlist.window.onEventChanged();
 end
 
-function onEventNameSelected(sSelection)
+function onEventNameSelected()
 	bUpdatingName = true;
 	-- combobox defaults to display value, not data value
 	DB.setValue(getDatabaseNode(), "eventname", "string", getEventName());
diff --git a/triggers/scripts/triggerparameter.lua b/triggers/scripts/triggerparameter.lua
index 6b323b9..cc47ebc 100644
--- a/triggers/scripts/triggerparameter.lua
+++ b/triggers/scripts/triggerparameter.lua
@@ -1,5 +1,5 @@
--- 
--- Please see the license.html file included with this distribution for 
+--
+-- Please see the license.html file included with this distribution for
 -- attribution and copyright information.
 --
 
diff --git a/triggers/template_triggers.xml b/triggers/template_triggers.xml
index 65067e4..da3f53b 100644
--- a/triggers/template_triggers.xml
+++ b/triggers/template_triggers.xml
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+	Please see the license.html file included with this distribution for
+	attribution and copyright information.
+-->
 
 <root>
 	<template name="list_triggercomponents">
diff --git a/triggers/triggers.xml b/triggers/triggers.xml
index 2098436..2aacb7a 100644
--- a/triggers/triggers.xml
+++ b/triggers/triggers.xml
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+	Please see the license.html file included with this distribution for
+	attribution and copyright information.
+-->
 
 <root>
 	<windowclass name="masterindexitem_activetrigger">