updateRatingStuff as dynamic + adding iconArray

Resolves #624
This commit is contained in:
⍚~Nex
2025-05-02 18:58:33 +02:00
parent 4e91b600ff
commit 31ae98fe44
+15 -8
View File
@@ -294,6 +294,11 @@ class PlayState extends MusicBeatState
* Opponent's icon
*/
public var iconP2:HealthIcon;
/**
* Every active icon that will be updated during gameplay (defaults to `iconP1` and `iconP1` between `create` and `postCreate` in scripts)
*/
public var iconArray:Array<HealthIcon> = [];
/**
* Camera for the HUD (notes, misses).
*/
@@ -750,9 +755,9 @@ class PlayState extends MusicBeatState
health = maxHealth / 2;
iconP1 = new HealthIcon(boyfriend != null ? boyfriend.getIcon() : "face", true);
iconP2 = new HealthIcon(dad != null ? dad.getIcon() : "face", false);
for(icon in [iconP1, iconP2]) {
iconArray.push(iconP1 = new HealthIcon(boyfriend != null ? boyfriend.getIcon() : "face", true));
iconArray.push(iconP2 = new HealthIcon(dad != null ? dad.getIcon() : "face", false));
for (icon in iconArray) {
icon.y = healthBar.y - (icon.height / 2);
add(icon);
}
@@ -769,7 +774,8 @@ class PlayState extends MusicBeatState
scoreTxt.alignment = RIGHT;
missesTxt.alignment = CENTER;
accuracyTxt.alignment = LEFT;
updateRatingStuff();
if (updateRatingStuff != null)
updateRatingStuff();
for(e in [healthBar, healthBarBG, iconP1, iconP2, scoreTxt, missesTxt, accuracyTxt])
e.cameras = [camHUD];
@@ -1227,7 +1233,7 @@ class PlayState extends MusicBeatState
iconP2.health = 1 - (healthBarPercent / 100);
}
function updateRatingStuff() {
dynamic function updateRatingStuff() {
scoreTxt.text = 'Score:$songScore';
missesTxt.text = '${comboBreaks ? "Combo Breaks" : "Misses"}:$misses';
@@ -1257,7 +1263,8 @@ class PlayState extends MusicBeatState
return;
}
updateRatingStuff();
if (updateRatingStuff != null)
updateRatingStuff();
if (canAccessDebugMenus) {
if (chartingMode && FlxG.keys.justPressed.SEVEN) {
@@ -1271,7 +1278,7 @@ class PlayState extends MusicBeatState
}
if (doIconBop)
for (icon in [iconP1, iconP2])
for (icon in iconArray)
if (icon.updateBump != null)
icon.updateBump();
@@ -1849,7 +1856,7 @@ class PlayState extends MusicBeatState
}
if (doIconBop)
for (icon in [iconP1, iconP2])
for (icon in iconArray)
if (icon.bump != null)
icon.bump();