openra 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 34349d5f69e993dc5c62afef3b1faabf20bd56c6
-  data.tar.gz: ee22bb04ead0b72e1a5526448bc901b9fb447cea
+  metadata.gz: 62b93a256a360d12ed36a4b50207648cb78f0db6
+  data.tar.gz: 2cd510fb3f3bb34916f1ecc278f3dea352ed31a6
 SHA512:
-  metadata.gz: c0f19e0167ac3ec21e7edeab7e58495e8cc3414e56b98da98b3519430510fcce723b5693877777abb68e3da075f6453c0515a4ddbc123dd518b13725a6401626
-  data.tar.gz: b88312025fe593bd92996790f618b87489dc69a1af381885696424396a4476ef8edc78f1ab9a3ca294fcc65309fd2fbe4e35497eaf2adde163a124bb7f0b0cf8
+  metadata.gz: 9d378e1942e96d258d4d96228812435a9404aab7301f7b40e0426167745acb2755c04b6a3c4e09474f04fbec7f8abc2c1fd9d05107995472776ff87ab9137c88
+  data.tar.gz: b62c614956326db37a276fdd845264d2bd30ed8babd4c126442a6afd187409f2e54845007c2691af1c0bbfb1c7f907d5f28bc343341e357e90d544e7f552895c

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

@@ -12,49 +12,87 @@ module Openra
         def call(replay:, **options)
           replay = Openra::Replays::Replay.new(replay)
 
-          client_index_mapping = {}
           players = replay.metadata.each_with_object([]) do |(key, value), arr|
             next unless key.start_with?('Player')
-            arr << value['Name']
+            arr << value
+          end
+          player_indices = players.map { |player| player['ClientIndex'] }
+          player_teams = players.map { |player| player['Team'] }
+          team_alignment = player_teams.each_with_object({}) do |team, hash|
+            if team == 0
+              hash[SecureRandom.uuid] = 1
+            else
+              hash[team] ||= 0
+              hash[team] += 1
+            end
           end
 
           replay_data = {
             mod: replay.mod,
             version: replay.version,
+            server_name: nil,
             map: {
-              name: replay.map_title,
+              name: utf8(replay.map_title),
               hash: replay.map_id
             },
             game: {
+              type: team_alignment.values.join('v'),
               start_time: replay.start_time,
               end_time: replay.end_time,
-              duration: replay.duration
+              duration: replay.duration,
+              options: {}
             },
             clients: [],
             chat: []
           }
 
-          # Get all clients
-          replay.orders.select { |order| order.command == 'SyncLobbyClients' }.each do |order|
-            clients = Openra::YAML.load(order.target)
-            clients.each_pair do |_, client|
-              next if client_index_mapping.include?(client['Index'])
+          timestep = nil
+          sync_info_orders = replay.orders.select do |order|
+            order.command == 'SyncInfo'
+          end
+          num_sync_info_orders = sync_info_orders.length
+
+          sync_info_orders.each.with_index do |sync_info_order, index|
+            sync_info = Openra::YAML.load(sync_info_order.target)
 
-              replay_data[:clients] << {
-                index: client['Index'],
-                name: client['Name'],
-                preferred_color: client['PreferredColor'],
-                color: client['Color'],
-                faction: client['Faction'],
-                ip: client['IpAddress'],
-                team: client['Team'] == 0 ? nil : client['Team'],
-                is_bot: client['Bot'].nil? ? false : true,
-                is_admin: client['IsAdmin'] == 'True',
-                is_player: players.include?(client['Name']),
-                build: []
-              }
+            # Get all clients
+            sync_info.each_pair do |key, data|
+              case key
+              when /^Client@/
+                replay_data[:clients] << {
+                  index: data['Index'],
+                  name: utf8(data['Name']),
+                  preferred_color: data['PreferredColor'],
+                  color: data['Color'],
+                  faction: data['Faction'],
+                  ip: data['IpAddress'],
+                  team: data['Team'] == 0 ? nil : data['Team'],
+                  is_bot: data['Bot'].nil? ? false : true,
+                  is_admin: data['IsAdmin'] == 'True',
+                  is_player: player_indices.include?(data['Index']),
+                  build: []
+                }
+              when 'GlobalSettings'
+                next unless index.next == num_sync_info_orders
 
-              client_index_mapping[client['Index']] = client
+                timestep = data['Timestep']
+                replay_data[:server_name] = data['ServerName']
+                replay_data[:game][:options] = {
+                  explored_map: data['Options']['explored']['Value'] == 'True',
+                  speed: data['Options']['gamespeed']['Value'],
+                  starting_cash: data['Options']['startingcash']['Value'],
+                  starting_units: data['Options']['startingunits']['Value'],
+                  fog_enabled: data['Options']['fog']['Value'] == 'True',
+                  cheats_enabled: data['Options']['cheats']['Value'] == 'True',
+                  kill_bounty_enabled: data['Options']['bounty']['Value'] == 'True',
+                  allow_undeploy: data['Options']['factundeploy']['Value'] == 'True',
+                  crated_enabled: data['Options']['crates']['Value'] == 'True',
+                  build_off_allies: data['Options']['allybuild']['Value'] == 'True',
+                  restrict_build_radius: data['Options']['buildradius']['Value'] == 'True',
+                  short_game: data['Options']['shortgame']['Value'] == 'True',
+                  techlevel: data['Options']['techlevel']['Value']
+                }
+              end
             end
           end
 
@@ -79,7 +117,7 @@ module Openra
 
               replay_data[:chat] << {
                 name: client[:name],
-                message: order.target
+                message: utf8(order.target)
               }
             end
           end
@@ -91,6 +129,12 @@ module Openra
             puts JSON.pretty_generate(replay_data)
           end
         end
+
+        private
+
+        def utf8(string)
+          string.force_encoding('UTF-8')
+        end
       end
     end
   end

data/lib/openra/replays.rb

@@ -1,3 +1,4 @@
+require 'date'
 require 'bindata'
 require 'big_integer'
 require 'pascal_string'

data/lib/openra/replays/replay.rb

@@ -32,14 +32,14 @@ module Openra
       end
 
       def start_time
-        @start_time ||= DateTime.strptime(
+        @start_time ||= ::DateTime.strptime(
           metadata['Root']['StartTimeUtc'],
           '%Y-%m-%d %H-%M-%S'
         ).to_time
       end
 
       def end_time
-        @end_time ||= DateTime.strptime(
+        @end_time ||= ::DateTime.strptime(
           metadata['Root']['EndTimeUtc'],
           '%Y-%m-%d %H-%M-%S'
         ).to_time

data/lib/openra/version.rb

@@ -1,3 +1,3 @@
 module Openra
-  VERSION = '0.0.2'.freeze
+  VERSION = '0.0.3'.freeze
 end

metadata

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