Skip to content

Commit 38ca4e8

Browse files
committed
update
1 parent e543e82 commit 38ca4e8

File tree

4 files changed

+66
-73
lines changed

4 files changed

+66
-73
lines changed

AddictScript/Addict.lua

Lines changed: 63 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,15 @@ util.require_natives("natives-1663599433")
88
guidedMissile = require "ToxTool"
99

1010
local addict = menu
11-
local addict_version = 1.42
12-
local gta_version = "v3028"
11+
local addict_version = 1.43
12+
local gta_version = "v3095"
1313
local dcinv = "fg6Ex4PbkJ"
1414
local dev_mode = false -- Disables stuff like updates [true/false]
1515

16+
local function tunable(value)
17+
return memory.script_global(glob.base + value)
18+
end
19+
1620
-- Add all SE's here for quicker updates
1721
local se = {
1822
tpspread = -1388926377, -- older gta se version
@@ -48,14 +52,7 @@ local glob = {
4852
sekickarg1 = 2657704,
4953
sekickarg2 = 1892703, -- older gta global version
5054
player_bounty = 1835502, -- older gta global version
51-
bounty1 = 2815059, -- older gta global version
52-
}
53-
54-
local function tunable(value)
55-
return memory.script_global(glob.base + value)
56-
end
57-
58-
local globals = {
55+
bounty1 = 2815059, -- older gta global version
5956
nightclub_prices = {
6057
["La Mesa"] = tunable(24838),
6158
["Mission Row"] = tunable(24843),
@@ -76,35 +73,33 @@ local github = addict.list(addict.my_root(), "Updates", {"addictupdates"})
7673
addict.hyperlink(github, "Addict Discord", "https://discord.gg/" .. dcinv)
7774

7875
async_http.init("raw.githubusercontent.com","/Addict0919/Addict-Script/main/AddictScript/AddictScriptChangelog",function(b)
79-
response=true;
80-
addict.action(github, "Changelog", {"addictchangelog"}, b, function() end)
81-
end,
82-
function()
83-
response=true
84-
end)
85-
async_http.dispatch()
86-
repeat util.yield()
87-
until response
88-
if not dev_mode then
89-
async_http.init("raw.githubusercontent.com","/Addict0919/Addict-Script/main/AddictScript/AddictScriptVersion.lua",function(b)
90-
currentVer=tonumber(b)
91-
response=true;
92-
if addict_version~=currentVer then
93-
util.toast("New Version found")async_http.init('raw.githubusercontent.com','/Addict0919/Addict-Script/main/AddictScript/Addict.lua',function(c)
94-
local d=select(2,load(c))
95-
if d then
96-
util.toast("Update failed to download, please re-download manually via Github or using Addict Discord Server.")
97-
return
98-
end;
99-
local e=io.open(filesystem.scripts_dir()..SCRIPT_RELPATH,"wb")
100-
e:write(c)
101-
e:close()
102-
util.toast("Update Done!")
103-
util.restart_script()
104-
end)
105-
async_http.dispatch()
106-
end
107-
end,
76+
addict.action(github, "Changelog", {"addictchangelog"}, b, function() end)
77+
response=true;
78+
end)
79+
async_http.dispatch()
80+
repeat util.yield()
81+
until response
82+
83+
if not dev_mode then
84+
async_http.init("raw.githubusercontent.com","/Addict0919/Addict-Script/main/AddictScript/AddictScriptVersion",function(b)
85+
currentVer=tonumber(b)
86+
response=true;
87+
if addict_version~=currentVer then
88+
util.toast("New Version found")async_http.init('raw.githubusercontent.com','/Addict0919/Addict-Script/main/AddictScript/Addict.lua',function(c)
89+
local d=select(2,load(c))
90+
if d then
91+
util.toast("Update failed to download, please re-download manually via Github or using Addict Discord Server.")
92+
return
93+
end;
94+
local e=io.open(filesystem.scripts_dir()..SCRIPT_RELPATH,"wb")
95+
e:write(c)
96+
e:close()
97+
util.toast("Update Done!")
98+
util.restart_script()
99+
end)
100+
async_http.dispatch()
101+
end
102+
end,
108103
function()
109104
response=true
110105
end)
@@ -2337,7 +2332,7 @@ while nc == nc_owned do
23372332
nc = nc_options.first[math.random(#nc_options.first)]
23382333
end
23392334

2340-
local price = memory.read_int(globals.nightclub_prices[nc])
2335+
local price = memory.read_int(glob.nightclub_prices[nc])
23412336

23422337
if wallet ~= nil and bank ~= nil then
23432338
if wallet + bank < price then
@@ -10691,40 +10686,40 @@ local player_ped = PLAYER.PLAYER_PED_ID()
1069110686
local old_coords = ENTITY.GET_ENTITY_COORDS(player_ped)
1069210687

1069310688
local coordinatesList = {
10694-
{x = -1329.5868, y = -3041.565, z = 65.06483},
10695-
{x = 12.201786, y = -2608.5598, z = 27.00581},
10696-
{x = 529.52344, y = -3159.0903, z = 46.26378},
10697-
{x = 797.6639, y = -2314.7708, z = 66.75716},
10698-
{x = -904.7783, y = -1799.8903, z = 60.525257},
10699-
{x = -902.62103, y = -1797.8055, z = 68.71026},
10700-
{x = -811.026, y = -1052.471, z = 84.877464},
10701-
{x = -74.7535, y = -820.54895, z = 331.0572},
10702-
{x = 693.5279, y = -1200.2932, z = 45.110516},
10703-
{x = 1944.0536, y = -911.7328, z = 177.15826},
10704-
{x = 955.1047, y = 11.822339, z = 129.3541},
10705-
{x = -1329.5868, y = -3041.565, z = 65.06483},
10706-
{x = -604.4595, y = 53.186974, z = 124.79825},
10707-
{x = -84.817345, y = 882.59576, z = 287.78268},
10708-
{x = -1755.0154, y = -75.41939, z = 137.54353},
10709-
{x = 2568.129, y = 760.6324, z = 160.43828},
10710-
{x = 807.4092, y = 2714.9368, z = 103.85771},
10711-
{x = 2252.8367, y = 3330.679, z = 138.64398},
10712-
{x = -1970.4495, y = 2864.2395, z = 34.49541},
10713-
{x = 1840.9294, y = 3868.8608, z = 54.188793},
10714-
{x = 490.04102, y = 5584.988, z = 802.92584},
10715-
{x = 2313.2842, y = 5981.442, z = 136.00969},
10716-
{x = -272.11963, y = 6188.8105, z = 82.51767},
10717-
{x = -1329.5868, y = -3041.565, z = 65.06483}
10689+
{x = -1329.5868, y = -3041.565, z = 65.06483},
10690+
{x = 12.201786, y = -2608.5598, z = 27.00581},
10691+
{x = 529.52344, y = -3159.0903, z = 46.26378},
10692+
{x = 797.6639, y = -2314.7708, z = 66.75716},
10693+
{x = -904.7783, y = -1799.8903, z = 60.525257},
10694+
{x = -902.62103, y = -1797.8055, z = 68.71026},
10695+
{x = -811.026, y = -1052.471, z = 84.877464},
10696+
{x = -74.7535, y = -820.54895, z = 331.0572},
10697+
{x = 693.5279, y = -1200.2932, z = 45.110516},
10698+
{x = 1944.0536, y = -911.7328, z = 177.15826},
10699+
{x = 955.1047, y = 11.822339, z = 129.3541},
10700+
{x = -1329.5868, y = -3041.565, z = 65.06483},
10701+
{x = -604.4595, y = 53.186974, z = 124.79825},
10702+
{x = -84.817345, y = 882.59576, z = 287.78268},
10703+
{x = -1755.0154, y = -75.41939, z = 137.54353},
10704+
{x = 2568.129, y = 760.6324, z = 160.43828},
10705+
{x = 807.4092, y = 2714.9368, z = 103.85771},
10706+
{x = 2252.8367, y = 3330.679, z = 138.64398},
10707+
{x = -1970.4495, y = 2864.2395, z = 34.49541},
10708+
{x = 1840.9294, y = 3868.8608, z = 54.188793},
10709+
{x = 490.04102, y = 5584.988, z = 802.92584},
10710+
{x = 2313.2842, y = 5981.442, z = 136.00969},
10711+
{x = -272.11963, y = 6188.8105, z = 82.51767},
10712+
{x = -1329.5868, y = -3041.565, z = 65.06483}
1071810713
}
1071910714

1072010715
for i, coords in ipairs(coordinatesList) do
10721-
ENTITY.SET_ENTITY_COORDS_NO_OFFSET(player_ped, coords.x, coords.y, coords.z)
10722-
send_script_event(se.tpspread, pid, {27, -1762807505, 0})
10723-
util.yield(100)
10716+
ENTITY.SET_ENTITY_COORDS_NO_OFFSET(player_ped, coords.x, coords.y, coords.z)
10717+
send_script_event(se.tpspread, pid, {27, -1762807505, 0})
10718+
util.yield(100)
1072410719
end
1072510720

1072610721
ENTITY.SET_ENTITY_COORDS_NO_OFFSET(player_ped, old_coords.x, old_coords.y, old_coords.z)
10727-
send_script_event(se.tpspread, pid, {27, -1762807505, 0})
10722+
send_script_event(se.tpspread, pid, {27, -1762807505, 0})
1072810723
end)
1072910724

1073010725
function attachto(offx, offy, offz, pid, angx, angy, angz, hash, isnpc, isveh)

AddictScript/AddictScriptChangelog

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
________________________
2-
v1.42
3-
- fixed discord invite
4-
- recoded credits tab
5-
- code cleanup
2+
v1.43
3+
- code cleanup/recode
64
________________________
75

86
Report any Bugs/Broken features on the Discord

AddictScript/AddictScriptVersion

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
1.43

AddictScript/AddictScriptVersion.lua

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)