domain expansion: taco bell aftermath

Joalor64GH · Jun 7, 2024 · 7c03f57 · 7c03f57
1 parent 490f171
commit 7c03f57
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 8 deletions.
diff --git a/source/meta/state/MinigamesState.hx b/source/meta/state/MinigamesState.hx
@@ -9,7 +9,7 @@ class MinigamesState extends MusicBeatState
 	var controlStrings:Array<Minigame> = [
 		new Minigame('GET OUT OF MY HEAD', 'the pain never stops\n(Amogus)', 'mgicons/sus'),
 		new Minigame('.jpegs are funny', "they are and you can't tell me otherwise\n(Compression)", 'mgicons/pico'),
-		new Minigame('Kill BF', 'lmao', 'mgicons/killBf')
+		new Minigame('Kill BF', 'lmao\n(Point & Click)', 'mgicons/killBf')
 		// soon...
 		// new Minigame("Joalor64's Special", 'It\'s me!\n(Melodic Circuit)', 'mgicons/me')
 	];

diff --git a/source/meta/state/PlayState.hx b/source/meta/state/PlayState.hx
@@ -1448,7 +1448,7 @@ class PlayState extends MusicBeatState
 		iconP2.canBounce = true;
 		add(iconP2);
 
-		scoreTxt = new FlxText(0, healthBar.y + 40, FlxG.width, "", 20);
+		scoreTxt = new FlxText(0, healthBar.y + 36, FlxG.width, "", 20);
 		scoreTxt.setFormat(Paths.font("vcr.ttf"), 20, FlxColor.WHITE, CENTER, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK);
 		scoreTxt.scrollFactor.set();
 		scoreTxt.borderSize = 1.25;

diff --git a/source/meta/state/ReplaySelectState.hx b/source/meta/state/ReplaySelectState.hx
@@ -127,11 +127,12 @@ class ReplaySelectState extends MusicBeatState
 
         else if (controls.ACCEPT && menuItems.length > 0)
         {
+            FreeplayState.curPlaying = false;
+            FreeplayState.destroyFreeplayVocals();
             PlayState.SONG = Song.loadFromJson(song, songName);
             PlayState.storyDifficulty = difficulties[curSelected];
             LoadingState.loadAndSwitchState(new ReplayState(Std.parseInt(menuItems[curSelected].split(" ")[1])), true);
         }
-
         else if (controls.BACK)
             MusicBeatState.switchState(new FreeplayState());
 
@@ -183,4 +184,4 @@ class ReplaySelectState extends MusicBeatState
 	    }
         }
     }
-} 
+} 
diff --git a/source/objects/userinterface/Bar.hx b/source/objects/userinterface/Bar.hx
@@ -5,7 +5,7 @@ class Bar extends FlxSpriteGroup
 	public var leftBar:FlxSprite;
 	public var rightBar:FlxSprite;
 	public var bg:FlxSprite;
-	public var valueFunction:Void->Float = function() return 0;
+	public var valueFunction:Void->Float = null;
 	public var percent(default, set):Float = 0;
 	public var bounds:Dynamic = {min: 0, max: 1};
 	public var leftToRight(default, set):Bool = true;
@@ -19,7 +19,7 @@ class Bar extends FlxSpriteGroup
 	{
 		super(x, y);
 
-		if (valueFunction != null) this.valueFunction = valueFunction;
+		this.valueFunction = valueFunction;
 		setBounds(boundX, boundY);
 
 		bg = new FlxSprite().loadGraphic(Paths.image(image));
@@ -42,13 +42,20 @@ class Bar extends FlxSpriteGroup
 
 	public var enabled:Bool = true;
 	override function update(elapsed:Float) {
-		var value:Null<Float> = FlxMath.remapToRange(FlxMath.bound(valueFunction(), bounds.min, bounds.max), bounds.min, bounds.max, 0, 100);
-		percent = (value != null ? value : 0);
 		if (!enabled)
 		{
 			super.update(elapsed);
 			return;
 		}
+
+		if (valueFunction != null)
+		{
+			var value:Null<Float> = FlxMath.remapToRange(FlxMath.bound(valueFunction(), bounds.min, bounds.max), bounds.min, bounds.max, 0, 100);
+			percent = (value != null ? value : 0);
+		}
+		else percent = 0;
+
+		super.update(elapsed);
 	}
 
 	public function setBounds(min:Float, max:Float)