COG 2023 RC4. Faster expansions in Robo mirror. Hopefully fixing direction of disengage formations. Restoring Opponents

Author: dgant

src/Micro/Formation/FormationStandard.scala

@@ -145,10 +145,13 @@ final class FormationStandard(val group: FriendlyUnitGroup, var style: Formation
       }
       val apexI = Maff.minBy(goalPathTiles.indices)(i => scoreApex(i, goalPathTiles(i)))
       apex      = apexI.map(goalPathTiles(_).center).getOrElse(goal)
-      face      = targetNear
-        .map(_.pixel)
-        .orElse(apexI.map(_ + 1 + Maff.div32(group.meanAttackerRange.toInt)).flatMap(goalPathTiles.drop(_).lastOption).map(_.center))
-        .getOrElse(goal)
+      face      = targetNear.map(_.pixel).getOrElse(?(
+        style == FormationStyleDisengage,
+        vanguardCentroid,
+        apexI
+          .map(_ + 1 + Maff.div32(group.meanAttackerRange.toInt))
+          .flatMap(goalPathTiles.drop(_).lastOption).map(_.center)
+          .getOrElse(?(style == FormationStyleDisengage, vanguardCentroid, goal))))
     }
   }
 

src/Micro/Matchups/MatchupAnalysis.scala

@@ -76,7 +76,7 @@ case class MatchupAnalysis(me: UnitInfo) {
   private val _inTankRange          = new Cache(() => threatsInRange.exists(Terran.SiegeTankSieged))
   private val _inRangeOfTank        = new Cache(() => targetsInRange.exists(Terran.SiegeTankSieged))
   private val _withinSafetyMargin   = new Cache(() => pixelsEntangled <= ?(me.flying && me.topSpeed > groupVs.maxAttackerSpeedVsAir, -64, -safetyMargin))
-  private val _threateningMiners    = new Cache(() => targets.exists(t => IsWorker(t) && t.friendly.flatMap(_.intent.toGather).orElse(t.orderTarget).exists(r => r.unitClass.isResource && r.base.exists(t.base.contains) && me.pixelDistanceEdge(r) + me.pixelDistanceEdge(t) < 160 + 2 * me.pixelRangeGround)))
+  private val _threateningMiners    = new Cache(() => targets.exists(t => IsWorker(t) && t.friendly.flatMap(_.intent.toGather).orElse(t.orderTarget).exists(r => r.unitClass.isResource && r.base.exists(t.base.contains) && me.pixelDistanceEdge(r) + me.pixelDistanceEdge(t) < 96 + 2 * me.pixelRangeGround)))
   private val _targetedByScarab     = new Cache(() => me.battle.exists(_.scarabTargets.exists(_._2 == me)))
   private val _framesToLive         = new Cache(() => me.likelyDoomedInFrames)
   private val _wantsToVolley        = new Cache(() => ?( ! me.canMove, None, // If we're stationary, we're unopinionated

src/Planning/Plans/GamePlans/Protoss/PvP/PvPLateGame.scala

@@ -93,7 +93,7 @@ class PvPLateGame extends GameplanImperative {
     shouldAttack ||= reaverShuttleCombo
     shouldAttack ||= With.fingerprints.cannonRush() || With.fingerprints.forgeFe()
     shouldAttack ||= dtBraveryAbroad && ! enemiesHaveComplete(Protoss.PhotonCannon)
-    shouldAttack ||= With.geography.enemyBases.exists(_.natural.exists(With.scouting.weControl)) && employing(PvP3GateGoon, PvP4GateGoon) && ! enemyStrategy(With.fingerprints.threeGateGoon, With.fingerprints.fourGateGoon)
+    shouldAttack ||= (With.scouting.ourMuscleOrigin.metro.exists(_.isEnemy) || With.geography.enemyBases.exists(_.natural.exists(With.scouting.weControl))) && employing(PvP3GateGoon, PvP4GateGoon) && ! enemyStrategy(With.fingerprints.threeGateGoon, With.fingerprints.fourGateGoon)
     shouldAttack ||= estimatedArmyDifferential > 3 * Protoss.Dragoon.skimulationValue
     shouldAttack &&= PvPIdeas.pvpSafeToMoveOut
     shouldAttack &&= ! fearDeath

src/Planning/Plans/GamePlans/Protoss/PvP/PvPOpening.scala

@@ -357,6 +357,7 @@ class PvPOpening extends GameplanImperative {
     } else if (PvPRobo()) {
       shouldExpand    = haveComplete(Protoss.Reaver)
       shouldExpand  ||= ! getReavers && unitsComplete(IsWarrior) >= ?(enemyBases > 1, 6, 12)
+      shouldExpand  ||= enemyRobo
       shouldExpand  &&= PvPIdeas.pvpSafeToMoveOut
       shouldExpand  &&= ! shuttleSpeed
       shouldExpand  &&= Protoss.DragoonRange()

src/Strategery/Selection/Opponents.scala

@@ -12,7 +12,7 @@ object Opponents {
 
   // COG 2023
   val bananabrain : Opponent = add("BananaBrain",   StrategySelectionGreedy())
-  val stardust    : Opponent = add("Stardust",      StrategySelectionRandom) //new StrategySelectionRecommended(StrategySelectionGreedy(), PvPDT))
+  val stardust    : Opponent = add("Stardust",      new StrategySelectionRecommended(StrategySelectionGreedy(), PvPDT))
   val mcrave      : Opponent = add("McRave",        StrategySelectionFixed(PvZ1BaseStargate))
   val microwave   : Opponent = add("Microwave",     new StrategySelectionRecommended(StrategySelectionGreedy(), PvZ1BaseGoonReaver))
   val cunybot     : Opponent = add("CUNYbot",       StrategySelectionFixed(PvZ1BaseSpeedlotArchon))