From c2b820b1f0448bd565f942983b91f412fdcf16a3 Mon Sep 17 00:00:00 2001
From: Renaud Durlin <renaud.durlin@gmail.com>
Date: Sun, 28 Jan 2024 18:01:33 +0100
Subject: [PATCH] Fix compatibility between FaydarkAutoRoll and LeUI

---
 EEUITweaks/EEUITweaks.tp2              |  2 +-
 EEUITweaks/Installation.txt            |  2 +-
 EEUITweaks/include/FaydarkAutoRoll.tpa | 15 +++++++--------
 README.md                              |  2 +-
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/EEUITweaks/EEUITweaks.tp2 b/EEUITweaks/EEUITweaks.tp2
index 51625a7..d86f528 100644
--- a/EEUITweaks/EEUITweaks.tp2
+++ b/EEUITweaks/EEUITweaks.tp2
@@ -27,7 +27,7 @@ ALWAYS
 	END
 END
 
-VERSION ~4.0.5~
+VERSION ~4.0.6~
 
 LANGUAGE 
 	~English~ ~EEUITweaks/languages/english~ ~EEUITweaks/languages/english/setup.tra~
diff --git a/EEUITweaks/Installation.txt b/EEUITweaks/Installation.txt
index 557f3c4..16c399c 100644
--- a/EEUITweaks/Installation.txt
+++ b/EEUITweaks/Installation.txt
@@ -1,4 +1,4 @@
-EEUITweaks - Version 4.0.5
+EEUITweaks - Version 4.0.6
 
 This mod is configured as a WeiDU mod and consists of a setup program
 named setup-EEUITweaks.exe and a mod files directory named EEUITweaks.
diff --git a/EEUITweaks/include/FaydarkAutoRoll.tpa b/EEUITweaks/include/FaydarkAutoRoll.tpa
index 59620f6..995c09d 100644
--- a/EEUITweaks/include/FaydarkAutoRoll.tpa
+++ b/EEUITweaks/include/FaydarkAutoRoll.tpa
@@ -1,7 +1,7 @@
 /*******************************************************************************
  * ChargenRacePatch1
  *
- * Adds '; chargen.selectedRace = chargen.races[ currentChargenRace ].id' 
+ * Adds '; chargen.selectedRace = chargen.races[ currentChargenRace ].id'
  * to DONE_BUTTON action
  * 
  * Results in $UIMenuIF("Succeeded") 1 => Success, 0 => Failure
@@ -21,14 +21,13 @@ BEGIN
 
 	// Find target, insert code
 	COPY - ~.../CounterInLine~ ~.../CounterInLine~
-		REPLACE_EVALUATE CASE_INSENSITIVE ~\(^[%TAB% ]*button%MWHITE%{%MNOBRACE%+text[%TAB% ]*%MQUOTE%DONE_BUTTON%MQUOTE%%MNOBRACE%+action%MWHITE%%MDQUOTE%%MNOTDQUOTE%+\)\(%MDQUOTE%%MWHITE%}.*%MEOL%\)~
+		REPLACE_EVALUATE CASE_INSENSITIVE ~\(createCharScreen:OnDoneButtonClick()\)~
 		BEGIN
-			SPRINT tempstr ~%MATCH1%%adder%%MATCH2%~
+			SPRINT tempstr ~%MATCH1%%adder%~
 			SET found = 1
 		END
 		~%tempstr%~
 
-		PATCH_LOG ~Match1 = "%v1%", Match2 = "%v2%"~
 	// Not found, fail
 	ACTION_IF NOT %found% THEN
 	BEGIN
@@ -51,7 +50,7 @@ END
 /*******************************************************************************
  * ChargenClassPatch1
  *
- * Adds 'chargen.selectedClass = chargen.class[ currentChargenClass ].id' 
+ * Adds '; chargen.selectedClass = chargen.class[ currentChargenClass ].id'
  * to DONE_BUTTON action
  * 
  * Results in $UIMenuIF("Succeeded") 1 => Success, 0 => Failure
@@ -61,7 +60,7 @@ DEFINE_ACTION_MACRO FaydarkAutoRoll.ChargenClassPatch1
 BEGIN
 	LOCAL_SPRINT tempstr $UIMenuIF("Body")
 	LOCAL_SET found = 0
-	LOCAL_SPRINT adder "chargen.selectedClass = chargen.class[ currentChargenClass ].id"
+	LOCAL_SPRINT adder "; chargen.selectedClass = chargen.class[ currentChargenClass ].id"
 
 	// Put current menu definition into inline file
 	COPY - ~ToInlineTemplate~ ~.../CounterInLine~
@@ -71,9 +70,9 @@ BEGIN
 
 	// Find target, insert code
 	COPY - ~.../CounterInLine~ ~.../CounterInLine~
-		REPLACE_EVALUATE CASE_INSENSITIVE ~\(^[%TAB% ]*button%MWHITE%{%MNOBRACE%+text[%TAB% ]*%MQUOTE%DONE_BUTTON%MQUOTE%%MNOBRACE%+action%MWHITE%%MDQUOTE%%MNOTDQUOTE%+\)\(%MDQUOTE%%MWHITE%}.*%MEOL%\)~
+		REPLACE_EVALUATE CASE_INSENSITIVE ~\(createCharScreen:OnDoneButtonClick()\)~
 		BEGIN
-			SPRINT tempstr ~%MATCH1%%adder%%MATCH2%~
+			SPRINT tempstr ~%MATCH1%%adder%~
 			SET found = 1
 		END
 		~%tempstr%~
diff --git a/README.md b/README.md
index bec71fb..61be996 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# EEUITweaks User Interface Mods Collection Version 4.0.5
+# EEUITweaks User Interface Mods Collection Version 4.0.6
 
 The goal of EEUITweaks is to be a collection of the individual UI.MENU (i.e. Extended Edition 2.x+) mods/patches/tweaks from the BeamDog UI Modding forum; packaged as a single WeiDU collection. The advantages are to automate the tedious manual editing of UI.MENU, simplify multiple mod installations (particularly after an update), and to provide a single source from which many EE GUI mods can be accessed. It does NOT install the full UI replacement environments, although it does support modding them.