Skip to content

Commit

Permalink
2.5.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@CamLikesKirby
CamLikesKirby committed Oct 27, 2024
1 parent 04a6bef commit c43974a
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 8 deletions.
2 changes: 1 addition & 1 deletion Project.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<!-- _________________________ Application Settings _________________________ -->

<app title="Friday Night Funkin' | VS. Dave and Bambi 3.0b | Moddable 2.5.0" file="VsDaveModdable" packageName="dnbteam.daveandbambi" package="dnbteam.daveandbambi" main="Main" version="3.0.0" company="dnbteam"/>
<app title="Friday Night Funkin' | VS. Dave and Bambi 3.0b | Moddable 2.5.1" file="VsDaveModdable" packageName="dnbteam.daveandbambi" package="dnbteam.daveandbambi" main="Main" version="3.0.0" company="dnbteam"/>
<app preloader="flixel.system.FlxPreloader"/>

<set name="APP_ID" value="0x0100f6c013bbc000"/>
Expand Down
23 changes: 19 additions & 4 deletions source/FreeplayState.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ class FreeplayState extends MusicBeatState
var cantEarnText:FlxText;
var rNText:FlxText;
var bothSidesText:FlxText;
var csaText:FlxText;
var rPNT:Array<String> = ['Off', 'Low Chance', 'Medium Chance', 'High Chance', 'Unfair'];

var loadingPack:Bool = false;
Expand Down Expand Up @@ -540,30 +541,38 @@ class FreeplayState extends MusicBeatState
add(randomOption);
modeArray.push(randomOption);

keyOption = new FlxText(settingsBG.x, settingsBG.y + 70, "Keys Added: " + FlxG.save.data.maniabutyeah + " (U)", 20);
keyOption = new FlxText(settingsBG.x, settingsBG.y + 60, "Keys Added: " + FlxG.save.data.maniabutyeah + " (U)", 20);
keyOption.setFormat(Paths.font("comic.ttf"), 24, FlxColor.WHITE, RIGHT);
keyOption.antialiasing = FlxG.save.data.antialiasing;
keyOption.scrollFactor.set();
keyOption.alpha = 0;
add(keyOption);
modeArray.push(keyOption);

rNText = new FlxText(settingsBG.x, settingsBG.y + 110, "Randomly Place Note Types: " + rPNT[FlxG.save.data.randomNoteTypes] + " (I)", 20);
rNText = new FlxText(settingsBG.x, settingsBG.y + 90, "Randomly Place Note Types: " + rPNT[FlxG.save.data.randomNoteTypes] + " (I)", 20);
rNText.setFormat(Paths.font("comic.ttf"), 16, FlxColor.WHITE, RIGHT);
rNText.antialiasing = FlxG.save.data.antialiasing;
rNText.scrollFactor.set();
rNText.alpha = 0;
add(rNText);
modeArray.push(rNText);

bothSidesText = new FlxText(settingsBG.x, settingsBG.y + 150, FlxG.save.data.bothSides ? "Both Sides: On (S)" : "Both Sides: Off (S)", 20);
bothSidesText = new FlxText(settingsBG.x, settingsBG.y + 110, FlxG.save.data.bothSides ? "Both Sides: On (S)" : "Both Sides: Off (S)", 20);
bothSidesText.setFormat(Paths.font("comic.ttf"), 24, FlxColor.WHITE, RIGHT);
bothSidesText.antialiasing = FlxG.save.data.antialiasing;
bothSidesText.scrollFactor.set();
bothSidesText.alpha = 0;
add(bothSidesText);
modeArray.push(bothSidesText);

csaText = new FlxText(settingsBG.x, settingsBG.y + 140, FlxG.save.data.csAllSongs ? "Character Select on All Songs: On (Y)" : "Character Select on All Songs: Off (Y)", 20);
csaText.setFormat(Paths.font("comic.ttf"), 14, FlxColor.WHITE, RIGHT);
csaText.antialiasing = FlxG.save.data.antialiasing;
csaText.scrollFactor.set();
csaText.alpha = 0;
add(csaText);
modeArray.push(csaText);

pModeOption = new FlxText(settingsBG.x, settingsBG.y + 230, FlxG.save.data.practiceMode ? "Practice Mode: On (P)" : "Practice Mode: Off (P)", 5);
pModeOption.setFormat(Paths.font("comic.ttf"), 24, FlxColor.WHITE, RIGHT);
pModeOption.antialiasing = FlxG.save.data.antialiasing;
Expand Down Expand Up @@ -811,6 +820,12 @@ class FreeplayState extends MusicBeatState
oppOption.text = FlxG.save.data.oppM ? "Oppenent Mode: On (O)" : "Oppenent Mode: Off (O)";
FlxG.save.flush();
}
if (FlxG.keys.justPressed.Y)
{
FlxG.save.data.csAllSongs = !FlxG.save.data.csAllSongs;
csaText.text = FlxG.save.data.csAllSongs ? "Character Select on All Songs: On (Y)" : "Character Select on All Songs: Off (Y)";
FlxG.save.flush();
}
if (FlxG.keys.justPressed.R)
{
FlxG.save.data.randomNotes = !FlxG.save.data.randomNotes;
Expand Down Expand Up @@ -1006,7 +1021,7 @@ class FreeplayState extends MusicBeatState
PlayState.storyWeek = songs[curSelected].week;

packTransitionDone = false;
if ((FlxG.keys.pressed.CONTROL || skipSelect.contains(PlayState.SONG.song.toLowerCase())) && !(PlayState.SONG.song.toLowerCase() == 'exploitation' && !FlxG.save.data.modchart))
if ((FlxG.keys.pressed.CONTROL || skipSelect.contains(PlayState.SONG.song.toLowerCase())) /*&& !(PlayState.SONG.song.toLowerCase() == 'exploitation'*/ && !FlxG.save.data.modchart && !FlxG.save.data.csAllSongs)
{
if (curDifficulty == 0) {
if (PlayState.SONG.song.toLowerCase() == 'roofs') {
Expand Down
2 changes: 1 addition & 1 deletion source/Main.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class Main extends Sprite

public static var fps:FpsDisplay;

public static var applicationName:String = "Friday Night Funkin' | VS. Dave and Bambi 3.0b | Moddable 2.5.0";
public static var applicationName:String = "Friday Night Funkin' | VS. Dave and Bambi 3.0b | Moddable 2.5.1";

// You can pretty much ignore everything from here on - your code should go in your states.

Expand Down
2 changes: 1 addition & 1 deletion source/MainMenuState.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ class MainMenuState extends MusicBeatState

public static var daRealEngineVer:String = 'Dave';
public static var engineVer:String = '3.0b';
public static var fanmadeEngineVer:String = '2.5.0';
public static var fanmadeEngineVer:String = '2.5.1';

public static var engineVers:Array<String> =
[
Expand Down
2 changes: 1 addition & 1 deletion source/PauseSubState.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ class PauseSubState extends MusicBeatSubstate
doALittleTrolling(levelDifficulty);
}
}});
if (PlayState.isStoryMode || FreeplayState.skipSelect.contains(PlayState.SONG.song.toLowerCase()) || PlayState.instance.localFunny == PlayState.CharacterFunnyEffect.Recurser)
if (PlayState.isStoryMode || FreeplayState.skipSelect.contains(PlayState.SONG.song.toLowerCase()) && !FlxG.save.data.csAllSongs || PlayState.instance.localFunny == PlayState.CharacterFunnyEffect.Recurser)
{
menuItems.remove(PauseOption.getOption(menuItems, 'Change Character'));
}
Expand Down
3 changes: 3 additions & 0 deletions source/SaveDataHandler.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -168,5 +168,8 @@ class SaveDataHandler

if (FlxG.save.data.checkVersion == null)
FlxG.save.data.checkVersion = true;

if (FlxG.save.data.csAllSongs == null)
FlxG.save.data.csAllSongs = false;
}
}

0 comments on commit c43974a

Please sign in to comment.