Compare commits
No commits in common. "1b21fcb0963de6968831739ed5c2248325a1c49c" and "aded1e4193a9a49a2a11a9be64ea5cdbf3cf98e4" have entirely different histories.
1b21fcb096
...
aded1e4193
10
lib/index.js
10
lib/index.js
|
|
@ -96,13 +96,13 @@ cfg.quiet = true
|
|||
bot.once("spawn", () => {
|
||||
plugins = {
|
||||
command: require('./plugins/command'),
|
||||
informer: require('./plugins/informer'),
|
||||
inventory: require('./plugins/inventory'),
|
||||
finder: require('./plugins/finder'),
|
||||
mover: require('./plugins/mover'),
|
||||
sleeper: require('./plugins/sleeper'),
|
||||
eater: require('./plugins/eater'),
|
||||
inventory: require('./plugins/inventory'),
|
||||
informer: require('./plugins/informer'),
|
||||
finder: require('./plugins/finder'),
|
||||
sleeper: require('./plugins/sleeper'),
|
||||
armor: require('./plugins/armor'),
|
||||
mover: require('./plugins/mover'),
|
||||
guard: require('./plugins/guard'),
|
||||
// miner: require('./plugins/miner.js'),
|
||||
statemachine: require('./plugins/statemachine'),
|
||||
|
|
|
|||
|
|
@ -11,16 +11,17 @@ let movements = []
|
|||
|
||||
|
||||
function initMoves(bot = bot, mcData = bot.mcData) {
|
||||
console.info(movements)
|
||||
if (movements.length > 0) {
|
||||
bot.pathfinder.setMovements(movements.defaultMove)
|
||||
return console.warn("go init: movements already initialized!", movements)
|
||||
return console.warn("movements already initialized!")
|
||||
}
|
||||
const normalMove = new Movements(bot, mcData)
|
||||
normalMove.canDig = false
|
||||
normalMove.scafoldingBlocks.push(mcData.blocksByName.slime_block.id)
|
||||
normalMove.blocksCantBreak.add(mcData.blocksByName.glass.id)
|
||||
normalMove.blocksToAvoid.add(mcData.blocksByName.magma_block.id)
|
||||
movements.push(normalMove)
|
||||
let defaultMove = new Movements(bot, mcData)
|
||||
defaultMove.canDig = false
|
||||
defaultMove.scafoldingBlocks.push(mcData.blocksByName.slime_block.id)
|
||||
defaultMove.blocksCantBreak.add(mcData.blocksByName.glass.id)
|
||||
defaultMove.blocksToAvoid.add(mcData.blocksByName.magma_block.id)
|
||||
movements.push(defaultMove)
|
||||
movements.defaultMove = movements[0]
|
||||
|
||||
bot.pathfinder.setMovements(defaultMove)
|
||||
|
|
@ -81,66 +82,6 @@ function follow(entity, dynamic = true, distance = 3) {
|
|||
bot.pathfinder.setGoal(new GoalFollow(entity, distance), dynamic)
|
||||
}
|
||||
|
||||
function away(entity = bot.nearestEntity(), invertInvert = true, dynamic = true, distance = 10) {
|
||||
const currentGoal = bot.pathfinder.goal
|
||||
console.assert(currentGoal || entity)
|
||||
const { GoalInvert } = require('mineflayer-pathfinder').goals
|
||||
|
||||
bot.pathfinder.setMovements(movements.defaultMove)
|
||||
|
||||
if (!currentGoal) {
|
||||
const { GoalFollow } = require('mineflayer-pathfinder').goals
|
||||
|
||||
if (entity.entity) {
|
||||
console.log("go away entity:", entity, entity.entity)
|
||||
entity = entity.entity
|
||||
}
|
||||
|
||||
cfg.quiet || bot.chat(
|
||||
`going away from ${entity?.type
|
||||
}: ${entity?.username || entity?.displayName
|
||||
}${dynamic ? "" : " once"}`
|
||||
)
|
||||
// alternative implementation
|
||||
// follow(entity, dynamic, distance)
|
||||
// bot.pathfinder.setGoal(new GoalInvert(bot.pathfinder.goal), dynamic)
|
||||
return bot.pathfinder.setGoal(new GoalInvert(
|
||||
new GoalFollow(entity, distance)
|
||||
), dynamic)
|
||||
}
|
||||
|
||||
if (currentGoal instanceof GoalInvert) {
|
||||
const currEntity = currentGoal.goal.entity
|
||||
console.log("go away inverse goal:", currentGoal.goal)
|
||||
if (invertInvert) {
|
||||
cfg.quiet || bot.chat(
|
||||
`switching towards ${currentGoal.goal?.constructor.name
|
||||
}: ${currEntity?.type
|
||||
}: ${currEntity?.username || currEntity?.displayName
|
||||
}${dynamic ? "" : " once"}`
|
||||
)
|
||||
bot.pathfinder.setGoal(currentGoal.goal, dynamic)
|
||||
} else {
|
||||
cfg.quiet || bot.chat(
|
||||
`already going away from ${currentGoal.goal?.constructor.name
|
||||
}; not switching`
|
||||
)
|
||||
}
|
||||
} else {
|
||||
const currEntity = currentGoal.entity
|
||||
console.log("go away goal:", currentGoal)
|
||||
cfg.quiet || bot.chat(
|
||||
`going away from ${currentGoal?.constructor.name
|
||||
}: ${currEntity?.type
|
||||
}: ${currEntity?.username || currEntity?.displayName
|
||||
}${dynamic ? "" : " once"}`
|
||||
)
|
||||
bot.pathfinder.setGoal(new GoalInvert(currentGoal), dynamic)
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
function ride(entity) {
|
||||
entity = entity?.entity || entity
|
||||
const ridableMobs = ["Horse", "Donkey", "Pig", "Strider"]
|
||||
|
|
@ -166,8 +107,7 @@ function ride(entity) {
|
|||
function moveOrRide(turn = false, reverse = -1, directionLabel, message_parts2) {
|
||||
// bot.once("attach", state = "vehiccel")
|
||||
if (bot.vehicle) {
|
||||
// FIXME moveVehicle should be +-1 or 0?
|
||||
const amount = Math.sign(parseInt(message_parts2[0]) || -reverse)
|
||||
const amount = parseInt(message_parts2[0]) || 10 * -reverse
|
||||
bot.moveVehicle(turn && amount || 0, !turn && amount || 0)
|
||||
} else {
|
||||
command([directionLabel].concat(message_parts2))
|
||||
|
|
@ -290,11 +230,6 @@ function command(message_parts, player) {
|
|||
case "mount":
|
||||
ride(message_parts2[0])
|
||||
break
|
||||
case "away":
|
||||
case "run":
|
||||
case "runaway":
|
||||
away()
|
||||
break
|
||||
case "w":
|
||||
case "f":
|
||||
moveOrRide(0, -1, "forward", message_parts2)
|
||||
|
|
@ -311,11 +246,6 @@ function command(message_parts, player) {
|
|||
case "r":
|
||||
moveOrRide(1, 1, "left", message_parts2)
|
||||
break
|
||||
case "up":
|
||||
case "u":
|
||||
case "j":
|
||||
moveOrRide(1, 1, "left", message_parts2)
|
||||
break
|
||||
case "back":
|
||||
case "forward":
|
||||
case "jump":
|
||||
|
|
|
|||
|
|
@ -78,9 +78,8 @@ function init(smName = "dummy", webserver) {
|
|||
actions: {
|
||||
// action implementation
|
||||
lookAtPlayerOnce: (context, event) => {
|
||||
const player = context?.player && (context?.player?.isValid || context?.player?.entity?.isValid)
|
||||
|| bot.nearestEntity(entity => entity.type === 'player');
|
||||
if (player?.position || player?.entity) {
|
||||
const player = context?.player || bot.nearestEntity(entity => entity.type === 'player');
|
||||
if (player.position || player.entity) {
|
||||
context.player = player;
|
||||
bot.lookAt((player.entity || player).position.offset(0, 1, 0));
|
||||
}
|
||||
|
|
@ -88,10 +87,9 @@ function init(smName = "dummy", webserver) {
|
|||
},
|
||||
activities: {
|
||||
lookAtPlayer: (context, event) => {
|
||||
const player = (context?.player?.isValid || context?.player?.entity?.isValid) && context?.player
|
||||
|| bot.nearestEntity(entity => entity.type === 'player' && entity.isValid);
|
||||
// TODO check pos every event?
|
||||
if (player?.position || player?.entity) {
|
||||
const player = context?.player || bot.nearestEntity(entity => entity.type === 'player');
|
||||
// TODO check every event?
|
||||
if (player.position || player.entity) {
|
||||
context.player = player;
|
||||
function looks() {
|
||||
bot.lookAt((player.entity || player).position.offset(0, 1, 0));
|
||||
|
|
@ -99,11 +97,6 @@ function init(smName = "dummy", webserver) {
|
|||
bot.on("time", looks);
|
||||
return () => bot.off("time", looks);
|
||||
}
|
||||
else {
|
||||
quiet || bot.chat("look: no valid players");
|
||||
// TODO use xstate logger
|
||||
context.debug && console.log("sm: no valid player", this, context, player);
|
||||
}
|
||||
}
|
||||
},
|
||||
delays: {
|
||||
|
|
@ -262,6 +255,9 @@ function runSM(name = getSM(undefined, undefined, true), player // or supervisor
|
|||
cfg.statemachine.running[machine.id] = service;
|
||||
cfg.statemachine.recent = machine;
|
||||
service.start();
|
||||
// // TODO check if idle state is different (maybe?)
|
||||
console.log("sm run", service.state.value === machine.initialState.value, service.state);
|
||||
console.log("sm run", service.state !== machine.initialState, machine.initialState);
|
||||
// return machine
|
||||
return service;
|
||||
}
|
||||
|
|
@ -295,7 +291,7 @@ function actionSM(action, name = getSM()) {
|
|||
if (service.status !== InterpreterStatus.Running)
|
||||
return;
|
||||
// const machine = service.machine
|
||||
service.send(action.toUpperCase());
|
||||
service.send(action.toLowerCase());
|
||||
}
|
||||
function stepSM(command = "", ...message_parts) {
|
||||
let service = getSM(undefined, true);
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user