Olib 2.0.0.pre.rc.5 → 2.0.0.pre.rc.6

data/lib/Olib/combat/creatures.rb

@@ -1,11 +1,8 @@
-require 'net/http'
 require 'json'
 # a collection for managing all of the creatures in a room
 
 class Creatures
   include Enumerable
-
-  METADATA_URL = "https://cdn.rawgit.com/ondreian/gemstone_data_project/c40a5dfb/creatures.json"
   
   ARCHETYPES = %i[ 
     undead living weak
@@ -22,22 +19,6 @@ class Creatures
 
   KINDS = ARCHETYPES + STATES
 
-  def self.fetch_metadata()
-    begin
-      JSON.parse Net::HTTP.get URI METADATA_URL
-    rescue
-      puts $!
-      puts $!.backtrace[0..1]
-      []
-    end
-  end
-
-  METADATA = fetch_metadata()
-  BY_NAME  = METADATA.reduce(Hash.new) do |by_name, record|
-    by_name[record["name"]] = record
-    by_name
-  end
-
   ALL = -> creature { true }
 
   attr_reader :predicate

data/lib/Olib/combat/metadata.rb

@@ -0,0 +1,13 @@
+class Creatures
+  module Metadata
+    @repo = JSON.parse File.read File.join(__dir__, "creatures.json")
+
+    def self.put(name:, level:, tags: [])
+      @repo[name.downcase] = {name: name, level: level, tags: tags}
+    end
+
+    def self.get(name)
+      @repo.fetch(name.downcase) do {name: name, level: Char.level, tags: []} end
+    end
+  end
+end

data/lib/Olib/core/container.rb

@@ -23,7 +23,7 @@ class Container < Exist
   end
 
   def contents
-    GameObj.containers.fetch(id, []).map do |item| Item.new(item, self) end
+    GameObj.containers.fetch(id, []).map do |item| Item.of(item, self) end
   end
 
   def closed?

data/lib/Olib/core/exist.rb

@@ -79,17 +79,9 @@ class Exist
     inspect()
   end
 
-  def inspect(depth= 0)
-    indent = ""
-    indent = "\n" + (["\t"] * depth).join if depth > 0 
-    body = [:id, :name, :tags].reduce("") do |acc, prop|
-      val = send(prop)
-      acc = "#{acc} #{prop}=#{val.inspect}" unless val.nil? or val.empty?
-      acc
-    end.strip
-
-    body = "#{body} contents=[#{contents.map {|i| i.inspect(depth + 1)}.join}]" unless contents.to_a.empty?
-      
-    %[#{indent}#{self.class.name}(#{body})]
+  def deconstruct_keys(keys)
+    keys.each_with_object({}) do |key, acc|
+      acc[key] = self.send(key)
+    end
   end
 end

data/lib/Olib/core/item.rb

@@ -2,6 +2,7 @@ require "ostruct"
 require "Olib/core/exist"
 require "Olib/core/use"
 require "Olib/core/transaction"
+require "Olib/core/scroll"
 
 class GameObj
   def to_item
@@ -12,6 +13,12 @@ end
 # this is the structure for a base Object
 # wraps an instance of GameObj and adds the ability for tags, queries
 class Item < Exist
+  def self.of(item, container = nil)
+    return Scroll.new(item, container) if item.type.include?("scroll")
+    return Item.new(item, container)
+  end
+
+
   def self.fetch(id)
     new Exist.fetch(id)
   end

data/lib/Olib/core/scroll.rb

@@ -0,0 +1,37 @@
+class Scroll < Exist
+  SPELL = %r[\((?<num>\d+)\)\s(?<name>(\w|\s)+)$]
+
+  def initialize(obj, container = nil)
+    super(obj.id)
+    @knowledge = nil
+    @container = container
+  end
+
+  def spells()
+    @_spells ||= _read()
+  end
+
+  def knowledge?
+    spells
+    @knowledge.eql?(true)
+  end
+
+  def _read()
+    Script.current.want_downstream_xml = true
+    dothistimeout("read ##{id}", 5, /It takes you a moment to focus on the/)
+    spells = []
+    @knowledge = false
+    while line = get
+      @knowledge = true if line.include?(%[in vibrant ink])
+      break if line =~ %r[<prompt]
+      _parse_spell(spells, line.strip)
+    end
+    Script.current.want_downstream_xml = false
+    return spells
+  end
+
+  def _parse_spell(spells, line)
+    return unless line =~ SPELL
+    spells << OpenStruct.new(line.match(SPELL).to_h)
+  end
+end

data/lib/Olib/core/transaction.rb

@@ -5,6 +5,7 @@ class Transaction < Exist
     start: %[to appraise (?:a |an |)<a exist="{{id}}"],
     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])
     )
@@ -14,6 +15,9 @@ class Transaction < Exist
     close: Regexp.union(
       %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],
+      %r[Nope #{Char.name}, I ain't buying that\.],
       %r[basically worthless here, #{Char.name}])
     )
   
@@ -33,9 +37,13 @@ class Transaction < Exist
   def appraise()
     return self unless @value.nil?
     take
-    (match, _lines) = Appraise.capture(self.to_h, 
+    (_, match, lines) = Appraise.capture(self.to_h, 
       "appraise \#{{id}}")
-    @value = match[:value].to_i
+    if lines.any? {|line| line.include?(%[Sorry, Pixelia, I'm not buying anything this valuable today.])}
+      @value = Float::INFINITY
+    else
+      @value = match[:value].to_i
+    end
     self
   end
 
@@ -46,8 +54,12 @@ class Transaction < Exist
         transaction: self,
         reason:      "Value[#{@value}] is over Threshold[#{@threshold}]"] 
     end
-    (match, _lines) = Sell.capture(self.to_h, 
+  
+    (_, match, _lines) = Sell.capture(self.to_h, 
       "sell \#{{id}}")
+
+    
+    match[:value] = 0 unless match[:value].is_a?(Integer)
     Ok[**match]
   end
 end

data/lib/Olib/go2.rb

@@ -32,8 +32,7 @@ class Go2
   def Go2.room(roomid)
     unless Room.current.id == roomid || Room.current.tags.include?(roomid)
       Char.unhide if hidden
-      start_script "go2", [roomid, "_disable_confirm_"]
-      wait_while { running? "go2" };
+      Script.run("go2", "#{roomid} _disable_confirm_")
     end
     Go2
   end

data/lib/Olib/log.rb

@@ -0,0 +1,42 @@
+module Preset
+  def self.as(kind, body)
+    %[<preset id="#{kind}">#{body}</preset>\r\n]
+  end
+end
+##
+## contextual logging
+##
+module Log  
+  require "cgi"
+  def self.out(msg, label: :debug)
+    return _write _view(msg, label) unless msg.is_a?(Exception)
+    ## pretty-print exception
+    _write _view(msg.message, label)
+    msg.backtrace.to_a.slice(0..5).each do |frame| _write _view(frame, label) end
+  end
+
+  def self._write(line)
+    if Script.current.vars.include?("--headless") or not defined?(:_respond)
+      $stdout.write(line + "\n")
+    elsif line.include?("<") and line.include?(">")
+      respond(line)
+    else
+      _respond Preset.as(:debug, CGI.escapeHTML(line))
+    end
+  end
+
+  def self._view(msg, label)
+    label = [Script.current.name, label].flatten.compact.join(".")
+    safe = msg.inspect
+    #safe = safe.gsub("<", "&lt;").gsub(">", "&gt;") if safe.include?("<") and safe.include?(">")
+    "[#{label}] #{safe}"
+  end
+
+  def self.pp(msg, label = :debug)
+    respond _view(msg, label)
+  end
+
+  def self.dump(*args)
+    pp(*args)
+  end
+end

data/lib/Olib/pattern_matching/rill.rb

@@ -38,7 +38,10 @@ class Rill
       if (result = (line.match(begin_pattern) or line.match(end_pattern)))
         matches.merge!(result.to_h)
       end
-      return {ok: 1, matches: matches, lines: lines} if (line.match(end_pattern) and state.eql?(:open))
+
+      if (line.match(end_pattern) and state.eql?(:open))
+        return [:ok, matches, lines]
+      end
     end
   end
 

data/lib/Olib/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: Olib
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.rc.5
+  version: 2.0.0.pre.rc.6
 platform: ruby
 authors:
 - Ondreian Shamsiel
@@ -30,8 +30,11 @@ files:
 - lib/Olib/character/inventory.rb
 - lib/Olib/character/mind.rb
 - lib/Olib/character/stance.rb
+- lib/Olib/combat/attack.rb
 - lib/Olib/combat/creature.rb
+- lib/Olib/combat/creatures.json
 - lib/Olib/combat/creatures.rb
+- lib/Olib/combat/metadata.rb
 - lib/Olib/core/action.rb
 - lib/Olib/core/container.rb
 - lib/Olib/core/containers.rb
@@ -40,6 +43,7 @@ files:
 - lib/Olib/core/item.rb
 - lib/Olib/core/kinds.rb
 - lib/Olib/core/rummage.rb
+- lib/Olib/core/scroll.rb
 - lib/Olib/core/transaction.rb
 - lib/Olib/core/use.rb
 - lib/Olib/core/utils.rb
@@ -50,6 +54,7 @@ files:
 - lib/Olib/ext/string.rb
 - lib/Olib/ext/symbol.rb
 - lib/Olib/go2.rb
+- lib/Olib/log.rb
 - lib/Olib/loot.rb
 - lib/Olib/npcs/npc.rb
 - lib/Olib/npcs/npcs.rb
@@ -59,7 +64,6 @@ files:
 - lib/Olib/objects/jar.rb
 - lib/Olib/objects/jewel.rb
 - lib/Olib/objects/jewelry.rb
-- lib/Olib/objects/scroll.rb
 - lib/Olib/objects/uncommon.rb
 - lib/Olib/objects/wand.rb
 - lib/Olib/opts.rb
@@ -94,8 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.0.pre1
 signing_key: 
 specification_version: 4
 summary: Useful Lich extensions for Gemstone IV

data/lib/Olib/objects/scroll.rb

@@ -1,42 +0,0 @@
-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, 716,
-    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.remove_from_whitelist(*args)
-    @@whitelist = @@whitelist - args
-  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
-end