Ported zones & properties lib to shared realm

master
E. Almqvist 5 years ago
parent 8c69f084fa
commit 8b35e73367
  1. 95
      gamemode/engine/lib/server/sv_property.lua
  2. 95
      gamemode/engine/lib/sh_property.lua
  3. 34
      gamemode/engine/lib/sh_zone.lua
  4. 10
      gamemode/engine/vars/sh_vars.lua
  5. 12
      gamemode/engine/vars/sv_vars.lua

@ -1,95 +0,0 @@
-- __ _ _______ _ __
-- / / /\ | | |__ __| | | \ \
-- / / / \ | |_ __ ___ | | ___ ___| |__ \ \
-- < < / /\ \ | | '_ ` _ \| |/ _ \/ __| '_ \ > >
-- \ \ / ____ \| | | | | | | | __/ (__| | | | / /
-- \_\ /_/ \_\_|_| |_| |_|_|\___|\___|_| |_| /_/
Quantum.Server.Property = {}
Quantum.Server.Property.Properties = {}
function Quantum.Server.Property.Register( propid, tbl )
if( Quantum.Server.Property.Properties[propid] == nil ) then
local prop = {
name = tbl.name || "Private Property",
id = propid,
owner = nil,
vec1 = tbl.vec1,
vec2 = tbl.vec2,
price = tbl.price || Quantum.Server.DefualtPropertyPrice
}
prop.zone = Quantum.Server.Zone.Register( propid .. "_property", { -- register the zone for the property
name = prop.name,
vec1 = prop.vec1,
vec2 = prop.vec2,
property = propid
} )
Quantum.Server.Property.Properties[propid] = prop
return prop
else
Quantum.Error( "Property id '" .. propid .. "' already exists! Aborting..." )
end
end
function Quantum.Server.Property.Get( propid ) return Quantum.Server.Property.Properties[propid] end
-- Player functions --
function Quantum.Server.Property.SetOwner( propid, charid )
Quantum.Server.Property.Properties[propid].owner = charid
end
hook.Add( "Move", "Quantum_Move_Property_CheckInZone", function( ply, mv )
if( ply.isloaded ) then
if( mv:GetVelocity() != Vector( 0, 0, 0 ) ) then
local zone = Quantum.Server.Zone.GetCurrentZone( ply:GetPos() )
if( zone != nil ) then
ply:ChatPrint( zone.name )
end
end
end
end)
-- Door functions --
function Quantum.Server.Property.LockDoor( ent )
if( Quantum.Server.DoorClasses[ent:GetClass()] && IsValid( ent ) ) then --
ent:Fire( "lock", "", 0 )
ent:EmitSound( Quantum.DoorSounds.Lock )
ent.islocked = true
end
end
function Quantum.Server.Property.UnlockDoor( ent )
if( Quantum.Server.DoorClasses[ent:GetClass()] && IsValid( ent ) ) then --
ent:Fire( "unlock", "", 0 )
ent:EmitSound( Quantum.DoorSounds.Unlock )
ent.islocked = false
end
end
function Quantum.Server.Property.SwitchLockDoor( ent )
if( Quantum.Server.DoorClasses[ent:GetClass()] && IsValid( ent ) ) then --
if( ent.islocked ) then
Quantum.Server.Property.UnlockDoor( ent )
else
Quantum.Server.Property.LockDoor( ent )
end
end
end
function Quantum.Server.Property.PlayerSwitchLock( pl, doorent )
local zone = Quantum.Server.Zone.GetCurrentZone( pl:GetPos() )
if( zone == nil ) then return end
if( Quantum.Server.Zone.DoorIsInZone(doorent, zone.id) ) then
local prop = Quantum.Server.Property.Get( zone.property )
if( prop.owner == pl || pl:IsSuperAdmin() ) then
Quantum.Server.Property.SwitchLockDoor( doorent )
else
return
end
end
end

@ -0,0 +1,95 @@
-- __ _ _______ _ __
-- / / /\ | | |__ __| | | \ \
-- / / / \ | |_ __ ___ | | ___ ___| |__ \ \
-- < < / /\ \ | | '_ ` _ \| |/ _ \/ __| '_ \ > >
-- \ \ / ____ \| | | | | | | | __/ (__| | | | / /
-- \_\ /_/ \_\_|_| |_| |_|_|\___|\___|_| |_| /_/
Quantum.Property = {}
Quantum.Property.Properties = {}
function Quantum.Property.Register( propid, tbl )
if( Quantum.Property.Properties[propid] == nil ) then
local prop = {
name = tbl.name || "Private Property",
id = propid,
owner = nil,
vec1 = tbl.vec1,
vec2 = tbl.vec2,
price = tbl.price || Quantum.DefualtPropertyPrice
}
prop.zone = Quantum.Zone.Register( propid .. "_property", { -- register the zone for the property
name = prop.name,
vec1 = prop.vec1,
vec2 = prop.vec2,
property = propid
} )
Quantum.Property.Properties[propid] = prop
return prop
else
Quantum.Error( "Property id '" .. propid .. "' already exists! Aborting..." )
end
end
function Quantum.Property.Get( propid ) return Quantum.Property.Properties[propid] end
-- Player functions --
function Quantum.Property.SetOwner( propid, charid )
Quantum.Property.Properties[propid].owner = charid
end
hook.Add( "Move", "Quantum_Move_Property_CheckInZone", function( ply, mv ) -- DEBUG REMOVE LATER
if( ply.isloaded ) then
if( mv:GetVelocity() != Vector( 0, 0, 0 ) ) then
local zone = Quantum.Zone.GetCurrentZone( ply:GetPos() )
if( zone != nil ) then
ply:ChatPrint( zone.name )
end
end
end
end)
-- Door functions --
function Quantum.Property.LockDoor( ent )
if( Quantum.DoorClasses[ent:GetClass()] && IsValid( ent ) ) then
ent:Fire( "lock", "", 0 )
ent:EmitSound( Quantum.DoorSounds.Lock )
ent.islocked = true
end
end
function Quantum.Property.UnlockDoor( ent )
if( Quantum.DoorClasses[ent:GetClass()] && IsValid( ent ) ) then
ent:Fire( "unlock", "", 0 )
ent:EmitSound( Quantum.DoorSounds.Unlock )
ent.islocked = false
end
end
function Quantum.Property.SwitchLockDoor( ent )
if( Quantum.DoorClasses[ent:GetClass()] && IsValid( ent ) ) then
if( ent.islocked ) then
Quantum.Property.UnlockDoor( ent )
else
Quantum.Property.LockDoor( ent )
end
end
end
function Quantum.Property.PlayerSwitchLock( pl, doorent )
local zone = Quantum.Zone.GetCurrentZone( pl:GetPos() )
if( zone == nil ) then return end
if( Quantum.Zone.DoorIsInZone(doorent, zone.id) ) then
local prop = Quantum.Property.Get( zone.property )
if( prop.owner == pl || pl:IsSuperAdmin() ) then
Quantum.Property.SwitchLockDoor( doorent )
else
return
end
end
end

@ -5,12 +5,12 @@
-- \ \ / ____ \| | | | | | | | __/ (__| | | | / / -- \ \ / ____ \| | | | | | | | __/ (__| | | | / /
-- \_\ /_/ \_\_|_| |_| |_|_|\___|\___|_| |_| /_/ -- \_\ /_/ \_\_|_| |_| |_|_|\___|\___|_| |_| /_/
Quantum.Server.Zone = {} Quantum.Zone = {}
Quantum.Server.Zone.Zones = {} -- all zones are rectangles where they go from vec1 to vec2 Quantum.Zone.Zones = {} -- all zones are rectangles where they go from vec1 to vec2
function Quantum.Server.Zone.Register( zoneid, tbl ) function Quantum.Zone.Register( zoneid, tbl )
if( Quantum.Server.Zone.Zones[zoneid] == nil ) then if( Quantum.Zone.Zones[zoneid] == nil ) then
local zone = { local zone = {
name = tbl.name || "Unknown Zone", name = tbl.name || "Unknown Zone",
id = zoneid, id = zoneid,
@ -20,35 +20,35 @@ function Quantum.Server.Zone.Register( zoneid, tbl )
-- why cant lua just have classes :( -- why cant lua just have classes :(
} }
Quantum.Server.Zone.Zones[zoneid] = zone Quantum.Zone.Zones[zoneid] = zone
return zone return zone
else else
Quantum.Error( "Zone id '" .. zoneid .. "' already exists! Aborting..." ) Quantum.Error( "Zone id '" .. zoneid .. "' already exists! Aborting..." )
end end
end end
function Quantum.Server.Zone.Get( zoneid ) function Quantum.Zone.Get( zoneid )
return Quantum.Server.Zone.Zones[zoneid] return Quantum.Zone.Zones[zoneid]
end end
function Quantum.Server.Zone.IsInZone( vec, zoneid, zone ) function Quantum.Zone.IsInZone( vec, zoneid, zone )
zone = zone || Quantum.Server.Zone.Get( zoneid ) zone = zone || Quantum.Zone.Get( zoneid )
return vec:WithinAABox( zone.vec1, zone.vec2 ) return vec:WithinAABox( zone.vec1, zone.vec2 )
end end
function Quantum.Server.Zone.GetCurrentZone( vec ) function Quantum.Zone.GetCurrentZone( vec )
for i, zone in pairs( Quantum.Server.Zone.Zones ) do for i, zone in pairs( Quantum.Zone.Zones ) do
if( Quantum.Server.Zone.IsInZone( vec, nil, zone ) ) then if( Quantum.Zone.IsInZone( vec, nil, zone ) ) then
return zone return zone
end end
end end
end end
function Quantum.Server.Zone.GetDoors( zoneid ) function Quantum.Zone.GetDoors( zoneid )
local zone = Quantum.Server.Zone.Get( zoneid ) local zone = Quantum.Zone.Get( zoneid )
local entInZone = {} local entInZone = {}
for i, ent in pairs( ents.FindInBox( zone.vec1, zone.vec2 ) ) do for i, ent in pairs( ents.FindInBox( zone.vec1, zone.vec2 ) ) do
if( Quantum.Server.DoorClasses[ ent:GetClass() ]) then if( Quantum.DoorClasses[ ent:GetClass() ]) then
entInZone[i] = ent entInZone[i] = ent
end end
end end
@ -56,7 +56,7 @@ function Quantum.Server.Zone.GetDoors( zoneid )
return entInZone return entInZone
end end
function Quantum.Server.Zone.DoorIsInZone( doorent, zoneid ) function Quantum.Zone.DoorIsInZone( doorent, zoneid )
local doors = Quantum.Server.Zone.GetDoors( zoneid ) local doors = Quantum.Zone.GetDoors( zoneid )
return table.HasValue( doors, doorent ) return table.HasValue( doors, doorent )
end end

@ -61,4 +61,14 @@ end
Quantum.DoorSounds = { Quantum.DoorSounds = {
Lock = "doors/default_locked.wav", Lock = "doors/default_locked.wav",
Unlock = "doors/default_locked.wav" Unlock = "doors/default_locked.wav"
}
Quantum.DefualtPropertyPrice = 5000
Quantum.DoorClasses = {
["func_door"] = true,
["func_door_rotating"] = true,
["prop_door_rotating"] = true,
["func_movelinear"] = true,
["prop_dynamic"] = true
} }

@ -7,14 +7,4 @@
Quantum.Server.DefaultNodeHealth = 10 Quantum.Server.DefaultNodeHealth = 10
Quantum.Server.DefaultNodeRespawnTimer = 30 Quantum.Server.DefaultNodeRespawnTimer = 30
Quantum.Server.DefualtPropertyPrice = 5000
Quantum.Server.DoorClasses = {
["func_door"] = true,
["func_door_rotating"] = true,
["prop_door_rotating"] = true,
["func_movelinear"] = true,
["prop_dynamic"] = true
}
Loading…
Cancel
Save