Skip to content

Commit

Permalink
Fix for showcase mode & misc (#51)
Browse files Browse the repository at this point in the history 
* flixel 5.3 fixes and such

* oopsie

* Update hmm.json

* Update hmm.json

* fix for showcase mode

* Update ClientPrefs.hx
  • Loading branch information
@moxie-coder
moxie-coder authored Oct 25, 2023
1 parent 597996e commit f06cfe0
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 6 deletions.
5 changes: 0 additions & 5 deletions source/ClientPrefs.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ class ClientPrefs { //default settings if it can't find a save file containing y
public static var instaRestart:Bool = false;
public static var charsAndBG:Bool = true;
public static var lowQuality:Bool = false;
public static var fasterChartLoad:Bool = false;
public static var shaders:Bool = true;
public static var framerate:Int = 60;
public static var cursing:Bool = true;
Expand Down Expand Up @@ -242,7 +241,6 @@ class ClientPrefs { //default settings if it can't find a save file containing y
FlxG.save.data.autosaveInterval = autosaveInterval;
FlxG.save.data.autosaveCharts = autosaveCharts;
FlxG.save.data.rateNameStuff = rateNameStuff;
FlxG.save.data.fasterChartLoad = fasterChartLoad;
FlxG.save.data.longFCName = longFCName;
FlxG.save.data.botTxtFade = botTxtFade;
FlxG.save.data.noteMotionBlur = noteMotionBlur;
Expand Down Expand Up @@ -490,9 +488,6 @@ class ClientPrefs { //default settings if it can't find a save file containing y
if(FlxG.save.data.showcaseMode != null) {
showcaseMode = FlxG.save.data.showcaseMode;
}
if(FlxG.save.data.fasterChartLoad != null) {
fasterChartLoad = FlxG.save.data.fasterChartLoad;
}
if(FlxG.save.data.autoPause != null) {
autoPause = FlxG.save.data.autoPause;
}
Expand Down
2 changes: 1 addition & 1 deletion source/PlayState.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5047,7 +5047,7 @@ if (ClientPrefs.showNPS) {
botplaySine += 180 * elapsed;
botplayTxt.alpha = 1 - Math.sin((Math.PI * botplaySine) / 180 * playbackRate);
}
if(cpuControlled && ClientPrefs.randomBotplayText && !ClientPrefs.communityGameBot && botplayTxt != null) {
if((botplayTxt != null && cpuControlled && !ClientPrefs.showcaseMode) && ClientPrefs.randomBotplayText && !ClientPrefs.communityGameBot) {
if(botplayTxt.text == "this text is gonna kick you out of botplay in 10 seconds" && !botplayUsed || botplayTxt.text == "Your Botplay Free Trial will end in 10 seconds." && !botplayUsed)
{
botplayUsed = true;
Expand Down

2 comments on commit f06cfe0

@Stefan2008Git
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't see any Flixel 5.3 fixes here. Only changes for botplay text to do not give Null Object Reference

@moxie-coder
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't see any Flixel 5.3 fixes here. Only changes for botplay text to do not give Null Object Reference

look at the original PR, it's because of a merge commit

Please sign in to comment.