Olib 0.0.8 → 0.0.9

data/lib/Olib/character/char.rb

@@ -1,118 +1,113 @@
-
-module Olib
-  class Char
-    @@silvers  = 0
-    @@routines = {}
-
-    def Char.hide
-      while not hiding?
-        waitrt?
-        if @@routines[:hiding]
-          @@routines[:hiding].call
-        else
-          fput 'hide'
-        end
-      end
-      Char
-    end
-
-    def Char.visible?
-      hiding? || invisible?
-    end
-    
-    def Char.hiding_routine(procedure)
-      @@routines[:hiding] = procedure
-      Char
-    end
-
-    def Char.left
-      GameObj.left_hand.nil? ? nil : Item.new(GameObj.left_hand)
-    end
-
-    def Char.right
-      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
-  def Olib.Char
-    Olib::Char
-  end
-
-end
+class Char
+  @@silvers  = 0
+  @@routines = {}
+
+  def Char.hide
+    while not hiding?
+      waitrt?
+      if @@routines[:hiding]
+        @@routines[:hiding].call
+      else
+        fput 'hide'
+      end
+    end
+    Char
+  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
+  end
+
+  def Char.left
+    GameObj.left_hand.name == "Empty" ? nil : Olib::Item.new(GameObj.left_hand)
+  end
+
+  def Char.right
+    GameObj.right_hand.name == "Empty" ? nil : Olib::Item.new(GameObj.right_hand)
+  end
+
+  def Char.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
+    wealth
+    return self
+  end
+
+  def Char.deposit_all
+    Go2.bank
+    fput "unhide" if invisible? || hidden?
+    fput "deposit all"
+    @@silvers = 0
+    return self
+  end
+
+  def Char.deposit(amt)
+    wealth
+    if wealth >= amt
+      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

data/lib/Olib/character/group.rb

@@ -1,68 +1,69 @@
-# NEW: Stable
-module Olib
-  class Group
-    @@characters             = {}
-    @@checked                = false
-    @@characters[Char.name]  = true  # YOU CAN NEVER ESCAPE YOURSELF (so your own disk won't fuck up)
-    @@leader                 = Char.name
-
-    # ran at the initialization of a script
-    def Group.check
-      @@characters             = {}
-      
-      
-      fput "group"
-      while line=get
-        break                            if line =~ /You are not currently in a group/
-        Group.define($1)                 if line =~ /([a-zA-Z]+) (is following you|is also a member of your group|is the leader of your group)/
-        @@leader = $1                    if line =~ /([a-zA-Z]+) is the leader of your group/
-        break                            if line =~ /^Your group status is/
-      end
-      @@checked = true
-      @@characters
-    end
-
-    def Group.leader
-      @@leader
-    end
-
-    def Group.leader?
-      Group.check unless @@checked
-      @@leader == Char.name
-    end
-
-    def Group.whisper(msg)
-      fput "whisper group #{msg}" unless Group.members.empty?
-    end
-    
-    def Group.add(char)
-      fput "group #{char}"
-      Group.define(char)
-      self
-    end
-
-    def Group.remove(char)
-      fput "remove #{char}"
-      @@characters.delete(char)
-      self
-    end
-
-    def Group.nonmembers
-      Group.check unless @@checked
-      others      = GameObj.pcs.map! {|char| char.noun } || []
-      # find all the disks/hidden players too
-      disk_owners = GameObj.loot.find_all { |obj| (obj.noun == 'disk') }.map{|disk| /([A-Z](?:[a-z]+))/.match(disk.name)[0].strip } || []
-      [others, disk_owners].flatten.reject(&:nil?).uniq - @@characters.keys
-    end
-
-    def Group.members
-      Group.check unless @@checked
-      @@characters.keys
-    end
-
-    def Group.define(name)
-      GameObj.pcs.detect do |pc| @@characters[name] = pc.dup if pc.noun == name end
-    end
-
-  end
+module Olib
+  class Group
+    @@characters             = {}
+    @@checked                = false
+    @@characters[Char.name]  = true  # YOU CAN NEVER ESCAPE YOURSELF (so your own disk won't fuck up)
+    @@leader                 = Char.name
+
+    # ran at the initialization of a script
+    def Group.check
+      @@characters             = {}
+      
+      
+      fput "group"
+      while line=get
+        break            if line =~ /You are not currently in a group/
+        Group.define($1) if line =~ /([a-zA-Z]+) (is following you|is also a member of your group|is the leader of your group)/
+        @@leader = $1    if line =~ /([a-zA-Z]+) is the leader of your group/
+        break            if line =~ /^Your group status is/
+      end
+      @@checked = true
+      @@characters
+    end
+
+    def Group.leader
+      @@leader
+    end
+
+    def Group.leader?
+      Group.check unless @@checked
+      @@leader == Char.name
+    end
+
+    def Group.whisper(msg)
+      fput "whisper group #{msg}" unless Group.members.empty?
+    end
+    
+    def Group.add(char)
+      fput "group #{char}"
+      Group.define(char)
+      self
+    end
+
+    def Group.remove(char)
+      fput "remove #{char}"
+      @@characters.delete(char)
+      self
+    end
+
+    def Group.nonmembers
+      Group.check unless @@checked
+      others      = GameObj.pcs.map! {|char| char.noun } || []
+      # find all the disks/hidden players too
+      disk_owners = GameObj.loot.find_all { |obj| (obj.noun == 'disk') }.map{|disk| /([A-Z](?:[a-z]+))/.match(disk.name)[0].strip } || []
+      [others, disk_owners].flatten.reject(&:nil?).uniq - @@characters.keys
+    end
+
+    def Group.members
+      Group.check unless @@checked
+      @@characters.keys
+    end
+
+    def Group.define(name)
+      GameObj.pcs.detect do |pc| @@characters[name] = pc.dup if pc.noun == name end
+    end
+  end
+end
+
+class Group < Olib::Group
 end

data/lib/Olib/character/inventory.rb

@@ -1,80 +1,80 @@
-module Olib
-  module Inventory
-    Vars.Olib[:Inventory] ||= Hash.new
-
-    @@checked = false
-
-    
-    def Inventory.containers
-      Inventory.check
-      GameObj.containers
-    end
-
-    def Inventory.to_s
-      Inventory.items.map(&:to_s)
-    end
-
-    def Inventory.checked?
-      @@checked
-    end
-
-    def Inventory.[](query)
-      GameObj.inv.select { |item|
-        item.name == query || item.id == query
-      }
-    end
-
-    def Inventory.teleporter
-      # check for worn teleporter
-      candidates= GameObj.inv.select { |item|
-        item.name == Vars.teleporter
-      }
-
-      unless candidates.empty?
-        return Item.new(candidates.first)
-      end
-
-      # check in containers
-      Inventory.items.select { |item|
-        item.is? "teleporter"
-      }.first
-    end
-    
-    def Inventory.items
-      Inventory.containers.map { |id, contents| contents.map {|item|
-          Item.new(item).define("container", id)
-        } 
-      }.flatten
-    end
-
-    def Inventory.check
-      return self if Inventory.checked?
-      GameObj.inv.select{ |item|
-        !item.name.include?('tattoo')
-      }.each {|item|
-        if item.contents.nil?
-          Olib.wrap("look in ##{item.id}") { |line|
-            respond line =~ /Shadow engulf/
-
-            raise Olib::Errors::Mundane if line =~ /There is nothing in there.|Total|^In the (.*).$|prompt|^Shadows engulf/
-
-            if line =~ /That is closed./
-              Olib.wrap("open ##{item.id}") { |line|
-                if line =~ /You open/
-                  multifput "look in ##{item.id}", "close ##{item.id}"
-                end
-              } 
-            end
-          }
-        end
-      }
-      @@checked = true
-      return self
-    end
-  
-  end
-
-  def Olib.Inventory
-    Olib::Inventory
-  end
+module Olib
+  module Inventory
+    Vars.Olib[:Inventory] ||= Hash.new
+
+    @@checked = false
+
+    
+    def Inventory.containers
+      Inventory.check
+      GameObj.containers
+    end
+
+    def Inventory.to_s
+      Inventory.items.map(&:to_s)
+    end
+
+    def Inventory.checked?
+      @@checked
+    end
+
+    def Inventory.[](query)
+      GameObj.inv.select { |item|
+        item.name == query || item.id == query
+      }
+    end
+
+    def Inventory.fwi_teleporter
+      # check for worn teleporter
+      candidates= GameObj.inv.select { |item|
+        item.name == Char.fwi_teleporter
+      }
+
+      unless candidates.empty?
+        return Item.new(candidates.first)
+      end
+
+      # check in containers
+      Inventory.items.select { |item|
+        item.is? "teleporter"
+      }.first
+    end
+    
+    def Inventory.items
+      Inventory.containers.map { |id, contents| contents.map {|item|
+          Item.new(item).define("container", id)
+        } 
+      }.flatten
+    end
+
+    def Inventory.check
+      return self if Inventory.checked?
+      GameObj.inv.select{ |item|
+        !item.name.include?('tattoo')
+      }.each {|item|
+        if item.contents.nil?
+          Olib.wrap("look in ##{item.id}") { |line|
+            respond line =~ /Shadow engulf/
+
+            raise Olib::Errors::Mundane if line =~ /There is nothing in there.|Total|^In the (.*).$|prompt|^Shadows engulf/
+
+            if line =~ /That is closed./
+              Olib.wrap("open ##{item.id}") { |line|
+                if line =~ /You open/
+                  multifput "look in ##{item.id}", "close ##{item.id}"
+                end
+              } 
+            end
+          }
+        end
+      }
+      @@checked = true
+      return self
+    end
+  
+  end
+
+  def Olib.Inventory
+    Olib::Inventory
+  end
 end