fix: add ferox enclave map, bank and pool

Torwent · Jan 17, 2024 · ee9c1f8 · ee9c1f8
1 parent cef6484
commit ee9c1f8
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 11 deletions.
diff --git a/osr/walker/objects/rsobjects.simba b/osr/walker/objects/rsobjects.simba
@@ -22,6 +22,7 @@ type
 
     TzhaarBank, WintertodtBank,
     PiscariliusBank, LumbridgeCastleBank, LunarBank,
+    FeroxBank,
 
     DepositBoxRegular, DepositBoxWood, DepositBoxWintertodt,
 
@@ -45,7 +46,6 @@ type
 
     MysteriousRuins, RCAltar, RCPortal, AbyssRift,
 
-
     PestControlNovicePlank,
     PestControlIntermidiatePlank,
     PestControlVeteranPlank,
@@ -123,7 +123,7 @@ type
     PrifddinasFurnace,
     //Tutorial Island
     TutorialRange, TutorialFurnace,
-    MythGuildBank, MythGuildRange: TRSObject;
+    MythGuildBank, MythGuildRange, FeroxPoolOfRefreshment: TRSObject;
   end;
 
 procedure TRSObjects.Setup();
@@ -224,15 +224,15 @@ begin
   with Self.MythGuildBank do
   begin
     Setup(4, [[10471, 5708]]);
-    SetupUpText(['Bank', 'chest']);
+    SetupUpText(['Bank c', 'k chest']);
     Finder.Colors += CTS2(1776416, 1, 0.01, 0.01);
     Finder.Colors += CTS2(5065541, 18, 0.25, 0.23);
   end;
 
   with Self.TzhaarBank do
   begin
     Setup(4, [[5082, 572], [4685, 412]]);
-    SetupUpText(['Bank', 'chest']);
+    SetupUpText(['Bank c', 'k chest']);
     Finder.Colors += CTS2(2171990, 13, 0.08, 0.75);
     Finder.ClusterDistance := 15;
     Finder.Erode := 2;
@@ -260,6 +260,13 @@ begin
     Finder.Colors += CTS2(3824749, 15, 0.06, 1.00);
   end;
 
+  with Self.FeroxBank do
+  begin
+    Setup(4, [[7913, 1920]]);
+    SetupUpText(['Bank c', 'k chest']);
+    Finder.Colors += CTS2(1064524, 10, 0.12, 3.56);
+  end;
+
   with Self.Gravestone do
   begin
     Setup(2, 4, []); //Tiles should be set on death!
@@ -354,7 +361,7 @@ begin
   begin
     //Fossil Island Misc Objects
     Setup(4, [[9486, 703], [9366, 1075]]);
-    SetupUpText(['Bank', 'Chest']);
+    SetupUpText(['Bank c', 'k chest']);
     Finder.Colors += CTS2(1449290, 9, 0.28, 5.71);
     Finder.Colors += CTS2(529505, 11, 0.22, 1.47);
     Finder.Colors += CTS2(5335150, 23, 0.16, 0.58);
@@ -530,7 +537,7 @@ begin
   with Self.WintertodtBank do
   begin
     Setup(4, [[1956, 684]]);
-    SetupUpText(['Bank', 'chest']);
+    SetupUpText(['Bank c', 'k chest']);
     Finder.ColorClusters += [CTS2(3289384, 4, 0.51, 0.37), CTS2(13025214, 17, 0.13, 0.11), 20];
   end;
 
@@ -940,7 +947,6 @@ begin
   with Self.BirdHouse do
   begin
     Setup(5, [[5887, 1251], [5867, 1275], [5522, 767], [5531, 1035]]);
-    SetupUpText(['Bank', 'chest']);
   end;
 
   with Self.BirdHouseSpace do
@@ -1193,7 +1199,6 @@ begin
     Finder.Colors += CTS2(13551688, 35, 0.07, 1.12);
   end;
 
-
   with Self.BlastFurnaceBarDispenser do
   begin
     Setup(5, [[10408, 1532]]);
@@ -1237,7 +1242,6 @@ begin
     Finder.Colors += CTS2(6513770, 7, 0.38, 0.10);
   end;
 
-
   with Self.ElidinisStatue do
   begin
     SetupUpText(['Pray-at']);
@@ -1400,6 +1404,13 @@ begin
     Finder.Colors += CTS2(6447720, 17, 0.15, 0.10);
     Finder.Colors += CTS2(6774887, 13, 1.48, 0.06);
   end;
+
+  with Self.FeroxPoolOfRefreshment do
+  begin
+    Setup(6,  [[7908, 1894], [7908, 1914]]);
+    SetupUpText(['Pool of', 'of Refreshment']);
+    Finder.Colors += CTS2(11184222, 11, 0.04, 0.78);
+  end;
 end;
 
 var
@@ -1427,7 +1438,8 @@ begin
     @RSObjects.PiscariliusBank,
     @RSObjects.LumbridgeCastleBank,
     @RSObjects.BankChestFossilIsland,
-    @RSObjects.MythGuildBank
+    @RSObjects.MythGuildBank,
+    @RSObjects.FeroxBank
   ];
 
   RSObjects.DepositBoxes := [

diff --git a/utils/rsregions/rsregions.simba b/utils/rsregions/rsregions.simba
@@ -107,6 +107,7 @@ type RSRegions = record(TSRLBaseRecord) class var
     RELLEKKA:                   TBox;
     UNGAEL:                     TBox;
     EVIL_CHICKEN_LAIR:          TBox;
+    FEROX_ENCLAVE:              TBox;
   end;
 
 begin
@@ -213,6 +214,7 @@ begin
   RSRegions.RELLEKKA                   := [5819, 1562, 6441, 2228];
   RSRegions.UNGAEL                     := [4933, 1622, 5284, 1966];
   RSRegions.EVIL_CHICKEN_LAIR          := [10156, 4116, 10553, 4494];
+  RSRegions.FEROX_ENCLAVE              := [7803, 1782, 8097, 2062];
 
   RSNamedRegionsArray := [
     ['Abyss', RSRegions.ABYSS],
@@ -317,7 +319,8 @@ begin
     ['Jormungand''s Prison', RSRegions.JORMUNGANDS_PRISON],
     ['Rellekka', RSRegions.RELLEKKA],
     ['Ungael', RSRegions.UNGAEL],
-    ['Evil Chicken Lair', RSRegions.EVIL_CHICKEN_LAIR]
+    ['Evil Chicken Lair', RSRegions.EVIL_CHICKEN_LAIR],
+    ['Ferox Enclave', RSRegions.FEROX_ENCLAVE]
   ];
 
   RSBankRegions.Setup();