sc2ai 0.2.0 → 0.3.0

data/data/sc2ai/protocol/raw.proto

@@ -10,12 +10,12 @@ import "sc2ai/protocol/common.proto";
 //
 
 message StartRaw {
-  optional Size2DI map_size = 1 [unverified_lazy=true];            // Width and height of the map.
+  optional Size2DI map_size = 1;            // Width and height of the map.
   optional ImageData pathing_grid = 2;      // 1 bit bitmap of the pathing grid.
-  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.
+  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.
 }
 
 
@@ -59,27 +59,27 @@ 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
-  Placeholder = 4;                        // Building that hasn't started construction.
+  ENUM_DISPLAY_TYPE_UNSET = 0; // PROTO3 COMPAT
+  VISIBLE = 1;                            // FULLY VISIBLE
+  SNAPSHOT = 2;                           // DIMMED VERSION OF UNIT LEFT BEHIND AFTER ENTERING FOG OF WAR
+  HIDDEN = 3;                             // FULLY HIDDEN
+  PLACEHOLDER = 4;                        // BUILDING THAT HASN'T STARTED CONSTRUCTION.
 }
 
 enum Alliance {
-  EnumAllianceUnset = 0; // Proto3 compat
-  Self = 1;
-  Ally = 2;
-  Neutral = 3;
-  Enemy = 4;
+  ENUM_ALLIANCE_UNSET = 0; // PROTO3 COMPAT
+  SELF = 1;
+  ALLY = 2;
+  NEUTRAL = 3;
+  ENEMY = 4;
 }
 
 enum CloakState {
-  CloakedUnknown = 0;  // Under the fog, so unknown whether it's cloaked or not.
-  Cloaked = 1;
-  CloakedDetected = 2;
-  NotCloaked = 3;
-  CloakedAllied = 4;
+  CLOAKED_UNKNOWN = 0;  // UNDER THE FOG, SO UNKNOWN WHETHER IT'S CLOAKED OR NOT.
+  CLOAKED = 1;
+  CLOAKED_DETECTED = 2;
+  NOT_CLOAKED = 3;
+  CLOAKED_ALLIED = 4;
 }
 
 message PassengerUnit {

data/data/sc2ai/protocol/sc2api.proto

@@ -155,14 +155,14 @@ 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.
-  in_replay = 4;                                // In a replay.
-  ended = 5;                                    // Game has ended, can still request game info, but ready for a new game.
-  quit = 6;                                     // Application is shutting down.
-  unknown = 99;                                 // Should not happen, but indicates an error if it occurs.
+  ENUM_STATUS_UNSET = 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.
+  IN_REPLAY = 4;                                // IN A REPLAY.
+  ENDED = 5;                                    // GAME HAS ENDED, CAN STILL REQUEST GAME INFO, BUT READY FOR A NEW GAME.
+  QUIT = 6;                                     // APPLICATION IS SHUTTING DOWN.
+  UNKNOWN = 99;                                 // SHOULD NOT HAPPEN, BUT INDICATES AN ERROR IF IT OCCURS.
 }
 
 //-----------------------------------------------------------------------------
@@ -192,15 +192,15 @@ message LocalMap {
 
 message ResponseCreateGame {
   enum Error {
-    EnumResponseCreateGameErrorUnset = 0; // Proto3 compat
-    MissingMap = 1;
-    InvalidMapPath = 2;
-    InvalidMapData = 3;
-    InvalidMapName = 4;
-    InvalidMapHandle = 5;
-    MissingPlayerSetup = 6;
-    InvalidPlayerSetup = 7;
-    MultiplayerUnsupported = 8;                     // Multiplayer is not supported in the current build.
+    ENUM_RESPONSE_CREATE_GAME_ERROR_UNSET = 0; // PROTO3 COMPAT
+    MISSING_MAP = 1;
+    INVALID_MAP_PATH = 2;
+    INVALID_MAP_DATA = 3;
+    INVALID_MAP_NAME = 4;
+    INVALID_MAP_HANDLE = 5;
+    MISSING_PLAYER_SETUP = 6;
+    INVALID_PLAYER_SETUP = 7;
+    MULTIPLAYER_UNSUPPORTED = 8;                     // MULTIPLAYER IS NOT SUPPORTED IN THE CURRENT BUILD.
   }
   optional Error error = 1;
   optional string error_details = 2;
@@ -233,22 +233,22 @@ message ResponseJoinGame {
   optional uint32 player_id = 1;
 
   enum Error {
-    EnumResponseJoinGameErrorUnset = 0; // Proto3 compat
-    MissingParticipation = 1;
-    InvalidObservedPlayerId = 2;
-    MissingOptions = 3;
-    MissingPorts = 4;
-    GameFull = 5;
-    LaunchError = 6;
-
-    // Multiplayer specific.
-    FeatureUnsupported = 7;                 // Multiplayer is not supported in the current build for the requested features.
-    NoSpaceForUser = 8;
-    MapDoesNotExist = 9;
-    CannotOpenMap = 10;
-    ChecksumError = 11;
-    NetworkError = 12;
-    OtherError = 13;
+    ENUM_RESPONSE_JOIN_GAME_ERROR_UNSET = 0; // PROTO3 COMPAT
+    MISSING_PARTICIPATION = 1;
+    INVALID_OBSERVED_PLAYER_ID = 2;
+    MISSING_OPTIONS = 3;
+    MISSING_PORTS = 4;
+    GAME_FULL = 5;
+    LAUNCH_ERROR = 6;
+
+    // MULTIPLAYER SPECIFIC.
+    FEATURE_UNSUPPORTED = 7;                 // MULTIPLAYER IS NOT SUPPORTED IN THE CURRENT BUILD FOR THE REQUESTED FEATURES.
+    NO_SPACE_FOR_USER = 8;
+    MAP_DOES_NOT_EXIST = 9;
+    CANNOT_OPEN_MAP = 10;
+    CHECKSUM_ERROR = 11;
+    NETWORK_ERROR = 12;
+    OTHER_ERROR = 13;
   }
   optional Error error = 2;
   optional string error_details = 3;
@@ -261,8 +261,8 @@ message RequestRestartGame {
 // The defaultRestartGameLoops is specified to be (1<<18) by default
 message ResponseRestartGame {
   enum Error {
-    EnumResponseRestartGameErrorUnset = 0; // Proto3 compat
-    LaunchError = 1;
+    ENUM_RESPONSE_RESTART_GAME_ERROR_UNSET = 0; // PROTO3 COMPAT
+    LAUNCH_ERROR = 1;
   }
   optional Error error = 1;
   optional string error_details = 2;
@@ -286,14 +286,14 @@ message RequestStartReplay {
 
 message ResponseStartReplay {
   enum Error {
-    EnumResponseStartReplayErrorUnset = 0; // Proto3 compat
-    MissingReplay = 1;
-    InvalidReplayPath = 2;
-    InvalidReplayData = 3;
-    InvalidMapData = 4;
-    InvalidObservedPlayerId = 5;
-    MissingOptions = 6;
-    LaunchError = 7;
+    ENUM_RESPONSE_START_REPLAY_ERROR_UNSET = 0; // PROTO3 COMPAT
+    MISSING_REPLAY = 1;
+    INVALID_REPLAY_PATH = 2;
+    INVALID_REPLAY_DATA = 3;
+    INVALID_MAP_DATA = 4;
+    INVALID_OBSERVED_PLAYER_ID = 5;
+    MISSING_OPTIONS = 6;
+    LAUNCH_ERROR = 7;
   }
   optional Error error = 1;
   optional string error_details = 2;
@@ -306,8 +306,8 @@ message RequestMapCommand {
 
 message ResponseMapCommand {
   enum Error {
-    EnumResponseMapCommandErrorUnset = 0; // Proto3 compat
-    NoTriggerError = 1;
+    ENUM_RESPONSE_MAP_COMMAND_ERROR_UNSET = 0; // PROTO3 COMPAT
+    NO_TRIGGER_ERROR = 1;
   }
   optional Error error = 1;
   optional string error_details = 2;
@@ -350,9 +350,9 @@ message RequestGameInfo {
 message ResponseGameInfo {
   optional string map_name = 1;
   optional string local_map_path = 2;
-  repeated PlayerInfo player_info = 3 [unverified_lazy=true];
+  repeated PlayerInfo player_info = 3;
   optional StartRaw start_raw = 4;               // Populated if Raw interface is enabled.
-  optional InterfaceOptions options = 5 [unverified_lazy=true];
+  optional InterfaceOptions options = 5;
   repeated string mod_names = 6;
 }
 
@@ -366,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 [unverified_lazy=true];      // Only populated if the game ended during this step.
+  repeated PlayerResult player_result = 4;      // Only populated if the game ended during this step.
   repeated ChatReceived chat = 5;
 }
 
@@ -459,12 +459,12 @@ message ResponseReplayInfo {
   optional uint32 base_build = 8;
 
   enum Error {
-    EnumResponseReplayInfoErrorUnset = 0; // Proto3 compat
-    MissingReplay = 1;
-    InvalidReplayPath = 2;
-    InvalidReplayData = 3;
-    ParsingError = 4;
-    DownloadError = 5;
+    ENUM_RESPONSE_REPLAY_INFO_ERROR_UNSET = 0; // PROTO3 COMPAT
+    MISSING_REPLAY = 1;
+    INVALID_REPLAY_PATH = 2;
+    INVALID_REPLAY_DATA = 3;
+    PARSING_ERROR = 4;
+    DOWNLOAD_ERROR = 5;
   }
   optional Error error = 9;
   optional string error_details = 10;
@@ -491,8 +491,8 @@ message RequestSaveMap {
 
 message ResponseSaveMap {
   enum Error {
-    EnumResponseSaveMapErrorUnset = 0; // Proto3 compat
-    InvalidMapData = 1;
+    ENUM_RESPONSE_SAVE_MAP_ERROR_UNSET = 0; // PROTO3 COMPAT
+    INVALID_MAP_DATA = 1;
   }
   optional Error error = 1;
 }
@@ -522,34 +522,34 @@ message ResponseDebug {
 //
 
 enum Difficulty {
-  EnumDifficultyUnset = 0; // Proto3 compat
-  VeryEasy = 1;
-  Easy = 2;
-  Medium = 3;
-  MediumHard = 4;
-  Hard = 5;
-  Harder = 6;
-  VeryHard = 7;
-  CheatVision = 8;
-  CheatMoney = 9;
-  CheatInsane = 10;
+  ENUM_DIFFICULTY_UNSET = 0; // PROTO3 COMPAT
+  VERY_EASY = 1;
+  EASY = 2;
+  MEDIUM = 3;
+  MEDIUM_HARD = 4;
+  HARD = 5;
+  HARDER = 6;
+  VERY_HARD = 7;
+  CHEAT_VISION = 8;
+  CHEAT_MONEY = 9;
+  CHEAT_INSANE = 10;
 }
 
 enum PlayerType {
-  EnumPlayerTypeUnset = 0; // Proto3 compat
-  Participant = 1;
-  Computer = 2;
-  Observer = 3;
+  ENUM_PLAYER_TYPE_UNSET = 0; // PROTO3 COMPAT
+  PARTICIPANT = 1;
+  COMPUTER = 2;
+  OBSERVER = 3;
 }
 
 enum AIBuild {
-  EnumAIBuildUnset = 0; // Proto3 compat
-  RandomBuild = 1;
-  Rush = 2;
-  Timing = 3;
-  Power = 4;
-  Macro = 5;
-  Air = 6;
+  ENUM_AI_BUILD_UNSET = 0; // PROTO3 COMPAT
+  RANDOM_BUILD = 1;
+  RUSH = 2;
+  TIMING = 3;
+  POWER = 4;
+  MACRO = 5;
+  AIR = 6;
 }
 
 message PlayerSetup {
@@ -630,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 [unverified_lazy=true];
+  optional Score score = 4;
 
   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 [unverified_lazy=true];               // Populated if Render interface is enabled.
+  optional ObservationRender render_data = 7;               // Populated if Render interface is enabled.
   optional ObservationUI ui_data = 8;                       // Populated if Feature Layer or Render interface is enabled.
 }
 
@@ -649,9 +649,9 @@ message Action {
 
 message ActionChat {
   enum Channel {
-    EnumChannelUnset = 0; // Proto3 compat
-    Broadcast = 1;
-    Team = 2;
+    ENUM_CHANNEL_UNSET = 0; // PROTO3 COMPAT
+    BROADCAST = 1;
+    TEAM = 2;
   }
   optional Channel channel = 1;
   optional string message = 2;
@@ -693,37 +693,37 @@ message ActionObserverCameraFollowUnits {
 }
 
 enum Alert {
-  EnumAlertUnset = 0; // Proto3 compat
-  AlertError = 3;
-  AddOnComplete = 4;
-  BuildingComplete = 5;
-  BuildingUnderAttack = 6;
-  LarvaHatched = 7;
-  MergeComplete = 8;
-  MineralsExhausted = 9;
-  MorphComplete = 10;
-  MothershipComplete = 11;
-  MULEExpired = 12;
-  NuclearLaunchDetected = 1;
-  NukeComplete = 13;
-  NydusWormDetected = 2;
-  ResearchComplete = 14;
-  TrainError = 15;
-  TrainUnitComplete = 16;
-  TrainWorkerComplete = 17;
-  TransformationComplete = 18;
-  UnitUnderAttack = 19;
-  UpgradeComplete = 20;
-  VespeneExhausted = 21;
-  WarpInComplete = 22;
+  ENUM_ALERT_UNSET = 0; // PROTO3 COMPAT
+  ALERT_ERROR = 3;
+  ADD_ON_COMPLETE = 4;
+  BUILDING_COMPLETE = 5;
+  BUILDING_UNDER_ATTACK = 6;
+  LARVA_HATCHED = 7;
+  MERGE_COMPLETE = 8;
+  MINERALS_EXHAUSTED = 9;
+  MORPH_COMPLETE = 10;
+  MOTHERSHIP_COMPLETE = 11;
+  MULE_EXPIRED = 12;
+  NUCLEAR_LAUNCH_DETECTED = 1;
+  NUKE_COMPLETE = 13;
+  NYDUS_WORM_DETECTED = 2;
+  RESEARCH_COMPLETE = 14;
+  TRAIN_ERROR = 15;
+  TRAIN_UNIT_COMPLETE = 16;
+  TRAIN_WORKER_COMPLETE = 17;
+  TRANSFORMATION_COMPLETE = 18;
+  UNIT_UNDER_ATTACK = 19;
+  UPGRADE_COMPLETE = 20;
+  VESPENE_EXHAUSTED = 21;
+  WARP_IN_COMPLETE = 22;
 }
 
 enum Result {
-  EnumResultUnset = 0; // Proto3 compat
-  Victory = 1;
-  Defeat = 2;
-  Tie = 3;
-  Undecided = 4;
+  ENUM_RESULT_UNSET = 0; // PROTO3 COMPAT
+  VICTORY = 1;
+  DEFEAT = 2;
+  TIE = 3;
+  UNDECIDED = 4;
 }
 
 message PlayerResult {

data/data/sc2ai/protocol/score.proto

@@ -5,9 +5,9 @@ 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
+    ENUM_SCORE_TYPE_UNSET = 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
   }
 
   optional ScoreType score_type = 6;

data/data/sc2ai/protocol/spatial.proto

@@ -101,11 +101,11 @@ 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.
-    AddAllType = 4;     // Equivalent to shift+control+click. Selects all units of a given type.
+    ENUM_ACTION_SPATIAL_UNIT_SELECTION_POINT_TYPE_UNSET = 0; // PROTO3 COMPAT
+    SELECT = 1;         // EQUIVALENT TO NORMAL CLICK. CHANGES SELECTION TO UNIT.
+    TOGGLE = 2;         // EQUIVALENT TO SHIFT+CLICK. TOGGLE SELECTION OF UNIT.
+    ALL_TYPE = 3;        // EQUIVALENT TO CONTROL+CLICK. SELECTS ALL UNITS OF A GIVEN TYPE.
+    ADD_ALL_TYPE = 4;     // EQUIVALENT TO SHIFT+CONTROL+CLICK. SELECTS ALL UNITS OF A GIVEN TYPE.
   }
   optional Type type = 2;
 }

data/data/sc2ai/protocol/ui.proto

@@ -90,12 +90,12 @@ 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.
-    SetAndSteal = 4;        // Equivalent to Control + Alt + number hotkey. Sets control group to current selection. Units are removed from other control groups.
-    AppendAndSteal = 5;     // Equivalent to Shift + Alt + number hotkey. Adds current selection into control group. Units are removed from other control groups.
+    ENUM_CONTROL_GROUP_ACTION_UNSET = 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.
+    SET_AND_STEAL = 4;        // EQUIVALENT TO CONTROL + ALT + NUMBER HOTKEY. SETS CONTROL GROUP TO CURRENT SELECTION. UNITS ARE REMOVED FROM OTHER CONTROL GROUPS.
+    APPEND_AND_STEAL = 5;     // EQUIVALENT TO SHIFT + ALT + NUMBER HOTKEY. ADDS CURRENT SELECTION INTO CONTROL GROUP. UNITS ARE REMOVED FROM OTHER CONTROL GROUPS.
   }
   optional ControlGroupAction action = 1;
   optional uint32 control_group_index = 2;
@@ -114,22 +114,22 @@ 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.
-    AddAll = 4;     // Equivalent to shift+control+click. Adds all idle workers to current selection.
+    ENUM_ACTION_SELECT_IDLE_WORKER_TYPE_UNSET = 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.
+    ADD_ALL = 4;     // EQUIVALENT TO SHIFT+CONTROL+CLICK. ADDS ALL IDLE WORKERS TO CURRENT SELECTION.
   }
   optional Type type = 1;
 }
 
 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.
-    DeselectAllOfType = 4;    // Control+Shift Click on icon.
+    ENUM_ACTION_MULTI_PANEL_TYPE_UNSET = 0; // PROTO3 COMPAT
+    SINGLE_SELECT = 1;         // CLICK ON ICON
+    DESELECT_UNIT = 2;         // SHIFT CLICK ON ICON
+    SELECT_ALL_OF_TYPE = 3;      // CONTROL CLICK ON ICON.
+    DESELECT_ALL_OF_TYPE = 4;    // CONTROL+SHIFT CLICK ON ICON.
   }
   optional Type type = 1;
   optional int32 unit_index = 2;

data/exe/sc2ai

@@ -1,9 +1,6 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-# require "pathname"
-# $LOAD_PATH.unshift(Pathname(File.dirname(__FILE__)).parent.join("lib").expand_path.to_s)
-
 require "sc2ai/cli/cli"
 
 # This got old quickly.

data/lib/sc2ai/api/data.rb

@@ -46,7 +46,7 @@ module Sc2
 
     # Indexes ability data by ability id
     # @param abilities [Array<Api::AbilityData>]
-    # @return [Hash<Integer, Api::AbilityData] indexed data
+    # @return [Hash<Integer, Api::AbilityData>] indexed data
     def abilities_from_proto(abilities)
       result = {}
 
@@ -75,7 +75,7 @@ module Sc2
 
     # Indexes upgrades data by id
     # @param upgrades [Array<Api::UpgradeData>]
-    # @return [Hash<Integer, Api::UpgradeData] indexed data
+    # @return [Hash<Integer, Api::UpgradeData>] indexed data
     def upgrades_from_proto(upgrades)
       result = {}
       upgrades.each do |u|
@@ -247,7 +247,7 @@ module Sc2
           unit_data.mineral_cost_sum += units[Api::UnitTypeId::GATEWAY].mineral_cost
           unit_data.vespene_cost_sum += units[Api::UnitTypeId::GATEWAY].vespene_cost
         else
-          if unit_data.race == Api::Race::Zerg && unit_data.attributes.include?(:Structure)
+          if unit_data.race == Api::Race::ZERG && unit_data.attributes.include?(Api::Attribute::STRUCTURE)
             unit_data.mineral_cost_sum += units[Api::UnitTypeId::DRONE].mineral_cost
           end
         end

data/lib/sc2ai/connection/connection_listener.rb

@@ -6,21 +6,21 @@ module Sc2
     # noinspection RubyUnusedLocalVariable
     module ConnectionListener
       # Called when connection established to application
-      # @param connection [Sc2Ai::Connection]
+      # @param connection [Sc2::Connection]
       # noinspection
       def on_connected(connection)
         Sc2.logger.debug { "#{self.class}.#{__method__} #{connection}" }
       end
 
       # Called while waiting on connection to application
-      # @param connection [Sc2Ai::Connection]
+      # @param connection [Sc2::Connection]
       # noinspection Lint/UnusedMethodArgument
       def on_connection_waiting(connection)
         Sc2.logger.debug { "#{self.class}.#{__method__} #{connection}" }
       end
 
       # Called when disconnected from application
-      # @param connection [Sc2Ai::Connection]
+      # @param connection [Sc2::Connection]
       # noinspection Lint/UnusedMethodArgument
       def on_disconnect(connection)
         Sc2.logger.debug { "#{self.class}.#{__method__} #{connection}" }

data/lib/sc2ai/connection/requests.rb

@@ -24,7 +24,7 @@ module Sc2
       end
 
       # Send to host and all clients for game to begin.
-      # @param race [Google::Protobuf::EnumValue] Api::Race
+      # @param race [Integer] see {Api::Race}
       # @param name [String] player name
       # @param server_host [String] hostname or ip of sc2 client
       # @param port_config [Sc2::PortConfig] port config auto or basic, using start port
@@ -51,16 +51,14 @@ module Sc2
           server_ports: port_config.server_port_set,
           client_ports: port_config.client_port_sets,
           options: Api::InterfaceOptions.new(
-            {
-              raw: true,
-              score: false,
-              feature_layer: feature_layer_interface_options(enable_feature_layer),
-              show_cloaked: true,
-              show_burrowed_shadows: true,
-              show_placeholders: true,
-              raw_affects_selection: Sc2.ladder?,
-              raw_crop_to_playable_area: true
-            }.merge!(interface_options)
+            raw: true,
+            score: false,
+            feature_layer: feature_layer_interface_options(enable_feature_layer),
+            show_cloaked: true,
+            show_burrowed_shadows: true,
+            show_placeholders: true,
+            raw_affects_selection: Sc2.ladder?,
+            raw_crop_to_playable_area: true, **interface_options
           )
         )
       end
@@ -103,7 +101,7 @@ module Sc2
       #     pp observer.api.start_replay(
       #       replay_path: Pathname("./replays/test.SC2Replay").realpath
       #     )
-      #     while observer.status == :in_replay
+      #     while observer.status == :IN_REPLAY
       #       #   Step forward
       #       observer.api.step(1)
       #       #   fresh observation info
@@ -124,27 +122,25 @@ module Sc2
 
         interface_options ||= {}
         send_request_for start_replay: Api::RequestStartReplay.new(
-          {
-            replay_path: replay_path.to_s,
-            replay_data: replay_data,
-            map_data: map_data,
-            realtime: false,
-            disable_fog: true,
-            record_replay: record_replay,
-            observed_player_id: 0,
-            options: Api::InterfaceOptions.new(
-              {
-                raw: true,
-                score: true,
-                feature_layer: feature_layer_interface_options(true),
-                show_cloaked: true,
-                show_burrowed_shadows: true,
-                show_placeholders: true,
-                raw_affects_selection: false,
-                raw_crop_to_playable_area: true
-              }.merge!(interface_options)
-            )
-          }.merge(options)
+          replay_path: replay_path.to_s,
+          replay_data: replay_data,
+          map_data: map_data,
+          realtime: false,
+          disable_fog: true,
+          record_replay: record_replay,
+          observed_player_id: 0,
+          options: Api::InterfaceOptions.new(
+            raw: true,
+            score: true,
+            feature_layer: feature_layer_interface_options(true),
+            show_cloaked: true,
+            show_burrowed_shadows: true,
+            show_placeholders: true,
+            raw_affects_selection: false,
+            raw_crop_to_playable_area: true,
+            **interface_options
+          ),
+          **options
         )
       end
 
@@ -425,8 +421,8 @@ module Sc2
       #      Api::Request.new(observation: RequestObservation)
       #    )[:observation]
       def send_request_for(**kwargs)
-        response = send_request(Api::Request.new(kwargs))
-        response[kwargs.keys.first.to_s]
+        response = send_request(Api::Request.new(**kwargs))
+        response.send(kwargs.keys.first)
       end
 
       private