openra 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d50772fdfb058a097600d6739787d971d4181ea94f889f463f5790d87cae0df
-  data.tar.gz: 325f6d9fae9516003c127b7ea580e69d4fdb45c70183a30e4b2ab35598ff2996
+  metadata.gz: e488c6ceb71360aa93bfcb831c16754fbe2ba4faf55608a7572b8b302e1820bb
+  data.tar.gz: a78247905a1918531599f321bfa3b1c31d4b2520e3f955b55dc15e44c4db3fc5
 SHA512:
-  metadata.gz: 4b7591e6daa6aa379d36f990a01f873826e133a9c5cffacb7bcf63f935148410c67e2936a875da5507b7c14ad1c7c1f4389136fbfb19672fb8028306a3500ade
-  data.tar.gz: 2304fa6ca53e18438a18c213fff87157a7835b4937e391af64cabd4202a2b9aa974e208cda17bbbf7bc2a51dba29585bcfd68c6f973d9fbc671b6ebd4bc758da
+  metadata.gz: e69e8ceeeabbd611d12f54850ffbd89fee488637d895d783c13582d1747426cad2659248d9c38332576125d5c5d0854a6ff82d384f52bfa05ba81dcb9792e9d5
+  data.tar.gz: 4926b3ce501e4c138239bd3660b45baa3199484b8c33ec8bf7fe8ecb0922673c9f1d841e07195fe2db38202217a2e55fbb471faffc31ba4fee6ca1b3a57d001b

data/CHANGELOG.md

@@ -1,6 +1,16 @@
 ## Unreleased
 
-[Compare v2.0.0...HEAD](https://github.com/AMHOL/openra-ruby/compare/v2.0.0...HEAD)
+[Compare v2.1.0...HEAD](https://github.com/AMHOL/openra-ruby/compare/v2.1.0...HEAD)
+
+## v2.1.0
+
+### Added
+
+* [replay-data] Add client fingerprint to output ([AMHOL](https://github.com/AMHOL))
+* [replay-data] Restored placement outputs to x, y, layers hash
+* [replay-data] Added support for bot replays
+
+[Compare v2.0.0...v2.1.0](https://github.com/AMHOL/openra-ruby/compare/v2.0.0...v2.1.0)
 
 ## v2.0.0
 

data/lib/openra/cli/commands/replay_data.rb

@@ -55,10 +55,13 @@ module Openra
 
               data[:clients] = sync_info.clients.map do |client|
                 player = replay.player(client.index)
+                player_index = replay.players.index(player) + FIRST_PLAYER_INDEX if player
 
                 {
                   index: client.index,
+                  player_index: player_index,
                   name: utf8(client.name),
+                  fingerprint: client.fingerprint,
                   preferred_color: client.preferred_color,
                   color: client.color,
                   spawn: {
@@ -112,18 +115,20 @@ module Openra
               client_hash[:support_powers] << {
                 type: key,
                 game_time: time(order.frame * sync_info.global_settings.frametime_multiplier),
-                placement: order.target_pos.to_i,
-                extra_placement: order.extra_pos.to_i
+                placement: cell(order.target_cell.to_i),
+                extra_placement: cell(order.extra_cell.to_i),
               }
             when 'PlaceBuilding'
+              # subject_id stores the player index here
+              # as bot commands are issued by the host client
               client_hash = data[:clients].find do |candidate|
-                candidate[:index] == order.client_index.to_s
+                candidate[:player_index] == order.subject_id
               end
 
               client_hash[:build] << {
                 structure: utf8(order.target),
                 game_time: time(order.frame * sync_info.global_settings.frametime_multiplier),
-                placement: order.target_pos.to_i
+                placement: cell(order.target_cell.to_i)
               }
             when 'Message'
               data[:chat] << {

data/lib/openra/cli/utils.rb

@@ -7,6 +7,16 @@ module Openra
         string.force_encoding('UTF-8')
       end
 
+      def cell(pos)
+        return if pos.zero?
+
+        {
+          x: pos >> 20,
+          y: ((pos >> 4) & 0xFFF0) >> 4,
+          layer: pos & 0xFF
+        }
+      end
+
       def time(msec)
         sec = msec / 1000
         mm, ss = sec.divmod(60)

data/lib/openra/constants.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 module Openra
+  FIRST_PLAYER_INDEX = 3
+
   SUPPORT_POWERS = {
     'ra' => {
       'SovietSpyPlane' => :spy_plane,

data/lib/openra/replays/order.rb

@@ -32,13 +32,13 @@ module Openra
       uint32 :actor_id, onlyif: TARGET_IS_ACTOR
       uint32 :player_actor_id, onlyif: TARGET_IS_FROZEN_ACTOR
       uint32 :frozen_actor_id, onlyif: TARGET_IS_FROZEN_ACTOR
-      int32 :target_pos, onlyif: TARGET_IS_CELL
+      int32 :target_cell, onlyif: TARGET_IS_CELL
       uint8 :target_sub_cell, onlyif: TARGET_IS_CELL
       int32 :pos_x, onlyif: TARGET_NOT_CELL
       int32 :pos_y, onlyif: TARGET_NOT_CELL
       int32 :pos_z, onlyif: TARGET_NOT_CELL
       pascal_string :standard_order_target, onlyif: HAS_TARGET_STRING
-      int32 :extra_pos, onlyif: HAS_EXTRA_LOCATION
+      int32 :extra_cell, onlyif: HAS_EXTRA_LOCATION
       uint32 :extra_data, onlyif: HAS_EXTRA_DATA
 
       def target

data/lib/openra/replays/replay.rb

@@ -25,7 +25,7 @@ module Openra
 
       def player(index)
         players.find do |candidate|
-          candidate.index == index
+          candidate.client_index == index
         end
       end
     end

data/lib/openra/struct/client.rb

@@ -12,6 +12,7 @@ module Openra
         attribute :faction_name, Types::Strict::String.meta(from: 'Faction')
         attribute :spawn_point, Types::Strict::String.meta(from: 'SpawnPoint')
         attribute :name, Types::Strict::String.meta(from: 'Name')
+        attribute :fingerprint, Types::Strict::String.meta(from: 'Fingerprint')
         attribute :ip, Types::Strict::String.meta(from: 'IpAddress')
         attribute :state, Types::Strict::String.meta(from: 'State')
         attribute :team, Types::Strict::String.meta(from: 'Team')

data/lib/openra/struct/player.rb

@@ -3,9 +3,12 @@
 module Openra
   class Struct < Dry::Struct
     class Player < Openra::Struct
+      transform_types(&:omittable)
+
       define do
-        attribute :index, Types::Strict::String.meta(from: 'ClientIndex')
+        attribute :client_index, Types::Strict::String.meta(from: 'ClientIndex')
         attribute :name, Types::Strict::String.meta(from: 'Name')
+        attribute :fingerprint, Types::Strict::String.meta(from: 'Fingerprint')
         attribute :is_human, Types::Params::Bool.meta(from: 'IsHuman')
         attribute :is_bot, Types::Params::Bool.meta(from: 'IsBot')
         attribute :faction_name, Types::Strict::String.meta(from: 'FactionName')

data/lib/openra/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Openra
-  VERSION = '2.0.0'.freeze
+  VERSION = '2.1.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openra
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Andy Holland