Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed major problems caused by new Among Us features and UI updates. #28

Merged
merged 1 commit into from
Oct 24, 2022
Merged

Fixed major problems caused by new Among Us features and UI updates. #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 43 additions & 23 deletions AmongKey/AmongKeyApp.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,19 +26,34 @@ var down: Int = 0
var left: Int = 0
var right: Int = 0

var mouseIsDown: Bool = false;
var mouseIsClicking: Bool = false;
var mouseIsDown: Bool = false
var mouseIsClicking: Bool = false
var mouseClickLock = NSLock()


func calculateUIPosition(ui_position: (ui_x: Int, ui_y: Int)) -> (x: Double, y: Double) {
let bottom_right_button = (x: 2536.0, y: 1873.0)
let vertical_spacing = 400.0;
let horizontal_spacing = 350.0;
return (x: bottom_right_button.x - horizontal_spacing * Double(ui_position.ui_x),
y: bottom_right_button.y - vertical_spacing * Double(ui_position.ui_y))
}


let JOYSTICK = (x: 227.589, y: 1873.375)
let USE_BUTTON = calculateUIPosition(ui_position: (ui_x: 0, ui_y: 0))
let KILL_BUTTON = calculateUIPosition(ui_position: (ui_x: 0, ui_y: 1))
let REPORT_BUTTON = calculateUIPosition(ui_position: (ui_x: 1, ui_y: 0))
let SABOTAGE_BUTTON = calculateUIPosition(ui_position: (ui_x: 1, ui_y: 1))
let VENT_BUTTON = calculateUIPosition(ui_position: (ui_x: 2, ui_y: 1))
let ROLE_BUTTON = calculateUIPosition(ui_position: (ui_x: 2, ui_y: 0))

let JOYSTICK = (x: 227.589, y: 1873.250)
let USE_BUTTON = (x: 2536.0, y: 1873.0)
let ESC_BUTTON = (x: 120.0, y: 420.0)
let KILL_BUTTON = (x: 2100.0, y: 1873.0)
let MAP_BUTTON = (x: 2665.0, y: 421.0)
let REPORT_BUTTON = (x: 2550.0, y: 1396.0)
let CHAT1_BUTTON = (x: 2395.0, y: 110.0)
let CHAT2_BUTTON = (x: 2411.0, y: 301.0)
let CHAT1_SEND_BUTTON = (x: 2105.0, y: 1585.0)
let CHAT2_SEND_BUTTON = (x: 2116.0, y: 1817.0)
let LOBBY_CHAT_BUTTON = (x: 2395.0, y: 110.0)
let MEETING_CHAT_BUTTON = (x: 2411.0, y: 301.0)
let LOBBY_CHAT_SEND_BUTTON = (x: 2105.0, y: 1585.0)
let MEETING_CHAT_SEND_BUTTON = (x: 1850.0, y: 1650.0)

var originalPosition = (x: 0.0, y: 0.0)
var originalSize = (height: 0.0, width: 0.0)
Expand Down Expand Up @@ -71,8 +86,7 @@ func setup() {
if (permission) {
createKeybinding()
}

//Run movment all 25ms
//Run movement all 25ms
Timer.scheduledTimer(withTimeInterval: 0.025, repeats: true) { _ in
movement()
}
Expand All @@ -86,15 +100,15 @@ func setup() {

func movement() {
if (X == -1 && Y == -1) { rescueMouse(); return }

if (mouseIsClicking == true){ return }


if (topmost == false) { rescueMouse(); return }

if (gamestate != "Ingame" && gamestate != "Lobby") { rescueMouse(); return }

if ((up + down + left + right) == 0) { rescueMouse(); return }

let lockSuccess = mouseClickLock.try()
if (!lockSuccess){ return }
var joystickY: Double = calcPos(pos: JOYSTICK).y
var joystickX: Double = calcPos(pos: JOYSTICK).x

Expand All @@ -114,6 +128,7 @@ func movement() {

mouseDown(pos: CGPoint(x: lastX, y: lastY));
mouseIsDown = true
mouseClickLock.unlock()
}

func calcPos(pos: (x: Double, y: Double)) -> (x: Double, y: Double) {
Expand Down Expand Up @@ -228,21 +243,26 @@ func simulateClick(pos: (x: Double, y: Double)) {
if (X == -1 && Y == -1) {
return;
}
let pos = CGPoint(x: X + calcPos(pos: pos).x, y: Y + calcPos(pos: pos).y)
mouseIsClicking = true
rescueMouse()
usleep(50000)
mouseDown(pos: pos)
usleep(50000)
mouseUp(pos: pos)
mouseIsClicking = false
let clickEventWaitTime : useconds_t = 10000;
DispatchQueue.global(qos:.background).async {
let pos = CGPoint(x: X + calcPos(pos: pos).x, y: Y + calcPos(pos: pos).y)
mouseClickLock.lock()
rescueMouse()
usleep(clickEventWaitTime)
mouseDown(pos: pos)
usleep(clickEventWaitTime)
mouseUp(pos: pos)
usleep(clickEventWaitTime)
mouseClickLock.unlock()
}
}

func simulateKeypress(key: UInt16) {
print("Keypress: " + String(key))
let keyDownEvent = CGEvent(keyboardEventSource: nil, virtualKey: key, keyDown: true)
keyDownEvent?.flags = CGEventFlags.maskCommand
keyDownEvent?.post(tap: CGEventTapLocation.cghidEventTap)

usleep(10000)
let keyUpEvent = CGEvent(keyboardEventSource: nil, virtualKey: key, keyDown: false)
keyUpEvent?.flags = CGEventFlags.maskCommand
Expand Down
24 changes: 15 additions & 9 deletions AmongKey/Keymapping.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,20 +53,20 @@ func createKeybinding() {
simulateKeypress(key: 53) //Escape to blur input field
}
amongusWindow()
simulateClick(pos: CHAT1_SEND_BUTTON)
simulateClick(pos: LOBBY_CHAT_SEND_BUTTON)
usleep(10000)
simulateClick(pos: (x: CHAT1_SEND_BUTTON.x - 350, y: CHAT1_SEND_BUTTON.y))
simulateClick(pos: (x: LOBBY_CHAT_SEND_BUTTON.x - 350, y: LOBBY_CHAT_SEND_BUTTON.y))
break;
case (36, "Meeting"): // Return to send message
if (!isFullscreen()) {
simulateKeypress(key: 53) //Escape to blur input field
}
amongusWindow()
simulateClick(pos: CHAT2_SEND_BUTTON)
simulateClick(pos: MEETING_CHAT_SEND_BUTTON)
usleep(10000)
simulateClick(pos: (x: CHAT2_SEND_BUTTON.x - 350, y: CHAT2_SEND_BUTTON.y))
simulateClick(pos: (x: MEETING_CHAT_SEND_BUTTON.x - 350, y: MEETING_CHAT_SEND_BUTTON.y))
break;
case (49, "Ingame"), (14, "Ingame"), (49, "Lobby"), (14, "Lobby"):
case (49, "Ingame"), (14, "Ingame"), (49, "Lobby"), (14, "Lobby"): // Space button
simulateClick(pos: USE_BUTTON)
break;
case (53, "Ingame"), (53, "Lobby"):
Expand All @@ -75,21 +75,27 @@ func createKeybinding() {
case (12, "Ingame"): // Q - Kill
simulateClick(pos: KILL_BUTTON)
break;
case (9, "Ingame"): // V - Vent
simulateClick(pos: VENT_BUTTON)
break;
case (3, "Ingame"): // F - Role Ability
simulateClick(pos: ROLE_BUTTON)
break;
case (15, "Ingame"): // R - Report
simulateClick(pos: REPORT_BUTTON)
break;
case (48, "Ingame"): // Tab - Map
simulateClick(pos: MAP_BUTTON)
break;
case (48, "Lobby"): // Tab to open chat and focus input field
simulateClick(pos: CHAT1_BUTTON)
simulateClick(pos: LOBBY_CHAT_BUTTON)
usleep(100000)
simulateClick(pos: (x: CHAT1_SEND_BUTTON.x - 250, y: CHAT1_SEND_BUTTON.y))
simulateClick(pos: (x: LOBBY_CHAT_SEND_BUTTON.x - 250, y: LOBBY_CHAT_SEND_BUTTON.y))
break;
case (48, "Meeting"): // Tab to open chat and focus input field
simulateClick(pos: CHAT2_BUTTON)
simulateClick(pos: MEETING_CHAT_BUTTON)
usleep(100000)
simulateClick(pos: (x: CHAT2_SEND_BUTTON.x - 250, y: CHAT2_SEND_BUTTON.y))
simulateClick(pos: (x: MEETING_CHAT_SEND_BUTTON.x - 250, y: MEETING_CHAT_SEND_BUTTON.y))
break;
case (18, _): //1 - Store AI Training Data Ingame
storeScreenshot = "Ingame"
Expand Down