sc2ai 0.0.2 → 0.0.3

data/lib/sc2ai/api/unit_type_id.rb

@@ -2012,11 +2012,63 @@ module Api
     MINERALFIELD450 = 1996
     MINERALFIELDOPAQUE = 1997
     MINERALFIELDOPAQUE900 = 1998
-    COLLAPSIBLEROCKTOWERDEBRISRAMPLEFTGREEN = 1999
-    COLLAPSIBLEROCKTOWERDEBRISRAMPRIGHTGREEN = 2000
-    COLLAPSIBLEROCKTOWERPUSHUNITRAMPLEFTGREEN = 2001
-    COLLAPSIBLEROCKTOWERPUSHUNITRAMPRIGHTGREEN = 2002
-    COLLAPSIBLEROCKTOWERRAMPLEFTGREEN = 2003
-    COLLAPSIBLEROCKTOWERRAMPRIGHTGREEN = 2004
+    MECHAZERGLINGACGLUESCREENDUMMY_2 = 1999
+    MECHABANELINGACGLUESCREENDUMMY_2 = 2000
+    MECHAHYDRALISKACGLUESCREENDUMMY_2 = 2001
+    MECHAINFESTORACGLUESCREENDUMMY_2 = 2002
+    MECHACORRUPTORACGLUESCREENDUMMY_2 = 2003
+    MECHAULTRALISKACGLUESCREENDUMMY_2 = 2004
+    MECHAOVERSEERACGLUESCREENDUMMY_2 = 2005
+    MECHALURKERACGLUESCREENDUMMY_2 = 2006
+    MECHABATTLECARRIERLORDACGLUESCREENDUMMY_2 = 2007
+    MECHASPINECRAWLERACGLUESCREENDUMMY_2 = 2008
+    MECHASPORECRAWLERACGLUESCREENDUMMY_2 = 2009
+    TROOPERMENGSKACGLUESCREENDUMMY_2 = 2010
+    MEDIVACMENGSKACGLUESCREENDUMMY_2 = 2011
+    BLIMPMENGSKACGLUESCREENDUMMY_2 = 2012
+    MARAUDERMENGSKACGLUESCREENDUMMY_2 = 2013
+    GHOSTMENGSKACGLUESCREENDUMMY_2 = 2014
+    SIEGETANKMENGSKACGLUESCREENDUMMY_2 = 2015
+    THORMENGSKACGLUESCREENDUMMY_2 = 2016
+    VIKINGMENGSKACGLUESCREENDUMMY_2 = 2017
+    BATTLECRUISERMENGSKACGLUESCREENDUMMY_2 = 2018
+    BUNKERDEPOTMENGSKACGLUESCREENDUMMY_2 = 2019
+    MISSILETURRETMENGSKACGLUESCREENDUMMY_2 = 2020
+    ARTILLERYMENGSKACGLUESCREENDUMMY_2 = 2021
+    LOADOUTSPRAY1_2 = 2022
+    LOADOUTSPRAY2_2 = 2023
+    LOADOUTSPRAY3_2 = 2024
+    LOADOUTSPRAY4_2 = 2025
+    LOADOUTSPRAY5_2 = 2026
+    LOADOUTSPRAY6_2 = 2027
+    LOADOUTSPRAY7_2 = 2028
+    LOADOUTSPRAY8_2 = 2029
+    LOADOUTSPRAY9_2 = 2030
+    LOADOUTSPRAY10_2 = 2031
+    LOADOUTSPRAY11_2 = 2032
+    LOADOUTSPRAY12_2 = 2033
+    LOADOUTSPRAY13_2 = 2034
+    LOADOUTSPRAY14_2 = 2035
+    COLLAPSIBLEROCKTOWERDEBRISRAMPLEFTGREEN = 2036
+    COLLAPSIBLEROCKTOWERDEBRISRAMPRIGHTGREEN = 2037
+    COLLAPSIBLEROCKTOWERPUSHUNITRAMPLEFTGREEN = 2038
+    COLLAPSIBLEROCKTOWERPUSHUNITRAMPRIGHTGREEN = 2039
+    COLLAPSIBLEROCKTOWERRAMPLEFTGREEN = 2040
+    COLLAPSIBLEROCKTOWERRAMPRIGHTGREEN = 2041
+    DUMMYUNIT000 = 2042
+    DUMMYUNIT001 = 2043
+    DUMMYUNIT002 = 2044
+    DUMMYUNIT003 = 2045
+    DUMMYUNIT004 = 2046
+    DUMMYUNIT005 = 2047
+    DUMMYUNIT006 = 2048
+    DUMMYUNIT007 = 2049
+    DUMMYUNIT008 = 2050
+    DUMMYUNIT009 = 2051
+    DUMMYUNIT010 = 2052
+    DUMMYUNIT011 = 2053
+    DUMMYUNIT012 = 2054
+    DUMMYUNIT013 = 2055
+    DUMMYUNIT014 = 2056
   end
 end

data/lib/sc2ai/api/upgrade_id.rb

@@ -306,5 +306,7 @@ module Api
     PSIONICAMPLIFIERS = 300
     SECRETEDCOATING = 301
     ENHANCEDSHOCKWAVES = 302
+    HURRICANETHRUSTERS = 303
+    INTERFERENCEMATRIX = 304
   end
 end

data/lib/sc2ai/cli/cli.rb

@@ -1,4 +1,5 @@
 require "thor"
+
 require "sc2ai/cli/new"
 require "sc2ai/cli/ladderzip"
 
@@ -20,36 +21,36 @@ module Sc2
     desc "setup410", "Downloads and install SC2 v4.10"
     # downloads and install SC2 v4.10
     def setup410
-      puts " "
-      puts "This script sets up SC2 at version 4.10, which we use competitively."
-      puts "Press any key to continue..."
-      puts " "
-      $stdin.getch
-
-      puts "You must accept the Blizzard® Starcraft® II AI and Machine Learning License at"
-      puts "https://blzdistsc2-a.akamaihd.net/AI_AND_MACHINE_LEARNING_LICENSE.html"
-      puts "It is PERMISSIVE and grants you freedoms over the standard EULA."
-      puts "We do not record this action, but depend on software goverend by that license to continue."
+      say " "
+      say "This script sets up SC2 at version 4.10, which we use competitively."
+      say "Press any key to continue..."
+      ask ""
+
+      say "You must accept the Blizzard® Starcraft® II AI and Machine Learning License at"
+      say "https://blzdistsc2-a.akamaihd.net/AI_AND_MACHINE_LEARNING_LICENSE.html"
+      say "It is PERMISSIVE and grants you freedoms over the standard EULA."
+      say "We do not record this action, but depend on software goverend by that license to continue."
       puts 'If you accept, type "iagreetotheeula" (without quotes) and press ENTER to continue:'
 
       while $stdin.gets.chomp != "iagreetotheeula"
-        puts ""
+        say ""
         puts 'Type "iagreetotheeula" (without quotes) and press ENTER to continue:'
       end
-      puts ""
-      puts ""
-      puts "Great decision."
+      say ""
+      say ""
+      say "Great decision."
 
+      require "sc2ai"
       Async do
         Sc2.logger.level = :fatal
-        puts "SC2 will launch a blank window, be unresponsive, but download about 100mb in the background."
-        puts "Let it finish and close itself."
-        puts "Press ENTER if you understand."
-        $stdin.getch
+        say "SC2 will launch a blank window, be unresponsive, but download about 100mb in the background."
+        say "Let it finish and close itself."
+        say "Press ENTER if you understand."
+        ask ""
 
-        puts ""
-        puts ""
-        puts "This will only take a minute..."
+        say ""
+        say ""
+        say "This will only take a minute..."
 
         Sc2.config.version = nil
         client = Sc2::ClientManager.obtain(0)
@@ -68,22 +69,23 @@ module Sc2
         base_build = "75689"
         path = Sc2::Paths.executable(base_build: base_build)
         if path.include?(base_build) && Pathname(path).exist?
-          puts " "
-          puts "Success. Downloaded complete."
-          puts " "
+          say " "
+          say "Success. Download complete.", :green
+          say " "
         else
-          puts "Error. Slightly worrying, but no fear."
-          puts "To manually setup, grab the latest ladder maps and add them to your map folder."
-          puts "Grab the latest maps from https://aiarena.net/wiki/maps/"
-          puts "Detected map folder: #{Sc2::Paths.maps_dir}"
-          puts "Then, download any recent replay from https://aiarena.net/ and double click to launch"
+          say "Error. Slightly worrying, but no fear.", :red
+          say "To manually setup, grab the latest ladder maps and add them to your map folder."
+          say "Grab the latest maps from https://aiarena.net/wiki/maps/"
+          say "Detected map folder: #{Sc2::Paths.maps_dir}"
+          say "Then, download any recent replay from https://aiarena.net/ and double click to launch"
         end
 
+        observer.api.quit
         observer.disconnect
-        puts "Generating sc2ai.yml to always use 4.10..."
+        say "Generating sc2ai.yml to always use 4.10..."
         Sc2.config.config_file.write({"version" => "4.10"}.to_yaml.to_s)
-        puts ""
-        puts "Done. You're good to go."
+        say ""
+        say "Done. You're good to go.", :green
       ensure
         Sc2::ClientManager.stop(0)
       end
@@ -133,7 +135,7 @@ module Sc2
     option :RealTime, type: :boolean, default: false, desc: "Forces realtime flag"
     def laddermatch
       require "sc2ai"
-      
+
       unless Sc2.ladder?
         raise Sc2::Error, "This command is only for competing on aiarena.net"
       end

data/lib/sc2ai/cli/ladderzip.rb

@@ -18,11 +18,21 @@ module Sc2
       desc "Builds a ladder zip using docker (requires docker)"
 
       def docker_exists
-        if Kernel.system("docker --version")
+        if Kernel.system("docker --version", out: File::NULL, err: File::NULL)
           say_status("docker", "found", :green)
         else
           say_status("docker", "not found", :red)
           say("Please install 'docker' and/or ensure it's in your PATH to continue.")
+          raise SystemExit
+        end
+
+        if Kernel.system("docker info", out: File::NULL, err: File::NULL)
+          say_status("docker engine", "found", :green)
+        else
+          say("  ")
+          say_status("docker engine", "offline", :red)
+          say("Please start docker engine. If you have Docker Desktop installed, open it before retrying.")
+          raise SystemExit
         end
       end
 
@@ -64,7 +74,8 @@ module Sc2
 
       def create_executable
         template("ladderzip/bin/ladder", "./.build/bin/ladder")
-        create_link(".build/#{botname}", "./bin/ladder")
+        # This fails on Windows. creating by hand in #link_ladder function below.
+        # create_link("./.build/#{botname}", "./bin/ladder")
       end
 
       def start_container
@@ -86,9 +97,11 @@ module Sc2
         include_pattern.collect! { |pt| pt.delete_prefix("!") }
 
         files = Dir.glob("**/*")
+
         ignored_files = files
           .select { |f| ignore_pattern.any? { |p| File.fnmatch?(p, f) } }
-          .reject! { |f| include_pattern.any? { |p| File.fnmatch?(p, f) } }
+          .reject { |f| include_pattern.any? { |p| File.fnmatch?(p, f) } }
+
         files -= ignored_files unless ignored_files.nil?
 
         files.each do |file|
@@ -103,6 +116,12 @@ module Sc2
         Kernel.system(cmd)
       end
 
+      def link_ladder
+        say_status("docker", "linking executable...", :cyan)
+        cmd = "docker compose -f #{@compose_file} exec --workdir /root/ruby-builder bot ln -s ./bin/ladder ./#{botname}"
+        Kernel.system(cmd)
+      end
+
       def install_gems
         say_status("docker", "bundle install...", :cyan)
         cmd = "docker compose -f #{@compose_file} exec --workdir /root/ruby-builder bot bundle install"

data/lib/sc2ai/player/geometry.rb

@@ -202,7 +202,7 @@ module Sc2
       # @param y [Float, Integer]
       # @return [Boolean] true if location is powered
       def powered?(x:, y:)
-        parsed_creep[y.to_i, x.to_i] != 0
+        parsed_power_grid[y.to_i, x.to_i] != 0
       end
 
       # Returns whether a x/y block is pathable as per minimap

data/lib/sc2ai/version.rb

@@ -2,5 +2,5 @@
 
 module Sc2
   # gem version
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sc2ai
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Dyson Returns
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-02-07 00:00:00.000000000 Z
+date: 2024-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -178,6 +178,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: webrick
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: standard
   requirement: !ruby/object:Gem::Requirement
@@ -292,7 +306,7 @@ dependencies:
         version: '0.22'
 description: This is a Ruby interface to STARCRAFT® II. It can be used for machine
   learning via Rumale or custom scripted AI battle.
-email:
+email: 
 executables:
 - sc2ai
 extensions: []
@@ -389,7 +403,6 @@ files:
 - lib/templates/new/boot.rb.tt
 - lib/templates/new/my_bot.rb.tt
 - lib/templates/new/run_example_match.rb.tt
-- sc2ai.gemspec
 homepage: https://www.github.com/dysonreturns/sc2ai
 licenses:
 - MIT
@@ -397,7 +410,7 @@ licenses:
 metadata:
   homepage_uri: https://www.github.com/dysonreturns/sc2ai
   changelog_uri: https://www.github.com/dysonreturns/sc2ai/blob/main/docs/CHANGELOG.md
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -413,7 +426,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.5.3
-signing_key:
+signing_key: 
 specification_version: 4
 summary: STARCRAFT® II AI API
 test_files: []

data/sc2ai.gemspec

@@ -1,80 +0,0 @@
-# frozen_string_literal: true
-
-$LOAD_PATH.unshift(File.expand_path("./lib"))
-require_relative "lib/sc2ai/version"
-
-Gem::Specification.new do |spec|
-  spec.name = "sc2ai"
-  spec.version = Sc2::VERSION
-  spec.authors = ["Dyson Returns"]
-
-  spec.summary = "STARCRAFT® II AI API"
-  spec.description = "This is a Ruby interface to STARCRAFT® II. It can be used for machine learning via Rumale or custom scripted AI battle."
-  spec.homepage = "https://www.github.com/dysonreturns/sc2ai"
-  spec.licenses = ["MIT", "Nonstandard"]
-  spec.required_ruby_version = ">= 3.2.2"
-
-  spec.metadata["homepage_uri"] = spec.homepage
-  # spec.metadata["source_code_uri"] = spec.homepage
-  spec.metadata["changelog_uri"] = "#{spec.homepage}/blob/main/docs/CHANGELOG.md"
-
-  # Specify which files should be added to the gem when it is released.
-  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files = Dir.chdir(__dir__) do
-    `git ls-files -z`.split("\x0").select do |f|
-      (File.expand_path(f) == __FILE__) ||
-        %r{\A(?:lib|data|exe)/}.match?(f)
-    end
-  end
-
-  spec.bindir = "exe"
-  spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
-
-  # Live dependencies ---
-  spec.add_dependency "async", "2.6.5"
-  # Sc2::Connection
-  spec.add_dependency "async-websocket", "0.26.0"
-  spec.add_dependency "google-protobuf", "3.25.1"
-  # Sc2::Client / Controller
-  spec.add_dependency "async-process", "1.3.1"
-  # Cli
-  spec.add_dependency "thor", "1.3.0"
-
-  # Geometry
-  spec.add_dependency "perfect-shape", "1.0.8"
-
-  spec.add_dependency "numo-narray", "0.9.2.1"
-  spec.add_dependency "numo-linalg", "0.1.7"
-  spec.add_dependency "rumale", "0.28.1"
-
-  # TODO: Find a way to not depend on a patched gem and yank this
-  spec.add_dependency "sc2ai-kdtree", "~> 0.4"
-
-  # Pre-packaged ladder dependencies
-  # We add these locally, so that authors know what to use
-  # spec.add_dependency "activerecord", "7.1.2"
-  # spec.add_dependency "sqlite3", "1.7.0"
-  # spec.add_dependency "rb_sys", "0.9.85"
-  # spec.add_dependency "concurrent-ruby", "1.2.2"
-  # spec.add_dependency "parallel", "1.24.0"
-
-  # Dev dependencies ---
-  spec.add_development_dependency "rake", "~> 13.1"
-  # Doc
-  spec.add_development_dependency "yard", "~> 0.9"
-  # Linting
-  # spec.add_development_dependency "fasterer" # no 3.3 support yet
-  spec.add_development_dependency "standard", "~> 1.33"
-
-  # Profiling
-  spec.add_development_dependency "memory_profiler", "~> 1.0"
-  spec.add_development_dependency "benchmark", "~> 0.3"
-  spec.add_development_dependency "benchmark-ips", "~> 2.13"
-
-  # Testing
-  spec.add_development_dependency "factory_bot", "~> 6.4"
-  spec.add_development_dependency "fakefs", "~> 2.5"
-  spec.add_development_dependency "rspec", "~> 3.12"
-  spec.add_development_dependency "simplecov", "~> 0.22"
-end