Merge pull request #132 from OliBomby/dev

Dev update 1.8.0.1
OliBomby · Nov 14, 2020 · 3de940b · 3de940b
2 parents 1e8c9a1 + 2ebcf8c
commit 3de940b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/Mapping Tools/Classes/Tools/PatternGallery/OsuPatternPlacer.cs b/Mapping Tools/Classes/Tools/PatternGallery/OsuPatternPlacer.cs
@@ -277,33 +277,33 @@ private void PreparePattern(Beatmap patternBeatmap, Beatmap beatmap, out List<Pa
                 foreach (var ho in patternBeatmap.HitObjects) {
                     double oldEndTime = ho.GetEndTime(false);
 
-                    ho.Time = transformPatternTiming.GetBeatLength(patternStartTime, ho.Time);
-                    ho.EndTime = transformPatternTiming.GetBeatLength(patternStartTime, oldEndTime);
+                    ho.Time = patternTiming.GetBeatLength(patternStartTime, ho.Time);
+                    ho.EndTime = patternTiming.GetBeatLength(patternStartTime, oldEndTime);
 
                     // The body hitsounds are not copies of timingpoints in patternTiming so they should be copied before changing offset
                     for (int i = 0; i < ho.BodyHitsounds.Count; i++) {
                         TimingPoint tp = ho.BodyHitsounds[i].Copy();
-                        tp.Offset = transformPatternTiming.GetBeatLength(patternStartTime, tp.Offset);
+                        tp.Offset = patternTiming.GetBeatLength(patternStartTime, tp.Offset);
                         ho.BodyHitsounds[i] = tp;
                     }
                 }
 
                 foreach (var tp in patternKiaiToggles.Concat(svChanges)) {
-                    tp.Offset = transformPatternTiming.GetBeatLength(patternStartTime, tp.Offset);
+                    tp.Offset = patternTiming.GetBeatLength(patternStartTime, tp.Offset);
                 }
 
                 // Transform the pattern redlines to beat time
                 // This will not change the order of redlines (unless negative BPM exists)
                 transformPatternTiming = patternTiming.Copy();
                 foreach (var tp in transformPatternTiming.Redlines) {
-                    tp.Offset = transformPatternTiming.GetBeatLength(patternStartTime, tp.Offset);
+                    tp.Offset = patternTiming.GetBeatLength(patternStartTime, tp.Offset);
                 }
 
                 // Transform the original timingpoints to beat time
                 // This will not change the order of timingpoints (unless negative BPM exists)
                 transformOriginalTiming = originalTiming.Copy();
                 foreach (var tp in transformOriginalTiming.TimingPoints) {
-                    tp.Offset = transformOriginalTiming.GetBeatLength(patternStartTime, tp.Offset);
+                    tp.Offset = originalTiming.GetBeatLength(patternStartTime, tp.Offset);
                 }
             }
 

diff --git a/Mapping Tools/Properties/AssemblyInfo.cs b/Mapping Tools/Properties/AssemblyInfo.cs
@@ -51,7 +51,7 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.8.0.0")]
-[assembly: AssemblyFileVersion("1.8.0.0")]
+[assembly: AssemblyVersion("1.8.0.1")]
+[assembly: AssemblyFileVersion("1.8.0.1")]
 [assembly: NeutralResourcesLanguage("en")]