Skip to content

Commit 7c1166a

Browse files
authored
Merge pull request #3789 from ikemen-engine/fix5
fix: life bgmusic in Tag Mode
2 parents a0a3924 + 7b29ce9 commit 7c1166a

1 file changed

Lines changed: 11 additions & 5 deletions

File tree

src/music.go

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -480,13 +480,19 @@ func (m Music) act() {
480480
continue
481481
}
482482

483-
// Low Life (only team leader)
483+
// Low Life
484484
if sys.stage.bgmState == BGMStateRound &&
485485
sys.roundState() == 2 &&
486-
c.playerNo == c.teamLeader()-1 &&
487-
float32(c.life)/float32(c.lifeMax) <= sys.stage.bgmratio {
488-
//fmt.Printf("[music] act: low life detected for player %d, trying 'life' prefix\n", c.playerNo)
489-
if cmusic.tryPlay("life", sys.stage.def) {
486+
c.playerNo == c.teamLeader()-1 {
487+
lowLife := true
488+
for i := side; i < int(MaxSimul)*2; i += 2 {
489+
if len(sys.chars[i]) > 0 && sys.chars[i][0] != nil &&
490+
float32(sys.chars[i][0].life)/float32(sys.chars[i][0].lifeMax) > sys.stage.bgmratio {
491+
lowLife = false
492+
break
493+
}
494+
}
495+
if lowLife && cmusic.tryPlay("life", sys.stage.def) {
490496
sys.stage.bgmState = BGMStateLowLife
491497
continue
492498
}

0 commit comments

Comments
 (0)