From 25b0348916d3a064bfaf72414d80520c70901887 Mon Sep 17 00:00:00 2001 From: Leijurv Date: Mon, 13 Aug 2018 16:56:09 -0700 Subject: [PATCH] tweaks --- src/main/java/baritone/bot/behavior/impl/PathingBehavior.java | 2 +- .../java/baritone/bot/pathing/calc/AbstractNodeCostSearch.java | 2 +- src/main/java/baritone/bot/pathing/goals/GoalXZ.java | 2 +- src/main/java/baritone/bot/pathing/movement/ActionCosts.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/baritone/bot/behavior/impl/PathingBehavior.java b/src/main/java/baritone/bot/behavior/impl/PathingBehavior.java index 91e56da4..a2917880 100644 --- a/src/main/java/baritone/bot/behavior/impl/PathingBehavior.java +++ b/src/main/java/baritone/bot/behavior/impl/PathingBehavior.java @@ -125,7 +125,7 @@ public class PathingBehavior extends Behavior { // and this path dosen't get us all the way there return; } - if (current.getPath().ticksRemainingFrom(current.getPosition()) < 200) { + if (current.getPath().ticksRemainingFrom(current.getPosition()) < 150) { // and this path has 5 seconds or less left displayChatMessageRaw("Path almost over. Planning ahead..."); findPathInNewThread(current.getPath().getDest(), false); diff --git a/src/main/java/baritone/bot/pathing/calc/AbstractNodeCostSearch.java b/src/main/java/baritone/bot/pathing/calc/AbstractNodeCostSearch.java index 65eefd6a..5a1523bd 100644 --- a/src/main/java/baritone/bot/pathing/calc/AbstractNodeCostSearch.java +++ b/src/main/java/baritone/bot/pathing/calc/AbstractNodeCostSearch.java @@ -57,7 +57,7 @@ public abstract class AbstractNodeCostSearch implements IPathFinder { * * @see */ - protected static final double[] COEFFICIENTS = {1, 1.5, 2, 2.5, 3, 4, 5, 10}; + protected static final double[] COEFFICIENTS = {1.25, 1.5, 2, 2.5, 3, 4, 5, 10}; // big TODO tune /** * If a path goes less than 5 blocks and doesn't make it to its goal, it's not worth considering. */ diff --git a/src/main/java/baritone/bot/pathing/goals/GoalXZ.java b/src/main/java/baritone/bot/pathing/goals/GoalXZ.java index 37cb694a..c1756e1b 100644 --- a/src/main/java/baritone/bot/pathing/goals/GoalXZ.java +++ b/src/main/java/baritone/bot/pathing/goals/GoalXZ.java @@ -98,7 +98,7 @@ public class GoalXZ implements Goal { diagonal = z; } diagonal *= SQRT_2; - return (diagonal + straight) * 4; + return (diagonal + straight) * 4; // big TODO tune } public static GoalXZ fromDirection(Vec3d origin, float yaw, double distance) { diff --git a/src/main/java/baritone/bot/pathing/movement/ActionCosts.java b/src/main/java/baritone/bot/pathing/movement/ActionCosts.java index e92af895..79069d50 100644 --- a/src/main/java/baritone/bot/pathing/movement/ActionCosts.java +++ b/src/main/java/baritone/bot/pathing/movement/ActionCosts.java @@ -22,7 +22,7 @@ public interface ActionCosts extends ActionCostsButOnlyTheOnesThatMakeMickeyDieI /** * These costs are measured roughly in ticks btw */ - double WALK_ONE_BLOCK_COST = 20 / 4.317; // // 4.633 + double WALK_ONE_BLOCK_COST = 20 / 4.317; // 4.633 double WALK_ONE_IN_WATER_COST = 20 / 2.2; double JUMP_ONE_BLOCK_COST = 5.72854;//see below calculation for fall. 1.25 blocks double LADDER_UP_ONE_COST = 20 / 2.35;