Skip to content

Commit

Permalink
thing s
Browse files Browse the repository at this point in the history
Removed extraData from new notes, it's unnecessary
When a section is added, the current section's mustHitSection checkmark will decide if the new section is a mustHitSection
Showcase Mode (turned on) + Chars & BGS (turned off) = COOL GREEN SCREEN!!
Freeplay - SPACE to preview songs now works on all difficulties instead of just "Normal"
  • Loading branch information
JordanSantiagoYT committed Oct 3, 2023
1 parent ba83fc5 commit 77eafdf
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 8 deletions.
5 changes: 3 additions & 2 deletions source/FreeplayState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -436,18 +436,19 @@ class FreeplayState extends MusicBeatState
});
}
var poop:String = Highscore.formatSong(songs[curSelected].songName.toLowerCase(), curDifficulty);
var songLowercase:String = Paths.formatToSongPath(songs[curSelected].songName);
#if desktop
if(instPlaying != curSelected)
{
if(sys.FileSystem.exists(Paths.inst(poop + '/' + poop)) || sys.FileSystem.exists(Paths.json(poop + '/' + poop)) || sys.FileSystem.exists(Paths.modsJson(poop + '/' + poop)))
if(sys.FileSystem.exists(Paths.inst(songLowercase + '/' + poop)) || sys.FileSystem.exists(Paths.json(songLowercase + '/' + poop)) || sys.FileSystem.exists(Paths.modsJson(songLowercase + '/' + poop)))
playSong();
else
songJsonPopup();
}
#else
if(instPlaying != curSelected)
{
if(OpenFlAssets.exists(Paths.inst(poop + '/' + poop)) || OpenFlAssets.exists(Paths.json(poop + '/' + poop)))
if(OpenFlAssets.exists(Paths.inst(songLowercase + '/' + poop)) || OpenFlAssets.exists(Paths.json(songLowercase + '/' + poop)))
playSong();
else
songJsonPopup();
Expand Down
1 change: 0 additions & 1 deletion source/Note.hx
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ typedef EventNote = {

class Note extends FlxSprite
{
public var extraData:Map<String,Dynamic> = [];

public var row:Int = 0;
public var strumTime:Float = 0;
Expand Down
14 changes: 10 additions & 4 deletions source/PlayState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -1963,16 +1963,22 @@ class PlayState extends MusicBeatState
}

if (ClientPrefs.showcaseMode && !ClientPrefs.charsAndBG) {
hitTxt = new FlxText(STRUM_X + (FlxG.width / 2) - 248, 20, 10000, "test", 42);
hitTxt.setFormat(Paths.font("vcr.ttf"), 42, FlxColor.WHITE, CENTER, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK);
//hitTxt = new FlxText(STRUM_X + (FlxG.width / 2) - 248, 20, 10000, "test", 42);
hitTxt = new FlxText(0, 20, 10000, "test", 42);
hitTxt.setFormat(Paths.font("vcr.ttf"), 42, FlxColor.WHITE, LEFT, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK);
hitTxt.scrollFactor.set();
hitTxt.borderSize = 2;
hitTxt.visible = true;
hitTxt.cameras = [camHUD];
hitTxt.alignment = FlxTextAlign.CENTER; // center the text
hitTxt.screenCenter(X);
//hitTxt.alignment = FlxTextAlign.LEFT; // center the text
//hitTxt.screenCenter(X);
hitTxt.screenCenter(Y);
add(hitTxt);
var chromaScreen = new FlxSprite(-5000, -2000).makeGraphic(Std.int(FlxG.width * 2), Std.int(FlxG.height * 2), FlxColor.GREEN);
chromaScreen.scrollFactor.set(0, 0);
chromaScreen.scale.set(3, 3);
chromaScreen.updateHitbox();
add(chromaScreen);
}

if (ClientPrefs.hudType == 'Kade Engine')
Expand Down
2 changes: 1 addition & 1 deletion source/editors/ChartingState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -3206,7 +3206,7 @@ class ChartingState extends MusicBeatState
sectionBeats: getSectionBeats(),
bpm: _song.bpm,
changeBPM: false,
mustHitSection: true,
mustHitSection: _song.notes[curSec].mustHitSection,
gfSection: false,
sectionNotes: [],
typeOfSection: 0,
Expand Down

0 comments on commit 77eafdf

Please sign in to comment.