jeff/trade_bot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Activity

Fix sorting multiple times

Browse Source
This commit is contained in:
Jeff 2024-07-11 14:30:50 -04:00
parent 2ec029e262
commit ed3d5c3f32
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/bot.rs
View File

@ -4,16 +4,12 @@ use std::{
time::{Duration, Instant}, time::{Duration, Instant},
}; };
use rand::{thread_rng, Rng};
use tokio::runtime::Runtime; use tokio::runtime::Runtime;
use vek::Quaternion; use vek::Quaternion;
use veloren_client::{addr::ConnectionArgs, Client, Event as VelorenEvent, WorldExt}; use veloren_client::{addr::ConnectionArgs, Client, Event as VelorenEvent, WorldExt};
use veloren_common::{ use veloren_common::{
clock::Clock, clock::Clock,
comp::{ comp::{invite::InviteKind, item::ItemDefinitionIdOwned, ChatType, ControllerInputs, Ori, Pos},
invite::InviteKind, item::ItemDefinitionIdOwned, Agent, Anchor, ChatType, ControllerInputs,
Ori, Pos,
},
outcome::Outcome, outcome::Outcome,
time::DayPeriod, time::DayPeriod,
trade::{PendingTrade, TradeAction, TradeResult}, trade::{PendingTrade, TradeAction, TradeResult},
@ -22,13 +18,6 @@ use veloren_common::{
DamageSource, ViewDistances, DamageSource, ViewDistances,
}; };
use veloren_common_net::sync::WorldSyncExt; use veloren_common_net::sync::WorldSyncExt;
use veloren_world::{
civ::WorldCivStage,
sim::Location,
site::{Settlement, SiteKindMeta},
site2::Site,
SettlementKindMeta,
};
const COINS: &str = "common.items.utility.coins"; const COINS: &str = "common.items.utility.coins";
@ -50,6 +39,7 @@ pub struct Bot {
last_action: Instant, last_action: Instant,
last_announcement: Instant, last_announcement: Instant,
last_ouch: Instant, last_ouch: Instant,
sort_count: u8,
} }
impl Bot { impl Bot {
@ -114,6 +104,7 @@ impl Bot {
last_action: now, last_action: now,
last_announcement: now, last_announcement: now,
last_ouch: now, last_ouch: now,
sort_count: 0,
}) })
} }
@ -136,6 +127,12 @@ impl Bot {
self.handle_position_and_orientation()?; self.handle_position_and_orientation()?;
self.handle_lantern(); self.handle_lantern();
if self.sort_count > 0 {
self.client.sort_inventory();
self.sort_count -= 1;
}
if let Some((_, trade, _)) = self.client.pending_trade() { if let Some((_, trade, _)) = self.client.pending_trade() {
match self.trade_mode { match self.trade_mode {
TradeMode::AdminAccess => { TradeMode::AdminAccess => {
@ -205,9 +202,9 @@ impl Bot {
log::debug!("Sorting inventory {sort_count} times"); log::debug!("Sorting inventory {sort_count} times");
for _ in 0..sort_count { self.client.sort_inventory();
self.client.sort_inventory();
} self.sort_count = sort_count.saturating_sub(1);
} else { } else {
log::debug!("Sorting inventory"); log::debug!("Sorting inventory");
self.client.sort_inventory(); self.client.sort_inventory();