Skip to content

Commit

Permalink
v.1.3.3
Browse files Browse the repository at this point in the history
- added gl hf & gg hotkeys
- added French / German layout overlay image
- fixed logic in a few places
  • Loading branch information
etofok committed Sep 24, 2024
1 parent 8dafdb0 commit 771c099
Show file tree
Hide file tree
Showing 17 changed files with 181 additions and 122 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -4,25 +4,32 @@

Displaced Grid overlays this image directly on top of the Warcraft III:Reforged window.

Name must be "IMAGE_OVERLAY.png"


If you play in a different resolution than 1920x1080 - you need to adjust the overlay.

If you DO NOT play in 1920x1080 - you DO need to adjust the overlay.
Otherwise it won't be properly aligned.


Use the provided "IMAGE_OVERLAY (for editing).psd" in this folder.
.psd - is a Photoshop file.
You can open in an online editor ("edit .psd online").


Here's a detailed instruction:

1. Open "IMAGE_OVERLAY (for editing).psd" in Photoshop or any online .psd editor.

2. Paste your in-game screenshot (as a temporary reference) and align the overlay on top of it.

3. Don't forget to remove the in-game screenshot before exporting.

4. Export as .png to keep the transparency.
4. Export as .png to keep the transparency. Do not export as .jpg.

5. The overlay image should be named exactly "IMAGE_OVERLAY.png".
5. The overlay image should be named exactly "IMAGE_OVERLAY.png". Do not name it any differently.

P.S. Save the .psd file as well in case you'll need to edit it later.
P.S. Save the .psd file as well just in case you'll need to get back to it later.

That's it!

Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 1 addition & 5 deletions Modules/Hotkey_CommandCard.ahk
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,7 @@


if (b_RapidFire == 1 and A_ThisHotkey == A_PriorHotkey) { ; * Breakdown below

Send {Escape}

if (b_EventLog)
UpdateEventLog("Deselect")
RapidFire()
}

Send % appendModifiers objCommand.logicalKey
Expand Down
3 changes: 1 addition & 2 deletions Modules/Hotkey_ControlGroup.ahk
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,10 @@
UpdateEventLog("Physical Key:`t" mods objCommand.physicalKey "`nCorresponding Action: " mods objCommand.logicalKey "`nA_ThisHotkey: " A_ThisHotkey)
}


Send % appendModifiers objCommand.logicalKey

; See module_CameraHotkeys.ahk
if (b_CameraHotkeys == 1) {
InstantCameraJump(objCommand)
InstantCameraPan(objCommand)
}
}
37 changes: 21 additions & 16 deletions Modules/Hotkey_Item.ahk
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ Hotkey_Item(objCommand) {
UpdateEventLog("Physical Key Pressed:`t" mods A_ThisHotkey "`nCorresponding GRID:`t" objCommand.logicalKey)
}



; Shift-keyed Item Key Usage
if (GetKeyState("Shift", "P")) {

Expand All @@ -38,38 +36,45 @@ Hotkey_Item(objCommand) {

if (b_QuickCastItems == 1) {
QuickCast(objCommand)
}

if (b_RapidFire == 1) {
Send, {Shift down}{Escape}
if (b_RapidFire == 1) {
RapidFire_queue()
}
}
}

} else { ; b_ShiftQueueItems == 0
if (b_ShiftQueueItems == 1) {

; By default, we cannot activate Item keys while Shift is pressed down: there's just no effect - the item hotkey is ignored.

if (b_EventLog)
UpdateEventLog("Attempt to activate " objCommand.logicalKey "`n(Default behavior - no action)")
}


; No "Shift" Item Usage

} else {

Send % objCommand.logicalKey
} else { ; if (GetKeyState("Shift", "P")) {

; QuickCastItems is a module that fires a pseudo quick cast
; read more info inside the module_QuickCastItems
; read more in module_QuickCastItems.ahk

Send % objCommand.logicalKey ; fire layout key to active item

if (b_QuickCastItems == 1) {

if (b_EventLog)
UpdateEventLog("QuickCast Item: " objCommand.logicalKey)

QuickCast(objCommand)
}

if (b_RapidFire == 1) {
Send, {Escape}
if (b_RapidFire == 1) {
RapidFire()
}
}

}

if (b_QuickCastItems == 0) {
if (b_EventLog)
UpdateEventLog("Cast Item: " objCommand.logicalKey)
}
}
}
1 change: 0 additions & 1 deletion Modules/layout_BlizzardGrid.ahk
Original file line number Diff line number Diff line change
Expand Up @@ -44,5 +44,4 @@ load_BlizzardGrid() {
Item6.physicalKey := "numpad2"

MouseButtonRight.physicalKey:= "Rbutton"

}
1 change: 0 additions & 1 deletion Modules/layout_DisplacedGrid.ahk
Original file line number Diff line number Diff line change
Expand Up @@ -43,5 +43,4 @@ load_DisplacedGrid() {
Item6.physicalKey := "!x"

MouseButtonRight.physicalKey:= "Rbutton"

}
9 changes: 5 additions & 4 deletions Modules/module_AltKeyImprovements.ahk
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ Menu, Tray, Add, %menu_Toggle_AltKeyImprovements%, Toggle_AltKeyImprovements

if (b_AltKeyImprovements == 1) {
Control_AltKeyImprovements(1)
} else {
Control_AltKeyImprovements(0)
Menu, Tray, Disable, %menu_Toggle_AltKeyImprovements%
}

;--------------------------------
Expand Down Expand Up @@ -85,8 +88,7 @@ AltKeyImprovements(objCommand) {
Click % PortraitUI.x " " PortraitUI.y

if (b_RapidFire == 1) {

Send {Shift Down}{Escape}
RapidFire_queue()

if (b_EventLog)
UpdateEventLog("Deselect")
Expand Down Expand Up @@ -144,8 +146,7 @@ AltKeyImprovements(objCommand) {
UpdateEventLog("Alt + (" KeyToPress ")`nFiring the Ability anyway!")

if (b_RapidFire == 1) {

Send, {Escape}
RapidFire()
Send % objCommand.logicalKey

return
Expand Down
9 changes: 6 additions & 3 deletions Modules/module_CameraHotkeys.ahk
Original file line number Diff line number Diff line change
Expand Up @@ -17,22 +17,25 @@
;-----------------------------------------

; Yes I use Globals
Global menu_Toggle_CameraHotkeys := "Camera Hotkeys | Instant Pan"
Global menu_Toggle_CameraHotkeys := "Camera Hotkeys | Instant Camera Pan"
Menu, Tray, Add, %menu_Toggle_CameraHotkeys%, Toggle_CameraHotkeys

;-----------------------------------------
; On program start...

if (b_CameraHotkeys == 1) {
Control_CameraHotkeys(1)
} else {
Control_CameraHotkeys(0)
Menu, Tray, Disable, %menu_Toggle_CameraHotkeys%
}

;-----------------------------------------
; Module

InstantCameraJump(objCommand) {
InstantCameraPan(objCommand) {

if (objCommand.jumpCameraInstantly == 1) {
if (objCommand.instantCameraPan == 1) {
Send % objCommand.logicalKey, 1
}
}
Expand Down
4 changes: 3 additions & 1 deletion Modules/module_CommandMultipleGroups.ahk
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,11 @@ if (b_CommandMultipleGroups == 1) {
Control_CommandMultipleGroups(1)

Global ControlGroups := [ControlGroup0, ControlGroup1, ControlGroup2, ControlGroup3, ControlGroup4, ControlGroup5, ControlGroup6, ControlGroup7, ControlGroup8, ControlGroup9]
} else {
Control_CommandMultipleGroups(0)
Menu, Tray, Disable, %menu_Toggle_CommandMultipleGroups%
}


;-----------------------------------------
; Module Control

Expand Down
11 changes: 7 additions & 4 deletions Modules/module_QuickCastItems.ahk
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@ Menu, Tray, Add, %menu_Toggle_QuickCastItems%, Toggle_QuickCastItems

if (b_QuickCastItems == 1) {
Control_QuickCastItems(1)
} else {
Control_QuickCastItems(0)
Menu, Tray, Disable, %menu_Toggle_QuickCastItems%
}

;-----------------------------------------
Expand Down Expand Up @@ -82,9 +85,10 @@ QuickCast(objItem) {

;-----------------------------------------
; Finally, send a Click or Shift-Click
; I have not found a clever way to differentiate between active and passive Items (i.e. Orb of Fire)
; which means it'll send a left click if we attempt to use a passive item.
; SOLUTION: don't attempt to use passive items it's not complicated guys.
; I have not found a clever way to differentiate between active and passive Items (i.e. Staff of Teleportation vs Orb of Fire)
; which means this module will send a left click as an attempt to active the item.
; if the item is a passive item, what will happen is you'll leftclick something.
; SOLUTION: just don't 'activate' your passive items.

if (GetKeyState("Shift", "P")) {

Expand All @@ -99,7 +103,6 @@ QuickCast(objItem) {

if (b_EventLog)
UpdateEventLog("QuickCast Items: CLICK!")

}
}

Expand Down
18 changes: 15 additions & 3 deletions Modules/module_QuickDropItems.ahk
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
;-----------------------------------------
; ----- QuickDrop Items
;-----------------------------------------
; Ctrl + Alt + 1 2 3 4 5 6 (+ Shift)
; Ctrl + Alt + Item1 / Item2 / Item3 / Item4 / Item5 / Item6
;(+ Shift)
;
; Drop/Pass/Sell an item from your inventory to the target at mouse cursor:
; a. place on the ground
Expand All @@ -24,6 +25,9 @@ Menu, Tray, Add, %menu_Toggle_QuickDropItems%, Toggle_QuickDropItems

if (b_QuickDropItems == 1) {
Control_QuickDropItems(1)
} else {
Control_QuickDropItems(0)
Menu, Tray, Disable, %menu_Toggle_QuickDropItems%
}

;-----------------------------------------
Expand All @@ -32,6 +36,15 @@ if (b_QuickDropItems == 1) {

QuickDrop(objItem) {

if (b_QuickDropItems == 0) {

if (b_EventLog) {
UpdateEventLog("QuickDropItems module is off!")
}

return
}

ItemX := objItem.x
ItemY := objItem.y+4 ; a few pixels below the coordinates specified in UserSettings.ahk

Expand All @@ -44,8 +57,7 @@ QuickDrop(objItem) {
Send {Click %StartX% %StartY%} ; otherwise Mouse Left Click

} else {

;Send {Shift Down}{Click Right}{Shift Up} ; This is an important difference that's necessary to comment out, because otherwise you'll shift-queue the 'follow' order. Meaning, the unit won't get to pass the item ever.
;Send {Shift Down}{Click Right}{Shift Up} ; This is an important difference that's necessary to comment out, because otherwise it'll shift-queue the 'follow' order.
Send {Click %ItemX% %ItemY% Right} ; grab the item on the interface
Send {Shift Down}{Click %StartX% %StartY%}{Shift Up} ; then Shift Mouse Left Click
}
Expand Down
13 changes: 13 additions & 0 deletions Modules/module_RapidFire.ahk
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,26 @@ Menu, Tray, Add, %menu_Toggle_RapidFire%, Toggle_RapidFire

if (b_RapidFire == 1) {
Control_RapidFire(1)
} else {
Control_RapidFire(0)
Menu, Tray, Disable, %menu_Toggle_RapidFire%
}

;-----------------------------------------
; Module Control

RapidFire() {
Send, {Escape}

if (b_EventLog)
UpdateEventLog("Deselect")
}

RapidFire_queue() {
Send, {Shift Down}{Escape}

if (b_EventLog)
UpdateEventLog("Deselect")
}

;-----------------------------------------
Expand Down
4 changes: 3 additions & 1 deletion Modules/module_ShiftQueueItems.ahk
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,10 @@ Menu, Tray, Add, %menu_Toggle_ShiftQueueItems%, Toggle_ShiftQueueItems

if (b_ShiftQueueItems == 1) {
Control_ShiftQueueItems(1)
} else {
Control_ShiftQueueItems(0)
Menu, Tray, Disable, %menu_Toggle_ShiftQueueItems%
}

;-----------------------------------------
; ShiftQueueItems Module
;-----------------------------------------
Expand Down
Loading

0 comments on commit 771c099

Please sign in to comment.