Olib 2.0.0.pre.rc.1 → 2.0.0.pre.rc.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3847ae46163103e49356d4e6fcc43badaa3b4ddd29a9ea3ad48c509203b5eb7
-  data.tar.gz: 6ff8a42a9ca26c9cf394bd311ff7095052b7a507005b34aa42d73d63f9701a79
+  metadata.gz: 59092281655cf2bb6035a9bf6117a4cd1b88539c2eb971041d13910f4d319f55
+  data.tar.gz: 26d0a65a8edfeba5077b6e9efc0887d8bdbcad394fa4b29af015a9281ab00f12
 SHA512:
-  metadata.gz: eb34b92ed44adeab5c1b15e7ae65f73124d7557af2c613bef5113c7efe76607e362807553076d52f51f05b95787b93adbf65cb3893343962af82485f008098d0
-  data.tar.gz: c89d3853c1d5569f7ed375269a047cf7eee943dde1f5ad8b11eb9c2ffb0e1abd29bdf9df8893491afb1cd4f0b29fb1c3df440d3559fc133f8db4119d390a8856
+  metadata.gz: '038216104dd7f79a3d45d181a759b56256ed6bf611dfcece8f8c777886f6a5371c2476381af7ecc447567169265e9299275973f18fd492d32f37ba5573d86a7d'
+  data.tar.gz: 1638f640f0540fc425937dd963a4914e0d44cbb391cc77f2417bb9a9e99b6c4107733818ad4448b1c3858149c803fa9933d164307070040593ecd3d6768de2a0

data/lib/Olib/character/group.rb

@@ -95,6 +95,7 @@ module Group
       "<#{name}: @leader=#{leader?} @status=#{status}>"
     end
   end
+
   MEMBERS    = Members.new
   OPEN       = :open
   CLOSED     = :closed
@@ -156,9 +157,7 @@ module Group
 
   def Group.disks
     return [Disk.find_by_name(Char.name)].compact unless Group.leader?
-    members.map(&:name).map do |name| 
-      Disk.find_by_name(name) 
-    end.compact
+    members.map(&:name).map do |name|  Disk.find_by_name(name) end.compact
   end
   
   def Group.to_s
@@ -199,13 +198,15 @@ module Group
     # <a exist="-10467645" noun="Oreh">Oreh</a> joins your group.
     # You add <a exist="-10467645" noun="Oreh">Oreh</a> to your group.
     # You remove <a exist="-10467645" noun="Oreh">Oreh</a> from the group.
-    JOIN   = %r{^<a exist="(?<id>[\d-]+)" noun="(?<noun>[A-Za-z]+)">(?<name>\w+?)</a> joins your group.$}
-    LEAVE  = %r{^<a exist="(?<id>[\d-]+)" noun="(?<noun>[A-Za-z]+)">(?<name>\w+?)</a> leaves your group.$}
-    ADD    = %r{^You add <a exist="(?<id>[\d-]+)" noun="(?<noun>[A-Za-z]+)">(?<name>\w+?)</a> to your group.$}
-    REMOVE = %r{^You remove <a exist="(?<id>[\d-]+)" noun="(?<noun>[A-Za-z]+)">(?<name>\w+?)</a> from the group.$}
-    NOOP   = %r{^But <a exist="(?<id>[\d-]+)" noun="(?<noun>[A-Za-z]+)">(?<name>\w+?)</a> is already a member of your group!$}
-    EXIST  = %r{<a exist="(?<id>[\d-]+)" noun="(?<noun>[A-Za-z]+)">(?<name>\w+?)</a>}
-    ANY    = Regexp.union(JOIN, LEAVE, ADD, REMOVE, NOOP)
+    # You disband your group.
+    JOIN    = %r{^<a exist="(?<id>[\d-]+)" noun="(?<noun>[A-Za-z]+)">(?<name>\w+?)</a> joins your group.$}
+    LEAVE   = %r{^<a exist="(?<id>[\d-]+)" noun="(?<noun>[A-Za-z]+)">(?<name>\w+?)</a> leaves your group.$}
+    ADD     = %r{^You add <a exist="(?<id>[\d-]+)" noun="(?<noun>[A-Za-z]+)">(?<name>\w+?)</a> to your group.$}
+    REMOVE  = %r{^You remove <a exist="(?<id>[\d-]+)" noun="(?<noun>[A-Za-z]+)">(?<name>\w+?)</a> from the group.$}
+    NOOP    = %r{^But <a exist="(?<id>[\d-]+)" noun="(?<noun>[A-Za-z]+)">(?<name>\w+?)</a> is already a member of your group!$}
+    EXIST   = %r{<a exist="(?<id>[\d-]+)" noun="(?<noun>[A-Za-z]+)">(?<name>\w+?)</a>}
+    DISBAND = %r{^You disband your group}
+    ANY     = Regexp.union(JOIN, LEAVE, ADD, REMOVE, NOOP)
   end
 
   GROUP_OBSERVER = -> line {
@@ -283,6 +284,10 @@ module Group
   end
 
   def self.broken?
-    (GameObj.pcs.to_a.map(&:noun) & Group.members.map(&:noun)).size.eql?(Group.members.size)
-  end   
+    if Group.leader?
+      (GameObj.pcs.map(&:noun) & Group.members.map(&:noun)).size < Group.members.size
+    else
+      GameObj.pcs.find do |pc| pc.noun.eql?(Group.leader.noun) end.nil?
+    end
+  end
 end

data/lib/Olib/combat/creature.rb

@@ -7,29 +7,39 @@
 require "ostruct"
 require "Olib/combat/creatures"
 require "Olib/core/exist"
+require "Olib/pattern_matching/rill"
 
 class Creature < Exist
   include Comparable
 
-  WOUNDS = [
-    :right_leg, :left_leg, :right_arm, 
-    :left_arm, :head, :neck, :chest, 
-    :abdomen, :back, :left_eye, :right_eye, 
-    :right_hand, :left_hand, :nerves,
+  Search = Rill.new(
+    timeout: 1,
+    start:   Rill.union(%(You search the <pushBold/><a exist="{{id}}"),))
+
+  Skin = Rill.new(
+    start: Rill.union(%[You skinned the <pushBold/><a exist="{{id}}"],
+                      %[You botched],
+                      %[has already"]))
+
+  Attack = Rill.new(
+    timeout: 2,
+    start:   Rill.union(%[You (.*?) at <pushBold/>(a|an|some) <a exist="{{id}}],
+                      %[A little bit late],
+                      %[already dead], 
+                      %[I could not find what you were referring to],
+                      %[What were you referring to?]))
+
+  WOUNDS = %i[
+    right_leg left_leg right_arm 
+    left_arm head neck chest 
+    abdomen back left_eye right_eye 
+    right_hand left_hand nerves
   ]
 
   TAGS = OpenStruct.new(
-    antimagic: /construct|Vvrael/,
-    grimswarm: /grimswarm/,
-    lowly:     /kobold|rolton|velnalin|urgh/,
-    trollish:  /troll|csetari/,
-    undead:    Regexp.union(
-      /zombie|ghost|skele|ghoul|spectral|wight|shade/,
-      /spectre|revenant|apparition|bone|were|rotting/,
-      /spirit|soul|barghest|vruul|night|phant|naisirc/,
-      /shrickhen|seraceris|n'ecare|vourkha|bendith/,
-      /baesrukha|lich|dybbuk|necrotic|flesh|waern|banshee/,
-      /seeker|eidolon|decay|putrefied|vaespilon/),
+    antimagic: %r[construct|Vvrael],
+    lowly:     %r[kobold|rolton|velnalin|urgh],
+    trollish:  %r[troll|csetari],
   )
 
   def self.tags(name)
@@ -201,38 +211,56 @@ class Creature < Exist
     status.include?(:dead)
   end
 
+  def block(method)
+    return {err: :dead} if dead?
+    Kernel.send(method)
+    return {err: :dead} if dead?
+    yield if block_given?
+  end
+
   def kill
-    unless dead?
-      fput "kill ##{@id}"
+    block(:waitrt?) do
+      Attack.capture(self.to_h, %[kill \#{{id}}])
+    end
+  end
+
+  def cast
+    block(:waitcastrt?) do
+      Attack.capture(self.to_h, %[cast \#{{id}}])
     end
-    self
   end
 
   def fire(location=nil)
-    unless dead?
-      Char.aim(location) if location
-      fput "fire ##{@id}"
+    Char.aim(location) if location
+    block(:waitrt?) do
+      Attack.capture(self.to_h, %[fire \#{{id}}])
     end
-    self
   end
 
   def hurl(location=nil)
-    unless dead?
-      Char.aim(location) if location
-      fput "hurl ##{@id}"
+    Char.aim(location) if location
+    block(:waitrt?) do
+      Attack.capture(self.to_h, %[hurl \#{{id}}])
     end
-    self
   end
 
-  def search
+  def search()
     waitrt?
-    fput "search ##{@id}" if dead?
+    return unless dead?
+    (_, lines) = Search.capture(self.to_h, %[search \#{{id}}])
+    # the first line containers a creature id we want to avoid capturing
+    lines[1..-1]
+    .map do |line| Exist.scan(line) end
+    .flatten.compact.reject(&:gone?)
   end
 
-  def skin
+  def skin()
     waitrt?
-    fput "skin ##{@id}" if dead?
-    self
+    return unless dead?
+    (_, lines) = Skin.capture(self.to_h, %[skin \#{{id}}])
+    lines
+    .map do |line| Exist.scan(line.split("yielding").last) end
+    .flatten.compact.reject(&:gone?)
   end
 end
 

data/lib/Olib/core/exist.rb

@@ -2,7 +2,8 @@
 require "Olib/core/action"
 
 class Exist
-  GETTER = %r[\w$]
+  GETTER  = %r[\w$]
+  PATTERN = %r(<a exist=(?:'|")(?<id>.*?)(?:'|") noun=(?:'|")(?<noun>.*?)(?:'|")>(?<name>.*?)</a>)
 
   def self.fetch(id)
     [ GameObj.inv, GameObj.containers.values, 
@@ -12,8 +13,12 @@ class Exist
                                              .find do |item| item.id.to_s.eql?(id.to_s) end
   end
 
+  def self.scan(str)
+    str.scan(PATTERN).map do |matches| Item.new(GameObj.new(*matches)) end
+  end
+
   def self.normalize_type_data(type)
-    (type or "").gsub(",", " ").split(" ")
+    (type or "").gsub(",", " ").split(" ").compact
   end
 
   attr_reader :id, :gameobj
@@ -35,6 +40,8 @@ class Exist
   end
 
   def method_missing(method, *args)
+    return nil if fetch.nil?
+
     if respond_to_missing?(method)
       fetch.send(method, *args)
     else
@@ -51,7 +58,7 @@ class Exist
   end
 
   def tags
-    Exist.normalize_type_data(type).map(&:to_sym)
+    Exist.normalize_type_data("#{type},#{sellable}").map(&:to_sym)
   end
 
   def effects

data/lib/Olib/core/item.rb

@@ -53,6 +53,10 @@ class Item < Exist
     Transaction.new(take, **args)
   end
 
+  def appraise(**args)
+    transaction(**args).appraise()
+  end
+
   def sell(**args)
     transaction(**args).sell()
   end

data/lib/Olib/ext/matchdata.rb

@@ -3,7 +3,7 @@ require "Olib/ext/string"
 
 class MatchData
   def to_struct
-    OpenStruct.new to_hash
+    OpenStruct.new to_h
   end
 
   def to_h

data/lib/Olib/pattern_matching/any.rb

@@ -1,11 +0,0 @@
-require "Olib/pattern_matching/result"
-
-class Any < Result
-  def self.===(*args)
-    true
-  end
-
-  def ===(other)
-    true
-  end
-end

data/lib/Olib/pattern_matching/result.rb

@@ -1,3 +1,6 @@
+
+require "Olib/pattern_matching/any"
+
 class Result
   def self.included(ctx)
     ctx.include(Result::Constructors)
@@ -32,7 +35,9 @@ class Result
     expected.all? do |k, v|
       if this.respond_to?(k.to_sym)
         _compare_values(v, this.send(k.to_sym))
-      elsif this.respond_to?(:[])
+      elsif this.is_a?(Array) and k.is_a?(Fixnum)
+        _compare_values(v, this[k.to_i])
+      elsif this.respond_to?(:[]) and not this.is_a?(Array)
         _compare_values(v, this[k.to_s]) or _compare_values(v, this[k.to_sym])
       else
         false
@@ -77,4 +82,14 @@ class Result
       Err[*args]
     end
   end
+end
+
+class Any < Result
+  def self.===(*args)
+    true
+  end
+
+  def ===(other)
+    true
+  end
 end

data/lib/Olib/pattern_matching/rill.rb

@@ -3,16 +3,21 @@ require "Olib/pattern_matching/outcome"
 require "Olib/ext/matchdata"
 
 class Rill
+  def self.union(*patterns)
+    patterns.join("|")
+  end
+
   PROMPT = /<prompt/
 
   include Enumerable
-  attr_reader :close, :start, :mode
+  attr_reader :close, :start, :mode, :timeout
 
-  def initialize(start: nil, close: PROMPT, mode: :xml)
+  def initialize(start: nil, close: PROMPT, mode: :xml, timeout: 5)
     fail "Rill.new() requires :start argument" if start.nil?
     @mode    = mode
     @close   = Outcome.new(close)
     @start   = Outcome.new(start)
+    @timeout = timeout
   end
 
   def capture(obj, command_template)
@@ -27,13 +32,13 @@ class Rill
     state         = :start
     lines         = []
     matches       = {}
-    XML.cmd(command) do |line|
+    XML.cmd(command, pattern: begin_pattern, timeout: @timeout) do |line|
       state = :open  if line.match(begin_pattern)
       lines  << line if state.eql?(:open)
-      if (result = (line.match(begin_pattern) || line.match(end_pattern)))
+      if (result = (line.match(begin_pattern) or line.match(end_pattern)))
         matches.merge!(result.to_h)
       end
-      return [matches, lines] if (line.match(end_pattern) and state.eql?(:open))
+      return {ok: 1, matches: matches, lines: lines} if (line.match(end_pattern) and state.eql?(:open))
     end
   end
 

data/lib/Olib/version.rb

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

data/lib/Olib/xml.rb

@@ -17,11 +17,15 @@ module XML
     result
   end
 
-  def self.cmd(cmd)
+  def self.cmd(cmd, timeout: 5, pattern:)
     XML.tap do 
-      fput(cmd)
+      result = dothistimeout(cmd, timeout, pattern)
+      return nil if result.nil?
+      yield(result)
+      ttl = Time.now + timeout
       while line = get
         yield(line)
+        break if Time.now > ttl
       end
     end
   end

metadata

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