fix: Update farmrunnerupdate.simba

var name changes for better distinction from other projects

Author: TwistedSlayerHelm

optional/handlers/farmrunnerupdate.simba

@@ -3432,6 +3432,7 @@ begin
 
   Stats.Setup();
   Stats.GetLevel(ERSSkill.AGILITY);
+  Stats.GetLevel(ERSSkill.HITPOINTS);
 
    for i := 0 to High(Self.Patches) do begin
     if Self.Patches[i].Data.Name.Contains('Civitas') then
@@ -3499,12 +3500,14 @@ begin
                [275, 210, 360, 245],
                [390, 210, 475, 245],
                [390, 140, 475, 180],
+               [  0,   0,   0,   0],
                [  0,   0,   0,   0]];
 
   invyboxes := [[650, 385, 730, 410],
                 [555, 425, 625, 455],
                 [650, 430, 730, 455],
                 [650, 340, 730, 370],
+                [  0,   0,   0,   0],
                 [  0,   0,   0,   0]];
 
   compostArray := ['Compost', 'Supercompost', 'Ultracompost', 'Bottomless compost bucket', '', ''];
@@ -3679,31 +3682,31 @@ begin
   FarmRunner.CompostType := CompType.getText();
   FarmConfig.composttypeint := CompType.getItemIndex();
 
-  ArdyTeleportType := Self.Form.GetChild('lcb_ardytp_combobox');
+  ArdyTeleportType := Self.Form.GetChild('lcb_ardytp_fr_combobox');
   FarmRunner.ArdougneTP := ArdyTeleportType.getText();
   FarmConfig.ardougnetpint := ArdyTeleportType.getItemIndex();
 
-  FallyTeleportType := Self.Form.GetChild('lcb_fallytp_combobox');
+  FallyTeleportType := Self.Form.GetChild('lcb_fallytp_fr_combobox');
   FarmRunner.FaladorTP := FallyTeleportType.getText();
   FarmConfig.faladortpint := FallyTeleportType.getItemIndex();
 
-  CathTeleportType := Self.Form.GetChild('lcb_cathtp_combobox');
+  CathTeleportType := Self.Form.GetChild('lcb_cathtp_fr_combobox');
   FarmRunner.CatherbyTP := CathTeleportType.getText();
   FarmConfig.catherbytpint := CathTeleportType.getItemIndex();
 
-  HosiTeleportType := Self.Form.GetChild('lcb_hostp_combobox');
+  HosiTeleportType := Self.Form.GetChild('lcb_hostp_fr_combobox');
   FarmRunner.HosidiusTP := HosiTeleportType.getText();
   FarmConfig.hosidiustpint := HosiTeleportType.getItemIndex();
 
-  CiviTeleportType := Self.Form.GetChild('lcb_civtp_combobox');
+  CiviTeleportType := Self.Form.GetChild('lcb_civtp_fr_combobox');
   FarmRunner.CivitasTP := CiviTeleportType.getText();
   FarmConfig.civitastpint := CiviTeleportType.getItemIndex();
 
-  FarmGuildTeleportType := Self.Form.GetChild('lcb_fguildtp_combobox');
+  FarmGuildTeleportType := Self.Form.GetChild('lcb_fguildtp_fr_combobox');
   FarmRunner.FarmguildTP := FarmGuildTeleportType.getText();
   FarmConfig.farmguildtpint := FarmGuildTeleportType.getItemIndex();
 
-  RPouchType := Self.Form.GetChild('lcb_rpouch_combobox');
+  RPouchType := Self.Form.GetChild('lcb_rpouch_fr_combobox');
   FarmRunner.RPouchMethod := RPouchType.getText();
   FarmConfig.runepouchint := RPouchType.getItemIndex();
 
@@ -3854,7 +3857,7 @@ var
   cb_hap, cb_civhp, cb_civfp, cb_civap, cb_gap,
   cb_gbp, cb_gcp, cb_kbp, cb_gsp,
   cb_runinit, cb_clherbs, cb_barbdibber, cb_msecat: TLabeledCheckBox;
-  lcb_herbseed, lcb_flowerseed, lcb_allotmentseed, lcb_compost, lcb_ardytp, lcb_fallytp, lcb_cathtp, lcb_hostp, lcb_civtp, lcb_fguildtp, lcb_rpouch: TLabeledComboBox;
+  lcb_herbseed, lcb_flowerseed, lcb_allotmentseed, lcb_compost, lcb_ardytp_fr, lcb_fallytp_fr, lcb_cathtp_fr, lcb_hostp_fr, lcb_civtp_fr, lcb_fguildtp_fr, lcb_rpouch_fr: TLabeledComboBox;
   box_runespouch: TLabeledEdit;
 begin
   Self.AddTab('Farm Run Settings');
@@ -4249,12 +4252,12 @@ begin
     SetCaption('Clean herbs');
   end;
 
-  with lcb_ardytp do
+  with lcb_ardytp_fr do
   begin
     Create(Result);
     SetLeft(TControl.AdjustToDPI(562));
     SetTop(TControl.AdjustToDPI(15));
-    SetName('lcb_ardytp');
+    SetName('lcb_ardytp_fr');
     SetCaption('Ardougne teleport');
     AddItemArray(['Not using Ardougne patch', 'Normal spellbook TELEPORT',  'Ardougne TABLET', 'Ardougne cape']);
     SetItemIndex(0);
@@ -4263,12 +4266,12 @@ begin
     ComboBox.SetFontColor(0);
   end;
 
-  with lcb_fallytp do
+  with lcb_fallytp_fr do
   begin
     Create(Result);
     SetLeft(TControl.AdjustToDPI(562));
     SetTop(TControl.AdjustToDPI(55));
-    SetName('lcb_fallytp');
+    SetName('lcb_fallytp_fr');
     SetCaption('Falador teleport');
     AddItemArray(['Not using Falador patch', 'Normal spellbook TELEPORT',  'Falador TABLET', 'Explorer ring']);
     SetItemIndex(0);
@@ -4277,12 +4280,12 @@ begin
     ComboBox.SetFontColor(0);
   end;
 
-  with lcb_cathtp do
+  with lcb_cathtp_fr do
   begin
     Create(Result);
     SetLeft(TControl.AdjustToDPI(562));
     SetTop(TControl.AdjustToDPI(95));
-    SetName('lcb_cathtp');
+    SetName('lcb_cathtp_fr');
     SetCaption('Catherby teleport');
     AddItemArray(['Not using Catherby patch', 'Normal spellbook TELEPORT',  'Lunar spellbook TELEPORT', 'Camelot TABLET', 'Catherby TABLET']);
     SetItemIndex(0);
@@ -4291,12 +4294,12 @@ begin
     ComboBox.SetFontColor(0);
   end;
 
-  with lcb_hostp do
+  with lcb_hostp_fr do
   begin
     Create(Result);
     SetLeft(TControl.AdjustToDPI(562));
     SetTop(TControl.AdjustToDPI(135));
-    SetName('lcb_hostp');
+    SetName('lcb_hostp_fr');
     SetCaption('Hosidius teleport');
     AddItemArray(['Not using Hosidius Patch', 'Xerics Talisman (CHARGED)', 'Hosidius TABLET', 'House teleport TABLET', 'House teleport RUNES', 'Construction cape UNTRIMMED', 'Construction cape TRIMMED']);
     SetItemIndex(0);
@@ -4305,12 +4308,12 @@ begin
     ComboBox.SetFontColor(0);
   end;
 
-  with lcb_civtp do
+  with lcb_civtp_fr do
   begin
     Create(Result);
     SetLeft(TControl.AdjustToDPI(562));
     SetTop(TControl.AdjustToDPI(175));
-    SetName('lcb_civtp');
+    SetName('lcb_civtp_fr');
     SetCaption('Civitas teleport');
     AddItemArray(['Not using Civitas Patch', 'Normal spellbook TELEPORT', 'Civitas TABLET', 'Hunter cape UNTRIMMED', 'Hunter cape TRIMMED', 'Basic quetzal whistle', 'Enhanced quetzal whistle', 'Perfected quetzal whistle']);
     SetItemIndex(0);
@@ -4319,12 +4322,12 @@ begin
     ComboBox.SetFontColor(0);
   end;
 
-  with lcb_fguildtp do
+  with lcb_fguildtp_fr do
   begin
     Create(Result);
     SetLeft(TControl.AdjustToDPI(562));
     SetTop(TControl.AdjustToDPI(215));
-    SetName('lcb_fguildtp');
+    SetName('lcb_fguildtp_fr');
     SetCaption('Farming guild teleport');
     AddItemArray(['Not using Farm guild patch', 'Skills necklace', 'Farming cape UNTRIMMED', 'Farming cape TRIMMED']);
     SetItemIndex(0);
@@ -4333,12 +4336,12 @@ begin
     ComboBox.SetFontColor(0);
   end;
 
-  with lcb_rpouch do
+  with lcb_rpouch_fr do
   begin
     Create(Result);
     SetLeft(TControl.AdjustToDPI(385));
     SetTop(TControl.AdjustToDPI(175));
-    SetName('lcb_rpouch');
+    SetName('lcb_rpouch_fr');
     SetCaption('Rune pouch');
     AddItemArray(['Not using/use runes', 'Rune pouch', 'Divine rune pouch']);
     SetItemIndex(0);
@@ -4378,17 +4381,17 @@ begin
 
   lcb_compost.SetItemIndex(FarmConfig.composttypeint);
 
-  lcb_rpouch.SetItemIndex(FarmConfig.runepouchint);
+  lcb_rpouch_fr.SetItemIndex(FarmConfig.runepouchint);
 
   if length(FarmConfig.runepouchstring) > 0 then
     box_runespouch.SetText(FarmConfig.runepouchstring);
 
-  lcb_ardytp.SetItemIndex(FarmConfig.ardougnetpint);
-  lcb_fallytp.SetItemIndex(FarmConfig.faladortpint);
-  lcb_cathtp.SetItemIndex(FarmConfig.catherbytpint);
-  lcb_hostp.SetItemIndex(FarmConfig.hosidiustpint);
-  lcb_civtp.SetItemIndex(FarmConfig.civitastpint);
-  lcb_fguildtp.SetItemIndex(FarmConfig.farmguildtpint);
+  lcb_ardytp_fr.SetItemIndex(FarmConfig.ardougnetpint);
+  lcb_fallytp_fr.SetItemIndex(FarmConfig.faladortpint);
+  lcb_cathtp_fr.SetItemIndex(FarmConfig.catherbytpint);
+  lcb_hostp_fr.SetItemIndex(FarmConfig.hosidiustpint);
+  lcb_civtp_fr.SetItemIndex(FarmConfig.civitastpint);
+  lcb_fguildtp_fr.SetItemIndex(FarmConfig.farmguildtpint);
 
   if FarmConfig.wherbEnabled then
     cb_whp.CheckBox.SetChecked(True);