sc2ai 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4cc73bf9c7a184bba045eeda38fda3eef727073f587a2d10aaa73221a32e623
-  data.tar.gz: 0a369e3cc2541eca0c31c9a54ee5837d1ecc468dbbef6c44294ed5446fece302
+  metadata.gz: 12ed47d1d8d02cf6f6b8cc90a721a6680549234091b9e59a6d26b28c176baddf
+  data.tar.gz: d32fa8177ced58062ce510a60923b4bd0b3808f2124c024184b4e05d1d2eea9b
 SHA512:
-  metadata.gz: 276537ab6bd87a3bccc61664af3cffc40dd1c1d5191d14bba5ee7c22e8d23795300ea7e968db4f46dff6847e3dac50e18a2232ec2a51bdae1b9341c6f8bc96e4
-  data.tar.gz: 6c58faf15c7eee339a9e24cbd7d945bd938cc82be86ee211bc9633127711f4b997b2b9619d83c0ce11e0b624facb4034bec83a46e9cb72e87b8f25039afc4baf
+  metadata.gz: 5484fa8272fa1be178882654b222691d1b7bab2c3209d29ad10643a6b43dbd99a238f5fe69f195df0066d1db58a30c3580093ac43ba16cf619993ea3853bdbb1
+  data.tar.gz: 509e55588fdc9c18e2011bab0c34e226123833d6daae537472076c4b21cd72950e4f4a1a94a7557040da8ca400f91775ce3fc7df4f9d66d5aa521deab69e6b7b

data/data/versions.json

@@ -569,15 +569,13 @@
     "version": 94137
   },
   {
-    "base-version": 95248,
-    "data-hash": "D3BB9F619ADA87F2943384DAF437EA32",
-    "fixed-hash": "17DA25BB12C6372C4E5944B5E4303906",
+    "base-version": 95841,
+    "data-hash": "536442325AEC578B31B2482F733396D5",
+    "fixed-hash": "68F2B161DFCE385FA577A21BF9BFAB0F",
     "label": "5.0.15",
     "replay-hash": "5563DC35EC51D0464DC16B56B424C9DF",
-    "version": 95248
+    "version": 95841
   },
-
-
   {
     "base-version": 94137,
     "data-hash": "519EE8D06E384469C652DD58FC6016AC",

data/lib/sc2ai/connection/requests.rb

@@ -160,12 +160,12 @@ module Sc2
       end
 
       # Saves game to an in-memory bookmark.
-      def request_quick_save
+      def quick_save
         send_request_for quick_save: Api::RequestQuickSave.new
       end
 
       # Loads from an in-memory bookmark.
-      def request_quick_load
+      def quick_load
         send_request_for quick_load: Api::RequestQuickLoad.new
       end
 

data/lib/sc2ai/player.rb

@@ -500,6 +500,22 @@ module Sc2
       def initialize(race:, name:)
         super(race:, name:, type: Api::PlayerType::PARTICIPANT)
       end
+
+      def play
+        loop do
+          @api.step(@step_count) unless @realtime
+
+          step_to_loop = @realtime ? game_loop + @step_count : nil
+          response_observation = @api.observation(game_loop: step_to_loop)
+          return if response_observation.nil?
+
+          # Check if match has a result and callback
+          on_player_result(response_observation.player_result) unless response_observation.player_result.empty?
+
+          return @result unless @result.nil?
+          break if @status != :IN_GAME
+        end
+      end
     end
 
     # A spectator for a Match

data/lib/sc2ai/protocol/extensions/power_source.rb

@@ -1,8 +1,6 @@
 module Api
   # Adds additional functionality to message object Api::PowerSource
   module PowerSourceExtension
-    include Sc2::Position
-
     # Adds additional functionality to message class Api::PowerSource
     module ClassMethods
       # Shorthand for creating an instance for [x, y, z]

data/lib/sc2ai/unit_group/filter_ext.rb

@@ -615,8 +615,9 @@ module Sc2
     # Builds a kdtree if not already built and returns it
     # @return [::Kdtree]
     def kdtree
-      return @kdtree unless @kdtree.nil?
-      @kdtree = Kdtree.new(@units.values.each_with_index.map { |unit, index| [unit.pos.x, unit.pos.y, index] })
+      cached("kdtree") do
+        Kdtree.new(@units.values.each_with_index.map { |unit, index| [unit.pos.x, unit.pos.y, index] })
+      end
     end
 
     # Returns an

data/lib/sc2ai/version.rb

@@ -1,5 +1,5 @@
 module Sc2
   # gem version
   # @return [String]
-  VERSION = "0.10.0"
+  VERSION = "0.11.0"
 end

data/sig/sc2ai.rbs

@@ -1251,6 +1251,9 @@ module Sc2
       CALLBACK_METHODS: untyped
 
       def initialize: (race: Integer, name: String) -> void
+
+      # sord omit - no YARD return type given, using untyped
+      def play: () -> untyped
     end
 
     # A spectator for a Match
@@ -2666,11 +2669,11 @@ module Sc2
 
     # sord omit - no YARD return type given, using untyped
     # Saves game to an in-memory bookmark.
-    def request_quick_save: () -> untyped
+    def quick_save: () -> untyped
 
     # sord omit - no YARD return type given, using untyped
     # Loads from an in-memory bookmark.
-    def request_quick_load: () -> untyped
+    def quick_load: () -> untyped
 
     # sord omit - no YARD return type given, using untyped
     # Quits Sc2. Does not work on ladder.
@@ -2959,11 +2962,11 @@ module Sc2
 
       # sord omit - no YARD return type given, using untyped
       # Saves game to an in-memory bookmark.
-      def request_quick_save: () -> untyped
+      def quick_save: () -> untyped
 
       # sord omit - no YARD return type given, using untyped
       # Loads from an in-memory bookmark.
-      def request_quick_load: () -> untyped
+      def quick_load: () -> untyped
 
       # sord omit - no YARD return type given, using untyped
       # Quits Sc2. Does not work on ladder.
@@ -7179,142 +7182,6 @@ module Api
     # ```
     def self.[]: ((Float | Integer) x, (Float | Integer) y, (Float | Integer) z) -> Api::Point
 
-    # Loose equality matches on floats x and y.
-    # We never check z-axis, because the map is single-level.
-    # TODO: We should almost certainly introduce TOLERANCE here, but verify it's cost first.
-    # 
-    # _@param_ `other`
-    def ==: (Sc2::Position other) -> bool
-
-    # A new point representing the sum of this point and the other point.
-    # 
-    # _@param_ `other` — The other point/number to add.
-    def add: ((Api::Point2D | Numeric) other) -> Api::Point2D
-
-    # Returns a new point representing the difference between this point and the other point/number.
-    # 
-    # _@param_ `other` — The other to subtract.
-    def subtract: ((Api::Point2D | Numeric) other) -> Api::Point2D
-
-    # Returns this point multiplied by the scalar
-    # 
-    # _@param_ `scalar` — The scalar to multiply by.
-    def multiply: (Float scalar) -> Api::Point2D
-
-    # _@param_ `scalar` — The scalar to divide by.
-    # 
-    # _@return_ — A new point representing this point divided by the scalar.
-    def divide: (Float scalar) -> Api::Point2D
-
-    # Randomly adjusts both x and y by a range of: -offset..offset
-    # 
-    # _@param_ `offset`
-    # 
-    # _@return_ — new Position
-    def random_offset: (Float offset) -> Sc2::Position
-
-    # Randomly change this point's x and y by the supplied offset.
-    # i.e. offset=2 can adjust x and y by any number in range -2..2
-    # 
-    # _@param_ `offset`
-    # 
-    # _@return_ — self
-    def random_offset!: (Float offset) -> Sc2::Position
-
-    # Creates a new point with x and y which is offset
-    # 
-    # _@param_ `x`
-    # 
-    # _@param_ `y`
-    # 
-    # _@return_ — new Position
-    def offset: (?(Float | Integer) x, ?(Float | Integer) y) -> Sc2::Position
-
-    # Changes this point's x and y by the supplied offset
-    # 
-    # _@param_ `x`
-    # 
-    # _@param_ `y`
-    # 
-    # _@return_ — self
-    def offset!: (?(Float | Integer) x, ?(Float | Integer) y) -> Sc2::Position
-
-    # For vector returns the magnitude, synonymous with Math.hypot
-    def magnitude: () -> Float
-
-    # The dot product of this vector and the other vector.
-    # 
-    # _@param_ `other` — The other vector to calculate the dot product with.
-    def dot: (Api::Point2D other) -> Float
-
-    # The cross product of this vector and the other vector.
-    # 
-    # _@param_ `other` — The other vector to calculate the cross product with.
-    def cross_product: (Api::Point2D other) -> Float
-
-    # The angle between this vector and the other vector, in radians.
-    # 
-    # _@param_ `other` — The other vector to calculate the angle to.
-    def angle_to: (Api::Point2D other) -> Float
-
-    # A new point representing the normalized version of this vector (unit length).
-    def normalize: () -> Api::Point2D
-
-    # Linear interpolation between this point and another for scale
-    # Finds a point on a line between two points at % along the way. 0.0 returns self,  1.0 returns other, 0.5 is halfway.
-    # 
-    # _@param_ `other`
-    # 
-    # _@param_ `scale` — a value between 0.0..1.0
-    def lerp: (Sc2::Position other, Float scale) -> Api::Point2D
-
-    # Calculates the distance between self and other
-    # 
-    # _@param_ `other`
-    def distance_to: (Sc2::Position other) -> Float
-
-    # The squared distance between this point and the other point.
-    # 
-    # _@param_ `other` — The other point to calculate the squared distance to.
-    def distance_squared_to: (Api::Point2D other) -> Float
-
-    # Distance between this point and coordinate of x and y
-    # 
-    # _@param_ `x`
-    # 
-    # _@param_ `y`
-    def distance_to_coordinate: (x: (Float | Integer), y: (Float | Integer)) -> Float
-
-    # The distance from this point to the circle.
-    # 
-    # _@param_ `center` — The center of the circle.
-    # 
-    # _@param_ `radius` — The radius of the circle.
-    def distance_to_circle: (Api::Point2D center, Float radius) -> Float
-
-    # Moves in direction towards other point by distance
-    # 
-    # _@param_ `other` — The target point to move to.
-    # 
-    # _@param_ `distance` — The distance to move.
-    def towards: (Api::Point2D other, Float distance) -> Api::Point2D
-
-    # Moves in direction away from the other point by distance
-    # 
-    # _@param_ `other` — The target point to move away from
-    # 
-    # _@param_ `distance` — The distance to move.
-    def away_from: (Api::Point2D other, Float distance) -> Api::Point2D
-
-    # Returns [x,y] array tuple
-    def to_axy: () -> ::Array[Float]
-
-    # Returns [x,y] array tuple where floats are cast to ints
-    # Useful when trying to find the tile which something is on
-    def to_atile: () -> ::Array[Integer]
-
-    def to_s: () -> String
-
     # sord omit - no YARD type given for :pos, using untyped
     # optional field readers
     attr_accessor pos: untyped
@@ -20375,153 +20242,6 @@ module Api
 
   # Adds additional functionality to message object Api::PowerSource
   module PowerSourceExtension
-    include Sc2::Position
-
-    # Returns self.
-    # If you're ever unsure if you have a Unit or Position in hand,
-    # this method allows safely calling `unknown_target.pos` to return a position.
-    # 
-    # ```ruby
-    # target.pos
-    # ```
-    def pos: () -> Sc2::Position
-
-    # Loose equality matches on floats x and y.
-    # We never check z-axis, because the map is single-level.
-    # TODO: We should almost certainly introduce TOLERANCE here, but verify it's cost first.
-    # 
-    # _@param_ `other`
-    def ==: (Sc2::Position other) -> bool
-
-    # A new point representing the sum of this point and the other point.
-    # 
-    # _@param_ `other` — The other point/number to add.
-    def add: ((Api::Point2D | Numeric) other) -> Api::Point2D
-
-    # Returns a new point representing the difference between this point and the other point/number.
-    # 
-    # _@param_ `other` — The other to subtract.
-    def subtract: ((Api::Point2D | Numeric) other) -> Api::Point2D
-
-    # Returns this point multiplied by the scalar
-    # 
-    # _@param_ `scalar` — The scalar to multiply by.
-    def multiply: (Float scalar) -> Api::Point2D
-
-    # _@param_ `scalar` — The scalar to divide by.
-    # 
-    # _@return_ — A new point representing this point divided by the scalar.
-    def divide: (Float scalar) -> Api::Point2D
-
-    # Randomly adjusts both x and y by a range of: -offset..offset
-    # 
-    # _@param_ `offset`
-    # 
-    # _@return_ — new Position
-    def random_offset: (Float offset) -> Sc2::Position
-
-    # Randomly change this point's x and y by the supplied offset.
-    # i.e. offset=2 can adjust x and y by any number in range -2..2
-    # 
-    # _@param_ `offset`
-    # 
-    # _@return_ — self
-    def random_offset!: (Float offset) -> Sc2::Position
-
-    # Creates a new point with x and y which is offset
-    # 
-    # _@param_ `x`
-    # 
-    # _@param_ `y`
-    # 
-    # _@return_ — new Position
-    def offset: (?(Float | Integer) x, ?(Float | Integer) y) -> Sc2::Position
-
-    # Changes this point's x and y by the supplied offset
-    # 
-    # _@param_ `x`
-    # 
-    # _@param_ `y`
-    # 
-    # _@return_ — self
-    def offset!: (?(Float | Integer) x, ?(Float | Integer) y) -> Sc2::Position
-
-    # For vector returns the magnitude, synonymous with Math.hypot
-    def magnitude: () -> Float
-
-    # The dot product of this vector and the other vector.
-    # 
-    # _@param_ `other` — The other vector to calculate the dot product with.
-    def dot: (Api::Point2D other) -> Float
-
-    # The cross product of this vector and the other vector.
-    # 
-    # _@param_ `other` — The other vector to calculate the cross product with.
-    def cross_product: (Api::Point2D other) -> Float
-
-    # The angle between this vector and the other vector, in radians.
-    # 
-    # _@param_ `other` — The other vector to calculate the angle to.
-    def angle_to: (Api::Point2D other) -> Float
-
-    # A new point representing the normalized version of this vector (unit length).
-    def normalize: () -> Api::Point2D
-
-    # Linear interpolation between this point and another for scale
-    # Finds a point on a line between two points at % along the way. 0.0 returns self,  1.0 returns other, 0.5 is halfway.
-    # 
-    # _@param_ `other`
-    # 
-    # _@param_ `scale` — a value between 0.0..1.0
-    def lerp: (Sc2::Position other, Float scale) -> Api::Point2D
-
-    # Calculates the distance between self and other
-    # 
-    # _@param_ `other`
-    def distance_to: (Sc2::Position other) -> Float
-
-    # The squared distance between this point and the other point.
-    # 
-    # _@param_ `other` — The other point to calculate the squared distance to.
-    def distance_squared_to: (Api::Point2D other) -> Float
-
-    # Distance between this point and coordinate of x and y
-    # 
-    # _@param_ `x`
-    # 
-    # _@param_ `y`
-    def distance_to_coordinate: (x: (Float | Integer), y: (Float | Integer)) -> Float
-
-    # The distance from this point to the circle.
-    # 
-    # _@param_ `center` — The center of the circle.
-    # 
-    # _@param_ `radius` — The radius of the circle.
-    def distance_to_circle: (Api::Point2D center, Float radius) -> Float
-
-    # Moves in direction towards other point by distance
-    # 
-    # _@param_ `other` — The target point to move to.
-    # 
-    # _@param_ `distance` — The distance to move.
-    def towards: (Api::Point2D other, Float distance) -> Api::Point2D
-
-    # Moves in direction away from the other point by distance
-    # 
-    # _@param_ `other` — The target point to move away from
-    # 
-    # _@param_ `distance` — The distance to move.
-    def away_from: (Api::Point2D other, Float distance) -> Api::Point2D
-
-    # Returns [x,y] array tuple
-    def to_axy: () -> ::Array[Float]
-
-    # Returns [x,y] array tuple where floats are cast to ints
-    # Useful when trying to find the tile which something is on
-    def to_atile: () -> ::Array[Integer]
-
-    def to_s: () -> String
-
     # Adds additional functionality to message class Api::PowerSource
     module ClassMethods
       # Shorthand for creating an instance for [x, y, z]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sc2ai
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Dyson Returns
@@ -388,7 +388,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.3.8
+      version: 3.4.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="