Update all plugins to conform to Rubocop.

data/plugins/skill/herblore/herb.rb

@@ -10,13 +10,13 @@ class Herb < Ingredient
 
   def initialize(item_id, unidentified, level, experience)
     super item_id
-    
+
     @unidentified = unidentified
     @level = level
     @experience = experience
   end
-  
-  def invoke(player, id, slot)
+
+  def invoke(player, _id, slot)
     item = player.inventory.get(slot)
     player.start_action(HerbIdentificationAction.new(player, self, slot, item))
   end
@@ -25,51 +25,54 @@ end
 # An action that makes a player identify a herb.
 class HerbIdentificationAction < Action
   attr_reader :herb, :slot, :item, :pulses
-  
+
   def initialize(player, herb, slot, item)
     super(0, true, player)
-    
+
     @herb = herb
     @slot = slot
     @item = item
     @pulses = 0
   end
-  
+
   def execute
     if @pulses == 0
-      unless check_skill(mob, @herb.level, "identify this herb")
+      unless check_skill(mob, @herb.level, 'identify this herb')
         stop
         return
       end
     end
+
     execute_action
     @pulses += 1
   end
-  
+
   def execute_action
     player = mob
     inventory = player.inventory
 
     if inventory.remove_slot(@slot, 1) == 1
       identified = @herb.item
-        
+
       inventory.add(identified)
       player.skill_set.add_experience(HERBLORE_ID, @herb.experience)
       player.send_message("You identify the herb as a #{identified.definition.name}.", true)
+      # TODO: 'as an' in some cases
     end
+
     stop
   end
-  
+
   def equals(other)
-    return (get_class == other.get_class and slot == other.slot and herb == other.herb)
+    get_class == other.get_class && slot == other.slot && herb == other.herb
   end
 end
 
 # Appends a herb to the InventoryItemMessage interception.
 def append_herb(item_id, unidentified, level, experience)
   herb = Herb.new(item_id, unidentified, level, experience)
-  append_herblore_item(herb, unidentified) 
-  return herb
+  append_herblore_item(herb, unidentified)
+  herb
 end
 
 # Herbs
@@ -87,4 +90,4 @@ SNAPDRAGON  = append_herb(3000, 3051, 59, 11.8)
 CADANTINE   = append_herb(265,  215,  65, 12.5)
 LANTADYME   = append_herb(2481, 2485, 67, 13.1)
 DWARF_WEED  = append_herb(267,  217,  70, 13.8)
-TORSTOL     = append_herb(269,  219,  75, 15)
+TORSTOL     = append_herb(269,  219,  75, 15)

data/plugins/skill/herblore/herblore.rb

@@ -1,4 +1,4 @@
-# Thanks to Sillhouette <http://www.rune-server.org/members/silhouette/> for posting
+# Thanks to Sillhouette <http://www.rune-server.org/members/silhouette> for posting
 # a large amount of Herblore skill data which has been thankfully used in this plugin.
 
 require 'java'
@@ -13,15 +13,14 @@ HERBLORE_ITEM_ON_ITEM = {}
 
 DRINK_ITEM = {}
 
-
 # A module which describes an invocable method of the Herblore skill.
 module HerbloreMethod
   def self.new
-    raise 'You cannot instantiate this module!'
+    fail 'You cannot instantiate this module!'
   end
 
-  def invoke(player, primary, secondary)
-    raise NotImplementedError.new('You must implement the invocation of HerbloreMethod!')
+  def invoke(_player, _primary, _secondary)
+    fail 'You must implement the invocation of HerbloreMethod!'
   end
 end
 
@@ -76,25 +75,28 @@ def append_herblore_item(method, key, secondary = -1)
   end
 end
 
-# Utility method for checking if a player's inventory has an item of the specified id, with optionally the specified amount (1 by default), at the specified slot.
+# Utility method for checking if a player's inventory has a of the specified id, with optionally
+# the specified amount (1 by default), at the specified slot.
 def check_slot(player, slot, id, amount = 1)
   item = player.inventory.get(slot)
-  return (!item.nil? and item.id == id and item.amount >= amount)
+  !item.nil? && item.id == id && item.amount >= amount
 end
 
-# Utility method for checking if a player's Herblore (maximum) level is at a required height. Also informs the player if this is not the case with use of the action 
-# variable, like so: "You need a Herblore level of at least #{required.to_s} to #{action}."
+# Utility method for checking if a player's Herblore (maximum) level is at the required level. Also
+# informs the player if this is not the case with use of the action variable, like so:
+# "You need a Herblore level of at least #{required.to_s} to #{action}."
 def check_skill(player, required, action)
-  if (required > player.skill_set.get_skill(Skill::HERBLORE).current_level)
+  if required > player.skill_set.get_skill(Skill::HERBLORE).current_level
     player.send_message("You need a Herblore level of at least #{required} to #{action}.")
     return false
   end
 
-  return true
+  true
 end
 
-# Opens a 'make' dialogue for the specified player, displaying the specified item. Optionally, a listener can be used for the dialogue.
+# Opens a 'make' dialogue for the specified player, displaying the specified item. Optionally, a
+# listener can be used for the dialogue.
 def open_dialogue(player, item, listener = nil)
   player.send(SetWidgetItemModelMessage.new(1746, item, 170))
   player.interface_set.open_dialogue(listener, HERBLORE_DIALOGUE)
-end
+end

data/plugins/skill/herblore/ingredient.rb

@@ -18,16 +18,15 @@ class Ingredient
     @item = Item.new(item) # Share item instances.
   end
 
-  # Checks if the specified player has the specified amount of this ingredient. Optionally, they can immediately be removed if that
-  # amount was indeed found.
+  # Checks if the specified player has the specified amount of this ingredient. Optionally, they
+  # can immediately be removed if that amount was indeed found.
   def check_remove(player, amount, remove)
     inventory = player.inventory
     counter = 0
 
     inventory.items.each do |inv_item|
       break unless counter < amount
-
-      next if inv_item == nil
+      next if inv_item.nil?
 
       id = inv_item.id
       inventory_amount = inv_item.amount
@@ -47,7 +46,7 @@ class Ingredient
       return true
     end
 
-    return false
+    false
   end
 end
 
@@ -59,11 +58,10 @@ class GroundIngredient < Ingredient
 
   def initialize(item_id, raw)
     super(item_id)
-
     @raw = raw
   end
 
-  def invoke(player, pestle_mortar, ingredient)
+  def invoke(player, _pestle_mortar, _ingredient)
     action = GrindingAction.new(player, self)
     listener = GrindingDialogueListener.new(player, action)
 
@@ -71,7 +69,8 @@ class GroundIngredient < Ingredient
   end
 end
 
-# A DialogueAdapter used for grinding ingredients. It is also used as an EnterAmountListener for the amount of grinding actions.
+# A DialogueAdapter used for grinding ingredients. It is also used as an EnterAmountListener for
+# the amount of grinding actions.
 class GrindingDialogueListener < DialogueAdapter
   include EnterAmountListener
 
@@ -79,7 +78,6 @@ class GrindingDialogueListener < DialogueAdapter
 
   def initialize(player, action)
     super()
-    
     @player = player
     @action = action
   end
@@ -103,7 +101,7 @@ class GrindingDialogueListener < DialogueAdapter
 
   # Called when an amount of grinding actions has been entered.
   def amountEntered(amount)
-    if amount <= 0 then return else execute(amount) end
+    execute(amount) if amount > 0
   end
 
   # Called to set the action(s) in motion.
@@ -129,7 +127,7 @@ class GrindingAction < Action
   attr_reader :ingredient, :amount, :pulses, :slot, :listener
 
   def initialize(player, ingredient)
-    super 0, true, player
+    super(0, true, player)
 
     @ingredient = ingredient
     @pulses = 0
@@ -145,7 +143,7 @@ class GrindingAction < Action
     if @pulses == 0
       mob.play_animation GRINDING_ANIM
     elsif @pulses == 1
-      if not gather_materials
+      unless gather_materials
         stop
         return
       end
@@ -159,45 +157,45 @@ class GrindingAction < Action
 
       inventory.reset(@slot)
       inventory.add(@ingredient.item)
-      
+
       set_delay(1)
     elsif @pulses == 2
       mob.stop_animation
-      continue()
+      continue
     end
   end
 
   # Checks if the player has the required materials to perform the (next) action.
   def gather_materials
     items = mob.inventory.items
-    
+
     pst_mrt = false
     ingr = false
     raw = @ingredient.raw
     (0...items.length).each do |slot|
       item = items[slot]
-      next if item == nil
+      next if item.nil?
 
       id = item.id
-      if id == PESTLE_MORTAR and !pst_mrt
+      if id == PESTLE_MORTAR && !pst_mrt
         pst_mrt = true
-      elsif id == raw and !ingr
+      elsif id == raw && !ingr
         ingr = true
         @slot = slot
       end
 
-      return true if pst_mrt and ingr
+      return true if pst_mrt && ingr
     end
 
     mob.send_message("You do not have any more #{name_of(raw).downcase}s.")
-    return false
+    false
   end
-  
+
   # Either invokes the stop() method in Action to shut it down
   # or continues to the next ingredient.
   def continue
     @amount -= 1
-    
+
     if @amount > 0
       set_delay(0)
       @pulses = -1
@@ -213,11 +211,11 @@ class GrindingAction < Action
 
   def stop
     super
-    mob.inventory.remove_listener(@listener) unless listener == nil
+    mob.inventory.remove_listener(@listener) unless listener.nil?
   end
-  
+
   def equals(other)
-    return (get_class == other.get_class and @ingredient == other.ingredient)
+    get_class == other.get_class && @ingredient == other.ingredient
   end
 end
 
@@ -225,7 +223,7 @@ end
 def append_ground(id, raw)
   ground = GroundIngredient.new(id, raw)
   append_herblore_item(ground, PESTLE_MORTAR, raw)
-  return ground
+  ground
 end
 
 # Normal ingredients
@@ -250,4 +248,4 @@ MAGIC_ROOTS        = Ingredient.new(6051)
 UNICORN_HORN_DUST = append_ground(235,  237)
 DRAGON_SCALE_DUST = append_ground(241,  243)
 CHOCOLATE_DUST    = append_ground(1975, 1973)
-# CRUSHED_NEST      = append_ground(6693, 5075)
+# CRUSHED_NEST      = append_ground(6693, 5075) # TODO: only in 377

data/plugins/skill/herblore/potion.rb

@@ -13,25 +13,26 @@ EMPTY_VIAL_ID = 229
 
 MIXING_ANIM = Animation.new(363)
 
-# Represents an unfinished potion which can be invoked as a HerbloreMethod and used as an ingredient.
+# Represents an unfinished potion which can be invoked as a HerbloreMethod and used as an
+# ingredient.
 class UnfinishedPotion < Ingredient
   include HerbloreMethod
 
   attr_reader :herb, :level
 
   def initialize(item_id, herb, level)
-    super item_id
-
+    super(item_id)
     @herb = herb
     @level = level
   end
 
-  def invoke(player, primary, secondary)
+  def invoke(player, _primary, _secondary)
     action = UnfinishedMixingAction.new(player, self)
     listener = UnfinishedMixingDialogueListener.new(player, action)
 
     open_dialogue(player, @item_id, listener)
   end
+
 end
 
 # Represents a finished potion which can be invoked as a HerbloreMethod.
@@ -51,11 +52,12 @@ class FinishedPotion
     action = FinishedMixingAction.new(player, primary, secondary, self)
     listener = FinishedMixingDialogueListener.new(player, action)
 
-    open_dialogue(player, @item.id, listener) 
+    open_dialogue(player, @item.id, listener)
   end
 end
 
-# A DialogueAdapter used for mixing potions. It is also used as an EnterAmountListener for the amount of mixing actions.
+# A DialogueAdapter used for mixing potions. It is also used as an EnterAmountListener for the
+# amount of mixing actions.
 class MixingDialogueListener < DialogueAdapter
   include EnterAmountListener
 
@@ -63,7 +65,7 @@ class MixingDialogueListener < DialogueAdapter
 
   def initialize(player, action)
     super()
-    
+
     @player = player
     @action = action
   end
@@ -71,7 +73,7 @@ class MixingDialogueListener < DialogueAdapter
   # Called when a button has been clicked whilst the dialogue was opened.
   def buttonClicked(button)
     amount = get_amount(button)
-    
+
     return false if amount == 0
 
     interfaces = @player.interface_set
@@ -85,12 +87,12 @@ class MixingDialogueListener < DialogueAdapter
     amount = calculate_maximum if amount == -2
 
     execute(amount)
-    return true
+    true
   end
 
   # Called when an amount of mixing actions has been entered.
   def amountEntered(amount)
-    if amount <= 0 then return else execute(amount) end
+    execute(amount) if amount > 0
   end
 
   # Called to set the action(s) in motion.
@@ -99,7 +101,7 @@ class MixingDialogueListener < DialogueAdapter
     @player.start_action(@action)
   end
 
-  def calculate_maximum(code)
+  def calculate_maximum(_code)
     # Override for potion-specific amount calculation.
   end
 
@@ -118,18 +120,17 @@ end
 
 # A MixingDialogueListener used for mixing unfinished potions.
 class UnfinishedMixingDialogueListener < MixingDialogueListener
+
   def calculate_maximum
     inventory = @player.inventory
 
     amount = inventory.get_amount(WATER_VIAL_ID)
-
     return 0 if amount <= 0
 
     herbs = inventory.get_amount(@action.potion.herb.item.id)
-    amount = herbs if amount > herbs
-
-    return amount
+    [herbs, amount].min
   end
+
 end
 
 # A MixingDialogueListener used for mixing finished potions.
@@ -144,7 +145,7 @@ class FinishedMixingDialogueListener < MixingDialogueListener
       amount = item_amount if amount > item_amount
     end
 
-    return amount
+    amount
   end
 
 end
@@ -170,6 +171,7 @@ class MixingAction < Action
           stop
           return
         end
+
         @started = true
       end
 
@@ -178,15 +180,17 @@ class MixingAction < Action
         return
       end
     end
+
     mob.play_animation(MIXING_ANIM)
     execute_action
 
-    if (@amount -= 1) > 0 then @pulses = 0 else stop end
+    @amount -= 1
+    @amount > 0 ? @pulses = 0 : stop
   end
 
   def stop
     super()
-    mob.inventory.remove_listener(@listener) unless @listener == nil
+    mob.inventory.remove_listener(@listener) unless @listener.nil?
   end
 
   def execute_action
@@ -195,7 +199,7 @@ class MixingAction < Action
 
   def gather_materials
     # Override for ingredient checking and gathering
-    return false
+    false
   end
 
   # Sets the amount of actions.
@@ -204,7 +208,7 @@ class MixingAction < Action
   end
 
   def equals(other)
-    return (get_class == other.get_class and @potion == other.potion)
+    get_class == other.get_class && @potion == other.potion
   end
 end
 
@@ -213,7 +217,7 @@ class UnfinishedMixingAction < MixingAction
   attr_reader :slots
 
   def initialize(player, potion)
-    super(player, potion, "use this herb.")
+    super(player, potion, 'use this herb.')
   end
 
   def execute_action
@@ -221,7 +225,9 @@ class UnfinishedMixingAction < MixingAction
     player = mob
     inventory = player.inventory
 
-    player.send_message("You put the #{name} in the water to make an unfinished #{name.sub(/ leaf$/, "")} potion.", true)
+    created = name.sub(/ leaf$/, '')
+    message = "You put the #{name} in the water to make an unfinished #{created} potion."
+    player.send_message(message, true)
 
     @slots.each do |slot, amount|
       unless inventory.remove_slot(slot, amount)
@@ -253,23 +259,23 @@ class UnfinishedMixingAction < MixingAction
     @slots[vial_slot] = 1
     @slots[herb_slot] = 1
 
-    return true
+    true
   end
+
 end
 
 # A MixingAction which handles the execution of making FinishedPotions.
 class FinishedMixingAction < MixingAction
   attr_reader :unfinished, :ingredient, :slots
-  
+
   def initialize(player, unfinished, ingredient, potion)
-    super(player, potion, "mix this potion")
-    
+    super(player, potion, 'mix this potion')
     @unfinished = unfinished
     @ingredient = ingredient
   end
-  
-  def execute_action
-    player = mob    
+
+  def executeAction
+    player = mob
     ingredient = name_of(@ingredient).downcase
     name = @potion.item.definition.name.sub('(3)', '')
 
@@ -277,17 +283,17 @@ class FinishedMixingAction < MixingAction
     player.skill_set.add_experience(HERBLORE_SKILL_ID, @potion.experience)
 
     inventory = player.inventory
-      
+
     @slots.each do |slot, amount|
-      if not inventory.remove_slot(slot, amount)
+      unless inventory.remove_slot(slot, amount) # TODO: will this remove stuff incorrectly?
         stop
         return
       end
     end
-      
+
     inventory.add(@potion.item)
   end
-  
+
   def gather_materials
     @slots = {}
     inventory = mob.inventory
@@ -297,70 +303,69 @@ class FinishedMixingAction < MixingAction
       mob.send_message('You do not have enough unfinished potions.')
       return false
     end
-    
+
     ingredient_slot = inventory.slot_of(@ingredient)
     if ingredient_slot == -1
       mob.send_message('You do not have enough ingredients.')
       return false
     end
-    
+
     @slots[vial_slot] = 1
     @slots[ingredient_slot] = 1
-    
-    return true
+
+    true
   end
+
 end
 
 # Appends a finished potion to the ItemOnItemMessage handling interception.
-def append_finished_potion(item, unfinished, ingredient, level, experience)
-  potion = FinishedPotion.new(item, [ unfinished, ingredient ], level, experience)
+def finished_potion(item, unfinished, ingredient, level, experience)
+  potion = FinishedPotion.new(item, [unfinished, ingredient], level, experience)
   append_herblore_item(potion, unfinished.item_id, ingredient.item_id)
-  return potion
+  potion
 end
 
 # Appends an unfinished potion to the ItemOnItemMessage handling interception.
-def append_unfinished_potion(item, herb, level)
+def unfinished_potion(item, herb, level)
   potion = UnfinishedPotion.new(item, herb, level)
   append_herblore_item(potion, herb.item_id, WATER_VIAL_ID)
-  return potion
+  potion
 end
 
-
 # Unfinished potions
-UNF_GUAM        = append_unfinished_potion(91,   GUAM_LEAF,   1) # 3
-UNF_MARRENTILL  = append_unfinished_potion(93,   MARRENTILL,  5)
-UNF_TARROMIN    = append_unfinished_potion(95,   TARROMIN,    12)
-UNF_HARRALANDER = append_unfinished_potion(97,   HARRALANDER, 22)
-UNF_RANARR      = append_unfinished_potion(99,   RANARR,      30)
-UNF_TOADFLAX    = append_unfinished_potion(3002, TOADFLAX,    34)
-UNF_IRIT        = append_unfinished_potion(101,  IRIT_LEAF,   45)
-UNF_AVANTOE     = append_unfinished_potion(103,  AVANTOE,     50)
-UNF_KWUARM      = append_unfinished_potion(105,  KWUARM,      55)
-UNF_SNAPDRAGON  = append_unfinished_potion(3004, SNAPDRAGON,  63)
-UNF_CADANTINE   = append_unfinished_potion(107,  CADANTINE,   66)
-UNF_LANTADYME   = append_unfinished_potion(2483, LANTADYME,   69)
-UNF_DWARF_WEED  = append_unfinished_potion(109,  DWARF_WEED,  72)
-UNF_TORSTOL     = append_unfinished_potion(111,  TORSTOL,     78)
-
+UNF_GUAM        = unfinished_potion(91,   GUAM_LEAF,   1) # 3
+UNF_MARRENTILL  = unfinished_potion(93,   MARRENTILL,  5)
+UNF_TARROMIN    = unfinished_potion(95,   TARROMIN,    12)
+UNF_HARRALANDER = unfinished_potion(97,   HARRALANDER, 22)
+UNF_RANARR      = unfinished_potion(99,   RANARR,      30)
+UNF_TOADFLAX    = unfinished_potion(3002, TOADFLAX,    34)
+UNF_IRIT        = unfinished_potion(101,  IRIT_LEAF,   45)
+UNF_AVANTOE     = unfinished_potion(103,  AVANTOE,     50)
+UNF_KWUARM      = unfinished_potion(105,  KWUARM,      55)
+UNF_SNAPDRAGON  = unfinished_potion(3004, SNAPDRAGON,  63)
+UNF_CADANTINE   = unfinished_potion(107,  CADANTINE,   66)
+UNF_LANTADYME   = unfinished_potion(2483, LANTADYME,   69)
+UNF_DWARF_WEED  = unfinished_potion(109,  DWARF_WEED,  72)
+UNF_TORSTOL     = unfinished_potion(111,  TORSTOL,     78)
 
 # Finished potions
-ATTACK_POT           = append_finished_potion(121,  UNF_GUAM,        EYE_NEWT,          1,  25) # 3, 25
-ANTIPOISON_POT       = append_finished_potion(175,  UNF_MARRENTILL,  UNICORN_HORN_DUST, 5,  37.5)
-STRENGTH_POT         = append_finished_potion(115,  UNF_TARROMIN,    LIMPWURT_ROOT,     12, 50)
-RESTORE_POT          = append_finished_potion(127,  UNF_HARRALANDER, RED_SPIDERS_EGGS,  18, 62.5)
-ENERGY_POT           = append_finished_potion(3010, UNF_HARRALANDER, CHOCOLATE_DUST,    26, 67.5)
-DEFENCE_POT          = append_finished_potion(133,  UNF_RANARR,      WHITE_BERRIES,     30, 75)
-AGILITY_POT          = append_finished_potion(3034, UNF_TOADFLAX,    TOADS_LEGS,        34, 80)
-PRAYER_POT           = append_finished_potion(139,  UNF_RANARR,      SNAPE_GRASS,       38, 87.5)
-SUPER_ATTACK_POT     = append_finished_potion(145,  UNF_IRIT,        EYE_NEWT,          45, 100)
-SUPER_ANTIPOISON_POT = append_finished_potion(181,  UNF_IRIT,        UNICORN_HORN_DUST, 48, 106.3)
-FISHING_POT          = append_finished_potion(151,  UNF_AVANTOE,     SNAPE_GRASS,       50, 112.5)
-SUPER_ENERGY_POT     = append_finished_potion(3018, UNF_AVANTOE,     MORT_MYRE_FUNGI,   52, 117.5)
-SUPER_STRENGTH_POT   = append_finished_potion(157,  UNF_KWUARM,      LIMPWURT_ROOT,     55, 125)
-WEAPON_POISON        = append_finished_potion(187,  UNF_KWUARM,      DRAGON_SCALE_DUST, 60, 137.5)
-SUPER_RESTORE_POT    = append_finished_potion(3026, UNF_SNAPDRAGON,  RED_SPIDERS_EGGS,  63, 142.5)
-SUPER_DEFENCE_POT    = append_finished_potion(163,  UNF_CADANTINE,   WHITE_BERRIES,     66, 150)
-ANTIFIRE_POT         = append_finished_potion(2428, UNF_LANTADYME,   DRAGON_SCALE_DUST, 69, 157.5)
-RANGING_POT          = append_finished_potion(169,  UNF_DWARF_WEED,  WINE_ZAMORAK,      72, 162.5)
-MAGIC_POT            = append_finished_potion(3042, UNF_LANTADYME,   POTATO_CACTUS,     76, 172.5)
-ZAMORAK_BREW         = append_finished_potion(189,  UNF_TORSTOL,     JANGERBERRIES,     78, 175)
+ATTACK_POT           = finished_potion(121,  UNF_GUAM,        EYE_NEWT,          1,  25) # 3
+ANTIPOISON_POT       = finished_potion(175,  UNF_MARRENTILL,  UNICORN_HORN_DUST, 5,  37.5)
+STRENGTH_POT         = finished_potion(115,  UNF_TARROMIN,    LIMPWURT_ROOT,     12, 50)
+RESTORE_POT          = finished_potion(127,  UNF_HARRALANDER, RED_SPIDERS_EGGS,  18, 62.5)
+ENERGY_POT           = finished_potion(3010, UNF_HARRALANDER, CHOCOLATE_DUST,    26, 67.5)
+DEFENCE_POT          = finished_potion(133,  UNF_RANARR,      WHITE_BERRIES,     30, 75)
+AGILITY_POT          = finished_potion(3034, UNF_TOADFLAX,    TOADS_LEGS,        34, 80)
+PRAYER_POT           = finished_potion(139,  UNF_RANARR,      SNAPE_GRASS,       38, 87.5)
+SUPER_ATTACK_POT     = finished_potion(145,  UNF_IRIT,        EYE_NEWT,          45, 100)
+SUPER_ANTIPOISON_POT = finished_potion(181,  UNF_IRIT,        UNICORN_HORN_DUST, 48, 106.3)
+FISHING_POT          = finished_potion(151,  UNF_AVANTOE,     SNAPE_GRASS,       50, 112.5)
+SUPER_ENERGY_POT     = finished_potion(3018, UNF_AVANTOE,     MORT_MYRE_FUNGI,   52, 117.5)
+SUPER_STRENGTH_POT   = finished_potion(157,  UNF_KWUARM,      LIMPWURT_ROOT,     55, 125)
+WEAPON_POISON        = finished_potion(187,  UNF_KWUARM,      DRAGON_SCALE_DUST, 60, 137.5)
+SUPER_RESTORE_POT    = finished_potion(3026, UNF_SNAPDRAGON,  RED_SPIDERS_EGGS,  63, 142.5)
+SUPER_DEFENCE_POT    = finished_potion(163,  UNF_CADANTINE,   WHITE_BERRIES,     66, 150)
+ANTIFIRE_POT         = finished_potion(2428, UNF_LANTADYME,   DRAGON_SCALE_DUST, 69, 157.5)
+RANGING_POT          = finished_potion(169,  UNF_DWARF_WEED,  WINE_ZAMORAK,      72, 162.5)
+MAGIC_POT            = finished_potion(3042, UNF_LANTADYME,   POTATO_CACTUS,     76, 172.5)
+ZAMORAK_BREW         = finished_potion(189,  UNF_TORSTOL,     JANGERBERRIES,     78, 175)