falloutBot/go-mc
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor movement improvements

Browse Source
This commit is contained in:
Tom
2020-09-26 00:10:48 -07:00
parent cadc1cab3a
commit 1a269d9b63
2 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
bot/path/blocks.go
View File

@ -16,6 +16,7 @@ var (
block.Andesite, block.Andesite,
block.PolishedAndesite, block.PolishedAndesite,
block.GrassBlock, block.GrassBlock,
block.GrassPath,
block.Dirt, block.Dirt,
block.CoarseDirt, block.CoarseDirt,
block.Cobblestone, block.Cobblestone,

31
bot/path/path.go
View File

@ -4,8 +4,11 @@ package path
import ( import (
"math" "math"
"math/rand" "math/rand"
"strings"
"time"
"github.com/Tnze/go-mc/bot/world" "github.com/Tnze/go-mc/bot/world"
"github.com/Tnze/go-mc/data/block"
"github.com/beefsack/go-astar" "github.com/beefsack/go-astar"
) )
@ -48,9 +51,10 @@ func (n *Nav) Path() (path []astar.Pather, distance float64, found bool) {
type Tile struct { type Tile struct {
Nav *Nav Nav *Nav
Movement Movement Movement Movement
Pos V3 Pos V3
ExtraCost int BlockStatus world.BlockStatus
ExtraCost int
} }
func (t Tile) PathNeighborCost(to astar.Pather) float64 { func (t Tile) PathNeighborCost(to astar.Pather) float64 {
@ -75,6 +79,7 @@ func (t Tile) PathNeighbors() []astar.Pather {
if t.Pos == t.Nav.Dest && t.Movement != Waypoint { if t.Pos == t.Nav.Dest && t.Movement != Waypoint {
dupe := t dupe := t
dupe.Movement = Waypoint dupe.Movement = Waypoint
dupe.BlockStatus = 0
return []astar.Pather{dupe} return []astar.Pather{dupe}
} }
@ -85,9 +90,10 @@ func (t Tile) PathNeighbors() []astar.Pather {
// fmt.Printf("%v-%v: Trying (%v) %v: possible=%v\n", t.Movement, t.Pos, pos, m, possible) // fmt.Printf("%v-%v: Trying (%v) %v: possible=%v\n", t.Movement, t.Pos, pos, m, possible)
if possible { if possible {
possibles = append(possibles, Tile{ possibles = append(possibles, Tile{
Nav: t.Nav, Nav: t.Nav,
Movement: m, Movement: m,
Pos: pos, Pos: pos,
BlockStatus: t.Nav.World.GetBlockStatus(pos.X, pos.Y, pos.Z),
}) })
} }
} }
@ -96,7 +102,7 @@ func (t Tile) PathNeighbors() []astar.Pather {
return possibles return possibles
} }
func (t Tile) Inputs(pos, deltaPos, vel Point) Inputs { func (t Tile) Inputs(pos, deltaPos, vel Point, runTime time.Duration) Inputs {
// Sufficient for simple movements. // Sufficient for simple movements.
at := math.Atan2(-deltaPos.X, -deltaPos.Z) at := math.Atan2(-deltaPos.X, -deltaPos.Z)
mdX, _, mdZ := t.Movement.Offset() mdX, _, mdZ := t.Movement.Offset()
@ -125,8 +131,8 @@ func (t Tile) Inputs(pos, deltaPos, vel Point) Inputs {
bStateID := t.Nav.World.GetBlockStatus(t.Pos.X, t.Pos.Y, t.Pos.Z) bStateID := t.Nav.World.GetBlockStatus(t.Pos.X, t.Pos.Y, t.Pos.Z)
if x, _, z := LadderDirection(bStateID).Offset(); dist2 > (0.9*0.9) && deltaPos.Y < 0 { if x, _, z := LadderDirection(bStateID).Offset(); dist2 > (0.9*0.9) && deltaPos.Y < 0 {
pos.X -= (0.55 * float64(x)) pos.X -= (0.25 * float64(x))
pos.Z -= (0.55 * float64(z)) pos.Z -= (0.25 * float64(z))
} else { } else {
pos.X += (0.42 * float64(x)) pos.X += (0.42 * float64(x))
pos.Z += (0.42 * float64(z)) pos.Z += (0.42 * float64(z))
@ -140,8 +146,11 @@ func (t Tile) Inputs(pos, deltaPos, vel Point) Inputs {
} }
case AscendNorth, AscendSouth, AscendEast, AscendWest: case AscendNorth, AscendSouth, AscendEast, AscendWest:
b := block.ByID[block.StateID[uint32(t.BlockStatus)]]
noJump := strings.HasSuffix(b.Name, "_stairs") && runTime < (1250*time.Millisecond)
dist2 := math.Sqrt(deltaPos.X*deltaPos.X + deltaPos.Z*deltaPos.Z) dist2 := math.Sqrt(deltaPos.X*deltaPos.X + deltaPos.Z*deltaPos.Z)
out.Jump = dist2 < 1.75 && deltaPos.Y < -0.81 out.Jump = dist2 < 1.75 && deltaPos.Y < -0.81 && !noJump
// Turn off the throttle if we get stuck on the jump. // Turn off the throttle if we get stuck on the jump.
if dist2 < 1 && deltaPos.Y < 0 && vel.Y == 0 { if dist2 < 1 && deltaPos.Y < 0 && vel.Y == 0 {
@ -160,5 +169,5 @@ func (t Tile) IsComplete(d Point) bool {
return d.Y >= 0 return d.Y >= 0
} }
return (d.X*d.X+d.Z*d.Z) < (0.18*0.18) && d.Y >= -0.01 && d.Y <= 0.08 return (d.X*d.X+d.Z*d.Z) < (0.18*0.18) && d.Y >= -0.065 && d.Y <= 0.08
} }