From fb07e64410d1abac4464d22ab34a2595695711d2 Mon Sep 17 00:00:00 2001 From: sigonasr2 Date: Sun, 4 Jun 2023 01:12:07 -0500 Subject: [PATCH] Use AOE from client to determine server's AOE flag --- sig/App.java | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/sig/App.java b/sig/App.java index 01289a7..5852ef1 100644 --- a/sig/App.java +++ b/sig/App.java @@ -67,10 +67,13 @@ class Client { case GlobalKeyEvent.VK_NUMPAD1: case GlobalKeyEvent.VK_1: case GlobalKeyEvent.VK_2: - case GlobalKeyEvent.VK_3: - case GlobalKeyEvent.VK_Z:{ + case GlobalKeyEvent.VK_3:{ out.writeUTF("FIGHT"); }break; + case GlobalKeyEvent.VK_Z: + case GlobalKeyEvent.VK_X:{ + out.writeUTF("FIGHTAOE"); + }break; case GlobalKeyEvent.VK_NUMPAD3: case 110: case GlobalKeyEvent.VK_DELETE: @@ -168,6 +171,7 @@ class Server private DataInputStream in = null; Robot r; boolean fighting=false; + boolean fightingaoe=false; private void PressKeyWithModifier(int modifier,int keycode) { r.keyPress(modifier); @@ -227,9 +231,10 @@ class Server return 0; } boolean MultipleTargets(){ - BufferedImage img=r.createScreenCapture(new Rectangle(75, 628, 1, 1)); + return fightingaoe; + /*BufferedImage img=r.createScreenCapture(new Rectangle(75, 628, 1, 1)); Color c=new Color(img.getRGB(0,0)); - return (c.getRed()==120&&c.getRed()==118&&c.getBlue()==120)||(c.getRed()==140&&c.getRed()==138&&c.getBlue()==140); + return (c.getRed()==120&&c.getRed()==118&&c.getBlue()==120)||(c.getRed()==140&&c.getRed()==138&&c.getBlue()==140);*/ } @@ -328,6 +333,11 @@ class Server }break; case "FIGHT":{ fighting=true; + fightingaoe=false; + System.out.println("Fight mode: "+fighting); + }break; + case "FIGHTAOE":{ + fighting=fightingaoe=true; System.out.println("Fight mode: "+fighting); }break; case "CHILL":{