Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

V3 Weather module #668

Merged
merged 4 commits into from
Jun 16, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 2 additions & 40 deletions vrp/__resource.lua
Original file line number Diff line number Diff line change
Expand Up @@ -10,36 +10,9 @@ server_scripts{
"base.lua",
"modules/map.lua",
"modules/gui.lua",
"modules/audio.lua",
"modules/login.lua",
"modules/admin.lua",
"modules/identity.lua",
"modules/group.lua",
"modules/transformer.lua",
"modules/hidden_transformer.lua",
"modules/inventory.lua",
"modules/player_state.lua",
"modules/survival.lua",
"modules/money.lua",
"modules/emotes.lua",
"modules/atm.lua",
"modules/phone.lua",
"modules/aptitude.lua",
"modules/shop.lua",
"modules/skinshop.lua",
"modules/mission.lua",
"modules/cloak.lua",
"modules/garage.lua",
"modules/business.lua",
"modules/home.lua",
"modules/home_components.lua",
"modules/police.lua",
"modules/radio.lua",
"modules/ped_blacklist.lua",
"modules/veh_blacklist.lua",
"modules/edible.lua",
"modules/warp.lua",
"modules/profiler.lua"
"modules/weather.lua"
}

-- client scripts
Expand All @@ -48,19 +21,8 @@ client_scripts{
"client/base.lua",
"client/map.lua",
"client/gui.lua",
"client/audio.lua",
"client/admin.lua",
"client/player_state.lua",
"client/survival.lua",
"client/identity.lua",
"client/phone.lua",
"client/garage.lua",
"client/police.lua",
"client/radio.lua",
"client/ped_blacklist.lua",
"client/veh_blacklist.lua",
"client/warp.lua",
"client/iplloader.lua"
"client/weather.lua"
}

-- client files
Expand Down
45 changes: 0 additions & 45 deletions vrp/cfg/control.lua

This file was deleted.

6 changes: 3 additions & 3 deletions vrp/cfg/groups.lua
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ function police_init(user)
weapons["WEAPON_NIGHTSTICK"] = {ammo=0}
weapons["WEAPON_FLASHLIGHT"] = {ammo=0}

vRP.EXT.PlayerState.remote._giveWeapons(user.source,weapons,true)
vRP.EXT.Police.remote._setCop(user.source,true)
vRP.EXT.PlayerState.remote._setArmour(user.source,100)
--vRP.EXT.PlayerState.remote._giveWeapons(user.source,weapons,true)
--vRP.EXT.Police.remote._setCop(user.source,true)
--vRP.EXT.PlayerState.remote._setArmour(user.source,100)
end

function police_onjoin(user)
Expand Down
2 changes: 1 addition & 1 deletion vrp/cfg/modules.lua
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ local modules = {
group = true,
gui = true,
map = true,
control = true -- weather and time controls
weather = true,
}

return modules
29 changes: 29 additions & 0 deletions vrp/cfg/weather.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
local cfg = {}

cfg.time = {
['Morning'] = 9,
['Noon'] = 12,
['Evening'] = 18,
['Night'] = 23
}

cfg.types = {
'EXTRASUNNY',
'CLEAR',
'SMOG',
'FOGGY',
'OVERCAST',
'CLOUDS',
'CLEARING',
'RAIN',
'THUNDER',
'SNOW',
'BLIZZARD',
'SNOWLIGHT'

--'XMAS',
--'NEUTRAL', --makes sky green
--'HALLOWEEN'
}

return cfg
126 changes: 0 additions & 126 deletions vrp/client/control.lua

This file was deleted.

Loading