fix: Merge pull request #122 from notBarr/master

Update rsobjects.simba
Torwent · Jan 6, 2024 · d07f849 · d07f849
2 parents 0b9114e + 2433d87
commit d07f849
Showing 1 changed file with 14 additions and 14 deletions.
diff --git a/osr/walker/objects/rsobjects.simba b/osr/walker/objects/rsobjects.simba
@@ -603,15 +603,15 @@ begin
   with Self.ClayRock do
   begin
     Setup(3, [[6552, 224], [6548, 228], [6456, 260], [6456, 264], [6448, 268], [6130, 1612], [6114, 1620], [6130, 1620], [6138, 1632], [258, 1820], [226, 1828], [222, 1832], [262, 1832], [4742, 1864], [4750, 1868], [1802, 1872], [1798, 1876], [2494, 2492], [2498, 2496], [2494, 2500], [2514, 2508], [2518, 2512], [8126, 2940], [8114, 2960], [8110, 2964], [7146, 3308], [7142, 3312], [7166, 3312], [7154, 3316], [7162, 3316], [7166, 3320], [7342, 3488], [7338, 3492], [9078, 3780], [9070, 3784], [9062, 3788], [9086, 3788], [9058, 3792], [9074, 3796], [1100, 3803], [1028, 3811], [8994, 3828], [9002, 3828], [1004, 3831], [8994, 3836], [5914, 3876], [5922, 3892], [8094, 4784], [4480, 5260], [4488, 5272], [4492, 5276], [8898, 5324], [8906, 5356], [8910, 5360]]);
-    SetupUpText(['ine Roc']);
+    SetupUpText(['ine Clay']);
     Finder.Colors += CTS2(6134971, 8, 0.04, 1.38);
     Finder.MinShortSide := 20;
   end;
 
   with Self.TinRock do
   begin
     Setup(3, [[6468, 204], [6552, 204], [6464, 212], [6544, 248], [6544, 256], [6544, 372], [6556, 376], [6548, 380], [6560, 380], [4014, 1535], [4018, 1543], [4022, 1547], [2410, 1592], [2462, 1592], [2406, 1600], [2422, 1604], [2426, 1608], [2426, 1612], [4734, 1880], [4730, 1892], [2530, 2488], [2534, 2492], [2490, 2512], [2490, 2516], [7710, 2764], [7714, 2768], [7718, 2772], [7714, 2776], [8118, 2940], [8118, 2944], [8126, 2944], [8118, 2948], [8098, 2972], [8550, 2976], [8086, 2984], [8546, 2984], [8086, 2988], [8522, 2988], [8522, 2992], [8518, 2996], [7026, 3000], [8518, 3000], [7018, 3008], [7026, 3008], [7014, 3012], [7014, 3016], [7010, 3020], [8602, 3184], [7330, 3500], [7338, 3508], [5310, 3516], [6018, 3776], [996, 3811], [1116, 3811], [1104, 3831], [5914, 3848], [5914, 3856], [8286, 3856], [8294, 3856], [5918, 3860], [8282, 3860], [8290, 3864], [5922, 3880], [5922, 3884], [5914, 3888], [5942, 3888], [8602, 4348], [8610, 4348], [8610, 4356], [8606, 4364], [4536, 5244], [4572, 5280], [4524, 5292]]);
-    SetupUpText(['ine Roc']);
+    SetupUpText(['ine Tin']);
     Finder.Colors += CTS2(7500669, 21, 0.13, 0.12);
     Finder.MinShortSide := 20;
   end;
@@ -624,15 +624,15 @@ begin
      [8550, 2996], [8553, 3000], [8534, 3004], [8541, 3004],
      [8546, 3004]
     ]);
-    SetupUpText(['ine Roc']);
+    SetupUpText(['ine Copp']);
     Finder.Colors += CTS2(4878743, 10, 0.06, 0.38);
     Finder.MinShortSide := 20;
   end;
 
   with Self.IronRock do
   begin
     Setup(3, [[6552, 188], [6464, 196], [6468, 200], [6548, 212], [6492, 392], [6484, 396], [6480, 400], [6516, 416], [6512, 424], [6464, 544], [6472, 548], [6468, 552], [6432, 596], [6436, 600], [6420, 612], [6416, 616], [6452, 616], [6420, 620], [6448, 620], [6456, 620], [7622, 684], [8170, 712], [8094, 740], [8102, 740], [8098, 744], [8094, 748], [8102, 748], [4926, 889], [4930, 893], [4926, 897], [9427, 992], [9427, 996], [9423, 1004], [9447, 1004], [9451, 1008], [9451, 1012], [9443, 1016], [498, 1196], [498, 1200], [510, 1200], [494, 1204], [514, 1204], [510, 1208], [9467, 1264], [9471, 1268], [9467, 1272], [1294, 1340], [1290, 1344], [1294, 1348], [1298, 1360], [7698, 1364], [7698, 1368], [7746, 1372], [7758, 1376], [7790, 1376], [7798, 1376], [7754, 1380], [7790, 1380], [7794, 1384], [7798, 1388], [2442, 1596], [2450, 1596], [2446, 1600], [2450, 1604], [2454, 1608], [6286, 1664], [6286, 1668], [6306, 1668], [6294, 1672], [6286, 1680], [6302, 1680], [6294, 1684], [6290, 1696], [4742, 1888], [4750, 1888], [1798, 1892], [4746, 1892], [1798, 1896], [1802, 1900], [7810, 2168], [7814, 2172], [2494, 2484], [2526, 2484], [2478, 2496], [2478, 2500], [2534, 2504], [2518, 2520], [8546, 2968], [8538, 2972], [8094, 2976], [8534, 2976], [8094, 2984], [7010, 3024], [7010, 3032], [7006, 3036], [6182, 3112], [6178, 3116], [6246, 3120], [6254, 3124], [6250, 3128], [6158, 3132], [6166, 3132], [6242, 3132], [6162, 3136], [6234, 3136], [8574, 3204], [8570, 3208], [8606, 3208], [8574, 3212], [8606, 3212], [8614, 3240], [8610, 3244], [8602, 3308], [8606, 3312], [7270, 3480], [7270, 3488], [7266, 3492], [5750, 3496], [5814, 3500], [7278, 3500], [5802, 3504], [5726, 3508], [5814, 3508], [5762, 3512], [5802, 3512], [7322, 3512], [5802, 3516], [5814, 3516], [7318, 3516], [5758, 3520], [5718, 3524], [5754, 3528], [5750, 3532], [9002, 3764], [9006, 3772], [9002, 3776], [5894, 3844], [5898, 3848], [5898, 3852], [5902, 3880], [5906, 3884], [5906, 3888], [5946, 3896], [5930, 3904], [6786, 4300], [10459, 4319], [10451, 4327], [10459, 4331], [10455, 4343], [8534, 4380], [8530, 4388], [8542, 4388], [8090, 4964], [8078, 4968], [4516, 5236], [4512, 5244], [4516, 5260], [4532, 5268], [4568, 5268], [4528, 5272], [4536, 5272], [4536, 5276], [8910, 5328], [8914, 5332], [8894, 5336], [8906, 5344], [8922, 5352]]);
-    SetupUpText(['ine Roc']);
+    SetupUpText(['ine Iro']);
     Finder.Colors += CTS2(2240329, 11, 0.12, 0.60);
     Finder.Colors += CTS2(2437710, 12, 0.10, 0.53);
     Finder.MinShortSide := 20;
@@ -641,15 +641,15 @@ begin
   with Self.SilverRock do
   begin
     Setup(3, [[4754, 445], [4746, 453], [4754, 457], [4938, 841], [4946, 845], [4974, 857], [4970, 861], [4962, 865], [2418, 1596], [2418, 1600], [6138, 1636], [6134, 1640], [6142, 1640], [2478, 2504], [2534, 2508], [8102, 2968], [8102, 2984], [8098, 2988], [8606, 3192], [8606, 3196], [8574, 3232], [8570, 3244], [8566, 3248], [7162, 3284], [7150, 3288], [7166, 3288], [7158, 3296], [7150, 3300], [7158, 3308], [10443, 4315], [10451, 4319], [10443, 4323], [8054, 4956], [4516, 5276], [4548, 5288], [4556, 5296]]);
-    SetupUpText(['ine Roc']);
+    SetupUpText(['ine Silv']);
     Finder.Colors += CTS2(11053233, 13, 0.15, 0.19);
     Finder.MinShortSide := 20;
   end;
 
   with Self.CoalRock do
   begin
     Setup(3, [[6484, 300], [6484, 304], [6492, 308], [6544, 392], [6540, 396], [6528, 400], [6528, 436], [6552, 444], [6484, 448], [6492, 452], [6500, 460], [6508, 488], [6540, 500], [6492, 504], [6524, 504], [6508, 512], [6552, 512], [6480, 520], [6536, 520], [6524, 524], [6504, 528], [6456, 532], [6476, 532], [6544, 532], [6440, 536], [6492, 536], [6516, 536], [6500, 540], [6532, 540], [6448, 544], [6484, 544], [6552, 544], [6492, 548], [6444, 552], [6512, 552], [6536, 556], [6456, 560], [6484, 560], [6520, 560], [6476, 564], [6504, 564], [6540, 564], [6484, 568], [6492, 568], [6532, 568], [6496, 572], [6400, 596], [6444, 604], [6464, 608], [6396, 612], [6432, 612], [6476, 612], [6480, 616], [6512, 616], [6500, 620], [6436, 624], [6412, 628], [6496, 628], [6400, 632], [6432, 632], [6448, 632], [6428, 636], [6408, 640], [6472, 640], [6412, 644], [6444, 644], [7618, 648], [7630, 656], [7602, 664], [7622, 664], [8154, 676], [8162, 676], [8158, 680], [8094, 684], [8102, 684], [8154, 684], [8162, 684], [8098, 688], [8094, 692], [8102, 692], [8166, 716], [4922, 873], [4902, 877], [4914, 877], [9555, 992], [9563, 992], [9447, 996], [9599, 996], [9427, 1000], [9511, 1004], [9419, 1008], [9611, 1008], [9643, 1008], [9483, 1012], [9555, 1012], [1102, 1016], [1118, 1016], [9431, 1016], [9479, 1016], [9503, 1016], [9539, 1016], [9623, 1016], [9447, 1020], [9503, 1024], [9519, 1024], [9467, 1028], [9507, 1028], [9651, 1028], [9463, 1032], [9503, 1032], [9523, 1032], [9463, 1036], [9519, 1036], [1118, 1048], [9503, 1048], [1122, 1052], [1110, 1056], [1126, 1056], [1146, 1056], [1114, 1060], [1122, 1060], [1190, 1060], [1106, 1064], [1126, 1064], [1162, 1064], [1114, 1068], [1126, 1072], [1122, 1076], [1178, 1080], [1174, 1084], [1134, 1088], [1190, 1112], [1106, 1116], [1170, 1128], [1194, 1128], [1198, 1132], [1166, 1144], [1118, 1148], [1102, 1156], [1170, 1156], [1118, 1160], [1098, 1172], [1166, 1180], [1106, 1188], [1158, 1196], [522, 1200], [1154, 1208], [506, 1212], [518, 1216], [1106, 1216], [1142, 1216], [510, 1220], [1114, 1220], [1118, 1228], [1146, 1228], [1102, 1236], [1110, 1236], [1102, 1240], [1302, 1332], [1310, 1336], [1310, 1340], [1310, 1344], [1294, 1352], [7722, 1352], [7758, 1352], [1306, 1356], [7718, 1356], [7766, 1356], [7710, 1380], [7714, 1384], [7718, 1388], [7750, 1392], [7702, 1396], [7746, 1396], [7766, 1404], [7762, 1408], [7754, 1412], [7786, 1428], [7782, 1432], [4026, 1447], [4030, 1451], [7730, 1452], [7742, 1452], [7738, 1456], [4118, 1459], [4114, 1463], [3938, 1523], [3930, 1527], [3942, 1527], [3926, 1535], [3926, 1539], [3930, 1543], [6118, 1616], [6138, 1620], [6114, 1624], [6134, 1624], [6122, 1632], [6130, 1632], [6126, 1640], [1814, 1872], [1810, 1876], [1806, 1880], [1806, 1884], [7462, 2056], [7478, 2056], [7466, 2060], [7482, 2060], [7446, 2064], [7454, 2064], [7462, 2064], [7438, 2068], [7450, 2072], [7486, 2072], [7438, 2076], [7458, 2080], [7434, 2084], [7458, 2084], [7434, 2088], [7478, 2088], [7434, 2092], [7478, 2092], [7486, 2092], [7442, 2096], [7474, 2096], [7486, 2096], [7462, 2100], [7482, 2100], [7442, 2104], [7454, 2104], [7466, 2104], [7810, 2180], [7806, 2184], [7806, 2188], [5710, 2508], [5726, 2508], [5714, 2512], [5738, 2516], [5698, 2520], [5746, 2520], [5694, 2524], [5746, 2524], [5690, 2528], [5694, 2532], [5722, 2532], [5698, 2536], [5754, 2544], [5734, 2548], [5718, 2552], [7718, 2760], [7726, 2764], [7726, 2768], [7034, 2984], [7030, 2996], [6158, 3104], [6170, 3104], [6150, 3108], [6226, 3116], [6170, 3120], [6234, 3120], [6170, 3124], [6214, 3124], [6230, 3124], [6214, 3132], [6226, 3132], [6214, 3136], [8602, 3180], [8610, 3248], [8606, 3252], [6722, 3272], [6730, 3280], [6718, 3284], [6726, 3284], [6734, 3284], [6742, 3284], [6738, 3288], [6738, 3464], [6734, 3468], [6746, 3468], [5806, 3552], [5822, 3552], [5810, 3556], [5826, 3556], [9010, 3760], [8994, 3772], [9010, 3780], [7974, 3836], [7970, 3840], [7978, 3844], [7970, 3848], [7974, 3852], [7970, 3856], [5898, 3924], [6782, 4320], [10439, 4347], [10435, 4355], [10451, 4359], [10447, 4367], [8566, 4380], [8558, 4384], [8562, 4388], [8570, 4388], [8090, 4788], [4536, 5252], [4488, 5264], [4524, 5264], [4520, 5272], [4528, 5280], [4532, 5284], [8902, 5332], [8918, 5344], [8910, 5348]]);
-    SetupUpText(['ine Roc']);
+    SetupUpText(['ine Coal']);
     Finder.Colors += CTS2(3158083, 6, 2.84, 0.38);
     Finder.MinShortSide := 20;
   end;
@@ -660,7 +660,7 @@ begin
     [ //Bandit Camp Quarry
      [8050, 4792], [8058, 4796], [8062, 4796], [8062, 4800]
     ]);
-    SetupUpText(['ine Roc']);
+    SetupUpText(['ine Sandst']);
     Finder.Colors += CTS2(2253179, 17, 0.04, 0.35);
     Finder.MinShortSide := 20;
   end;
@@ -672,23 +672,23 @@ begin
      [6674, 4457], [6679,4457], [6678, 4448],
      [6686, 4453], [6687, 4440], [6695, 4445], [6695, 4436]
     ]);
-    SetupUpText(['ine Roc']);
+    SetupUpText(['ine Gem r']);
     Finder.Colors += CTS2(7211376, 19, 0.02, 0.85);
     Finder.MinShortSide := 20;
   end;
 
   with Self.GoldRock do
   begin
     Setup(3, [[6536, 460], [4726, 461], [4746, 465], [4726, 469], [8122, 684], [8130, 684], [8126, 688], [8174, 716], [4930, 837], [4970, 837], [4958, 845], [4950, 849], [4950, 869], [4942, 873], [4046, 2768], [4058, 2768], [4042, 2772], [4062, 2772], [4042, 2788], [4058, 2788], [4054, 2792], [6838, 3296], [8570, 3296], [6842, 3300], [8570, 3300], [7146, 3328], [7166, 3328], [7166, 3332], [7146, 3336], [7150, 3344], [7162, 3344], [7294, 3512], [7302, 3516], [6330, 3540], [6318, 3544], [6318, 3548], [6318, 3552], [6334, 3552], [6330, 3556], [6358, 3828], [6366, 3840], [6374, 3848], [6362, 3852], [6378, 3852], [6378, 3856], [10435, 4311], [10451, 4311], [10423, 4319], [10431, 4319], [8686, 4940], [8690, 4944], [8678, 4948], [8690, 4952], [8682, 4960], [4524, 5240], [4552, 5248], [4500, 5284], [4544, 5300], [10260, 5624], [10268, 5628], [10272, 5632], [10276, 5640]]);
-    SetupUpText(['ine Roc']);
+    SetupUpText(['ine Gold']);
     Finder.Colors += CTS2(3580597, 17, 0.02, 0.86);
     Finder.MinShortSide := 20;
   end;
 
   with Self.VolcanicSulphurRock do
   begin
     Setup(3, []);
-    SetupUpText(['ine Roc']);
+    SetupUpText(['ine Volca']);
     //Finder.Colors += CTS2(2044210, 9, 0.10, 0.85);
     Finder.MinShortSide := 20;
   end;
@@ -699,31 +699,31 @@ begin
     [ // Bandit Camp Quarry
       [8054, 4816], [8054, 4812], [8054, 4808], [8062, 4804]
     ]);
-    SetupUpText(['ine Roc']);
+    SetupUpText(['ine Grani']);
     Finder.Colors += CTS2(3630463, 26, 0.05, 0.37);
     Finder.MinShortSide := 20;
   end;
 
   with Self.MithrilRock do
   begin
     Setup(3, [[6484, 408], [6476, 416], [6544, 544], [6536, 548], [6548, 552], [6524, 568], [6472, 596], [6492, 596], [6508, 604], [6504, 608], [6468, 624], [6476, 628], [6524, 628], [6464, 636], [6500, 640], [6496, 644], [7614, 660], [7622, 672], [7630, 676], [7606, 680], [8174, 708], [9483, 1032], [9487, 1036], [1302, 1344], [7734, 1368], [7734, 1384], [7734, 1388], [7730, 1392], [7738, 1392], [7798, 1400], [7734, 1404], [7798, 1404], [7726, 1408], [7802, 1412], [7742, 1416], [7742, 1420], [7746, 1424], [7738, 1428], [2426, 1600], [6302, 1672], [6298, 1700], [246, 1816], [254, 1828], [250, 1832], [230, 1840], [238, 1844], [1798, 1908], [1794, 1912], [8610, 3228], [8614, 3232], [6722, 3260], [6678, 3460], [6674, 3464], [6682, 3472], [6682, 3480], [6002, 3768], [5958, 3840], [5910, 3860], [7970, 3860], [7966, 3864], [7970, 3868], [7978, 3868], [7986, 3872], [6798, 4324], [6798, 4328], [10427, 4343], [10427, 4351], [4564, 5256], [4568, 5264]]);
-    SetupUpText(['ine Roc']);
+    SetupUpText(['ine Mithr']);
     Finder.Colors += CTS2(6046016, 20, 0.04, 0.26);
     Finder.MinShortSide := 20;
   end;
 
   with Self.AdamantiteRock do
   begin
     Setup(3, [[6504, 404], [6504, 412], [6476, 444], [6496, 556], [6472, 572], [6520, 596], [6456, 600], [6480, 600], [6524, 600], [6492, 612], [6484, 636], [6512, 636], [6488, 648], [7614, 672], [8166, 708], [8162, 740], [8170, 740], [8166, 744], [8162, 748], [8170, 748], [4914, 901], [9491, 1020], [9487, 1044], [9507, 1044], [9491, 1048], [7694, 1408], [7698, 1412], [7694, 1420], [7706, 1424], [7722, 1428], [7726, 1432], [238, 1820], [234, 1824], [242, 1832], [246, 1840], [1794, 1900], [8586, 3180], [6742, 3472], [6742, 3476], [4510, 3804], [4502, 3808], [4510, 3812], [4514, 3820], [7986, 3860], [7982, 3864], [6782, 4308], [8914, 5356]]);
-    SetupUpText(['ine Roc']);
+    SetupUpText(['ine Adamant']);
     Finder.Colors += CTS2(4214847, 21, 0.06, 0.19);
     Finder.MinShortSide := 20;
   end;
 
   with Self.RuniteRock do
   begin
     Setup(3, [[6552, 600], [6560, 616], [7298, 700], [7250, 716], [7186, 792], [4910, 873], [4922, 901], [7630, 908], [7634, 912], [9523, 1028], [9515, 1040], [3938, 1535], [4514, 3808], [4506, 3824]]);
-    SetupUpText(['ine Roc']);
+    SetupUpText(['ine Runite']);
     Finder.Colors += CTS2(8091471, 26, 0.08, 0.33);
     Finder.MinShortSide := 20;
   end;