Merge pull request #2977 from ikemen-engine/fix7

fix: victory music, esc options fade, results screen parsing

Author: K4thos

external/script/options.lua

@@ -1434,7 +1434,7 @@ function options.f_createMenu(tbl, bool_main)
 				playBgm({source = "motif.title", interrupt = true})
 				main.close = false
 				break
-			elseif esc() or main.f_input(main.t_players, motif.option_info.menu.cancel.key) then
+			elseif (esc() or main.f_input(main.t_players, motif.option_info.menu.cancel.key)) and not main.fadeActive then
 				sndPlay(motif.Snd, motif.option_info.cancel.snd[1], motif.option_info.cancel.snd[2])
 				if bool_main then
 					if options.modified then

src/bytecode.go

@@ -659,7 +659,6 @@ const (
 	OC_ex_ikemenversion
 	OC_ex_incustomanim
 	OC_ex_incustomstate
-	OC_ex_indialogue
 	OC_ex_isassertedchar
 	OC_ex_isassertedglobal
 	OC_ex_ishost

src/hiscore_rank.go

@@ -81,18 +81,30 @@ func tallyRun() runTally {
 }
 
 func modeCleared(mode string, matches int) bool {
-	switch mode {
-	case "survival", "survivalcoop", "netplaysurvivalcoop":
-		// P1 wins OR reached configured rounds to win
+	// Survival-like: P1 wins OR reached configured rounds-to-win.
+	modeLower := strings.ToLower(mode)
+	if strings.Contains(modeLower, "survival") {
 		if sys.winnerTeam() == 1 {
 			return true
 		}
-		rtw := int(sys.motif.SurvivalResultsScreen.RoundsToWin)
-		return matches >= rtw && rtw > 0
-	default:
-		// Arcade / Timeattack / TeamCoop etc.
-		return sys.winnerTeam() == 1
+		// Pull rounds-to-win from the unified ResultsScreen map.
+		// Prefer the exact mode entry; if not present, fall back to plain "survival"
+		// so modes like "survivalcoop"/"netplaysurvivalcoop" can reuse [Survival Results Screen].
+		rs, _ := sys.motif.wi.findResultsScreenForMode(&sys.motif, modeLower)
+		if rs == nil {
+			rs, _ = sys.motif.wi.findResultsScreenForMode(&sys.motif, "survival")
+		}
+		if rs != nil {
+			rtw := int(rs.RoundsToWin)
+			return matches >= rtw && rtw > 0
+		}
+
+		// No results screen config available -> can't use rounds-to-win rule.
+		return false
 	}
+
+	// Arcade / Timeattack / TeamCoop etc.
+	return sys.winnerTeam() == 1
 }
 
 func rankingTypeFor(mode string) (string, bool) {