Olib 0.1.0 → 0.1.1

data/lib/Olib/core/use.rb

@@ -0,0 +1,39 @@
+class Use
+  
+  attr_accessor :item
+  
+  def initialize(item, &block)
+    @item = item
+    both(&block) if block
+  end
+
+  def run(&block)
+    Try.new do
+      yield @item
+    end
+    @item.container.add(@item)
+  end
+
+  def left(&block)
+    empty_left_hand
+    @item.take
+    Char.swap if Char.right.id == @item.id
+    run &block
+    fill_left_hand
+  end
+
+  def right(&block)
+    empty_right_hand
+    @item.take
+    run &block
+    fill_right_hand
+  end
+
+  def both(&block)
+    empty_hands
+    @item.take
+    run &block
+    fill_hands
+  end
+
+end

data/lib/Olib/dictionary/dictionary.rb

@@ -1,6 +1,7 @@
-module Olib
+require "ostruct"
 
-  class Dictionary
+module Olib
+  class Dictionary < OpenStruct
     def Dictionary.heirloom
       re = {}
       re[:is]   = /are the initials ([A-Z]{2})./
@@ -82,7 +83,9 @@ module Olib
       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{ |str| str.gsub(/ies$/, 'y').gsub(/zes$/,'z').gsub(/s$/,'').gsub(/large |medium |containing |small |tiny |some /, '').strip }
+      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
   
@@ -96,7 +99,7 @@ module Olib
       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 pick up|^You remove|^You rummage|^You draw|^You grab|^You reach|^You already/
+      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
   
@@ -105,7 +108,7 @@ module Olib
       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]        = /^You put|^You tuck|^You sheathe|^You slip|^You roll up|^You tuck|^You add|^You place/
+      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
     
@@ -161,6 +164,5 @@ module Olib
     def Dictionary.fusion
       /(?<orbs>.*?) spherical depressions adorn the (.*?), approximately the size and shape of a small gem/
     end
-
   end
 end

data/lib/Olib/go2.rb

@@ -1,3 +1,15 @@
+class Integer
+  def go2
+    Go2.room self
+  end  
+end
+
+class String
+  def go2
+    Go2.room self
+  end  
+end
+
 module Olib
   ##
   ## @brief      ;go2 wrapper class
@@ -18,38 +30,26 @@ module Olib
     ##
     ## dynamically assign all of our Go2#methods
     ##
-    Go2.tags
-      .each { |tag|
-        method  = Olib.methodize tag
-        go2_dep = "go2_#{method}"
-        
-        Go2.define_singleton_method(method.to_sym) do
-          Go2.room tag
-        end
-
-        Go2.define_singleton_method(go2_dep.to_sym) do
-          respond "[deprecation warning] Go2.#{go2_dep} => Go2.#{method}"
-          Go2.room tag
-        end
-      }
+    Go2.tags.each { |tag|
+      method  = Olib.methodize tag
+      
+      Go2.define_singleton_method(method.to_sym) do
+        Go2.room tag
+      end
+    }
 
     def Go2.room(roomid)
-      Olib.Char.unhide if hidden
-      unless Room.current.id == 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.go2(roomid)
-      respond "[deprecation warning] Go2.go2 => Go2.room"
-      Go2.room(roomid)
-    end
-
     def Go2.origin
       Go2.room @@origin[:roomid]
-      Olib.Char.hide if @@origin[:hidden]
+      Char.hide if @@origin[:hidden]
       Go2
     end
 
@@ -111,7 +111,6 @@ module Olib
     # use the teleporter variable to locate your teleporter and teleport
     # naive of where you are
     def Go2.fwi_teleport
-      respond "[deprecation warning] Go2.fwi_teleport => Go2.fwi"
       Go2.fwi
     end
 
@@ -122,16 +121,7 @@ module Olib
       echo "the go2_locker method currently does not function properly..."
       self
     end
-    ##
-    ## @brief      returns to the rebased room
-    ## @deprecated
-    ##
-    ## @return     Go2
-    ##
-    def Go2.go2_origin
-      respond "[deprecation warning] Go2.go2_origin => Go2.origin"
-      Go2.fwi
-    end    
+  
 
   end
 
@@ -139,11 +129,6 @@ module Olib
     Olib::Go2
   end
 
-  class Transport < Go2
-    respond "[deprecation warning] Olib::Transport => Olib::Go2 on next major release"
-    # backwards compat
-  end
-
 end
 
 class Go2 < Olib::Go2

data/lib/Olib/interface/queryable.rb

@@ -0,0 +1,50 @@
+module Interface
+  class Queryable
+    def self.fetch
+      []
+    end
+
+    def self.each(&block)
+      fetch.each &block
+    end
+
+    def self.map(&block)
+      fetch.map &block
+    end
+
+    def self.find(&block)
+      fetch.find &block
+    end
+
+    def self.sort(&block)
+      fetch.sort &block
+    end
+
+    def self.select(&block)
+      fetch.select &block
+    end
+
+    def self.reject(&block)
+      fetch.reject &block
+    end
+
+    def self.where(**conds)
+    end
+
+    def self.first
+      fetch.first
+    end
+
+    def self.sample(n = 1)
+      fetch.sample n
+    end
+
+    def self.empty?
+      (fetch || []).empty?
+    end
+
+    def self.size
+      fetch.size
+    end
+  end
+end

data/lib/Olib/objects/box.rb

@@ -1,4 +1,3 @@
-module Olib
-  class Box < Item
-  end
+
+class Box < Olib::Item
 end

data/lib/Olib/objects/clothing.rb

@@ -1,4 +1,2 @@
-module Olib
-  class Clothing < Item
-  end
+class Clothing < Olib::Item
 end

data/lib/Olib/objects/herb.rb

@@ -1,4 +1,2 @@
-module Olib
-  class Herb < Item
-  end
-end
+class Herb < Olib::Item
+end

data/lib/Olib/objects/jewel.rb

@@ -1,35 +1,32 @@
 # Class to interact with gems
 # overwriting Gem is a bad idea
-module Olib
-  class Jewel < Item
-    attr_accessor :quality, :value
-    
-    def appraise
-      result = dothistimeout "appraise ##{@id}", 3, /#{Gemstone_Regex.gems[:appraise].values.join('|')}/
-      case result
-        when Gemstone_Regex.gems[:appraise][:gemshop]
-          # handle gemshop appraisal
-          @value = $1
-        when Gemstone_Regex.gems[:appraise][:player]
-          @value = $3
-          @quality = $2
-        when Gemstone_Regex.gems[:appraise][:failure]
-          waitrt?
-          self.appraise
-        else
-          respond result
-          Client.notify "Error during gem appraisal"
-      end
+class Jewel < Olib::Item
+  attr_accessor :quality, :value
+  
+  def appraise
+    result = dothistimeout "appraise ##{@id}", 3, /#{Olib::Dictionary.gems[:appraise].values.join('|')}/
+    case result
+      when Olib::Dictionary.gems[:appraise][:gemshop]
+        # handle gemshop appraisal
+        @value = $1.to_i
+      when Olib::Dictionary.gems[:appraise][:player]
+        @value = $3.to_i
+        @quality = $2
+      when Olib::Dictionary.gems[:appraise][:failure]
+        waitrt?
+        self.appraise
+      else
+        respond result
+        Client.notify "Error during gem appraisal"
     end
+  end
 
-    def normalized_name
-      Gemstone_Regex.gems[:singularize].call(@name)
-    end
-    
-    def sell
-      result = take
-      fput "sell ##{@id}" if result =~ Gemstone_Regex.get[:success]
-    end
+  def normalized_name
+    Olib::Dictionary.gems[:singularize].call(@name)
+  end
   
+  def sell
+    result = take
+    fput "sell ##{@id}" if result =~ Olib::Dictionary.get[:success]
   end
-end
+end

data/lib/Olib/objects/jewelry.rb

@@ -1,10 +1,10 @@
-module Olib
-  class Jewelry < Item
-    attr_accessor :heirloom
-    def heirloom?
-      result = Library.do "look ##{@id}", /^You see nothing unusual|#{Gemstone_Regex.item[:heirloom]}/
-      @heirloom = result =~ Gemstone_Regex.item[:heirloom] ? true : false
-      @heirloom
-    end
+class Jewelry < Olib::Item
+  HEIRLOOM = /are the initials ([A-Z]{2})./
+
+  attr_accessor :heirloom
+  def heirloom?
+    result = Olib.do "look ##{@id}", /^You see nothing unusual/ | HEIRLOOM
+    @heirloom = result =~ HEIRLOOM ? true : false
+    @heirloom
   end
 end

data/lib/Olib/objects/scroll.rb

@@ -1,72 +1,42 @@
-module Olib
-  class Scroll < Item
-    @@whitelist = [ 
-      101, 102, 103, 107, 116, 120, 
-      202, 211, 215, 219,
-      303, 307, 310, 313, 315,
-      401, 406, 414, 425, 430, 
-      503, 507, 508, 509, 511, 513, 520, 
-      601, 602, 606, 613, 617, 618, 625, 640, 
-      712, 716,
-      905, 911, 913, 920, 
-      1109, 1119, 1125, 1130,
-      1201, 1204,
-      1601, 1603, 1606, 1610, 1611, 1612, 1616,
-      1712, 1718
-    ]
-    attr_accessor :spells, :worthy, :whitelist
-    
-    def Scroll.whitelist
-      @@whitelist
-    end
-
-    def Scroll.add_to_whitelist(*args)
-      @@whitelist + args
-    end
-
-    def Scroll.remove_from_whitelist(*args)
-      @@whitelist = @@whitelist - args
-    end
-
-    def initialize(item)
-      super item
-      @spells = []
-      return self
-    end
+class Scroll < Olib::Item
+  @@whitelist = [ 
+    101, 102, 103, 107, 116, 120, 
+    202, 211, 215, 219,
+    303, 307, 310, 313, 315,
+    401, 406, 414, 425, 430, 
+    503, 507, 508, 509, 511, 513, 520, 
+    601, 602, 606, 613, 617, 618, 625, 640, 
+    712, 716,
+    905, 911, 913, 920, 
+    1109, 1119, 1125, 1130,
+    1201, 1204,
+    1601, 1603, 1606, 1610, 1611, 1612, 1616,
+    1712, 1718
+  ]
+  attr_accessor :spells, :worthy, :whitelist
+  
+  def Scroll.whitelist
+    @@whitelist
+  end
 
-    def worthy?
-      @worthy = false
-      read unless @spells.length > 0
-      @spells.each do |spell| @worthy = true if Scroll.whitelist.include? spell[:n] end
-      @worthy
-    end
+  def Scroll.add_to_whitelist(*args)
+    @@whitelist + args
+  end
 
-    def sell
-      unless self.worthy?
-        result = dothistimeout "get ##{@id}", 1, /^You remove/
-        fput "sell ##{@id}" if result
-      end
-    end
+  def Scroll.remove_from_whitelist(*args)
+    @@whitelist = @@whitelist - args
+  end
 
-    def read
-      dothistimeout "read ##{@id}", 5, /It takes you a moment to focus/
-      result = matchtimeout(5, 'On the')
-      if result
-        begin
-          Timeout::timeout(0.1) do
-            while(get =~ /\(([0-9]+)\) ([a-zA-Z'\s]+)/)
-              spell        = {} 
-              spell[:n]    = $1.to_i
-              spell[:name] = $2.to_s
-              @spells.push spell
-            end 
-          end
-        rescue Timeout::Error
-          # Silent
-        end
-      end
-      self
-    end
+  def initialize(item)
+    super item
+    @spells = []
+    return self
+  end
 
+  def worthy?
+    @worthy = false
+    read unless @spells.length > 0
+    @spells.each do |spell| @worthy = true if Scroll.whitelist.include? spell[:n] end
+    @worthy
   end
-end
+end