From 4a85fbb8430840cd7d8dd2311e9e5c58d2e5623b Mon Sep 17 00:00:00 2001
From: Farratto <181971243+Farratto@users.noreply.github.com>
Date: Fri, 6 Dec 2024 22:34:19 -0500
Subject: [PATCH] Improved inter-extension compatibility. Made cantrip
 modification work.

looking for cantrips was all lowercase.  Most cantrips have a capital "C".  setRecordTypePostAddCallback doesn't automatically work with other extensions going for the same place.  This method won't step on other extensions.
---
 extension.xml               |   6 +++---
 raven-circ-30x30.png        | Bin 2401 -> 0 bytes
 raven-circ-30x30.webp       | Bin 0 -> 746 bytes
 scripts/manager_combat2.lua |  29 ++++++++++++++++++++---------
 4 files changed, 23 insertions(+), 12 deletions(-)
 delete mode 100644 raven-circ-30x30.png
 create mode 100644 raven-circ-30x30.webp

diff --git a/extension.xml b/extension.xml
index d3cade2..3b1cdaa 100644
--- a/extension.xml
+++ b/extension.xml
@@ -3,16 +3,16 @@
 <root version="3.0">
   <properties>
     <name>CT Scroll 5e Extension</name>
-    <version>0.4.1</version>
+    <version>0.4.1-rc1</version>
     <author>fxg42</author>
     <description>Increment and decrement NPC combat tracker entry attack bonuses and damage die with the scroll wheel.</description>
     <loadorder>100</loadorder>
   </properties>
 
-  <announcement text="CT Scroll v0.4.1" font="emotefont" icon="raven"/>
+  <announcement text="CT Scroll v0.4.1-rc1" font="emotefont" icon="raven"/>
 
   <base>
-    <icon name="raven" file="raven-circ-30x30.png"/>
+    <icon name="raven" file="raven-circ-30x30.webp"/>
     <includefile source="ct/ct_host.xml" />
     <script name="CombatManager__proxy" file="scripts/manager_combat2.lua" />
   </base>
diff --git a/raven-circ-30x30.png b/raven-circ-30x30.png
deleted file mode 100644
index a0e1f4e066bad25c9cab0d3c57dab84198d88a67..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2401
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
TmriGg00000NkvXXu0mjfS*f<^

diff --git a/raven-circ-30x30.webp b/raven-circ-30x30.webp
new file mode 100644
index 0000000000000000000000000000000000000000..664b92adef2a9bb76edf7c746a16a73f8dba6915
GIT binary patch
literal 746
zcmV<G0u}vINk&HE0ssJ4MM6+kP&il$0000G0000T0012T06|PpNEHD900DrU?SI<l
zuQ2UW?h$X^qA)>yE#nNlh)-cSF~@qs%<Q-jj-(ADVgg{b>iAW_%_bIJPY@6r`E0@B
z7VCA<Z7viqH3VEPn3}Aa3RF3?hU&Q$nh=KikIEIQ_mngtmU3^ZWzVVq3B~`yJzC&e
z(uAtiI{*M<E;OMWXqy1|;DkE9097`{pr<`9Oc<6oUo9-WSAv^`(}P78F}YP|QJJv9
zB8!+TxLG(ouVxnBtCIqY@&+oV=!voh_yE1kDS)OLqU9eO0D$XDbVmJs008uu`={|=
zy+I40d@D#~qw2R3maFc20TO@zMhUCYK^x<B#LRdf!P=&aUfJu6RVp#3w=AC;fLObA
z<&h^7*>km_fz<$3P&go_0RRAS2mqY{DjonH06v8>lt-l^q9Hf>r~sf4iDdw+GJw4V
z$=-fNf!g=M?B6{nz%*$~tWE}k?JiB*&ivVbJ#+ds1@+r6Mlr?(^Vk3Y{U76dz2z6S
zNRHYeESG*&gUdbT`Q<thmT0^Ym5PZ7)cBu&`n~u4GquX%Y^=Mw8Q7@7BFI<t%sqi^
z`VvUMyd*Cig<W}L{QX5fmF7NuM!-zLi<YJt9^<J;jU9;!eW4|<=ta4WKX>eNwK{2@
z>W@s#qkEqL<OR^5le<D%H=RZjV_Av*NRUs}@OmdK7jux~5ty4g4bK8LO+C~Cj%1}1
z+a=xsGK2xm%Bef~O~%JCboEs~Ql1uw%8u%ye$3J5;Z_+kDeID&phqaNn*yS7{!^!i
z`~Y2gv`!!O5z^RB3!*njY<n@P3m1mh5obue1e)*j{VscCEPFH-yj?oUJLki0-*bli
zJc3tciTxQly-s3w&@q>DS>&C8L?r>_=LjjD$$Gnu(9YvSL&HmNPg;FkZ90p>o472R
c0zaUF8*qqQRD_8@`{t(vGBZR#axee@0Pq%8+yDRo

literal 0
HcmV?d00001

diff --git a/scripts/manager_combat2.lua b/scripts/manager_combat2.lua
index bc18e93..9d394b3 100644
--- a/scripts/manager_combat2.lua
+++ b/scripts/manager_combat2.lua
@@ -1,17 +1,27 @@
+--
+-- Different way to call custom functions when adding entry to CT in 5E ruleset
+--
+
+local fonRecordTypeEvent;
 function onInit()
-  CombatRecordManager.setRecordTypePostAddCallback("npc", proxy(CombatManager2.onNPCPostAdd, upcastCantrips));
+  if Session.IsHost then
+    fonRecordTypeEvent = CombatRecordManager.onRecordTypeEvent;
+    CombatRecordManager.onRecordTypeEvent = onRecordTypeEventNS;
+  end
+end
+function onClose()
+  if Session.IsHost then
+    CombatRecordManager.onRecordTypeEvent = fonRecordTypeEvent;
+  end
 end
 
 --
 -- Intercepts calls to subject function and executes an advice after the call.
 --
 
-function proxy(subjectFn, afterAdvice)
-  return function(...)
-    local returnValue = subjectFn(...);
-    afterAdvice(...);
-    return returnValue;
-  end
+function onRecordTypeEventNS(sRecordType, tCustom)
+  fonRecordTypeEvent(sRecordType, tCustom);
+  upcastCantrips(tCustom);
 end
 
 --
@@ -23,7 +33,7 @@ function upcastCantrips(tCustom)
   local nodeEntry = tCustom.nodeCT;
   local notches = getNbNotches(getSpellcasterLevel(nodeEntry));
   if notches < 1 then return end
-  
+
   forEachCantrip(nodeEntry, function(attackLine, setValue)
     if attackLine:find("DMG:") or attackLine:find("HEAL:") then
       setValue(updateNbDice(notches, attackLine));
@@ -74,7 +84,8 @@ function forEachCantrip(nodeEntry, f)
   for _, spellTrait in pairs({"spells", "innatespells"}) do
     for _, nodePower in pairs(DB.getChildren(nodeEntry, spellTrait)) do
       local attackLine = DB.getValue(nodePower, "value", "");
-      if attackLine:find("cantrip") then
+	  local attackLineLower = string.lower(attackLine);
+      if attackLineLower:find("cantrip") then
         local setValue = function(...) DB.setValue(nodePower, "value", "string", ...) end
         f(attackLine, setValue);
       end