From 87131516719c7257d451d17abb67f060f60cdb30 Mon Sep 17 00:00:00 2001
From: Major- <major@emulate.rs>
Date: Thu, 20 Feb 2014 17:41:17 +0000
Subject: [PATCH] Cleanup code.

---
 data/plugins/skill-herblore/herblore.rb   | 11 ++++++-----
 data/plugins/skill-herblore/ingredient.rb | 16 +++++++---------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/data/plugins/skill-herblore/herblore.rb b/data/plugins/skill-herblore/herblore.rb
index 5773c9eb..3c8b2813 100644
--- a/data/plugins/skill-herblore/herblore.rb
+++ b/data/plugins/skill-herblore/herblore.rb
@@ -10,10 +10,11 @@ HERBLORE_ID = Skill::HERBLORE
 HERBLORE_DIALOGUE = 4429
 
 HERBLORE_ITEM = {}
-HERBLORE_ITEM_ITEM = {}
+HERBLORE_ITEM_ON_ITEM = {}
 
 DRINK_ITEM = {}
 
+
 # A module which describes an invocable method of the Herblore skill.
 module HerbloreMethod
   def self.new
@@ -29,12 +30,12 @@ end
 on :event, :item_on_item do |ctx, player, event|
   primary = event.id
   secondary = event.target_id
-  hash = HERBLORE_ITEM_ITEM[primary]
+  hash = HERBLORE_ITEM_ON_ITEM[primary]
 
   if hash == nil
     secondary = event.id
     primary = event.target_id
-    hash = HERBLORE_ITEM_ITEM[primary]
+    hash = HERBLORE_ITEM_ON_ITEM[primary]
   end
 
   if hash != nil
@@ -70,11 +71,11 @@ def append_herblore_item(method, key, secondary = -1)
   if secondary == -1
     HERBLORE_ITEM[key] = method
   else
-    hash = HERBLORE_ITEM_ITEM[key]
+    hash = HERBLORE_ITEM_ON_ITEM[key]
     hash = {} if hash == nil
 
     hash[secondary] = method
-    HERBLORE_ITEM_ITEM[key] = hash
+    HERBLORE_ITEM_ON_ITEM[key] = hash
   end
 end
 
diff --git a/data/plugins/skill-herblore/ingredient.rb b/data/plugins/skill-herblore/ingredient.rb
index 9b7ada72..19786889 100644
--- a/data/plugins/skill-herblore/ingredient.rb
+++ b/data/plugins/skill-herblore/ingredient.rb
@@ -88,9 +88,7 @@ class GrindingDialogueListener < DialogueAdapter
   # Called when a button has been clicked whilst the dialogue was opened.
   def buttonClicked(button)
     amount = get_amount(button)
-    if amount == 0
-      return false
-    end
+    return false if amount == 0
 
     interfaces = @player.interface_set
     interfaces.close
@@ -226,7 +224,7 @@ class GrindingAction < Action
 end
 
 # Appends a grinded ingredient to the ItemOnItemEvent handler interception.
-def append_grinded(id, raw)
+def append_ground(id, raw)
   grinded = GroundIngredient.new(id, raw)
   append_herblore_item(grinded, PESTLE_MORTAR, raw)
   return grinded
@@ -251,8 +249,8 @@ YEW_ROOTS          = Ingredient.new(6049)
 MAGIC_ROOTS        = Ingredient.new(6051)
 
 # Grinded ingredients
-UNICORN_HORN_DUST = append_grinded(235,  237)
-DRAGON_SCALE_DUST = append_grinded(241,  243)
-CHOCOLATE_DUST    = append_grinded(1975, 1973)
-CRUSHED_NEST      = append_grinded(6693, 5075)
-GROUND_MUD_RUNE   = append_grinded(9594, 4698)
\ No newline at end of file
+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)
+GROUND_MUD_RUNE   = append_ground(9594, 4698)
\ No newline at end of file