diff --git a/source/funkin/backend/chart/EventsData.hx b/source/funkin/backend/chart/EventsData.hx index fa7a3a9b61..bc4d240b03 100644 --- a/source/funkin/backend/chart/EventsData.hx +++ b/source/funkin/backend/chart/EventsData.hx @@ -102,7 +102,9 @@ class EventsData { {name: "Offset X", type: TFloat(null, null, 10, 3), defValue: 0}, {name: "Offset Y", type: TFloat(null, null, 10, 3), defValue: 0}, {name: "Copy Shader?", type: TBool, defValue: true}, - {name: "Use Stage Node Position?", type: TBool, defValue: false} + {name: "Use Stage Node Position?", type: TBool, defValue: false}, + {name: "Update Icon?", type: TBool, defValue: true}, + {name: "Update Healthbar Color?", type: TBool, defValue: true} ], "Scroll Speed Change" => [ {name: "Tween Speed?", type: TBool, defValue: true}, diff --git a/source/funkin/game/PlayState.hx b/source/funkin/game/PlayState.hx index efd747580b..aa1fa53e0d 100644 --- a/source/funkin/game/PlayState.hx +++ b/source/funkin/game/PlayState.hx @@ -1836,16 +1836,20 @@ class PlayState extends MusicBeatState strumLines.members[event.params[0]].characters[event.params[1]] = newChar; //refresh icons - switch(event.params[0]){ + if (event.params[8]) switch(event.params[0]) { case 0: iconP2.setIcon(dad.getIcon()); case 1: iconP1.setIcon(bf.getIcon()); } - var leftColor:Int = dad != null && dad.iconColor != null && Options.colorHealthBar ? dad.iconColor : (opponentMode ? 0xFF66FF33 : 0xFFFF0000); - var rightColor:Int = boyfriend != null && boyfriend.iconColor != null && Options.colorHealthBar ? boyfriend.iconColor : (opponentMode ? 0xFFFF0000 : 0xFF66FF33); // switch the colors - healthBar.createFilledBar(leftColor, rightColor); - healthBar.updateBar(); + + if (event.params[9]) { + var leftColor:Int = dad != null && dad.iconColor != null && Options.colorHealthBar ? dad.iconColor : (opponentMode ? 0xFF66FF33 : 0xFFFF0000); + var rightColor:Int = boyfriend != null && boyfriend.iconColor != null && Options.colorHealthBar ? boyfriend.iconColor : (opponentMode ? 0xFFFF0000 : 0xFF66FF33); // switch the colors + healthBar.createFilledBar(leftColor, rightColor); + healthBar.updateBar(); + } + case "Scroll Speed Change": var tween = eventsTween.get("scrollSpeedTween"); if (tween != null) tween.cancel();