cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-12-27 07:27:12 +00:00
Code Issues Releases Wiki Activity

POLIIIISH SHIIIIT

Browse source
This commit is contained in:
Cameron Taylor 2020-10-31 21:34:17 -07:00
parent 24b78d949e
commit 4859d15057
4 changed files with 61 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
source/FreeplayState.hx
View file

@ -75,6 +75,11 @@ class FreeplayState extends MusicBeatState
changeSelection(1); changeSelection(1);
} }
if (controls.BACK)
{
FlxG.switchState(new StoryMenuState());
}
if (accepted) if (accepted)
{ {
PlayState.SONG = Song.loadFromJson(songs[curSelected].toLowerCase(), songs[curSelected].toLowerCase()); PlayState.SONG = Song.loadFromJson(songs[curSelected].toLowerCase(), songs[curSelected].toLowerCase());

6
source/PlayState.hx
View file

@ -593,7 +593,7 @@ class PlayState extends MusicBeatState
if (FlxG.keys.justPressed.ESCAPE) if (FlxG.keys.justPressed.ESCAPE)
{ {
FlxG.switchState(new ChartingState()); // FlxG.switchState(new ChartingState());
} }
// FlxG.watch.addQuick('VOL', vocals.amplitudeLeft); // FlxG.watch.addQuick('VOL', vocals.amplitudeLeft);
@ -609,8 +609,8 @@ class PlayState extends MusicBeatState
/* if (FlxG.keys.justPressed.NINE) /* if (FlxG.keys.justPressed.NINE)
FlxG.switchState(new Charting()); */ FlxG.switchState(new Charting()); */
if (FlxG.keys.justPressed.EIGHT) // if (FlxG.keys.justPressed.EIGHT)
FlxG.switchState(new AnimationDebug(SONG.player2)); // FlxG.switchState(new AnimationDebug(SONG.player2));
if (startingSong) if (startingSong)
{ {

2
source/StoryMenuState.hx
View file

@ -19,7 +19,7 @@ class StoryMenuState extends MusicBeatState
var weekData:Array<Dynamic> = [['Tutorial', 'Bopeebo', 'Fresh', 'Dadbattle'], ['Spookeez', 'South']]; var weekData:Array<Dynamic> = [['Tutorial', 'Bopeebo', 'Fresh', 'Dadbattle'], ['Spookeez', 'South']];
var curDifficulty:Int = 1; var curDifficulty:Int = 1;
public static var weekUnlocked:Array<Bool> = [true, true]; public static var weekUnlocked:Array<Bool> = [true, false];
var weekCharacters:Array<Dynamic> = [['dad', 'bf', 'gf'], ['spooky', 'bf', 'gf']]; var weekCharacters:Array<Dynamic> = [['dad', 'bf', 'gf'], ['spooky', 'bf', 'gf']];
var curWeek:Int = 0; var curWeek:Int = 0;

62
source/TitleState.hx
View file

@ -8,6 +8,7 @@ import flixel.addons.transition.FlxTransitionSprite.GraphicTransTileDiamond;
import flixel.addons.transition.FlxTransitionableState; import flixel.addons.transition.FlxTransitionableState;
import flixel.addons.transition.TransitionData; import flixel.addons.transition.TransitionData;
import flixel.graphics.FlxGraphic; import flixel.graphics.FlxGraphic;
import flixel.graphics.frames.FlxAtlasFrames;
import flixel.group.FlxGroup; import flixel.group.FlxGroup;
import flixel.input.gamepad.FlxGamepad; import flixel.input.gamepad.FlxGamepad;
import flixel.math.FlxPoint; import flixel.math.FlxPoint;
@ -53,6 +54,10 @@ class TitleState extends MusicBeatState
super.create(); super.create();
#if (!debug && NG_LOGIN)
var ng:NGio = new NGio(APIStuff.API, APIStuff.EncKey);
#end
#if SKIP_TO_PLAYSTATE #if SKIP_TO_PLAYSTATE
FlxG.switchState(new StoryMenuState()); FlxG.switchState(new StoryMenuState());
#else #else
@ -60,6 +65,11 @@ class TitleState extends MusicBeatState
#end #end
} }
var logoBl:FlxSprite;
var gfDance:FlxSprite;
var danceLeft:Bool = false;
var titleText:FlxSprite;
function startIntro() function startIntro()
{ {
if (!initialized) if (!initialized)
@ -84,26 +94,47 @@ class TitleState extends MusicBeatState
FlxG.sound.music.fadeIn(4, 0, 0.7); FlxG.sound.music.fadeIn(4, 0, 0.7);
} }
Conductor.changeBPM(102);
persistentUpdate = true; persistentUpdate = true;
var bg:FlxSprite = new FlxSprite().loadGraphic(AssetPaths.stageback__png); var bg:FlxSprite = new FlxSprite().makeGraphic(FlxG.width, FlxG.height, FlxColor.BLACK);
bg.antialiasing = true; // bg.antialiasing = true;
bg.setGraphicSize(Std.int(bg.width * 0.6)); // bg.setGraphicSize(Std.int(bg.width * 0.6));
bg.updateHitbox(); // bg.updateHitbox();
add(bg); add(bg);
var logoBl:FlxSprite = new FlxSprite().loadGraphic(AssetPaths.logo__png); logoBl = new FlxSprite(-100, -100);
logoBl.screenCenter(); logoBl.frames = FlxAtlasFrames.fromSparrow(AssetPaths.logoBumpin__png, AssetPaths.logoBumpin__xml);
logoBl.color = FlxColor.BLACK; logoBl.antialiasing = true;
logoBl.animation.addByPrefix('bump', 'logo bumpin', 24);
logoBl.animation.play('bump');
logoBl.updateHitbox();
// logoBl.screenCenter();
// logoBl.color = FlxColor.BLACK;
add(logoBl); add(logoBl);
gfDance = new FlxSprite(FlxG.width * 0.4, FlxG.height * 0.07);
gfDance.frames = FlxAtlasFrames.fromSparrow(AssetPaths.gfDanceTitle__png, AssetPaths.gfDanceTitle__xml);
gfDance.animation.addByIndices('danceLeft', 'gfDance', [30, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14], "", 24, false);
gfDance.animation.addByIndices('danceRight', 'gfDance', [15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29], "", 24, false);
gfDance.antialiasing = true;
add(gfDance);
titleText = new FlxSprite();
titleText.frames = FlxAtlasFrames.fromSparrow(AssetPaths.titleEnter__png, AssetPaths.titleEnter__xml);
titleText.animation.addByPrefix('idle', "Press Enter to Begin", 24);
titleText.animation.addByPrefix('press', "ENTER PRESSED", 24);
titleText.antialiasing = true;
titleText.animation.play('idle');
add(titleText);
var logo:FlxSprite = new FlxSprite().loadGraphic(AssetPaths.logo__png); var logo:FlxSprite = new FlxSprite().loadGraphic(AssetPaths.logo__png);
logo.screenCenter(); logo.screenCenter();
logo.antialiasing = true; logo.antialiasing = true;
add(logo); // add(logo);
FlxTween.tween(logoBl, {y: logoBl.y + 50}, 0.6, {ease: FlxEase.quadInOut, type: PINGPONG}); // 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}); // FlxTween.tween(logo, {y: logoBl.y + 50}, 0.6, {ease: FlxEase.quadInOut, type: PINGPONG, startDelay: 0.1});
credGroup = new FlxGroup(); credGroup = new FlxGroup();
add(credGroup); add(credGroup);
@ -155,6 +186,9 @@ class TitleState extends MusicBeatState
if (pressedEnter && !transitioning && skippedIntro) if (pressedEnter && !transitioning && skippedIntro)
{ {
NGio.unlockMedal(60960);
titleText.animation.play('press');
FlxG.camera.flash(FlxColor.WHITE, 1); FlxG.camera.flash(FlxColor.WHITE, 1);
FlxG.sound.play('assets/sounds/confirmMenu' + TitleState.soundExt, 0.7); FlxG.sound.play('assets/sounds/confirmMenu' + TitleState.soundExt, 0.7);
@ -210,6 +244,14 @@ class TitleState extends MusicBeatState
{ {
super.beatHit(); super.beatHit();
logoBl.animation.play('bump');
danceLeft = !danceLeft;
if (danceLeft)
gfDance.animation.play('danceRight');
else
gfDance.animation.play('danceLeft');
FlxG.log.add(curBeat); FlxG.log.add(curBeat);
switch (curBeat) switch (curBeat)