From 101d80ee836a252415ee7c903021df98c1bc4d3c Mon Sep 17 00:00:00 2001 From: mrbesen Date: Thu, 27 Apr 2017 23:27:18 +0200 Subject: [PATCH] Added the "Arena-popup-clicker" --- src/mrbesen/cr/auto/clicker/Clicker.java | 15 ++++++++++----- src/mrbesen/cr/auto/clicker/UI.java | 3 ++- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/mrbesen/cr/auto/clicker/Clicker.java b/src/mrbesen/cr/auto/clicker/Clicker.java index 332145b..00c358b 100644 --- a/src/mrbesen/cr/auto/clicker/Clicker.java +++ b/src/mrbesen/cr/auto/clicker/Clicker.java @@ -18,10 +18,10 @@ public class Clicker implements Runnable{ private boolean skipbattle = false; private Thread thread; - private Point top_left; - private Point battle; private Point end; + + private Point arena_switch; private Point[] cardslots = new Point[4]; private Point playout; @@ -142,7 +142,12 @@ public class Clicker implements Runnable{ inbattle = false; clickL(rob, end);//ok button Main.get().ui.info("Battle ended."); - sleep(10000);//10 sec-loading screen + sleep(12000);//10 sec-loading screen + //checken, ob Arena wechsel pop-up + if(checkOK(arena_switch, rob)) { + clickL(rob, arena_switch); + sleep(5000); + } } } catch (AWTException e) { e.printStackTrace(); @@ -183,7 +188,7 @@ public class Clicker implements Runnable{ } else if(num == 6) playout = a; else if(num == 7) - top_left = a; + arena_switch = a; } public boolean isSet(int num) { @@ -202,7 +207,7 @@ public class Clicker implements Runnable{ else if(num == 6) return playout; else if(num == 7) - return top_left; + return arena_switch; return null; } diff --git a/src/mrbesen/cr/auto/clicker/UI.java b/src/mrbesen/cr/auto/clicker/UI.java index 2f1df73..74c0ab7 100644 --- a/src/mrbesen/cr/auto/clicker/UI.java +++ b/src/mrbesen/cr/auto/clicker/UI.java @@ -48,7 +48,8 @@ public class UI implements ActionListener { new PosSelector(this, "Card2",false, 1), new PosSelector(this, "Card3",false, 2), new PosSelector(this, "Card4", false, 3), - new PosSelector(this, "Playout", false, 6) + new PosSelector(this, "Playout", false, 6), + new PosSelector(this, "Arena View", false, 7) }; private JButton skip = new JButton("SKIP"); // the button, to skip waiting