fix(fairy ring): now properly waits for the teleport to finish

Torwent · Sep 5, 2024 · cf65b54 · cf65b54
1 parent 1e024f3
commit cf65b54
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 14 deletions.
diff --git a/optional/interfaces/mainscreen/fairyring.simba b/optional/interfaces/mainscreen/fairyring.simba
@@ -702,7 +702,7 @@ begin
     Exit;
   pos := Self._Pos();
   Mouse.Click(Self.GetTeleportButton(), MOUSE_LEFT);
-  Result := WaitUntil(not Self.IsOpen(), 300, 3000) and WaitUntil(pos.InRange(Self._Pos(), 24), 300, 3000);
+  Result := WaitUntil(not Self.IsOpen(), 300, 3000) and WaitUntil(not pos.InRange(Self._Pos(), 24), 300, 3000);
 end;
 
 
@@ -1005,7 +1005,7 @@ begin
 
   if contextMenuTeleport then
   begin
-    Exit(WaitUntil(pos.InRange(Self._Pos(), 32), 300, 6000));
+    Exit(WaitUntil(not pos.InRange(Self._Pos(), 32), 300, 6000));
   end;
 
   if WaitUntil(Self.IsOpen(), SRL.TruncatedGauss(50, 1500), 3000) then

diff --git a/osr/interfaces/gametabs/achievements.simba b/osr/interfaces/gametabs/achievements.simba
@@ -172,17 +172,17 @@ begin
   buttons.Draw(bitmap);
 end;
 
-procedure TRSAchievements.MakeVisible(Diary : ERSAchievementDiary);
+procedure TRSAchievements.MakeVisible(diary : ERSAchievementDiary);
 var
   CurrentScroll : Int32 := Self.GetScrollPosition;
   Min, Max : Int32;
 begin
-  Min := Ord(Diary) - 6;
+  Min := Ord(diary) - 6;
   if Min < 0 then
     Min := 0;
   Min := Min * 20;
 
-  Max := Ord(Diary) * 20;
+  Max := Ord(diary) * 20;
   if Max > 100 then
     Max := 100;
 
@@ -210,7 +210,7 @@ begin
   end;
 end;
 
-function TRSAchievements.GetDiaryBox(Diary : ERSAchievementDiary): TBox;
+function TRSAchievements.GetDiaryBox(diary : ERSAchievementDiary): TBox;
 const
   EXPECTED_TEXT : TStringArray := ['Ardo', 'Dese', 'ador', 'Frem', 'Kand', 'Karam', 'Kour', 'Lumb', 'Mort', 'Varr', 'West', 'dern'];
 var
@@ -219,7 +219,7 @@ var
   i            : Int32;
   FoundText    : String;
 begin
-  Self.MakeVisible(Diary);
+  Self.MakeVisible(diary);
   DiaryBoxes := Self.GetDiaryBoxes;
   for i := 0 to High(DiaryBoxes) do
   begin
@@ -231,14 +231,11 @@ begin
   Result := [0, 0];
 end;
 
-function TRSAchievements.GetDiaryLevel(Diary : ERSAchievementDiary): Int32;
-var
-  DiaryBox: TBox;
+function TRSAchievements.GetDiaryLevel(diary : ERSAchievementDiary): Int32;
 begin
-  Self.Open();
-  Self.OpenTab(ERSAChievementTab.DIARIES);
-  DiaryBox := Self.GetDiaryBox(Diary);
-  Result := Round(SRL.CountColor(CTS2(1357111, 1, 0.01, 0.01), DiaryBox) / 175);
+  if not Self.Open() then Exit(-1);
+  if not Self.OpenTab(ERSAChievementTab.DIARIES) then Exit(-1);
+  Result := Round(SRL.CountColor(CTS2(1357111, 1, 0.01, 0.01), Self.GetDiaryBox(diary)) / 175);
 end;
 
 var