don't change ResetNextIf to ResetIf when attached to a Trigger condition

Jamiras · Jun 26, 2023 · caac96d · caac96d
1 parent 04fe66d
commit caac96d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/Source/Parser/AchievementBuilder.cs b/Source/Parser/AchievementBuilder.cs
@@ -1802,6 +1802,15 @@ private static void NormalizeResetNextIfs(List<List<RequirementEx>> groups)
                             continue;
                         }
 
+                        if (lastRequirement.Type == RequirementType.Trigger)
+                        {
+                            // if the ResetNextIf is attached to a Trigger clause, assume there are other conditions
+                            // that would also be reset if the ResetNextIf were changed to a ResetIf and that would
+                            // cause the challenge indicator to be hidden.
+                            canExtract = false;
+                            continue;
+                        }
+
                         resetNextIfClauses.Add(requirementEx);
 
                         resetNextIsForPause |= (lastRequirement.Type == RequirementType.PauseIf);

diff --git a/Tests/Parser/AchievementBuilderTests.cs b/Tests/Parser/AchievementBuilderTests.cs
@@ -432,6 +432,10 @@ public void TestOptimizeNormalizeComparisons(string input, string expected)
         [TestCase("never(byte(0x001234) != 5) && (byte(0x002345) == 6 || once(byte(0x002345) == 7))", "never(byte(0x001234) != 5) && (byte(0x002345) == 6 || once(byte(0x002345) == 7))")] // if there's a HitCount anywhere, leave the ResetIf alone
         [TestCase("(measured(byte(0x1234) < 100) && unless(byte(0x1235) == 1)) || (measured(byte(0x1236) < 100) && unless(byte(0x1235) == 2))",
                   "(measured(byte(0x001234) < 100) && unless(byte(0x001235) == 1)) || (measured(byte(0x001236) < 100) && unless(byte(0x001235) == 2))")] // measured should prevent unless from being inverted
+        [TestCase("trigger_when(repeated(3, byte(0x1234) == 1) && never(byte(0x2345) == 2)", // don't convert ResetNextIf to ResetIf when attached to a challenge indicator
+                  "trigger_when(repeated(3, byte(0x001234) == 1 && never(byte(0x002345) == 2)))")]
+        [TestCase("trigger_when(repeated(3, byte(0x1234) == 1) && never(byte(0x2345) == 2)) && byte(0x3456) == 3", // don't convert ResetNextIf to ResetIf when attached to a challenge indicator
+                  "trigger_when(repeated(3, byte(0x001234) == 1 && never(byte(0x002345) == 2))) && byte(0x003456) == 3")]
         public void TestOptimizeNormalizeResetIfsAndPauseIfs(string input, string expected)
         {
             var achievement = CreateAchievement(input);