From 24f527507984e3d07c060600390da2345980e723 Mon Sep 17 00:00:00 2001 From: mrbesen Date: Tue, 8 Mar 2022 00:04:56 +0100 Subject: [PATCH] prepick --- include/lolautoaccept.h | 4 ++++ src/lolautoaccept.cpp | 30 ++++++++++++++++++++++-------- src/main.cpp | 3 +++ 3 files changed, 29 insertions(+), 8 deletions(-) diff --git a/include/lolautoaccept.h b/include/lolautoaccept.h index dcc2bf4..5b80339 100644 --- a/include/lolautoaccept.h +++ b/include/lolautoaccept.h @@ -37,5 +37,9 @@ private: public: LolAutoAccept(); + void setPrePick(const std::string& prePick); + void setBan(const std::string& ban); + void setPick(const std::string& pick); + void run(); }; \ No newline at end of file diff --git a/src/lolautoaccept.cpp b/src/lolautoaccept.cpp index 6eaf216..c225082 100644 --- a/src/lolautoaccept.cpp +++ b/src/lolautoaccept.cpp @@ -39,7 +39,7 @@ void LolAutoAccept::checkForGame() { return; } - performClick(0); // accept Game + performClick(1); // accept Game // security sleep std::this_thread::sleep_for(std::chrono::seconds(3)); @@ -70,34 +70,48 @@ void LolAutoAccept::performClick(uint32_t nr) { sim.mouseMoveTo(p.x, p.y); - std::this_thread::sleep_for(std::chrono::milliseconds(120)); + std::this_thread::sleep_for(std::chrono::milliseconds(170)); sim.mouseClick(XIS::LEFT_MOUSE_BUTTON); // move mouse away - std::this_thread::sleep_for(std::chrono::milliseconds(120)); - sim.mouseMoveTo(0, 0); + std::this_thread::sleep_for(std::chrono::milliseconds(170)); + p = inputs.get(0); + sim.mouseMoveTo(p.x, p.y); } void LolAutoAccept::enterSearch(const std::string& text) { - performClick(1); // click searchbox + performClick(2); // click searchbox Log::debug << "enter text: " << text; sim.keySequence(text); - std::this_thread::sleep_for(std::chrono::milliseconds(180)); + std::this_thread::sleep_for(std::chrono::milliseconds(750)); } void LolAutoAccept::pickFirst(const std::string& search) { enterSearch(search); - performClick(2); // first champion + performClick(3); // first champion } LolAutoAccept::LolAutoAccept() : acceptmatcher("imgs/Accept.png"), arrowmatcher("imgs/arrowdown.png"), sim(XInputSimulator::getInstance()) { // click positions in 1280x720 scale + inputs.addPoint({0, 0}); // zero zero inputs.addPoint({645, 560}); // accept game inputs.addPoint({775, 105}); // search box - inputs.addPoint({180, 160}); // first champ + inputs.addPoint({380, 160}); // first champ +} + +void LolAutoAccept::setPrePick(const std::string& prePick) { + prepick = prePick; +} + +void LolAutoAccept::setBan(const std::string& ban) { + this->ban = ban; +} + +void LolAutoAccept::setPick(const std::string& pick) { + this->pick = pick; } void LolAutoAccept::run() { diff --git a/src/main.cpp b/src/main.cpp index 7bff905..c73829e 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -13,6 +13,9 @@ int main(int argc, const char** argv) { Log::info << "Hello, World!"; LolAutoAccept lolaa; + + lolaa.setPrePick("morgana"); + lolaa.run(); Log::stop();