Additional inRadius and estimation function.

Author: Bytekeeper

src/main/java/org/bk/ass/Simulator.java

@@ -22,8 +22,16 @@
  * Be cautious when modifying {@link Agent}s after they have been added to the simulation.
  */
 public class Simulator {
+  /**
+   * Use to count health and shields as equal, maybe useful in PvP?
+   */
   public static final ToIntFunction<Agent> HEALTH_AND_SHIELD =
-      agent -> agent.getHealth() + agent.getShields();
+          agent -> agent.getHealth() + agent.getShields();
+  /**
+   * Use to count shields as half the value of health.
+   */
+  public static final ToIntFunction<Agent> HEALTH_AND_HALFED_SHIELD =
+          agent -> agent.getHealth() + agent.getShields() / 2;
 
   private static final int MAX_MAP_DIMENSION = 8192;
   private static final int TILE_SIZE = 16;

src/main/java/org/bk/ass/query/PositionQueries.java

@@ -91,6 +91,17 @@ public Collection<U> inRadius(int x, int y, int radius, Predicate<U> criteria) {
     return new RadiusAreaSearcher(x, y, radius, criteria).search();
   }
 
+  /**
+   * Returns all elements matching the given criteria in the given radius around the given element,
+   * including those on the border. <em>The given criteria might be called often, make sure it is
+   * fast!</em>`
+   */
+  public Collection<U> inRadius(U u, int radius, Predicate<U> criteria) {
+    if (radius <= 0) throw new IllegalArgumentException("radius should be > 0");
+    Position position = positionExtractor.apply(u);
+    return new RadiusAreaSearcher(position.x, position.y, radius, criteria).search();
+  }
+
   @Override
   public Iterator<U> iterator() {
     List<U> items = new ArrayList<>();