Parker2991/Funkin
1
0
Fork 0
mirror of https://github.com/FunkinCrew/Funkin.git synced 2024-11-23 08:07:54 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #489 from FunkinCrew/bugfix/blazin-death-confirm

Browse source 
Blazin' Death confirm fix
This commit is contained in:
Cameron Taylor 2024-04-19 14:06:19 -04:00 committed by GitHub
commit a0c061e93b
3 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.vscode/settings.json vendored
View file

@ -170,6 +170,11 @@
"target": "windows", "target": "windows",
"args": ["-debug", "-DANIMDEBUG", "-DFORCE_DEBUG_VERSION"] "args": ["-debug", "-DANIMDEBUG", "-DFORCE_DEBUG_VERSION"]
}, },
{
"label": "Windows / Debug (Debug hxCodec)",
"target": "windows",
"args": ["-debug", "-DHXC_LIBVLC_LOGGING", "-DFORCE_DEBUG_VERSION"]
},
{ {
"label": "HashLink / Debug (Straight to Animation Editor)", "label": "HashLink / Debug (Straight to Animation Editor)",
"target": "hl", "target": "hl",

2
assets

@ -1 +1 @@
Subproject commit 069c9bf45f197ebe0b38483d11bb30c15bbb5eca Subproject commit a24f42932fbe9032d28be1603f197fb50c938276

24
source/funkin/ui/freeplay/SongMenuItem.hx
View file

@ -46,7 +46,7 @@ class SongMenuItem extends FlxSpriteGroup
public var hsvShader(default, set):HSVShader; public var hsvShader(default, set):HSVShader;
var diffRatingSprite:FlxSprite; // var diffRatingSprite:FlxSprite;
public function new(x:Float, y:Float) public function new(x:Float, y:Float)
{ {
@ -65,13 +65,13 @@ class SongMenuItem extends FlxSpriteGroup
var rank:String = FlxG.random.getObject(ranks); var rank:String = FlxG.random.getObject(ranks);
ranking = new FlxSprite(capsule.width * 0.84, 30); ranking = new FlxSprite(capsule.width * 0.84, 30);
ranking.loadGraphic(Paths.image('freeplay/ranks/' + rank)); // ranking.loadGraphic(Paths.image('freeplay/ranks/' + rank));
ranking.scale.x = ranking.scale.y = realScaled; // ranking.scale.x = ranking.scale.y = realScaled;
// ranking.alpha = 0.75; // ranking.alpha = 0.75;
ranking.visible = false; // ranking.visible = false;
ranking.origin.set(capsule.origin.x - ranking.x, capsule.origin.y - ranking.y); // ranking.origin.set(capsule.origin.x - ranking.x, capsule.origin.y - ranking.y);
add(ranking); // add(ranking);
grpHide.add(ranking); // grpHide.add(ranking);
switch (rank) switch (rank)
{ {
@ -81,9 +81,9 @@ class SongMenuItem extends FlxSpriteGroup
grayscaleShader = new Grayscale(1); grayscaleShader = new Grayscale(1);
diffRatingSprite = new FlxSprite(145, 90).loadGraphic(Paths.image('freeplay/diffRatings/diff00')); // diffRatingSprite = new FlxSprite(145, 90).loadGraphic(Paths.image('freeplay/diffRatings/diff00'));
diffRatingSprite.shader = grayscaleShader; // diffRatingSprite.shader = grayscaleShader;
diffRatingSprite.origin.set(capsule.origin.x - diffRatingSprite.x, capsule.origin.y - diffRatingSprite.y); // diffRatingSprite.origin.set(capsule.origin.x - diffRatingSprite.x, capsule.origin.y - diffRatingSprite.y);
// TODO: Readd once ratings are fully implemented // TODO: Readd once ratings are fully implemented
// add(diffRatingSprite); // add(diffRatingSprite);
// grpHide.add(diffRatingSprite); // grpHide.add(diffRatingSprite);
@ -118,8 +118,8 @@ class SongMenuItem extends FlxSpriteGroup
function updateDifficultyRating(newRating:Int):Void function updateDifficultyRating(newRating:Int):Void
{ {
var ratingPadded:String = newRating < 10 ? '0$newRating' : '$newRating'; var ratingPadded:String = newRating < 10 ? '0$newRating' : '$newRating';
diffRatingSprite.loadGraphic(Paths.image('freeplay/diffRatings/diff${ratingPadded}')); // diffRatingSprite.loadGraphic(Paths.image('freeplay/diffRatings/diff${ratingPadded}'));
diffRatingSprite.visible = false; // diffRatingSprite.visible = false;
} }
function set_hsvShader(value:HSVShader):HSVShader function set_hsvShader(value:HSVShader):HSVShader