Olib 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a05957b07155806a7e7734bb11d9c5ee8747b9f
-  data.tar.gz: b67bd020ff43158986fc731be1191a77219c0493
+  metadata.gz: df424880c2b863a92f1f370b6721dda0e54d63b4
+  data.tar.gz: 0b2911f4abf059ca84605d829cf4456d3d189ee7
 SHA512:
-  metadata.gz: 31b56fe1ef2e65c7885154dca6ffe50b86a18c9f29bb80daad5bf483f544ee10e33113b4a69fe66caab8059339faf8306b55b05243021b219dea27f322f66770
-  data.tar.gz: 35cce00b0592507e586b32d0833e2d85476424bd21de07ea63e88769fafc43ee46409195715c464b41fb42847b39699973e42b53930e01d9de29205a2958b616
+  metadata.gz: d6ad45ab88fee2b97934a2035e35b9f8ff37f324e54b943da41df31e5372bebaf508862d8a5cb6cb3b9030a6704d7c4e187bc88dcd5faacfbe3f4f18471c8a17
+  data.tar.gz: bd38704ae30455a17d6284ec88e7c1b7692cfa3f4edaa39af250e97500d7dea915575044c69e044f0d7db4284ef6884d151719d83ab230ff8d9bacf5332e483a

data/Olib.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift lib unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |s|
   s.name          = 'Olib'
-  s.version       = '0.0.5'
+  s.version       = '0.0.6'
   s.date          = '2014-09-12'
   s.summary       = "Useful Lich extensions for Gemstone IV"
   s.description   = "Useful Lich extensions for Gemstone IV including hostile creature management, group management, syntactically pleasing movement, locker management, etc"

data/lib/Olib.rb

@@ -3,17 +3,6 @@ require 'json'
 
 module Olib
 
-  
-  # load core first
-  Dir[File.dirname(__FILE__) + '/Olib/core/**/*.rb'].each {|file|
-    require file 
-  }
-
-  # load things that depend on core extensions
-  Dir[File.dirname(__FILE__) + '/Olib/**/*.rb'].each {|file|
-    require file 
-  }
-
   def Olib.update_notifier
     begin
         request  = Net::HTTP::Get.new('/api/v1/gems/Olib.json', initheader = {'Content-Type' =>'application/json'})
@@ -24,7 +13,7 @@ module Olib
         else
           # check version
           if Gem.loaded_specs["Olib"].version < Gem::Version.new(JSON.parse(response.body)['version'])
-            respond "You need to update the Olib gem with a `gem install Olib`"
+            puts "<pushBold/>You need to update the Olib gem with a `gem install Olib`<popBold/>"
           end
         end
       rescue
@@ -33,6 +22,16 @@ module Olib
       end
   end
 
+  # load core first
+  Dir[File.dirname(__FILE__) + '/Olib/core/**/*.rb'].each {|file|
+    require file 
+  }
+
+  # load things that depend on core extensions
+  Dir[File.dirname(__FILE__) + '/Olib/**/*.rb'].each {|file|
+    require file 
+  }
+
   # invoke update notifier immediately
   Olib.update_notifier
 
@@ -40,6 +39,11 @@ module Olib
     dothistimeout action, 5, re
   end
 
+  def Olib.run(script, *args)
+    start_script script, args
+    wait_while { running? script }
+  end
+
   Vars.Olib ||= Hash.new
 
 

data/lib/Olib/bounty.rb

@@ -1,52 +1,129 @@
 module Olib
-  class 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 (?<n>[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/
-
-    # convenience list to get all types of bounties
-    def Bounty.types
-      @@re.keys
-    end
+    class Bounty
+      @@procedures            = {}
+
+      @@re                    = {}
+      @@re[:herb]             = /requires (?:a|an|some) (?<herb>[a-zA-Z '-]+) found (?:in|on|around) (?<area>[a-zA-Z '-]+).  These samples must be in pristine condition.  You have been tasked to retrieve (?<number>[\d]+)/
+      @@re[:escort]           = /Go to the (.*?) and WAIT for (?:him|her|them) to meet you there.  You must guarantee (?:his|her|their) safety to (?<destiniation>[a-zA-Z '-]+) as soon as/
+      @@re[:gem]              = /has received orders from multiple customers requesting (?:a|an|some) (?<gem>[a-zA-Z '-]+).  You have been tasked to retrieve (?<number>[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) (?<creature>[a-zA-Z '-]+) (in|on|around|near|by) (?<area>[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 (?<creature>^((?!bandit).)*$) activity (?:in|on) (?:the )? (?<area>.*?)(?: near| between| under|\.) ([a-zA-Z' ]+).  You need to kill (?<number>[0-9]+)/
+      @@re[:bandits]          = /^You have been tasked to suppress bandit activity (?:in |on )(?:the )(?<area>.*?)(?: near| between| under) ([a-zA-Z' ]+).  You need to kill (?<number>[0-9]+)/
+      @@re[:dangerous]        = /You have been tasked to hunt down and kill a particularly dangerous (?<creature>.*) that has established a territory (?:in|on) (?:the )?(?<area>.*?)(?: 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, (?<npc>[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) (?<creature>.*) (?:in|on) (?:the )?(?<area>.*?)(?: near| between| under|\.)/
+      @@re[:failed_bounty]    = /You have failed in your task/
+      @@re[:no_bounty]        = /You are not currently assigned a task/
 
-    def Bounty.type
-      t = nil
-      @@re.each do |type, exp|
-        t= type if checkbounty =~ exp
+      # convenience list to get all types of bounties
+      def Bounty.types
+        @@re.keys
       end
-      return t
-    end
 
-    def Bounty.creature
-    
-    end
+      def Bounty.town
+        checkbounty.match(@@re[ Bounty.type ])[:town]
+      end
 
-    def Bounty.gem
-        
-    end
+      def Bounty.area
+        checkbounty.match(@@re[ Bounty.type ])[:area]
+      end
 
-    def Bounty.location
-    end
+      def Bounty.destination
+        checkbounty.match(@@re[ Bounty.type ])[:destiniation]
+      end
+
+      def Bounty.gem
+        checkbounty.match(@@re[ Bounty.type ])[:gem]
+      end
 
-    def Bounty.n
+      def Bounty.creature
+          checkbounty.match(@@re[ Bounty.type ])[:creature]
+      end
 
-    end
+      def Bounty.herb
+          checkbounty.match(@@re[ Bounty.type ])[:herb]
+      end
+
+      def Bounty.n
+          checkbounty.match(@@re[ Bounty.type ])[:number].to_i
+      end
+
+      def Bounty.type
+        t = nil
+        @@re.each do |type, exp|
+          t= type if checkbounty =~ exp
+        end
+        return t
+      end
+
+      def Bounty.current
+          Bounty.type
+      end
 
-  end
+      def Bounty.ask_for_bounty
+        fput "ask ##{Bounty.npc.id} for bounty"
+      end
+
+      def Bounty.to_s
+          @@procedures.to_s
+      end
+
+      def Bounty.define_procedure(namespace, &block)
+        @@procedures[namespace] = block
+      end
+
+      def Bounty.procedures
+        @@procedures
+      end
+
+      def Bounty.cooldown?
+        Spell[9003].active?
+      end
+
+      def Bounty.throw_missing_procedure
+        msg = "\n"
+        msg.concat "\nBounty.exec called for #{Bounty.current} without a defined procedure\n\n"
+        msg.concat "define a procedure with:\n"
+        msg.concat " \n" 
+        msg.concat "   Bounty.define_procedure(:#{Bounty.current}) {\n" 
+        msg.concat "      # do something\n"
+        msg.concat "   }\n"
+        msg.concat " \n"
+        msg.concat "or rescue this error (Olib::Errors::Fatal) gracefully\n"
+        msg.concat " \n"
+        raise Errors::Fatal.new msg
+      end
+
+      def Bounty.exec(procedure=nil)
+
+        if procedure
+          if @@procedures[procedure]
+            @@procedures[procedure].call
+            return Bounty
+          else 
+            Bounty.throw_missing_procedure
+          end
+        end
+
+        if @@procedures[Bounty.current]
+          @@procedures[Bounty.current].call
+          return Bounty
+        else
+          Bounty.throw_missing_procedure
+        end
+
+      end
+
+      def Bounty.npc
+        GameObj.npcs.select { |npc| npc.name =~ /guard|taskmaster|gemcutter|jeweler|healer/i }.first
+      end
+
+    end
 end

data/lib/Olib/character/char.rb

@@ -1,6 +1,7 @@
 
 module Olib
-  module Char
+  class Char
+    @@silvers  = 0
     @@routines = {}
 
     def Char.hide
@@ -32,6 +33,81 @@ module Olib
       GameObj.right_hand.nil? ? nil : Item.new(GameObj.right_hand)
     end
 
+    def Char.withdraw(amount)
+      Transport.go2_bank
+      result = Olib.do "withdraw #{amount} silvers", /I'm sorry|hands you/
+      if result =~ /I'm sorry/ 
+        Transport.go2_origin
+        echo "Unable to withdraw the amount requested for this script to run from your bank account"
+        exit
+      end
+      wealth
+      return self
+    end
+
+    def Char.deposit_all
+      Transport.go2_bank
+      fput "unhide" if invisible? || hidden?
+      fput "deposit all"
+      @@silvers = 0
+      return self
+    end
+
+    def Char.deposit(amt)
+      wealth
+      if wealth >= amt
+        Transport.go2_bank
+        fput "unhide" if invisible? || hidden?
+        fput "deposit #{amt}"
+      end
+      return self
+    end
+
+    # naive share
+    # does not check if you're actually in a group or not
+    def Char.share
+      wealth
+      fput "share #{@silvers}"
+      wealth
+      self
+    end
+
+    def Char.deplete_wealth(silvers)
+      @@silvers = @@silvers - silvers
+    end
+
+    def Char.smart_wealth
+      return @@silvers if @@silvers 
+      Char.wealth
+    end
+
+    def Char.unhide
+      fput 'unhide' if Spell[916].active? or hidden?
+      self
+    end
+
+    def Char.hide
+      if Spell[916].known? && Spell[916].affordable?
+        Spell[916].cast
+      else
+        fput "hide" until hidden?
+      end
+    end
+
+    def Char.wealth
+      fput "info"
+      while(line=get)
+        next    if line =~ /^\s*Name\:|^\s*Gender\:|^\s*Normal \(Bonus\)|^\s*Strength \(STR\)\:|^\s*Constitution \(CON\)\:|^\s*Dexterity \(DEX\)\:|^\s*Agility \(AGI\)\:|^\s*Discipline \(DIS\)\:|^\s*Aura \(AUR\)\:|^\s*Logic \(LOG\)\:|^\s*Intuition \(INT\)\:|^\s*Wisdom \(WIS\)\:|^\s*Influence \(INF\)\:/
+        if line =~ /^\s*Mana\:\s+\-?[0-9]+\s+Silver\:\s+([0-9]+)/
+          @@silvers= $1.to_i
+          break
+        end
+        sleep 0.1
+      end
+      @@silvers
+    end
+
+
   end
 
   # chainable

data/lib/Olib/core/container.rb

@@ -48,11 +48,15 @@ module Olib
       GameObj[@ref.id].contents.map{ |item| Item.new(item) }
     end
 
-    def where(conditions)        
+    def where(conditions)
       contents.select { |item|
-        conditions.keys.map { |key|
-          item.respond_to?(key) ? item.send(key) == conditions[key] : false
-        }.include? false
+        !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
 

data/lib/Olib/core/errors.rb

@@ -1,5 +1,14 @@
 module Olib
   module Errors
+    @@padding = 20
+
+    def Errors.padding(n)
+      @@padding = n
+    end
+
+    def Errors.indent(str)
+      str.split("\n").map { |line| [''] * @@padding * " " + line }.join("\n")
+    end
 
     # used internally to handle early thread execution and error bubbling
     class Mundane < Exception
@@ -21,7 +30,7 @@ module Olib
           message.concat "\n\nAn Olib::Errors::Fatal was raised but not rescued in an Olib method"
           message.concat "\nyou should rescue this error if it isn't fatal and you don't want your script to break"
         end
-        super(message)
+        super Errors.indent message
       end
     end 
 
@@ -34,7 +43,7 @@ module Olib
           message.concat "\n\nYou tried to add stuff to a container that was full"
           message.concat "\nyou should rescue this error if it isn't fatal and you don't want your script to break"
         end
-        super(message)
+        super Errors.indent message
       end
     end 
     
@@ -45,7 +54,7 @@ module Olib
           message.concat "\n\nYou tried to do something that costs more money that your character had on them"
           message.concat "\nyou should rescue this error if it isn't fatal and you don't want your script to break"
         end
-        super(message)
+        super Errors.indent message
       end
     end 
 
@@ -54,7 +63,7 @@ module Olib
         message = String.new
         message.concat "\n\nYour hands were full!"
         message.concat "\nyou should rescue this error if you don't want your script to break"
-        super(message)
+        super Errors.indent message
       end
     end
 
@@ -63,7 +72,7 @@ module Olib
         message = String.new
         message.concat "\n\nYou were too heavy to do something!"
         message.concat "\nyou should rescue this error if you don't want your script to break"
-        super(message)
+        super Errors.indent message
       end
     end
 
@@ -74,9 +83,9 @@ module Olib
           message.concat "\n\nYou tried to interact with something that no longer exists"
           message.concat "\nyou should rescue this error if it isn't fatal and you don't want your script to break"
         end
-        super(message)
+        super Errors.indent message
       end
     end
 
   end
-end
+end

data/lib/Olib/core/item.rb

@@ -1,11 +1,15 @@
 require 'Olib/core/extender'
 
 module Olib
-  # special item wrapper class to wrap item types with custom, common interactions becoming syntactic sugar
+  # this is the structure for a base Object
+  # wraps an instance of GameObj and adds the ability for tags, queries
   class Item < Olib::Gameobj_Extender
     attr_accessor :props
-
-    def initialize(obj=nil)
+    # When created, it should be passed an instance of GameObj
+    #
+    # Example: 
+    #          Olib::Item.new(GameObj.right_hand)
+    def initialize(obj)
       @props = Hash.new
 
       @props[:name]       = obj.name
@@ -37,6 +41,11 @@ module Olib
       @props.to_s
     end
 
+    # determine if Item is something
+    #
+    # example:
+    #          item.is?("jar")
+    #
     def is?(tag)
       @props[:tags].include?(tag)
     end
@@ -65,6 +74,7 @@ module Olib
     end
 
     def buy
+      Char.deplete_wealth cost
       fput action 'buy'
       self
     end
@@ -77,10 +87,20 @@ module Olib
       !has?(key)
     end
 
+    def exists?
+      GameObj[@id].nil?
+    end
+
     def pullable?
       is? 'pullable'
     end
 
+    def affordable?
+      take
+      return true if pullable?
+      cost <= Char.smart_wealth
+    end
+
     def buyable?
       is? 'buyable'
     end
@@ -96,7 +116,10 @@ module Olib
       else
         Olib.wrap(action "buy"){ |line|
           raise Olib::Errors::InsufficientFunds if line =~ /The merchant frowns/
-          raise Olib::Errors::Mundane            if line =~ /You hand over/
+          if line =~ /You hand over/
+            Char.deplete_wealth cost
+            raise Olib::Errors::Mundane
+          end
         }
       end
       self
@@ -222,7 +245,12 @@ module Olib
 
     def give(target, onfailure=nil)
       Olib.wrap_stream("give ##{@id} to #{target}", 30) { |line|
-        
+        raise Olib::Errors::Mundane if line=~ /This looks perfect/
+
+        if line =~ /glances at you and moves out of your reach./
+          raise Olib::Errors::Fatal.new "You appear to have an invalid NPC definition"
+        end
+
       }
 
       self
@@ -311,6 +339,12 @@ module Olib
       self
     end
 
+    def drop
+      Script.log("#{Time.now} > dropped #{to_s}")
+      fput action "drop"
+      self
+    end
+
     def _inspect
 
       return self if has? 'inspect'

data/lib/Olib/dictionary/dictionary.rb

@@ -96,7 +96,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/
+      re[:success]        = /^You put|^You tuck|^You sheathe|^You slip|^You roll up|^You tuck|^You add|^You place/
       re
     end
     

data/lib/Olib/objects/box.rb

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

data/lib/Olib/objects/clothing.rb

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

data/lib/Olib/objects/herb.rb

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

data/lib/Olib/objects/jar.rb

@@ -1,5 +1,5 @@
 module Olib
-  class Jar < Gameobj_Extender
+  class Jar < Item
     attr_accessor :gem, :count, :full, :empty, :pullable, :initial_count, :stacked
 
     def initialize(item)

data/lib/Olib/objects/jewel.rb

@@ -1,7 +1,7 @@
 # Class to interact with gems
 # overwriting Gem is a bad idea
 module Olib
-  class Jewel < Gameobj_Extender
+  class Jewel < Item
     attr_accessor :quality, :value
     
     def appraise

data/lib/Olib/objects/jewelry.rb

@@ -1,5 +1,5 @@
 module Olib
-  class Jewelry < Gameobj_Extender
+  class Jewelry < Item
     attr_accessor :heirloom
     def heirloom?
       result = Library.do "look ##{@id}", /^You see nothing unusual|#{Gemstone_Regex.item[:heirloom]}/

data/lib/Olib/objects/scroll.rb

@@ -1,72 +1,72 @@
 module Olib
-  class Scroll < Gameobj_Extender
-  @@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, 
-    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
+  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, 
+      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.add_to_whitelist(*args)
+      @@whitelist + args
+    end
 
-  def Scroll.remove_from_whitelist(*args)
-    @@whitelist = @@whitelist - args
-  end
+    def Scroll.remove_from_whitelist(*args)
+      @@whitelist = @@whitelist - args
+    end
 
-  def initialize(item)
-    super item
-    @spells = []
-    return 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
+    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
+    def sell
+      unless self.worthy?
+        result = dothistimeout "get ##{@id}", 1, /^You remove/
+        fput "sell ##{@id}" if result
+      end
     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 
+    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
-      rescue Timeout::Error
-        # Silent
       end
+      self
     end
-    self
-  end
 
-end
+  end
 end

data/lib/Olib/objects/uncommon.rb

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

data/lib/Olib/objects/unknown.rb

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

data/lib/Olib/objects/wand.rb

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

data/lib/Olib/shops.rb

@@ -15,6 +15,7 @@ module Olib
       ]
       .flatten
       .compact
+      .select     { |container| !(container.name =~ /^([A-z][a-z]+ disk$)/)}
       .map        { |container| Shop::Container.new(container)  }
 
       @@containers
@@ -135,13 +136,14 @@ module Olib
 
       def Playershop.where(conditions)        
         Playershop.items.select { |item|
-          conditions.keys.map { |key|
-            item.respond_to?(key) ? item.send(key) == conditions[key] : false
-            
-          }.include? false
-          
+          !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)

data/lib/Olib/transport.rb

@@ -1,8 +1,7 @@
 module Olib
 
   class Transport
-
-    @@silvers    = 0
+    
     @@teleporter = {}
     @@routines   = {}
 
@@ -16,7 +15,7 @@ module Olib
       ].each do |target|
         singleton.send :define_method, "go2_#{target}".to_sym do
 
-          unhide if hidden?
+          Olib.Char.unhide if hidden?
           unless Room.current.tags.include?(target)
             start_script 'go2', [target, '_disable_confirm_']
             wait_while { running? "go2" };
@@ -33,6 +32,7 @@ module Olib
       @@origin[:roomid]   = Room.current.id
       @@origin[:hidden]   = hiding?
       @@origin[:location] = Room.current.location
+      Olib.debug "rebasing to #{@@origin}"
       self
     end
 
@@ -85,68 +85,9 @@ module Olib
       self
     end
 
-    def Transport.wealth
-      fput "info"
-      while(line=get)
-        next                if line =~ /^\s*Name\:|^\s*Gender\:|^\s*Normal \(Bonus\)|^\s*Strength \(STR\)\:|^\s*Constitution \(CON\)\:|^\s*Dexterity \(DEX\)\:|^\s*Agility \(AGI\)\:|^\s*Discipline \(DIS\)\:|^\s*Aura \(AUR\)\:|^\s*Logic \(LOG\)\:|^\s*Intuition \(INT\)\:|^\s*Wisdom \(WIS\)\:|^\s*Influence \(INF\)\:/
-        if line =~ /^\s*Mana\:\s+\-?[0-9]+\s+Silver\:\s+([0-9]+)/
-          @@silvers= $1.to_i
-          break
-        end
-        sleep 0.1
-      end
-      @@silvers
-    end
-
-    def Transport.deplete(silvers)
-      @@silvers = @@silvers - silvers
-    end
-
-    def Transport.smart_wealth
-      return @@silvers if @@silvers 
-      @@wealth
-    end
-
-    def Transport.unhide
-      fput 'unhide' if Spell[916].active? or hidden?
-      self
-    end
-
-    def Transport.withdraw(amount)
-      go2_bank
-      result = Olib.do "withdraw #{amount} silvers", /I'm sorry|hands you/
-      if result =~ /I'm sorry/ 
-        go2_origin
-        echo "Unable to withdraw the amount requested for this script to run from your bank account"
-        exit
-      end
-      return self
-    end
-
-    def Transport.deposit_all
-      self.go2_bank
-      fput "unhide" if invisible? || hidden?
-      fput "deposit all"
-      return self
-    end
-
-    def Transport.deposit(amt)
-      self.go2_bank
-      fput "unhide" if invisible? || hidden?
-      fput "deposit #{amt}"
-      return self
-    end
-
-    # naive share
-    # does not check if you're actually in a group or not
-    def Transport.share
-      wealth
-      fput "share #{@silvers}"
-      self
-    end
 
     def Transport.go2(roomid)
-      unhide if hidden
+      Olib.Char.unhide if hidden
       unless Room.current.id == roomid
         start_script 'go2', [roomid, '_disable_confirm_']
         wait_while { running? "go2" };
@@ -163,11 +104,8 @@ module Olib
     end
 
     def Transport.go2_origin
-      if Room.current.id != @@origin[:roomid]
-        start_script 'go2', [@origin[:roomid]]
-        wait_while { running? "go2" };
-      end
-      hide if @@origin[:hidden]
+      Transport.go2 @@origin[:roomid]
+      Olib.Char.hide if @@origin[:hidden]
       return self
     end    
 

data/lib/Olib/utils/cli.rb

@@ -1,74 +1,81 @@
-class ScriptVars
-  attr_accessor :opts
-  def initialize
-    opts          = {}
-    opts[:flags]  = {}
-    return opts if Script.current.vars.empty?
-    list          = Script.current.vars.map(&:downcase).last(Script.current.vars.length-1)
-    unless list.first.start_with?('--')
-      opts[:cmd]   = list.shift
-    end
-    # iterate over list for flag values
-    
-    list.each.with_index {|ele, i|
-      if ele.start_with?('--')
-        opts[:flags][ symbolize(ele) ] = ''
-      else
-        # cast to Number if is number
-        ele = ele.to_i if ele =~ /^([\d\.]+$)/
-        # look back to previous flag and set it to it's value
-        opts[:flags][ symbolize(list[i-1]) ] = ele
+module Olib
+  class ScriptVars
+    attr_accessor :opts
+    def initialize
+      opts          = {}
+      opts[:flags]  = {}
+      return opts if Script.current.vars.empty?
+      list          = Script.current.vars.map(&:downcase).last(Script.current.vars.length-1)
+      
+      unless list.first.start_with?('--')
+        opts[:cmd]   = list.shift
       end
-    }
-    
-    @opts = opts
-    self
-  end
 
-  def cmd
-    @opts[:cmd]
-  end
+      # iterate over list for flag values
+      flags = list.compact.join(' ').split('--')
+      flags.shift
+      flags.each { |flag|
+        segments  = flag.split(' ')
+        name      =  symbolize(segments.shift)
+        opts[:flags][name] = true 
+        if !segments.empty?
+          value = segments.join(' ').strip
+          if value =~ /[\d]+/
+            value = value.to_i
+          end
+          opts[:flags][name] = value
+        end
+      }
 
-  def empty?(flag)
-    opts[:flags][flag].class == TrueClass || opts[:flags][flag].class == NilClass
-  end
+      @opts = opts
+      self
+    end
 
-  def cmd?(action)
-    cmd == action
-  end
+    def cmd
+      @opts[:cmd]
+    end
 
-  def symbolize(flag)
-    flag.gsub('--', '').gsub('-', '_').to_sym
-  end
+    def empty?(flag)
+      opts[:flags][flag].class == TrueClass || opts[:flags][flag].class == NilClass
+    end
 
-  def help?
-    cmd =~ /help/
-  end
+    def cmd?(action)
+      cmd == action
+    end
 
-  def flags
-    opts[:flags].keys
-  end
+    def symbolize(flag)
+      flag.gsub('--', '').gsub('-', '_').to_sym
+    end
 
-  def to_s
-    @opts.to_s
-  end
+    def help?
+      cmd =~ /help/
+    end
 
-  def flag
-    self
-  end
+    def flags
+      opts[:flags].keys
+    end
 
-  def flag?(f)
-    opts[:flags][ symbolize(f) ]
-  end
+    def to_s
+      @opts.to_s
+    end
 
-  def method_missing(arg1, arg2=nil)
-    @opts[:flags][arg1]
-  end
+    def flag
+      self
+    end
+
+    def flag?(f)
+      opts[:flags][ symbolize(f) ]
+    end
 
+    def method_missing(arg1, arg2=nil)
+      @opts[:flags][arg1]
+    end
+
+  end
 end
 
 module Olib
   def Olib.CLI
-    ScriptVars.new
+    Olib::ScriptVars.new
   end
 end

data/lib/Olib/utils/monsterbold.rb

@@ -0,0 +1,5 @@
+module Olib
+  def Olib.monsterbold(str)
+    "<pushBold/>#{str}<popBold/>"
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: Olib
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Ondreian Shamsiel
@@ -46,6 +46,7 @@ files:
 - lib/Olib/transport.rb
 - lib/Olib/utils/cli.rb
 - lib/Olib/utils/help_menu.rb
+- lib/Olib/utils/monsterbold.rb
 - lib/Olib/utils/utils.rb
 - lib/Olib/utils/vbulletin.rb
 - lib/Olib.rb