fix: sync homeward protocols with main

Author: Peter1169

CHANGELOG.md

@@ -185,3 +185,4 @@
 - feat: new horror-themed disc [stage_4] | by [@Loqor](https://github.com/Loqor) ([#2161](https://github.com/amblelabs/ait/pull/2161))
 - feat: new copper console model! | by [@Loqor](https://github.com/Loqor) ([#2162](https://github.com/amblelabs/ait/pull/2162))
 - fix: revert interior config back to the old one! | by [@rapbattlegod32](https://github.com/rapbattlegod32) ([#2165](https://github.com/amblelabs/ait/pull/2165))
+- feat: hard cap on missed flight events, if hit, crashes tardis | by [@Loqor](https://github.com/Loqor) ([#2173](https://github.com/amblelabs/ait/pull/2173))

src/main/java/dev/amble/ait/core/tardis/control/sequences/Sequence.java

@@ -120,6 +120,7 @@ public void execute(Tardis tardis, @Nullable ServerPlayerEntity player) {
 
         @Override
         public void executeMissed(Tardis tardis, @Nullable ServerPlayerEntity player) {
+            tardis.travel().missEvent();
             this.executeMissed.run(tardis);
         }
 

src/main/java/dev/amble/ait/core/tardis/handler/travel/ProgressiveTravelHandler.java

@@ -5,6 +5,7 @@
 import dev.amble.ait.core.AITSounds;
 import dev.amble.ait.core.tardis.Tardis;
 import dev.amble.ait.core.tardis.control.sequences.SequenceHandler;
+import dev.amble.ait.data.Exclude;
 import dev.amble.ait.data.properties.bool.BoolProperty;
 import dev.amble.ait.data.properties.bool.BoolValue;
 import dev.amble.ait.data.properties.integer.IntProperty;
@@ -33,6 +34,12 @@ public abstract class ProgressiveTravelHandler extends TravelHandlerBase {
     protected final BoolValue handbrake = HANDBRAKE.create(this);
     protected final BoolValue autopilot = AUTOPILOT.create(this);
 
+    @Exclude(strategy = Exclude.Strategy.NETWORK)
+    private int missedEvents;
+
+    @Exclude(strategy = Exclude.Strategy.NETWORK)
+    private int missedHardCap;
+
     public ProgressiveTravelHandler(Id id) {
         super(id);
     }
@@ -46,6 +53,8 @@ public void onLoaded() {
 
         handbrake.of(this, HANDBRAKE);
         autopilot.of(this, AUTOPILOT);
+
+        this.updateMissedHardCap(this.getTargetTicks());
     }
 
     private boolean isInFlight() {
@@ -97,13 +106,15 @@ public void recalculate() {
     }
 
     protected void startFlight() {
+        this.resetMissed();
         this.setFlightTicks(0);
         this.setTargetTicks(TravelUtil.getFlightDuration(this.position(), this.destination()));
     }
 
     protected void resetFlight() {
         this.setFlightTicks(0);
         this.setTargetTicks(0);
+        this.resetMissed();
     }
 
     public int getFlightTicks() {
@@ -120,6 +131,13 @@ public int getTargetTicks() {
 
     protected void setTargetTicks(int ticks) {
         this.targetTicks.set(ticks);
+        this.updateMissedHardCap(ticks);
+    }
+
+    private void updateMissedHardCap(int targetTicks) {
+        int newHardCap = TravelUtil.getHardCap(targetTicks);
+        this.missedEvents = TravelUtil.rescaleMissedEvents(this.missedEvents, this.missedHardCap, newHardCap);
+        this.missedHardCap = newHardCap;
     }
 
     public void handbrake(boolean value) {
@@ -222,4 +240,22 @@ public void triggerSequencingDuringFlight(Tardis tardis) {
             sequences.triggerRandomSequence(true);
         }
     }
+
+    public void missEvent() {
+        if (this.getState() != State.FLIGHT || this.getTargetTicks() <= 0)
+            return;
+
+        if (this.missedHardCap <= 0)
+            this.updateMissedHardCap(this.getTargetTicks());
+
+        this.missedEvents++;
+        if (this.missedEvents >= this.missedHardCap) {
+            this.tardis().crash();
+            this.resetMissed();
+        }
+    }
+
+    public void resetMissed() {
+        this.missedEvents = 0;
+    }
 }

src/main/java/dev/amble/ait/core/tardis/handler/travel/TravelHandler.java

@@ -595,6 +595,8 @@ public Optional<ActionQueue> forceRemat() {
         if (this.tardis.sequence().hasActiveSequence())
             this.tardis.sequence().cancelActiveSequence();
 
+        this.resetMissed();
+
         CachedDirectedGlobalPos initialPos = this.getProgress();
         boolean destinationHome = this.tardis.returnHome().isDestinationHome();
         boolean exactHailMaryLanding = this.tardis.returnHome().isHailMaryExactLanding();

src/main/java/dev/amble/ait/core/tardis/handler/travel/TravelUtil.java

@@ -17,6 +17,7 @@
 public class TravelUtil {
 
     private static final int BASE_FLIGHT_TICKS = 5 * 20;
+    private static final int QUICK_FLIGHT_THRESHOLD = 128;
 
     public static void randomPos(Tardis tardis, int limit, int max, Consumer<CachedDirectedGlobalPos> consumer) {
         TravelHandler travel = tardis.travel();
@@ -78,7 +79,7 @@ public static int getFlightDuration(CachedDirectedGlobalPos source, CachedDirect
         boolean hasDirChanged = source.getRotation() != destination.getRotation();
         boolean hasDimChanged = !source.getDimension().equals(destination.getDimension());
 
-        if (distance < 128 && !hasDimChanged)
+        if (distance < QUICK_FLIGHT_THRESHOLD && !hasDimChanged)
             return 1; // fast travel
 
         return (int) (BASE_FLIGHT_TICKS + (distance / 10f) + (hasDirChanged ? 100 : 0) + (hasDimChanged ? 600 : 0));
@@ -119,4 +120,20 @@ public static CachedDirectedGlobalPos jukePos(CachedDirectedGlobalPos pos, int m
     public static CachedDirectedGlobalPos jukePos(CachedDirectedGlobalPos pos, int min, int max) {
         return jukePos(pos, min, max, 1);
     }
+
+    public static int getHardCap(int targetTicks) {
+        if (targetTicks <= QUICK_FLIGHT_THRESHOLD) return 1;
+        return 1 + MathHelper.floor(1d / 6d * MathHelper.sqrt(targetTicks - QUICK_FLIGHT_THRESHOLD));
+    }
+
+    static int rescaleMissedEvents(int missedEvents, int previousHardCap, int newHardCap) {
+        int normalizedHardCap = Math.max(newHardCap, 1);
+        int maximumMissedEvents = normalizedHardCap - 1;
+
+        if (missedEvents <= 0) return 0;
+        if (previousHardCap <= 0) return MathHelper.clamp(missedEvents, 0, maximumMissedEvents);
+
+        long proportionalMisses = (long) missedEvents * normalizedHardCap / previousHardCap;
+        return MathHelper.clamp((int) Math.min(proportionalMisses, Integer.MAX_VALUE), 0, maximumMissedEvents);
+    }
 }