Olib 2.0.0.pre.rc.2 → 2.0.0.pre.rc.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 59092281655cf2bb6035a9bf6117a4cd1b88539c2eb971041d13910f4d319f55
-  data.tar.gz: 26d0a65a8edfeba5077b6e9efc0887d8bdbcad394fa4b29af015a9281ab00f12
+  metadata.gz: 88c17ccdc2fc52aecad952d952a46005a5fbff7103a1b650d29d4d65f437a17a
+  data.tar.gz: 187d49baaf0362d38b87805b5beb71e345ce95654588095020b4a8de0f190a8e
 SHA512:
-  metadata.gz: '038216104dd7f79a3d45d181a759b56256ed6bf611dfcece8f8c777886f6a5371c2476381af7ecc447567169265e9299275973f18fd492d32f37ba5573d86a7d'
-  data.tar.gz: 1638f640f0540fc425937dd963a4914e0d44cbb391cc77f2417bb9a9e99b6c4107733818ad4448b1c3858149c803fa9933d164307070040593ecd3d6768de2a0
+  metadata.gz: 72af6ca80a60fa8527c7edbcab8697a8e8730989866d90a73f094dbdb5e550b4e1171e609c5fcc6ede53a8b9e4e4b8fd94e0a4cdf79d05d01f3ada904b2b543d
+  data.tar.gz: c6a9e86b1b0c33355a30e1262fde92800b82edc50e13dee9bcf048fdfb942819c9db3484e90e2ce443331316baed64130d6ee2ee3a7d43515695d7e4e1ff898e

data/lib/Olib/combat/creature.rb

@@ -49,12 +49,25 @@ class Creature < Exist
     end
   end
 
+  def self.stem_name(foe)
+    foe.name.split(" ").slice(1..-1).join(" ")
+  end
+
+  def self.add_boss_type(foe)
+    return if foe.tags.include?(:aggressive)  
+    if GameObj.type_data["aggressive npc"][:name].match stem_name(foe)
+      foe.tags << :aggressive
+      foe.tags << :npc
+    end
+  end
+
   attr_accessor :wounds, :tags
   def initialize(creature)
     super(creature)
     @wounds = {}
     @tags   = (Exist.normalize_type_data(creature.type) + (metadata["tags"] || []) ).map(&:to_sym)
     TAGS.each_pair do |tag, pattern| @tags << tag if @name =~ pattern end
+    Creature.add_boss_type(self)
     heal
   end
 

data/lib/Olib/combat/creatures.rb

@@ -15,7 +15,6 @@ class Creatures
 
   STATES = %i[
     prone sitting kneeling
-    dead 
     sleeping webbed immobile
     stunned 
     flying
@@ -48,9 +47,9 @@ class Creatures
   end
 
   def each()    
-    GameObj.npcs.to_a.map do |obj| Creature.new(obj) end
+    GameObj.targets.to_a.map do |obj| Creature.new(obj) end
       .select(&@predicate)
-      .each do |creature| yield(creature) if GameObj[creature.id] and creature.aggressive? end
+      .each do |creature| yield(creature) if GameObj[creature.id] end
   end
 
   def respond_to_missing?(method, include_private = false)
@@ -75,6 +74,12 @@ class Creatures
     Creatures.new do |creature| creature.name.include?(Bounty.creature) end
   end
 
+  def dead
+    GameObj.npcs.to_a
+      .select do |c| c.status.include?("dead") end
+      .map do |obj| Creature.new(obj) end
+  end
+
   def self.method_missing(method, *args, &block)
     if respond_to?(method)
       Creatures.new.send(method, *args, &block)

data/lib/Olib/core/container.rb

@@ -26,6 +26,10 @@ class Container < Exist
     GameObj.containers.fetch(id, []).map do |item| Item.new(item, self) end
   end
 
+  def closed?
+    not GameObj.containers[id]
+  end
+
   def each(&block)
     contents.each(&block)
   end

data/lib/Olib/core/containers.rb

@@ -1,31 +1,45 @@
 require "Olib/pattern_matching/pattern_matching"
 
 module Containers
-  @@containers = {}
-
-  def self.find_game_obj!(name)
-    var     = Vars[name.to_s] or fail Exception, "Var[#{name}] is not set\n\t;vars set #{name}=<whatever>"
-    pattern = %r[#{var}]
-    GameObj.inv.find(&Where[name: pattern]) or fail Exception, "#{name.capitalize}(#{var}) could not be found in GameObj.inv"
+  @@containers ||= {}
+
+  def self.find_game_obj!(pattern)
+    candidates = GameObj.inv.select do |item|
+      if pattern.class.is_a?(String)
+        item.name.include?(pattern)
+      else
+        item.name.match(pattern)
+      end
+    end
+    case candidates.size
+    when 1
+      return Container.new(candidates.first)
+    when 0
+      fail Exception, <<~ERROR
+        Source(GameObj.inv)
+
+         reason: no matches for Pattern(#{pattern}) found in GameObj.inv
+      ERROR
+    else
+      fail Exception, <<~ERROR
+        Source(GameObj.inv)
+
+         reason: aspecific Container[#{pattern.to_s}] found
+        matches: #{candidates.map(&:name)}
+      ERROR
+    end
   end
 
   def self.define(name)
-    @@containers[name] = Container.new(
-      Containers.find_game_obj!(name))
+    var = Vars[name.to_s] or fail Exception, "Var[#{name}] is not set\n\t;vars set #{name}=<whatever>"
+    pattern = %r[#{var}]
+    @@containers[name] = Containers.find_game_obj!(pattern)
     @@containers[name]
   end
 
-  def self.method_missing(name, *args)
-    return @@containers[name] if @@containers[name]
-    return self.define(name)
-  end
-
   def self.[](name)
-    begin
-      self.define(name)
-    rescue Exception => err
-      Err(why: err.message, error: err)
-    end
+    return define(name) if name.is_a?(Symbol)
+    find_game_obj!(name)
   end
 
   def self.right_hand
@@ -39,4 +53,9 @@ module Containers
   def self.registry
     @@containers
   end
+
+  def self.method_missing(name, *args)
+    return @@containers[name] if @@containers[name]
+    return self.define(name)
+  end
 end

data/lib/Olib/version.rb

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

metadata

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