Make BillyYank multi portraits compatible with LeUI

r-e-d · May 8, 2022 · f9e1f6d · f9e1f6d
1 parent fd13c11
commit f9e1f6d
Show file tree

Hide file tree

Showing 7 changed files with 111 additions and 75 deletions.
diff --git a/EEUITweaks/copy/BillyYankMultiPort/GENDER/GUIGDB.MOS b/EEUITweaks/copy/BillyYankMultiPort/GENDER/GUIGDB.MOS
diff --git a/EEUITweaks/copy/BillyYankMultiPort/GENDER/mos0130.PVRZ b/EEUITweaks/copy/BillyYankMultiPort/GENDER/mos0130.PVRZ
diff --git a/EEUITweaks/copy/BillyYankMultiPort/GENDER/mos0131.PVRZ b/EEUITweaks/copy/BillyYankMultiPort/GENDER/mos0131.PVRZ
diff --git a/EEUITweaks/copy/luicommon/BG2Theme/MOS4253.PVRZ b/EEUITweaks/copy/luicommon/BG2Theme/MOS4253.PVRZ
diff --git a/EEUITweaks/include/BillyYankMultiPort.tpa b/EEUITweaks/include/BillyYankMultiPort.tpa
@@ -14,16 +14,26 @@ END
 LOG @158
 SILENT
 
+OUTER_SET LeUIBGEE = (MOD_IS_INSTALLED ~LeUI-BG1EE.tp2~ ~0~)
+OUTER_SET LeUISoD = (MOD_IS_INSTALLED ~LeUI-SoD.tp2~ ~0~)
+
 OUTER_SPRINT $UIMenuIF("MenuName") ~CHARGEN_PORTRAIT~
 ACTION_MATCH 1
 WITH
-	%IsSoD%
+	%IsSoD% %LeUISoD%
 	BEGIN
 		LOG @19
 		SILENT
 		OUTER_SPRINT $UIMenuIF("Filespec") ~%PKGNAME%/menu/BillyYankMultiPort/chargenportSOD.menu~
 	END
 
+	%IsBGEE% %LeUIBGEE%
+	BEGIN
+		LOG @14
+		SILENT
+		OUTER_SPRINT $UIMenuIF("Filespec") ~%PKGNAME%/menu/BillyYankMultiPort/chargenportBGEE.menu~
+	END
+
 	%IsEETSoD%
 	BEGIN
 		LOG @32
@@ -87,13 +97,6 @@ WITH
 		OUTER_SPRINT $UIMenuIF("Filespec") ~%PKGNAME%/menu/BillyYankMultiPort/chargenportBG2.menu~
 	END
 
-	%IsBGEE%
-	BEGIN
-		LOG @14
-		SILENT
-		OUTER_SPRINT $UIMenuIF("Filespec") ~%PKGNAME%/menu/BillyYankMultiPort/chargenportBGEE.menu~
-	END
-
 	%IsIWDEE%
 	BEGIN
 		PRINT @29
@@ -111,7 +114,7 @@ BEGIN
 	FAIL @160
 END
 
-ACTION_IF %IsLeUIBG2% OR %IsLeUISOD% OR %IsLeUIBG1% OR %IsEETLeUI% THEN
+ACTION_IF %IsLeUIBG2% OR %IsLeUISOD% OR %IsLeUIBG1% OR %IsEETLeUI% OR %LeUIBGEE% THEN
 BEGIN
 	LOG @103001
 	SILENT
@@ -124,6 +127,18 @@ BEGIN
 	END
 END
 
+ACTION_IF %LeUISoD% THEN
+BEGIN
+	LOG @103001
+	SILENT
+	OUTER_SPRINT $UIMenuIF("MenuName") ~CHARGEN_GENDER~
+	OUTER_SPRINT $UIMenuIF("Filespec") ~%PKGNAME%/menu/BillyYankMultiPort/genderLeUI2.menu~
+	LAUNCH_ACTION_MACRO UIMenuReplaceMenu
+	ACTION_IF NOT $UIMenuIF("Succeeded") THEN
+	BEGIN
+		FAIL @103002
+	END
+END
 
 // Close up
 LOG @13
@@ -139,7 +154,7 @@ LOG @17
 SILENT
 ACTION_MATCH 1
 WITH
-	%IsSoD% %IsEETSoD% %IsKRDS% %IsKRDS0% %IsKRDS1% %IsKRDS2% %IsKRDS3% %IsKRDS4% %IsKRDS5% %IsKRDS6%
+	%IsSoD% %IsEETSoD% %IsKRDS% %IsKRDS0% %IsKRDS1% %IsKRDS2% %IsKRDS3% %IsKRDS4% %IsKRDS5% %IsKRDS6% %LeUISoD%
 	BEGIN
 		LAF EEUITweaks.CopyPVRZResource
 			STR_VAR
@@ -167,15 +182,14 @@ WITH
 		END
 	END
 
-	%IsBG2% %IsBG2onSoD% %IsEETBG2% %IsLeUIBG2% %IsEETLeUI%
+	%IsBGEE% %LeUIBGEE%
 	BEGIN
-		COPY ~%PKGNAME%/copy/BillyYankMultiPort/BG2/M_BYstyl.lua~ ~override~
-		COPY ~%PKGNAME%/copy/BillyYankMultiPort/BG2/BYGUIPRC.BAM~ ~override~
+		COPY ~%PKGNAME%/copy/BillyYankMultiPort/BGEE/M_BYstyl.lua~ ~override~
 		LAF EEUITweaks.CopyPVRZResource
 			STR_VAR
-				source_folder = EVAL ~%PKGNAME%/copy/BillyYankMultiPort/BG2~
+				source_folder = EVAL ~%PKGNAME%/copy/BillyYankMultiPort/BGEE~
 				resource_file = ~BYGUIAPB.MOS~
-				pvrz_files = ~MOS5001.PVRZ~
+				pvrz_files = ~MOS5005.PVRZ~
 			RET
 				$UIMenuIF("Succeeded") = succeeded
 		END
@@ -185,27 +199,9 @@ WITH
 		END
 		LAF EEUITweaks.CopyPVRZResource
 			STR_VAR
-				source_folder = EVAL ~%PKGNAME%/copy/BillyYankMultiPort/BG2~
-				resource_file = ~BYOSTSM.BAM~
-				pvrz_files = ~MOS5004.PVRZ~
-			RET
-				$UIMenuIF("Succeeded") = succeeded
-		END
-		ACTION_IF NOT $UIMenuIF("Succeeded") THEN
-		BEGIN
-			FAIL @44
-		END
-	END
-
-	%IsLeUISOD% %IsLeUIBG1%
-	BEGIN
-		COPY ~%PKGNAME%/copy/BillyYankMultiPort/BG2/M_BYstyl.lua~ ~override~
-		COPY ~%PKGNAME%/copy/BillyYankMultiPort/BG2/BYGUIPRC.BAM~ ~override~
-		LAF EEUITweaks.CopyPVRZResource
-			STR_VAR
-				source_folder = EVAL ~%PKGNAME%/copy/BillyYankMultiPort/BG2~
-				resource_file = ~BYGUIAPB.MOS~
-				pvrz_files = ~MOS5001.PVRZ~
+				source_folder = EVAL ~%PKGNAME%/copy/BillyYankMultiPort/BGEE~
+				resource_file = ~BYGUIPRC.BAM~
+				pvrz_files = ~MOS5006.PVRZ~
 			RET
 				$UIMenuIF("Succeeded") = succeeded
 		END
@@ -215,21 +211,9 @@ WITH
 		END
 		LAF EEUITweaks.CopyPVRZResource
 			STR_VAR
-				source_folder = EVAL ~%PKGNAME%/copy/BillyYankMultiPort/BG2~
+				source_folder = EVAL ~%PKGNAME%/copy/BillyYankMultiPort/BGEE~
 				resource_file = ~BYOSTSM.BAM~
-				pvrz_files = ~MOS5004.PVRZ~
-			RET
-				$UIMenuIF("Succeeded") = succeeded
-		END
-		ACTION_IF NOT $UIMenuIF("Succeeded") THEN
-		BEGIN
-			FAIL @44
-		END
-		LAF EEUITweaks.CopyPVRZResource
-			STR_VAR
-				source_folder = EVAL ~%PKGNAME%/copy/BillyYankMultiPort/GENDER~
-				resource_file = ~GUIGDB.MOS~
-				pvrz_files = ~mos0130.PVRZ mos0131.PVRZ~
+				pvrz_files = ~MOS5007.PVRZ~
 			RET
 				$UIMenuIF("Succeeded") = succeeded
 		END
@@ -239,26 +223,15 @@ WITH
 		END
 	END
 
-	%IsBGEE%
+	%IsBG2% %IsBG2onSoD% %IsEETBG2% %IsLeUIBG2% %IsEETLeUI% %IsLeUISOD% %IsLeUIBG1%
 	BEGIN
-		COPY ~%PKGNAME%/copy/BillyYankMultiPort/BGEE/M_BYstyl.lua~ ~override~
+		COPY ~%PKGNAME%/copy/BillyYankMultiPort/BG2/M_BYstyl.lua~ ~override~
+		COPY ~%PKGNAME%/copy/BillyYankMultiPort/BG2/BYGUIPRC.BAM~ ~override~
 		LAF EEUITweaks.CopyPVRZResource
 			STR_VAR
-				source_folder = EVAL ~%PKGNAME%/copy/BillyYankMultiPort/BGEE~
+				source_folder = EVAL ~%PKGNAME%/copy/BillyYankMultiPort/BG2~
 				resource_file = ~BYGUIAPB.MOS~
-				pvrz_files = ~MOS5005.PVRZ~
-			RET
-				$UIMenuIF("Succeeded") = succeeded
-		END
-		ACTION_IF NOT $UIMenuIF("Succeeded") THEN
-		BEGIN
-			FAIL @44
-		END
-		LAF EEUITweaks.CopyPVRZResource
-			STR_VAR
-				source_folder = EVAL ~%PKGNAME%/copy/BillyYankMultiPort/BGEE~
-				resource_file = ~BYGUIPRC.BAM~
-				pvrz_files = ~MOS5006.PVRZ~
+				pvrz_files = ~MOS5001.PVRZ~
 			RET
 				$UIMenuIF("Succeeded") = succeeded
 		END
@@ -268,9 +241,9 @@ WITH
 		END
 		LAF EEUITweaks.CopyPVRZResource
 			STR_VAR
-				source_folder = EVAL ~%PKGNAME%/copy/BillyYankMultiPort/BGEE~
+				source_folder = EVAL ~%PKGNAME%/copy/BillyYankMultiPort/BG2~
 				resource_file = ~BYOSTSM.BAM~
-				pvrz_files = ~MOS5007.PVRZ~
+				pvrz_files = ~MOS5004.PVRZ~
 			RET
 				$UIMenuIF("Succeeded") = succeeded
 		END

diff --git a/EEUITweaks/menu/BillyYankMultiPort/genderLeUI1.menu b/EEUITweaks/menu/BillyYankMultiPort/genderLeUI1.menu
@@ -3,8 +3,8 @@ menu
 	name 'CHARGEN_GENDER'
 	align center center
 	ignoreesc
-	onOpen "toggleMale = 0; toggleFemale = 0"
-	
+	onOpen "toggleMale = 0; toggleFemale = 0; createCharGenderHelp = nil"
+
 	label
 	{
 		area 0 159 1024 609
@@ -18,9 +18,10 @@ menu
 	}
 	label
 	{
-		area 414 182 288 416
-		text lua "Infinity_FetchString(createCharGenderHelp)" 
-		text style "normal"
+		area 414 184 286 404
+		text lua "Infinity_FetchString(createCharGenderHelp)"
+		text style "parchment"
+		text color D
 	}
 	button
 	{
@@ -42,7 +43,7 @@ menu
 	button
 	{
 		on escape
-		area 194 718 232 44
+		area 198 718 234 44
 		text "BACK_BUTTON"
 		text style "button"
 		bam GUIOSTUL
@@ -51,7 +52,7 @@ menu
 	button
 	{
 		on return
-		area 438 718 206 44
+		area 438 718 201 44
 		bam GUIOSTUM
 		text "DONE_BUTTON"
 		text style "button"

diff --git a/EEUITweaks/menu/BillyYankMultiPort/genderLeUI2.menu b/EEUITweaks/menu/BillyYankMultiPort/genderLeUI2.menu
@@ -0,0 +1,62 @@
+menu
+{
+	name 'CHARGEN_GENDER'
+	align center center
+	ignoreesc
+	onOpen "toggleMale = 0; toggleFemale = 0; createCharGenderHelp = nil"
+
+	label
+	{
+		area 0 159 1024 609
+		mosaic 'GUIGDB'
+	}
+	label
+	{
+		area 36 182 332 44
+		text "GENDER_TITLE"
+		text style "title"
+	}
+	label
+	{
+		area 430 177 290 422
+		text lua "Infinity_FetchString(createCharGenderHelp)"
+		text style "parchment"
+		text color B
+	}
+	button
+	{
+		area 84 354 98 86
+		bam GUIGEND1
+		sequence 0
+		toggle toggleMale
+		action "toggleFemale = 0; createCharScreen:OnGenderSelectButtonClick(1)"
+	}
+	button
+	{
+		area 230 354 98 86
+		bam GUIGEND1
+		sequence 1
+		toggle toggleFemale
+		action "toggleMale = 0; createCharScreen:OnGenderSelectButtonClick(2)"
+	}
+
+	button
+	{
+		on escape
+		area 198 688 234 44
+		text "BACK_BUTTON"
+		text style "button"
+		bam GUIOSTUL
+		action "Infinity_PopMenu(); createCharScreen:OnCancelButtonClick()"
+	}
+	button
+	{
+		on return
+		area 438 688 201 44
+		bam GUIOSTUM
+		text "DONE_BUTTON"
+		text style "button"
+		clickable lua "createCharScreen:IsDoneButtonClickable()"
+		action "Infinity_PopMenu(); createCharScreen:OnDoneButtonClick()"
+	}
+}