user333/simple-shooter-game
1
0
Fork 0
mirror of https://github.com/a-bad-dev/simple-shooter-game.git synced 2026-06-09 20:36:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

More updates

Browse source
This commit is contained in:
IonicCheese 2025-12-10 18:21:35 -08:00
commit 7623c786b7
1 changed files with 9 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

22
mods/game/main/init.lua
View file

@ -52,7 +52,7 @@ function give_player_items(player)
inv:add_item("main", "ctf_ranged:ammo 100") inv:add_item("main", "ctf_ranged:ammo 100")
elseif class == "shotgun" then elseif class == "shotgun" then
inv:add_item("main", "ctf_ranged:benelli_loaded") inv:add_item("main", "ctf_ranged:benelli_loaded")
inv:add_item("main", "ctf_ranged:makarov_loaded") inv:add_item("main", "ctf_ranged:glock17_loaded")
inv:add_item("main", "ctf_ranged:ammo 100") inv:add_item("main", "ctf_ranged:ammo 100")
end end
end end
@ -69,7 +69,7 @@ function set_player_mode(player, mode)
}) })
load_player_data(player) load_player_data(player)
privs.noclip, privs.fast, privs.fly = false, false, false privs.noclip, privs.fast, privs.fly, privs.interact = false, false, false, true
playertag.set(player, playertag.TYPE_ENTITY, {a = 255, r = 255, g = 255, b = 255}) playertag.set(player, playertag.TYPE_ENTITY, {a = 255, r = 255, g = 255, b = 255})
@ -86,7 +86,7 @@ function set_player_mode(player, mode)
breathbar = true, breathbar = true,
}) })
elseif mode == "spectator" then elseif mode == "spectator" then
privs.noclip, privs.fast, privs.fly = true, true, true privs.noclip, privs.fast, privs.fly, privs.interact = true, true, true, false
make_player_invisible(player) make_player_invisible(player)
@ -106,7 +106,7 @@ function set_player_mode(player, mode)
}) })
elseif mode == "pre_match" then elseif mode == "pre_match" then
privs.noclip, privs.fast, privs.fly = false, true, false -- allow fast movement to get to a specific point on the large map privs.noclip, privs.fast, privs.fly, privs.interact = false, true, false, false -- allow fast movement to get to a specific point on the large map
make_player_invisible(player) make_player_invisible(player)
@ -115,9 +115,9 @@ function set_player_mode(player, mode)
label[3,0.1;Change class:] label[3,0.1;Change class:]
button[0.3,1;2.5,1;class_sniper;Sniper] button[0.3,1;2.5,1;class_sniper;Long-range]
button[2.8,1;2.5,1;class_assault;Assault] button[2.8,1;2.5,1;class_assault;Mid-range]
button[5.3,1;2.5,1;class_shotgun;Shotgun] button[5.3,1;2.5,1;class_shotgun;Short-range]
list[current_player;main;0,2;8,1;] list[current_player;main;0,2;8,1;]
list[current_player;main;0,3.25;8,3;8] list[current_player;main;0,3.25;8,3;8]
@ -187,10 +187,6 @@ function start_match()
end end
function end_match() function end_match()
if match_state == "pre_match" or match_state == "not_started" or match_state == "post_match" then
return false
end
set_match_state("not_started") set_match_state("not_started")
for _, player in pairs(core.get_connected_players()) do for _, player in pairs(core.get_connected_players()) do
@ -389,9 +385,9 @@ core.register_chatcommand("reset", {
privs = {match_manager = true}, privs = {match_manager = true},
description = "Terminate the match", description = "Terminate the match",
func = function() func = function()
local success = end_match() if match_state ~= "pre_match" and match_state ~= "post_match" and match_state ~= "not_started" then
if success then
core.chat_send_all(core.colorize("red", "Match Terminated")) core.chat_send_all(core.colorize("red", "Match Terminated"))
end_match()
return true return true
end end