Fixed major cinematic bugs & reduced inventory space

master
E. Almqvist 5 years ago
parent 825d45a51a
commit 21b18ab878
  1. 10
      gamemode/engine/derma/menus/menu_character.lua
  2. 2
      gamemode/engine/derma/menus/menu_charinfo.lua
  3. 6
      gamemode/engine/derma/menus/menu_intro.lua
  4. 6
      gamemode/engine/derma/menus/menu_main.lua
  5. 4
      gamemode/settings/sh_settings.lua

@ -114,7 +114,7 @@ local pages = {
ang1 = Angle( 1.5841090679169, 68.17308807373, 0 )
}
},
["RP_SouthSide"] = {
["rp_southside"] = {
[1] = {
fov = 65,
velocity = 1,
@ -123,10 +123,10 @@ local pages = {
}
}
}
Quantum.Client.Cam.Start( p.scene[game.GetMap()], true )
Quantum.Client.Cam.Start( p.scene[string.lower(game.GetMap())], true )
p.OnRemove = function( self )
Quantum.Client.Cam.Start( parent.scene[game.GetMap()], true ) -- switch back to the parents scene
Quantum.Client.Cam.Start( parent.scene[string.lower(game.GetMap())], true ) -- switch back to the parents scene
end
local banner = vgui.Create( "DImage", p )
@ -509,7 +509,7 @@ function menu.open( dt )
ang1 = Angle( 5.9394421577454, -49.899868011475, 0 )
}
},
["RP_SouthSide"] = {
["rp_southside"] = {
[1] = {
fov = 70,
velocity = 1,
@ -518,7 +518,7 @@ function menu.open( dt )
}
}
}
Quantum.Client.Cam.Start( f.scene[game.GetMap()], true )
Quantum.Client.Cam.Start( f.scene[string.lower(game.GetMap())], true )
local args = {
CloseButtonText = "Return",

@ -17,7 +17,7 @@ local padding = 10 * resScale
local padding_s = 4 * resScale
local errorMdl = "models/player.mdl"
local itemWidth, itemHeight = 65 * resScale, 65 * resScale
local itemWidth, itemHeight = 95 * resScale, 95 * resScale
local function createItemAmountLabel( icon, item )
icon.amountpanel = vgui.Create( "DLabel", icon )

@ -129,7 +129,7 @@ local scenes = {
ang2 = Angle( -2.0592522621155, 42.27123260498, 0 )
}
},
["RP_SouthSide"] = {
["rp_southside"] = {
[1] = {
fov = 70,
velocity = 12,
@ -252,8 +252,8 @@ function intro.open()
end
skip.OnCursorEntered = function() surface.PlaySound( "UI/buttonrollover.wav" ) end
if( scenes[game.GetMap()] ) then
Quantum.Client.Cam.Start( scenes[game.GetMap()], false ) -- start the cinematic
if( scenes[ string.lower(game.GetMap()) ] ) then
Quantum.Client.Cam.Start( scenes[string.lower(game.GetMap())], false ) -- start the cinematic
else
Quantum.Error( "Unable to get map scenes. Aborting cinematic intro..." )
fade.transition( f, {}, 1, 1, 1, Color( 0, 0, 0, 255 ), true, Quantum.EmptyFunction, function() Quantum.Client.IsInMenu = false end )

@ -55,7 +55,7 @@ local scenes = {
}
}
},
["RP_SouthSide"] = {
["rp_southside"] = {
[1] = {
[1] = {
fov = 70,
@ -99,8 +99,8 @@ function main.open(dt)
theme.renderblur( self, 2, 7 )
end
if( scenes[ game.GetMap() ] != nil ) then
Quantum.Client.Cam.Start( scenes[ game.GetMap() ][math.random( 1, table.Count(scenes[ game.GetMap() ])) ], false )
if( scenes[ string.lower(game.GetMap()) ] != nil ) then
Quantum.Client.Cam.Start( scenes[string.lower(game.GetMap())][math.random( 1, table.Count(scenes[string.lower(game.GetMap())])) ], false )
else
Quantum.Error( "There are no scenes for this map! Aborting scene..." )
end

@ -13,8 +13,8 @@ Quantum.DiscordInvite = "https://discord.gg/heUJB4B"
Quantum.WorkshopLink = "https://steamcommunity.com/sharedfiles/filedetails/?id=1842234130"
Quantum.Inventory = {
Height = 10, -- NOTE: MAX HEIGHT=12
Width = 16, -- NOTE: MAX WIDTH=18
Height = 5, -- NOTE: MAX HEIGHT=12
Width = 8, -- NOTE: MAX WIDTH=18
MaxStackSize = 20 -- NOTE: MAX MaxStackSize=99
}

Loading…
Cancel
Save