reinforce 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b82c7c72df9adcff276fa371cb5c8d953cbdd6ca9a539699e721ee7a77c38008
-  data.tar.gz: b1448e586008e393b8340fe4f3eaa6229f1a26fdc0e4005d0b4531472a5bcee6
+  metadata.gz: ce4b276c117912159c3ae62126f7b8f64e9742696a7e1d266e9da4f80f12e55c
+  data.tar.gz: dce5ee59db328ccbb329abf60325f46443ec2525e16684df73cf8b7dab6cec0c
 SHA512:
-  metadata.gz: 960628d6ec125a2e4f08ad0e910f2204942d2c4eb75ebf27fb6f4ed3f3ffd673cdbfcd44aa060abf8873ccf48381a96491411ae839848655c3c63681d01a8e9d
-  data.tar.gz: 1dfa500def6c6de0cc24e106ebfeb36f2235d53f442cdd87226e8d3338e5b4bfc05d308dfe76cd3f48a627afd863cf125a9d4dffc96fd49af6b5f0cd6448b11b
+  metadata.gz: 37167278ccbab5f28625b1c65ba5b32597ffd4956714b46c9b3478286c63d73dda7f2e8f09235ed435844fe900945dfab50bf1b40d264aded5f067428745c179
+  data.tar.gz: b1ef2dd4a85fcbbab874d2095a1c9e507dc682249dc9365e10330a34edee90f53a6c73b5d6082398fc004f24453d9fae25d0dc455007625d06d52093487bf467

data/lib/reinforce/attributes/collection.rb

@@ -80,14 +80,48 @@ module Reinforce
         return nil if build.nil?
 
         build = last_build if build == LATEST_BUILD
-        @pbgid_keyed.dig(build, pbgid) || get_by_pbgid(pbgid, build: previous_build_for(build))
+
+        cursor = build
+        until cursor.nil?
+          value = @pbgid_keyed.dig(cursor, pbgid)
+          return value unless value.nil?
+
+          cursor = previous_build_for(cursor)
+        end
+
+        cursor = next_build_for(build)
+        until cursor.nil?
+          value = @pbgid_keyed.dig(cursor, pbgid)
+          return value unless value.nil?
+
+          cursor = next_build_for(cursor)
+        end
+
+        nil
       end
 
       def get_by_path(path, build: LATEST_BUILD)
         return nil if build.nil?
 
         build = last_build if build == LATEST_BUILD
-        @path_keyed.dig(build, path) || get_by_path(path, build: previous_build_for(build))
+
+        cursor = build
+        until cursor.nil?
+          value = @path_keyed.dig(cursor, path)
+          return value unless value.nil?
+
+          cursor = previous_build_for(cursor)
+        end
+
+        cursor = next_build_for(build)
+        until cursor.nil?
+          value = @path_keyed.dig(cursor, path)
+          return value unless value.nil?
+
+          cursor = next_build_for(cursor)
+        end
+
+        nil
       end
 
       def populate(build, data, rehash: true)
@@ -135,6 +169,10 @@ module Reinforce
         @pbgid_keyed.keys.sort.reverse.find { |b| b < build }
       end
 
+      def next_build_for(build)
+        @pbgid_keyed.keys.sort.find { |b| b > build }
+      end
+
       def rehash(hash)
         previous = nil
 

data/lib/reinforce/factory.rb

@@ -6,7 +6,8 @@ module Reinforce
     PRODUCTION_COMMANDS = %w[BuildSquad BuildGlobalUpgrade].freeze
     BATTLEGROUP_COMMANDS = %w[SelectBattlegroup SelectBattlegroupAbility UseBattlegroupAbility].freeze
     CANCEL_COMMANDS = %w[CancelConstruction CancelProduction].freeze
-    ALL_COMMANDS = BUILDING_COMMANDS + PRODUCTION_COMMANDS + BATTLEGROUP_COMMANDS + CANCEL_COMMANDS
+    AI_COMMANDS = %w[AITakeover].freeze
+    ALL_COMMANDS = BUILDING_COMMANDS + PRODUCTION_COMMANDS + BATTLEGROUP_COMMANDS + CANCEL_COMMANDS + AI_COMMANDS
 
     def initialize(player, build_number)
       @player = player.to_h
@@ -14,10 +15,11 @@ module Reinforce
       @buildings = []
       @productions = {}
       @battlegroup = []
+      @takeover = []
     end
 
     def build(with_cancellations: false)
-      commands.each { |c| classify_command(c) }
+      commands.each { |c| break if classify_command(c) == false }
       result = consolidate
       result = rectify_suspects(result)
       result = result.reject(&:cancelled?) unless with_cancellations
@@ -40,16 +42,22 @@ module Reinforce
         classify_battlegroup_command(command)
       elsif CANCEL_COMMANDS.include?(command.action_type)
         process_cancellation(command)
+      elsif AI_COMMANDS.include?(command.action_type)
+        process_takeover(command)
       end
     end
 
     def classify_building_command(command)
       @buildings << command if command.details.autobuild?
+
+      true
     end
 
     def classify_production_command(command)
       @productions[command.source] ||= []
       @productions[command.source] << command
+
+      true
     end
 
     def classify_battlegroup_command(command)
@@ -58,6 +66,8 @@ module Reinforce
       else
         @battlegroup << command
       end
+
+      true
     end
 
     def process_cancellation(command)
@@ -66,10 +76,20 @@ module Reinforce
       else
         @productions[command.source][command.index - 1].cancel
       end
+
+      true
+    end
+
+    def process_takeover(command)
+      return true unless @player[:human]
+
+      @takeover << command
+
+      false
     end
 
     def consolidate
-      build = @buildings + @battlegroup + @productions.values.flatten
+      build = @buildings + @battlegroup + @takeover + @productions.values.flatten
       build.sort_by(&:tick)
     end
 

data/lib/reinforce/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Reinforce
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: reinforce
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - ryantaylor
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '6.2'
 description: A tool for extracting accurate build orders from Company of Heroes 3
   replay files.
 email: