From 34761730271e72ee14729e54c45fe690b882a50d Mon Sep 17 00:00:00 2001 From: AlmTech Software Date: Fri, 24 Jan 2020 22:05:06 +0100 Subject: [PATCH] UI Tweaks & finished new cinematic for new map --- entities/weapons/quantum_hands/shared.lua | 8 +++----- gamemode/engine/core/server/sv_player_init.lua | 2 +- gamemode/engine/derma/lib/cl_menu_theme.lua | 5 +++-- gamemode/engine/derma/menus/menu_character.lua | 4 ++-- gamemode/engine/derma/menus/menu_charinfo.lua | 4 ++-- gamemode/engine/derma/menus/menu_intro.lua | 18 +++++++++--------- 6 files changed, 20 insertions(+), 21 deletions(-) diff --git a/entities/weapons/quantum_hands/shared.lua b/entities/weapons/quantum_hands/shared.lua index ab0ebd9..841d41a 100644 --- a/entities/weapons/quantum_hands/shared.lua +++ b/entities/weapons/quantum_hands/shared.lua @@ -65,12 +65,12 @@ SWEP.Secondary.Ammo = "" SWEP.Secondary.Delay = 0.25 function SWEP:Initialize() - if CLIENT || !IsValid(self:GetOwner()) then return true end self:SetHoldType( "normal" ) end function SWEP:Deploy() - --self:GetOwner():DrawWorldModel( false ) + if( CLIENT || !IsValid(self:GetOwner()) ) then return true end + self:GetOwner():DrawWorldModel( false ) return true end @@ -101,7 +101,6 @@ function SWEP:PrimaryAttack() print( translateVector( "Angle", LocalPlayer():GetAngles() ) ) end end - return false end function SWEP:SecondaryAttack() @@ -109,11 +108,10 @@ function SWEP:SecondaryAttack() if( LocalPlayer():IsSuperAdmin() ) then LocalPlayer():ChatPrint( "Check console for output.\n" ) Quantum.Debug( "--Camera Data--" ) - print( translateVector( "Vector", LocalPlayer():GetPos() ) ) + print( translateVector( "Vector", LocalPlayer():GetBonePosition( LocalPlayer():LookupBone( "ValveBiped.Bip01_Head1" ) ) ) ) print( translateVector( "Angle", LocalPlayer():GetAngles() ) ) end end - return false end function SWEP:Reload() diff --git a/gamemode/engine/core/server/sv_player_init.lua b/gamemode/engine/core/server/sv_player_init.lua index f386f0b..e28586b 100644 --- a/gamemode/engine/core/server/sv_player_init.lua +++ b/gamemode/engine/core/server/sv_player_init.lua @@ -43,7 +43,7 @@ local function setUpPlayer( ply ) ply:SetCrouchedWalkSpeed( Quantum.Server.Settings.PlayerSpeeds.duck) ply:SetMaxSpeed( Quantum.Server.Settings.PlayerSpeeds.run ) - ply:SetFOV( 80 ) + ply:SetFOV( 72 ) ply:Give( "quantum_hands" ) ply:SelectWeapon( "quantum_hands" ) diff --git a/gamemode/engine/derma/lib/cl_menu_theme.lua b/gamemode/engine/derma/lib/cl_menu_theme.lua index 57aa86a..9fd7a49 100644 --- a/gamemode/engine/derma/lib/cl_menu_theme.lua +++ b/gamemode/engine/derma/lib/cl_menu_theme.lua @@ -126,10 +126,11 @@ function theme.skipbutton( b, inClr ) surface.DrawRect( padding_s/2, padding_s/2, w - padding_s, h - padding_s ) end -function theme.pagetext( p ) +function theme.pagetext( p, clr ) local w, h = p:GetSize() + clr = clr || Color( 205, 205, 205, 255 ) - p:SetTextColor( Color( 205, 205, 205, 255 ) ) + p:SetTextColor( clr ) surface.SetDrawColor( Color( 0, 0, 0, 0 ) ) surface.DrawRect( 0, 0, w, h ) diff --git a/gamemode/engine/derma/menus/menu_character.lua b/gamemode/engine/derma/menus/menu_character.lua index d623b63..147bee0 100644 --- a/gamemode/engine/derma/menus/menu_character.lua +++ b/gamemode/engine/derma/menus/menu_character.lua @@ -110,8 +110,8 @@ local pages = { [1] = { fov = 60, velocity = 10, - pos1 = Vector( -7225.9956054688, -967.29949951172, 320 ), - ang1 = Angle( 2.7715656757355, 41.735473632813, 0 ) + pos1 = Vector( -7229.9194335938, 5658.4575195313, 317.09027099609 ), + ang1 = Angle( 1.5841090679169, 68.17308807373, 0 ) } } } diff --git a/gamemode/engine/derma/menus/menu_charinfo.lua b/gamemode/engine/derma/menus/menu_charinfo.lua index 6230afe..350675e 100644 --- a/gamemode/engine/derma/menus/menu_charinfo.lua +++ b/gamemode/engine/derma/menus/menu_charinfo.lua @@ -177,7 +177,7 @@ function menu.open( dt ) f:ShowCloseButton( false ) f:MakePopup() f.Paint = function( self, w, h ) - surface.SetDrawColor( 0, 0, 0, 40 ) + surface.SetDrawColor( 0, 0, 0, 120 ) surface.DrawRect( 0, 0, w, h ) theme.renderblur( self, 10, 10 ) end @@ -444,7 +444,7 @@ function menu.open( dt ) name:SetPos( itemframe.x, money.y - name.h - padding ) name.Paint = function( self, w, h ) draw.RoundedBox( 5, 0, 0, w, h, Color( 0, 0, 0, 90 ) ) - theme.pagetext( self ) + theme.pagetext( self, Color( 255, 255, 255 ) ) end end diff --git a/gamemode/engine/derma/menus/menu_intro.lua b/gamemode/engine/derma/menus/menu_intro.lua index cfc8bdf..84851d5 100644 --- a/gamemode/engine/derma/menus/menu_intro.lua +++ b/gamemode/engine/derma/menus/menu_intro.lua @@ -84,7 +84,7 @@ local scenes = { fov = 70, velocity = 12, pos1 = Vector( 3029.4631347656, 1975.4969482422, 323.03317260742 ), - pos2 = Vector( 2984.1782226563, 1293.4967041016, 266.60958862305 ), + pos2 = Vector( 2984.1782226563, 1293.4967041016, 320.60958862305 ), ang1 = Angle( 2.5343189239502, -101.2608795166, 0 ), ang2 = Angle( 0.95032584667206, -131.14338684082, 0 ) }, @@ -115,18 +115,18 @@ local scenes = { [6] = { fov = 60, velocity = 15, - pos1 = Vector( 3114.608887, -13817.962891, 82.778885 ), - pos2 = Vector( 5247.718262, -14413.496094, 74.946350 ), - ang1 = Angle( 0.844603, -15.770578, 0.000000 ), - ang2 = Angle( 2.006202, 37.927032, 0.000000 ) + pos1 = Vector( 8437.771484375, 13937.401367188, 1746.5352783203 ), + pos2 = Vector( 3200.0029296875, 14697.87109375, 2583.8791503906 ), + ang1 = Angle( -1.2141468524933, -164.51931762695, 0 ), + ang2 = Angle( -29.039636611938, -123.28386688232, 0 ) }, [7] = { fov = 60, velocity = 14, - pos1 = Vector( 4964.591797, 4514.272461, 213.532272 ), - pos2 = Vector( 5047.838379, 3216.407959, 128.219254 ), - ang1 = Angle( 8.131199, -77.082695, 0.000000 ), - ang2 = Angle( 0.422407, -89.520081, 0.000000 ) + pos1 = Vector( 2833.5769042969, 14572.4609375, 85.577995300293 ), + pos2 = Vector( 4496.3881835938, 14495.8671875, 84.486724853516 ), + ang1 = Angle( -0.63365286588669, -4.9319581985474, 0 ), + ang2 = Angle( -2.0592522621155, 42.27123260498, 0 ) } } }