Miko/baritone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace bool firework with ticksBoosted in solvePitch

Browse Source
This commit is contained in:
Brady
2023-06-26 16:58:29 -05:00
parent 3e94cac567
commit 04a5a1a620
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/baritone/behavior/ElytraBehavior.java
View File

@@ -792,15 +792,17 @@ public final class ElytraBehavior extends Behavior implements IElytraBehavior, H
private Pair<Float, Boolean> solvePitch(final SolverContext context, final Vec3d goalDelta,
final int relaxation, final boolean ignoreLava) {
final boolean desperate = relaxation == 2;
final int steps = desperate ? 3 : context.boost.isBoosted() ? 5 : Baritone.settings().elytraSimulationTicks.value;
final int ticks = desperate ? 3 : context.boost.isBoosted() ? 5 : Baritone.settings().elytraSimulationTicks.value;
final int ticksBoosted = context.boost.isBoosted() ? ticks : 0;
final Float pitch = this.solvePitch(context, goalDelta, steps, desperate, context.boost.isBoosted(), ignoreLava);
final Float pitch = this.solvePitch(context, goalDelta, ticks, ticksBoosted, desperate, ignoreLava);
if (pitch != null) {
return new Pair<>(pitch, false);
}
if (Baritone.settings().experimentalTakeoff.value && relaxation > 0) {
final Float usingFirework = this.solvePitch(context, goalDelta, steps, desperate, true, ignoreLava);
// Simulate as if we were boosted for the entire duration
final Float usingFirework = this.solvePitch(context, goalDelta, ticks, ticks, desperate, ignoreLava);
if (usingFirework != null) {
return new Pair<>(usingFirework, true);
}
@@ -809,8 +811,8 @@ public final class ElytraBehavior extends Behavior implements IElytraBehavior, H
return new Pair<>(null, false);
}
private Float solvePitch(final SolverContext context, final Vec3d goalDelta, final int steps,
final boolean desperate, final boolean firework, final boolean ignoreLava) {
private Float solvePitch(final SolverContext context, final Vec3d goalDelta, final int ticks,
final int ticksBoosted, final boolean desperate, final boolean ignoreLava) {
// we are at a certain velocity, but we have a target velocity
// what pitch would get us closest to our target velocity?
// yaw is easy so we only care about pitch
@@ -830,8 +832,8 @@ public final class ElytraBehavior extends Behavior implements IElytraBehavior, H
context.aimProcessor.fork(),
goalDelta,
pitch,
steps,
firework ? Integer.MAX_VALUE : 0,
ticks,
ticksBoosted,
ignoreLava
);
if (displacement == null) {