Skip to content

Fix entity gates for FPGA by another way #3663

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.

Sign up for GitHub

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

Merged
Astralcircle merged 3 commits into from
Jul 18, 2026
+26 −18
Merged

Fix entity gates for FPGA by another way #3663

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0f6560d
Revert "Fix fpga chip passing gate's internal table instead of chip e…
Astralcircle Jul 18, 2026
9f62e46
Fix entity gates for FPGA by another way
Astralcircle Jul 18, 2026
98ca3f3
Remove some useless IsValid checks
Astralcircle Jul 18, 2026
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
4 changes: 2 additions & 2 deletions lua/entities/gmod_wire_fpga/init.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -938,10 +938,10 @@ function ENT:CalculateNode(node, nodeId, gate)
table.insert(activeValues, self.Values[nodeId][inputNum])
end

value = {gate.output(self, unpack(activeValues))}
value = {gate.output(self.Gates[nodeId], unpack(activeValues))}
else
--normal gates
value = {gate.output(self, unpack(self.Values[nodeId]))}
value = {gate.output(self.Gates[nodeId], unpack(self.Values[nodeId]))}
end

--Error correction - for dumb designed gates... (entity owner gate)
Expand Down
40 changes: 24 additions & 16 deletions lua/wire/gates/entity.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,22 @@ GateActions("Entity")

local clamp = WireLib.clampForce

local function isAllowed( gate, ent )
local function CanPhysgun( gate, ent )
if not IsValid( ent ) then return false end
if ent:IsPlayer() then return false end
if not IsValid(gate:GetPlayer()) then return false end
return hook.Run( "PhysgunPickup", gate:GetPlayer(), ent ) ~= false

local owner = gate:GetPlayer()
if not IsValid( owner ) then return false end

return WireLib.CanPhysgun( owner, ent )
end

local function CanTool( gate, ent, toolname )
if not IsValid( ent ) then return false end

local owner = gate:GetPlayer()
if not IsValid( owner ) then return false end

return WireLib.CanTool( owner, ent, toolname )
end

GateActions["entity_applyf"] = {
Expand All @@ -19,7 +30,7 @@ GateActions["entity_applyf"] = {
inputtypes = { "ENTITY" , "VECTOR" },
timed = true,
output = function(gate, ent, vec )
if not isAllowed( gate, ent ) then return end
if not CanPhysgun( gate, ent ) then return end
local phys = ent:GetPhysicsObject()
if not IsValid( phys ) then return end
if not isvector(vec) then vec = Vector (0, 0, 0) end
Expand All @@ -39,7 +50,7 @@ GateActions["entity_applyof"] = {
inputtypes = { "ENTITY" , "VECTOR" , "VECTOR" },
timed = true,
output = function(gate, ent, vec, offset )
if not isAllowed( gate, ent ) then return end
if not CanPhysgun( gate, ent ) then return end
local phys = ent:GetPhysicsObject()
if not IsValid( phys ) then return end
if not isvector(vec) then vec = Vector (0, 0, 0) end
Expand All @@ -63,7 +74,7 @@ GateActions["entity_applyaf"] = {
inputtypes = { "ENTITY" , "ANGLE" },
timed = true,
output = function(gate, ent, angForce )
if not isAllowed( gate, ent ) then return end
if not CanPhysgun( gate, ent ) then return end
local phys = ent:GetPhysicsObject()
if not IsValid( phys ) then return end
local clampedForce = clamp(angForce)
Expand Down Expand Up @@ -109,7 +120,7 @@ GateActions["entity_applytorq"] = {
inputtypes = { "ENTITY" , "VECTOR" },
timed = true,
output = function(gate, ent, vec )
if not isAllowed( gate, ent ) then return end
if not CanPhysgun( gate, ent ) then return end
local phys = ent:GetPhysicsObject()
if not IsValid( phys ) then return end
if not isvector(vec) then vec = Vector (0, 0, 0) end
Expand Down Expand Up @@ -614,8 +625,7 @@ GateActions["entity_owner"] = {
outputtypes = { "ENTITY" },
timed = true,
output = function(gate, Ent)
if not Ent:IsValid() then return WireLib.GetOwner(gate) end
return WireLib.GetOwner(Ent)
return Ent:IsValid() and WireLib.GetOwner(Ent) or gate:GetPlayer()
end,
label = function(Out,Ent)
return string.format ("owner(%s) = %s", Ent, tostring(Out))
Expand Down Expand Up @@ -834,9 +844,8 @@ GateActions["entity_setmass"] = {
inputs = { "Ent" , "Val" },
inputtypes = { "ENTITY" , "NORMAL" },
output = function(gate, Ent, Val )
if not Ent:IsValid() then return end
if not CanTool(gate, Ent, "weight") then return end
if not Ent:GetPhysicsObject():IsValid() then return end
if not WireLib.CanTool(WireLib.GetOwner(gate), Ent, "weight") then return end
if not Val then Val = Ent:GetPhysicsObject():GetMass() end
Val = math.Clamp(Val, 0.001, 50000)
Ent:GetPhysicsObject():SetMass(Val)
Expand Down Expand Up @@ -875,8 +884,7 @@ GateActions["entity_setcol"] = {
inputs = { "Ent" , "Col" },
inputtypes = { "ENTITY" , "VECTOR" },
output = function(gate, Ent, Col )
if not Ent:IsValid() then return end
if not WireLib.CanTool(WireLib.GetOwner(gate), Ent, "color") then return end
if not CanTool(gate, Ent, "color") then return end
if not isvector(Col) then Col = Vector(255,255,255) end
Ent:SetColor(Color(Col.x,Col.y,Col.z,255))
end,
Expand Down Expand Up @@ -1242,7 +1250,7 @@ GateActions["entity_setanglevelocity"] = {
inputtypes = { "ENTITY", "VECTOR" },
timed = true,
output = function(gate, ent, vec)
if not isAllowed(gate, ent) then return end
if not CanPhysgun(gate, ent) then return end
local phys = ent:GetPhysicsObject()
if not phys:IsValid() then return end
phys:SetAngleVelocity(clamp(Vector(vec)))
Expand All @@ -1258,7 +1266,7 @@ GateActions["entity_setvelocity"] = {
inputtypes = { "ENTITY", "VECTOR" },
timed = true,
output = function(gate, ent, vec)
if not isAllowed(gate, ent) then return end
if not CanPhysgun(gate, ent) then return end
local phys = ent:GetPhysicsObject()
if not phys:IsValid() then return end
phys:SetVelocity(clamp(Vector(vec)))
Expand Down
Loading