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

Combo counter tweaks, stage position tweaks

Browse source
This commit is contained in:
Eric Myllyoja 2022-09-08 02:48:51 -04:00
parent baab8e101f
commit 3a085e9333
3 changed files with 25 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
source/funkin/ComboCounter.hx
View file

@ -31,6 +31,7 @@ class ComboCounter extends FlxTypedSpriteGroup<FlxSprite>
{ {
kill(); kill();
}; };
effectStuff.setGraphicSize(Std.int(effectStuff.width * 0.7));
add(effectStuff); add(effectStuff);
grpNumbers = new FlxTypedGroup<ComboNumber>(); grpNumbers = new FlxTypedGroup<ComboNumber>();
@ -90,7 +91,8 @@ class ComboCounter extends FlxTypedSpriteGroup<FlxSprite>
while (daCombo > 0) while (daCombo > 0)
{ {
var comboNumber:ComboNumber = new ComboNumber(420 - (130 * loopNum), 44 * loopNum, daCombo % 10); var comboNumber:ComboNumber = new ComboNumber(450 - (100 * loopNum), 20 + 14 * loopNum, daCombo % 10);
comboNumber.setGraphicSize(Std.int(comboNumber.width * 0.7));
grpNumbers.add(comboNumber); grpNumbers.add(comboNumber);
add(comboNumber); add(comboNumber);

2
source/funkin/play/PlayState.hx
View file

@ -370,6 +370,7 @@ class PlayState extends MusicBeatState
add(cameraFollowPoint); add(cameraFollowPoint);
comboPopUps = new PopUpStuff(); comboPopUps = new PopUpStuff();
comboPopUps.cameras = [camHUD];
add(comboPopUps); add(comboPopUps);
grpNoteSplashes = new FlxTypedGroup<NoteSplash>(); grpNoteSplashes = new FlxTypedGroup<NoteSplash>();
@ -1900,6 +1901,7 @@ class PlayState extends MusicBeatState
{ {
var animShit:ComboCounter = new ComboCounter(-100, 300, combo); var animShit:ComboCounter = new ComboCounter(-100, 300, combo);
animShit.scrollFactor.set(0.6, 0.6); animShit.scrollFactor.set(0.6, 0.6);
animShit.cameras = [camHUD];
add(animShit); add(animShit);
var frameShit:Float = (1 / 24) * 2; // equals 2 frames in the animation var frameShit:Float = (1 / 24) * 2; // equals 2 frames in the animation

34
source/funkin/ui/PopUpStuff.hx
View file

@ -1,10 +1,10 @@
package funkin.ui; package funkin.ui;
import funkin.util.Constants;
import flixel.FlxSprite; import flixel.FlxSprite;
import flixel.group.FlxGroup.FlxTypedGroup; import flixel.group.FlxGroup.FlxTypedGroup;
import flixel.tweens.FlxTween; import flixel.tweens.FlxTween;
import funkin.play.PlayState; import funkin.play.PlayState;
import funkin.util.Constants;
using StringTools; using StringTools;
@ -20,21 +20,26 @@ class PopUpStuff extends FlxTypedGroup<FlxSprite>
if (daRating == null) if (daRating == null)
daRating = "good"; daRating = "good";
var rating:FlxSprite = new FlxSprite(); var rating:FlxSprite = new FlxSprite(0, 0);
rating.scrollFactor.set(0.2, 0.2);
rating.zIndex = 1000;
var ratingPath:String = daRating; var ratingPath:String = daRating;
if (PlayState.instance.currentStageId.startsWith('school')) if (PlayState.instance.currentStageId.startsWith('school'))
ratingPath = "weeb/pixelUI/" + ratingPath + "-pixel"; ratingPath = "weeb/pixelUI/" + ratingPath + "-pixel";
rating.loadGraphic(Paths.image(ratingPath)); rating.loadGraphic(Paths.image(ratingPath));
rating.x = FlxG.width * 0.55 - 40; rating.x = FlxG.width * 0.50;
rating.x -= FlxG.camera.scroll.x * 0.2;
// make sure rating is visible lol! // make sure rating is visible lol!
if (rating.x < FlxG.camera.scroll.x) // if (rating.x < FlxG.camera.scroll.x)
rating.x = FlxG.camera.scroll.x; // rating.x = FlxG.camera.scroll.x;
else if (rating.x > FlxG.camera.scroll.x + FlxG.camera.width - rating.width) // else if (rating.x > FlxG.camera.scroll.x + FlxG.camera.width - rating.width)
rating.x = FlxG.camera.scroll.x + FlxG.camera.width - rating.width; // rating.x = FlxG.camera.scroll.x + FlxG.camera.width - rating.width;
rating.y = FlxG.camera.scroll.y + FlxG.camera.height * 0.4 - 60; // FlxG.camera.scroll.y +
rating.y = FlxG.camera.height * 0.4 - 60;
rating.acceleration.y = 550; rating.acceleration.y = 550;
rating.velocity.y -= FlxG.random.int(140, 175); rating.velocity.y -= FlxG.random.int(140, 175);
rating.velocity.x -= FlxG.random.int(0, 10); rating.velocity.x -= FlxG.random.int(0, 10);
@ -76,14 +81,15 @@ class PopUpStuff extends FlxTypedGroup<FlxSprite>
pixelShitPart2 = '-pixel'; pixelShitPart2 = '-pixel';
} }
var comboSpr:FlxSprite = new FlxSprite().loadGraphic(Paths.image(pixelShitPart1 + 'combo' + pixelShitPart2)); var comboSpr:FlxSprite = new FlxSprite().loadGraphic(Paths.image(pixelShitPart1 + 'combo' + pixelShitPart2));
comboSpr.y = FlxG.camera.scroll.y + FlxG.camera.height * 0.4 + 80; comboSpr.y = FlxG.camera.height * 0.4 + 80;
comboSpr.x = FlxG.width * 0.55; comboSpr.x = FlxG.width * 0.50;
comboSpr.x -= FlxG.camera.scroll.x * 0.2;
// make sure combo is visible lol! // make sure combo is visible lol!
// 194 fits 4 combo digits // 194 fits 4 combo digits
if (comboSpr.x < FlxG.camera.scroll.x + 194) // if (comboSpr.x < FlxG.camera.scroll.x + 194)
comboSpr.x = FlxG.camera.scroll.x + 194; // comboSpr.x = FlxG.camera.scroll.x + 194;
else if (comboSpr.x > FlxG.camera.scroll.x + FlxG.camera.width - comboSpr.width) // else if (comboSpr.x > FlxG.camera.scroll.x + FlxG.camera.width - comboSpr.width)
comboSpr.x = FlxG.camera.scroll.x + FlxG.camera.width - comboSpr.width; // comboSpr.x = FlxG.camera.scroll.x + FlxG.camera.width - comboSpr.width;
comboSpr.acceleration.y = 600; comboSpr.acceleration.y = 600;
comboSpr.velocity.y -= 150; comboSpr.velocity.y -= 150;