sc2ai 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7feb936b57c5b3e4c5cae670ea743f43ccb36a5111bf39abb88ad6e63702ffc5
-  data.tar.gz: 3b25e577bae3d33255f4e648fa69a8005e67af47e207cffdb7d0e2c790b86961
+  metadata.gz: ff26842dae751021cefd5ec41520a100ee4590e38d10fc96e846513a2d112176
+  data.tar.gz: eec5d7f966b086a9b1f164097d15917c4d2e14fd0556215c33dda1f7a446ef1d
 SHA512:
-  metadata.gz: 3c0d3dac4646702e85531561eb94d11ce8c5a5da53a255832a18803f34daad07f42958be0309f2b043a003581cdb5a9ac198b1326f13a93cd7a6f92211f75fa0
-  data.tar.gz: 43baa9be2700f945f0f9aed19c81b9bd77ee21df9fa43a151caa2b7d09646de17f2fe69814d8cfd0384e1644106123d01d96b2e34a413563411da41d5f67b0c1
+  metadata.gz: 989364e2517ea677ff53f9da0764e8e6626b9569dee736ee7b3f69723e08e6f4a2fd3c3f864034f380c758c2c80b557adaeb4cae73e34217e437a9493b7860ed
+  data.tar.gz: d6836e0492d8df3f63f849b3b4e3710a292783c8250a5be4fe6bdd88a3507203576f9786e48c9196d2b6daaa1bfe53b9a03812a0ee384369882948222457b2f2

data/data/sc2ai/protocol/common.proto

@@ -1,5 +1,5 @@
 
-syntax = "proto2";
+syntax = "proto3";
 
 package Api;
 

data/data/sc2ai/protocol/data.proto

@@ -1,5 +1,5 @@
 
-syntax = "proto2";
+syntax = "proto3";
 
 package Api;
 
@@ -19,6 +19,7 @@ message AbilityData {
   optional uint32 remaps_to_ability_id = 7;                       // This ability id may be represented by the given more generic id.
 
   enum Target {
+    EnumTargetUnset = 0; // Proto3 compat
     None = 1;                                                     // Does not require a target.
     Point = 2;                                                    // Requires a target position.
     Unit = 3;                                                     // Requires a unit to target. Given by position using feature layers.
@@ -37,6 +38,7 @@ message AbilityData {
 }
 
 enum Attribute {
+  EnumAttributeUnset = 0; // Proto3 compat
   Light = 1;
   Armored = 2;
   Biological = 3;
@@ -57,6 +59,7 @@ message DamageBonus {
 
 message Weapon {
   enum TargetType {
+    EnumTargetTypeUnset = 0; // Proto3 compat
     Ground = 1;
     Air = 2;
     Any = 3;

data/data/sc2ai/protocol/debug.proto

@@ -1,5 +1,5 @@
 
-syntax = "proto2";
+syntax = "proto3";
 
 package Api;
 
@@ -67,6 +67,7 @@ message DebugSphere {
 }
 
 enum DebugGameState {
+  EnumDebugGameStateUnset = 0; // Proto3 compat
   show_map = 1;
   control_enemy = 2;
   food = 3;
@@ -94,6 +95,7 @@ message DebugKillUnit {
 
 message DebugTestProcess {
   enum Test {
+    EnumTestUnset = 0; // Proto3 compat
     hang = 1;
     crash = 2;
     exit = 3;
@@ -108,6 +110,7 @@ message DebugSetScore {
 
 message DebugEndGame {
   enum EndResult {
+    EnumEndResultUnset = 0; // Proto3 compat
     Surrender = 1;                  // Default if nothing is set. The current player admits defeat.
     DeclareVictory = 2;
   }
@@ -116,6 +119,7 @@ message DebugEndGame {
 
 message DebugSetUnitValue {
   enum UnitValue {
+    EnumUnitValueUnset = 0; // Proto3 compat
     Energy = 1;
     Life = 2;
     Shields = 3;

data/data/sc2ai/protocol/error.proto

@@ -1,9 +1,10 @@
 
-syntax = "proto2";
+syntax = "proto3";
 
 package Api;
 
 enum ActionResult {
+  EnumActionResultUnset = 0; // Proto3 compat
   Success = 1;
   NotSupported = 2;
   Error = 3;

data/data/sc2ai/protocol/query.proto

@@ -1,5 +1,5 @@
 
-syntax = "proto2";
+syntax = "proto3";
 
 package Api;
 

data/data/sc2ai/protocol/raw.proto

@@ -1,5 +1,5 @@
 
-syntax = "proto2";
+syntax = "proto3";
 
 package Api;
 
@@ -10,12 +10,12 @@ import "sc2ai/protocol/common.proto";
 //
 
 message StartRaw {
-  optional Size2DI map_size = 1;            // Width and height of the map.
+  optional Size2DI map_size = 1 [unverified_lazy=true];            // Width and height of the map.
   optional ImageData pathing_grid = 2;      // 1 bit bitmap of the pathing grid.
-  optional ImageData terrain_height = 3;    // 1 byte bitmap of the terrain height.
-  optional ImageData placement_grid = 4;    // 1 bit bitmap of the building placement grid.
-  optional RectangleI playable_area = 5;    // The playable cells.
-  repeated Point2D start_locations = 6;     // Possible start locations for players.
+  optional ImageData terrain_height = 3 [unverified_lazy=true];    // 1 byte bitmap of the terrain height.
+  optional ImageData placement_grid = 4 [unverified_lazy=true];    // 1 bit bitmap of the building placement grid.
+  optional RectangleI playable_area = 5 [unverified_lazy=true];    // The playable cells.
+  repeated Point2D start_locations = 6 [unverified_lazy=true];     // Possible start locations for players.
 }
 
 
@@ -59,6 +59,7 @@ message UnitOrder {
 }
 
 enum DisplayType {
+  EnumDisplayTypeUnset = 0; // Proto3 compat
   Visible = 1;                            // Fully visible
   Snapshot = 2;                           // Dimmed version of unit left behind after entering fog of war
   Hidden = 3;                             // Fully hidden
@@ -66,6 +67,7 @@ enum DisplayType {
 }
 
 enum Alliance {
+  EnumAllianceUnset = 0; // Proto3 compat
   Self = 1;
   Ally = 2;
   Neutral = 3;

data/data/sc2ai/protocol/sc2api.proto

@@ -1,5 +1,5 @@
 
-syntax = "proto2";
+syntax = "proto3";
 
 package Api;
 
@@ -155,6 +155,7 @@ message Response {
 }
 
 enum Status {
+  EnumStatusUnset = 0; // Proto3 compat
   launched = 1;                                 // Game has been launch and is not yet doing anything.
   init_game = 2;                                // Create game has been called, and the host is awaiting players.
   in_game = 3;                                  // In a single or multiplayer game.
@@ -191,6 +192,7 @@ message LocalMap {
 
 message ResponseCreateGame {
   enum Error {
+    EnumResponseCreateGameErrorUnset = 0; // Proto3 compat
     MissingMap = 1;
     InvalidMapPath = 2;
     InvalidMapData = 3;
@@ -231,6 +233,7 @@ message ResponseJoinGame {
   optional uint32 player_id = 1;
 
   enum Error {
+    EnumResponseJoinGameErrorUnset = 0; // Proto3 compat
     MissingParticipation = 1;
     InvalidObservedPlayerId = 2;
     MissingOptions = 3;
@@ -258,6 +261,7 @@ message RequestRestartGame {
 // The defaultRestartGameLoops is specified to be (1<<18) by default
 message ResponseRestartGame {
   enum Error {
+    EnumResponseRestartGameErrorUnset = 0; // Proto3 compat
     LaunchError = 1;
   }
   optional Error error = 1;
@@ -282,6 +286,7 @@ message RequestStartReplay {
 
 message ResponseStartReplay {
   enum Error {
+    EnumResponseStartReplayErrorUnset = 0; // Proto3 compat
     MissingReplay = 1;
     InvalidReplayPath = 2;
     InvalidReplayData = 3;
@@ -301,6 +306,7 @@ message RequestMapCommand {
 
 message ResponseMapCommand {
   enum Error {
+    EnumResponseMapCommandErrorUnset = 0; // Proto3 compat
     NoTriggerError = 1;
   }
   optional Error error = 1;
@@ -343,11 +349,11 @@ message RequestGameInfo {
 
 message ResponseGameInfo {
   optional string map_name = 1;
-  repeated string mod_names = 6;
   optional string local_map_path = 2;
-  repeated PlayerInfo player_info = 3;
+  repeated PlayerInfo player_info = 3 [unverified_lazy=true];
   optional StartRaw start_raw = 4;               // Populated if Raw interface is enabled.
-  optional InterfaceOptions options = 5;
+  optional InterfaceOptions options = 5 [unverified_lazy=true];
+  repeated string mod_names = 6;
 }
 
 //-----------------------------------------------------------------------------
@@ -360,7 +366,7 @@ message ResponseObservation {
   repeated Action actions = 1;                  // Actions this player did since the last Observation.
   repeated ActionError action_errors = 2;       // Equivalent of UI "red text" errors.
   optional Observation observation = 3;
-  repeated PlayerResult player_result = 4;      // Only populated if the game ended during this step.
+  repeated PlayerResult player_result = 4 [unverified_lazy=true];      // Only populated if the game ended during this step.
   repeated ChatReceived chat = 5;
 }
 
@@ -453,6 +459,7 @@ message ResponseReplayInfo {
   optional uint32 base_build = 8;
 
   enum Error {
+    EnumResponseReplayInfoErrorUnset = 0; // Proto3 compat
     MissingReplay = 1;
     InvalidReplayPath = 2;
     InvalidReplayData = 3;
@@ -484,6 +491,7 @@ message RequestSaveMap {
 
 message ResponseSaveMap {
   enum Error {
+    EnumResponseSaveMapErrorUnset = 0; // Proto3 compat
     InvalidMapData = 1;
   }
   optional Error error = 1;
@@ -514,6 +522,7 @@ message ResponseDebug {
 //
 
 enum Difficulty {
+  EnumDifficultyUnset = 0; // Proto3 compat
   VeryEasy = 1;
   Easy = 2;
   Medium = 3;
@@ -527,12 +536,14 @@ enum Difficulty {
 }
 
 enum PlayerType {
+  EnumPlayerTypeUnset = 0; // Proto3 compat
   Participant = 1;
   Computer = 2;
   Observer = 3;
 }
 
 enum AIBuild {
+  EnumAIBuildUnset = 0; // Proto3 compat
   RandomBuild = 1;
   Rush = 2;
   Timing = 3;
@@ -619,11 +630,11 @@ message Observation {
   optional PlayerCommon player_common = 1;
   repeated Alert alerts = 10;
   repeated AvailableAbility abilities = 3;                  // Abilities available in the selection. Enabled if in this list, disabled otherwise.
-  optional Score score = 4;
+  optional Score score = 4 [unverified_lazy=true];
 
   optional ObservationRaw raw_data = 5;                     // Populated if Raw interface is enabled.
   optional ObservationFeatureLayer feature_layer_data = 6;  // Populated if Feature Layer interface is enabled.
-  optional ObservationRender render_data = 7;               // Populated if Render interface is enabled.
+  optional ObservationRender render_data = 7 [unverified_lazy=true];               // Populated if Render interface is enabled.
   optional ObservationUI ui_data = 8;                       // Populated if Feature Layer or Render interface is enabled.
 }
 
@@ -638,6 +649,7 @@ message Action {
 
 message ActionChat {
   enum Channel {
+    EnumChannelUnset = 0; // Proto3 compat
     Broadcast = 1;
     Team = 2;
   }
@@ -681,6 +693,7 @@ message ActionObserverCameraFollowUnits {
 }
 
 enum Alert {
+  EnumAlertUnset = 0; // Proto3 compat
   AlertError = 3;
   AddOnComplete = 4;
   BuildingComplete = 5;
@@ -706,6 +719,7 @@ enum Alert {
 }
 
 enum Result {
+  EnumResultUnset = 0; // Proto3 compat
   Victory = 1;
   Defeat = 2;
   Tie = 3;

data/data/sc2ai/protocol/score.proto

@@ -1,10 +1,11 @@
 
-syntax = "proto2";
+syntax = "proto3";
 
 package Api;
 
 message Score {
   enum ScoreType {
+    EnumScoreTypeUnset = 0; // Proto3 compat
     Curriculum = 1;                // map generated score (from curriculum maps with special scoring)
     Melee = 2;                     // summation of in-progress and current units/buildings value + minerals + vespene
   }

data/data/sc2ai/protocol/spatial.proto

@@ -1,5 +1,5 @@
 
-syntax = "proto2";
+syntax = "proto3";
 
 package Api;
 
@@ -101,6 +101,7 @@ message ActionSpatialCameraMove {
 message ActionSpatialUnitSelectionPoint {
   optional PointI selection_screen_coord = 1;
   enum Type {
+    EnumActionSpatialUnitSelectionPointTypeUnset = 0; // Proto3 compat
     Select = 1;         // Equivalent to normal click. Changes selection to unit.
     Toggle = 2;         // Equivalent to shift+click. Toggle selection of unit.
     AllType = 3;        // Equivalent to control+click. Selects all units of a given type.

data/data/sc2ai/protocol/ui.proto

@@ -1,5 +1,5 @@
 
-syntax = "proto2";
+syntax = "proto3";
 
 package Api;
 
@@ -90,6 +90,7 @@ message ActionUI {
 
 message ActionControlGroup {
   enum ControlGroupAction {
+    EnumControlGroupActionUnset = 0; // Proto3 compat
     Recall = 1;             // Equivalent to number hotkey. Replaces current selection with control group.
     Set = 2;                // Equivalent to Control + number hotkey. Sets control group to current selection.
     Append = 3;             // Equivalent to Shift + number hotkey. Adds current selection into control group.
@@ -113,6 +114,7 @@ message ActionSelectLarva {
 
 message ActionSelectIdleWorker {
   enum Type {
+    EnumActionSelectIdleWorkerTypeUnset = 0; // Proto3 compat
     Set = 1;        // Equivalent to click with no modifiers. Replaces selection with single idle worker.
     Add = 2;        // Equivalent to shift+click. Adds single idle worker to current selection.
     All = 3;        // Equivalent to control+click. Selects all idle workers.
@@ -123,6 +125,7 @@ message ActionSelectIdleWorker {
 
 message ActionMultiPanel {
   enum Type {
+    EnumActionMultiPanelTypeUnset = 0; // Proto3 compat
     SingleSelect = 1;         // Click on icon
     DeselectUnit = 2;         // Shift Click on icon
     SelectAllOfType = 3;      // Control Click on icon.

data/lib/docker_build/Dockerfile.ruby

@@ -29,7 +29,7 @@ WORKDIR /root/ruby-builder
 RUN rm ruby-$RUBY_VERSION.tar.gz
 RUN rm -rf ./ruby-$RUBY_VERSION
 RUN rm yaml-0.2.5.tar.gz
-RUN rm -rf ./yaml-0.2.5
+#RUN rm -rf ./yaml-0.2.5
 
 # Package config
 # numo-linalg needs openblas, copy to ruby-prefix/lib/ dir.
@@ -57,9 +57,11 @@ RUN gem install 'sc2ai'
 
 FROM debian:12-slim
 COPY --from=build /root/ruby-builder /root/ruby-builder
-
+ENV AIARENA "true"
 RUN /root/ruby-builder/.ruby/bin/ruby --yjit -v
 
+RUN /root/ruby-builder/.ruby/bin/bundle config set --global without test development
+
 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

data/lib/sc2ai/api/ability_id.rb

@@ -1305,7 +1305,12 @@ module Api
       # @param ability_id [Integer]
       # @return [Integer] either the current id if no remap or the remapped id
       def generic_id(ability_id)
-        remap_ids[ability_id] || ability_id
+        @_non_remap_ids ||= {}
+        if @_non_remap_ids[ability_id]
+          @_non_remap_ids[ability_id]
+        else
+          remap_ids[ability_id] || (@_non_remap_ids[ability_id] = ability_id)
+        end
       end
 
       private

data/lib/sc2ai/api/data.rb

@@ -107,6 +107,7 @@ module Sc2
     def override_unit_data
       correct_unit_type_costs
       correct_unit_type_sum
+      decorate_unit_type_placement_length
     end
 
     # @private
@@ -254,5 +255,19 @@ module Sc2
         unit_data
       end
     end
+
+    # @private
+    # Adds placement_length to units if applicable
+    private def decorate_unit_type_placement_length
+      @units.each_value do |unit_type_data|
+        unit_type_data.placement_length = 0
+        next unless unit_type_data.ability_id
+        next unless @abilities[unit_type_data.ability_id]
+        footprint_radius = @abilities[unit_type_data.ability_id].footprint_radius
+        if footprint_radius
+          unit_type_data.placement_length = (footprint_radius * 2.0).to_i
+        end
+      end
+    end
   end
 end

data/lib/sc2ai/api/tech_tree.rb

@@ -68,7 +68,7 @@ module Api
       # @param unit_type_id [Integer] the unit which you want to check
       # @return [Array<Integer>] returns an array of unit type ids as per Api:UnitTypeId
       def unit_created_from(unit_type_id:)
-        unit_created_from_data[unit_type_id]
+        unit_created_from_data[unit_type_id] || []
       end
 
       # Returns what the unit type an upgrade is researched from

data/lib/sc2ai/api/tech_tree_data.rb

@@ -13,7 +13,13 @@ module Api
     {ability: Api::AbilityId::UPGRADETOORBITAL_ORBITALCOMMAND,
      required_building: Api::UnitTypeId::BARRACKS}},
                                                Api::UnitTypeId::BARRACKS =>
-  {Api::UnitTypeId::MARINE =>
+  {Api::UnitTypeId::BARRACKSTECHLAB =>
+    {ability: Api::AbilityId::BUILD_TECHLAB_BARRACKS,
+     requires_placement_position: true},
+   Api::UnitTypeId::BARRACKSREACTOR =>
+    {ability: Api::AbilityId::BUILD_REACTOR_BARRACKS,
+     requires_placement_position: true},
+   Api::UnitTypeId::MARINE =>
     {ability: Api::AbilityId::BARRACKSTRAIN_MARINE},
    Api::UnitTypeId::REAPER =>
     {ability: Api::AbilityId::BARRACKSTRAIN_REAPER},
@@ -25,7 +31,13 @@ module Api
     {ability: Api::AbilityId::BARRACKSTRAIN_MARAUDER,
      requires_techlab: true}},
                                                Api::UnitTypeId::FACTORY =>
-  {Api::UnitTypeId::HELLION =>
+  {Api::UnitTypeId::FACTORYTECHLAB =>
+    {ability: Api::AbilityId::BUILD_TECHLAB_FACTORY,
+     requires_placement_position: true},
+   Api::UnitTypeId::FACTORYREACTOR =>
+    {ability: Api::AbilityId::BUILD_REACTOR_FACTORY,
+     requires_placement_position: true},
+   Api::UnitTypeId::HELLION =>
     {ability: Api::AbilityId::FACTORYTRAIN_HELLION},
    Api::UnitTypeId::CYCLONE => {ability: Api::AbilityId::TRAIN_CYCLONE},
    Api::UnitTypeId::WIDOWMINE =>
@@ -41,7 +53,13 @@ module Api
     {ability: Api::AbilityId::TRAIN_HELLBAT,
      required_building: Api::UnitTypeId::ARMORY}},
                                                Api::UnitTypeId::STARPORT =>
-  {Api::UnitTypeId::MEDIVAC =>
+  {Api::UnitTypeId::STARPORTTECHLAB =>
+    {ability: Api::AbilityId::BUILD_TECHLAB_STARPORT,
+     requires_placement_position: true},
+   Api::UnitTypeId::STARPORTREACTOR =>
+    {ability: Api::AbilityId::BUILD_REACTOR_STARPORT,
+     requires_placement_position: true},
+   Api::UnitTypeId::MEDIVAC =>
     {ability: Api::AbilityId::STARPORTTRAIN_MEDIVAC},
    Api::UnitTypeId::VIKINGFIGHTER =>
     {ability: Api::AbilityId::STARPORTTRAIN_VIKINGFIGHTER},
@@ -56,6 +74,20 @@ module Api
     {ability: Api::AbilityId::STARPORTTRAIN_BATTLECRUISER,
      requires_techlab: true,
      required_building: Api::UnitTypeId::FUSIONCORE}},
+                                               Api::UnitTypeId::FACTORYFLYING =>
+  {Api::UnitTypeId::FACTORYTECHLAB =>
+    {ability: Api::AbilityId::BUILD_TECHLAB_FACTORY,
+     requires_placement_position: true},
+   Api::UnitTypeId::FACTORYREACTOR =>
+    {ability: Api::AbilityId::BUILD_REACTOR_FACTORY,
+     requires_placement_position: true}},
+                                               Api::UnitTypeId::STARPORTFLYING =>
+  {Api::UnitTypeId::STARPORTTECHLAB =>
+    {ability: Api::AbilityId::BUILD_TECHLAB_STARPORT,
+     requires_placement_position: true},
+   Api::UnitTypeId::STARPORTREACTOR =>
+    {ability: Api::AbilityId::BUILD_REACTOR_STARPORT,
+     requires_placement_position: true}},
                                                Api::UnitTypeId::SCV =>
   {Api::UnitTypeId::COMMANDCENTER =>
     {ability: Api::AbilityId::TERRANBUILD_COMMANDCENTER,
@@ -104,6 +136,13 @@ module Api
    Api::UnitTypeId::FUSIONCORE =>
     {ability: Api::AbilityId::TERRANBUILD_FUSIONCORE,
      required_building: Api::UnitTypeId::STARPORT,
+     requires_placement_position: true}},
+                                               Api::UnitTypeId::BARRACKSFLYING =>
+  {Api::UnitTypeId::BARRACKSTECHLAB =>
+    {ability: Api::AbilityId::BUILD_TECHLAB_BARRACKS,
+     requires_placement_position: true},
+   Api::UnitTypeId::BARRACKSREACTOR =>
+    {ability: Api::AbilityId::BUILD_REACTOR_BARRACKS,
      requires_placement_position: true}},
                                                Api::UnitTypeId::RAVEN =>
   {Api::UnitTypeId::AUTOTURRET =>
@@ -780,16 +819,28 @@ module Api
     Api::UnitTypeId::ORBITALCOMMAND],
                                     Api::UnitTypeId::PLANETARYFORTRESS => [Api::UnitTypeId::COMMANDCENTER],
                                     Api::UnitTypeId::ORBITALCOMMAND => [Api::UnitTypeId::COMMANDCENTER],
+                                    Api::UnitTypeId::BARRACKSTECHLAB =>
+  [Api::UnitTypeId::BARRACKS, Api::UnitTypeId::BARRACKSFLYING],
+                                    Api::UnitTypeId::BARRACKSREACTOR =>
+  [Api::UnitTypeId::BARRACKS, Api::UnitTypeId::BARRACKSFLYING],
                                     Api::UnitTypeId::MARINE => [Api::UnitTypeId::BARRACKS],
                                     Api::UnitTypeId::REAPER => [Api::UnitTypeId::BARRACKS],
                                     Api::UnitTypeId::GHOST => [Api::UnitTypeId::BARRACKS],
                                     Api::UnitTypeId::MARAUDER => [Api::UnitTypeId::BARRACKS],
+                                    Api::UnitTypeId::FACTORYTECHLAB =>
+  [Api::UnitTypeId::FACTORY, Api::UnitTypeId::FACTORYFLYING],
+                                    Api::UnitTypeId::FACTORYREACTOR =>
+  [Api::UnitTypeId::FACTORY, Api::UnitTypeId::FACTORYFLYING],
                                     Api::UnitTypeId::HELLION => [Api::UnitTypeId::FACTORY],
                                     Api::UnitTypeId::CYCLONE => [Api::UnitTypeId::FACTORY],
                                     Api::UnitTypeId::WIDOWMINE => [Api::UnitTypeId::FACTORY],
                                     Api::UnitTypeId::SIEGETANK => [Api::UnitTypeId::FACTORY],
                                     Api::UnitTypeId::THOR => [Api::UnitTypeId::FACTORY],
                                     Api::UnitTypeId::HELLIONTANK => [Api::UnitTypeId::FACTORY],
+                                    Api::UnitTypeId::STARPORTTECHLAB =>
+  [Api::UnitTypeId::STARPORT, Api::UnitTypeId::STARPORTFLYING],
+                                    Api::UnitTypeId::STARPORTREACTOR =>
+  [Api::UnitTypeId::STARPORT, Api::UnitTypeId::STARPORTFLYING],
                                     Api::UnitTypeId::MEDIVAC => [Api::UnitTypeId::STARPORT],
                                     Api::UnitTypeId::VIKINGFIGHTER => [Api::UnitTypeId::STARPORT],
                                     Api::UnitTypeId::LIBERATOR => [Api::UnitTypeId::STARPORT],

data/lib/sc2ai/connection.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "async"
-require "async/io/stream"
 require "async/http/endpoint"
 require "async/websocket"
 require_relative "connection/requests"

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

@@ -8,7 +8,7 @@ module Async
       def initialize(*args, **options)
         # Setup a cross-thread notification pipe - nio4r can't monitor pids unfortunately:
         pipe = ::IO.pipe
-        @input = Async::IO::Generic.new(pipe.first)
+        @input = pipe.first
         @output = pipe.last
 
         @exit_status = nil

data/lib/sc2ai/player/debug.rb

@@ -121,8 +121,8 @@ module Sc2
           draw: Api::DebugDraw.new(
             boxes: [
               Api::DebugBox.new(
-                min: Api::Point.new(x: point.x - radius, y: point.y - radius, z: point.z + 0.02),
-                max: Api::Point.new(x: point.x + radius, y: point.y + radius, z: point.z + (radius * 2) + 0.02),
+                min: Api::Point.new(x: point.x - radius, y: point.y - radius, z: point.z + 0.03),
+                max: Api::Point.new(x: point.x + radius, y: point.y + radius, z: point.z + (radius * 2) + 0.03),
                 color:
               )
             ]
@@ -149,6 +149,40 @@ module Sc2
         )
       end
 
+      # Renders a block on the floor, drawn by 4 lines
+      # Pass in either a pos (Position/Unit) or exact x * y coordinates
+      # Optional indentation adds padding on borders inward
+      # @param pos [Api::Unit, Api::Position]
+      # @param x [Float, Integer]
+      # @param y [Float, Integer]
+      # @param color [Api::Color]
+      # @param indent [Float] default 0.05. should be lower than < 1.0
+      # @example
+      #   debug_tile(x: 12.3, y: 4.56, color: Api::Color.new(r: 255, g: 0, b: 0))
+      #   debug_tile(some_unit)
+      #   debug_tile(some_unit.pos)
+      def debug_tile(pos = nil, x: nil, y: nil, color: nil, indent: 0.05)
+        if pos.is_a?(Api::Unit)
+          x = pos.pos.x.floor
+          y = pos.pos.y.floor
+        elsif pos.is_a?(Sc2::Position)
+          x = pos.pos.x.floor
+          y = pos.pos.y.floor
+        end
+
+        # Raise above floor to prevent texture clipping
+        z = geo.terrain_height(x:, y:).to_f + 0.1
+        tl = Api::Point[x + indent, y + 1.0 - indent, z]
+        bl = Api::Point[x + indent, y + indent, z]
+        br = Api::Point[x + 1.0 - indent, y + indent, z]
+        tr = Api::Point[x + 1.0 - indent, y + 1.0 - indent, z]
+
+        debug_draw_line(p0: tl, p1: bl, color:)
+        debug_draw_line(p0: bl, p1: br, color:)
+        debug_draw_line(p0: br, p1: tr, color:)
+        debug_draw_line(p0: tr, p1: tl, color:)
+      end
+
       # Other Commands ---
 
       # @param command [Integer] one of Api::DebugGameState::*

data/lib/sc2ai/player/geo.rb

@@ -111,10 +111,10 @@ module Sc2
             if bot.race == Api::Race::Zerg
               # Reserve one row lower, meaning (y-3) instead of (y-2)
               @expo_placement_grid[(y - 3).clamp(map_tile_range_y)..(y + 2).clamp(map_tile_range_y),
-                                   (x - 2).clamp(map_tile_range_y)..(x + 2).clamp(map_tile_range_y)] = 1
+                                   (x - 2).clamp(map_tile_range_x)..(x + 2).clamp(map_tile_range_x)] = 1
             else
               @expo_placement_grid[(y - 2).clamp(map_tile_range_y)..(y + 2).clamp(map_tile_range_y),
-                                   (x - 2).clamp(map_tile_range_y)..(x + 2).clamp(map_tile_range_y)] = 1
+                                   (x - 2).clamp(map_tile_range_x)..(x + 2).clamp(map_tile_range_x)] = 1
             end
           end
         end

data/lib/sc2ai/player/units.rb

@@ -91,6 +91,17 @@ module Sc2
       # For this unit type, tells you how many are in progress by checking orders for all it's sources.
       # @return [Integer]
       def units_in_progress(unit_type_id)
+        if unit_type_id == Api::UnitTypeId::REACTOR
+          return units_in_progress(Api::UnitTypeId::BARRACKSREACTOR) +
+              units_in_progress(Api::UnitTypeId::FACTORYREACTOR) +
+              units_in_progress(Api::UnitTypeId::STARPORTREACTOR)
+        elsif unit_type_id == Api::UnitTypeId::TECHLAB
+          return units_in_progress(Api::UnitTypeId::BARRACKSTECHLAB) +
+              units_in_progress(Api::UnitTypeId::FACTORYTECHLAB) +
+              units_in_progress(Api::UnitTypeId::STARPORTTECHLAB)
+        end
+
+        # Get source unit
         source_unit_types = Api::TechTree.unit_created_from(unit_type_id: unit_type_id)
 
         # When building from LARVA, check the intermediate models
@@ -119,9 +130,22 @@ module Sc2
         else
           units
         end
+        # For SCV, the structure might be completed but dangling order for a few frames.
+        source_is_scv = source_unit_types.include?(Api::UnitTypeId::SCV)
+
+        # Let's count orders matching the ability
         total_in_progress = origin.select_type(source_unit_types).sum do |source|
           source.orders.count do |order|
-            true if order.ability_id == unit_create_ability
+            if order.ability_id == unit_create_ability
+              if source_is_scv
+                # If we are a SCV, do not count our order if the target is a completed structure pos
+                structures.select_type(unit_type_id).completed.none? do |structure|
+                  structure.pos == order.target_world_space_pos
+                end
+              else
+                true
+              end
+            end
           end
         end
         total_in_progress *= 2 if unit_type_id == Api::UnitTypeId::ZERGLING