Olib 0.1.2 → 2.0.0.pre.rc.1

data/lib/Olib/dictionary/dictionary.rb

@@ -1,168 +1,168 @@
 require "ostruct"
 
-module Olib
-  class Dictionary < OpenStruct
-    def Dictionary.heirloom
-      re = {}
-      re[:is]   = /are the initials ([A-Z]{2})./
-      re[:give] = /Excellent.  I'm sure the person who lost this will be quite happy/
-      re
-    end
 
-    def Dictionary.tag
-      /<a exist="(?<id>.*?)" noun="(?<noun>.*?)">(?<name>.*?)<\/a>/
-    end
+class Dictionary < OpenStruct
+  def Dictionary.heirloom
+    re = {}
+    re[:is]   = /are the initials ([A-Z]{2})./
+    re[:give] = /Excellent.  I'm sure the person who lost this will be quite happy/
+    re
+  end
 
-    def Dictionary.contents
-      /(On|In) the (.*?) you see (?<items>.*)/
-    end
+  def Dictionary.tag
+    /<a exist="(?<id>.*?)" noun="(?<noun>.*?)">(?<name>.*?)<\/a>/
+  end
 
-    def Dictionary.ignorable?(line)
-      line =~ /You feel less drained|You feel at full magical power again|\[LNet\]|GSIV|moving stealthily into the room|glides into view|soars out of sight|You notice (.*?) moving stealthily out|[A-Z][a-z]+ says, "|(removes|put) a (.*?) from in (his|her)|just opened (a|an)|just went|You gesture|Your spell is ready|just bit the dust|joins the adventure|just arrived|returns home from a hard day of adventuring|no longer effective|You sense that your attunement|You do not feel drained anymore|You feel the magic of your spell depart/
-    end
+  def Dictionary.contents
+    /(On|In) the (.*?) you see (?<items>.*)/
+  end
 
-    def Dictionary.targetable
-      re = {}
-      re[:yes] = /^You are now targeting/
-      re[:no]  = /^You can't target/
-      re
-    end
-    def Dictionary.bounty
-      re = {}
-      re[:herb]             = /requires (?:a|an|some) ([a-zA-Z '-]+) found (?:in|on|around) ([a-zA-Z '-]+).  These samples must be in pristine condition.  You have been tasked to retrieve ([0-9]+)/
-      re[:escort]           = /Go to the (.*?) and WAIT for (?:him|her|them) to meet you there.  You must guarantee (?:his|her|their) safety to ([a-zA-Z '-]+) as soon as/
-      re[:gem]              = /has received orders from multiple customers requesting (?:a|an|some) ([a-zA-Z '-]+).  You have been tasked to retrieve ([0-9]+)/
-      re[:heirloom]         = /You have been tasked to recover ([a-zA-Z '-]+) that an unfortunate citizen lost after being attacked by (a|an|some) ([a-zA-Z '-]+) (in|on|around|near|by) ([a-zA-Z '-]+)./
-      re[:heirloom_found]   = /^You have located the heirloom and should bring it back to/
-      re[:turn_in]          = /You have succeeded in your task and can return to the Adventurer's Guild to receive your reward/
-      re[:guard_turn_in]    = /^You succeeded in your task and should report back to/
-      re[:guard_bounty]     = /Go report to ([a-zA-Z ]+) to find out more/
-      re[:cull]             = /^You have been tasked to suppress (^((?!bandit).)*$) activity (?:in|on) (?:the )? (.*?)(?: near| between| under|\.) ([a-zA-Z' ]+).  You need to kill ([0-9]+)/
-      re[:bandits]          = /^You have been tasked to suppress bandit activity (?:in |on )(?:the )(.*?)(?: near| between| under) ([a-zA-Z' ]+).  You need to kill ([0-9]+)/
-      re[:dangerous]        = /You have been tasked to hunt down and kill a particularly dangerous (.*) that has established a territory (?:in|on) (?:the )?(.*?)(?: near| between| under|\.)/
-      re[:get_skin_bounty]  = /The local furrier/
-      re[:get_herb_bounty]  = /local herbalist|local healer|local alchemist/
-      re[:get_gem_bounty]   = /The local gem dealer, ([a-zA-Z ]+), has an order to fill and wants our help/
-      re[:creature_problem] = /It appears they have a creature problem they\'d like you to solve/
-      re[:rescue]           = /A local divinist has had visions of the child fleeing from (?:a|an) (.*) (?:in|on) (?:the )?(.*?)(?: near| between| under|\.)/
+  def Dictionary.ignorable?(line)
+    line =~ /You feel less drained|You feel at full magical power again|\[LNet\]|GSIV|moving stealthily into the room|glides into view|soars out of sight|You notice (.*?) moving stealthily out|[A-Z][a-z]+ says, "|(removes|put) a (.*?) from in (his|her)|just opened (a|an)|just went|You gesture|Your spell is ready|just bit the dust|joins the adventure|just arrived|returns home from a hard day of adventuring|no longer effective|You sense that your attunement|You do not feel drained anymore|You feel the magic of your spell depart/
+  end
 
-      re[:failed_bounty]    = /You have failed in your task/
-      re[:get_bounty]       = /You are not currently assigned a task/
-     
-    end
-    def Dictionary.bandit_traps
-      re = {}
-      re[:net]     = /Suddenly, a carefully concealed net springs up from the ground, completely entangling you/
-      re[:jaws]    = /large pair of carefully concealed metal jaws slam shut on your/
-      re[:wire]    = /stumbled right into a length of nearly invisible razor wire/
-      re[:pouch]   = /of air as you realize you've just stepped on a carefully concealed inflated pouch/
-      re[:rope]    = /wrapping around your ankle and tossing you up into the air/
-      re[:spikes]  = /from under you as you fall into a shallow pit filled with tiny spikes/
-      re[:net]     = /completely entangling you/
-      re[:net_end] = /The net entangling you rips and falls apart/
-      re[:hidden]  = /You hear a voice shout|leaps|flies from the shadows toward you/
-      re[:fail]    = /You spy/
-      re[:statue]  = /A faint silvery light flickers from the shadows/
-      re
-    end
+  def Dictionary.targetable
+    re = {}
+    re[:yes] = /^You are now targeting/
+    re[:no]  = /^You can't target/
+    re
+  end
+  
+  def Dictionary.bounty
+    re = {}
+    re[:herb]             = /requires (?:a|an|some) ([a-zA-Z '-]+) found (?:in|on|around) ([a-zA-Z '-]+).  These samples must be in pristine condition.  You have been tasked to retrieve ([0-9]+)/
+    re[:escort]           = /Go to the (.*?) and WAIT for (?:him|her|them) to meet you there.  You must guarantee (?:his|her|their) safety to ([a-zA-Z '-]+) as soon as/
+    re[:gem]              = /has received orders from multiple customers requesting (?:a|an|some) ([a-zA-Z '-]+).  You have been tasked to retrieve ([0-9]+)/
+    re[:heirloom]         = /You have been tasked to recover ([a-zA-Z '-]+) that an unfortunate citizen lost after being attacked by (a|an|some) ([a-zA-Z '-]+) (in|on|around|near|by) ([a-zA-Z '-]+)./
+    re[:heirloom_found]   = /^You have located the heirloom and should bring it back to/
+    re[:turn_in]          = /You have succeeded in your task and can return to the Adventurer's Guild to receive your reward/
+    re[:guard_turn_in]    = /^You succeeded in your task and should report back to/
+    re[:guard_bounty]     = /Go report to ([a-zA-Z ]+) to find out more/
+    re[:cull]             = /^You have been tasked to suppress (^((?!bandit).)*$) activity (?:in|on) (?:the )? (.*?)(?: near| between| under|\.) ([a-zA-Z' ]+).  You need to kill ([0-9]+)/
+    re[:bandits]          = /^You have been tasked to suppress bandit activity (?:in |on )(?:the )(.*?)(?: near| between| under) ([a-zA-Z' ]+).  You need to kill ([0-9]+)/
+    re[:dangerous]        = /You have been tasked to hunt down and kill a particularly dangerous (.*) that has established a territory (?:in|on) (?:the )?(.*?)(?: near| between| under|\.)/
+    re[:get_skin_bounty]  = /The local furrier/
+    re[:get_herb_bounty]  = /local herbalist|local healer|local alchemist/
+    re[:get_gem_bounty]   = /The local gem dealer, ([a-zA-Z ]+), has an order to fill and wants our help/
+    re[:creature_problem] = /It appears they have a creature problem they\'d like you to solve/
+    re[:rescue]           = /A local divinist has had visions of the child fleeing from (?:a|an) (.*) (?:in|on) (?:the )?(.*?)(?: near| between| under|\.)/
+
+    re[:failed_bounty]    = /You have failed in your task/
+    re[:get_bounty]       = /You are not currently assigned a task/
     
-    def Dictionary.shop
-      db = {}
-      db[:success]            = /^You hand over|You place your/
-      db[:failure]            = {}
-      db[:failure][:missing]  = /^There is nobody here to buy anything from/
-      db[:failure][:silvers]  = /^The merchant frowns and says/
-      db[:failure][:full]     = /^There's no more room for anything else/
-      db[:failure][:own]      = /^Buy your own merchandise?/
-      db
-    end
-    def Dictionary.gems
-      re                         = {}
-      # Expressions to match interaction with gems
-      re[:appraise]              = {}
-      re[:appraise][:gemshop]    = /inspects it carefully before saying, "I'll give you ([0-9]+) for it if you want to sell/
-      re[:appraise][:player]     = /You estimate that the ([a-zA-Z '-]+) is of ([a-zA-Z '-]+) quality and worth approximately ([0-9]+) silvers/
-      re[:appraise][:failure]    = /As best you can tell, the ([a-zA-Z '-]+) is of average quality/
-      re[:singularize]           = Proc.new do |str| 
-        str.gsub(/ies$/, 'y').gsub(/zes$/,'z').gsub(/s$/,'').gsub(/large |medium |containing |small |tiny |some /, '').strip 
-      end
-      re
-    end
+  end
+  def Dictionary.bandit_traps
+    re = {}
+    re[:net]     = /Suddenly, a carefully concealed net springs up from the ground, completely entangling you/
+    re[:jaws]    = /large pair of carefully concealed metal jaws slam shut on your/
+    re[:wire]    = /stumbled right into a length of nearly invisible razor wire/
+    re[:pouch]   = /of air as you realize you've just stepped on a carefully concealed inflated pouch/
+    re[:rope]    = /wrapping around your ankle and tossing you up into the air/
+    re[:spikes]  = /from under you as you fall into a shallow pit filled with tiny spikes/
+    re[:net]     = /completely entangling you/
+    re[:net_end] = /The net entangling you rips and falls apart/
+    re[:hidden]  = /You hear a voice shout|leaps|flies from the shadows toward you/
+    re[:fail]    = /You spy/
+    re[:statue]  = /A faint silvery light flickers from the shadows/
+    re
+  end
   
-    def Dictionary.get
-      re = {}
-      re[:failure] = {}
-      # Expressions to match `get` verb results
-      re[:failure][:weight]       = /You are unable to handle the additional load/
-      re[:failure][:hands_full]   = /^You need a free hand to pick that up/
-      re[:failure][:ne]           = /^Get what/
-      re[:failure][:buy]          = /(is|for|be) (?<cost>[0-9]+) (silvers|coins)/
-      re[:failure][:race]         = /be (?<cost>[0-9]+) (silvers|coins) for someone like you/
-      re[:failure][:pshop]        = /^Looking closely/
-      re[:success]                = /^You carefully|^You unsheathe|^You shield|^You discreetly|^You gather|^You pick up|^You remove|^You rummage|^You draw|^You grab|^You reach|^You already|^You gather/
-      re
-    end
+  def Dictionary.shop
+    db = {}
+    db[:success]            = /^You hand over|You place your/
+    db[:failure]            = {}
+    db[:failure][:missing]  = /^There is nobody here to buy anything from/
+    db[:failure][:silvers]  = /^The merchant frowns and says/
+    db[:failure][:full]     = /^There's no more room for anything else/
+    db[:failure][:own]      = /^Buy your own merchandise?/
+    db
+  end
+  def Dictionary.gems
+    re                         = {}
+    # Expressions to match interaction with gems
+    re[:appraise]              = {}
+    re[:appraise][:gemshop]    = /inspects it carefully before saying, "I'll give you ([0-9]+) for it if you want to sell/
+    re[:appraise][:player]     = /You estimate that the ([a-zA-Z '-]+) is of ([a-zA-Z '-]+) quality and worth approximately ([0-9]+) silvers/
+    re[:appraise][:failure]    = /As best you can tell, the ([a-zA-Z '-]+) is of average quality/
+    re[:singularize]           = Proc.new do |str| 
+      str.gsub(/ies$/, 'y').gsub(/zes$/,'z').gsub(/s$/,'').gsub(/large |medium |containing |small |tiny |some /, '').strip 
+    end
+    re
+  end
+
+  def Dictionary.get
+    re = {}
+    re[:failure] = {}
+    # Expressions to match `get` verb results
+    re[:failure][:weight]       = /You are unable to handle the additional load/
+    re[:failure][:hands_full]   = /^You need a free hand to pick that up/
+    re[:failure][:ne]           = /^Get what/
+    re[:failure][:buy]          = /(is|for|be) (?<cost>[0-9]+) (silvers|coins)/
+    re[:failure][:race]         = /be (?<cost>[0-9]+) (silvers|coins) for someone like you/
+    re[:failure][:pshop]        = /^Looking closely/
+    re[:success]                = /^You carefully|^You unsheathe|^You shield|^You discreetly|^You gather|^You pick up|^You remove|^You rummage|^You draw|^You grab|^You reach|^You already|^You gather/
+    re
+  end
+
+  def Dictionary.put
+    re = {}
+    re[:failure]        = {}    
+    re[:failure][:full] = /^won't fit in the|is full!|filling it./
+    re[:failure][:ne]   = /^I could not find what you were referring to/
+    re[:success]        = /^Your bundle|^You attempt to shield|^As you place|^You wipe off the blade|^You discreetly|^You toss|^You carefully|^You give|^You untie your|^You put|^You absent|^You tuck|^You sheathe|^You slip|^You roll up|^You tuck|^You add|^You place/
+    re
+  end
   
-    def Dictionary.put
-      re = {}
-      re[:failure]        = {}    
-      re[:failure][:full] = /^won't fit in the|is full!|filling it./
-      re[:failure][:ne]   = /^I could not find what you were referring to/
-      re[:success]        = /^Your bundle|^You attempt to shield|^As you place|^You wipe off the blade|^You discreetly|^You toss|^You carefully|^You give|^You untie your|^You put|^You absent|^You tuck|^You sheathe|^You slip|^You roll up|^You tuck|^You add|^You place/
-      re
-    end
-    
-    def Dictionary.jar(name=nil)
-      if name
-        return name.gsub(/large |medium |containing |small |tiny |some /, '').sub 'rubies', 'ruby'
-      else
-        return false
-      end
+  def Dictionary.jar(name=nil)
+    if name
+      return name.gsub(/large |medium |containing |small |tiny |some /, '').sub 'rubies', 'ruby'
+    else
+      return false
     end
+  end
 
-    def Dictionary.armors
-      armors                           = Hash.new
-      armors['robes']                  = /cloth armor/i
-      armors['light leather']          = /soft leather armor that covers the torso only./i
-      armors['full leather']           = /soft leather armor that covers the torso and arms./i 
-      armors['reinforced leather']     = /soft leather armor that covers the torso, arms, and legs./i 
-      armors['double leather']         = /soft leather armor that covers the torso, arms, legs, neck, and head./i
-      armors['leather breastplate']    = /rigid leather armor that covers the torso only./i
-      armors['cuirbouilli leather']    = /rigid leather armor that covers the torso and arms./i
-      armors['studded leather']        = /rigid leather armor that covers the torso, arms, and legs./i
-      armors['brigadine armor']        = /rigid leather armor that covers the torso, arms, legs, neck, and head./i
-      armors['chain mail']             = /chain armor that covers the torso only./i
-      armors['double chain']           = /chain armor that covers the torso and arms./i
-      armors['augmented chain']        = /chain armor that covers the torso, arms, and legs./i
-      armors['chain hauberk']          = /chain armor that covers the torso, arms, legs, neck, and head./i
-      armors['metal breastplate']      = /plate armor that covers the torso only./i
-      armors['augmented plate']        = /plate armor that covers the torso and arms./i
-      armors['half plate']             = /plate armor that covers the torso, arms, and legs./i
-      armors['full plate']             = /plate armor that covers the torso, arms, legs, neck, and head./i
-      armors['DB']                     = /miscellaneous armor that protects the wearer in general/
-      armors
-    end
+  def Dictionary.armors
+    armors                           = Hash.new
+    armors['robes']                  = /cloth armor/i
+    armors['light leather']          = /soft leather armor that covers the torso only./i
+    armors['full leather']           = /soft leather armor that covers the torso and arms./i 
+    armors['reinforced leather']     = /soft leather armor that covers the torso, arms, and legs./i 
+    armors['double leather']         = /soft leather armor that covers the torso, arms, legs, neck, and head./i
+    armors['leather breastplate']    = /rigid leather armor that covers the torso only./i
+    armors['cuirbouilli leather']    = /rigid leather armor that covers the torso and arms./i
+    armors['studded leather']        = /rigid leather armor that covers the torso, arms, and legs./i
+    armors['brigadine armor']        = /rigid leather armor that covers the torso, arms, legs, neck, and head./i
+    armors['chain mail']             = /chain armor that covers the torso only./i
+    armors['double chain']           = /chain armor that covers the torso and arms./i
+    armors['augmented chain']        = /chain armor that covers the torso, arms, and legs./i
+    armors['chain hauberk']          = /chain armor that covers the torso, arms, legs, neck, and head./i
+    armors['metal breastplate']      = /plate armor that covers the torso only./i
+    armors['augmented plate']        = /plate armor that covers the torso and arms./i
+    armors['half plate']             = /plate armor that covers the torso, arms, and legs./i
+    armors['full plate']             = /plate armor that covers the torso, arms, legs, neck, and head./i
+    armors['DB']                     = /miscellaneous armor that protects the wearer in general/
+    armors
+  end
 
-    def Dictionary.size
-      /that it is a (?<size>.*) shield that protects/
-    end
+  def Dictionary.size
+    /that it is a (?<size>.*) shield that protects/
+  end
 
-    def Dictionary.numbers
-      numbers                          = Hash.new
-      numbers['one']                   = 1
-      numbers['two']                   = 2
-      numbers['three']                 = 3
-      numbers['four']                  = 4
-      numbers['five']                  = 5
-      numbers
-    end
+  def Dictionary.numbers
+    numbers                          = Hash.new
+    numbers['one']                   = 1
+    numbers['two']                   = 2
+    numbers['three']                 = 3
+    numbers['four']                  = 4
+    numbers['five']                  = 5
+    numbers
+  end
 
-    def Dictionary.spiked
-      /You also notice that it is spiked./i
-    end
+  def Dictionary.spiked
+    /You also notice that it is spiked./i
+  end
 
-    def Dictionary.fusion
-      /(?<orbs>.*?) spherical depressions adorn the (.*?), approximately the size and shape of a small gem/
-    end
+  def Dictionary.fusion
+    /(?<orbs>.*?) spherical depressions adorn the (.*?), approximately the size and shape of a small gem/
   end
 end

data/lib/Olib/ext/hash.rb

@@ -0,0 +1,7 @@
+require "ostruct"
+
+class Hash
+  def to_struct
+    OpenStruct.new self
+  end
+end

data/lib/Olib/ext/matchdata.rb

@@ -0,0 +1,14 @@
+require "ostruct"
+require "Olib/ext/string"
+
+class MatchData
+  def to_struct
+    OpenStruct.new to_hash
+  end
+
+  def to_h
+    Hash[self.names.map(&:to_sym).zip(self.captures.map(&:strip).map do |capture|  
+      if capture.is_i? then capture.to_i else capture end
+    end)]
+  end
+end

data/lib/Olib/ext/string.rb

@@ -0,0 +1,9 @@
+class String
+  def is_i?
+    !!(self =~ /\A[-+]?[0-9]+\z/)
+  end
+
+  def methodize
+    self.downcase.strip.gsub(/-|\s+|'|"/, "_").to_sym
+  end
+end

data/lib/Olib/ext/symbol.rb

@@ -0,0 +1,13 @@
+class Symbol
+  def to_game
+    self.to_s.gsub("_", " ")
+  end
+
+  def ok?
+    self.eql?(:ok)
+  end
+
+  def err?
+    self.eql?(:err)
+  end
+end

data/lib/Olib/go2.rb

@@ -1,3 +1,5 @@
+require "Olib/ext/string"
+
 class Integer
   def go2
     Go2.room self
@@ -10,127 +12,61 @@ class String
   end  
 end
 
-module Olib
+class Go2
   ##
-  ## @brief      ;go2 wrapper class
+  ## @brief      returns the filtered relevant Map db tags
   ##
-  class Go2 
-    @@teleporter = {}
-    @@routines   = {}
-    ##
-    ## @brief      returns the filtered relevant Map db tags
-    ##
-    ## @return     Array
-    ##
-    def Go2.tags
-      Map.tags
-        .select { |tag| !tag.include? "=" }
-    end
-
-    ##
-    ## dynamically assign all of our Go2#methods
-    ##
-    Go2.tags.each { |tag|
-      method  = Olib.methodize tag
-      
-      Go2.define_singleton_method(method.to_sym) do
-        Go2.room tag
-      end
-    }
+  ## @return     Array
+  ##
+  def Go2.tags
+    Map.tags.select { |tag| !tag.include? "=" }
+  end
 
-    def Go2.room(roomid)
-      unless Room.current.id == roomid || Room.current.tags.include?(roomid)
-        Char.unhide if hidden
-        start_script "go2", [roomid, "_disable_confirm_"]
-        wait_while { running? "go2" };
-      end
-      Go2
-    end
+  ##
+  ## dynamically assign all of our Go2#methods
+  ##
+  Go2.tags.each do |tag|    
+    Go2.define_singleton_method(tag.methodize) do Go2.room(tag) end
+  end
 
-    def Go2.origin
-      Go2.room @@origin[:roomid]
-      Char.hide if @@origin[:hidden]
-      Go2
+  def Go2.room(roomid)
+    unless Room.current.id == roomid || Room.current.tags.include?(roomid)
+      Char.unhide if hidden
+      start_script "go2", [roomid, "_disable_confirm_"]
+      wait_while { running? "go2" };
     end
+    Go2
+  end
 
-    def Go2.fwi
-      unless Char.fwi_teleporter
-        echo "Error: No teleport defined ;var set teleporter=<teleporter>"
-        exit
-      end
-      
-      unless Inventory.fwi_teleporter
-        echo "Error: Your teleporter could not be found #{Go2.teleporter}"
-        exit
-      end
-
-      last = Room.current.id
-      teleporter = Inventory.fwi_teleporter
-      if teleporter.worn?
-        teleporter.turn
-      else
-        teleporter.take.turn.stash
-      end
-
-      if Room.current.id == last
-        echo "Error: You tried to teleport to FWI in a room that does not allow that"
-      end
-
-      Go2
-    end
-  
-    def Go2.rebase
-      @@origin            = {}
-      @@origin[:roomid]   = Room.current.id
-      @@origin[:hidden]   = hiding?
-      @@origin[:location] = Room.current.location
-      Olib.debug "rebasing to #{@@origin}"
-      Go2
-    end
+  def Go2.origin
+    Go2.room @@origin[:roomid]
+    Char.hide if @@origin[:hidden]
+    Go2
+  end
 
-    Go2.rebase
+  def Go2.rebase
+    @@origin            = {}
+    @@origin[:roomid]   = Room.current.id
+    @@origin[:hidden]   = hiding?
+    @@origin[:location] = Room.current.location
+    Go2
+  end
 
-    # Thanks Tillmen
-    def Go2.cost(to)
-      cost = 0
-      Map.findpath(Room.current.id, to).each { |id|
-        Room[id].tags.each { |tag|          
-          if tag =~ /^silver-cost:#{id-1}:(.*)$/
-            cost_string = $1
-            if cost_string =~ /^[0-9]+$/
-              cost += cost_string.to_i
-            else
-              cost = StringProc.new(cost_string).call.to_i
-            end
+  # Thanks Tillmen
+  def Go2.cost(to)
+    cost = 0
+    Map.findpath(Room.current.id, to).each { |id|
+      Room[id].tags.each { |tag|          
+        if tag =~ /^silver-cost:#{id-1}:(.*)$/
+          cost_string = $1
+          if cost_string =~ /^[0-9]+$/
+            cost += cost_string.to_i
+          else
+            cost = StringProc.new(cost_string).call.to_i
           end
-        }
+        end
       }
-      cost
-    end
-
-    # use the teleporter variable to locate your teleporter and teleport
-    # naive of where you are
-    def Go2.fwi_teleport
-      Go2.fwi
-    end
-
-    # TODO
-    # create a dictionary of house lockers and the logic to enter a locker
-    # insure locker is closed before scripting away from it
-    def Go2.locker
-      echo "the go2_locker method currently does not function properly..."
-      self
-    end
-  
-
-  end
-
-  def Olib.Go2
-    Olib::Go2
+    }
+    cost
   end
-
-end
-
-class Go2 < Olib::Go2
-  # expose on the global scope
 end