cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-08-20 23:45:04 +00:00
Code Issues Releases Wiki Activity

new combo stuf

Browse source
This commit is contained in:
Cameron Taylor 2021-07-14 20:32:09 -04:00
parent 9cb1c6b0ea
commit 98a77811be
3 changed files with 131 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

119
source/ComboCounter.hx Normal file
View file

@ -0,0 +1,119 @@
package;
import flixel.FlxSprite;
import flixel.group.FlxGroup.FlxTypedGroup;
import flixel.group.FlxSpriteGroup.FlxTypedSpriteGroup;
class ComboCounter extends FlxTypedSpriteGroup<FlxSprite>
{
var effectStuff:FlxSprite;
var wasComboSetup:Bool = false;
var daCombo:Int = 0;
var grpNumbers:FlxTypedGroup<ComboNumber>;
public function new(x:Float, y:Float, daCombo:Int = 0)
{
super(x, y);
this.daCombo = daCombo;
effectStuff = new FlxSprite(0, 0);
effectStuff.frames = Paths.getSparrowAtlas('noteCombo');
effectStuff.animation.addByPrefix('funny', 'NOTE COMBO animation', 24, false);
effectStuff.animation.play('funny');
effectStuff.antialiasing = true;
effectStuff.animation.finishCallback = function(nameThing)
{
kill();
};
add(effectStuff);
grpNumbers = new FlxTypedGroup<ComboNumber>();
// add(grpNumbers);
}
override function update(elapsed:Float)
{
if (effectStuff.animation.curAnim.curFrame == 2 && !wasComboSetup)
{
setupCombo(daCombo);
}
if (effectStuff.animation.curAnim.curFrame == 18)
{
grpNumbers.forEach(function(spr:ComboNumber)
{
spr.animation.reset();
});
}
if (effectStuff.animation.curAnim.curFrame == 20)
{
grpNumbers.forEach(function(spr:ComboNumber)
{
spr.kill();
});
}
super.update(elapsed);
}
function setupCombo(daCombo:Int)
{
FlxG.sound.play(Paths.sound('comboSound'));
wasComboSetup = true;
var loopNum:Int = 0;
while (daCombo > 0)
{
var comboNumber:ComboNumber = new ComboNumber(420 - (130 * loopNum), 44 * loopNum, daCombo % 10);
grpNumbers.add(comboNumber);
add(comboNumber);
loopNum += 1;
daCombo = Math.floor(daCombo / 10);
}
// var comboNumber:ComboNumber = new ComboNumber(420, 0, 0);
// add to both, in the group just for ez organize/accessing
// grpNumbers.add(comboNumber);
// add(comboNumber);
// var comboNumber2:ComboNumber = new ComboNumber(420 - 134, 44, 0);
// grpNumbers.add(comboNumber2);
// add(comboNumber2);
}
}
class ComboNumber extends FlxSprite
{
public function new(x:Float, y:Float, digit:Int)
{
super(x - 20, y);
var stringNum:String = Std.string(digit);
frames = Paths.getSparrowAtlas('noteComboNumbers');
animation.addByPrefix(stringNum, stringNum, 24, false);
animation.play(stringNum);
antialiasing = true;
updateHitbox();
}
var shiftedX:Bool = false;
override function update(elapsed:Float)
{
if (animation.curAnim.curFrame == 2 && !shiftedX)
{
shiftedX = true;
x += 20;
}
super.update(elapsed);
}
}

9
source/PlayState.hx
View file

@ -3008,6 +3008,15 @@ class PlayState extends MusicBeatState
iconP1.updateHitbox();
iconP2.updateHitbox();
if (curBeat % 8 == 7
&& SONG.notes[Math.floor(curStep / 16)].mustHitSection
&& combo > 5
&& !SONG.notes[Math.floor(curStep / 16) + 1].mustHitSection)
{
var animShit:ComboCounter = new ComboCounter(-100, 300, combo);
add(animShit);
}
if (curBeat % gfSpeed == 0)
gf.dance();

4
source/TitleState.hx
View file

@ -301,9 +301,11 @@ class TitleState extends MusicBeatState
// FlxTween.tween(logoBl, {y: logoBl.y + 50}, 0.6, {ease: FlxEase.quadInOut, type: PINGPONG});
// FlxTween.tween(logo, {y: logoBl.y + 50}, 0.6, {ease: FlxEase.quadInOut, type: PINGPONG, startDelay: 0.1});
var animShit:ComboCounter = new ComboCounter(200, 200, 1423);
add(animShit);
credGroup = new FlxGroup();
add(credGroup);
textGroup = new FlxGroup();
blackScreen = new FlxSprite().makeGraphic(FlxG.width, FlxG.height, FlxColor.BLACK);