RepoMirrors
/
baritone
mirror of https://github.com/cabaletta/baritone
1
0
Fork 1
Code Issues Releases Wiki Activity

Move firework boost calculation into `solvePitch`

This commit is contained in:
Brady 2023-06-26 15:35:40 -05:00
parent c18715b8d7
commit 0b5a310f18
No known key found for this signature in database
GPG Key ID: 73A788379A197567
1 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -69,6 +69,11 @@ public final class ElytraBehavior extends Behavior implements IElytraBehavior, H
*/ */
private int remainingFireworkTicks; private int remainingFireworkTicks;
/**
* Remaining cool-down ticks after the player's position and rotation are reset by the server
*/
private int remainingSetBackTicks;
/** /**
* The most recent minimum number of firework boost ticks, equivalent to {@code 10 * (1 + Flight)} * The most recent minimum number of firework boost ticks, equivalent to {@code 10 * (1 + Flight)}
* <p> * <p>
@ -76,7 +81,6 @@ public final class ElytraBehavior extends Behavior implements IElytraBehavior, H
*/ */
private int minimumBoostTicks; private int minimumBoostTicks;
private int remainingSetBackTicks;
private BlockStateInterface bsi; private BlockStateInterface bsi;
private Future<Solution> solver; private Future<Solution> solver;
@ -836,7 +840,9 @@ public final class ElytraBehavior extends Behavior implements IElytraBehavior, H
final Rotation rotation = aimProcessor.nextRotation( final Rotation rotation = aimProcessor.nextRotation(
RotationUtils.calcRotationFromVec3d(Vec3d.ZERO, delta, ctx.playerRotations()).withPitch(pitch) RotationUtils.calcRotationFromVec3d(Vec3d.ZERO, delta, ctx.playerRotations()).withPitch(pitch)
); );
motion = step(motion, rotation, firework && i > 0); final Vec3d lookDirection = RotationUtils.calcLookDirectionFromRotation(rotation);
motion = step(motion, lookDirection, rotation.getPitch());
delta = delta.subtract(motion); delta = delta.subtract(motion);
// Collision box while the player is in motion, with additional padding for safety // Collision box while the player is in motion, with additional padding for safety
@ -855,6 +861,15 @@ public final class ElytraBehavior extends Behavior implements IElytraBehavior, H
hitbox = hitbox.offset(motion.x, motion.y, motion.z); hitbox = hitbox.offset(motion.x, motion.y, motion.z);
totalMotion = totalMotion.add(motion); totalMotion = totalMotion.add(motion);
line.add(totalMotion); line.add(totalMotion);
if (firework) {
// See EntityFireworkRocket
motion = motion.add(
lookDirection.x * 0.1 + (lookDirection.x * 1.5 - motion.x) * 0.5,
lookDirection.y * 0.1 + (lookDirection.y * 1.5 - motion.y) * 0.5,
lookDirection.z * 0.1 + (lookDirection.z * 1.5 - motion.z) * 0.5
);
}
} }
double directionalGoodness = goalDirection.dotProduct(totalMotion.normalize()); double directionalGoodness = goalDirection.dotProduct(totalMotion.normalize());
// tried to incorporate a "speedGoodness" but it kept making it do stupid stuff (aka always losing altitude) // tried to incorporate a "speedGoodness" but it kept making it do stupid stuff (aka always losing altitude)
@ -871,20 +886,12 @@ public final class ElytraBehavior extends Behavior implements IElytraBehavior, H
return bestPitch; return bestPitch;
} }
private static Vec3d step(final Vec3d motion, final Rotation rotation, final boolean applyFireworkBoost) { private static Vec3d step(final Vec3d motion, final Vec3d lookDirection, final float pitch) {
double motionX = motion.x; double motionX = motion.x;
double motionY = motion.y; double motionY = motion.y;
double motionZ = motion.z; double motionZ = motion.z;
final Vec3d lookDirection = RotationUtils.calcLookDirectionFromRotation(rotation);
if (applyFireworkBoost) { float pitchRadians = pitch * RotationUtils.DEG_TO_RAD_F;
// See EntityFireworkRocket
motionX += lookDirection.x * 0.1 + (lookDirection.x * 1.5 - motionX) * 0.5;
motionY += lookDirection.y * 0.1 + (lookDirection.y * 1.5 - motionY) * 0.5;
motionZ += lookDirection.z * 0.1 + (lookDirection.z * 1.5 - motionZ) * 0.5;
}
float pitchRadians = rotation.getPitch() * RotationUtils.DEG_TO_RAD_F;
double pitchBase2 = Math.sqrt(lookDirection.x * lookDirection.x + lookDirection.z * lookDirection.z); double pitchBase2 = Math.sqrt(lookDirection.x * lookDirection.x + lookDirection.z * lookDirection.z);
double flatMotion = Math.sqrt(motionX * motionX + motionZ * motionZ); double flatMotion = Math.sqrt(motionX * motionX + motionZ * motionZ);
double thisIsAlwaysOne = lookDirection.length(); double thisIsAlwaysOne = lookDirection.length();
@ -962,4 +969,3 @@ public final class ElytraBehavior extends Behavior implements IElytraBehavior, H
} }
} }
} }