- mini fixes nuclear;

- go to facility switches fix
Karloid · Dec 17, 2017 · 0a3c596 · 0a3c596
1 parent 03cc949
commit 0a3c596
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 2 deletions.
diff --git a/34.jar b/34.jar
diff --git a/core/src/MyStrategy.java b/core/src/MyStrategy.java
@@ -1089,7 +1089,7 @@ private void switchGoToFacility(VehicleGroupInfo myGroup) {
                     if (distanceTo == 0) {
                         distanceTo = 1;
                     }
-                    if (myAp.getDistanceTo(otherF) / distanceTo < 0.78 && distanceTo > 64) {
+                    if (myAp.getDistanceTo(otherF) / distanceTo < 0.78 && distanceTo > 64 && distanceTo < myAp.getDistanceTo(myF) - 32) {
                         myGroup.goToFacility = other.goToFacility;
                         other.goToFacility = null; //TODO mb do not reset
                     }

diff --git a/core/src/NuclearStrike.java b/core/src/NuclearStrike.java
@@ -37,7 +37,7 @@ private void calcPredicted(VehicleWrapper myVehicle, VehicleWrapper target, MySt
 
         long myId = myStrategy.me.getId();
 
-        if (myVehicle.v.getDurability() < 50) {
+        if (myVehicle.v.getDurability() < Math.min(50, myStrategy.um.maxMyHp * 0.8f)) {
             predictedDmg = 0;
             return;
         }

diff --git a/core/src/UnitManager.java b/core/src/UnitManager.java
@@ -18,6 +18,7 @@ public class UnitManager {
     TickStats enemyStats;
     private List<VehicleWrapper> cachedMy;
     private List<VehicleWrapper> cachedEnemy;
+    public int maxMyHp;
 
 
     public UnitManager(MyStrategy mys) {
@@ -41,6 +42,8 @@ public void initializeTick() {
         initTickFacUpdates();
 
 
+        maxMyHp = streamVehicles(Ownership.ALLY).max(Comparator.comparingInt(value -> value.v.getDurability())).map(vehicleWrapper -> vehicleWrapper.v.getDurability()).orElse(50);
+
         if (myStats.isNonEmpty()) {
             mys.log("My stats: " + myStats);
         }

diff --git a/lr/local-runner-sync.default.properties b/lr/local-runner-sync.default.properties
@@ -67,6 +67,7 @@ fog-of-war-quality=1
 #seed=541562105365045
 #seed=560101143593578
 #seed=562820576579634
+#seed=610343767212111
 seed=
 
 # Путь к каталогу с плагинами или пустая строка для работы без плагинов.