Olib 2.0.0.pre.rc.6 → 2.0.0.pre.rc.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7d8e8dfe837282ceb421c8919c9b14385299f9f718493dc74efef8c9863cb4a
-  data.tar.gz: dffc7436f4fc2da600ed00104ca8ca53e9880226d846c12c67987fe36ca9845d
+  metadata.gz: 6b6389e96091c8dc8e79ea4bb25b9c30805c91d47f09addab1a1e2075976a9dc
+  data.tar.gz: 6008e2a6431503d0c72b17c7ec5e27a940ae7a2a4d4af807f6c11670f346794f
 SHA512:
-  metadata.gz: bde4171be06ed24d979ffbc9a49b68a7159af161006607194485502d4e9f8a43d6c9b10b8417b2e915f8e30475670a4c87965ac0d63609302f804ea4c6e15990
-  data.tar.gz: 97ebab201d826e5e483777535ee91d93a9d80110eea2f329c142d3893a0985409957e95f2d4f74e28bedd1832cdf17636c160e14dd580003013a940fa2c4de83
+  metadata.gz: b19fd1ecffec4ddd4a0e8a587b8db4ccb9089c28ffc1d74c4bab90626a2e43e52efcdec7c2abbb8ae943331d7b5c3deac78e1a2674cfdd47dd6f6410294a0fdf
+  data.tar.gz: bf7d1ddb8a5d621f5a9c98656127a051c93842942c0079d061d415fbefd937450e57866ece27d978652af98881ba620b599575b65735aab76f5daf732d0a0b00

data/lib/Olib/bounty.rb

@@ -1,15 +1,15 @@
 require "ostruct"
 
 class Bounty
-  NPCS = /guard|sergeant|Felinium|clerk|purser|taskmaster|gemcutter|jeweler|akrash|kris|Ghaerdish|Furryback|healer|dealer|Ragnoz|Maraene|Kelph|Areacne|Jhiseth|Gaedrein/i
+  NPCS = /guard|sergeant|Luthrek|Felinium|clerk|purser|taskmaster|gemcutter|jeweler|akrash|kris|Ghaerdish|Furryback|healer|dealer|Ragnoz|Maraene|Kelph|Areacne|Jhiseth|Gaedrein/i
   HERBALIST_AREAS = /illistim|vaalor|legendary rest|solhaven/i
-  @@listeners = {}
+
   # this should be refactored to use CONST
   REGEX = OpenStruct.new(
     creature_problem: /"Hmm, I've got a task here from (?<town>.*?)\.  It appears they have a creature problem they\'d like you to solve/,
     report_to_guard:  /^You succeeded in your task and should report back to/,
     get_skin_bounty:  /The local furrier/,
-    heirloom_found:   /^You have located the heirloom and should bring it back to/,
+    heirloom_found:   /^You have located (?:a|an|some) (?<heirloom>.*?) and should bring it back to one of the (?<town>.*?) gate guards\./,
     cooldown:         /^You are not currently assigned a task.  You will be eligible for new task assignment in about (?<minutes>.*?) minute(s)./,
     
     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|\.)/,
@@ -27,14 +27,14 @@ class Bounty
     escort: /Go to the (.*?) and WAIT for (?:him|her|them) to meet you there.  You must guarantee (?:his|her|their) safety to (?<destination>.*?) as soon as/,
     gem:    /The gem dealer in (?<town>.*?), (?<npc>.*?), has received orders from multiple customers requesting (?:a|an|some) (?<gem>[a-zA-Z '-]+).  You have been tasked to retrieve (?<number>[0-9]+)/,
     cull:    /^You have been tasked to suppress (?<creature>(?!bandit).*) activity (?:in|on|around) (?<area>.*?)(| (near|between) (?<realm>.*?)).  You need to kill (?<number>[0-9]+)/,
-    bandits: /^You have been tasked to suppress bandit activity (?:in|on|around) (?<area>.*?) (?:near|between|under) (?<realm>.*?).  You need to kill (?<number>[0-9]+)/,
+    bandits: /^You have been tasked to suppress bandit activity (?:in|on|around|near) (?<area>.*?) (?:near|between|under) (?<realm>.*?).  You need to kill (?<number>[0-9]+)/,
 
     rescue:  /A local divinist has had visions of the child fleeing from (?:a|an) (?<creature>.*) (?:in|on) (?:the )?(?<area>.*?)(?: near| between| under|\.)/,
     failed:  /You have failed in your task/,
     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|between|under) (?<realm>.*?).  You need to kill (?<number>[0-9]+)/,
+    help_bandits: /You have been tasked to help (?<partner>.*?) suppress bandit activity (?:in|on|around|near) (?<area>.*?) (?:near|between|under) (?<realm>.*?).  You need to kill (?<number>[0-9]+)/,
     help_creatures: /You have been tasked to help (?<partner>.*?) kill a dangerous creature by suppressing (?<creature>.*) activity (?:in|on|around|near) (?<area>.*?) (?:near|between|under) (?<realm>.*?) during the hunt.  You need to kill (?<number>[0-9]+)/,
     help_cull: /You have been tasked to help (?<partner>.*?) suppress (?<creature>.*) activity (?:in|on|around|near) (?<area>.*?) (?:near|between|under) (?<realm>.*?).  You need to kill (?<number>[0-9]+)/,
   )
@@ -142,15 +142,6 @@ class Bounty
     Bounty
   end
 
-  def Bounty.on(namespace, &block)
-    @@listeners[namespace] = block
-    Bounty
-  end
-
-  def Bounty.listeners
-    @@listeners
-  end
-
   def Bounty.cooldown?
     not XMLData.active_spells["Next Bounty"].nil?
   end
@@ -163,38 +154,6 @@ class Bounty
     Bounty
   end
 
-  def Bounty.throw_missing_listener
-    msg = "\n"
-    msg.concat "\nBounty.dispatch called for `:#{Bounty.type}` without a defined listener\n\n"
-    msg.concat "define a listener with:\n"
-    msg.concat " \n" 
-    msg.concat "   Bounty.on(:#{Bounty.type}) {\n" 
-    msg.concat "      # do something\n"
-    msg.concat "   }\n"
-    msg.concat " \n"
-    msg.concat "or rescue this error (Errors::Fatal) gracefully\n"
-    msg.concat " \n"
-    raise Errors::Fatal.new msg
-  end
-
-  def Bounty.dispatch(listener=nil)
-    if listener
-      if @@listeners[listener]
-        @@listeners[listener].call
-        return Bounty
-      else 
-        Bounty.throw_missing_listener
-      end
-    end
-
-    if @@listeners[Bounty.type]
-      @@listeners[Bounty.type].call
-      return Bounty
-    else
-      Bounty.throw_missing_listener
-    end
-  end
-
   def Bounty.find_guard
     Go2.advguard
     if Bounty.npc.nil? then Go2.advguard2 end

data/lib/Olib/combat/metadata.rb

@@ -9,5 +9,9 @@ class Creatures
     def self.get(name)
       @repo.fetch(name.downcase) do {name: name, level: Char.level, tags: []} end
     end
+
+    def self.repo()
+      @repo.values.map {|creature| OpenStruct.new(creature)}
+    end
   end
 end

data/lib/Olib/core/transaction.rb

@@ -6,14 +6,14 @@ class Transaction < Exist
     close: Regexp.union(
       %r[I already appraised that],
       %r[Sorry, #{Char.name}, I'm not buying anything this valuable today\.],
-      %r[(I'll give you|How's|I'll offer you|worth at least) (?<value>\d+)],
-      %r[(?<value>\d+) silvers])
+      %r[(I'll give you|How's|I'll offer you|worth at least) (?<value>[,\d]+)],
+      %r[(?<value>[,\d]+) silvers])
     )
   
   Sell = Rill.new(
     start: %[You offer|You ask (?<merchant>.*?) if (he|she) would like to buy (?:a |an |)<a exist="{{id}}"],
     close: Regexp.union(
-      %r[(hands you|for) (?<value>\d+)],
+      %r[(hands you|for) (?<value>[,\d]+)],
       %r[No #{Char.name}, I won't buy that],
       %r[I'm sorry, #{Char.name}, but I have no use for that\.],
       %r[He hands it back to you],
@@ -39,10 +39,11 @@ class Transaction < Exist
     take
     (_, match, lines) = Appraise.capture(self.to_h, 
       "appraise \#{{id}}")
-    if lines.any? {|line| line.include?(%[Sorry, Pixelia, I'm not buying anything this valuable today.])}
+    if lines.any? {|line| line.include?(%[Sorry, #{Char.name}, I'm not buying anything this valuable today.])}
       @value = Float::INFINITY
     else
-      @value = match[:value].to_i
+      Log.out(match[:value])
+      @value = match[:value].delete(",").to_i
     end
     self
   end
@@ -58,7 +59,10 @@ class Transaction < Exist
     (_, match, _lines) = Sell.capture(self.to_h, 
       "sell \#{{id}}")
 
-    
+    if match[:value].is_a?(String) && match[:value] =~ /[\d,]+/
+      match[:value] = match[:value].delete(",").to_i
+    end
+
     match[:value] = 0 unless match[:value].is_a?(Integer)
     Ok[**match]
   end

data/lib/Olib/ext/matchdata.rb

@@ -8,7 +8,7 @@ class MatchData
 
   def to_h
     Hash[self.names.map(&:to_sym).zip(self.captures.map(&:strip).map do |capture|  
-      if capture.is_i? then capture.to_i else capture end
+      if capture.is_i? then capture.delete(",").to_i else capture end
     end)]
   end
 end

data/lib/Olib/ext/string.rb

@@ -1,6 +1,6 @@
 class String
   def is_i?
-    !!(self =~ /\A[-+]?[0-9]+\z/)
+    !!(self.delete(",") =~ /\A[-+]?[0-9]+\z/)
   end
 
   def methodize

data/lib/Olib/go2.rb

@@ -29,23 +29,32 @@ class Go2
     Go2.define_singleton_method(tag.methodize) do Go2.room(tag) end
   end
 
-  def Go2.room(roomid)
-    unless Room.current.id == roomid || Room.current.tags.include?(roomid)
+  def Go2.run(target)
+    Script.run "go2", ("%s _disable_confirm_" % target)
+  end
+
+  def Go2.room(target)
+    starting_room = Room.current.id
+    unless Room.current.id == target || Room.current.tags.include?(target)
       Char.unhide if hidden
-      Script.run("go2", "#{roomid} _disable_confirm_")
+      Go2.run(target)
+      if block_given?
+        yield
+        starting_room
+      end
     end
     Go2
   end
 
   def Go2.origin
-    Go2.room @@origin[:roomid]
+    Go2.room @@origin[:target]
     Char.hide if @@origin[:hidden]
     Go2
   end
 
   def Go2.rebase
     @@origin            = {}
-    @@origin[:roomid]   = Room.current.id
+    @@origin[:target]   = Room.current.id
     @@origin[:hidden]   = hiding?
     @@origin[:location] = Room.current.location
     Go2

data/lib/Olib/version.rb

@@ -1,3 +1,3 @@
 module Olib
-  VERSION = "2.0.0-rc.6"
+  VERSION = "2.0.0-rc.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: Olib
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.rc.6
+  version: 2.0.0.pre.rc.7
 platform: ruby
 authors:
 - Ondreian Shamsiel