mirror of
https://github.com/ninjamuffin99/Funkin.git
synced 2024-12-26 15:07:14 +00:00
POLIIIISH SHIIIIT
This commit is contained in:
Cameron Taylor
parent
bc08fb2c3d
commit
62abd32b97
BIN
art/Start_Screen_Assets.fla
Normal file
BIN
art/Start_Screen_Assets.fla
Normal file
Binary file not shown.
BIN
assets/images/gfDanceTitle.png
Normal file
BIN
assets/images/gfDanceTitle.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.2 MiB |
35
assets/images/gfDanceTitle.xml
Normal file
35
assets/images/gfDanceTitle.xml
Normal file
|
|
@ -0,0 +1,35 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<TextureAtlas imagePath="gfDanceTitle.png">
|
||||
<!-- Created with Adobe Animate version 20.0.0.17400 -->
|
||||
<!-- http://www.adobe.com/products/animate.html -->
|
||||
<SubTexture name="gfDance0000" x="0" y="0" width="717" height="648" frameX="-2" frameY="-14" frameWidth="721" frameHeight="662"/>
|
||||
<SubTexture name="gfDance0001" x="727" y="0" width="721" height="648" frameX="0" frameY="-14" frameWidth="721" frameHeight="662"/>
|
||||
<SubTexture name="gfDance0002" x="1458" y="0" width="721" height="646" frameX="0" frameY="-16" frameWidth="721" frameHeight="662"/>
|
||||
<SubTexture name="gfDance0003" x="2189" y="0" width="717" height="646" frameX="-2" frameY="-16" frameWidth="721" frameHeight="662"/>
|
||||
<SubTexture name="gfDance0004" x="2916" y="0" width="717" height="649" frameX="-2" frameY="-13" frameWidth="721" frameHeight="662"/>
|
||||
<SubTexture name="gfDance0005" x="0" y="659" width="717" height="649" frameX="-2" frameY="-13" frameWidth="721" frameHeight="662"/>
|
||||
<SubTexture name="gfDance0006" x="727" y="659" width="717" height="650" frameX="-2" frameY="-12" frameWidth="721" frameHeight="662"/>
|
||||
<SubTexture name="gfDance0007" x="1454" y="659" width="717" height="661" frameX="-2" frameY="-1" frameWidth="721" frameHeight="662"/>
|
||||
<SubTexture name="gfDance0008" x="1454" y="659" width="717" height="661" frameX="-2" frameY="-1" frameWidth="721" frameHeight="662"/>
|
||||
<SubTexture name="gfDance0009" x="1454" y="659" width="717" height="661" frameX="-2" frameY="-1" frameWidth="721" frameHeight="662"/>
|
||||
<SubTexture name="gfDance0010" x="2181" y="659" width="717" height="662" frameX="-2" frameY="0" frameWidth="721" frameHeight="662"/>
|
||||
<SubTexture name="gfDance0011" x="2181" y="659" width="717" height="662" frameX="-2" frameY="0" frameWidth="721" frameHeight="662"/>
|
||||
<SubTexture name="gfDance0012" x="2181" y="659" width="717" height="662" frameX="-2" frameY="0" frameWidth="721" frameHeight="662"/>
|
||||
<SubTexture name="gfDance0013" x="2908" y="659" width="717" height="661" frameX="-2" frameY="-1" frameWidth="721" frameHeight="662"/>
|
||||
<SubTexture name="gfDance0014" x="2908" y="659" width="717" height="661" frameX="-2" frameY="-1" frameWidth="721" frameHeight="662"/>
|
||||
<SubTexture name="gfDance0015" x="0" y="1331" width="717" height="650" frameX="-2" frameY="-12" frameWidth="721" frameHeight="662"/>
|
||||
<SubTexture name="gfDance0016" x="727" y="1331" width="721" height="650" frameX="0" frameY="-12" frameWidth="721" frameHeight="662"/>
|
||||
<SubTexture name="gfDance0017" x="1458" y="1331" width="721" height="650" frameX="0" frameY="-12" frameWidth="721" frameHeight="662"/>
|
||||
<SubTexture name="gfDance0018" x="2189" y="1331" width="717" height="650" frameX="-2" frameY="-12" frameWidth="721" frameHeight="662"/>
|
||||
<SubTexture name="gfDance0019" x="2916" y="1331" width="717" height="651" frameX="-2" frameY="-11" frameWidth="721" frameHeight="662"/>
|
||||
<SubTexture name="gfDance0020" x="0" y="1992" width="717" height="651" frameX="-2" frameY="-11" frameWidth="721" frameHeight="662"/>
|
||||
<SubTexture name="gfDance0021" x="727" y="1992" width="717" height="652" frameX="-2" frameY="-10" frameWidth="721" frameHeight="662"/>
|
||||
<SubTexture name="gfDance0022" x="1454" y="1992" width="717" height="657" frameX="-2" frameY="-5" frameWidth="721" frameHeight="662"/>
|
||||
<SubTexture name="gfDance0023" x="1454" y="1992" width="717" height="657" frameX="-2" frameY="-5" frameWidth="721" frameHeight="662"/>
|
||||
<SubTexture name="gfDance0024" x="1454" y="1992" width="717" height="657" frameX="-2" frameY="-5" frameWidth="721" frameHeight="662"/>
|
||||
<SubTexture name="gfDance0025" x="2181" y="1992" width="717" height="656" frameX="-2" frameY="-6" frameWidth="721" frameHeight="662"/>
|
||||
<SubTexture name="gfDance0026" x="2181" y="1992" width="717" height="656" frameX="-2" frameY="-6" frameWidth="721" frameHeight="662"/>
|
||||
<SubTexture name="gfDance0027" x="2181" y="1992" width="717" height="656" frameX="-2" frameY="-6" frameWidth="721" frameHeight="662"/>
|
||||
<SubTexture name="gfDance0028" x="2908" y="1992" width="717" height="656" frameX="-2" frameY="-6" frameWidth="721" frameHeight="662"/>
|
||||
<SubTexture name="gfDance0029" x="2908" y="1992" width="717" height="656" frameX="-2" frameY="-6" frameWidth="721" frameHeight="662"/>
|
||||
</TextureAtlas>
|
||||
BIN
assets/images/logoBumpin.png
Normal file
BIN
assets/images/logoBumpin.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 579 KiB |
20
assets/images/logoBumpin.xml
Normal file
20
assets/images/logoBumpin.xml
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<TextureAtlas imagePath="logoBumpin.png">
|
||||
<!-- Created with Adobe Animate version 20.0.0.17400 -->
|
||||
<!-- http://www.adobe.com/products/animate.html -->
|
||||
<SubTexture name="logo bumpin0000" x="0" y="0" width="894" height="670" frameX="-22" frameY="-16" frameWidth="939" frameHeight="703"/>
|
||||
<SubTexture name="logo bumpin0001" x="904" y="0" width="939" height="703"/>
|
||||
<SubTexture name="logo bumpin0002" x="904" y="0" width="939" height="703"/>
|
||||
<SubTexture name="logo bumpin0003" x="0" y="713" width="911" height="683" frameX="-14" frameY="-10" frameWidth="939" frameHeight="703"/>
|
||||
<SubTexture name="logo bumpin0004" x="0" y="713" width="911" height="683" frameX="-14" frameY="-10" frameWidth="939" frameHeight="703"/>
|
||||
<SubTexture name="logo bumpin0005" x="921" y="713" width="905" height="679" frameX="-17" frameY="-12" frameWidth="939" frameHeight="703"/>
|
||||
<SubTexture name="logo bumpin0006" x="921" y="713" width="905" height="679" frameX="-17" frameY="-12" frameWidth="939" frameHeight="703"/>
|
||||
<SubTexture name="logo bumpin0007" x="921" y="713" width="905" height="679" frameX="-17" frameY="-12" frameWidth="939" frameHeight="703"/>
|
||||
<SubTexture name="logo bumpin0008" x="921" y="713" width="905" height="679" frameX="-17" frameY="-12" frameWidth="939" frameHeight="703"/>
|
||||
<SubTexture name="logo bumpin0009" x="921" y="713" width="905" height="679" frameX="-17" frameY="-12" frameWidth="939" frameHeight="703"/>
|
||||
<SubTexture name="logo bumpin0010" x="921" y="713" width="905" height="679" frameX="-17" frameY="-12" frameWidth="939" frameHeight="703"/>
|
||||
<SubTexture name="logo bumpin0011" x="921" y="713" width="905" height="679" frameX="-17" frameY="-12" frameWidth="939" frameHeight="703"/>
|
||||
<SubTexture name="logo bumpin0012" x="921" y="713" width="905" height="679" frameX="-17" frameY="-12" frameWidth="939" frameHeight="703"/>
|
||||
<SubTexture name="logo bumpin0013" x="921" y="713" width="905" height="679" frameX="-17" frameY="-12" frameWidth="939" frameHeight="703"/>
|
||||
<SubTexture name="logo bumpin0014" x="921" y="713" width="905" height="679" frameX="-17" frameY="-12" frameWidth="939" frameHeight="703"/>
|
||||
</TextureAtlas>
|
||||
BIN
assets/images/titleEnter.png
Normal file
BIN
assets/images/titleEnter.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.4 MiB |
59
assets/images/titleEnter.xml
Normal file
59
assets/images/titleEnter.xml
Normal file
|
|
@ -0,0 +1,59 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<TextureAtlas imagePath="titleEnter.png">
|
||||
<!-- Created with Adobe Animate version 20.0.0.17400 -->
|
||||
<!-- http://www.adobe.com/products/animate.html -->
|
||||
<SubTexture name="ENTER PRESSED0000" x="0" y="0" width="1477" height="79"/>
|
||||
<SubTexture name="ENTER PRESSED0001" x="1487" y="0" width="1477" height="79"/>
|
||||
<SubTexture name="ENTER PRESSED0002" x="0" y="0" width="1477" height="79"/>
|
||||
<SubTexture name="ENTER PRESSED0003" x="1487" y="0" width="1477" height="79"/>
|
||||
<SubTexture name="ENTER PRESSED0004" x="0" y="0" width="1477" height="79"/>
|
||||
<SubTexture name="ENTER PRESSED0005" x="1487" y="0" width="1477" height="79"/>
|
||||
<SubTexture name="ENTER PRESSED0006" x="1487" y="0" width="1477" height="79"/>
|
||||
<SubTexture name="ENTER PRESSED0007" x="0" y="0" width="1477" height="79"/>
|
||||
<SubTexture name="ENTER PRESSED0008" x="1487" y="0" width="1477" height="79"/>
|
||||
<SubTexture name="Press Enter to Begin0000" x="0" y="89" width="1495" height="96"/>
|
||||
<SubTexture name="Press Enter to Begin0001" x="1505" y="89" width="1495" height="96"/>
|
||||
<SubTexture name="Press Enter to Begin0002" x="0" y="195" width="1495" height="96"/>
|
||||
<SubTexture name="Press Enter to Begin0003" x="1505" y="195" width="1495" height="96"/>
|
||||
<SubTexture name="Press Enter to Begin0004" x="0" y="301" width="1495" height="96"/>
|
||||
<SubTexture name="Press Enter to Begin0005" x="1505" y="301" width="1495" height="96"/>
|
||||
<SubTexture name="Press Enter to Begin0006" x="0" y="407" width="1495" height="96"/>
|
||||
<SubTexture name="Press Enter to Begin0007" x="1505" y="407" width="1495" height="96"/>
|
||||
<SubTexture name="Press Enter to Begin0008" x="0" y="513" width="1495" height="96"/>
|
||||
<SubTexture name="Press Enter to Begin0009" x="1505" y="513" width="1495" height="96"/>
|
||||
<SubTexture name="Press Enter to Begin0010" x="0" y="619" width="1495" height="96"/>
|
||||
<SubTexture name="Press Enter to Begin0011" x="1505" y="619" width="1495" height="96"/>
|
||||
<SubTexture name="Press Enter to Begin0012" x="0" y="725" width="1495" height="96"/>
|
||||
<SubTexture name="Press Enter to Begin0013" x="1505" y="725" width="1495" height="96"/>
|
||||
<SubTexture name="Press Enter to Begin0014" x="0" y="831" width="1495" height="96"/>
|
||||
<SubTexture name="Press Enter to Begin0015" x="1505" y="831" width="1495" height="96"/>
|
||||
<SubTexture name="Press Enter to Begin0016" x="0" y="937" width="1495" height="96"/>
|
||||
<SubTexture name="Press Enter to Begin0017" x="1505" y="937" width="1495" height="96"/>
|
||||
<SubTexture name="Press Enter to Begin0018" x="0" y="1043" width="1495" height="96"/>
|
||||
<SubTexture name="Press Enter to Begin0019" x="1505" y="1043" width="1495" height="96"/>
|
||||
<SubTexture name="Press Enter to Begin0020" x="0" y="1149" width="1495" height="96"/>
|
||||
<SubTexture name="Press Enter to Begin0021" x="1505" y="1149" width="1495" height="96"/>
|
||||
<SubTexture name="Press Enter to Begin0022" x="0" y="1255" width="1495" height="96"/>
|
||||
<SubTexture name="Press Enter to Begin0023" x="0" y="1255" width="1495" height="96"/>
|
||||
<SubTexture name="Press Enter to Begin0024" x="1505" y="1255" width="1495" height="96"/>
|
||||
<SubTexture name="Press Enter to Begin0025" x="0" y="1149" width="1495" height="96"/>
|
||||
<SubTexture name="Press Enter to Begin0026" x="0" y="1361" width="1495" height="96"/>
|
||||
<SubTexture name="Press Enter to Begin0027" x="1505" y="1361" width="1495" height="96"/>
|
||||
<SubTexture name="Press Enter to Begin0028" x="0" y="1467" width="1495" height="96"/>
|
||||
<SubTexture name="Press Enter to Begin0029" x="1505" y="1467" width="1495" height="96"/>
|
||||
<SubTexture name="Press Enter to Begin0030" x="0" y="1573" width="1495" height="96"/>
|
||||
<SubTexture name="Press Enter to Begin0031" x="1505" y="1573" width="1495" height="96"/>
|
||||
<SubTexture name="Press Enter to Begin0032" x="0" y="1679" width="1495" height="96"/>
|
||||
<SubTexture name="Press Enter to Begin0033" x="1505" y="1679" width="1495" height="96"/>
|
||||
<SubTexture name="Press Enter to Begin0034" x="0" y="1785" width="1495" height="96"/>
|
||||
<SubTexture name="Press Enter to Begin0035" x="1505" y="1785" width="1495" height="96"/>
|
||||
<SubTexture name="Press Enter to Begin0036" x="0" y="1891" width="1495" height="96"/>
|
||||
<SubTexture name="Press Enter to Begin0037" x="1505" y="1891" width="1495" height="96"/>
|
||||
<SubTexture name="Press Enter to Begin0038" x="0" y="1997" width="1495" height="96"/>
|
||||
<SubTexture name="Press Enter to Begin0039" x="1505" y="1997" width="1495" height="96"/>
|
||||
<SubTexture name="Press Enter to Begin0040" x="0" y="2103" width="1495" height="96"/>
|
||||
<SubTexture name="Press Enter to Begin0041" x="1505" y="2103" width="1495" height="96"/>
|
||||
<SubTexture name="Press Enter to Begin0042" x="0" y="2209" width="1495" height="96"/>
|
||||
<SubTexture name="Press Enter to Begin0043" x="1505" y="2209" width="1495" height="96"/>
|
||||
<SubTexture name="Press Enter to Begin0044" x="0" y="89" width="1495" height="96"/>
|
||||
</TextureAtlas>
|
||||
|
|
@ -75,6 +75,11 @@ class FreeplayState extends MusicBeatState
|
|||
changeSelection(1);
|
||||
}
|
||||
|
||||
if (controls.BACK)
|
||||
{
|
||||
FlxG.switchState(new StoryMenuState());
|
||||
}
|
||||
|
||||
if (accepted)
|
||||
{
|
||||
PlayState.SONG = Song.loadFromJson(songs[curSelected].toLowerCase(), songs[curSelected].toLowerCase());
|
||||
|
|
|
|||
|
|
@ -593,7 +593,7 @@ class PlayState extends MusicBeatState
|
|||
|
||||
if (FlxG.keys.justPressed.ESCAPE)
|
||||
{
|
||||
FlxG.switchState(new ChartingState());
|
||||
// FlxG.switchState(new ChartingState());
|
||||
}
|
||||
|
||||
// FlxG.watch.addQuick('VOL', vocals.amplitudeLeft);
|
||||
|
|
@ -609,8 +609,8 @@ class PlayState extends MusicBeatState
|
|||
|
||||
/* if (FlxG.keys.justPressed.NINE)
|
||||
FlxG.switchState(new Charting()); */
|
||||
if (FlxG.keys.justPressed.EIGHT)
|
||||
FlxG.switchState(new AnimationDebug(SONG.player2));
|
||||
// if (FlxG.keys.justPressed.EIGHT)
|
||||
// FlxG.switchState(new AnimationDebug(SONG.player2));
|
||||
|
||||
if (startingSong)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ class StoryMenuState extends MusicBeatState
|
|||
var weekData:Array<Dynamic> = [['Tutorial', 'Bopeebo', 'Fresh', 'Dadbattle'], ['Spookeez', 'South']];
|
||||
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 curWeek:Int = 0;
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@ import flixel.addons.transition.FlxTransitionSprite.GraphicTransTileDiamond;
|
|||
import flixel.addons.transition.FlxTransitionableState;
|
||||
import flixel.addons.transition.TransitionData;
|
||||
import flixel.graphics.FlxGraphic;
|
||||
import flixel.graphics.frames.FlxAtlasFrames;
|
||||
import flixel.group.FlxGroup;
|
||||
import flixel.input.gamepad.FlxGamepad;
|
||||
import flixel.math.FlxPoint;
|
||||
|
|
@ -53,6 +54,10 @@ class TitleState extends MusicBeatState
|
|||
|
||||
super.create();
|
||||
|
||||
#if (!debug && NG_LOGIN)
|
||||
var ng:NGio = new NGio(APIStuff.API, APIStuff.EncKey);
|
||||
#end
|
||||
|
||||
#if SKIP_TO_PLAYSTATE
|
||||
FlxG.switchState(new StoryMenuState());
|
||||
#else
|
||||
|
|
@ -60,6 +65,11 @@ class TitleState extends MusicBeatState
|
|||
#end
|
||||
}
|
||||
|
||||
var logoBl:FlxSprite;
|
||||
var gfDance:FlxSprite;
|
||||
var danceLeft:Bool = false;
|
||||
var titleText:FlxSprite;
|
||||
|
||||
function startIntro()
|
||||
{
|
||||
if (!initialized)
|
||||
|
|
@ -84,26 +94,47 @@ class TitleState extends MusicBeatState
|
|||
FlxG.sound.music.fadeIn(4, 0, 0.7);
|
||||
}
|
||||
|
||||
Conductor.changeBPM(102);
|
||||
persistentUpdate = true;
|
||||
|
||||
var bg:FlxSprite = new FlxSprite().loadGraphic(AssetPaths.stageback__png);
|
||||
bg.antialiasing = true;
|
||||
bg.setGraphicSize(Std.int(bg.width * 0.6));
|
||||
bg.updateHitbox();
|
||||
var bg:FlxSprite = new FlxSprite().makeGraphic(FlxG.width, FlxG.height, FlxColor.BLACK);
|
||||
// bg.antialiasing = true;
|
||||
// bg.setGraphicSize(Std.int(bg.width * 0.6));
|
||||
// bg.updateHitbox();
|
||||
add(bg);
|
||||
|
||||
var logoBl:FlxSprite = new FlxSprite().loadGraphic(AssetPaths.logo__png);
|
||||
logoBl.screenCenter();
|
||||
logoBl.color = FlxColor.BLACK;
|
||||
logoBl = new FlxSprite(-100, -100);
|
||||
logoBl.frames = FlxAtlasFrames.fromSparrow(AssetPaths.logoBumpin__png, AssetPaths.logoBumpin__xml);
|
||||
logoBl.antialiasing = true;
|
||||
logoBl.animation.addByPrefix('bump', 'logo bumpin', 24);
|
||||
logoBl.animation.play('bump');
|
||||
logoBl.updateHitbox();
|
||||
// logoBl.screenCenter();
|
||||
// logoBl.color = FlxColor.BLACK;
|
||||
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);
|
||||
logo.screenCenter();
|
||||
logo.antialiasing = true;
|
||||
add(logo);
|
||||
// add(logo);
|
||||
|
||||
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(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});
|
||||
|
||||
credGroup = new FlxGroup();
|
||||
add(credGroup);
|
||||
|
|
@ -155,6 +186,9 @@ class TitleState extends MusicBeatState
|
|||
|
||||
if (pressedEnter && !transitioning && skippedIntro)
|
||||
{
|
||||
NGio.unlockMedal(60960);
|
||||
titleText.animation.play('press');
|
||||
|
||||
FlxG.camera.flash(FlxColor.WHITE, 1);
|
||||
FlxG.sound.play('assets/sounds/confirmMenu' + TitleState.soundExt, 0.7);
|
||||
|
||||
|
|
@ -210,6 +244,14 @@ class TitleState extends MusicBeatState
|
|||
{
|
||||
super.beatHit();
|
||||
|
||||
logoBl.animation.play('bump');
|
||||
danceLeft = !danceLeft;
|
||||
|
||||
if (danceLeft)
|
||||
gfDance.animation.play('danceRight');
|
||||
else
|
||||
gfDance.animation.play('danceLeft');
|
||||
|
||||
FlxG.log.add(curBeat);
|
||||
|
||||
switch (curBeat)
|
||||
|
|
|
|||
Loading…
Reference in a new issue