diff options
| author | Alexander Pickering <alexandermpickering@gmail.com> | 2016-05-25 22:40:09 -0400 |
|---|---|---|
| committer | Alexander Pickering <alexandermpickering@gmail.com> | 2016-05-25 22:40:09 -0400 |
| commit | f797cbe348dd52b51da4cd4812cfa291d1434095 (patch) | |
| tree | df4fabacfc6819a981d750c510122f5bbda8083c /gamemode/server | |
| parent | a5932d386488030b6005c829fe343f74daed9893 (diff) | |
| parent | fd04cb695e1c0e6597456f2b1b7b076310fd81bf (diff) | |
| download | gmstranded-f797cbe348dd52b51da4cd4812cfa291d1434095.tar.gz gmstranded-f797cbe348dd52b51da4cd4812cfa291d1434095.tar.bz2 gmstranded-f797cbe348dd52b51da4cd4812cfa291d1434095.zip | |
Merge branch 'structsystem'hotfix
Diffstat (limited to 'gamemode/server')
| -rw-r--r-- | gamemode/server/admin_commands.lua | 10 | ||||
| -rw-r--r-- | gamemode/server/player_functions.lua | 7 |
2 files changed, 7 insertions, 10 deletions
diff --git a/gamemode/server/admin_commands.lua b/gamemode/server/admin_commands.lua index 284792c..d21c884 100644 --- a/gamemode/server/admin_commands.lua +++ b/gamemode/server/admin_commands.lua @@ -1,7 +1,11 @@ concommand.Add( "gms_admin_maketree", function( ply ) if ( IsValid( ply ) && !ply:IsAdmin() ) then ply:SendMessage( "You need admin rights for this!", 3, Color( 200, 0, 0, 255 ) ) return end local tr = ply:TraceFromEyes( 10000 ) - GAMEMODE.MakeTree( tr.HitPos ) + local ent = ents.Create( "gms_tree" ) + ent:SetPos( tr.HitPos ) + ent:Spawn() + ent.GMSAutoSpawned = true + ent:SetNWString( "Owner", "World" ) end ) concommand.Add( "gms_admin_makerock", function( ply ) @@ -28,7 +32,7 @@ concommand.Add( "gms_admin_makeantlionbarrow", function( ply, cmd, args ) local ent = ents.Create( "gms_antlionbarrow" ) ent:SetPos( tr.HitPos ) ent:Spawn() - ent:SetNetworkedString( "Owner", "World" ) + ent:SetNWString( "Owner", "World" ) ent:SetKeyValue( "MaxAntlions", args[1] ) end ) @@ -132,7 +136,7 @@ concommand.Add( "gms_admin_populatearea", function( ply, cmd, args ) ent:SetModel( GMS.RockModels[math.random( 1, #GMS.RockModels )] ) ent:SetPos( groundtrace.HitPos ) ent:Spawn() - ent:SetNetworkedString( "Owner", "World" ) + ent:SetNWString( "Owner", "World" ) ent:Fadein() ent.PhysgunDisabled = true ent:GetPhysicsObject():EnableMotion( false ) diff --git a/gamemode/server/player_functions.lua b/gamemode/server/player_functions.lua index 561a618..854e649 100644 --- a/gamemode/server/player_functions.lua +++ b/gamemode/server/player_functions.lua @@ -143,12 +143,9 @@ end util.AddNetworkString( "gms_SetResource" ) function PlayerMeta:SetResource( resource, int ) - print("SetResource called!") if(isstring(resource)) then resource = GMS.GetResourceByName(resource) end - PrintTable(resource) - print(int) --if ( !self.Resources[resource] ) then self.Resources[resource] = 0 end @@ -186,10 +183,6 @@ function PlayerMeta:IncResource( resource, int ) if ( !self.Resources[resource] ) then self.Resources[resource] = 0 end local all = self:GetAllResources() local max = self.MaxResources - print("When adding resources, max resource is:") - print(max) - print("All is:") - print(all) if ( all + int > max ) then self.Resources[resource] = self.Resources[resource] + ( max - all ) |