fix: continue screen end sequence and music

Fixes #2966

Author: K4thos

src/iniutils.go

@@ -2589,6 +2589,36 @@ func (h *BgmProperties) maxSize() int {
 	return maxLen
 }
 
+// Split a [Music] key into (prefix, property) while allowing dots in prefix.
+func splitMusicKey(rawKey string) (prefix string, property string) {
+	k := strings.TrimSpace(rawKey)
+	if k == "" {
+		return "", ""
+	}
+	kl := strings.ToLower(k)
+
+	// Find the last occurrence of a known music anchor so that prefixes can contain dots.
+	anchors := []string{".bgmusic", ".music", ".bgm"}
+	best := -1
+	for _, a := range anchors {
+		if i := strings.LastIndex(kl, a); i > best {
+			best = i
+		}
+	}
+
+	if best >= 0 {
+		prefix = strings.TrimSpace(k[:best])
+		property = strings.TrimSpace(kl[best+1:]) // without leading dot
+		return prefix, property
+	}
+
+	// Fallback
+	if dotIdx := strings.Index(k, "."); dotIdx >= 0 {
+		return strings.TrimSpace(k[:dotIdx]), strings.TrimSpace(strings.ToLower(k[dotIdx+1:]))
+	}
+	return "", strings.ToLower(k)
+}
+
 func parseMusicSection(section *ini.Section) Music {
 	// If section is nil, just return empty Music
 	if section == nil {
@@ -2615,16 +2645,12 @@ func parseMusicSection(section *ini.Section) Music {
 			continue
 		}
 
-		// Split into prefix and property
-		prefix := ""
-		property := rawKey
-		if dotIdx := strings.Index(rawKey, "."); dotIdx >= 0 {
-			prefix = strings.ToLower(rawKey[:dotIdx])
-			property = strings.ToLower(rawKey[dotIdx+1:])
-		} else {
-			// entire rawKey is the property
-			property = strings.ToLower(rawKey)
-		}
+		// Split into prefix and property, allowing dots inside prefix.
+		prefixRaw, property := splitMusicKey(rawKey)
+
+		// Normalize prefix: lower-case + flatten dots to underscores
+		prefix := strings.ToLower(prefixRaw)
+		prefix = strings.ReplaceAll(prefix, ".", "_")
 
 		// Split comma-separated values
 		values := strings.Split(rawVal, ",")

src/motif.go

@@ -3023,6 +3023,7 @@ type MotifContinue struct {
 	initialized bool
 	counter     int32
 	endTimer    int32
+	showEndAnim bool
 	credits     int32
 	yesSide     bool
 	selected    bool
@@ -3037,6 +3038,7 @@ func (co *MotifContinue) reset(m *Motif) {
 	co.yesSide = true
 	co.selected = false
 	co.endTimer = -1
+	co.showEndAnim = false
 	sys.applyFightAspect()
 }
 
@@ -3105,6 +3107,7 @@ func (co *MotifContinue) init(m *Motif) {
 	co.counter = 0
 	co.active = true
 	co.initialized = true
+	co.showEndAnim = false
 }
 
 func (co *MotifContinue) processSelection(m *Motif, continueSelected bool) {
@@ -3168,8 +3171,21 @@ func (co *MotifContinue) step(m *Motif) {
 		}
 	}
 
-	if !co.selected {
+	// Keep the counter anim running while showing the integrated end/gameover tail.
+	if !co.selected || co.showEndAnim {
 		m.ContinueScreen.Counter.AnimData.Update()
+	}
+
+	// If we're showing the integrated end/gameover tail (gameover.enabled = 0),
+	// defer fadeout until the counter animation reaches endtime.
+	if co.selected && co.showEndAnim && co.endTimer == -1 &&
+		m.ContinueScreen.Counter.EndTime > 0 &&
+		co.counter >= m.ContinueScreen.Counter.EndTime {
+		startFadeOut(m.ContinueScreen.FadeOut.FadeData, m.fadeOut, false, m.fadePolicy)
+		co.endTimer = co.counter + m.fadeOut.timeRemaining
+	}
+
+	if !co.selected {
 		if m.ContinueScreen.LegacyMode.Enabled {
 			if m.button(m.ContinueScreen.Move.Key, co.pn-1) {
 				m.Snd.play(m.ContinueScreen.Move.Snd, 100, 0, 0, 0, 0)
@@ -3190,7 +3206,23 @@ func (co *MotifContinue) step(m *Motif) {
 				co.playCounterSounds(m)
 			} else if co.counter == m.ContinueScreen.Counter.End.SkipTime {
 				m.Snd.play(m.ContinueScreen.Counter.End.Snd, 100, 0, 0, 0, 0)
-				co.processSelection(m, false)
+				m.Music.Play("continue.end", sys.motif.Def)
+				// If separate gameover screen is disabled, the end/gameover portion is integrated into the same counter animation.
+				// Let it play to endtime, then fade out.
+				if !m.ContinueScreen.GameOver.Enabled {
+					cs := m.ContinueScreen
+					m.processStateTransitions(
+						cs.P2.No.State,
+						cs.P2.Teammate.No.State,
+						cs.P1.No.State,
+						cs.P1.Teammate.No.State,
+					)
+					co.selected = true
+					co.showEndAnim = true
+					// fadeout will be started when counter reaches Counter.EndTime
+				} else {
+					co.processSelection(m, false)
+				}
 			}
 		}
 	}
@@ -3234,7 +3266,7 @@ func (co *MotifContinue) draw(m *Motif, layerno int16) {
 	// Mugen style
 	if m.ContinueScreen.LegacyMode.Enabled {
 		co.drawLegacyMode(m, layerno)
-	} else if !co.selected {
+	} else if !co.selected || co.showEndAnim {
 		// Arcade style Counter
 		m.ContinueScreen.Counter.AnimData.Draw(layerno)
 	}

src/music.go

@@ -180,6 +180,11 @@ func (m Music) Override(other Music) {
 	}
 }
 
+// flattens dotted prefixes to underscore form, matching parseMusicSection.
+func normalizeMusicPrefix(prefix string) string {
+	return strings.ReplaceAll(prefix, ".", "_")
+}
+
 // AppendParams parses comma-separated "key=value" pairs (as passed from
 // Lua addChar/addStage/loadStart) and appends to the proper prefix list.
 func (m Music) AppendParams(entries []string) {
@@ -190,10 +195,27 @@ func (m Music) AppendParams(entries []string) {
 			value := strings.TrimSpace(c[eqPos+1:])
 			prefix := ""
 			field := key
-			if dotPos := strings.Index(key, "."); dotPos != -1 {
+
+			// Allow dots in prefix: split using the last ".<music anchor>" if present,
+			// otherwise fall back to last dot.
+			kl := strings.ToLower(key)
+			anchors := []string{".bgmusic", ".music", ".bgm"}
+			best := -1
+			for _, a := range anchors {
+				if i := strings.LastIndex(kl, a); i > best {
+					best = i
+				}
+			}
+			if best >= 0 {
+				prefix = strings.TrimSpace(key[:best])
+				field = strings.TrimSpace(key[best+1:]) // without leading dot
+			} else if dotPos := strings.LastIndex(key, "."); dotPos != -1 {
 				prefix = key[:dotPos]
 				field = key[dotPos+1:]
 			}
+
+			// Flatten dotted prefixes to match storage in parseMusicSection.
+			prefix = normalizeMusicPrefix(prefix)
 			//fmt.Printf("[music] AppendParams: normalized key='%s' -> prefix='%s', field='%s', value='%s'\n", key, prefix, field, value)
 
 			// Ignore non-music fields
@@ -261,10 +283,20 @@ func (m Music) Read(key, def string) (string, int, int, int, int, int, float32,
 	var loop, volume, loopstart, loopend, startposition, loopcount int = 1, 100, 0, 0, 0, -1
 	var freqmul float32 = 1.0
 	//fmt.Printf("[music] Read: key='%s' def='%s'\n", key, def)
+	// Support dotted prefixes by only stripping a suffix when the key actually targets a music field.
 	prefix := key
-	if dotPos := strings.Index(key, "."); dotPos != -1 {
-		prefix = key[:dotPos]
+	kl := strings.ToLower(key)
+	anchors := []string{".bgmusic", ".music", ".bgm"}
+	best := -1
+	for _, a := range anchors {
+		if i := strings.LastIndex(kl, a); i > best {
+			best = i
+		}
+	}
+	if best >= 0 {
+		prefix = key[:best]
 	}
+	prefix = normalizeMusicPrefix(prefix)
 	if len(m[prefix]) > 0 {
 		idx := int(RandI(0, int32(len(m[prefix]))-1))
 		bgm = SearchFile(m[prefix][idx].bgmusic, []string{def, "", "sound/"})
@@ -314,7 +346,8 @@ func (m Music) tryPlay(key, def string) bool {
 	//if dot := strings.Index(key, "."); dot != -1 {
 	//	key = key[:dot]
 	//}
-	lst, ok := m[key]
+	nkey := normalizeMusicPrefix(key)
+	lst, ok := m[nkey]
 	if !ok || len(lst) == 0 {
 		//fmt.Printf("[music] tryPlay: prefix '%s' not found or empty\n", key)
 		return false
@@ -331,7 +364,7 @@ func (m Music) tryPlay(key, def string) bool {
 		//fmt.Printf("[music] tryPlay: prefix '%s' has no defined bgmusic entries\n", key)
 		return false
 	}
-	ok = m.Play(key+".bgmusic", def)
+	ok = m.Play(nkey+".bgmusic", def)
 	//fmt.Printf("[music] tryPlay: Play('%s.bgmusic') -> %v\n", key, ok)
 	return ok
 }

src/resources/defaultMotif.ini

@@ -168,6 +168,15 @@
 	continue.bgm.freqmul = 1.0
 	continue.bgm.loopcount = -1
 
+	continue.end.bgm = 
+	continue.end.bgm.loop = 1
+	continue.end.bgm.volume = 100
+	continue.end.bgm.loopstart = 0
+	continue.end.bgm.loopend = 0
+	continue.end.bgm.startposition = 0
+	continue.end.bgm.freqmul = 1.0
+	continue.end.bgm.loopcount = -1
+
 	results.bgm = 
 	results.bgm.loop = 1
 	results.bgm.volume = 100