Skip to content

Commit

Permalink
Added Atlas passive tree
Browse files Browse the repository at this point in the history
  • Loading branch information
@JusKillmeQik
JusKillmeQik committed Feb 3, 2022
1 parent f8a3dfc commit a92db16
Show file tree
Hide file tree
Showing 9 changed files with 120 additions and 41 deletions.
2 changes: 1 addition & 1 deletion LevelingGuide.ahk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -485,7 +485,7 @@ ShowAllWindows:
}
}

If (tree_toggle) {
If (tree_toggle or atlas_toggle) {
Gui, Tree:Show, NoActivate
} Else If (level_toggle) {
Gui, Level:Show, NoActivate
Expand Down
1 change: 1 addition & 0 deletions PatchNotes.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

### Archnemesis League

* Added an Atlas Passive Tree (default Alt+a to view)
* Removed Map functionality until the new end game is understood
* Added the 3 new gems
* Updated old gems
Expand Down
Binary file added images/atlas.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions lib/build.ahk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -949,6 +949,7 @@ UpdateElements() {
noteUpdate := ""
npcUpdate := groupList[GroupIndex(%element%group)][2]
imageUpdate := 0
%element%url := ""
} Else {
colorUpdate := %element%color
noteUpdate := %element%note
Expand Down
4 changes: 4 additions & 0 deletions lib/config.ahk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ global KeyHideZones := "!F2"
global KeyCycleZones := "^PgDn"
global KeyHideExp := "!F3"
global KeyHideTree := "!f"
global KeyHideAtlas := "!a"
global KeyHideGems := "!g"

global KeyShowSyndicate := "F6"
Expand All @@ -56,6 +57,7 @@ global skipGemImages := "False"
global KeySettings := "F10"

global tree_toggle := 0
global atlas_toggle := 0

global zone_toggle := 1
global level_toggle := 1
Expand Down Expand Up @@ -139,6 +141,7 @@ IniRead, KeyHideZones, %ININame%, ToggleKey, KeyHideZones, %KeyHideZones%
IniRead, KeyCycleZones, %ININame%, ToggleKey, KeyCycleZones, %KeyCycleZones%
IniRead, KeyHideExp, %ININame%, ToggleKey, KeyHideExp, %KeyHideExp%
IniRead, KeyHideTree, %ININame%, ToggleKey, KeyHideTree, %KeyHideTree%
IniRead, KeyHideAtlas, %ININame%, ToggleKey, KeyHideAtlas, %KeyHideAtlas%
IniRead, KeyHideGems, %ININame%, ToggleKey, KeyHideGems, %KeyHideGems%
IniRead, KeyShowSyndicate, %ININame%, ToggleKey, KeyShowSyndicate, %KeyShowSyndicate%
IniRead, KeyShowTemple, %ININame%, ToggleKey, KeyShowTemple, %KeyShowTemple%
Expand Down Expand Up @@ -266,6 +269,7 @@ WriteAll() {
IniWrite, %KeyCycleZones%, %ININame%, ToggleKey, KeyCycleZones
IniWrite, %KeyHideExp%, %ININame%, ToggleKey, KeyHideExp
IniWrite, %KeyHideTree%, %ININame%, ToggleKey, KeyHideTree
IniWrite, %KeyHideAtlas%, %ININame%, ToggleKey, KeyHideAtlas
IniWrite, %KeyHideGems%, %ININame%, ToggleKey, KeyHideGems
IniWrite, %KeyShowSyndicate%, %ININame%, ToggleKey, KeyShowSyndicate
IniWrite, %KeyShowTemple%, %ININame%, ToggleKey, KeyShowTemple
Expand Down
48 changes: 48 additions & 0 deletions lib/draw.ahk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,55 @@
}
}

DrawAtlas() {
global

image_file := "" A_ScriptDir "\images\atlas.png" ""

If (FileExist(image_file))
{
GDIPToken := Gdip_Startup()

pBM := Gdip_CreateBitmapFromFile( image_file )
original_treeW:= Gdip_GetImageWidth( pBM )
original_treeH:= Gdip_GetImageHeight( pBM )

Gdip_DisposeImage( pBM )
Gdip_Shutdown( GDIPToken )

;Only build the tree if the file is a valid size picture
If (original_treeW and original_treeH)
{
If (original_treeW > original_treeH) {
treeW := Round( A_ScreenWidth / 2 )
treeRatio := treeW / original_treeW
treeH := original_treeH * treeRatio
If (treeH > Round( A_ScreenHeight * 4 / 5 )){
treeH := Round( A_ScreenHeight * 4 / 5 )
treeRatio := treeH / original_treeH
treeW := original_treeW * treeRatio
}
} else {
treeH := Round( A_ScreenHeight * 4 / 5 )
treeRatio := treeH / original_treeH
treeW := original_treeW * treeRatio
}

If (treeSide = "Right") {
xTree := A_ScreenWidth - treeW
} else {
xTree := 0
}
yTree := A_ScreenHeight - treeH

Gui, Tree:+E0x20 +E0x80 -Caption +ToolWindow +LastFound +AlwaysOnTop -Resize -DPIScale +hwndTreeWindow
Gui, Tree:Add, Picture, x0 y0 w%treeW% h%treeH%, %image_file%

Gui, Tree:Show, x%xTree% y%yTree% w%treeW% h%treeH% NA, Gui Tree
WinSet, Transparent, 240, ahk_id %TreeWindow%
}
}
}

DrawTree() {
global
Expand Down
2 changes: 1 addition & 1 deletion lib/gems.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -480,7 +480,7 @@
"level": 28,
"required_lvl": 28,
"name": "Armageddon Brand",
"Witch": "Siosa",
"Witch": "Clarissa",
"Shadow": "Siosa",
"Ranger": "Siosa",
"Duelist": "Siosa",
Expand Down
23 changes: 23 additions & 0 deletions lib/hotkeys.ahk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,11 +99,34 @@ ToggleTree() {
DrawTree()
Gui, Tree:Show, NA
tree_toggle := 1
atlas_toggle := 0
}
else
{
Gui, Tree:Cancel
tree_toggle := 0
atlas_toggle := 0
}
Send %KeyHideTree%
}

If (KeyHideAtlas != "") {
Hotkey % KeyHideAtlas, ToggleAtlas
}

ToggleAtlas() {
if (atlas_toggle = 0)
{
DrawAtlas()
Gui, Tree:Show, NA
atlas_toggle := 1
tree_toggle := 0
}
else
{
Gui, Tree:Cancel
atlas_toggle := 0
tree_toggle := 0
}
Send %KeyHideTree%
}
Expand Down
80 changes: 41 additions & 39 deletions lib/settings.ahk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,24 +71,25 @@ LaunchSettings() {
Gui, Settings:Add, Text, w%nameWidth% h%optionHeight% y+5, Hide Zone Images ;Static22
Gui, Settings:Add, Text, w%nameWidth% h%optionHeight% y+5, Hide Level Tracker ;Static23
Gui, Settings:Add, Text, w%nameWidth% h%optionHeight% y+5, Show Skill Tree ;Static24
Gui, Settings:Add, Text, w%nameWidth% h%optionHeight% y+5, Hide Gem Setup ;Static25
Gui, Settings:Add, Text, w%nameWidth% h%optionHeight% y+5, Show Betrayal Help ;Static26
Gui, Settings:Add, Text, w%nameWidth% h%optionHeight% y+5, Show Incursion Help ;Static27
Gui, Settings:Add, Text, w%nameWidth% h%optionHeight% y+5, Show Heist Help ;Static28
Gui, Settings:Add, Text, w%nameWidth% h%optionHeight% y+5, Manually Cycle Zone ;Static29
Gui, Settings:Add, Text, w%nameWidth% h%optionHeight% y+5, Show Atlas Tree ;Static25
Gui, Settings:Add, Text, w%nameWidth% h%optionHeight% y+5, Hide Gem Setup ;Static26
Gui, Settings:Add, Text, w%nameWidth% h%optionHeight% y+5, Show Betrayal Help ;Static27
Gui, Settings:Add, Text, w%nameWidth% h%optionHeight% y+5, Show Incursion Help ;Static28
Gui, Settings:Add, Text, w%nameWidth% h%optionHeight% y+5, Show Heist Help ;Static29
Gui, Settings:Add, Text, w%nameWidth% h%optionHeight% y+5, Manually Cycle Zone ;Static30

;Third Column Offset
Gui, Settings:Add, Text, w%offsetWidth% h%optionHeight% x230 y320, Offsets ;Static30
Gui, Settings:Add, Text, w%offsetWidth% h%optionHeight% x230 y320, Offsets ;Static31

Gui, Settings:Add, Text, w%offsetWidth% h%optionHeight% x230 y350, Notes X ;Static31
Gui, Settings:Add, Text, w%offsetWidth% h%optionHeight% y+5, Pics X ;Static32
Gui, Settings:Add, Text, w%offsetWidth% h%optionHeight% y+5, Level X ;Static33
Gui, Settings:Add, Text, w%offsetWidth% h%optionHeight% y+5, Gems X ;Static34
Gui, Settings:Add, Text, w%offsetWidth% h%optionHeight% x230 y350, Notes X ;Static32
Gui, Settings:Add, Text, w%offsetWidth% h%optionHeight% y+5, Pics X ;Static33
Gui, Settings:Add, Text, w%offsetWidth% h%optionHeight% y+5, Level X ;Static34
Gui, Settings:Add, Text, w%offsetWidth% h%optionHeight% y+5, Gems X ;Static35

Gui, Settings:Add, Text, w%offsetWidth% h%optionHeight% x345 y350, Notes Y ;Static35
Gui, Settings:Add, Text, w%offsetWidth% h%optionHeight% y+5, Pics Y ;Static36
Gui, Settings:Add, Text, w%offsetWidth% h%optionHeight% y+5, Level Y ;Static37
Gui, Settings:Add, Text, w%offsetWidth% h%optionHeight% y+5, Gems Y ;Static38
Gui, Settings:Add, Text, w%offsetWidth% h%optionHeight% x345 y350, Notes Y ;Static36
Gui, Settings:Add, Text, w%offsetWidth% h%optionHeight% y+5, Pics Y ;Static37
Gui, Settings:Add, Text, w%offsetWidth% h%optionHeight% y+5, Level Y ;Static38
Gui, Settings:Add, Text, w%offsetWidth% h%optionHeight% y+5, Gems Y ;Static39


;Fourth Column Hotkey Key
Expand All @@ -97,6 +98,7 @@ LaunchSettings() {
Gui, Settings:Add, Hotkey, vKeyHideZones w%nameWidth% h%optionHeight% y+5, %KeyHideZones%
Gui, Settings:Add, Hotkey, vKeyHideExp w%nameWidth% h%optionHeight% y+5, %KeyHideExp%
Gui, Settings:Add, Hotkey, vKeyHideTree w%nameWidth% h%optionHeight% y+5, %KeyHideTree%
Gui, Settings:Add, Hotkey, vKeyHideAtlas w%nameWidth% h%optionHeight% y+5, %KeyHideAtlas%
Gui, Settings:Add, Hotkey, vKeyHideGems w%nameWidth% h%optionHeight% y+5, %KeyHideGems%
Gui, Settings:Add, Hotkey, vKeyShowSyndicate w%nameWidth% h%optionHeight% y+5, %KeyShowSyndicate%
Gui, Settings:Add, Hotkey, vKeyShowTemple w%nameWidth% h%optionHeight% y+5, %KeyShowTemple%
Expand All @@ -116,13 +118,13 @@ LaunchSettings() {


;Build
Gui, Settings:Add, Text, w80 h%optionHeight% x490 y10, Build ;Static39
Gui, Settings:Add, Text, w80 h%optionHeight% x490 y10, Build ;Static40

;Fifth Column Build Options
Gui, Settings:Add, Text, w%optionWidth% h%optionHeight% x490 y40, Build Editor ;Static40
Gui, Settings:Add, Text, w%optionWidth% h%optionHeight% y+5, Build Folder ;Static41
Gui, Settings:Add, Text, w%optionWidth% h%optionHeight% y+5, Notes Folder ;Static42
Gui, Settings:Add, Text, w%optionWidth% h%optionHeight% y+5, New Build ;Static43
Gui, Settings:Add, Text, w%optionWidth% h%optionHeight% x490 y40, Build Editor ;Static41
Gui, Settings:Add, Text, w%optionWidth% h%optionHeight% y+5, Build Folder ;Static42
Gui, Settings:Add, Text, w%optionWidth% h%optionHeight% y+5, Notes Folder ;Static43
Gui, Settings:Add, Text, w%optionWidth% h%optionHeight% y+5, New Build ;Static44

;Sixth Column Build Edits
Gui, Settings:Add, Button, gEditBuild w%nameWidth% h%optionHeight% x+5 y36, &Edit Build
Expand All @@ -136,17 +138,17 @@ LaunchSettings() {


;Colors
Gui, Settings:Add, Text, w80 h%optionHeight% x490 y161, Colors ;Static44
Gui, Settings:Add, Text, w80 h%optionHeight% x490 y161, Colors ;Static45

Gui, Settings:Add, Text, w%optionWidth% h%optionHeight% y+9, Background ;Static45
Gui, Settings:Add, Text, w%optionWidth% h%optionHeight% y+5, Red < ;Static46
Gui, Settings:Add, Text, w%optionWidth% h%optionHeight% y+5, Green + ;Static47
Gui, Settings:Add, Text, w%optionWidth% h%optionHeight% y+5, Blue > ;Static48
Gui, Settings:Add, Text, w%optionWidth% h%optionHeight% y+5, Yellow - ;Static49
Gui, Settings:Add, Text, w%optionWidth% h%optionHeight% y+5, White ;Static50
Gui, Settings:Add, Text, w%optionWidth% h%optionHeight% y+9, Background ;Static46
Gui, Settings:Add, Text, w%optionWidth% h%optionHeight% y+5, Red < ;Static47
Gui, Settings:Add, Text, w%optionWidth% h%optionHeight% y+5, Green + ;Static48
Gui, Settings:Add, Text, w%optionWidth% h%optionHeight% y+5, Blue > ;Static49
Gui, Settings:Add, Text, w%optionWidth% h%optionHeight% y+5, Yellow - ;Static50
Gui, Settings:Add, Text, w%optionWidth% h%optionHeight% y+5, White ;Static51

Gui, Settings:Add, Text, w%nameWidth% h%optionHeight% y+25, Tree Side ;Static51
Gui, Settings:Add, Text, w%nameWidth% h%optionHeight% y+5, Tree File Name ;Static52
Gui, Settings:Add, Text, w%nameWidth% h%optionHeight% y+25, Tree Side ;Static52
Gui, Settings:Add, Text, w%nameWidth% h%optionHeight% y+5, Tree File Name ;Static53

Gui, Settings:Add, Edit, vbackgroundColor w%nameWidth% h%optionHeight% x565 y186, %backgroundColor%
Gui, Settings:Add, Edit, vredColor w%nameWidth% h%optionHeight% y+5, %redColor%
Expand Down Expand Up @@ -388,7 +390,7 @@ ToolTip() {
If (toolTime > toolTimeout) {
ToolTip, This is the multiplier for the full resolution of `nthe zone layout images. A good default value is .5
}
} Else If (control = "static31") { ;Notes X Offset
} Else If (control = "static32") { ;Notes X Offset
If (oldControl = control){
toolTime .= 1
} Else {
Expand All @@ -399,7 +401,7 @@ ToolTip() {
If (toolTime > toolTimeout) {
ToolTip, How much space to leave on the right side of the screen for the overlay. `n1 = All the way to right (covers the map/info). `nThis is a good setting if you're going to hide the notes anyway. `n.855 = As far right as you can go without covering the Mini-Map. `nGreat setting if you don't use the overlay map. `n.78 = Default setting and as far right as you can go without covering anything.
}
} Else If (control = "static35") { ;Notes Y Offset
} Else If (control = "static36") { ;Notes Y Offset
If (oldControl = control){
toolTime .= 1
} Else {
Expand All @@ -410,7 +412,7 @@ ToolTip() {
If (toolTime > toolTimeout) {
ToolTip, How far down to place the overlay. `n0 = At the top of the screen (Default). `n1 = At the top of a second monitor below your primary. `n-1 = at the top of a second monitor above your primary. `n You can adjust this to place the overlay anywhere you would like on your screen.
}
} Else If (control = "static33") { ;Level X Offset
} Else If (control = "static34") { ;Level X Offset
If (oldControl = control){
toolTime .= 1
} Else {
Expand All @@ -421,7 +423,7 @@ ToolTip() {
If (toolTime > toolTimeout) {
ToolTip, How far to the right of the screen to put the Experience tracker. `n.287 = As far to the left as you can go without covering the flasks. `n.589 = As far to the right as you can go without covering the skill bar on my resolution and font size. `nThis is the default and a great option for 1080 screen resolutions and size 9 Consolas. `nExperiment with other numbers if you want to move the Experience tracker around.
}
} Else If (control = "static37") { ;Level Y Offset
} Else If (control = "static38") { ;Level Y Offset
If (oldControl = control){
toolTime .= 1
} Else {
Expand All @@ -432,7 +434,7 @@ ToolTip() {
If (toolTime > toolTimeout) {
ToolTip, How far down the screen to put the Experience tracker. `n.955 = As low as you can go without covering the experience bar on my resolution and font size. `nThis is the default and a great option for 1080 screen resolutions and size 9 Consolas. `nExperiment with other numbers if you want to move the Experience tracker around.
}
} Else If (control = "static34") { ;Gems X Offset
} Else If (control = "static35") { ;Gems X Offset
If (oldControl = control){
toolTime .= 1
} Else {
Expand All @@ -443,7 +445,7 @@ ToolTip() {
If (toolTime > toolTimeout) {
ToolTip, How far to the right to put the Gem Setup. `n.005 = Is the default and places the setup on the left side of the primary screen. `n1.005 = This should put the setup on the left side of a secondary monitor that is to the right of the primary. `n-.995 = This should put the setup on the left side of a secondary monitor that is to the left of the primary. `n None of this has been tested so please experiement with good values and let me know what to put here.
}
} Else If (control = "static38") { ;Gems Y Offset
} Else If (control = "static39") { ;Gems Y Offset
If (oldControl = control){
toolTime .= 1
} Else {
Expand All @@ -454,7 +456,7 @@ ToolTip() {
If (toolTime > toolTimeout) {
ToolTip, How far down you want the Gem Setup. `n0 = All the way at top of the screen. `nIt will cover your buffs and debuffs. `n.180 = Just below your buffs and debuffs. `nThis is the default and a great option for normal screen resolutions.
}
} Else If (control = "static32") { ;Pics X Offset
} Else If (control = "static33") { ;Pics X Offset
If (oldControl = control){
toolTime .= 1
} Else {
Expand All @@ -465,7 +467,7 @@ ToolTip() {
If (toolTime > toolTimeout) {
ToolTip, How far to the right to put the Layout Images. `n0 = Is the default and will lock the images to the Note's position. `nAny other value will freely move the images on the screen. `nThe positioning is based on the top right of the images so the offset `nprobably needs to be over .5 to be useful.
}
} Else If (control = "static36") { ;Pics Y Offset
} Else If (control = "static37") { ;Pics Y Offset
If (oldControl = control){
toolTime .= 1
} Else {
Expand All @@ -476,7 +478,7 @@ ToolTip() {
If (toolTime > toolTimeout) {
ToolTip, How far down you want the Layout Images. `n0 = All the way at top of the screen. `nIt will cover your buffs and debuffs. `n.180 = Just below your buffs and debuffs. `nThis value is only used if the X offset is not 0 and bound to the Notes.
}
} Else If (control = "static44") { ;Colors
} Else If (control = "static45") { ;Colors
If (oldControl = control){
toolTime .= 1
} Else {
Expand All @@ -487,7 +489,7 @@ ToolTip() {
If (toolTime > toolTimeout) {
ToolTip, For the colors you can put names such as "red" or "blue" or "green". `nHex values can also be used like "FF4040" or "2ECC40" or "0080FF".
}
} Else If (control = "static51") { ;Tree Side
} Else If (control = "static52") { ;Tree Side
If (oldControl = control){
toolTime .= 1
} Else {
Expand All @@ -498,7 +500,7 @@ ToolTip() {
If (toolTime > toolTimeout) {
ToolTip, Do you want the Skill Tree to cover your Life "Left" or Inventory "Right" when shown.
}
} Else If (control = "static52") { ;Tree Name
} Else If (control = "static53") { ;Tree Name
If (oldControl = control){
toolTime .= 1
} Else {
Expand Down

0 comments on commit a92db16

Please sign in to comment.