openra 3.0.1 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f9c700154d2bb31c15ac83a1edc2ec365fb567c17a4bc2d2e37c920c67de779
-  data.tar.gz: 13ed839f20179328684f677211cf663bc83aad21024105baf26beaf012757b2b
+  metadata.gz: ffa865d3e9489b00e005822cb07c6d586bdeab1f16475a81a0fc752920e46192
+  data.tar.gz: cc8166eeb9d81ba373bd8e570e5ddb82122a2657044321e853683a32de4f7946
 SHA512:
-  metadata.gz: 8bd6a6092972426e71f7f885f6eaa5f56dac5310c285c4b5af80aaaf48b67618d586b861b25151edfc9fbc98fc6f5fa4642dcdca19ea4c0e7a340aee484cd3a1
-  data.tar.gz: 4d2ad04c37f95a9a88f9852bfe36f936f1977e5cfeb72fbc84901911d73f1c5df441569249a53c406c8df9f17430d22aeccdc70962810d432a7c25491390ed7c
+  metadata.gz: 70b0c4a280854133fb7cbb4ea961075393966a781ec1310bb1e33f6cf7198e29c0655a167cdb24731eea1055111e43a0d01210e3db89b1f69ea062873381390a
+  data.tar.gz: be5f4bbbb31afa430c8a78d6987ed7441dcc27107add02583bf66ce7322b1bb2891dd8ae3f5c29afa5d60ab0a1bd1ece4f62f03b26bec6722443d9b03513351d

data/CHANGELOG.md

@@ -1,6 +1,13 @@
 ## Unreleased
 
-[Compare v3.0.1...HEAD](https://github.com/AMHOL/openra-ruby/compare/v3.0.0...HEAD)
+[Compare v4.0.0...HEAD](https://github.com/AMHOL/openra-ruby/compare/v3.0.0...HEAD)
+
+## v4.0.0
+
+* [maint] Support playtest-20201213 - drops support for all older clients
+* [core] Generate file hash in replay-data and replay-metadata commands
+
+[Compare v3.0.1...v4.0.0](https://github.com/AMHOL/openra-ruby/compare/v3.0.1...v4.0.0)
 
 ## v3.0.1
 

data/lib/openra-commands.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 require 'openra/commands'

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

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-# frozen_string_literal: true
-
 module Openra
   class CLI
     module Commands

data/lib/openra/commands/replays/extract_data.rb

@@ -14,6 +14,9 @@ module Openra
             mod: replay.metadata.mod,
             version: replay.metadata.version,
             server_name: nil,
+            file: {
+              hash: replay.file_hash
+            },
             map: {
               name: utf8(replay.metadata.map_name),
               hash: replay.metadata.map_hash

data/lib/openra/commands/replays/extract_metadata.rb

@@ -12,6 +12,9 @@ module Openra
           {
             mod: replay.metadata.mod,
             version: replay.metadata.version,
+            file: {
+              hash: replay.file_hash
+            },
             map: {
               name: utf8(replay.metadata.map_name),
               hash: replay.metadata.map_hash

data/lib/openra/replays.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'date'
+require 'digest'
 require 'bindata'
 require 'bindata/big_integer'
 require 'bindata/pascal_string'

data/lib/openra/replays/file.rb

@@ -24,6 +24,10 @@ module Openra
         end
       end
 
+      def generate_hash
+        Digest::SHA256.hexdigest(file.read)
+      end
+
       def metadata
         # https://github.com/OpenRA/OpenRA/blob/23b3c237b7071fd308c4664b0b6c5d719c0f3c74/OpenRA.Game/FileFormats/ReplayMetadata.cs#L96
         @metadata ||= begin

data/lib/openra/replays/order.rb

@@ -6,19 +6,22 @@ module Openra
     class Order < BinData::Record
       HEX_FE = ?\xFE.dup.force_encoding('ASCII-8BIT').freeze
       HEX_FF = ?\xFF.dup.force_encoding('ASCII-8BIT').freeze
-      # NEED TO LEARN HOW TO READ FLAGS AND TARGET TYPE
+
       IS_STANDARD_ORDER = -> { order_type == HEX_FF }
       IS_IMMEDIATE_ORDER = -> { order_type == HEX_FE }
-      HAS_TARGET = -> { instance_exec(&IS_STANDARD_ORDER) && (flags & 1) == 1 }
+      HAS_TARGET = -> { instance_exec(&IS_STANDARD_ORDER) && (flags & 0x01) == 0x01 }
+      HAS_EXTRA_ACTORS = -> { instance_exec(&IS_STANDARD_ORDER) && (flags & 0x02) == 0x02 }
       TARGET_IS_ACTOR = -> { instance_exec(&HAS_TARGET) && target_type == 1 }
       TARGET_IS_TERRAIN = -> { instance_exec(&HAS_TARGET) && target_type == 2 }
       TARGET_IS_FROZEN_ACTOR = -> { instance_exec(&HAS_TARGET) && target_type == 3 }
-      TARGET_IS_CELL = -> { instance_exec(&TARGET_IS_TERRAIN) && (flags & 64) == 64 }
-      TARGET_NOT_CELL = -> { instance_exec(&TARGET_IS_TERRAIN) && (flags & 64) != 64 }
-      HAS_SUBJECT = -> { instance_exec(&IS_STANDARD_ORDER) && (flags & 128) == 128 }
-      HAS_TARGET_STRING = -> { instance_exec(&IS_STANDARD_ORDER) && (flags & 4) == 4 }
-      HAS_EXTRA_LOCATION = -> { instance_exec(&IS_STANDARD_ORDER) && (flags & 16) == 16 }
-      HAS_EXTRA_DATA = -> { instance_exec(&IS_STANDARD_ORDER) && (flags & 32) == 32 }
+      TARGET_IS_CELL = -> { instance_exec(&TARGET_IS_TERRAIN) && (flags & 0x40) == 0x40 }
+      TARGET_NOT_CELL = -> { instance_exec(&TARGET_IS_TERRAIN) && (flags & 0x40) != 0x40 }
+      HAS_SUBJECT = -> { instance_exec(&IS_STANDARD_ORDER) && (flags & 0x80) == 0x80 }
+      HAS_TARGET_STRING = -> { instance_exec(&IS_STANDARD_ORDER) && (flags & 0x04) == 0x04 }
+      HAS_EXTRA_LOCATION = -> { instance_exec(&IS_STANDARD_ORDER) && (flags & 0x10) == 0x10 }
+      HAS_EXTRA_DATA = -> { instance_exec(&IS_STANDARD_ORDER) && (flags & 0x20) == 0x20 }
+      # IS_QUEUED = -> { instance_exec(&IS_STANDARD_ORDER) && (flags & 0x08) == 0x08 }
+      IS_GROUPED = -> { instance_exec(&IS_STANDARD_ORDER) && (flags & 0x100) == 0x100 }
 
       endian :little
       # Common
@@ -27,7 +30,7 @@ module Openra
       # Immediate Order Data
       pascal_string :immediate_order_target, onlyif: IS_IMMEDIATE_ORDER
       # Standard Order Data
-      uint8 :flags, onlyif: IS_STANDARD_ORDER
+      int16 :flags, onlyif: IS_STANDARD_ORDER
       uint32 :subject_id, onlyif: HAS_SUBJECT
       uint8 :target_type, onlyif: HAS_TARGET
       uint32 :actor_id, onlyif: TARGET_IS_ACTOR
@@ -39,8 +42,12 @@ module Openra
       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_actors_count, onlyif: HAS_EXTRA_ACTORS
+      array :extra_actor_ids, type: :uint32, initial_length: :extra_actors_count, onlyif: HAS_EXTRA_ACTORS
       int32 :extra_cell, onlyif: HAS_EXTRA_LOCATION
       uint32 :extra_data, onlyif: HAS_EXTRA_DATA
+      int32 :grouped_actors_count, onlyif: IS_GROUPED
+      array :grouped_actor_ids, type: :uint32, initial_length: :grouped_actors_count, onlyif: IS_GROUPED
 
       def target
         standard? ? standard_order_target : immediate_order_target

data/lib/openra/replays/replay.rb

@@ -9,6 +9,10 @@ module Openra
         @file = Openra::Replays::File.new(filename)
       end
 
+      def file_hash
+        file.generate_hash
+      end
+
       def metadata
         @metadata ||= Openra::Struct::Metadata.new(
           Openra::MiniYAML.load(file.metadata.data)

data/lib/openra/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openra
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 4.0.0
 platform: ruby
 authors:
 - Andy Holland
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-29 00:00:00.000000000 Z
+date: 2021-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler