wait for poh loading screen #minor

Torwent · Sep 3, 2021 · 1f05eed · 1f05eed
1 parent 59aecfa
commit 1f05eed
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 0 deletions.
diff --git a/osr/interface/mainscreen.simba b/osr/interface/mainscreen.simba
@@ -342,3 +342,30 @@ begin
             (SRL.CountColor(CTS0(8247, 0), Self.Bounds) = 900);
 end;
 
+(*
+MainScreen.WaitLoadingPOH
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.. pascal:: function TRSMainScreen.WaitLoadingPOH: Boolean;
+
+Waits for the POH loading screen returns true if we find a loading screen and successfully wait for it to finish.
+
+Example
+-------
+
+  Writeln MainScreen.WaitLoadingPOH;
+*)
+function TRSMainScreen.WaitLoadingPOH(WaitTime: Int32; Interval: Int32 = -1): Boolean;
+var
+  t: UInt64;
+begin
+  if (Interval = -1) then
+    Interval := SRL.TruncatedGauss(50, 1500);
+
+  t := GetTickCount;
+  if WaitUntil(Self.LoadingPOH, Interval, WaitTime) then
+  begin
+    WaitTime := WaitTime - (GetTickCount - t);
+    Result := WaitUntil(not Self.LoadingPOH, Interval, WaitTime);
+  end;
+end;
+
diff --git a/osr/waspobjects/rsobjects.simba b/osr/waspobjects/rsobjects.simba
@@ -150,6 +150,15 @@ begin
   POHPortal.Finder.ColorClusters += [CTS2(9379961, 30, 0.16, 1.76),
                                      CTS2(5987170, 16, 0.18, 0.06), 40];
 
+  OakLarderBuilt.SetupCommon;
+  OakLarderBuilt.UpText := ['Larder'];
+  OakLarderBuilt.Finder.ColorClusters += [CTS2(6916239, 10, 0.33, 1.18), CTS2(4154749, 9, 0.13, 0.65), 150];
+
+  OakLarderSpace.SetupCommon;
+  OakLarderSpace.UpText := ['2 more'];
+  OakLarderSpace.Finder.ColorClusters += [CTS2(10529472, 16, 0.25, 0.95), CTS2(8884636, 16, 0.16, 0.18), 80];
+
+
   AlKharidBank.SetupCommon;
   AlKharidBank.UpText := ['Bank ', 'booth'];
   AlKharidBank.Finder.ColorClusters += [CTS2(5594210, 18, 0.24, 0.28),