gabry/CodenameEngine
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

read description (#1016)

Browse Source 
* read description

- rename tween to playTween
- use the recycle function for positioning in displayRatingNumbers
- add "tween" variable (which is an FlxTween instance, not to be confused with playTween)
- fix returns

* i think this will be confusing but ok

* Revert "i think this will be confusing but ok"

This reverts commit 5a8c834220.
This commit is contained in:
sillyborja
2026-06-28 11:59:38 +07:00
committed by GitHub
parent 45d47677ac
commit 45a2f28cf6
2 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/funkin/backend/scripting/events/gameplay/RatingsShowEvent.hx
+6 -1
View File
@@ -1,6 +1,7 @@
package funkin.backend.scripting.events.gameplay;
import flixel.math.FlxPoint;
import flixel.tweens.FlxTween;
final class RatingsShowEvent extends CancellableEvent
{
@@ -71,7 +72,7 @@ final class RatingsShowEvent extends CancellableEvent
/**
* Whether the sprite should be tweened or not.
*/
public var tween:Bool;
public var playTween:Bool;
/**
* The amount of spacing for the combo numbers. (may be null)
*/
@@ -88,4 +89,8 @@ final class RatingsShowEvent extends CancellableEvent
* The rating name of the rating sprite. (may be null)
*/
public var rating:Null<String>;
/**
* The FlxTween instance. (null before "onPostRatingsShown")
*/
public var tween:Null<FlxTween>;
}
source/funkin/game/PlayState.hx
+18 -12
View File
@@ -2033,10 +2033,13 @@ class PlayState extends MusicBeatState
public function displayRating(myRating:String, ?evt:NoteHitEvent):Void
{
var event:RatingsShowEvent = EventManager.get(RatingsShowEvent).recycle(comboGroup.recycleLoop(FlxSprite), null, null, null, null, 0.7, true, "game/score/", "", 550, FlxPoint.get(FlxG.random.int(0, 10), FlxG.random.int(140, 175)), 0.2, (Conductor.crochet * 0.001), true, false, false, true, null, FlxPoint.get(comboGroup.x + -40, comboGroup.y + -60), true, myRating);
var event:RatingsShowEvent = EventManager.get(RatingsShowEvent).recycle(comboGroup.recycleLoop(FlxSprite), null, null, null, null, 0.7, true, "game/score/", "", 550, FlxPoint.get(FlxG.random.int(0, 10), FlxG.random.int(140, 175)), 0.2, (Conductor.crochet * 0.001), true, false, false, true, null, FlxPoint.get(comboGroup.x + -40, comboGroup.y + -60), true, myRating, null);
gameAndCharsEvent("onRatingsShown", event);
if (event.cancelled || !event.displayRating) return event.ratingSprite.kill(); // TODO: Find a better way for this?
if (event.cancelled || !event.displayRating) { // TODO: Find a better way for this?
event.ratingSprite.kill();
return;
}
var hasEvent:Bool = evt != null;
@@ -2056,8 +2059,8 @@ class PlayState extends MusicBeatState
rating.antialiasing = hasEvent && evt.ratingAntialiasing != null ? evt.ratingAntialiasing : event.ratingAntialiasing;
rating.updateHitbox();
if (event.tween) {
FlxTween.tween(rating, {alpha: 0}, event.tweenDuration, {
if (event.playTween) {
event.tween = FlxTween.tween(rating, {alpha: 0}, event.tweenDuration, {
startDelay: event.startDelay,
onComplete: function(tween:FlxTween) {
rating.kill();
@@ -2072,10 +2075,13 @@ class PlayState extends MusicBeatState
public function displayCombo(?evt:NoteHitEvent):Void {
if (minDigitDisplay >= 0 && (combo == 0 || combo >= minDigitDisplay)) {
var event:RatingsShowEvent = EventManager.get(RatingsShowEvent).recycle(null, null, comboGroup.recycleLoop(FlxSprite), null, null, 0.7, true, "game/score/", "", 600, FlxPoint.get(FlxG.random.int(0, 10), 150), 0.2, (Conductor.crochet * 0.001), false, false, evt != null && evt.displayCombo != null ? evt.displayCombo : defaultDisplayCombo, true, null, FlxPoint.get(comboGroup.x, comboGroup.y), true, null);
var event:RatingsShowEvent = EventManager.get(RatingsShowEvent).recycle(null, null, comboGroup.recycleLoop(FlxSprite), null, null, 0.7, true, "game/score/", "", 600, FlxPoint.get(FlxG.random.int(0, 10), 150), 0.2, (Conductor.crochet * 0.001), false, false, evt != null && evt.displayCombo != null ? evt.displayCombo : defaultDisplayCombo, true, null, FlxPoint.get(comboGroup.x, comboGroup.y), true, null, null);
gameAndCharsEvent("onRatingsShown", event);
if (event.cancelled || !event.displayCombo) return event.comboSprite.kill(); // TODO: Find a better way for this?
if (event.cancelled || !event.displayCombo) { // TODO: Find a better way for this?
event.comboSprite.kill();
return;
}
var hasEvent:Bool = evt != null;
@@ -2095,8 +2101,8 @@ class PlayState extends MusicBeatState
comboSpr.antialiasing = hasEvent && evt.ratingAntialiasing != null ? evt.ratingAntialiasing : event.ratingAntialiasing;
comboSpr.updateHitbox();
if (event.tween) {
FlxTween.tween(comboSpr, {alpha: 0}, event.tweenDuration, {
if (event.playTween) {
event.tween = FlxTween.tween(comboSpr, {alpha: 0}, event.tweenDuration, {
onComplete: function(tween:FlxTween) {
comboSpr.kill();
},
@@ -2115,7 +2121,7 @@ class PlayState extends MusicBeatState
var separatedScore:String = Std.string(combo).addZeros(3);
for (i in 0...separatedScore.length)
{
var event:RatingsShowEvent = EventManager.get(RatingsShowEvent).recycle(null, comboGroup.recycleLoop(FlxSprite), null, 0.5, true, null, null, "game/score/", "", FlxG.random.int(200, 300), FlxPoint.get(FlxG.random.float(-5, 5), FlxG.random.int(140, 160)), 0.2, (Conductor.crochet * 0.002), false, true, false, true, 43, FlxPoint.get(), true, null);
var event:RatingsShowEvent = EventManager.get(RatingsShowEvent).recycle(null, comboGroup.recycleLoop(FlxSprite), null, 0.5, true, null, null, "game/score/", "", FlxG.random.int(200, 300), FlxPoint.get(FlxG.random.float(-5, 5), FlxG.random.int(140, 160)), 0.2, (Conductor.crochet * 0.002), false, true, false, true, 43, FlxPoint.get(comboGroup.x - 90, comboGroup.y + 80), true, null, null);
gameAndCharsEvent("onRatingsShown", event);
if (event.cancelled || !event.displayNumbers) { // TODO: Find a better way for this?
@@ -2131,7 +2137,7 @@ class PlayState extends MusicBeatState
var numScale:Float = hasEvent && evt.numScale != null ? evt.numScale : event.numScale;
var numScore:FlxSprite = event.numberSprite.loadAnimatedGraphic(Paths.image('${pre}num${separatedScore.charAt(i)}${suf}'));
event.position.set(comboGroup.x + (event.numSpacing * i) - 90, comboGroup.y + 80); // TODO: Maybe find a better way to do this?
event.position.x += event.numSpacing * i;
if (event.resetSprite) {
CoolUtil.resetSprite(numScore, event.position.x, event.position.y);
}
@@ -2143,8 +2149,8 @@ class PlayState extends MusicBeatState
numScore.velocity.y -= event.velocity.y;
numScore.velocity.x = event.velocity.x;
if (event.tween) {
FlxTween.tween(numScore, {alpha: 0}, event.tweenDuration, {
if (event.playTween) {
event.tween = FlxTween.tween(numScore, {alpha: 0}, event.tweenDuration, {
onComplete: function(tween:FlxTween) {
numScore.kill();
},