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

misc improvements

Browse Source
This commit is contained in:
Leijurv 2018-09-10 09:22:32 -07:00
parent 075ad3f244
commit 72eec135d0
No known key found for this signature in database
GPG Key ID: 44A3EA646EADAC6A
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/baritone/pathing/calc/AStarPathFinder.java
View File

@ -158,8 +158,8 @@ public class AStarPathFinder extends AbstractNodeCostSearch implements Helper {
if (neighbor.isOpen) { if (neighbor.isOpen) {
openSet.update(neighbor); openSet.update(neighbor);
} else { } else {
openSet.insert(neighbor);//dont double count, dont insert into open set if it's already there
neighbor.isOpen = true; neighbor.isOpen = true;
openSet.insert(neighbor);//dont double count, dont insert into open set if it's already there
} }
for (int i = 0; i < bestSoFar.length; i++) { for (int i = 0; i < bestSoFar.length; i++) {
double heuristic = neighbor.estimatedCostToGoal + neighbor.cost / COEFFICIENTS[i]; double heuristic = neighbor.estimatedCostToGoal + neighbor.cost / COEFFICIENTS[i];

3
src/main/java/baritone/pathing/calc/PathNode.java
View File

@ -18,6 +18,7 @@
package baritone.pathing.calc; package baritone.pathing.calc;
import baritone.pathing.goals.Goal; import baritone.pathing.goals.Goal;
import baritone.pathing.movement.ActionCosts;
import baritone.pathing.movement.Movement; import baritone.pathing.movement.Movement;
import baritone.utils.pathing.BetterBlockPos; import baritone.utils.pathing.BetterBlockPos;
@ -81,7 +82,7 @@ public final class PathNode {
public PathNode(BetterBlockPos pos, Goal goal) { public PathNode(BetterBlockPos pos, Goal goal) {
this.pos = pos; this.pos = pos;
this.previous = null; this.previous = null;
this.cost = Short.MAX_VALUE; this.cost = ActionCosts.COST_INF;
this.goal = goal; this.goal = goal;
this.estimatedCostToGoal = goal.heuristic(pos); this.estimatedCostToGoal = goal.heuristic(pos);
this.previousMovement = null; this.previousMovement = null;

6
src/main/java/baritone/pathing/movement/movements/MovementParkour.java
View File

@ -65,6 +65,12 @@ public class MovementParkour extends Movement {
if (!MovementHelper.fullyPassable(src.up().offset(dir))) { if (!MovementHelper.fullyPassable(src.up().offset(dir))) {
return null; return null;
} }
if (!MovementHelper.fullyPassable(src.up(2).offset(dir))) {
return null;
}
if (!MovementHelper.fullyPassable(src.up(2))) {
return null;
}
for (int i = 2; i <= 4; i++) { for (int i = 2; i <= 4; i++) {
BlockPos dest = src.offset(dir, i); BlockPos dest = src.offset(dir, i);
// TODO perhaps dest.up(3) doesn't need to be fullyPassable, just canWalkThrough, possibly? // TODO perhaps dest.up(3) doesn't need to be fullyPassable, just canWalkThrough, possibly?