From 093b66ccfdd9488bf1087a106c53cc8e74effbe7 Mon Sep 17 00:00:00 2001
From: Ryan Hagelstrom <rhagelstrom@gmail.com>
Date: Tue, 17 Sep 2024 22:01:01 -0500
Subject: [PATCH 1/2] Farratto update for 2024 ruleset

---
 campaign/record_npc_5e.xml | 53 ++++++++++++++++++++++++++++++--------
 1 file changed, 42 insertions(+), 11 deletions(-)

diff --git a/campaign/record_npc_5e.xml b/campaign/record_npc_5e.xml
index 5fca7ba..48b903c 100644
--- a/campaign/record_npc_5e.xml
+++ b/campaign/record_npc_5e.xml
@@ -5,22 +5,21 @@
   attribution and copyright information.
 -->
 
+<!-- Quick fix employed by Farratto.  Only adjusted GUI anchors. -->
+
 <root>
-	<windowclass name="npc_combat" merge="join">
+	<windowclass name="npc_combat_top_2014" merge="join">
 		<script file="campaign/scripts/npc_main_5e.lua" />
 		<sheetdata>
-			<label_column name="init_label" insertbefore="speed_label">
+			<label_content_column name="init_label" insertbefore="speed_label">
 				<static textres="initiative" />
-			</label_column>
+			</label_content_column>
 			<number_chartotal name="init" insertbefore="speed_label">
 				<anchored to="init_label" width="40" height="20">
-					<top parent="columnanchor" anchor="bottom" relation="relative" offset="7" />
+					<top parent="contentanchor" anchor="bottom" relation="relative" offset="7" />
 					<left offset="97" />
 				</anchored>
-				<font>reference-b-large</font>
 				<rollable />
-				<displaysign />
-				<modifiersize>mini</modifiersize>
 				<modifierfield>inittemporary</modifierfield>
 				<source><name>abilities.dexterity.bonus</name><op>+</op></source>
 				<script>
@@ -40,19 +39,51 @@
 				</script>
 			</number_chartotal>
 
-			<label_column name="speed_label">
+			<label_content_column name="speed_label">
 				<anchored to="init" position="topright" offset="0,10">
 					<left anchor="right" offset="10" />
 					<top merge="replace" />
 				</anchored>
-			</label_column>
-			<string_column name="speed">
+			</label_content_column>
+			<string_content_column name="speed">
 				<anchored to="speed_label">
 					<left anchor="right" offset="10" />
 					<top merge="replace" />
 					<right parent="" />
 				</anchored>
-			</string_column>
+			</string_content_column>
+		</sheetdata>
+	</windowclass>
+	<windowclass name="npc_combat_top_2024" merge="join">
+		<script file="campaign/scripts/npc_main_5e.lua" />
+		<sheetdata>
+			<label_content_column name="init_label" insertbefore="speed_label">
+				<static textres="initiative" />
+			</label_content_column>
+			<number_chartotal name="init" insertbefore="speed_label">
+				<anchored to="init_label" width="40" height="20">
+					<top parent="contentanchor" anchor="bottom" relation="relative" offset="7" />
+					<left offset="97" />
+				</anchored>
+				<rollable />
+				<modifierfield>inittemporary</modifierfield>
+				<source><name>abilities.dexterity.bonus</name><op>+</op></source>
+				<script>
+					function action(draginfo)
+						local rActor = ActorManager.resolveActor(window.getDatabaseNode());
+						if rActor.sCTNode ~= "" then
+							ActionInit.performRoll(draginfo, rActor);
+						end
+						return true;
+					end
+					function onDragStart(button, x, y, draginfo)
+						return action(draginfo);
+					end
+					function onDoubleClick(x,y)
+						return action();
+					end
+				</script>
+			</number_chartotal>
 		</sheetdata>
 	</windowclass>
 </root>
\ No newline at end of file

From 1896577fbef0e2fb26b121d12a816cf1c5f8f6ec Mon Sep 17 00:00:00 2001
From: Farratto <181971243+Farratto@users.noreply.github.com>
Date: Mon, 7 Oct 2024 14:36:50 -0400
Subject: [PATCH 2/2] Found & Fixed bug

When resetting an NPC record back to original, it would found a node that was throwing an error.  Temporal Fixation was creating an temporary init field using a deprecated method.  I just updated it to the method supplied on Atlassian.
---
 campaign/record_npc_5e.xml | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/campaign/record_npc_5e.xml b/campaign/record_npc_5e.xml
index 48b903c..f57fbc7 100644
--- a/campaign/record_npc_5e.xml
+++ b/campaign/record_npc_5e.xml
@@ -5,8 +5,6 @@
   attribution and copyright information.
 -->
 
-<!-- Quick fix employed by Farratto.  Only adjusted GUI anchors. -->
-
 <root>
 	<windowclass name="npc_combat_top_2014" merge="join">
 		<script file="campaign/scripts/npc_main_5e.lua" />
@@ -14,7 +12,7 @@
 			<label_content_column name="init_label" insertbefore="speed_label">
 				<static textres="initiative" />
 			</label_content_column>
-			<number_chartotal name="init" insertbefore="speed_label">
+			<basicnumber name="init" insertbefore="speed_label">
 				<anchored to="init_label" width="40" height="20">
 					<top parent="contentanchor" anchor="bottom" relation="relative" offset="7" />
 					<left offset="97" />
@@ -37,7 +35,7 @@
 						return action();
 					end
 				</script>
-			</number_chartotal>
+			</basicnumber>
 
 			<label_content_column name="speed_label">
 				<anchored to="init" position="topright" offset="0,10">
@@ -60,7 +58,7 @@
 			<label_content_column name="init_label" insertbefore="speed_label">
 				<static textres="initiative" />
 			</label_content_column>
-			<number_chartotal name="init" insertbefore="speed_label">
+			<basicnumber name="init" insertbefore="speed_label">
 				<anchored to="init_label" width="40" height="20">
 					<top parent="contentanchor" anchor="bottom" relation="relative" offset="7" />
 					<left offset="97" />
@@ -83,7 +81,7 @@
 						return action();
 					end
 				</script>
-			</number_chartotal>
+			</basicnumber>
 		</sheetdata>
 	</windowclass>
 </root>
\ No newline at end of file