Merge branch 'main' into main

This commit is contained in:
Sweaterdog 2025-02-27 21:24:08 -08:00 committed by GitHub
commit ae7b1d9650
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 46 additions and 2 deletions

1
.gitignore vendored
View file

@ -16,3 +16,4 @@ services/viaproxy/viaproxy.yml
tmp/
wandb/
experiments/

View file

@ -0,0 +1,43 @@
{
"multiagent_techtree_1_stone_pickaxe": {
"conversation": "Let's collaborate to build a stone pickaxe",
"agent_count": 2,
"initial_inventory": {
"0": {
"wooden_pickaxe": 1
},
"1": {
"wooden_axe": 1
}
},
"blocked_actions": {
"0": [],
"1": []
},
"target": "stone_pickaxe",
"number_of_target": 1,
"type": "techtree",
"timeout": 20
},
"multiagent_techtree_1_shears": {
"goal": "Collaborate with other agents to build a shear.",
"conversation": "Let's collaborate to build a shear.",
"agent_count": 2,
"initial_inventory": {
"0": {
"iron_ingot": 1
},
"1": {
"iron_ingot": 1
}
},
"blocked_actions": {
"0": [],
"1": []
},
"target": "shears",
"number_of_target": 1,
"type": "techtree",
"timeout": 20
}
}

View file

@ -92,7 +92,6 @@ export class Agent {
this.startEvents();
// this.task.initBotTask();
if (!load_mem) {
this.task.initBotTask();
}

View file

@ -124,6 +124,7 @@ export class SelfPrompter {
this.stopLoop();
this.state = STOPPED;
}
async pause() {
this.interrupt = true;
await this.agent.actions.stop();

View file

@ -102,7 +102,7 @@ export class Task {
bot.chat(`/clear ${name}`);
console.log(`Cleared ${name}'s inventory.`);
//kill all drops
if (this.agent.count_id === 0) {
bot.chat(`/kill @e[type=item]`);