sc2ai 0.4.1 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e0b154fe7c1d86ed183b43f3a3ee0b915b1d745ca839a86f9150d571e792864
-  data.tar.gz: 56a466963b5fd4b8d6ad7878bad675a270b90a53caf174b6abb749a4a4265b6d
+  metadata.gz: aaa51c5d8ef4ec90b0da920e6fee5b5aef436612b316da1f6f47b9fbb213bb78
+  data.tar.gz: c2a69316a5469f9074d471a0e3456d687f015148bb4f2483f7ef4945866fdce8
 SHA512:
-  metadata.gz: 6de08591f8bfd744cac376b46aeb0eb4fe8027aadb31a7d9ce9eaee1e7b030636ca9b098e76383d879cd1b9f19e72fc5e1d7f8db5161ecde98be5ea8197994ce
-  data.tar.gz: cfc3ecab272e6157dd26661e5a1d085e9b3bd41a98e32f788eab4d1955a6c82d179387f7bb05e214ece46ce93c847522e56ece97f251e5a021c5b91243475432
+  metadata.gz: 806ebc2a45c45bf69db2e25085a3e548cdc41cb97f7792603577d72e1e1e5db104dd5c0c82924ac1a2138ac1cd89770d29135688d75b266ee0fe2a9b784d768a
+  data.tar.gz: 338f46f6bdccc9e847c57d7d3abff6b450c2f2ad507582ab601806ba8bcc5d82ba850cd95488c7be85c870cee634ba741e02c408c31cfffbeb9544561d9f0178

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/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:
@@ -273,7 +273,7 @@ module Sc2
 
       # Sets unit_value Energy, Life or Shields for a specific unit tag to given value
       # @param unit_tag [Integer]
-      # @param unit_value [Integer] 1=Energy,2=Life,3=Shields one of Api::DebugSetUnitValue::UnitValue::*
+      # @param unit_value [Integer] 1=ENERGY,2=LIFE,3=SHIELDS one of Api::DebugSetUnitValue::UnitValue::*
       # @param value [Float] the value which the attribute will be set to
       # @return [void]
       def debug_set_unit_value(unit_tag:, unit_value:, value:)

data/lib/sc2ai/player/geo.rb

@@ -570,6 +570,7 @@ module Sc2
 
               i += 1
             end
+            next if possible_points.empty?
             # Choose best fitting point
             best_point = possible_points.keys[possible_points.values.find_index(possible_points.values.min)]
             @expansions[best_point.to_p2d] = UnitGroup.new(clustered_resources)