AirDog46/Kade-Engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #218 from theDetourist/offset-desktoponly

Browse Source 
Make Per Song Offset Desktop Only
This commit is contained in:
Kade M 2021-04-15 10:46:15 -07:00 committed by GitHub
commit e92d286405
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 79 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

113
source/PauseSubState.hx
View File

@ -69,7 +69,10 @@ class PauseSubState extends MusicBeatSubstate
perSongOffset = new FlxText(5, FlxG.height - 18, 0, "Additive Offset (Left, Right): " + PlayState.songOffset + " - Description - " + 'Adds value to global offset, per song.', 12); perSongOffset = new FlxText(5, FlxG.height - 18, 0, "Additive Offset (Left, Right): " + PlayState.songOffset + " - Description - " + 'Adds value to global offset, per song.', 12);
perSongOffset.scrollFactor.set(); perSongOffset.scrollFactor.set();
perSongOffset.setFormat("VCR OSD Mono", 16, FlxColor.WHITE, LEFT, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK); perSongOffset.setFormat("VCR OSD Mono", 16, FlxColor.WHITE, LEFT, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK);
add(perSongOffset);
#if desktop
add(perSongOffset);
#end
for (i in 0...menuItems.length) for (i in 0...menuItems.length)
{ {
@ -106,60 +109,64 @@ class PauseSubState extends MusicBeatSubstate
}else if (downP) }else if (downP)
{ {
changeSelection(1); changeSelection(1);
}else if (leftP)
{
oldOffset = PlayState.songOffset;
PlayState.songOffset -= 1;
sys.FileSystem.rename(songPath + oldOffset + '.offset', songPath + PlayState.songOffset + '.offset');
perSongOffset.text = "Additive Offset (Left, Right): " + PlayState.songOffset + " - Description - " + 'Adds value to global offset, per song.';
// Prevent loop from happening every single time the offset changes
if(!offsetChanged)
{
grpMenuShit.clear();
menuItems = ['Restart Song', 'Exit to menu'];
for (i in 0...menuItems.length)
{
var songText:Alphabet = new Alphabet(0, (70 * i) + 30, menuItems[i], true, false);
songText.isMenuItem = true;
songText.targetY = i;
grpMenuShit.add(songText);
}
changeSelection();
cameras = [FlxG.cameras.list[FlxG.cameras.list.length - 1]];
offsetChanged = true;
}
}else if (rightP)
{
oldOffset = PlayState.songOffset;
PlayState.songOffset += 1;
sys.FileSystem.rename(songPath + oldOffset + '.offset', songPath + PlayState.songOffset + '.offset');
perSongOffset.text = "Additive Offset (Left, Right): " + PlayState.songOffset + " - Description - " + 'Adds value to global offset, per song.';
if(!offsetChanged)
{
grpMenuShit.clear();
menuItems = ['Restart Song', 'Exit to menu'];
for (i in 0...menuItems.length)
{
var songText:Alphabet = new Alphabet(0, (70 * i) + 30, menuItems[i], true, false);
songText.isMenuItem = true;
songText.targetY = i;
grpMenuShit.add(songText);
}
changeSelection();
cameras = [FlxG.cameras.list[FlxG.cameras.list.length - 1]];
offsetChanged = true;
}
} }
#if desktop
else if (leftP)
{
oldOffset = PlayState.songOffset;
PlayState.songOffset -= 1;
sys.FileSystem.rename(songPath + oldOffset + '.offset', songPath + PlayState.songOffset + '.offset');
perSongOffset.text = "Additive Offset (Left, Right): " + PlayState.songOffset + " - Description - " + 'Adds value to global offset, per song.';
// Prevent loop from happening every single time the offset changes
if(!offsetChanged)
{
grpMenuShit.clear();
menuItems = ['Restart Song', 'Exit to menu'];
for (i in 0...menuItems.length)
{
var songText:Alphabet = new Alphabet(0, (70 * i) + 30, menuItems[i], true, false);
songText.isMenuItem = true;
songText.targetY = i;
grpMenuShit.add(songText);
}
changeSelection();
cameras = [FlxG.cameras.list[FlxG.cameras.list.length - 1]];
offsetChanged = true;
}
}else if (rightP)
{
oldOffset = PlayState.songOffset;
PlayState.songOffset += 1;
sys.FileSystem.rename(songPath + oldOffset + '.offset', songPath + PlayState.songOffset + '.offset');
perSongOffset.text = "Additive Offset (Left, Right): " + PlayState.songOffset + " - Description - " + 'Adds value to global offset, per song.';
if(!offsetChanged)
{
grpMenuShit.clear();
menuItems = ['Restart Song', 'Exit to menu'];
for (i in 0...menuItems.length)
{
var songText:Alphabet = new Alphabet(0, (70 * i) + 30, menuItems[i], true, false);
songText.isMenuItem = true;
songText.targetY = i;
grpMenuShit.add(songText);
}
changeSelection();
cameras = [FlxG.cameras.list[FlxG.cameras.list.length - 1]];
offsetChanged = true;
}
}
#end
if (accepted) if (accepted)
{ {
var daSelected:String = menuItems[curSelected]; var daSelected:String = menuItems[curSelected];

33
source/PlayState.hx
View File

@ -39,10 +39,10 @@ import lime.utils.Assets;
import openfl.display.BlendMode; import openfl.display.BlendMode;
import openfl.display.StageQuality; import openfl.display.StageQuality;
import openfl.filters.ShaderFilter; import openfl.filters.ShaderFilter;
import Sys;
#if windows #if desktop
import Discord.DiscordClient; import Discord.DiscordClient;
import Sys;
#end #end
using StringTools; using StringTools;
@ -1230,23 +1230,26 @@ class PlayState extends MusicBeatState
var playerCounter:Int = 0; var playerCounter:Int = 0;
// Per song offset check // Per song offset check
var songPath = 'assets/data/' + PlayState.SONG.song.toLowerCase() + '/'; #if desktop
for(file in sys.FileSystem.readDirectory(songPath)) var songPath = 'assets/data/' + PlayState.SONG.song.toLowerCase() + '/';
{ for(file in sys.FileSystem.readDirectory(songPath))
var path = haxe.io.Path.join([songPath, file]);
if(!sys.FileSystem.isDirectory(path))
{ {
if(path.endsWith('.offset')) var path = haxe.io.Path.join([songPath, file]);
if(!sys.FileSystem.isDirectory(path))
{ {
trace('Found offset file: ' + path); if(path.endsWith('.offset'))
songOffset = Std.parseFloat(file.substring(0, file.indexOf('.off'))); {
break; trace('Found offset file: ' + path);
}else { songOffset = Std.parseFloat(file.substring(0, file.indexOf('.off')));
trace('Offset file not found. Creating one @: ' + songPath); break;
sys.io.File.saveContent(songPath + songOffset + '.offset', ''); }else {
trace('Offset file not found. Creating one @: ' + songPath);
sys.io.File.saveContent(songPath + songOffset + '.offset', '');
}
} }
} }
} #end
var daBeats:Int = 0; // Not exactly representative of 'daBeats' lol, just how much it has looped var daBeats:Int = 0; // Not exactly representative of 'daBeats' lol, just how much it has looped
for (section in noteData) for (section in noteData)
{ {