Skip to content

Commit f4446cb

Browse files
Noobyguy775Noobyguy775
authored
Moved AutoClicker to Misc tab (NatroTeam#15)
* Moved autoclicker to Misc tab - gives room for another graphic design by memorylesss or just extra settings room - fixed groupboxes to be the same as other tabs Key delay can be moved to another tab as needed * Minor adjustments - separated AutoClicker GroupBox and added dynamic Hotkey label - moved Input and Reconnect settings up - moved nm_autoclickerbutton() function next to the other GUI functions - gave Start button its own function so the general F4 label doesn't change window focus by minimising GUI - adjusted positions of clicker GUI and added UpDown to Click Interval
1 parent ebf6289 commit f4446cb

File tree

1 file changed

+66
-38
lines changed

1 file changed

+66
-38
lines changed

‎natro_macro.ahk‎

Lines changed: 66 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -2002,6 +2002,7 @@ Gui, Font, w700
20022002
Gui, Add, GroupBox, x5 y24 w160 h144, Hive Tools
20032003
Gui, Add, GroupBox, x5 y168 w160 h62, Other Tools
20042004
Gui, Add, GroupBox, x170 y24 w160 h144, Calculators
2005+
Gui, Add, GroupBox, x170 y168 w160 h62 vAutoClickerButton, AutoClicker (%AutoClickerHotkey%)
20052006
Gui, Add, GroupBox, x335 y24 w160 h84, Macro Tools
20062007
Gui, Add, GroupBox, x335 y108 w160 h60, Discord Tools
20072008
Gui, Add, GroupBox, x335 y168 w160 h62, Reporting
@@ -2016,6 +2017,8 @@ Gui, Add, Button, x10 y184 w150 h42 gnm_GenerateBeeList, Export Hive Bee List`n(
20162017
Gui, Add, Button, x175 y40 w150 h40 gnm_TicketShopCalculatorButton, Ticket Shop Calculator`n(Google Sheets)
20172018
Gui, Add, Button, x175 y82 w150 h40 gnm_SSACalculatorButton, SSA Calculator`n(Google Sheets)
20182019
Gui, Add, Button, x175 y124 w150 h40 gnm_BondCalculatorButton, Bond Calculator`n(Google Sheets)
2020+
;autoclicker
2021+
Gui, Add, Button, x175 y184 w150 h42 gnm_autoclickerbutton, AutoClicker`nSettings
20192022
;macro tools
20202023
Gui, Add, Button, x340 y40 w150 h20 gnm_HotkeyGUI, Change Hotkeys
20212024
Gui, Add, Button, x340 y62 w150 h20 gnm_DebugLogGUI, Debug Log Options
@@ -2053,7 +2056,9 @@ PostMessage, 0x5555, 35, 0, , ahk_pid %lp_PID%
20532056
;------------------------
20542057
Gui, Tab, Settings
20552058
;gui settings
2056-
Gui, Add, GroupBox, x5 y25 w160 h65, GUI SETTINGS
2059+
Gui, Font, w700
2060+
Gui, Add, GroupBox, x5 y25 w160 h65, Gui
2061+
Gui, Font, s8 cDefault Norm, Tahoma
20572062
Gui, Add, Checkbox, x10 y73 vAlwaysOnTop gnm_AlwaysOnTop Checked%AlwaysOnTop%, Always On Top
20582063
Gui, Add, Text, x10 y40 w70 +left +BackgroundTrans,GUI Theme:
20592064
nm_importStyles()
@@ -2062,7 +2067,9 @@ Gui, Add, Text, x10 y57 w100 +left +BackgroundTrans,GUI Transparency:
20622067
Gui, Add, DropDownList, x105 y55 w52 h100 vGuiTransparency gnm_guiTransparencySet Disabled, % LTrim(StrReplace("|0|5|10|15|20|25|30|35|40|45|50|55|60|65|70|", "|" GuiTransparency "|", "|" GuiTransparency "||"), "|")
20632068

20642069
;hive settings
2065-
Gui, Add, GroupBox, x5 y95 w160 h65, HIVE SETTINGS
2070+
Gui, Font, w700
2071+
Gui, Add, GroupBox, x5 y95 w160 h65, Hive
2072+
Gui, Font, s8 cDefault Norm, Tahoma
20662073
Gui, Add, Text, x10 y110 w60 +left +BackgroundTrans,Hive Slot:
20672074
Gui, Font, s6
20682075
Gui, Add, Text, x61 y112 w60 +left +BackgroundTrans,(6-5-4-3-2-1)
@@ -2077,54 +2084,52 @@ Gui, Add, Edit, x33 y141 w18 h16 Limit2 number +BackgroundTrans vConvertDelay gn
20772084
Gui, Add, Text, x54 y142 w110 +left +BackgroundTrans,seconds after convert
20782085

20792086
;reset settings
2080-
Gui, Add, GroupBox, x5 y165 w160 h70, RESET SETTINGS
2087+
Gui, Font, w700
2088+
Gui, Add, GroupBox, x5 y165 w160 h70, Reset
2089+
Gui, Font, s8 cDefault Norm, Tahoma
20812090
Gui, Add, Button, x20 y183 w130 h22 gnm_ResetFieldDefaultGUI, Reset Field Defaults
20822091
Gui, Add, Button, x20 y207 w130 h22 gnm_ResetConfig, Reset All Settings
20832092

20842093
;input settings
2085-
Gui, Add, GroupBox, x170 y25 w160 h93, INPUT SETTINGS
2086-
Gui, Add, Text, x180 y40 w100 +left +BackgroundTrans,Add Key Delay (ms):
2087-
Gui, Add, Edit, x280 y38 w47 h18 limit4 number vKeyDelayEdit gnm_saveKeyDelay
2088-
Gui, Add, UpDown, Range0-9999 vKeyDelay gnm_saveKeyDelay Disabled, % KeyDelay
2089-
Gui, Font, Underline
2090-
Gui, Add, Text, x182 y58 w85 -Wrap c0x0046ee vAutoClickerButton, AutoClicker (%AutoClickerHotkey%)
2094+
Gui, Font, w700
2095+
Gui, Add, GroupBox, x170 y25 w160 h35, Input
20912096
Gui, Font, s8 cDefault Norm, Tahoma
2092-
Gui, Add, Checkbox, x267 y59 +BackgroundTrans vClickMode gnm_saveAutoClicker Checked%ClickMode%, Infinite
2093-
Gui, Add, Text, x182 y77, Repeat
2094-
Gui, Add, Edit, % "x221 y75 w64 h18 vClickCountEdit +BackgroundTrans gnm_saveAutoClicker Number Disabled" ClickMode
2095-
Gui, Add, UpDown, % "vClickCount gnm_saveAutoClicker Range0-99999 Disabled" ClickMode, %ClickCount%
2096-
Gui, Add, Text, x290 y77, times
2097-
Gui, Add, Text, x182 y96, Click Interval (ms):
2098-
Gui, Add, Edit, x277 y94 w40 h18 +BackgroundTrans Number vClickDelay gnm_saveAutoClicker, %ClickDelay%
2097+
Gui, Add, Text, x176 y40 w100 +left +BackgroundTrans,Add Key Delay (ms):
2098+
Gui, Add, Edit, x276 y38 w47 h18 limit4 number vKeyDelayEdit gnm_saveKeyDelay
2099+
Gui, Add, UpDown, Range0-9999 vKeyDelay gnm_saveKeyDelay Disabled, % KeyDelay
20992100

21002101
;reconnect settings
2101-
Gui, Add, GroupBox, x170 y123 w160 h112, RECONNECT SETTINGS
2102-
Gui, Add, Text, x180 y140 w80 +Left +BackgroundTrans,Server Link:
2103-
Gui, Add, Edit, x240 y139 w82 h16 +BackgroundTrans vPrivServer gnm_ServerLink Disabled, %PrivServer%
2104-
Gui, Add, Text, x180 y159 +BackgroundTrans, Reconnect every
2105-
Gui, Add, Edit, x265 y158 w18 h16 Number Limit2 vReconnectInterval gnm_setReconnectInterval, %ReconnectInterval%
2106-
Gui, Add, Text, x287 y159 +BackgroundTrans, hours
2107-
Gui, Add, Text, x196 y177 +BackgroundTrans, starting at
2108-
Gui, Add, Edit, x250 y176 w18 h16 Number Limit2 vReconnectHour gnm_setReconnectHour, %ReconnectHour%
2102+
Gui, Font, w700
2103+
Gui, Add, GroupBox, x170 y65 w160 h112, Reconnect
2104+
Gui, Font, s8 cDefault Norm, Tahoma
2105+
Gui, Add, Text, x180 y82 w80 +Left +BackgroundTrans,Server Link:
2106+
Gui, Add, Edit, x240 y81 w82 h16 +BackgroundTrans vPrivServer gnm_ServerLink Disabled, %PrivServer%
2107+
Gui, Add, Text, x180 y101 +BackgroundTrans, Reconnect every
2108+
Gui, Add, Edit, x265 y100 w18 h16 Number Limit2 vReconnectInterval gnm_setReconnectInterval, %ReconnectInterval%
2109+
Gui, Add, Text, x287 y101 +BackgroundTrans, hours
2110+
Gui, Add, Text, x196 y119 +BackgroundTrans, starting at
2111+
Gui, Add, Edit, x250 y118 w18 h16 Number Limit2 vReconnectHour gnm_setReconnectHour, %ReconnectHour%
21092112
Gui, font, w1000 s11
2110-
Gui, Add, Text, x269 y173 +BackgroundTrans, :
2113+
Gui, Add, Text, x269 y115 +BackgroundTrans, :
21112114
Gui, Font, s8 cDefault Norm, Tahoma
2112-
Gui, Add, Edit, x275 y176 w18 h16 Number Limit2 vReconnectMin gnm_setReconnectMin, %ReconnectMin%
2115+
Gui, Add, Edit, x275 y118 w18 h16 Number Limit2 vReconnectMin gnm_setReconnectMin, %ReconnectMin%
21132116
Gui, font, s6 w700
2114-
Gui, Add, Text, x295 y179 +BackgroundTrans, UTC
2117+
Gui, Add, Text, x295 y121 +BackgroundTrans, UTC
21152118
Gui, Font, s8 cDefault Norm, Tahoma
2116-
Gui, Add, Button, x315 y176 w10 h15 gnm_ReconnectTimeHelp, ?
2117-
Gui, Add, CheckBox, x180 y195 w88 h15 vReconnectMessage gnm_saveConfig +BackgroundTrans Checked%ReconnectMessage%, Natro so broke
2119+
Gui, Add, Button, x315 y118 w10 h15 gnm_ReconnectTimeHelp, ?
2120+
Gui, Add, CheckBox, x180 y137 w88 h15 vReconnectMessage gnm_saveConfig +BackgroundTrans Checked%ReconnectMessage%, Natro so broke
21182121
hBM := Gdip_CreateHBITMAPFromBitmap(bitmaps["weary"])
2119-
Gui, Add, Picture, +BackgroundTrans x269 y193 w20 h20, HBITMAP:*%hBM%
2122+
Gui, Add, Picture, +BackgroundTrans x269 y135 w20 h20, HBITMAP:*%hBM%
21202123
DllCall("DeleteObject", "ptr", hBM)
21212124
Gdip_DisposeImage(bitmaps["weary"])
2122-
Gui, Add, Button, x315 y194 w10 h15 gnm_NatroSoBrokeHelp, ?
2123-
Gui, Add, CheckBox, x180 y212 w132 h15 vPublicFallback gnm_saveConfig +BackgroundTrans Checked%PublicFallback%, Fallback to Public Server
2124-
Gui, Add, Button, x315 y212 w10 h15 gnm_PublicFallbackHelp, ?
2125+
Gui, Add, Button, x315 y136 w10 h15 gnm_NatroSoBrokeHelp, ?
2126+
Gui, Add, CheckBox, x180 y154 w132 h15 vPublicFallback gnm_saveConfig +BackgroundTrans Checked%PublicFallback%, Fallback to Public Server
2127+
Gui, Add, Button, x315 y154 w10 h15 gnm_PublicFallbackHelp, ?
21252128

21262129
;character settings
2127-
Gui, Add, GroupBox, x335 y25 w160 h210, CHARACTER SETTINGS
2130+
Gui, Font, w700
2131+
Gui, Add, GroupBox, x335 y25 w160 h210, Character
2132+
Gui, Font, s8 cDefault Norm, Tahoma
21282133
Gui, Add, Text, x345 y40 w110 +left +BackgroundTrans,Movement Speed:
21292134
Gui, Font, s6
21302135
Gui, Add, Text, x345 y55 w80 +right +BackgroundTrans,(WITHOUT HASTE)
@@ -7411,17 +7416,41 @@ nm_CollectKillButton(hCtrl){
74117416
}
74127417
}
74137418
}
7419+
nm_autoclickerbutton()
7420+
{
7421+
global
7422+
Gui, clicker:Destroy
7423+
Gui, clicker:+AlwaysOnTop +Border
7424+
Gui, clicker:Font, s8 cDefault w700, Tahoma
7425+
Gui, clicker:Add, Groupbox, x5 y2 w161 h60, Settings
7426+
Gui, clicker:Font, Norm
7427+
Gui, clicker:Add, Checkbox, x76 y2 +BackgroundTrans vClickMode gnm_saveAutoClicker Checked%ClickMode%, Infinite
7428+
Gui, clicker:Add, Text, x13 y21, Repeat
7429+
Gui, clicker:Add, Edit, % "x50 y19 w80 h18 vClickCountEdit +BackgroundTrans gnm_saveAutoClicker Number Limit7 Disabled" ClickMode
7430+
Gui, clicker:Add, UpDown, % "vClickCount gnm_saveAutoClicker Range0-9999999 Disabled" ClickMode, %ClickCount%
7431+
Gui, clicker:Add, Text, x133 y21, times
7432+
Gui, clicker:Add, Text, x10 y41, Click Interval (ms):
7433+
Gui, clicker:Add, Edit, x100 y39 w61 h18 +BackgroundTrans Number gnm_saveAutoClicker Limit5, %ClickDelay%
7434+
Gui, clicker:Add, UpDown, vClickDelay gnm_saveAutoClicker Range0-99999, %ClickDelay%
7435+
Gui, clicker:Add, Button, x45 y68 w80 h20 gnm_StartAutoClicker, Start (%AutoClickerHotkey%)
7436+
Gui, clicker:Show, w170, AutoClicker
7437+
}
74147438
nm_saveAutoClicker(){
74157439
global
7416-
GuiControlGet, ClickDelay
7417-
GuiControlGet, ClickCount
7418-
GuiControlGet, ClickMode
7440+
GuiControlGet, ClickDelay, clicker:
7441+
GuiControlGet, ClickCount, clicker:
7442+
GuiControlGet, ClickMode, clicker:
74197443
IniWrite, %ClickDelay%, settings\nm_config.ini, Settings, ClickDelay
74207444
IniWrite, %ClickCount%, settings\nm_config.ini, Settings, ClickCount
74217445
IniWrite, %ClickMode%, settings\nm_config.ini, Settings, ClickMode
74227446
GuiControl, % (ClickMode ? "Disable" : "Enable"), ClickCount
74237447
GuiControl, % (ClickMode ? "Disable" : "Enable"), ClickCountEdit
74247448
}
7449+
nm_StartAutoClicker(){
7450+
Gui, clicker:Destroy
7451+
Gui, Minimize
7452+
autoclicker()
7453+
}
74257454
nm_saveKeyDelay(){
74267455
global
74277456
GuiControlGet, KeyDelay
@@ -19947,7 +19976,6 @@ autoclicker(){
1994719976
sleep %ClickDelay%
1994819977
}
1994919978
}
19950-
toggle := 0
1995119979
return
1995219980
;TIMERS
1995319981
timers:

0 commit comments

Comments
 (0)