Skip to content

Commit 92c257d

Browse files
committed
Uploaded v0.9.6
1 parent 4e5c009 commit 92c257d

33 files changed

+1809
-2177
lines changed
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
on:
2+
release:
3+
types: [published]
4+
5+
jobs:
6+
release-to-discord:
7+
runs-on: ubuntu-latest
8+
steps:
9+
- name: send-discord-webhook
10+
id: discord
11+
uses: NatroTeam/discord-release-action@v1.0
12+
with:
13+
webhook_url: ${{secrets.WEBHOOK_URL}}

‎NATRO_MACRO.exe‎

893 KB
Binary file not shown.

‎Natro Macro Patch Notes.txt‎

Lines changed: 0 additions & 763 deletions
This file was deleted.

‎README.md‎

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
<!--
2+
Thanks for downloading Natro Macro!
3+
4+
To run the macro, just extract the folder and open 'NATRO_MACRO.exe'!
5+
6+
If you need help or just want to discuss, join our Discord at .gg/natromacro!
7+
8+
IMPORTANT: Make sure you are only downloading from an official source!
9+
The only official sources are our GitHub page (https://github.com/NatroTeam/NatroMacro)
10+
and our Discord server (https://discord.gg/natromacro)
11+
12+
>>> IGNORE BELOW THIS LINE <<<
13+
-->
14+
15+
<div align="center">
16+
17+
<!-- logo banner -->
18+
<picture>
19+
<source width="200px" media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/NatroTeam/.github/main/profile/assets/banners/natro-logo-dark.svg"> <!-- dark theme (white text) -->
20+
<img src="https://raw.githubusercontent.com/NatroTeam/.github/main/profile/assets/banners/natro-logo-light.svg"> <!-- light theme (black text) -->
21+
</picture>
22+
<br>
23+
24+
<!-- shields -->
25+
[![][github-release-shield]][github-release-link]
26+
[![][discord-shield]][discord-link]
27+
[![][roblox-shield]][roblox-link]
28+
<br>
29+
An open-source Bee Swarm Simulator macro written in AutoHotkey!
30+
31+
</div>
32+
33+
34+
## ⚙️ Installation
35+
36+
1. Download the latest version from [here][latest-release-link]
37+
2. Right click Natro_Macro_vX.X.X.zip and click 'Extract All...'
38+
3. Open the extracted folder and run 'NATRO_MACRO.exe'
39+
40+
41+
## 🫂 Community
42+
43+
__Join our official [Discord server][discord-link]!__ This is where you can connect with the community, get immediate pings for macro updates, and download custom patterns, paths, and themes.
44+
45+
If Natro Macro helped you, let us know by giving it a ⭐ $\color{yellow}{\textsf{Star}}$ on GitHub!
46+
47+
<a href="https://github.com/NatroTeam/NatroMacro/stargazers">
48+
<picture>
49+
<source media="(prefers-color-scheme: dark)" srcset="https://reporoster.com/stars/dark/NatroTeam/NatroMacro"> <!-- dark theme -->
50+
<img src="https://reporoster.com/stars/NatroTeam/NatroMacro"> <!-- light theme -->
51+
</picture>
52+
</a>
53+
54+
55+
## ⌨️ Contributing
56+
57+
Natro Macro is an open-source project. We greatly appreciate all contributions, whether you are helping us fix bugs or suggesting new features. If you want to get started, give our [Contributing Guidelines][contributing-link] a read.
58+
59+
- Bugs: If you find an issue or run into an error message while using the macro, please create a [bug report][bug-report-link].
60+
- Suggestions: If you have an idea for a feature that you'd like to see in the macro, please submit a [suggestion][suggestion-link].
61+
62+
For discussion, please join us on our [Discord server][discord-link] instead.
63+
64+
65+
<details><summary><h4>📝 License</h4></summary>
66+
67+
Copyright © 2022-2023 [Natro Team][github-profile-link]<br>
68+
This project is licensed under [GNU GPL v3.0](./LICENSE.md)
69+
70+
</details>
71+
72+
<!-- links -->
73+
[github-release-shield]: https://img.shields.io/github/v/release/NatroTeam/NatroMacro?style=flat-square&logo=github&logoColor=white&labelColor=black&color=2674DA
74+
[github-release-link]: https://github.com/NatroTeam/NatroMacro/releases
75+
[roblox-shield]: https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fgroups.roblox.com%2Fv1%2Fgroups%2F16490149&query=%24.memberCount&suffix=%20members&style=flat-square&logo=roblox&logoColor=white&label=roblox&labelColor=black&color=EC2F2D
76+
[roblox-link]: https://www.roblox.com/groups/16490149/Natro-Macro
77+
[discord-shield]: https://img.shields.io/discord/1012610056921038868?style=flat-square&logo=discord&logoColor=white&label=discord&labelColor=black&color=5865F2
78+
[discord-link]: https://discord.gg/natromacro
79+
[latest-release-link]: https://github.com/NatroTeam/NatroMacro/releases/latest
80+
[contributing-link]: https://github.com/NatroTeam/.github/blob/main/CONTRIBUTING.md
81+
[bug-report-link]: https://github.com/NatroTeam/NatroMacro/issues/new?assignees=&labels=bug%2Cneeds+triage&projects=&template=bug.yml
82+
[suggestion-link]: https://github.com/NatroTeam/NatroMacro/issues/new?assignees=&labels=suggestion%2Cneeds+triage&projects=&template=suggestion.yml
83+
[github-profile-link]: http://github.com/NatroTeam

‎lib/Gdip_All.ahk‎

Lines changed: 685 additions & 375 deletions
Large diffs are not rendered by default.

‎lib/HyperSleep.ahk‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
{
33
static freq, init := DllCall("QueryPerformanceFrequency", "Int64*", freq)
44
DllCall("QueryPerformanceCounter", "Int64*", begin)
5-
finish := begin + ms * freq / 1000
6-
while (current < finish)
7-
{
8-
if ((finish - current) > 30000)
5+
finish := begin + ms * freq / 1000
6+
while (current < finish)
7+
{
8+
if ((finish - current) > 30000)
99
{
1010
DllCall("Winmm.dll\timeBeginPeriod", UInt, 1)
11-
DllCall("Sleep", "UInt", 1)
11+
DllCall("Sleep", "UInt", 1)
1212
DllCall("Winmm.dll\timeEndPeriod", UInt, 1)
1313
}
1414
DllCall("QueryPerformanceCounter", "Int64*", current)
15-
}
15+
}
1616
}

‎lib/Walk.ahk‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ DetectMovespeed(ByRef s, ByRef f, hasteCap:=0)
5151
global hasty_guard, gifted_hasty, base_movespeed, buff_characters, bitmaps
5252

5353
; check roblox window exists
54-
WinGetClientPos(_x, _y, _w, _h, "Roblox ahk_exe RobloxPlayerBeta.exe")
54+
WinGetClientPos(_x, _y, _w, _h, "ahk_id " GetRobloxHWND())
5555
if (_w = 0)
5656
return (10000000, DllCall("QueryPerformanceCounter", "Int64*", f)) ; large number to break walk loop
5757

@@ -128,4 +128,17 @@ WinGetClientPos(ByRef X:="", ByRef Y:="", ByRef Width:="", ByRef Height:="", Win
128128
DllCall("ClientToScreen", "UPtr",hWnd, "Ptr",&RECT)
129129
X := NumGet(&RECT, 0, "Int"), Y := NumGet(&RECT, 4, "Int")
130130
Width := NumGet(&RECT, 8, "Int"), Height := NumGet(&RECT, 12, "Int")
131+
}
132+
133+
GetRobloxHWND()
134+
{
135+
if (hwnd := WinExist("Roblox ahk_exe RobloxPlayerBeta.exe"))
136+
return hwnd
137+
else if (WinExist("Roblox ahk_exe ApplicationFrameHost.exe"))
138+
{
139+
ControlGet, hwnd, Hwnd, , ApplicationFrameInputSinkWindow1
140+
return hwnd
141+
}
142+
else
143+
return 0
131144
}

0 commit comments

Comments
 (0)