Merge pull request #225 from bassiej14/master

Added heart to magichandler and consume

Author: Torwent

osr/handlers/consumablehandler.simba

@@ -367,7 +367,7 @@ begin
     while not consumableHandler^.Delay.IsFinished() do
       Wait(50, 100);
   slotBox := Self.GetSlotBox(slots[0]);
-  Result := Self.ClickSlot(slots[0], ['Eat', 'Drink']);
+  Result := Self.ClickSlot(slots[0], ['Eat', 'Drink', 'Invigorate']);
 
   if Result then
   begin

utils/items/consumables.simba

@@ -69,9 +69,8 @@ WriteLn CONSUMABLE_ARRAYS[ERSConsumable.ENERGY];
   ATTACK_BOOST_ARRAY: TRSItemArray = ['Divine super attack potion(1..4)', 'Super attack(1..4)', 'Attack potion(1..4)'];
   DEFENCE_BOOST_ARRAY: TRSItemArray = ['Divine super defence potion(1..4)', 'Super defence(1..4)', 'Defence potion(1..4)'];
   RANGING_BOOST_ARRAY: TRSItemArray = ['Divine ranging potion(1..4)', 'Ranging potion(1..4)'];
-  MAGIC_BOOST_ARRAY: TRSItemArray = ['Divine magic potion(1..4)', 'Magic potion(1..4)'];
+  MAGIC_BOOST_ARRAY: TRSItemArray = ['Divine magic potion(1..4)', 'Magic potion(1..4)', 'Saturated heart', 'Imbued heart'];
   TRASH_ARRAY: TRSItemArray = ['Cocktail glass', 'Jug', 'Bowl', 'Pie dish', 'Vial', 'Beer glass', 'Empty cup'];
-
   CONSUMABLE_ARRAYS: array [ERSConsumable] of TRSItemArray := [FOOD_ARRAY, PRAYER_ARRAY, ENERGY_ARRAY, ANTI_POISON_ARRAY, ANTI_FIRE_ARRAY, BOOST_ARRAY, STRENGTH_BOOST_ARRAY, ATTACK_BOOST_ARRAY, DEFENCE_BOOST_ARRAY, RANGING_BOOST_ARRAY, MAGIC_BOOST_ARRAY];
 
 type
@@ -291,7 +290,7 @@ begin
   if Self.IsSetup then
     Exit;
   str := ToStr(Self.Item);
-  if str.Contains('ivine ') then
+  if str.Contains('ivine ') or str.Contains('heart') then
     Self.Timer := (5 * ONE_MINUTE) + (3 * ONE_SECOND)
   else
     Self.Timer := 8 * ONE_MINUTE;