Skip to content

Commit 89f54cf

Browse files
sapphyrussapphyrus
committed
Update for newest cheat version + fixes
1 parent dfa91ff commit 89f54cf

File tree

9 files changed

+198
-35
lines changed

9 files changed

+198
-35
lines changed

‎build/emmylua.lua

Lines changed: 33 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -150,8 +150,8 @@ function client.camera_position() end
150150
--- Logs a colored message to console. End the string with \0 to prevent it from adding a newline.
151151
---
152152
--- `r`: Red (0-255)
153-
--- `g`: Red (0-255)
154-
--- `b`: Red (0-255)
153+
--- `g`: Green (0-255)
154+
--- `b`: Blue (0-255)
155155
--- `msg`: The message
156156
--- `...`: Comma-separated arguments to concatenate with msg.
157157
---@param r number
@@ -965,6 +965,7 @@ function renderer.gradient(x, y, w, h, r1, g1, b1, a1, r2, g2, b2, a2, ltr) end
965965
---@param b number
966966
---@param a number
967967
---@param ...
968+
---@return number
968969
function renderer.indicator(r, g, b, a, ...) end
969970

970971
---
@@ -989,21 +990,33 @@ function renderer.indicator(r, g, b, a, ...) end
989990
function renderer.line(xa, ya, xb, yb, r, g, b, a) end
990991

991992
---
992-
--- Returns a texture ID that can be used with renderer.texture, or nil on failure
993+
--- Loads a texture from raw JPG contents (with file header). Returns a texture ID that can be used with renderer.texture, or nil on failure
993994
---
994995
--- `contents`: Raw JPG file contents
995996
---@param contents string
996997
---@return number texture id
997998
function renderer.load_jpg(contents) end
998999

9991000
---
1000-
--- Returns a texture ID that can be used with renderer.texture, or nil on failure
1001+
--- Loads a texture from raw png contents (with file header). Returns a texture ID that can be used with renderer.texture, or nil on failure
10011002
---
10021003
--- `contents`: Raw PNG file contents
10031004
---@param contents string
10041005
---@return number texture id
10051006
function renderer.load_png(contents) end
10061007

1008+
---
1009+
--- Loads a texture from a RGBA buffer. Returns a texture ID that can be used with renderer.texture, or nil on failure
1010+
---
1011+
--- `contents`: RGBA buffer (hex encoded - red = "\xFF\x00\x00\xFF")
1012+
--- `width`: Width
1013+
--- `height`: Height
1014+
---@param contents string
1015+
---@param width number
1016+
---@param height number
1017+
---@return number texture id
1018+
function renderer.load_rgba(contents, width, height) end
1019+
10071020
---
10081021
--- Returns a texture ID that can be used with renderer.texture, or nil on failure
10091022
---
@@ -1071,7 +1084,7 @@ function renderer.rectangle(x, y, w, h, r, g, b, a) end
10711084
function renderer.text(x, y, r, g, b, a, flags, max_width, ...) end
10721085

10731086
---
1074-
--- Draws a texture from the texture id created from load_png, load_jpg or load_svg
1087+
--- Draws a texture from the texture id created from load_rgba, load_png, load_jpg or load_svg
10751088
---
10761089
--- `id`: Texture ID
10771090
--- `x`: X screen coordinate
@@ -1082,6 +1095,7 @@ function renderer.text(x, y, r, g, b, a, flags, max_width, ...) end
10821095
--- `g`: Green (0-255)
10831096
--- `b`: Blue (0-255)
10841097
--- `a`: Alpha (0-255)
1098+
--- `tiled`: True if a differently sized texture should be tiled instead of scaled
10851099
---@param id number
10861100
---@param x number
10871101
---@param y number
@@ -1091,7 +1105,8 @@ function renderer.text(x, y, r, g, b, a, flags, max_width, ...) end
10911105
---@param g number
10921106
---@param b number
10931107
---@param a number
1094-
function renderer.texture(id, x, y, w, h, r, g, b, a) end
1108+
---@param tiled boolean
1109+
function renderer.texture(id, x, y, w, h, r, g, b, a, tiled) end
10951110

10961111
---
10971112
--- This can only be called from the paint callback.
@@ -1149,6 +1164,18 @@ function ui.get(item) end
11491164
---@return boolean
11501165
function ui.is_menu_open() end
11511166

1167+
---
1168+
--- Returns the x, y of the menu, even when closed.
1169+
---
1170+
---@return number, number
1171+
function ui.menu_position() end
1172+
1173+
---
1174+
--- Returns the width, height of the menu, even when closed.
1175+
---
1176+
---@return number, number
1177+
function ui.menu_size() end
1178+
11521179
---
11531180
--- Returns current mouse coordinates x, y
11541181
---

‎build/gitbook/globals/renderer.md

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ This can only be called from the paint callback.
6969

7070
#### renderer.indicator
7171

72-
`renderer.indicator(r: number, g: number, b: number, a: number, ...)`
72+
`renderer.indicator(r: number, g: number, b: number, a: number, ...)`: number
7373

7474
Argument | Type | Description
7575
-------- | ---- | -----------
@@ -108,7 +108,7 @@ Argument | Type | Description
108108
-------- | ---- | -----------
109109
**contents** | string | Raw JPG file contents
110110

111-
Returns a texture ID that can be used with renderer.texture, or nil on failure
111+
Loads a texture from raw JPG contents (with file header). Returns a texture ID that can be used with renderer.texture, or nil on failure
112112

113113

114114
#### renderer.load_png
@@ -119,7 +119,20 @@ Argument | Type | Description
119119
-------- | ---- | -----------
120120
**contents** | string | Raw PNG file contents
121121

122-
Returns a texture ID that can be used with renderer.texture, or nil on failure
122+
Loads a texture from raw png contents (with file header). Returns a texture ID that can be used with renderer.texture, or nil on failure
123+
124+
125+
#### renderer.load_rgba
126+
127+
`renderer.load_rgba(contents: string, width: number, height: number)`: number (texture id)
128+
129+
Argument | Type | Description
130+
-------- | ---- | -----------
131+
**contents** | string | RGBA buffer (hex encoded - red = "\xFF\x00\x00\xFF")
132+
**width** | number (px) | Width
133+
**height** | number (px) | Height
134+
135+
Loads a texture from a RGBA buffer. Returns a texture ID that can be used with renderer.texture, or nil on failure
123136

124137

125138
#### renderer.load_svg
@@ -186,7 +199,7 @@ This can only be called from the paint callback.
186199

187200
#### renderer.texture
188201

189-
`renderer.texture(id: number, x: number, y: number, w: number, h: number, r: number, g: number, b: number, a: number)`
202+
`renderer.texture(id: number, x: number, y: number, w: number, h: number, r: number, g: number, b: number, a: number[, tiled: boolean])`
190203

191204
Argument | Type | Description
192205
-------- | ---- | -----------
@@ -199,8 +212,9 @@ Argument | Type | Description
199212
**g** | number | Green (0-255)
200213
**b** | number | Blue (0-255)
201214
**a** | number | Alpha (0-255)
215+
**tiled** | boolean | True if a differently sized texture should be tiled instead of scaled
202216

203-
Draws a texture from the texture id created from load_png, load_jpg or load_svg
217+
Draws a texture from the texture id created from load_rgba, load_png, load_jpg or load_svg
204218

205219

206220
#### renderer.triangle

‎build/gitbook/globals/ui.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,20 @@ For a checkbox, returns true or false. For a slider, returns an integer. For a c
2323
Returns true if the menu is currently open.
2424

2525

26+
#### ui.menu_position
27+
28+
`ui.menu_position()`: number, number
29+
30+
Returns the x, y of the menu, even when closed.
31+
32+
33+
#### ui.menu_size
34+
35+
`ui.menu_size()`: number, number
36+
37+
Returns the width, height of the menu, even when closed.
38+
39+
2640
#### ui.mouse_position
2741

2842
`ui.mouse_position()`: number, number

‎build/globals.json

Lines changed: 51 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1630,6 +1630,7 @@
16301630
"indicator": {
16311631
"name": "renderer.indicator",
16321632
"description": "Returns the Y screen coordinate (vertical offset) of the drawn text, or nil on failure. This can only be called from the paint callback.",
1633+
"return_type": "number",
16331634
"args": [
16341635
{
16351636
"name": "r",
@@ -1709,7 +1710,7 @@
17091710
},
17101711
"load_jpg": {
17111712
"name": "renderer.load_jpg",
1712-
"description": "Returns a texture ID that can be used with renderer.texture, or nil on failure",
1713+
"description": "Loads a texture from raw JPG contents (with file header). Returns a texture ID that can be used with renderer.texture, or nil on failure",
17131714
"return_type": "number",
17141715
"return_description": "texture id",
17151716
"args": [
@@ -1722,7 +1723,7 @@
17221723
},
17231724
"load_png": {
17241725
"name": "renderer.load_png",
1725-
"description": "Returns a texture ID that can be used with renderer.texture, or nil on failure",
1726+
"description": "Loads a texture from raw png contents (with file header). Returns a texture ID that can be used with renderer.texture, or nil on failure",
17261727
"return_type": "number",
17271728
"return_description": "texture id",
17281729
"args": [
@@ -1733,6 +1734,31 @@
17331734
}
17341735
]
17351736
},
1737+
"load_rgba": {
1738+
"name": "renderer.load_rgba",
1739+
"description": "Loads a texture from a RGBA buffer. Returns a texture ID that can be used with renderer.texture, or nil on failure",
1740+
"return_type": "number",
1741+
"return_description": "texture id",
1742+
"args": [
1743+
{
1744+
"name": "contents",
1745+
"description": "RGBA buffer (hex encoded - red = \"\\xFF\\x00\\x00\\xFF\")",
1746+
"type": "string"
1747+
},
1748+
{
1749+
"name": "width",
1750+
"description": "Width",
1751+
"type": "number",
1752+
"type_description": "px"
1753+
},
1754+
{
1755+
"name": "height",
1756+
"description": "Height",
1757+
"type": "number",
1758+
"type_description": "px"
1759+
}
1760+
]
1761+
},
17361762
"load_svg": {
17371763
"name": "renderer.load_svg",
17381764
"description": "Returns a texture ID that can be used with renderer.texture, or nil on failure",
@@ -1880,7 +1906,7 @@
18801906
},
18811907
"texture": {
18821908
"name": "renderer.texture",
1883-
"description": "Draws a texture from the texture id created from load_png, load_jpg or load_svg",
1909+
"description": "Draws a texture from the texture id created from load_rgba, load_png, load_jpg or load_svg",
18841910
"args": [
18851911
{
18861912
"name": "id",
@@ -1931,6 +1957,12 @@
19311957
"name": "a",
19321958
"description": "Alpha (0-255)",
19331959
"type": "number"
1960+
},
1961+
{
1962+
"name": "tiled",
1963+
"description": "True if a differently sized texture should be tiled instead of scaled",
1964+
"optional": true,
1965+
"type": "boolean"
19341966
}
19351967
]
19361968
},
@@ -2044,6 +2076,22 @@
20442076

20452077
]
20462078
},
2079+
"menu_position": {
2080+
"name": "ui.menu_position",
2081+
"description": "Returns the x, y of the menu, even when closed.",
2082+
"return_type": "number, number",
2083+
"args": [
2084+
2085+
]
2086+
},
2087+
"menu_size": {
2088+
"name": "ui.menu_size",
2089+
"description": "Returns the width, height of the menu, even when closed.",
2090+
"return_type": "number, number",
2091+
"args": [
2092+
2093+
]
2094+
},
20472095
"mouse_position": {
20482096
"name": "ui.mouse_position",
20492097
"description": "Returns current mouse coordinates x, y",

‎build/mkdocs/docs/globals/renderer.md

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ This can only be called from the paint callback.
6969

7070
#### renderer.indicator
7171

72-
`renderer.indicator(r: number, g: number, b: number, a: number, ...)`
72+
`renderer.indicator(r: number, g: number, b: number, a: number, ...)`: number
7373

7474
Argument | Type | Description
7575
-------- | ---- | -----------
@@ -108,7 +108,7 @@ Argument | Type | Description
108108
-------- | ---- | -----------
109109
**contents** | string | Raw JPG file contents
110110

111-
Returns a texture ID that can be used with renderer.texture, or nil on failure
111+
Loads a texture from raw JPG contents (with file header). Returns a texture ID that can be used with renderer.texture, or nil on failure
112112

113113

114114
#### renderer.load_png
@@ -119,7 +119,20 @@ Argument | Type | Description
119119
-------- | ---- | -----------
120120
**contents** | string | Raw PNG file contents
121121

122-
Returns a texture ID that can be used with renderer.texture, or nil on failure
122+
Loads a texture from raw png contents (with file header). Returns a texture ID that can be used with renderer.texture, or nil on failure
123+
124+
125+
#### renderer.load_rgba
126+
127+
`renderer.load_rgba(contents: string, width: number, height: number)`: number (texture id)
128+
129+
Argument | Type | Description
130+
-------- | ---- | -----------
131+
**contents** | string | RGBA buffer (hex encoded - red = "\xFF\x00\x00\xFF")
132+
**width** | number (px) | Width
133+
**height** | number (px) | Height
134+
135+
Loads a texture from a RGBA buffer. Returns a texture ID that can be used with renderer.texture, or nil on failure
123136

124137

125138
#### renderer.load_svg
@@ -186,7 +199,7 @@ This can only be called from the paint callback.
186199

187200
#### renderer.texture
188201

189-
`renderer.texture(id: number, x: number, y: number, w: number, h: number, r: number, g: number, b: number, a: number)`
202+
`renderer.texture(id: number, x: number, y: number, w: number, h: number, r: number, g: number, b: number, a: number[, tiled: boolean])`
190203

191204
Argument | Type | Description
192205
-------- | ---- | -----------
@@ -199,8 +212,9 @@ Argument | Type | Description
199212
**g** | number | Green (0-255)
200213
**b** | number | Blue (0-255)
201214
**a** | number | Alpha (0-255)
215+
**tiled** | boolean | True if a differently sized texture should be tiled instead of scaled
202216

203-
Draws a texture from the texture id created from load_png, load_jpg or load_svg
217+
Draws a texture from the texture id created from load_rgba, load_png, load_jpg or load_svg
204218

205219

206220
#### renderer.triangle

‎build/mkdocs/docs/globals/ui.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,20 @@ For a checkbox, returns true or false. For a slider, returns an integer. For a c
2323
Returns true if the menu is currently open.
2424

2525

26+
#### ui.menu_position
27+
28+
`ui.menu_position()`: number, number
29+
30+
Returns the x, y of the menu, even when closed.
31+
32+
33+
#### ui.menu_size
34+
35+
`ui.menu_size()`: number, number
36+
37+
Returns the width, height of the menu, even when closed.
38+
39+
2640
#### ui.mouse_position
2741

2842
`ui.mouse_position()`: number, number

‎build_globals.rb

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,9 @@ def initialize()
5555
"table" => "table",
5656
"width, height" => "number, number",
5757
"x, y, z" => "number, number, number",
58-
"x1, y1, x2, y2, alpha_multiplier" => "number, number, number, number, number"
58+
"x, y" => "number, number",
59+
"x1, y1, x2, y2, alpha_multiplier" => "number, number, number, number, number",
60+
"y screen coordinate" => "number"
5961
}
6062
end
6163

@@ -71,12 +73,15 @@ def get_return_type(name, data)
7173
# end
7274

7375
types = []
74-
@types.each do |type, type_str|
75-
types << type_str if data.key?("description") && data["description"].include?(type) && data["description"].downcase.include?("returns")
76+
if desc = data["description"].dup.downcase
77+
@types.each do |type, type_str|
78+
if desc.include?(type) && desc.include?("returns")
79+
types << type_str
80+
desc.gsub!(type, "")
81+
end
82+
end
83+
return types[0] if types.uniq.length == 1
7684
end
77-
return types[0] if types.uniq.length == 1
78-
79-
return nil
8085
end
8186
end
8287

0 commit comments

Comments
 (0)