From d45e33f966e5a88b5f91ef8763c57c84fb9df66e Mon Sep 17 00:00:00 2001
From: Fluto <mesut.l@hotmail.com>
Date: Thu, 10 Feb 2022 20:12:18 +1100
Subject: [PATCH] tja2bin doesn't like floats for it's BRANCHSTART command

so round it up to an int
---
 TJAConvert/Program.cs        | 33 +++++++++++++++++++++++++++++++--
 TJAConvert/TJAConvert.csproj |  3 ++-
 2 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/TJAConvert/Program.cs b/TJAConvert/Program.cs
index ca5a74e..bc8304f 100644
--- a/TJAConvert/Program.cs
+++ b/TJAConvert/Program.cs
@@ -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;
diff --git a/TJAConvert/TJAConvert.csproj b/TJAConvert/TJAConvert.csproj
index 021884a..4b2fc3c 100644
--- a/TJAConvert/TJAConvert.csproj
+++ b/TJAConvert/TJAConvert.csproj
@@ -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>