Olib 0.1.2 → 2.0.0.pre.rc.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 6e3a63b873937a4644f53fcfea7a335e3b0d2cc6
-  data.tar.gz: 851ef4add8178845dbd0db6bd61ae42db530af57
+SHA256:
+  metadata.gz: a3847ae46163103e49356d4e6fcc43badaa3b4ddd29a9ea3ad48c509203b5eb7
+  data.tar.gz: 6ff8a42a9ca26c9cf394bd311ff7095052b7a507005b34aa42d73d63f9701a79
 SHA512:
-  metadata.gz: 8c9ba056450555b6de96ae48ef41d84d5ea670de5cee5b01fcba3acb3672d3c3f4d8b19424db236fc19532f0358a091b0758f58d1378877b52aac5771c8932b2
-  data.tar.gz: dd6dc889f09910d1f4faf264cdb405f32d59c34e4319c8a3fe9f91efb511b9715872951c0c39550550a4f96ba85977027b9649f021a6ec03156650256b22688b
+  metadata.gz: eb34b92ed44adeab5c1b15e7ae65f73124d7557af2c613bef5113c7efe76607e362807553076d52f51f05b95787b93adbf65cb3893343962af82485f008098d0
+  data.tar.gz: c89d3853c1d5569f7ed375269a047cf7eee943dde1f5ad8b11eb9c2ffb0e1abd29bdf9df8893491afb1cd4f0b29fb1c3df440d3559fc133f8db4119d390a8856

data/Olib.gemspec

@@ -5,7 +5,7 @@ require "Olib/version"
 Gem::Specification.new do |s|
   s.name          = "Olib"
   s.version       = Olib::VERSION
-  s.date          = "2014-09-12"
+  s.date          = "2018-01-04"
   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"
   s.authors       = ["Ondreian Shamsiel"]

data/lib/Olib.rb

@@ -1,83 +1,10 @@
-require 'net/http'
-require 'json'
 require "ostruct"
 
-class String
-  def is_i?
-    !!(self =~ /\A[-+]?[0-9]+\z/)
-  end
-end
-
-class MatchData
-  def to_struct
-    OpenStruct.new to_hash
-  end
-
-  def to_hash
-    Hash[self.names.zip(self.captures.map(&:strip).map do |capture|  
-      if capture.is_i? then capture.to_i else capture end
-    end)]
-  end
-end
-
-class Hash
-  def to_struct
-    OpenStruct.new self
-  end
-end
-
-class Regexp
-  def or(re)
-    Regexp.new self.to_s + "|" + re.to_s
-  end
-  # define union operator for regex instance
-  def |(re)
-    self.or(re)
-  end
-end
-
 module Olib
-
-  def Olib.update_notifier
-    begin
-        response  = JSON.parse Net::HTTP.get URI('https://rubygems.org/api/v1/gems/Olib.json')
-        # check version
-        if Gem.loaded_specs["Olib"].version < Gem::Version.new(response['version'])
-          puts "<pushBold/>You need to update the Olib gem with a `gem install Olib`<popBold/>"
-        end    
-      rescue
-        echo $!
-        puts $!.backtrace[0..1]
-      end
-  end
-
-  def Olib.methodize(str)
-    str.to_s.downcase.strip.gsub(/-|\s+|'|"/, "_").to_sym
-  end
-
-  # load core first
-  Dir[File.dirname(__FILE__) + '/Olib/core/**/*.rb'].each {|file|
-    require file 
-  }
-
+  # load ext first
+  Dir[File.dirname(__FILE__) + '/Olib/ext/**/*.rb'].each do |file| require(file) end
+  # load core next
+  Dir[File.dirname(__FILE__) + '/Olib/core/**/*.rb'].each do |file| require(file) end
   # load things that depend on core extensions
-  Dir[File.dirname(__FILE__) + '/Olib/**/*.rb'].each {|file|
-    require file 
-  }
-
-  # invoke update notifier immediately
-  # Olib.update_notifier
-
-  def Olib.do(action, re)
-    dothistimeout action, 5, re
-  end
-
-  def Olib.run(script, *args)
-    start_script script, args
-    wait_while { running? script }
-  end
-
-  Vars.Olib ||= Hash.new
-
-
-end
+  Dir[File.dirname(__FILE__) + '/Olib/**/*.rb'].each do |file| require(file) end
+end

data/lib/Olib/area.rb

@@ -1,48 +1,35 @@
-class Area < Olib::Container
-  def self.contents
-    GameObj.loot.map { |obj| Olib::Item.new(obj) }
-  end
-
-  def each
-    self.contents.each { |item|
-      yield item
-    }
-  end
-
-  class << self
-    Olib::Item.type_methods.each { |method, tag|
-      exp = /#{tag}/
-      define_method(method.to_sym) do
-        GameObj.loot
-          .select { |obj| obj.type =~ exp }
-          .map { |obj| Olib::Item.new(obj) }
-      end
-    }
+class Area
+  include Enumerable
+  def self.method_missing(method, *args, &block)
+    if respond_to?(method)
+      Area.new.send(method, *args, &block)
+    else
+      super(method, *args, &block)
+    end
   end
 
-  def Area.deep
-    Area.new
+  def self.respond_to?(method)
+    return super(method) unless Area.new.respond_to?(method)
+    return true
   end
 
-  attr_accessor :room, :objects
+  attr_reader :room, :autoid, :objects
 
   def initialize
     @room     = Room.current
-    @objects  = [ GameObj.loot, GameObj.room_desc ]
-      .flatten
-      .compact
-      .map { |thing| thing.id }
-      .uniq # sometimes objects exist in both loot & room_desc
-      .map { |id| Olib::Container.new id }
+    @auto     = XMLData.room_count
+    @objects  = [ GameObj.loot, GameObj.room_desc ].map(&:to_a).flatten.compact.map(&:to_container)
   end
 
-  def contents
+  def each(&block)
+    @objects.each(&block)
+  end
+
+  def deep
     items = []
-    @objects
-      .reject { |container| container.name =~ /[A-Z][a-z]+ disk/ }
-      .each { |container|
+    @objects.reject { |container| container.name =~ /[A-Z][a-z]+ disk/ }.each { |container|
         check_container container
-        item = Olib::Item.new container
+        item = Item.new container
         unless container.nested?
           container.contents.each { |item|
             item.container = container
@@ -58,7 +45,7 @@ class Area < Olib::Container
           end
         end
       }
-    items.compact
+    items.compact.each do |item| yield(item) end
   end
 
   def check_container(container)
@@ -66,6 +53,4 @@ class Area < Olib::Container
       container.look.at.on
     end
   end
-
-
 end

data/lib/Olib/bounty.rb

@@ -35,7 +35,7 @@ class Bounty
     none:    /You are not currently assigned a task/,
     skin:    /^You have been tasked to retrieve (?<number>\d+) (?<skin>.*?) of at least (?<quality>.*?) quality for (?<buyer>.*?) in (?<realm>.*?)\.\s+You can SKIN them off the corpse of (a|an|some) (?<creature>.*?) or/,
     
-    help_bandits: /You have been tasked to help (?<partner>.*?) suppress bandit activity (in|on|around) (?<area>.*?)(| near (?<realm>.*?)).  You need to kill (?<number>[0-9]+)/
+    help_bandits: /You have been tasked to help (?<partner>.*?) suppress bandit activity (?:in|on|around) (?<area>.*?) (?:near|between|under) (?<realm>.*?).  You need to kill (?<number>[0-9]+)/
   )
   
   # convenience list to get all types of bounties
@@ -59,7 +59,7 @@ class Bounty
   def Bounty.parse(str)
     type, patt = Bounty.match str
     unless patt
-      raise Exception.new "could not match Bounty: #{str}\nplease notify Ondreian"
+      return OpenStruct.new
     else
       bounty = patt.match(str).to_struct
       bounty[:type] = type
@@ -159,13 +159,13 @@ class Bounty
   end
 
   def Bounty.cooldown?
-    Spell[9003].active?
+    not XMLData.active_spells["Next Bounty"].nil?
   end
 
   def Bounty.cooldown!
     if Bounty.cooldown?
       Go2.origin
-      wait_until { !Bounty.cooldown? }
+      wait_while { Bounty.cooldown? }
     end
     Bounty
   end
@@ -179,9 +179,9 @@ class Bounty
     msg.concat "      # do something\n"
     msg.concat "   }\n"
     msg.concat " \n"
-    msg.concat "or rescue this error (Olib::Errors::Fatal) gracefully\n"
+    msg.concat "or rescue this error (Errors::Fatal) gracefully\n"
     msg.concat " \n"
-    raise Olib::Errors::Fatal.new msg
+    raise Errors::Fatal.new msg
   end
 
   def Bounty.dispatch(listener=nil)
@@ -205,14 +205,12 @@ class Bounty
   def Bounty.find_guard
     Go2.advguard
     if Bounty.npc.nil? then Go2.advguard2 end
-    if Bounty.npc.nil? then 
-      throw Olib::Errors::Fatal.new "could not find guard"
-    end
+    throw Errors::Fatal.new "could not find guard" if Bounty.npc.nil?  
     return Bounty
   end
 
   def Bounty.npc
-    GameObj.npcs.find { |npc| npc.name =~ NPCS } ||
+    GameObj.npcs.find { |npc| npc.name =~ NPCS } or
     GameObj.room_desc.find { |npc| npc.name =~ NPCS }
   end
 end

data/lib/Olib/character/char.rb

@@ -1,42 +1,50 @@
 class Char
-  EMPATH     = "Empath"
+  INJURIES = Wounds.singleton_methods.map(&:to_s).select do |m| m.downcase == m and not m.include?("_") end.map(&:to_sym)
   Duration   = Struct.new(:seconds, :minutes, :hours)
-  INJURIES   = Wounds.singleton_methods
-    .map(&:to_s)
-    .select do |m| m.downcase == m && m !~ /_/ end.map(&:to_sym)
-
   @@silvers  = 0
-  @@routines = {}
   @@aiming   = nil
 
-  def Char.hide
-    while not hiding?
-      waitrt?
-      if @@routines[:hiding]
-        @@routines[:hiding].call
-      else
-        fput 'hide'
-      end
-    end
-    Char
+  def Char.spell(num)
+    hour, minutes, seconds = Spell[num].remaining.split(":").map(&:to_f)
+    total_seconds = seconds + (minutes * 60.00) + (hour * 60.00 * 60.00)
+
+    Duration.new(
+      total_seconds,
+      total_seconds/60,
+      total_seconds/60/60,
+    )
   end
 
-  def Char.arm
+  def self.hide()
+    return unless visible?
+    fput "hide"
+    waitrt?
+    self
+  end
+
+  def self.unhide()
+    return if visible?
+    fput "unhide"
+    wait_until do visible? end
+    self
+  end
+
+  def self.arm
     fput "gird"
     self
   end
 
-  def Char.unarm
+  def self.unarm
     fput "store both"
     self
   end
 
-  def Char.swap
+  def self.swap
     fput "swap"
     self
   end
 
-  def Char.stand
+  def self.stand
     unless standing?
       fput "stand"
       waitrt?
@@ -44,18 +52,7 @@ class Char
     self
   end
 
-  def Char.spell(num)
-    hour, minutes, seconds = Spell[num].remaining.split(":").map(&:to_f)
-    total_seconds = seconds + (minutes * 60.00) + (hour * 60.00 * 60.00)
-
-    Duration.new(
-      total_seconds,
-      total_seconds/60,
-      total_seconds/60/60,
-    )
-  end
-
-  def Char.aim(location)
+  def self.aim(location)
     unless @@aiming == location
       fput "aim #{location}"
       @@aiming = location
@@ -63,32 +60,24 @@ class Char
     self
   end
 
-  def Char.fwi_teleporter
-    Vars.teleporter || Vars.mapdb_fwi_trinket
-  end
 
-  def Char.visible?
-    hiding? || invisible?
-  end
-  
-  def Char.hiding_routine(procedure)
-    @@routines[:hiding] = procedure
-    Char
+  def self.visible?
+    hiding? or invisible?
   end
 
-  def Char.in_town?
+  def self.in_town?
     Room.current.location =~ /the Adventurer's Guild|kharam|teras|landing|sol|icemule trace|mist|vaalor|illistim|rest|cysaegir|logoth/i
   end
 
-  def Char.left
-    GameObj.left_hand.name == "Empty" ? nil : Olib::Item.new(GameObj.left_hand)
+  def self.left
+    GameObj.left_hand.name == "Empty" ? nil : Item.new(GameObj.left_hand)
   end
 
-  def Char.right
-    GameObj.right_hand.name == "Empty" ? nil : Olib::Item.new(GameObj.right_hand)
+  def self.right
+    GameObj.right_hand.name == "Empty" ? nil : Item.new(GameObj.right_hand)
   end
 
-  def Char.withdraw(amount)
+  def self.withdraw(amount)
     Go2.bank
     result = Olib.do "withdraw #{amount} silvers", /I'm sorry|hands you/
     if result =~ /I'm sorry/ 
@@ -100,15 +89,15 @@ class Char
     return self
   end
 
-  def Char.deposit_all
+  def self.deposit_all
     Go2.bank
-    fput "unhide" if invisible? || hidden?
+    fput "unhide" unless visible?
     fput "deposit all"
     @@silvers = 0
     return self
   end
 
-  def Char.deposit(amt)
+  def self.deposit(amt)
     wealth
     if wealth >= amt
       Go2.bank
@@ -120,28 +109,28 @@ class Char
 
   # naive share
   # does not check if you're actually in a group or not
-  def Char.share
+  def self.share
     wealth
     fput "share #{@silvers}"
     wealth
     self
   end
 
-  def Char.deplete_wealth(silvers)
+  def self.deplete_wealth(silvers)
     #@@silvers = @@silvers - silvers
   end
 
-  def Char.smart_wealth
+  def self.smart_wealth
     return @@silvers if @@silvers 
     Char.wealth
   end
 
-  def Char.unhide
+  def self.unhide
     fput 'unhide' if Spell[916].active? or hidden?
     self
   end
 
-  def Char.hide
+  def self.hide
     if Spell[916].known? && Spell[916].affordable?
       Spell[916].cast
     else
@@ -149,29 +138,36 @@ class Char
     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
+  def self.wealth
+    silvers = nil
+    DownstreamHook.add("Olib_check_silvers", Proc.new do |server_string|
+      if server_string =~ /^\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\)\:/
+        nil
+      elsif server_string =~ /^\s*Mana\:\s+\-?[0-9]+\s+Silver\:\s+([0-9]+)/
+        silvers = $1.to_i
+        DownstreamHook.remove("Olib_check_silvers")
+        nil
+      else
+        server_string
       end
-      sleep 0.1
-    end
+    end)
+    $_SERVER_.puts "#{$cmd_prefix}info\n"
+    wait_until { silvers }
+    silvers
+    @@silvers = silvers
     @@silvers
   end
 
-  def Char.total_wound_severity
+  def self.total_wound_severity
     INJURIES
       .reduce(0) do |sum, method| sum + Wounds.send(method) end
   end
 
-  def Char.wounded?
+  def self.wounded?
     total_wound_severity.gt(0)
   end
 
-  def Char.empty_hands
+  def self.empty_hands
     hands = [Char.left, Char.right].compact
 
     hands.each do |hand| Containers.Lootsack.add hand end