Implement spread-teammates for spawns

Signed-off-by: BT (calcastor/mame) <[email protected]>
PGMDev · Jul 21, 2022 · 2d3f992 · 2d3f992
1 parent 5726ad9
commit 2d3f992
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 5 deletions.
diff --git a/core/src/main/java/tc/oc/pgm/points/SpreadPointProvider.java b/core/src/main/java/tc/oc/pgm/points/SpreadPointProvider.java
@@ -14,8 +14,12 @@ public class SpreadPointProvider extends AggregatePointProvider {
 
   private static final int SAMPLE_COUNT = 16;
 
-  public SpreadPointProvider(Collection<? extends PointProvider> children) {
+  private final boolean spreadTeammates;
+
+  public SpreadPointProvider(
+      Collection<? extends PointProvider> children, boolean spreadTeammates) {
     super(children);
+    this.spreadTeammates = spreadTeammates;
   }
 
   @Override
@@ -34,7 +38,9 @@ public Location getPoint(Match match, @Nullable Entity entity) {
         for (MatchPlayer enemy : match.getParticipants()) {
           if (enemy.isParticipating()
               && !enemy.isDead()
-              && (player == null || player.getParty() != enemy.getParty())) {
+              && (player == null
+                  || player.getParty() != enemy.getParty()
+                  || this.spreadTeammates)) {
             nearest = Math.min(nearest, pos.distanceSquared(enemy.getBukkit().getLocation()));
           }
         }

diff --git a/core/src/main/java/tc/oc/pgm/spawns/SpawnAttributes.java b/core/src/main/java/tc/oc/pgm/spawns/SpawnAttributes.java
@@ -11,6 +11,7 @@ public class SpawnAttributes {
   public final Kit kit;
   public final boolean sequential;
   public final boolean spread;
+  public final boolean spreadTeammates;
   public final boolean exclusive;
   public final boolean persistent;
 
@@ -20,18 +21,28 @@ public SpawnAttributes(
       Kit kit,
       boolean sequential,
       boolean spread,
+      boolean spreadTeammates,
       boolean exclusive,
       boolean persistent) {
     this.filter = filter;
     this.providerAttributes = providerAttributes;
     this.kit = kit;
     this.sequential = sequential;
     this.spread = spread;
+    this.spreadTeammates = spreadTeammates;
     this.exclusive = exclusive;
     this.persistent = persistent;
   }
 
   public SpawnAttributes() {
-    this(StaticFilter.ABSTAIN, new PointProviderAttributes(), null, false, false, false, false);
+    this(
+        StaticFilter.ABSTAIN,
+        new PointProviderAttributes(),
+        null,
+        false,
+        false,
+        false,
+        false,
+        false);
   }
 }
diff --git a/core/src/main/java/tc/oc/pgm/spawns/SpawnParser.java b/core/src/main/java/tc/oc/pgm/spawns/SpawnParser.java
@@ -63,8 +63,8 @@ else if (el.getChild("regions") != null
     PointProvider provider;
     if (attributes.sequential) {
       provider = new SequentialPointProvider(providers);
-    } else if (attributes.spread) {
-      provider = new SpreadPointProvider(providers);
+    } else if (attributes.spread || attributes.spreadTeammates) {
+      provider = new SpreadPointProvider(providers, attributes.spreadTeammates);
     } else {
       provider = new RandomPointProvider(providers);
     }
@@ -101,6 +101,8 @@ public SpawnAttributes parseAttributes(Element el, SpawnAttributes parent)
 
     boolean sequential = XMLUtils.parseBoolean(el.getAttribute("sequential"), parent.sequential);
     boolean spread = XMLUtils.parseBoolean(el.getAttribute("spread"), parent.spread);
+    boolean spreadTeammates =
+        XMLUtils.parseBoolean(el.getAttribute("spread-teammates"), parent.spreadTeammates);
     boolean exclusive = XMLUtils.parseBoolean(el.getAttribute("exclusive"), parent.exclusive);
     boolean persistent = XMLUtils.parseBoolean(el.getAttribute("persistent"), parent.persistent);
 
@@ -130,6 +132,7 @@ public SpawnAttributes parseAttributes(Element el, SpawnAttributes parent)
         && kit == parent.kit
         && sequential == parent.sequential
         && spread == parent.spread
+        && spreadTeammates == parent.spreadTeammates
         && exclusive == parent.exclusive
         && persistent == parent.persistent
         && !newFilters) {
@@ -142,6 +145,7 @@ public SpawnAttributes parseAttributes(Element el, SpawnAttributes parent)
           kit,
           sequential,
           spread,
+          spreadTeammates,
           exclusive,
           persistent);
     }