cowarin
/
Funkin
mirror of https://github.com/ninjamuffin99/Funkin.git
1
0
Fork 0
Code Issues Releases Wiki Activity

did the meme on switch

This commit is contained in:
Brandon 2020-11-10 15:07:34 -05:00
parent 74f313feec
commit 926f7dd6ff
7 changed files with 19 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Preloader.hx
View File

@ -41,10 +41,10 @@ class Preloader extends FlxBasePreloader
{
if(Percent < 69)
{
logo.scaleX += Percent / 1280;
logo.scaleY += Percent / 1280;
logo.x -= Percent * 0.86;
logo.y -= Percent / 1.4;
logo.scaleX += Percent / 1920;
logo.scaleY += Percent / 1920;
logo.x -= Percent * 0.6;
logo.y -= Percent / 2;
}else{
logo.scaleX = this._width / 1280;
logo.scaleY = this._width / 1280;

15
assets/images/lucky_guitar_assets.xml
View File

@ -82,21 +82,6 @@
<SubTexture name="lucky guitar idle0033" x="1964" y="1148" width="730" height="573" frameX="0" frameY="0" frameWidth="751" frameHeight="575"/>
<SubTexture name="lucky guitar idle0034" x="2694" y="1148" width="617" height="486" frameX="-113" frameY="-87" frameWidth="751" frameHeight="575"/>
<SubTexture name="lucky guitar idle0035" x="2694" y="1148" width="617" height="486" frameX="-113" frameY="-87" frameWidth="751" frameHeight="575"/>
<SubTexture name="lucky guitar idle sketch0000" x="3311" y="1148" width="405" height="291" frameX="-164" frameY="-3" frameWidth="870" frameHeight="655"/>
<SubTexture name="lucky guitar idle sketch0001" x="3311" y="1148" width="405" height="291" frameX="-164" frameY="-3" frameWidth="870" frameHeight="655"/>
<SubTexture name="lucky guitar idle sketch0002" x="0" y="1721" width="579" height="586" frameX="-42" frameY="-69" frameWidth="870" frameHeight="655"/>
<SubTexture name="lucky guitar idle sketch0003" x="0" y="1721" width="579" height="586" frameX="-42" frameY="-69" frameWidth="870" frameHeight="655"/>
<SubTexture name="lucky guitar idle sketch0004" x="579" y="1721" width="665" height="288" frameX="0" frameY="-364" frameWidth="870" frameHeight="655"/>
<SubTexture name="lucky guitar idle sketch0005" x="579" y="1721" width="665" height="288" frameX="0" frameY="-364" frameWidth="870" frameHeight="655"/>
<SubTexture name="lucky guitar idle sketch0006" x="1244" y="1721" width="330" height="271" frameX="-146" frameY="-376" frameWidth="870" frameHeight="655"/>
<SubTexture name="lucky guitar idle sketch0007" x="1244" y="1721" width="330" height="271" frameX="-146" frameY="-376" frameWidth="870" frameHeight="655"/>
<SubTexture name="lucky guitar idle sketch0008" x="1574" y="1721" width="260" height="259" frameX="-279" frameY="-381" frameWidth="870" frameHeight="655"/>
<SubTexture name="lucky guitar idle sketch0009" x="1574" y="1721" width="260" height="259" frameX="-279" frameY="-381" frameWidth="870" frameHeight="655"/>
<SubTexture name="lucky guitar idle sketch0010" x="1834" y="1721" width="373" height="163" frameX="-317" frameY="-477" frameWidth="870" frameHeight="655"/>
<SubTexture name="lucky guitar idle sketch0011" x="1834" y="1721" width="373" height="163" frameX="-317" frameY="-477" frameWidth="870" frameHeight="655"/>
<SubTexture name="lucky guitar idle sketch0012" x="2207" y="1721" width="378" height="334" frameX="-492" frameY="-104" frameWidth="870" frameHeight="655"/>
<SubTexture name="lucky guitar idle sketch0013" x="2207" y="1721" width="378" height="334" frameX="-492" frameY="-104" frameWidth="870" frameHeight="655"/>
<SubTexture name="lucky guitar idle sketch0014" x="2585" y="1721" width="464" height="236" frameX="-269" frameY="0" frameWidth="870" frameHeight="655"/>
<SubTexture name="lucky sing left0000" x="3049" y="1721" width="767" height="575" frameX="-173" frameY="-9" frameWidth="953" frameHeight="625"/>
<SubTexture name="lucky sing left0001" x="3049" y="1721" width="767" height="575" frameX="-173" frameY="-9" frameWidth="953" frameHeight="625"/>
<SubTexture name="lucky sing left0002" x="0" y="2307" width="654" height="489" frameX="-286" frameY="-95" frameWidth="953" frameHeight="625"/>

BIN
assets/music/vidyagames.mp3 Normal file
View File

Binary file not shown.

BIN
assets/music/vidyagames.ogg Normal file
View File

Binary file not shown.

20
source/Character.hx
View File

@ -105,17 +105,17 @@ class Character extends FlxSprite
case 'lucky':
tex = FlxAtlasFrames.fromSparrow(AssetPaths.lucky_guitar_assets__png, AssetPaths.lucky_guitar_assets__xml);
frames = tex;
animation.addByPrefix('idle', 'lucky guitar idle', 24);
animation.addByPrefix('singUP', 'lucky UP NOTE', 24);
animation.addByPrefix('singRIGHT', 'lucky sing right', 24);
animation.addByPrefix('singDOWN', 'lucky DOWN note', 24);
animation.addByPrefix('singLEFT', 'lucky sing left', 24);
animation.addByPrefix('idle', 'lucky guitar idle', 24, false);
animation.addByPrefix('singUP', 'lucky UP NOTE', 24, false);
animation.addByPrefix('singRIGHT', 'lucky sing right', 24, false);
animation.addByPrefix('singDOWN', 'lucky DOWN note', 24, false);
animation.addByPrefix('singLEFT', 'lucky sing left', 24, false);
addOffset('idle');
addOffset("singUP", -6, 50);
addOffset("singRIGHT", 0, 27);
addOffset("singLEFT", -10, 10);
addOffset("singDOWN", 0, -30);
addOffset('idle', 0, -180);
addOffset("singUP", 200, -180);
addOffset("singRIGHT", 200, -180);
addOffset("singLEFT", 200, -180);
addOffset("singDOWN", 200, -180);
playAnim('idle');
}
}

5
source/FreeplayState.hx
View File

@ -151,7 +151,6 @@ class FreeplayState extends MusicBeatState
if (accepted)
{
var poop:String = Highscore.formatSong(songs[curSelected].toLowerCase(), curDifficulty);
trace(poop);
PlayState.SONG = Song.loadFromJson(poop, songs[curSelected].toLowerCase());
@ -172,7 +171,9 @@ class FreeplayState extends MusicBeatState
if (curDifficulty > 2)
curDifficulty = 0;
#if !switch
intendedScore = Highscore.getScore(songs[curSelected], curDifficulty);
#end
switch (curDifficulty)
{
@ -200,8 +201,10 @@ class FreeplayState extends MusicBeatState
// selector.y = (70 * curSelected) + 30;
#if !switch
intendedScore = Highscore.getScore(songs[curSelected], curDifficulty);
// lerpScore = 0;
#end
var bullShit:Int = 0;

1
source/PlayState.hx
View File

@ -679,6 +679,7 @@ class PlayState extends MusicBeatState
if (camFollow.x != dad.getMidpoint().x + 150 && !PlayState.SONG.notes[Std.int(curStep / 16)].mustHitSection)
{
camFollow.setPosition(dad.getMidpoint().x + 150, dad.getMidpoint().y - 100);
//camFollow.setPosition(lucky.getMidpoint().x - 120, lucky.getMidpoint().y + 210);
vocals.volume = 1;
if (SONG.song.toLowerCase() == 'tutorial')