this doesnt count as 0.1.1, its still 0.1.0

L BOZO
sebastianverdejo · Oct 29, 2023 · 7aa33ed · 7aa33ed
1 parent dd0260a
commit 7aa33ed
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 16 deletions.
diff --git a/source/Achievements.hx b/source/Achievements.hx
@@ -25,7 +25,6 @@ class Achievements {
 		["Oversinging Much...?",		"Hold down a note for 10 seconds.",					'oversinging',			false],
 		["Hyperactive",					"Finish a Song without going Idle.",				'hype',					false],
 		["Just the Two of Us",			"Finish a Song pressing only two keys.",			'two_keys',				false],
-		["Back to The Old Days",				"Set pause music as Ludum Dare.",		'oldmusic',				false],
 		["Toaster Gamer",				"Have you tried to run the game on a toaster?",		'toastie',				false],
 		["Debugger",					"Beat the \"Test\" Stage from the Chart Editor.",	'debugger',				 true]
 	];

diff --git a/source/FreeplayState.hx b/source/FreeplayState.hx
@@ -420,10 +420,10 @@ class FreeplayState extends MusicBeatState
 			if (FlxG.keys.pressed.SHIFT){
 				LoadingState.loadAndSwitchState(new ChartingState());
 			}else if (ClientPrefs.noCharMenu == false){
-				FlxTween.tween(FlxG.camera, {y: -1500}, 0.5, {ease: FlxEase.quartOutIn});
+				FlxTween.tween(FlxG.camera, {y: -1500}, 0.5, {ease: FlxEase.quartOut});
 				LoadingState.loadAndSwitchState(new CharMenu());
 			}else{
-				FlxTween.tween(FlxG.camera, {y: -1500}, 0.5, {ease: FlxEase.quartOutIn});
+				FlxTween.tween(FlxG.camera, {y: -1500}, 0.5, {ease: FlxEase.quartOut});
 				LoadingState.loadAndSwitchState(new PlayState());
 			}
 

diff --git a/source/PlayState.hx b/source/PlayState.hx
@@ -3127,7 +3127,7 @@ class PlayState extends MusicBeatState
 		}
 		else if (ClientPrefs.Iconbop == 'Noob')
 		{
-			iconP2.setGraphicSize(Std.int(FlxMath.lerp(150, iconP2.height, 0.8)),Std.int(FlxMath.lerp(150, iconP2.height, 0.8)));
+			iconP2.setGraphicSize(Std.int(FlxMath.lerp(150, iconP2.height, -0.8)),Std.int(FlxMath.lerp(150, iconP2.height, -0.8)));
 		}
 		else if (ClientPrefs.Iconbop == 'Golden Apple')
 		{

diff --git a/source/TitleState.hx b/source/TitleState.hx
@@ -119,6 +119,8 @@ class TitleState extends MusicBeatState
 		}
 		#end*/
 
+		FlxG.fullscreen = ClientPrefs.fullScreen;
+
 		FlxG.game.focusLostFramerate = 60;
 		FlxG.sound.muteKeys = muteKeys;
 		FlxG.sound.volumeDownKeys = volumeDownKeys;

diff --git a/source/editors/MasterEditorMenu.hx b/source/editors/MasterEditorMenu.hx
@@ -39,7 +39,8 @@ class MasterEditorMenu extends MusicBeatState
 	private var curSelected = 0;
 	private var curDirectory = 0;
 	private var directoryTxt:FlxText;
-	var backdrops:FlxBackdrop = new FlxBackdrop(Paths.image('backdrop2'), #if (flixel < "5.0.0") 0, 0, true, true #else XY #end);
+	// BACKDROP CODE FROM C GIRL!!!
+	var backdrops:FlxBackdrop = new FlxBackdrop(Paths.image('backdrop'), #if (flixel < "5.0.0") 0, 0, true, true #else XY #end);
 
 	override function create()
 	{
@@ -57,10 +58,13 @@ class MasterEditorMenu extends MusicBeatState
 		if(ClientPrefs.hideCheckers == false)
 			add(backdrops);
 		else
-			bg.scrollFactor.set();
+			bg.screenCenter();
 
 		backdrops.scrollFactor.set(0, 0.07);
-		backdrops.angle = 45;
+
+		#if (flixel < "5.0.0")
+        backdrops.angle = 45;
+        #end
 
 		grpTexts = new FlxTypedGroup<Alphabet>();
 		add(grpTexts);

diff --git a/source/editors/WeekEditorState.hx b/source/editors/WeekEditorState.hx
@@ -16,6 +16,7 @@ import openfl.utils.Assets;
 import openfl.utils.Assets as OpenFlAssets;
 import flixel.FlxCamera;
 import flixel.addons.display.FlxBackdrop;
+import flixel.util.FlxGradient;
 import flixel.addons.ui.FlxInputText;
 import flixel.addons.ui.FlxUI9SliceSprite;
 import flixel.addons.ui.FlxUI;
@@ -592,7 +593,9 @@ class WeekEditorFreeplayState extends MusicBeatState
 	}
 
 	var bg:FlxSprite;
+	// BACKDROP CODE FROM C GIRL!!!
 	var backdrops:FlxBackdrop = new FlxBackdrop(Paths.image('backdrop'), #if (flixel < "5.0.0") 0, 0, true, true #else XY #end);
+	var gradientBar:FlxSprite = new FlxSprite(0, 0).makeGraphic(FlxG.width, 300, 0xFFAA00AA);
 	private var grpSongs:FlxTypedGroup<Alphabet>;
 	private var iconArray:Array<HealthIcon> = [];
 
@@ -605,13 +608,22 @@ class WeekEditorFreeplayState extends MusicBeatState
 		bg.color = FlxColor.WHITE;
 		add(bg);
 
+		gradientBar = FlxGradient.createGradientFlxSprite(Math.round(FlxG.width), 512, [0x00ff0000, 0x55f15792, 0xAAd61375], 1, 90, true);
+		gradientBar.y = FlxG.height - gradientBar.height;
+		gradientBar.updateHitbox();
+		add(gradientBar);
+		gradientBar.scrollFactor.set(0, 0);
+
 		if(ClientPrefs.hideCheckers == false)
 			add(backdrops);
 		else
-			bg.antialiasing = ClientPrefs.globalAntialiasing;
+			bg.screenCenter();
 
 		backdrops.scrollFactor.set(0, 0.07);
-		backdrops.angle = 45;
+
+		#if (flixel < "5.0.0")
+        backdrops.angle = 45;
+        #end
 
 		grpSongs = new FlxTypedGroup<Alphabet>();
 		add(grpSongs);

diff --git a/source/options/MoreSubState.hx b/source/options/MoreSubState.hx
@@ -113,13 +113,6 @@ class MoreSubState extends BaseOptionsMenu
 
 	function onChangeFullScreen()
 	{
-		if(ClientPrefs.fullScreen == true)
-		{
 			FlxG.fullscreen = ClientPrefs.fullScreen;
-		}
-		else if(ClientPrefs.fullScreen == false)
-		{
-			FlxG.fullscreen = ClientPrefs.fullScreen;
-		}
 	}
 }