fix(mindustry): Some more formation fixes

xpdustry · Jan 16, 2025 · 1651b07 · 1651b07
1 parent e8b51ce
commit 1651b07
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/imperium-mindustry/src/main/kotlin/com/xpdustry/imperium/mindustry/formation/FormationAI.kt b/imperium-mindustry/src/main/kotlin/com/xpdustry/imperium/mindustry/formation/FormationAI.kt
@@ -24,7 +24,7 @@ import mindustry.entities.units.AIController
 import mindustry.gen.Call
 import mindustry.gen.Unit as MindustryUnit
 
-class FormationAI(private val context: FormationContext) : AIController(), FormationMember {
+class FormationAI(val context: FormationContext) : AIController(), FormationMember {
 
     override var id: Int = -1
     override val targetVector = Vec2()

diff --git a/...-mindustry/src/main/kotlin/com/xpdustry/imperium/mindustry/formation/FormationListener.kt b/...-mindustry/src/main/kotlin/com/xpdustry/imperium/mindustry/formation/FormationListener.kt
@@ -81,15 +81,17 @@ class FormationListener(instances: InstanceManager) : ImperiumApplication.Listen
                     unit.controller(ai)
                     context.members.add(ai)
                 }
-                context.strategy.update(context)
+                if (eligible.isNotEmpty()) {
+                    context.strategy.update(context)
+                }
             }
             val anchor = Vec2(player.x(), player.y())
             for (member in context.members) {
                 context.pattern.calculate(
                     member.targetVector,
                     context.assignments[member.id] ?: 0,
                     min(context.slots, context.members.size),
-                    player.unit().hitSize * 2F,
+                    player.unit().hitSize * 1.8F,
                 )
                 member.targetVector.add(anchor)
             }
@@ -198,7 +200,8 @@ class FormationListener(instances: InstanceManager) : ImperiumApplication.Listen
             leader.type.buildSpeed > 0 == unit.type.buildSpeed > 0 &&
             unit != leader &&
             (unit.hitSize <= leader.hitSize * 1.5F) &&
-            (formation || unit.controller() !is FormationAI)
+            (unit.controller() !is FormationAI ||
+                (formation && (unit.controller() as FormationAI).context.leader == leader))
 
     enum class FormationPatternEntry(val value: FormationPattern) {
         CIRCLE(CircleFormationPattern),