sc2ai 0.6.5 → 0.8.0

data/lib/sc2ai/api/buff_id.rb

@@ -295,7 +295,7 @@ module Api
     ACCELERATIONZONETEMPORALFIELD = 289
     ACCELERATIONZONEFLYINGTEMPORALFIELD = 290
     INHIBITORZONEFLYINGTEMPORALFIELD = 291
-    LOADOUTSPRAYTRACKER = 292
+    DUMMYBUFF000 = 292
     INHIBITORZONETEMPORALFIELD = 293
     CLOAKFIELD = 294
     RESONATINGGLAIVESPHASESHIFT = 295
@@ -305,5 +305,10 @@ module Api
     TAKENDAMAGE = 299
     RAVENSCRAMBLERMISSILECARRIER = 300
     BATTERYOVERCHARGE = 301
+    DUMMYBUFF002 = 302
+    DUMMYBUFF001 = 303
+    DUMMYBUFF003 = 304
+    DUMMYBUFF004 = 305
+    DUMMYBUFF005 = 306
   end
 end

data/lib/sc2ai/api/data.rb

@@ -118,16 +118,10 @@ module Sc2
       units.transform_values! do |unit_data|
         # Cost corrections, hardcoded.
         case unit_data.unit_id
-        when Api::UnitTypeId::CYCLONE # TERRAN - UNITS
-          unit_data.mineral_cost = 125
-          unit_data.vespene_cost = 50
-          unit_data.food_required = 2
         when Api::UnitTypeId::LIBERATOR
           unit_data.vespene_cost = 125
         when Api::UnitTypeId::MULE
           unit_data.mineral_cost = 0
-        when Api::UnitTypeId::RAVEN
-          unit_data.vespene_cost = 150
         when Api::UnitTypeId::AUTOTURRET # TERRAN - STRUCTURES
           unit_data.mineral_cost = 0
         when Api::UnitTypeId::ORBITALCOMMAND

data/lib/sc2ai/api/tech_tree_data.rb

@@ -39,7 +39,6 @@ module Api
      requires_placement_position: true},
    Api::UnitTypeId::HELLION =>
     {ability: Api::AbilityId::FACTORYTRAIN_HELLION},
-   Api::UnitTypeId::CYCLONE => {ability: Api::AbilityId::TRAIN_CYCLONE},
    Api::UnitTypeId::WIDOWMINE =>
     {ability: Api::AbilityId::FACTORYTRAIN_WIDOWMINE},
    Api::UnitTypeId::SIEGETANK =>
@@ -51,7 +50,9 @@ module Api
      required_building: Api::UnitTypeId::ARMORY},
    Api::UnitTypeId::HELLIONTANK =>
     {ability: Api::AbilityId::TRAIN_HELLBAT,
-     required_building: Api::UnitTypeId::ARMORY}},
+     required_building: Api::UnitTypeId::ARMORY},
+   Api::UnitTypeId::CYCLONE =>
+    {ability: Api::AbilityId::TRAIN_CYCLONE, requires_techlab: true}},
                                                Api::UnitTypeId::STARPORT =>
   {Api::UnitTypeId::STARPORTTECHLAB =>
     {ability: Api::AbilityId::BUILD_TECHLAB_STARPORT,
@@ -276,10 +277,6 @@ module Api
    Api::UnitTypeId::QUEEN =>
     {ability: Api::AbilityId::TRAINQUEEN_QUEEN,
      required_building: Api::UnitTypeId::SPAWNINGPOOL}},
-                                               Api::UnitTypeId::CREEPTUMOR =>
-  {Api::UnitTypeId::CREEPTUMOR =>
-    {ability: Api::AbilityId::BUILD_CREEPTUMOR_TUMOR,
-     requires_placement_position: true}},
                                                Api::UnitTypeId::SPIRE =>
   {Api::UnitTypeId::GREATERSPIRE =>
     {ability: Api::AbilityId::UPGRADETOGREATERSPIRE_GREATERSPIRE,
@@ -421,10 +418,6 @@ module Api
                                                Api::UnitTypeId::CREEPTUMORBURROWED =>
   {Api::UnitTypeId::CREEPTUMOR =>
     {ability: Api::AbilityId::BUILD_CREEPTUMOR,
-     requires_placement_position: true}},
-                                               Api::UnitTypeId::CREEPTUMORQUEEN =>
-  {Api::UnitTypeId::CREEPTUMOR =>
-    {ability: Api::AbilityId::BUILD_CREEPTUMOR_TUMOR,
      requires_placement_position: true}},
                                                Api::UnitTypeId::LARVA =>
   {Api::UnitTypeId::DRONE => {ability: Api::AbilityId::LARVATRAIN_DRONE},
@@ -565,8 +558,8 @@ module Api
                                              Api::UnitTypeId::FACTORYTECHLAB =>
   {Api::UpgradeId::HIGHCAPACITYBARRELS =>
     {ability: Api::AbilityId::RESEARCH_INFERNALPREIGNITER},
-   Api::UpgradeId::HURRICANETHRUSTERS =>
-    {ability: Api::AbilityId::FACTORYTECHLABRESEARCH_CYCLONERESEARCHHURRICANETHRUSTERS},
+   Api::UpgradeId::CYCLONELOCKONDAMAGEUPGRADE =>
+    {ability: Api::AbilityId::RESEARCH_CYCLONELOCKONDAMAGE},
    Api::UpgradeId::DRILLCLAWS =>
     {ability: Api::AbilityId::RESEARCH_DRILLINGCLAWS,
      required_building: Api::UnitTypeId::ARMORY},
@@ -729,7 +722,10 @@ module Api
   {Api::UpgradeId::EVOLVEGROOVEDSPINES =>
     {ability: Api::AbilityId::RESEARCH_GROOVEDSPINES},
    Api::UpgradeId::EVOLVEMUSCULARAUGMENTS =>
-    {ability: Api::AbilityId::RESEARCH_MUSCULARAUGMENTS}},
+    {ability: Api::AbilityId::RESEARCH_MUSCULARAUGMENTS},
+   Api::UpgradeId::FRENZY =>
+    {ability: Api::AbilityId::HYDRALISKDENRESEARCH_RESEARCHFRENZY,
+     required_building: Api::UnitTypeId::HIVE}},
                                              Api::UnitTypeId::SPIRE =>
   {Api::UpgradeId::ZERGFLYERWEAPONSLEVEL1 =>
     {ability: Api::AbilityId::RESEARCH_ZERGFLYERATTACKLEVEL1},
@@ -832,11 +828,11 @@ module Api
                                     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::CYCLONE => [Api::UnitTypeId::FACTORY],
                                     Api::UnitTypeId::STARPORTTECHLAB =>
   [Api::UnitTypeId::STARPORT, Api::UnitTypeId::STARPORTFLYING],
                                     Api::UnitTypeId::STARPORTREACTOR =>
@@ -907,11 +903,6 @@ module Api
   [Api::UnitTypeId::HATCHERY,
     Api::UnitTypeId::LAIR,
     Api::UnitTypeId::HIVE],
-                                    Api::UnitTypeId::CREEPTUMOR =>
-  [Api::UnitTypeId::CREEPTUMOR,
-    Api::UnitTypeId::QUEEN,
-    Api::UnitTypeId::CREEPTUMORBURROWED,
-    Api::UnitTypeId::CREEPTUMORQUEEN],
                                     Api::UnitTypeId::GREATERSPIRE => [Api::UnitTypeId::SPIRE],
                                     Api::UnitTypeId::NYDUSCANAL => [Api::UnitTypeId::NYDUSNETWORK],
                                     Api::UnitTypeId::HIVE => [Api::UnitTypeId::LAIR],
@@ -936,6 +927,8 @@ module Api
                                     Api::UnitTypeId::RAVAGER => [Api::UnitTypeId::ROACH],
                                     Api::UnitTypeId::BROODLORD => [Api::UnitTypeId::CORRUPTOR],
                                     Api::UnitTypeId::CREEPTUMORQUEEN => [Api::UnitTypeId::QUEEN],
+                                    Api::UnitTypeId::CREEPTUMOR =>
+  [Api::UnitTypeId::QUEEN, Api::UnitTypeId::CREEPTUMORBURROWED],
                                     Api::UnitTypeId::CHANGELING =>
   [Api::UnitTypeId::OVERSEER, Api::UnitTypeId::OVERSEERSIEGEMODE],
                                     Api::UnitTypeId::DRONE => [Api::UnitTypeId::LARVA],
@@ -991,7 +984,8 @@ module Api
                                           Api::UpgradeId::SHIELDWALL => Api::UnitTypeId::BARRACKSTECHLAB,
                                           Api::UpgradeId::PUNISHERGRENADES => Api::UnitTypeId::BARRACKSTECHLAB,
                                           Api::UpgradeId::HIGHCAPACITYBARRELS => Api::UnitTypeId::FACTORYTECHLAB,
-                                          Api::UpgradeId::HURRICANETHRUSTERS => Api::UnitTypeId::FACTORYTECHLAB,
+                                          Api::UpgradeId::CYCLONELOCKONDAMAGEUPGRADE =>
+  Api::UnitTypeId::FACTORYTECHLAB,
                                           Api::UpgradeId::DRILLCLAWS => Api::UnitTypeId::FACTORYTECHLAB,
                                           Api::UpgradeId::SMARTSERVOS => Api::UnitTypeId::FACTORYTECHLAB,
                                           Api::UpgradeId::BANSHEECLOAK => Api::UnitTypeId::STARPORTTECHLAB,
@@ -1042,6 +1036,7 @@ module Api
   Api::UnitTypeId::EVOLUTIONCHAMBER,
                                           Api::UpgradeId::EVOLVEGROOVEDSPINES => Api::UnitTypeId::HYDRALISKDEN,
                                           Api::UpgradeId::EVOLVEMUSCULARAUGMENTS => Api::UnitTypeId::HYDRALISKDEN,
+                                          Api::UpgradeId::FRENZY => Api::UnitTypeId::HYDRALISKDEN,
                                           Api::UpgradeId::ZERGFLYERWEAPONSLEVEL1 => Api::UnitTypeId::SPIRE,
                                           Api::UpgradeId::ZERGFLYERARMORSLEVEL1 => Api::UnitTypeId::SPIRE,
                                           Api::UpgradeId::ZERGFLYERWEAPONSLEVEL2 => Api::UnitTypeId::SPIRE,
@@ -1181,11 +1176,11 @@ module Api
     Api::AbilityId::ATTACK_ATTACK,
     Api::AbilityId::SMART],
                                  Api::UnitTypeId::BUNKER =>
-  [Api::AbilityId::EFFECT_SALVAGE,
-    Api::AbilityId::RALLY_BUILDING,
+  [Api::AbilityId::RALLY_BUILDING,
     Api::AbilityId::LOAD_BUNKER,
+    Api::AbilityId::SALVAGEEFFECT_SALVAGE,
     Api::AbilityId::SMART],
-                                 Api::UnitTypeId::SENSORTOWER => [],
+                                 Api::UnitTypeId::SENSORTOWER => [Api::AbilityId::SALVAGEEFFECT_SALVAGE],
                                  Api::UnitTypeId::GHOSTACADEMY =>
   [Api::AbilityId::RESEARCH_PERSONALCLOAKING, Api::AbilityId::BUILD_NUKE],
                                  Api::UnitTypeId::FACTORY =>
@@ -1194,12 +1189,12 @@ module Api
     Api::AbilityId::BUILD_REACTOR_FACTORY,
     Api::AbilityId::LIFT_FACTORY,
     Api::AbilityId::FACTORYTRAIN_HELLION,
-    Api::AbilityId::TRAIN_CYCLONE,
     Api::AbilityId::FACTORYTRAIN_WIDOWMINE,
     Api::AbilityId::SMART,
     Api::AbilityId::FACTORYTRAIN_SIEGETANK,
     Api::AbilityId::FACTORYTRAIN_THOR,
-    Api::AbilityId::TRAIN_HELLBAT],
+    Api::AbilityId::TRAIN_HELLBAT,
+    Api::AbilityId::TRAIN_CYCLONE],
                                  Api::UnitTypeId::STARPORT =>
   [Api::AbilityId::RALLY_BUILDING,
     Api::AbilityId::BUILD_TECHLAB_STARPORT,
@@ -1274,7 +1269,7 @@ module Api
                                  Api::UnitTypeId::BARRACKSREACTOR => [],
                                  Api::UnitTypeId::FACTORYTECHLAB =>
   [Api::AbilityId::RESEARCH_INFERNALPREIGNITER,
-    Api::AbilityId::FACTORYTECHLABRESEARCH_CYCLONERESEARCHHURRICANETHRUSTERS,
+    Api::AbilityId::RESEARCH_CYCLONELOCKONDAMAGE,
     Api::AbilityId::RESEARCH_DRILLINGCLAWS,
     Api::AbilityId::RESEARCH_SMARTSERVOS],
                                  Api::UnitTypeId::FACTORYREACTOR => [],
@@ -1427,9 +1422,9 @@ module Api
                                  Api::UnitTypeId::NEXUS =>
   [Api::AbilityId::RALLY_NEXUS,
     Api::AbilityId::NEXUSTRAIN_PROBE,
-    Api::AbilityId::BATTERYOVERCHARGE_BATTERYOVERCHARGE,
     Api::AbilityId::EFFECT_CHRONOBOOSTENERGYCOST,
     Api::AbilityId::EFFECT_MASSRECALL_NEXUS,
+    Api::AbilityId::ENERGYRECHARGE_ENERGYRECHARGE,
     Api::AbilityId::SMART,
     Api::AbilityId::NEXUSTRAINMOTHERSHIP_MOTHERSHIP],
                                  Api::UnitTypeId::PYLON => [],
@@ -1642,8 +1637,7 @@ module Api
     Api::AbilityId::SMART,
     Api::AbilityId::UPGRADETOLAIR_LAIR,
     Api::AbilityId::TRAINQUEEN_QUEEN],
-                                 Api::UnitTypeId::CREEPTUMOR =>
-  [Api::AbilityId::BUILD_CREEPTUMOR_TUMOR, Api::AbilityId::SMART],
+                                 Api::UnitTypeId::CREEPTUMOR => [],
                                  Api::UnitTypeId::EXTRACTOR => [],
                                  Api::UnitTypeId::SPAWNINGPOOL =>
   [Api::AbilityId::RESEARCH_ZERGLINGMETABOLICBOOST,
@@ -1660,7 +1654,8 @@ module Api
     Api::AbilityId::RESEARCH_ZERGMISSILEWEAPONSLEVEL3],
                                  Api::UnitTypeId::HYDRALISKDEN =>
   [Api::AbilityId::RESEARCH_GROOVEDSPINES,
-    Api::AbilityId::RESEARCH_MUSCULARAUGMENTS],
+    Api::AbilityId::RESEARCH_MUSCULARAUGMENTS,
+    Api::AbilityId::HYDRALISKDENRESEARCH_RESEARCHFRENZY],
                                  Api::UnitTypeId::SPIRE =>
   [Api::AbilityId::RESEARCH_ZERGFLYERATTACKLEVEL1,
     Api::AbilityId::RESEARCH_ZERGFLYERARMORLEVEL1,
@@ -1770,7 +1765,8 @@ module Api
     Api::AbilityId::ATTACK_ATTACK,
     Api::AbilityId::SMART,
     Api::AbilityId::BURROWDOWN_HYDRALISK,
-    Api::AbilityId::MORPH_LURKER],
+    Api::AbilityId::MORPH_LURKER,
+    Api::AbilityId::HYDRALISKFRENZY_HYDRALISKFRENZY],
                                  Api::UnitTypeId::MUTALISK =>
   [Api::AbilityId::STOP_STOP,
     Api::AbilityId::MOVE_MOVE,
@@ -1914,8 +1910,7 @@ module Api
   [Api::AbilityId::BUILD_CREEPTUMOR_TUMOR,
     Api::AbilityId::SMART,
     Api::AbilityId::BUILD_CREEPTUMOR],
-                                 Api::UnitTypeId::CREEPTUMORQUEEN =>
-  [Api::AbilityId::BUILD_CREEPTUMOR_TUMOR, Api::AbilityId::SMART],
+                                 Api::UnitTypeId::CREEPTUMORQUEEN => [],
                                  Api::UnitTypeId::SPINECRAWLERUPROOTED =>
   [Api::AbilityId::STOP_STOP,
     Api::AbilityId::MOVE_MOVE,
@@ -1955,11 +1950,7 @@ module Api
     Api::AbilityId::EFFECT_GHOSTSNIPE,
     Api::AbilityId::SMART,
     Api::AbilityId::BEHAVIOR_CLOAKON_GHOST],
-                                 Api::UnitTypeId::INFESTEDTERRANSEGG =>
-  [Api::AbilityId::MOVE_MOVE,
-    Api::AbilityId::PATROL_PATROL,
-    Api::AbilityId::HOLDPOSITION_HOLD,
-    Api::AbilityId::SMART],
+                                 Api::UnitTypeId::INFESTEDTERRANSEGG => [],
                                  Api::UnitTypeId::LARVA =>
   [Api::AbilityId::LARVATRAIN_DRONE,
     Api::AbilityId::LARVATRAIN_OVERLORD,

data/lib/sc2ai/api/unit_type_id.rb

@@ -2012,11 +2012,37 @@ 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
+    COLLAPSIBLEROCKTOWERDEBRISRAMPLEFTGREEN = 2010
+    COLLAPSIBLEROCKTOWERDEBRISRAMPRIGHTGREEN = 2011
+    COLLAPSIBLEROCKTOWERPUSHUNITRAMPLEFTGREEN = 2012
+    COLLAPSIBLEROCKTOWERPUSHUNITRAMPRIGHTGREEN = 2013
+    COLLAPSIBLEROCKTOWERRAMPLEFTGREEN = 2014
+    COLLAPSIBLEROCKTOWERRAMPRIGHTGREEN = 2015
+    DUMMYUNIT000 = 2016
+    DUMMYUNIT001 = 2017
+    DUMMYUNIT002 = 2018
+    DUMMYUNIT003 = 2019
+    DUMMYUNIT004 = 2020
+    DUMMYUNIT005 = 2021
+    DUMMYUNIT006 = 2022
+    DUMMYUNIT007 = 2023
+    DUMMYUNIT008 = 2024
+    DUMMYUNIT009 = 2025
+    DUMMYUNIT010 = 2026
+    DUMMYUNIT011 = 2027
+    DUMMYUNIT012 = 2028
+    DUMMYUNIT013 = 2029
+    DUMMYUNIT014 = 2030
   end
 end

data/lib/sc2ai/api/upgrade_id.rb

@@ -3,7 +3,6 @@
 module Api
   # Constant reference of Upgrade ids
   module UpgradeId
-    NULL = 0
     CARRIERLAUNCHSPEEDUPGRADE = 1
     GLIALRECONSTITUTION = 2
     TUNNELINGCLAWS = 3
@@ -21,7 +20,6 @@ module Api
     STIMPACK = 15
     SHIELDWALL = 16
     PUNISHERGRENADES = 17
-    SIEGETECH = 18
     HIGHCAPACITYBARRELS = 19
     BANSHEECLOAK = 20
     MEDIVACCADUCEUSREACTOR = 21
@@ -29,7 +27,6 @@ module Api
     HUNTERSEEKER = 23
     DURABLEMATERIALS = 24
     PERSONALCLOAKING = 25
-    GHOSTMOEBIUSREACTOR = 26
     TERRANVEHICLEARMORSLEVEL1 = 27
     TERRANVEHICLEARMORSLEVEL2 = 28
     TERRANVEHICLEARMORSLEVEL3 = 29
@@ -54,7 +51,6 @@ module Api
     OBSERVERGRAVITICBOOSTER = 48
     GRAVITICDRIVE = 49
     EXTENDEDTHERMALLANCE = 50
-    HIGHTEMPLARKHAYDARINAMULET = 51
     PSISTORMTECH = 52
     ZERGMELEEWEAPONSLEVEL1 = 53
     ZERGMELEEWEAPONSLEVEL2 = 54
@@ -70,17 +66,14 @@ module Api
     BURROW = 64
     ZERGLINGATTACKSPEED = 65
     ZERGLINGMOVEMENTSPEED = 66
-    HYDRALISKSPEED = 67
     ZERGFLYERWEAPONSLEVEL1 = 68
     ZERGFLYERWEAPONSLEVEL2 = 69
     ZERGFLYERWEAPONSLEVEL3 = 70
     ZERGFLYERARMORSLEVEL1 = 71
     ZERGFLYERARMORSLEVEL2 = 72
     ZERGFLYERARMORSLEVEL3 = 73
-    INFESTORENERGYUPGRADE = 74
     CENTRIFICALHOOKS = 75
     BATTLECRUISERENABLESPECIALIZATIONS = 76
-    BATTLECRUISERBEHEMOTHREACTOR = 77
     PROTOSSAIRWEAPONSLEVEL1 = 78
     PROTOSSAIRWEAPONSLEVEL2 = 79
     PROTOSSAIRWEAPONSLEVEL3 = 80
@@ -92,51 +85,24 @@ module Api
     CHARGE = 86
     BLINKTECH = 87
     ANABOLICSYNTHESIS = 88
-    OBVERSEINCUBATION = 89
-    VIKINGJOTUNBOOSTERS = 90
-    ORGANICCARAPACE = 91
-    INFESTORPERISTALSIS = 92
-    ABDOMINALFORTITUDE = 93
-    HYDRALISKSPEEDUPGRADE = 94
-    BANELINGBURROWMOVE = 95
-    COMBATDRUGS = 96
-    STRIKECANNONS = 97
     TRANSFORMATIONSERVOS = 98
     PHOENIXRANGEUPGRADE = 99
     TEMPESTRANGEUPGRADE = 100
     NEURALPARASITE = 101
     LOCUSTLIFETIMEINCREASE = 102
-    ULTRALISKBURROWCHARGEUPGRADE = 103
-    ORACLEENERGYUPGRADE = 104
-    RESTORESHIELDS = 105
-    PROTOSSHEROSHIPWEAPON = 106
-    PROTOSSHEROSHIPDETECTOR = 107
-    PROTOSSHEROSHIPSPELL = 108
-    REAPERJUMP = 109
-    INCREASEDRANGE = 110
-    ZERGBURROWMOVE = 111
-    ANIONPULSECRYSTALS = 112
     TERRANVEHICLEANDSHIPWEAPONSLEVEL1 = 113
     TERRANVEHICLEANDSHIPWEAPONSLEVEL2 = 114
     TERRANVEHICLEANDSHIPWEAPONSLEVEL3 = 115
     TERRANVEHICLEANDSHIPARMORSLEVEL1 = 116
     TERRANVEHICLEANDSHIPARMORSLEVEL2 = 117
     TERRANVEHICLEANDSHIPARMORSLEVEL3 = 118
-    FLYINGLOCUSTS = 119
     ROACHSUPPLY = 120
     IMMORTALREVIVE = 121
     DRILLCLAWS = 122
     CYCLONELOCKONRANGEUPGRADE = 123
-    CYCLONEAIRUPGRADE = 124
     LIBERATORMORPH = 125
-    ADEPTSHIELDUPGRADE = 126
     LURKERRANGE = 127
-    IMMORTALBARRIER = 128
-    ADEPTKILLBOUNCE = 129
     ADEPTPIERCINGATTACK = 130
-    CINEMATICMODE = 131
-    CURSORDEBUG = 132
-    MAGFIELDLAUNCHERS = 133
     EVOLVEGROOVEDSPINES = 134
     EVOLVEMUSCULARAUGMENTS = 135
     BANSHEESPEED = 136
@@ -145,168 +111,21 @@ module Api
     MEDIVACINCREASESPEEDBOOST = 139
     LIBERATORAGRANGEUPGRADE = 140
     DARKTEMPLARBLINKUPGRADE = 141
-    RAVAGERRANGE = 142
-    RAVENDAMAGEUPGRADE = 143
     CYCLONELOCKONDAMAGEUPGRADE = 144
-    ARESCLASSWEAPONSSYSTEMVIKING = 145
-    AUTOHARVESTER = 146
-    HYBRIDCPLASMAUPGRADEHARD = 147
-    HYBRIDCPLASMAUPGRADEINSANE = 148
-    INTERCEPTORLIMIT4 = 149
-    INTERCEPTORLIMIT6 = 150
-    def self._330MMBARRAGECANNONS = 151
-    NOTPOSSIBLESIEGEMODE = 152
-    NEOSTEELFRAME_2 = 153
-    NEOSTEELANDSHRIKETURRETICONUPGRADE = 154
-    OCULARIMPLANTS = 155
-    CROSSSPECTRUMDAMPENERS = 156
-    ORBITALSTRIKE = 157
-    CLUSTERBOMB = 158
-    SHAPEDHULL = 159
-    SPECTRETOOLTIPUPGRADE = 160
-    ULTRACAPACITORS = 161
-    VANADIUMPLATING = 162
-    COMMANDCENTERREACTOR = 163
-    REGENERATIVEBIOSTEEL = 164
-    CELLULARREACTORS = 165
-    BANSHEECLOAKEDDAMAGE = 166
-    DISTORTIONBLASTERS = 167
-    EMPTOWER = 168
-    SUPPLYDEPOTDROP = 169
-    HIVEMINDEMULATOR = 170
-    FORTIFIEDBUNKERCARAPACE = 171
-    PREDATOR = 172
-    SCIENCEVESSEL = 173
-    DUALFUSIONWELDERS = 174
-    ADVANCEDCONSTRUCTION = 175
-    ADVANCEDMEDICTRAINING = 176
-    PROJECTILEACCELERATORS = 177
-    REINFORCEDSUPERSTRUCTURE = 178
-    MULE = 179
-    ORBITALRELAY = 180
-    RAZORWIRE = 181
-    ADVANCEDHEALINGAI = 182
-    TWINLINKEDFLAMETHROWERS = 183
-    NANOCONSTRUCTOR = 184
-    CERBERUSMINES = 185
-    HYPERFLUXOR = 186
-    TRILITHIUMPOWERCELLS = 187
-    PERMANENTCLOAKGHOST = 188
-    PERMANENTCLOAKSPECTRE = 189
-    ULTRASONICPULSE = 190
-    SURVIVALPODS = 191
-    ENERGYSTORAGE = 192
-    FULLBORECANISTERAMMO = 193
-    CAMPAIGNJOTUNBOOSTERS = 194
-    MICROFILTERING = 195
-    PARTICLECANNONAIR = 196
-    VULTUREAUTOREPAIR = 197
-    PSIDISRUPTOR = 198
-    SCIENCEVESSELENERGYMANIPULATION = 199
-    SCIENCEVESSELPLASMAWEAPONRY = 200
-    SHOWGATLINGGUN = 201
-    TECHREACTOR = 202
-    TECHREACTORAI = 203
-    TERRANDEFENSERANGEBONUS = 204
-    X88TNAPALMUPGRADE = 205
-    HURRICANEMISSILES = 206
-    MECHANICALREBIRTH = 207
-    MARINESTIMPACK = 208
-    DARKTEMPLARTACTICS = 209
-    CLUSTERWARHEADS = 210
-    CLOAKDISTORTIONFIELD = 211
-    DEVASTATORMISSILES = 212
-    DISTORTIONTHRUSTERS = 213
-    DYNAMICPOWERROUTING = 214
-    IMPALERROUNDS = 215
-    KINETICFIELDS = 216
-    BURSTCAPACITORS = 217
-    HAILSTORMMISSILEPODS = 218
-    RAPIDDEPLOYMENT = 219
-    REAPERSTIMPACK = 220
-    REAPERD8CHARGE = 221
-    TYCHUS05BATTLECRUISERPENETRATION = 222
-    VIRALPLASMA = 223
-    FIREBATJUGGERNAUTPLATING = 224
-    MULTILOCKTARGETINGSYSTEMS = 225
-    TURBOCHARGEDENGINES = 226
-    DISTORTIONSENSORS = 227
-    INFERNALPREIGNITERS = 228
-    HELLIONCAMPAIGNINFERNALPREIGNITER = 229
-    NAPALMFUELTANKS = 230
-    AUXILIARYMEDBOTS = 231
-    JUGGERNAUTPLATING = 232
-    MARAUDERLIFEBOOST = 233
-    COMBATSHIELD = 234
-    REAPERU238ROUNDS = 235
-    MAELSTROMROUNDS = 236
-    SIEGETANKSHAPEDBLAST = 237
-    TUNGSTENSPIKES = 238
-    BEARCLAWNOZZLES = 239
-    NANOBOTINJECTORS = 240
-    STABILIZERMEDPACKS = 241
-    HALOROCKETS = 242
-    SCAVENGINGSYSTEMS = 243
-    EXTRAMINES = 244
-    ARESCLASSWEAPONSSYSTEM = 245
-    WHITENAPALM = 246
-    VIRALMUNITIONS = 247
-    JACKHAMMERCONCUSSIONGRENADES = 248
-    FIRESUPPRESSIONSYSTEMS = 249
-    FLARERESEARCH = 250
-    MODULARCONSTRUCTION = 251
-    EXPANDEDHULL = 252
-    SHRIKETURRET = 253
-    MICROFUSIONREACTORS = 254
-    WRAITHCLOAK = 255
-    SINGULARITYCHARGE = 256
-    GRAVITICTHRUSTERS = 257
-    YAMATOCANNON = 258
-    DEFENSIVEMATRIX = 259
-    DARKPROTOSS = 260
-    TERRANINFANTRYWEAPONSULTRACAPACITORSLEVEL1 = 261
-    TERRANINFANTRYWEAPONSULTRACAPACITORSLEVEL2 = 262
-    TERRANINFANTRYWEAPONSULTRACAPACITORSLEVEL3 = 263
-    TERRANINFANTRYARMORSVANADIUMPLATINGLEVEL1 = 264
-    TERRANINFANTRYARMORSVANADIUMPLATINGLEVEL2 = 265
-    TERRANINFANTRYARMORSVANADIUMPLATINGLEVEL3 = 266
-    TERRANVEHICLEWEAPONSULTRACAPACITORSLEVEL1 = 267
-    TERRANVEHICLEWEAPONSULTRACAPACITORSLEVEL2 = 268
-    TERRANVEHICLEWEAPONSULTRACAPACITORSLEVEL3 = 269
-    TERRANVEHICLEARMORSVANADIUMPLATINGLEVEL1 = 270
-    TERRANVEHICLEARMORSVANADIUMPLATINGLEVEL2 = 271
-    TERRANVEHICLEARMORSVANADIUMPLATINGLEVEL3 = 272
-    TERRANSHIPWEAPONSULTRACAPACITORSLEVEL1 = 273
-    TERRANSHIPWEAPONSULTRACAPACITORSLEVEL2 = 274
-    TERRANSHIPWEAPONSULTRACAPACITORSLEVEL3 = 275
-    TERRANSHIPARMORSVANADIUMPLATINGLEVEL1 = 276
-    TERRANSHIPARMORSVANADIUMPLATINGLEVEL2 = 277
-    TERRANSHIPARMORSVANADIUMPLATINGLEVEL3 = 278
-    HIREKELMORIANMINERSPH = 279
-    HIREDEVILDOGSPH = 280
-    HIRESPARTANCOMPANYPH = 281
-    HIREHAMMERSECURITIESPH = 282
-    HIRESIEGEBREAKERSPH = 283
-    HIREHELSANGELSPH = 284
-    HIREDUSKWINGPH = 285
-    HIREDUKESREVENGE = 286
-    TOSHEASYMODE = 287
     VOIDRAYSPEEDUPGRADE = 288
     SMARTSERVOS = 289
     ARMORPIERCINGROCKETS = 290
     CYCLONERAPIDFIRELAUNCHERS = 291
     RAVENENHANCEDMUNITIONS = 292
     DIGGINGCLAWS = 293
-    CARRIERCARRIERCAPACITY = 294
-    CARRIERLEASHRANGEUPGRADE = 295
     HURRICANETHRUSTERS = 296
     TEMPESTGROUNDATTACKUPGRADE = 297
-    MICROBIALSHROUD = 298
-    INTERFERENCEMATRIX = 299
-    SUNDERINGIMPACT = 300
-    AMPLIFIEDSHIELDING = 301
-    PSIONICAMPLIFIERS = 302
-    SECRETEDCOATING = 303
-    ENHANCEDSHOCKWAVES = 304
+    FRENZY = 298
+    MICROBIALSHROUD = 299
+    INTERFERENCEMATRIX = 300
+    SUNDERINGIMPACT = 301
+    AMPLIFIEDSHIELDING = 302
+    PSIONICAMPLIFIERS = 303
+    SECRETEDCOATING = 304
   end
 end

data/lib/sc2ai/cli/cli.rb

@@ -19,22 +19,23 @@ module Sc2
     register(Sc2::Cli::Ladderzip, "ladderzip", "ladderzip BOTNAME", "Prepares a zip via docker for supplied aiarena bot name")
     register(Sc2::Cli::VersusBot, "vsbot", "vsbot FILENAME", "Copies target zip to docker and starts a match")
 
-    # TODO: Use thor's #ask and other methods helpers of raw $stdin and puts.
-    desc "setup410", "Downloads and install SC2 v4.10"
-    # downloads and install SC2 v4.10
+    desc "setup410", "alias of download_ladder_version"
     def setup410
+      download_ladder_version
+    end
+
+    desc "download_ladder_version", "Downloads and install SC2 at the patch used for ladder"
+    # downloads and install SC2 "ladder" as pinned in versions.json
+    def download_ladder_version
       require "sc2ai"
       Async do
         Sc2.logger.level = :fatal
         say " "
-        say "This script sets up SC2 at version 4.10, which we use competitively."
+        say "This script sets up SC2 at the same version use competitively."
         say "SC2 will launch a blank window, be unresponsive, but download about 100mb in the background."
         say ""
         say "It will appear to hang as it updates. This is normal."
         say "Let it finish and close itself."
-        say "Press any key to continue..."
-        ask ""
-
         say ""
         say ""
         say "This will only take a minute..."
@@ -53,7 +54,14 @@ module Sc2
         )
 
         # Auto-detect executable path and ensure it matched exactly
-        base_build = "75689"
+        base_build = ""
+        Sc2::Client.versions_json.each do |node|
+          if node["label"] == "ladder"
+            base_build = node["base-version"].to_s
+            break
+          end
+        end
+
         path = Sc2::Paths.executable(base_build: base_build)
         if path.include?(base_build) && Pathname(path).exist?
           say " "
@@ -69,13 +77,13 @@ module Sc2
 
         observer.api.quit
         observer.disconnect
-        say "Generating sc2ai.yml to always use 4.10..."
-        Sc2.config.config_file.write({"version" => "4.10"}.to_yaml.to_s)
+        say "Generating sc2ai.yml to always use version 'ladder'..."
+        Sc2.config.config_file.write({"version" => "ladder"}.to_yaml.to_s)
         say ""
         say "Done. You're good to go."
         say "To run an example match, execute:"
         say ""
-        say "ruby run_example_match.rb", :green
+        say "ruby run_example_match.rb", :cyan
         say ""
       ensure
         Sc2::ClientManager.stop(0)

data/lib/sc2ai/cli/new.rb

@@ -5,6 +5,7 @@ module Sc2
   class Cli < Thor
     class New < Thor::Group
       include Thor::Actions
+
       desc "Creates a new bot"
 
       # Define arguments and options
@@ -76,11 +77,13 @@ module Sc2
         say ""
         say "Bot generated, next steps:"
         say ""
-        say "cd #{@directory} && bundle install", :green
+        say "cd #{@directory} && bundle install", :cyan
+        say ""
+        say "Afterwards, it is recommended to setup SC2 to match the ladder version with:"
         say ""
-        say "Once your project is ready, if you haven't done so, setup SC2 v4.10 with:"
+        say "bundle exec sc2ai download_ladder_version", :cyan
         say ""
-        say "bundle exec sc2ai setup410", :green
+        say "Refer to the docs to get the 'AI Edition' maps or further help: https://sc2ai.pages.dev/"
         say ""
       end
     end

data/lib/sc2ai/connection/requests.rb

@@ -57,7 +57,7 @@ module Sc2
             show_cloaked: true,
             show_burrowed_shadows: true,
             show_placeholders: true,
-            raw_affects_selection: Sc2.ladder?,
+            raw_affects_selection: enable_feature_layer || Sc2.ladder?,
             raw_crop_to_playable_area: true, **interface_options
           )
         )
@@ -207,8 +207,13 @@ module Sc2
           @_cached_request_observation ||= Api::Request.new(
             observation: Api::RequestObservation.new
           ).to_proto
+
+          time = Process.clock_gettime(Process::CLOCK_MONOTONIC, :float_millisecond)
           @websocket.send_binary(@_cached_request_observation)
-          response = Api::Response.decode(@websocket.read.to_str)
+          response = @websocket.read.to_str
+          @external_time += Process.clock_gettime(Process::CLOCK_MONOTONIC, :float_millisecond) - time
+
+          response = Api::Response.decode(response)
 
           if @status != response.status
             @status = response.status