Merge pull request #3644 from ikemen-engine/loading

feat: add background loading for boot, versus screen, and Turns

Author: K4thos

external/script/main.lua

@@ -168,7 +168,9 @@ options.t_itemname = {
 			--modifyGameOption('Config.TickInterpolation', true)
 			--modifyGameOption('Config.ZoomActive', true)
 			--modifyGameOption('Config.EscOpensMenu', true)
-			--modifyGameOption('Config.BackgroundLoading', false) --TODO: not implemented
+			modifyGameOption('Config.VsScreenLoading', false)
+			modifyGameOption('Config.TurnsLoading', false)
+			--modifyGameOption('Config.BootLoadingMode', 0)
 			--modifyGameOption('Config.FirstRun', false)
 			--modifyGameOption('Config.WindowTitle', "Ikemen GO")
 			--modifyGameOption('Config.WindowIcon', {"external/icons/IkemenCylia_256.png", "external/icons/IkemenCylia_96.png", "external/icons/IkemenCylia_48.png"})
@@ -1251,19 +1253,33 @@ options.t_itemname = {
 		return true
 	end,
 	--Background Loading
-	--[[['backgroundloading'] = function(t, item, cursorPosY, moveTxt)
+	['vsscreenloading'] = function(t, item, cursorPosY, moveTxt)
 		if getInput(-1, motif.option_info.menu.add.key, motif.option_info.menu.subtract.key, motif.option_info.menu.done.key) then
 			sndPlay(motif.Snd, motif.option_info.cursor.move.snd[1], motif.option_info.cursor.move.snd[2])
-			if gameOption('Config.BackgroundLoading') then
-				modifyGameOption('Config.BackgroundLoading', false)
+			if gameOption('Config.VsScreenLoading') then
+				modifyGameOption('Config.VsScreenLoading', false)
 			else
-				modifyGameOption('Config.BackgroundLoading', true)
+				modifyGameOption('Config.VsScreenLoading', true)
 			end
-			t.items[item].vardisplay = options.f_boolDisplay(gameOption('Config.BackgroundLoading'), motif.option_info.menu.valuename.enabled, motif.option_info.menu.valuename.disabled)
+			t.items[item].vardisplay = options.f_boolDisplay(gameOption('Config.VsScreenLoading'), motif.option_info.menu.valuename.enabled, motif.option_info.menu.valuename.disabled)
 			options.modified = true
 		end
 		return true
-	end,]]
+	end,
+	--Turns Preloading
+	['turnsloading'] = function(t, item, cursorPosY, moveTxt)
+		if getInput(-1, motif.option_info.menu.add.key, motif.option_info.menu.subtract.key, motif.option_info.menu.done.key) then
+			sndPlay(motif.Snd, motif.option_info.cursor.move.snd[1], motif.option_info.cursor.move.snd[2])
+			if gameOption('Config.TurnsLoading') then
+				modifyGameOption('Config.TurnsLoading', false)
+			else
+				modifyGameOption('Config.TurnsLoading', true)
+			end
+			t.items[item].vardisplay = options.f_boolDisplay(gameOption('Config.TurnsLoading'), motif.option_info.menu.valuename.enabled, motif.option_info.menu.valuename.disabled)
+			options.modified = true
+		end
+		return true
+	end,
 	--HelperMax
 	['helpermax'] = function(t, item, cursorPosY, moveTxt)
 		if getInput(-1, motif.option_info.menu.add.key) then
@@ -1507,9 +1523,12 @@ options.t_vardisplay = {
 	['autoguard'] = function()
 		return options.f_boolDisplay(gameOption('Options.AutoGuard'))
 	end,
-	--['backgroundloading'] = function()
-	--	return options.f_boolDisplay(gameOption('Config.BackgroundLoading'), motif.option_info.menu.valuename.enabled, motif.option_info.menu.valuename.disabled)
-	--end,
+	['vsscreenloading'] = function()
+		return options.f_boolDisplay(gameOption('Config.VsScreenLoading'), motif.option_info.menu.valuename.enabled, motif.option_info.menu.valuename.disabled)
+	end,
+	['turnsloading'] = function()
+		return options.f_boolDisplay(gameOption('Config.TurnsLoading'), motif.option_info.menu.valuename.enabled, motif.option_info.menu.valuename.disabled)
+	end,
 	['bgmvolume'] = function()
 		return gameOption('Sound.BGMVolume') .. '%'
 	end,