Taiko_Stuff/TakoTako
1
0
Fork 0
mirror of synced 2024-11-23 22:00:56 +01:00
Code Releases Activity

tja2bin doesn't like floats for it's BRANCHSTART command

Browse Source 
so round it up to an int
This commit is contained in:
Fluto 2022-02-10 20:12:18 +11:00
parent 0746f030f2
commit d45e33f966
2 changed files with 33 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
TJAConvert/Program.cs
View File

@ -679,7 +679,7 @@ namespace TJAConvert
attempts--;
// todo: Not sure how to solve this, so ignore it for now
if (result.Contains("branches must have same measure count") || result.Contains("invalid #BRANCHSTART"))
if (result.Contains("branches must have same measure count"))
return -2;
async Task RunProcess()
@ -858,10 +858,39 @@ namespace TJAConvert
return true;
}
if (result.Contains("invalid #BRANCHSTART"))
{
var currentLines = File.ReadLines(newPath).ToList();
for (var i = 0; i < currentLines.Count; i++)
{
var line = currentLines[i];
if (!line.StartsWith("#BRANCHSTART p,", StringComparison.InvariantCultureIgnoreCase))
continue;
var arguments = line.Substring("#BRANCHSTART ".Length).Split(',');
// This invalid branch start error needs to be manually resolved
if (arguments.Length != 3)
return false;
float number1;
float number2;
if (!float.TryParse(arguments[1], out var test))
return false;
number1 = test;
if (!float.TryParse(arguments[2], out test))
return false;
number2 = test;
currentLines[i] = $"#BRANCHSTART p,{(int)Math.Ceiling(number1)},{(int)Math.Ceiling(number2)}";
}
File.WriteAllLines(newPath, currentLines);
return true;
}
if (result.Contains("#E must be after the #N branch") || result.Contains("#M must be after the #E branch"))
{
var currentLines = File.ReadLines(newPath).ToList();
// var problematicCourse = GetCourseWithProblems();
string currentBranch = "";
int startOfBranch = -1;

3
TJAConvert/TJAConvert.csproj
View File

@ -39,6 +39,7 @@
</ItemGroup>
<Target Name="PostBuildCopy" AfterTargets="PostBuildEvent">
<Copy SourceFiles="$(TargetDir)TJAConvert.exe" DestinationFolder="$(ProjectDir)\..\TakoTako\Executables" SkipUnchangedFiles="true" />
<Copy SourceFiles="$(ProjectDir)..\TakoTako\Executables\tja2bin.exe" DestinationFolder="$(TargetDir)" SkipUnchangedFiles="true" />
<Copy SourceFiles="$(TargetDir)TJAConvert.exe" DestinationFolder="$(ProjectDir)..\TakoTako\Executables" SkipUnchangedFiles="true" />
</Target>
</Project>