Merge pull request #3744 from ikemen-engine/fix

fix: randomtest pause menu, bash path, storyboard not found within zip archive, dialogue sctrl wait token, netplay loading readiness reliability

Author: K4thos

build/Ikemen_GO.command

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 cd "$(dirname "$0")"
 
 case "$OSTYPE" in

build/build.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # Exit in case of failure; print function-trap friendly errors
 set -o errtrace

build/bundle_run.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # Get the directory of this script (MacOS directory)
 SCRIPT_DIR="$(dirname "$0")"

external/script/main.lua

@@ -941,6 +941,7 @@ end
 --;===========================================================
 function main.f_commandLine()
 	setGameMode('quickvs')
+	main.pauseMenu = false
 	setCredits(-1)
     -- No need for asynchronous loading when running from command line. Fixes race conditions with Turns teammate faces
     modifyGameOption('Config.BootLoadingMode', 0)
@@ -1129,6 +1130,7 @@ function main.f_commandLine()
 		main.f_clearShuffleTables()
 		refresh()
 	end
+	table.insert(t_params, 'pausemenu=' .. tostring(main.pauseMenu))
 	local params = table.concat(t_params, ", ")
 	if params == '' then
 		loadStart()
@@ -1885,6 +1887,7 @@ function main.f_default()
 		redlifebar = gameOption('Options.RedLife'),
 	}
 	main.luaPath = 'external/script/default.lua' --path to script executed by start.f_selectMode()
+	main.pauseMenu = true
 	main.makeRoster = false --if default roster for each match should be generated before first match
 	main.matchWins = { --amount of rounds to win for each team side and team mode
 		draw = {gameOption('Options.Match.MaxDrawGames'), gameOption('Options.Match.MaxDrawGames')},
@@ -2108,6 +2111,7 @@ main.t_itemname = {
 		main.matchWins.tag = {1, 1}
 		main.numSimul = {2, 2}
 		main.numTag = {2, 2}
+		main.pauseMenu = false
 		main.persistLife = true
 		main.persistMusic = true
 		main.persistRounds = true
@@ -2147,6 +2151,7 @@ main.t_itemname = {
 		main.motif.winscreen = true
 		main.numSimul = {2, 2}
 		main.numTag = {2, 2}
+		main.pauseMenu = false
 		main.resetScore = true
 		main.stageOrder = true
 		main.storyboard.credits = true
@@ -2174,6 +2179,7 @@ main.t_itemname = {
 		main.motif.victoryscreen = true
 		main.orderSelect[1] = true
 		main.orderSelect[2] = true
+		main.pauseMenu = false
 		main.selectMenu[2] = true
 		main.stageMenu = true
 		main.teamMenu[1].simul = true
@@ -2197,6 +2203,7 @@ main.t_itemname = {
 	end,
 	--RANDOMTEST
 	['randomtest'] = function(t, item)
+		main.pauseMenu = false
 		setGameMode('randomtest')
 		hook.run("main.t_itemname", t, item)
 		return main.f_randomtest
@@ -3445,6 +3452,7 @@ end
 
 function main.f_demoStart()
 	main.f_default()
+	main.pauseMenu = false
 	local palState = {}
 	setFightScreenElements({bars = motif.demo_mode.fight.bars.display})
 	setGameMode('demo')
@@ -3461,7 +3469,7 @@ function main.f_demoStart()
 	end
 	hook.run("main.t_itemname", t, item)
 	--clearColor(motif[main.background].bgclearcolor[1], motif[main.background].bgclearcolor[2], motif[main.background].bgclearcolor[3])
-	loadStart()
+	loadStart(start.f_buildLoadStartParams())
 	game()
 	if not motif.attract_mode.enabled then
 		if introWaitCycles >= motif.demo_mode.intro.waitcycles then

external/script/start.lua

@@ -1777,7 +1777,7 @@ function start.f_selectMode()
 		--external script execution
 		local oldCustomArcadePath = start.customArcadePath
 		start.customArcadePath = customArcadePath
-		assert(loadfile(path))()
+		assert(loadFile(path))()
 		start.customArcadePath = oldCustomArcadePath
 		--infinite matches flag detected
 		if main.makeRoster and start.t_roster[matchNo()] ~= nil and start.t_roster[matchNo()][1] == -1 then
@@ -3778,6 +3778,7 @@ function start.f_buildLoadStartParams(arg, doSelectMissing, t_orderRemap)
 	addParam("charparam.time", main.charparam.time)
 	addParam("p1.turnsoffset", start.p[1].turnsOffset or 0)
 	addParam("p2.turnsoffset", start.p[2].turnsOffset or 0)
+	addParam("pausemenu", main.pauseMenu)
 	addParam("persistlife", main.persistLife)
 	addParam("persistmusic", main.persistMusic)
 	addParam("persistrounds", main.persistRounds)

src/common.go

@@ -15,6 +15,8 @@ import (
 	"unicode"
 	"unicode/utf8"
 
+	"gopkg.in/ini.v1"
+
 	"golang.org/x/text/encoding/japanese"
 	"golang.org/x/text/transform"
 )
@@ -409,6 +411,24 @@ func LoadText(filename string) (string, error) {
 	return string(bytes), nil
 }
 
+func LoadINIText(text string, opts ini.LoadOptions) (*ini.File, error) {
+	return ini.LoadSources(opts, []byte(NormalizeNewlines(text)))
+}
+
+func LoadINIBytes(data []byte, opts ini.LoadOptions) (*ini.File, error) {
+	return LoadINIText(string(data), opts)
+}
+
+func LoadINIFile(filename string, opts ini.LoadOptions) (*ini.File, string, error) {
+	text, err := LoadText(filename)
+	if err != nil {
+		return nil, "", err
+	}
+	text = NormalizeNewlines(text)
+	iniFile, err := LoadINIText(text, opts)
+	return iniFile, text, err
+}
+
 func decodeShiftJIS(input string) string {
 	bytes := []byte(input)
 

src/config.go

@@ -243,31 +243,32 @@ func loadConfig(def string) (*Config, error) {
 	userOptions := baseOptions
 	userOptions.AllowShadows = true
 
-	// Choose default config source: prefer physical file, else embedded bytes.
-	var defaultSrc interface{}
+	var err error
+
+	defaultText := string(defaultConfig)
 	if fp := FileExist("resources/defaultConfig.ini"); len(fp) != 0 {
-		defaultSrc = fp
-	} else {
-		defaultSrc = defaultConfig
+		defaultText, err = LoadText(fp)
+		if err != nil {
+			return nil, fmt.Errorf("failed to load default config %s: %w", fp, err)
+		}
 	}
 	// Load the INI file
 	var iniFile *ini.File
 	var defaultOnlyIni *ini.File
 	var userIniFile *ini.File
 
-	var err error
 	// Load defaults-only.
-	defaultOnlyIni, err = ini.LoadSources(baseOptions, defaultSrc)
+	defaultOnlyIni, err = LoadINIText(defaultText, baseOptions)
 	if err != nil {
 		return nil, fmt.Errorf("failed to read defaults-only data: %v", err)
 	}
 	// Start merged INI as defaults, then overlay user (first-wins for duplicates).
-	iniFile, err = ini.LoadSources(baseOptions, defaultSrc)
+	iniFile, err = LoadINIText(defaultText, baseOptions)
 	if err != nil {
 		return nil, fmt.Errorf("failed to read base data: %v", err)
 	}
 	if fp := FileExist(def); len(fp) != 0 {
-		userIniFile, err = ini.LoadSources(userOptions, def)
+		userIniFile, _, err = LoadINIFile(fp, userOptions)
 		if err != nil {
 			return nil, fmt.Errorf("failed to read user data: %v", err)
 		}

src/motif.go

@@ -1558,6 +1558,7 @@ func loadMotif(def string) (*Motif, error) {
 	var iniFile *ini.File
 	var userIniFile *ini.File
 	var defaultOnlyIni *ini.File
+	var motifText string
 
 	if err := LoadFile(&def, []string{def, "", "data/"}, "", func(filename string) error {
 		def = filename
@@ -1568,10 +1569,11 @@ func loadMotif(def string) (*Motif, error) {
 			return fmt.Errorf("Failed to discover external mod system.def files: %w", err)
 		}
 
-		inputBytes, err := LoadText(filename)
+		inputText, err := LoadText(filename)
 		if err != nil {
 			return fmt.Errorf("Failed to load text from %s: %w", filename, err)
 		}
+		motifText = NormalizeNewlines(inputText)
 
 		var modsConcat strings.Builder
 		for _, p := range modSystemDefs {
@@ -1588,7 +1590,7 @@ func loadMotif(def string) (*Motif, error) {
 
 		// Preprocess and load INI sources from memory.
 		// Motif file overrides mods
-		baseTxt := NormalizeNewlines(string(inputBytes))
+		baseTxt := motifText
 		modsTxt := modsConcat.String()
 		var combined string
 		if modsTxt != "" {
@@ -1599,22 +1601,22 @@ func loadMotif(def string) (*Motif, error) {
 		} else {
 			combined = baseTxt
 		}
-		normalizedInput := []byte(preprocessINIContent(combined))
-		normalizedDefault := []byte(preprocessINIContent(NormalizeNewlines(string(defaultMotif))))
+		normalizedInput := preprocessINIContent(combined)
+		normalizedDefault := preprocessINIContent(NormalizeNewlines(string(defaultMotif)))
 
 		// Defaults-only baseline
-		defaultOnlyIni, err = ini.LoadSources(baseOptions, normalizedDefault)
+		defaultOnlyIni, err = LoadINIText(normalizedDefault, baseOptions)
 		if err != nil {
 			return fmt.Errorf("Failed to load defaults-only INI from memory: %w", err)
 		}
 
 		// merged starts as defaults, then overlay user (first-wins for duplicates in user)
-		iniFile, err = ini.LoadSources(baseOptions, normalizedDefault)
+		iniFile, err = LoadINIText(normalizedDefault, baseOptions)
 		if err != nil {
 			return fmt.Errorf("Failed to load merged baseline INI from memory: %w", err)
 		}
 
-		userIniFile, err = ini.LoadSources(userOptions, normalizedInput)
+		userIniFile, err = LoadINIText(normalizedInput, userOptions)
 		if err != nil {
 			return fmt.Errorf("Failed to load user INI source from memory: %w", err)
 		}
@@ -1834,11 +1836,7 @@ func loadMotif(def string) (*Motif, error) {
 	m.loadFiles()
 	sys.keepAlive()
 
-	str, err := LoadText(def)
-	if err != nil {
-		return nil, err
-	}
-	lines, i := SplitAndTrim(str, "\n"), 0
+	lines, i := SplitAndTrim(motifText, "\n"), 0
 	m.AnimTable = ReadAnimationTable(m.Def, m.Sff, &m.Sff.palList, lines, &i, true)
 	i = 0
 
@@ -3362,10 +3360,15 @@ func (me *MotifMenu) init(m *Motif) {
 	}
 	openPressed := sys.esc || sys.uiRawInput(pm.Menu.Cancel.Key, -1)
 
-	if sys.escExit() || (sys.netplay() && openPressed) {
-		if sys.netplay() {
+	if !sys.sel.gameParams.PauseMenu {
+		if openPressed {
 			sys.esc = true
+			sys.endMatch = true
 		}
+		return
+	}
+
+	if sys.escExit() {
 		sys.endMatch = true
 		return
 	}
@@ -4823,7 +4826,7 @@ func (di *MotifDialogue) step(m *Motif) {
 	}
 
 	// If line is fully rendered, handle auto-switch after SwitchTime
-	if di.lineFullyRendered {
+	if di.lineFullyRendered && di.wait <= 0 {
 		di.switchCounter++
 		if di.switchCounter >= int(m.DialogueInfo.SwitchTime) {
 			di.advanceLine(m)