ACF-Team/CFW
1
0
Fork 0
mirror of https://github.com/ACF-Team/CFW.git synced 2025-03-04 03:03:16 -05:00
Code Issues Packages Projects Releases Activity

Merge pull request #4 from thecraftianman/main

Browse Source 
Update E2 library
This commit is contained in:
Stooberton 2024-02-05 18:21:00 -06:00 committed by GitHub
commit bf21b81c0e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lua/cfw/extensions/mass_sv.lua
View File

@ -23,6 +23,8 @@ hook.Add("cfw.contraption.created", "CFW_Mass", function(con)
end)
hook.Add("cfw.contraption.entityAdded", "CFW_Mass", function(con, ent)
if not IsValid(ent) then return end
local obj = ent:GetPhysicsObject()
if IsValid(obj) then
@ -34,6 +36,8 @@ hook.Add("cfw.contraption.entityAdded", "CFW_Mass", function(con, ent)
end)
hook.Add("cfw.contraption.entityRemoved", "CFW_Mass", function(con, ent)
if not IsValid(ent) then return end
local obj = ent:GetPhysicsObject()
if IsValid(obj) then

14
lua/entities/gmod_wire_expression2/core/custom/cfw.lua
View File

@ -15,16 +15,6 @@ do -- Datatype and operator
end
)
registerOperator("ass", "xcr", "xcr", function(self, args)
local lhs, op2, scope = args[2], args[3], args[4]
local rhs = op2[1](self, op2)
self.Scopes[scope][lhs] = rhs
self.Scopes[scope].vclk[lhs] = true
return rhs
end)
e2function number operator_is(contraption cont)
return isValidContraption(cont) and 1 or 0
end
@ -32,10 +22,6 @@ do -- Datatype and operator
e2function number operator==(contraption c1, contraption c2)
return c1 == c2 and 1 or 0
end
e2function number operator!=(contraption c1, contraption c2)
return c1 ~= c2 and 1 or 0
end
end
do

6
lua/entities/gmod_wire_expression2/core/custom/cl_cfw.lua Normal file
View File

@ -0,0 +1,6 @@
E2Helper.Descriptions["isValid(xcr:)"] = "Returns 1 if the contraption is valid and 0 otherwise."
E2Helper.Descriptions["getContraption(e:)"] = "Returns the contraption constrained to this entity."
E2Helper.Descriptions["count(xcr:)"] = "Returns the number of entities in the contraption."
E2Helper.Descriptions["getMass(xcr:)"] = "Returns the total mass of the contraption in kg."
E2Helper.Descriptions["getTable(xcr:)"] = "Returns the E2 table of the contraption."
E2Helper.Descriptions["getEntities(xcr:)"] = "Returns the entities contained in the contraption."