diff --git a/Compatible/Compatible.csproj b/Compatible/Compatible.csproj index 73359e2..f46784f 100644 --- a/Compatible/Compatible.csproj +++ b/Compatible/Compatible.csproj @@ -9,6 +9,6 @@ - + diff --git a/Qwilight/Assets/UI/@Default/@Default.zip b/Qwilight/Assets/UI/@Default/@Default.zip index 9815534..08e4eed 100644 --- a/Qwilight/Assets/UI/@Default/@Default.zip +++ b/Qwilight/Assets/UI/@Default/@Default.zip @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:33f7a2a2b585b74edbed80cc8f3ab2af1744e895bfda07b4237c268630cc69da -size 80961703 +oid sha256:673063fb93b8dc74f71053fbb3ef38656393089b63e94087638c8e1b514fbf1a +size 77337023 diff --git a/Qwilight/Compiler/BaseCompiler.cs b/Qwilight/Compiler/BaseCompiler.cs index d16d0d7..9afa41c 100644 --- a/Qwilight/Compiler/BaseCompiler.cs +++ b/Qwilight/Compiler/BaseCompiler.cs @@ -364,8 +364,9 @@ } break; case ModeComponent.PutCopyNotes.P1Symmetric: - foreach (var note in Notes) + for (var i = Notes.Count - 1; i >= 0; --i) { + var note = Notes[i]; var targetNote = CopyNote(note); if (targetNote != null) { @@ -373,7 +374,6 @@ { note.LevyingInput = 10 - note.LevyingInput; } - if (targetNote.LevyingInput == 1) { targetNote.LevyingInput = 16; @@ -387,8 +387,9 @@ } break; case ModeComponent.PutCopyNotes.P2Symmetric: - foreach (var note in Notes) + for (var i = Notes.Count - 1; i >= 0; --i) { + var note = Notes[i]; var targetNote = CopyNote(note); if (targetNote != null) { diff --git a/Qwilight/Compute/DefaultCompute.cs b/Qwilight/Compute/DefaultCompute.cs index 04f6ae1..a3b7974 100644 --- a/Qwilight/Compute/DefaultCompute.cs +++ b/Qwilight/Compute/DefaultCompute.cs @@ -2173,6 +2173,7 @@ { LoopingCounter += millisLoopUnit * AudioMultiplier; } + _isPassable = LoopingCounter < PassableWait; while (TwilightCompiledIOQueue.TryDequeue(out var twilightCompiledIO)) { @@ -2330,15 +2331,14 @@ FaintLayered += Utility.GetMove(1.0, FaintLayered, 1000.0 / millisLoopUnit); } - if ((_isPassable = LoopingCounter < PassableWait) && SetPass) + if (SetPass) { - LevyingWait = PassableWait; HandleUIAudio("Pass"); + LevyingWait = PassableWait; SetUndo = true; continue; } - - if (SetEscape) + else if (SetEscape) { OnHandled(); continue; diff --git a/Qwilight/Qwilight.csproj b/Qwilight/Qwilight.csproj index 3444693..393889e 100644 --- a/Qwilight/Qwilight.csproj +++ b/Qwilight/Qwilight.csproj @@ -36,6 +36,10 @@ + + + + @@ -64,7 +68,7 @@ - + diff --git a/Qwilight/ViewModel/MainViewModel.cs b/Qwilight/ViewModel/MainViewModel.cs index e374059..32a1bd7 100644 --- a/Qwilight/ViewModel/MainViewModel.cs +++ b/Qwilight/ViewModel/MainViewModel.cs @@ -2986,13 +2986,13 @@ break; } } - else + else if (!Computer.IsPausing) { - if (Computer.IsPassable && !Computer.IsPausing) + if (Computer.IsPassable) { Computer.SetPass = true; } - if (Computer.IsEscapable && !Computer.IsPausing) + else if (Computer.IsEscapable) { Computer.SetEscape = true; }