Olib 0.0.8 → 0.0.9

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
-  end
+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
+  end
 end

data/lib/Olib/objects/scroll.rb

@@ -1,72 +1,72 @@
-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
-
-    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 sell
-      unless self.worthy?
-        result = dothistimeout "get ##{@id}", 1, /^You remove/
-        fput "sell ##{@id}" if result
-      end
-    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
-
-  end
+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
+
+    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 sell
+      unless self.worthy?
+        result = dothistimeout "get ##{@id}", 1, /^You remove/
+        fput "sell ##{@id}" if result
+      end
+    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
+
+  end
 end

data/lib/Olib/objects/uncommon.rb

@@ -1,4 +1,4 @@
-module Olib
-  class Uncommon < Item
-  end
+module Olib
+  class Uncommon < Item
+  end
 end

data/lib/Olib/objects/unknown.rb

@@ -1,4 +1,4 @@
-module Olib
-  class Unknown < Item
-  end
+module Olib
+  class Unknown < Item
+  end
 end

data/lib/Olib/objects/wand.rb

@@ -1,4 +1,4 @@
-module Olib
-  class Wand < Item
-  end
+module Olib
+  class Wand < Item
+  end
 end

data/lib/Olib/shops.rb

@@ -1,177 +1,177 @@
-module Olib
-  module Shop
-
-    @@containers = []
-
-    def Shop.items
-      Shop.containers.map { |container| container.contents }.flatten
-    end
-
-    def Shop.containers
-      #fput "look"
-      @@containers = [
-        GameObj.loot, 
-        GameObj.room_desc
-      ]
-      .flatten
-      .compact
-      .select     { |container| !(container.name =~ /^([A-z][a-z]+ disk$)/)}
-      .map        { |container| Shop::Container.new(container)  }
-
-      @@containers
-
-    end
-
-    def Shop.cache
-      @@containers
-    end
-
-    class Container < Olib::Gameobj_Extender
-      attr_accessor :show, :nested, :containers, :id, :cache, :props
-
-      def to_s
-        info = {}
-        info[:name]     = @name
-        info[:noun]     = @noun
-        info[:props]    = @props
-        info[:cache]    = @cache
-        info.to_s
-      end
-      
-      def initialize(obj)
-        @cache = Hash.new
-        @props = Hash.new
-        super(obj)
-      end
-
-      def action(verb)
-        "#{verb} ##{@id}"
-      end
-
-      def look
-        self
-      end
-
-      # detect nested containers
-      def at
-        
-        Olib.wrap_stream(action 'look at') { |line|
-          
-          raise Olib::Errors::Mundane if line =~ /You see nothing unusual/
-
-          if line =~ /Looking at the (.*?), you see (?<nested>.*)/
-            @nested     = true
-
-            @containers = line.match(/Looking at the (.*?), you see (?<nested>.*)/)[:nested].scan(/<a exist="(?<id>.*?)" noun="(?<noun>.*?)">(?<name>.*?)<\/a>/).map {|matches| 
-              Container.new GameObj.new *matches
-            }
-            raise Olib::Errors::Prempt
-          end
-          
-        }
-
-        self
-      end
-
-      def nested?
-        @nested || false
-      end
-
-      def in
-        return self unless @id
-        Olib.wrap_stream(action 'look in') { |line|
-          raise Olib::Errors::Mundane if line=~ /^There is nothing in there|^That is closed|filled with a variety of garbage|Total items:/
-          raise Olib::Errors::Prempt  if line =~ /^In the (.*?) you see/
-        }
-        self
-      end
-
-      def on
-        return self unless @id
-        Olib.wrap_stream(action 'look on') { |line|
-          raise Olib::Errors::Mundane if line =~ /^There is nothing on there/
-          raise Olib::Errors::Prempt  if line =~ /^On the (.*?) you see/
-        }
-        self
-      end
-
-      def contents
-        look.in.on unless GameObj[@id].contents
-        GameObj[@id].contents.map {|i| Item.new(i).define('container', @id) }
-      end
-
-      def containers
-        @containers
-      end 
-    end
-    
-    class Playershop
-      @@noncontainers = [ "wall", "ceiling", "permit", "floor", "helmet", "snowshoes",
-                      "candelabrum", "flowerpot", "Hearthstone", "bear", "candelabra",
-                      "sculpture", "anvil", "tapestry", "portrait", "Wehnimer", "spiderweb",
-                      "rug", "fountain", "longsword", "ship", "panel", "painting", "armor",
-                      "flowers", "head", "plate", "vase", "pillows", "mask", "skeleton", "fan",
-                      "flag", "statue", "mat", "plaque", "mandolin", "plant", "sign" ]
-      
-      def Playershop.containers
-        Shop.containers.reject { |container|
-          @@noncontainers.include? container.noun
-        }
-      end
-
-      def Playershop.balance
-        balance = 0
-        Olib.wrap_stream('shop withdraw') { |line|
-          next if line =~ /^Usage: SHOP WITHDRAW <amount>/
-          raise Olib::Errors::Prempt if line =~ /^You must be in your shop to do that.$/
-
-          if line =~ /Your shop's bank account is currently ([\d]+)/
-            balance = $1.to_i
-            raise Olib::Errors::Prempt
-          end
-
-        }
-        return balance
-      end
-
-      def Playershop.where(conditions)        
-        Playershop.items.select { |item|
-          !conditions.keys.map { |key|
-            if conditions[key].class == Array
-              item.props[key].class == Array && !conditions[key].map { |ele| item.props[key].include? ele }.include?(false)
-            else
-              item.props[key] == conditions[key]
-            end
-          }.include?(false)
-        }
-      end
-
-      def Playershop.find_by_tags(*tags)
-        
-        Playershop.items.select { |item|
-          !tags.map {|tag| item.is?(tag) }.include? false
-        }
-      end
-
-      def Playershop.sign
-        Shop.containers.select { |container|
-          container.noun == 'sign'
-        }[0]
-      end
-
-      def Playershop.items
-        Playershop.containers.map { |container|
-          container.contents
-        }.flatten
-      end
-    end
-  end
-
-  def Olib.Playershop
-    Olib::Shop::Playershop
-  end
-
-  def Olib.Shop
-    Olib::Shop
-  end
+module Olib
+  module Shop
+
+    @@containers = []
+
+    def Shop.items
+      Shop.containers.map { |container| container.contents }.flatten
+    end
+
+    def Shop.containers
+      #fput "look"
+      @@containers = [
+        GameObj.loot, 
+        GameObj.room_desc
+      ]
+      .flatten
+      .compact
+      .select     { |container| !(container.name =~ /^([A-z][a-z]+ disk$)/)}
+      .map        { |container| Shop::Container.new(container)  }
+
+      @@containers
+
+    end
+
+    def Shop.cache
+      @@containers
+    end
+
+    class Container < Olib::Gameobj_Extender
+      attr_accessor :show, :nested, :containers, :id, :cache, :props
+
+      def to_s
+        info = {}
+        info[:name]     = @name
+        info[:noun]     = @noun
+        info[:props]    = @props
+        info[:cache]    = @cache
+        info.to_s
+      end
+      
+      def initialize(obj)
+        @cache = Hash.new
+        @props = Hash.new
+        super(obj)
+      end
+
+      def action(verb)
+        "#{verb} ##{@id}"
+      end
+
+      def look
+        self
+      end
+
+      # detect nested containers
+      def at
+        
+        Olib.wrap_stream(action 'look at') { |line|
+          
+          raise Olib::Errors::Mundane if line =~ /You see nothing unusual/
+
+          if line =~ /Looking at the (.*?), you see (?<nested>.*)/
+            @nested     = true
+
+            @containers = line.match(/Looking at the (.*?), you see (?<nested>.*)/)[:nested].scan(/<a exist="(?<id>.*?)" noun="(?<noun>.*?)">(?<name>.*?)<\/a>/).map {|matches| 
+              Container.new GameObj.new *matches
+            }
+            raise Olib::Errors::Prempt
+          end
+          
+        }
+
+        self
+      end
+
+      def nested?
+        @nested || false
+      end
+
+      def in
+        return self unless @id
+        Olib.wrap_stream(action 'look in') { |line|
+          raise Olib::Errors::Mundane if line=~ /^There is nothing in there|^That is closed|filled with a variety of garbage|Total items:/
+          raise Olib::Errors::Prempt  if line =~ /^In the (.*?) you see/
+        }
+        self
+      end
+
+      def on
+        return self unless @id
+        Olib.wrap_stream(action 'look on') { |line|
+          raise Olib::Errors::Mundane if line =~ /^There is nothing on there/
+          raise Olib::Errors::Prempt  if line =~ /^On the (.*?) you see/
+        }
+        self
+      end
+
+      def contents
+        look.in.on unless GameObj[@id].contents
+        GameObj[@id].contents.map {|i| Item.new(i).define('container', @id) }
+      end
+
+      def containers
+        @containers
+      end 
+    end
+    
+    class Playershop
+      @@noncontainers = [ "wall", "ceiling", "permit", "floor", "helmet", "snowshoes",
+                      "candelabrum", "flowerpot", "Hearthstone", "bear", "candelabra",
+                      "sculpture", "anvil", "tapestry", "portrait", "Wehnimer", "spiderweb",
+                      "rug", "fountain", "longsword", "ship", "panel", "painting", "armor",
+                      "flowers", "head", "plate", "vase", "pillows", "mask", "skeleton", "fan",
+                      "flag", "statue", "mat", "plaque", "mandolin", "plant", "sign" ]
+      
+      def Playershop.containers
+        Shop.containers.reject { |container|
+          @@noncontainers.include? container.noun
+        }
+      end
+
+      def Playershop.balance
+        balance = 0
+        Olib.wrap_stream('shop withdraw') { |line|
+          next if line =~ /^Usage: SHOP WITHDRAW <amount>/
+          raise Olib::Errors::Prempt if line =~ /^You must be in your shop to do that.$/
+
+          if line =~ /Your shop's bank account is currently ([\d]+)/
+            balance = $1.to_i
+            raise Olib::Errors::Prempt
+          end
+
+        }
+        return balance
+      end
+
+      def Playershop.where(conditions)        
+        Playershop.items.select { |item|
+          !conditions.keys.map { |key|
+            if conditions[key].class == Array
+              item.props[key].class == Array && !conditions[key].map { |ele| item.props[key].include? ele }.include?(false)
+            else
+              item.props[key] == conditions[key]
+            end
+          }.include?(false)
+        }
+      end
+
+      def Playershop.find_by_tags(*tags)
+        
+        Playershop.items.select { |item|
+          !tags.map {|tag| item.is?(tag) }.include? false
+        }
+      end
+
+      def Playershop.sign
+        Shop.containers.select { |container|
+          container.noun == 'sign'
+        }[0]
+      end
+
+      def Playershop.items
+        Playershop.containers.map { |container|
+          container.contents
+        }.flatten
+      end
+    end
+  end
+
+  def Olib.Playershop
+    Olib::Shop::Playershop
+  end
+
+  def Olib.Shop
+    Olib::Shop
+  end
 end