Skip to content

Commit

Permalink
the
Browse files Browse the repository at this point in the history
  • Loading branch information
Joalor64GH authored Jun 8, 2024
1 parent 4409caf commit 3947873
Show file tree
Hide file tree
Showing 4 changed files with 41 additions and 14 deletions.
1 change: 1 addition & 0 deletions TODO
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
[NEXT UPDATE]
- Main Menu Addons
- Extra Notes (for real this time)

[HIGH PRIORITY]
- Localization Support (basically done, but need to add data for languages)
Expand Down
7 changes: 7 additions & 0 deletions source/meta/CoolUtil.hx
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,13 @@ class CoolUtil
if (value is Array) return colorFromArray(value, defValue);
return FlxColor.WHITE;
}

inline public static function fixRGBColorArray(colors:Array<Int>, ?defColors:Array<Int>):Array<Int> {
// helper function used on characters n such
final endResult:Array<Int> = (defColors != null && defColors.length > 2) ? defColors : [255, 255, 255, 255]; // Red, Green, Blue, Alpha
for (i in 0...endResult.length) if (colors[i] > -1) endResult[i] = colors[i];
return endResult;
}

inline public static function listFromString(string:String):Array<String>
return string.trim().split('\n').map(str -> str.trim());
Expand Down
27 changes: 13 additions & 14 deletions source/meta/state/MainMenuState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -207,19 +207,20 @@ class MainMenuState extends MusicBeatState
else
menuItem.y = 60 + (i * 160);
#if (flixel >= "5.0.0") // update your fucking flixel
FlxMouseEvent.add(menuItem, null, function(e) switchTheStatePlease(), function(e)
{
new FlxTimer().start(0.01, function (tmr:FlxTimer) {
selectedSomethinAnal = true;
});

if (!selectedSomethin && selectedSomethinAnal)
if (finishedFunnyMove)
FlxMouseEvent.add(menuItem, null, function(e) switchTheStatePlease(), function(e)
{
curSelected = i;
changeItem();
FlxG.sound.play(Paths.sound('scrollMenu'));
}
});
new FlxTimer().start(0.01, function (tmr:FlxTimer) {
selectedSomethinAnal = true;
});

if (!selectedSomethin && selectedSomethinAnal)
{
curSelected = i;
changeItem();
FlxG.sound.play(Paths.sound('scrollMenu'));
}
});
#end
}

Expand Down Expand Up @@ -334,9 +335,7 @@ class MainMenuState extends MusicBeatState
}

if (controls.ACCEPT)
{
switchTheStatePlease();
}
#if MODS_ALLOWED
else if (FlxG.keys.anyJustPressed(debugKeys))
{
Expand Down
20 changes: 20 additions & 0 deletions source/meta/state/PlayState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,7 @@ class PlayState extends MusicBeatState
var gunsNoteTweens:Array<FlxTween> = [];
// the funny thing is, i am considering adding extra notes in the future
// but idk if that's possible with the fact that hsv note coloring was removed
// edit: we're gonna cook next update
public static var mania(default, set):Int = 3;
public static function set_mania(newMania:Int) {
mania = newMania;
Expand Down Expand Up @@ -3608,6 +3609,25 @@ class PlayState extends MusicBeatState
}
#end

if (FlxG.keys.justPressed.SPACE)
{
if (curStage != 'limo' || SONG.song.toLowerCase() != 'stress') {
if (boyfriend != null && boyfriend.animOffsets.exists('hey')) {
boyfriend.playAnim('hey', true);
boyfriend.specialAnim = true;
boyfriend.heyTimer = 0.6;
}
}

if (curStage != 'tank' || curStage != 'limo') {
if (gf != null && gf.animOffsets.exists('cheer')) {
gf.playAnim('cheer', true);
gf.specialAnim = true;
gf.heyTimer = 0.6;
}
}
}

judgementCounter.text = 'Sicks: ${sicks}\nGoods: ${goods}\nBads: ${bads}\nShits: ${shits}\nMisses: ${songMisses}';

if (useVideo && GlobalVideo.get() != null)
Expand Down

0 comments on commit 3947873

Please sign in to comment.