CapsAdmin/pac3
1
0
Fork 0
mirror of https://github.com/CapsAdmin/pac3.git synced 2025-03-04 03:03:01 -05:00
Code Issues Packages Projects Releases Wiki Activity

fire bullets singleplayer hack fix

Browse Source 
I found that the hook is ineffective on singleplayer, so some networking was needed

and add enum builder for bullet types, as well as some defaults
This commit is contained in:
pingu7867 2024-07-28 20:40:15 -04:00
parent 7657713c2f
commit 0f9b73f22f
2 changed files with 43 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
lua/pac3/core/client/parts/event.lua
View File

@ -1462,10 +1462,21 @@ PART.OldEvents = {
operator_type = "string", preferred_operator = "find simple",
tutorial_explanation = "fire_bullets supposedly checks what types of bullets you're firing",
arguments = {{find_ammo = "string"}, {time = "number"}},
userdata = {{default = "AR2", enums = function()
local tbl = {}
for i=-1,512,1 do
local name = game.GetAmmoName(i)
if name then
tbl[name .. " (ID ="..i..")"] = name
end
end
return tbl
end}, {default = 0.1}},
callback = function(self, ent, find_ammo, time)
time = time or 0.1
ent = try_viewmodel(ent)
if game.SinglePlayer() and ent.pac_hide_bullets ~= ent:GetNWBool("pac_hide_bullets", false) then net.Start("pac_hide_bullets_get") net.WriteBool(ent.pac_hide_bullets) net.SendToServer() end
local data = ent.pac_fire_bullets
local b = false
@ -3377,14 +3388,24 @@ pac.AddHook("EntityEmitSound", "emit_sound", function(data)
end
end)
pac.AddHook("EntityFireBullets", "firebullets", function(ent, data)
if not ent:IsValid() or not ent.pac_has_parts then return end
ent.pac_fire_bullets = {name = data.AmmoType, time = pac.RealTime, reset = true}
if ent.pac_hide_bullets then
return false
end
pac.CallRecursiveOnAllParts("OnFireBullets")
end)
if game.SinglePlayer() then
net.Receive("pac_fire_bullets_for_singleplayer", function()
local ent = net.ReadEntity()
if not ent:IsValid() or not ent.pac_has_parts then return end
local ammo_type = net.ReadUInt(8)
ent.pac_fire_bullets = {name = game.GetAmmoName(ammo_type), time = pac.RealTime, reset = true}
pac.CallRecursiveOnAllParts("OnFireBullets")
end)
else
pac.AddHook("EntityFireBullets", "firebullets", function(ent, data)
if not ent:IsValid() or not ent.pac_has_parts then return end
ent.pac_fire_bullets = {name = data.AmmoType, time = pac.RealTime, reset = true}
pac.CallRecursiveOnAllParts("OnFireBullets")
if ent.pac_hide_bullets then
return false
end
end)
end
--for regaining focus on cameras from first person, hacky thing to not loop through localparts every time
--only if the received command name matches that of a camera's linked command event

14
lua/pac3/core/server/net_messages.lua
View File

@ -3,6 +3,8 @@ util.AddNetworkString("pac.AllowPlayerButtons")
util.AddNetworkString("pac.BroadcastPlayerButton")
util.AddNetworkString("pac_chat_typing_mirror")
util.AddNetworkString("pac_chat_typing_mirror_broadcast")
util.AddNetworkString("pac_fire_bullets_for_singleplayer")
util.AddNetworkString("pac_hide_bullets_get")
do -- button event
net.Receive("pac.AllowPlayerButtons", function(length, client)
@ -39,3 +41,15 @@ net.Receive("pac_chat_typing_mirror", function(len, ply)
net.WriteEntity(ply)
net.Broadcast()
end)
if game.SinglePlayer() then
hook.Add("EntityFireBullets", "pac_bullet_singleplayer_hack", function(ent, data)
if ent:IsPlayer() then
net.Start("pac_fire_bullets_for_singleplayer") net.WriteEntity(ent) net.WriteUInt(game.GetAmmoID(data.AmmoType),8) net.Broadcast()
end
if ent:GetNWBool("pac_hide_bullets", false) then return false end
end)
net.Receive("pac_hide_bullets_get", function(len, ply)
ply:SetNWBool("pac_hide_bullets",net.ReadBool())
end)
end