diff --git a/Preloader.hx b/Preloader.hx
index 6882d8d06..932df79b7 100644
--- a/Preloader.hx
+++ b/Preloader.hx
@@ -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;
diff --git a/assets/images/lucky_guitar_assets.xml b/assets/images/lucky_guitar_assets.xml
index b4a0cc576..41b7d07e2 100644
--- a/assets/images/lucky_guitar_assets.xml
+++ b/assets/images/lucky_guitar_assets.xml
@@ -82,21 +82,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/assets/music/vidyagames.mp3 b/assets/music/vidyagames.mp3
new file mode 100644
index 000000000..e63eeb801
Binary files /dev/null and b/assets/music/vidyagames.mp3 differ
diff --git a/assets/music/vidyagames.ogg b/assets/music/vidyagames.ogg
new file mode 100644
index 000000000..da9dd3030
Binary files /dev/null and b/assets/music/vidyagames.ogg differ
diff --git a/source/Character.hx b/source/Character.hx
index 427e7bb11..da51e2321 100644
--- a/source/Character.hx
+++ b/source/Character.hx
@@ -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');
}
}
diff --git a/source/FreeplayState.hx b/source/FreeplayState.hx
index b938f1aac..7b0dbbe8b 100644
--- a/source/FreeplayState.hx
+++ b/source/FreeplayState.hx
@@ -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;
diff --git a/source/PlayState.hx b/source/PlayState.hx
index 35a8b9f7c..5a0989afa 100644
--- a/source/PlayState.hx
+++ b/source/PlayState.hx
@@ -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')