sc2ai 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0db477a14bdf3d61b9ba5398b2b4e141832db450cabf2ba1b25c3ecbf5936b95
-  data.tar.gz: f8b7b955443d9233b7a05c4cabedd4cc22540996b841b3896815cb02fd8c22c1
+  metadata.gz: 5b421602e2cdff4d59e4b3b4ab168f7d894a43f4474244b229ec72c78d6bf6a9
+  data.tar.gz: cbc072cb8a55cacabd0ac751ff5286f582c0145241a98343834f0c0def7c31c1
 SHA512:
-  metadata.gz: 8d1bea39be1caff988cea9351abef368eef22d544dfa04551b681d473e5055765fc7c347435e714b3f05fad4649ce38918b2732b04f22f88b08639e22d0ad15b
-  data.tar.gz: 97457f03348767c490e6386b95919d01fa2bda0859e7c6c957ef96f3f0b00b76d54d82f5725ced238f6a62901b9bfdd27197e2230bb36d9736bb58c10d6a4ba1
+  metadata.gz: df8e5f7a8557d0f3dce348cbd9dcdc8ef8f03f88b5f00376d7972b36c223e042ed61123612642189e2722b0a62eb22f7f02a16ca5650864bdd8f3a49ddc86680
+  data.tar.gz: d5094e865be75f4b7c31b25a41ff8f021edbb4380567f304a39c1ade99d3155fa408d821c980f2751daf85eddee3f8f9c84a81557255e923db524d9570fad817

data/data/sc2ai/protocol/data.proto

@@ -88,8 +88,8 @@ message UnitTypeData {
   optional bool has_minerals = 20;
   optional float sight_range = 25;                                // Range unit reveals vision.
 
-  repeated uint32 tech_alias = 21;                                // Other units that satisfy the same tech requirement.
-  optional uint32 unit_alias = 22;                                // The morphed variant of this unit.
+  repeated uint32 tech_alias = 21 [packed=false];                                // Other units that satisfy the same tech requirement.
+  optional uint32 unit_alias = 22 [packed=false];                                // The morphed variant of this unit.
 
   optional uint32 tech_requirement = 23;                          // Structure required to build this unit. (Or any with the same tech_alias)
   optional bool require_attached = 24;                            // Whether tech_requirement is an add-on.

data/data/sc2ai/protocol/debug.proto

@@ -90,7 +90,7 @@ message DebugCreateUnit {
 }
 
 message DebugKillUnit {
-  repeated uint64 tag = 1;
+  repeated uint64 tag = 1 [packed =false];
 }
 
 message DebugTestProcess {

data/data/sc2ai/protocol/raw.proto

@@ -46,7 +46,7 @@ message PowerSource {
 message PlayerRaw {
   repeated PowerSource power_sources = 1;
   optional Point camera = 2;
-  repeated uint32 upgrade_ids = 3;
+  repeated uint32 upgrade_ids = 3 [packed=false];
 }
 
 message UnitOrder {
@@ -112,7 +112,7 @@ message Unit {
   optional float radius = 8;
   optional float build_progress = 9;        // Range: [0.0, 1.0]
   optional CloakState cloak = 10;
-  repeated uint32 buff_ids = 27;
+  repeated uint32 buff_ids = 27 [packed=false];
 
   optional float detect_range = 31;
   optional float radar_range = 32;
@@ -160,7 +160,7 @@ message MapState {
 }
 
 message Event {
-  repeated uint64 dead_units = 1;
+  repeated uint64 dead_units = 1 [packed=false];
 }
 
 message Effect {
@@ -190,8 +190,8 @@ message ActionRawUnitCommand {
     Point2D target_world_space_pos = 2;
     uint64 target_unit_tag = 3;
   }
-  repeated uint64 unit_tags = 4;
-  optional bool queue_command = 5;
+  repeated uint64 unit_tags = 4 [packed=false];
+  optional bool queue_command = 5 [packed=false];
 }
 
 message ActionRawCameraMove {
@@ -200,5 +200,5 @@ message ActionRawCameraMove {
 
 message ActionRawToggleAutocast {
   optional int32 ability_id = 1;
-  repeated uint64 unit_tags = 2;
+  repeated uint64 unit_tags = 2 [packed=false];
 }

data/data/sc2ai/protocol/sc2api.proto

@@ -689,7 +689,7 @@ message ActionObserverCameraFollowPlayer {
 }
 
 message ActionObserverCameraFollowUnits {
-  repeated uint64 unit_tags = 1;
+  repeated uint64 unit_tags = 1 [packed=false];
 }
 
 enum Alert {

data/data/sc2ai/protocol/ui.proto

@@ -42,7 +42,7 @@ message SinglePanel {
   optional int32 attack_upgrade_level = 2;
   optional int32 armor_upgrade_level = 3;
   optional int32 shield_upgrade_level = 4;
-  repeated int32 buffs = 5;
+  repeated int32 buffs = 5 [packed=false];
 }
 
 message MultiPanel {

data/{lib/docker_build → docker_build}/Dockerfile.ruby

@@ -9,7 +9,7 @@ ARG DEBIAN_DISABLE_RUBYGEMS_INTEGRATION=true
 
 # Deps - Ruby build
 RUN apt-get update
-RUN apt install --assume-yes rustc curl build-essential libssl-dev zlib1g-dev libgmp-dev uuid-dev
+RUN apt install --assume-yes rustc curl build-essential libssl-dev zlib1g-dev libgmp-dev libffi-dev uuid-dev
 
 # Deps - libyaml from source
 RUN curl https://pyyaml.org/download/libyaml/yaml-0.2.5.tar.gz -o yaml-0.2.5.tar.gz
@@ -65,7 +65,7 @@ RUN /root/ruby-builder/.ruby/bin/bundle config set --global without test develop
 RUN apt-get update
 RUN apt-get purge $(aptitude search '~i!~M!~prequired!~pimportant!~R~prequired!~R~R~prequired!~R~pimportant!~R~R~pimportant!busybox!grub!initramfs-tools' | awk '{print $2}')  --assume-yes
 RUN apt-get purge aptitude  --assume-yes
-RUN apt-get install zip openssl build-essential libopenblas0-serial --assume-yes
+RUN apt-get install zip openssl build-essential libopenblas0-serial libffi-dev --assume-yes
 RUN apt-get autoremove --assume-yes
 RUN apt-get clean --assume-yes
 

data/lib/sc2ai/cli/ladderzip.rb

@@ -38,7 +38,7 @@ module Sc2
 
       def set_compose_file
         @compose_file = Sc2::Paths.gem_root
-          .join("lib", "docker_build", "docker-compose-ladderzip.yml")
+          .join("docker_build", "docker-compose-ladderzip.yml")
           .expand_path.to_s
       end
 

data/lib/sc2ai/local_play/client.rb

@@ -67,7 +67,7 @@ module Sc2
         begin
           ::Async::Process.spawn(command_string, **options)
         rescue
-          Sc2.logger.info("Client exited unexpectedly")
+          Sc2.logger.info("Client exited")
           task&.stop
         end
       end

data/lib/sc2ai/local_play/match.rb

@@ -68,6 +68,7 @@ module Sc2
           ensure
             Sc2.logger.debug { "Game over, disconnect players." }
             # Suppress interrupt errors #$stderr.reopen File.new(File::NULL, "w")
+            player.quit if Gem.win_platform?
             player.disconnect
             ClientManager.stop(player_index) # unless keep_clients_alive
           end

data/lib/sc2ai/overrides/async/process/child.rb

@@ -19,9 +19,10 @@ module Async
           options[:pgroup] = true
         end
 
-        @pid = ::Process.spawn(*args, **options)
+
 
         @thread = Thread.new do
+          @pid = ::Process.spawn(*args, **options)
           _, @exit_status = ::Process.wait2(@pid)
           @output.close
         end

data/lib/sc2ai/paths.rb

@@ -280,7 +280,6 @@ module Sc2
         # Platform-specific patches
         if platform == PF_WSL1 || platform == PF_WSL2
           dir = win_to_wsl(path: dir)
-          raise Pathname(dir).inspect
         elsif PF_WINDOWS
           dir = dir.tr("\\", "/")
         end

data/lib/sc2ai/player/debug.rb

@@ -29,7 +29,7 @@ module Sc2
           draw: Api::DebugDraw.new(
             text: [
               Api::DebugText.new(
-                text:,
+                text: text.to_s,
                 size:,
                 virtual_pos: Api::Point.new(x: 0.01, y: 0.01) # unit or fixed position.
               )
@@ -50,7 +50,7 @@ module Sc2
           draw: Api::DebugDraw.new(
             text: [
               Api::DebugText.new(
-                text:,
+                text: text.to_s,
                 virtual_pos: Api::Point.new(
                   x: left_percent.to_f / 100,
                   y: top_percent.to_f / 100
@@ -74,7 +74,7 @@ module Sc2
           draw: Api::DebugDraw.new(
             text: [
               Api::DebugText.new(
-                text:,
+                text: text.to_s,
                 world_pos: point,
                 color:,
                 size:

data/lib/sc2ai/player.rb

@@ -129,6 +129,15 @@ module Sc2
       @api&.close
     end
 
+    # @private
+    # Note: Do not document, because ladder players should never quit,
+    # but rather #leave_game instead
+    # Sends quit command to SC2
+    # @return [void]
+    def quit
+      @api&.quit
+    end
+
     # @!endgroup Connection
 
     # API --------------------