For unknown reasons the vast majority of the files were uncommitted l…

…ast time
MeAndUnique · May 19, 2022 · 415b97c · 415b97c
1 parent 132be41
commit 415b97c
Show file tree

Hide file tree

Showing 31 changed files with 110 additions and 83 deletions.
diff --git 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
@@ -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
diff --git 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
@@ -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
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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.
 --