From 825d45a51a7860331631bbc5aede69a644199506 Mon Sep 17 00:00:00 2001 From: "E. Almqvist" Date: Sat, 7 Mar 2020 21:04:46 +0100 Subject: [PATCH] Added map scenes --- .../engine/derma/menus/menu_character.lua | 16 ++++++++++++ gamemode/engine/derma/menus/menu_intro.lua | 26 +++++++++---------- gamemode/engine/derma/menus/menu_main.lua | 12 +++++++-- 3 files changed, 39 insertions(+), 15 deletions(-) diff --git a/gamemode/engine/derma/menus/menu_character.lua b/gamemode/engine/derma/menus/menu_character.lua index 147bee0..0f2b68b 100644 --- a/gamemode/engine/derma/menus/menu_character.lua +++ b/gamemode/engine/derma/menus/menu_character.lua @@ -113,6 +113,14 @@ local pages = { pos1 = Vector( -7229.9194335938, 5658.4575195313, 317.09027099609 ), ang1 = Angle( 1.5841090679169, 68.17308807373, 0 ) } + }, + ["RP_SouthSide"] = { + [1] = { + fov = 65, + velocity = 1, + pos1 = Vector( 5634.8549804688, 4806.2377929688, 7.7848830223083 ), + ang1 = Angle( 1.1936118602753, 74.54320526123, 0 ) + } } } Quantum.Client.Cam.Start( p.scene[game.GetMap()], true ) @@ -500,6 +508,14 @@ function menu.open( dt ) pos1 = Vector( -11620.374023438, 7470.0942382813, 409 ), ang1 = Angle( 5.9394421577454, -49.899868011475, 0 ) } + }, + ["RP_SouthSide"] = { + [1] = { + fov = 70, + velocity = 1, + pos1 = Vector( -9518.1962890625, 1911.3391113281, 64.119094848633 ), + ang1 = Angle( 1.4575741291046, -73.014747619629, 0 ) + } } } Quantum.Client.Cam.Start( f.scene[game.GetMap()], true ) diff --git a/gamemode/engine/derma/menus/menu_intro.lua b/gamemode/engine/derma/menus/menu_intro.lua index 9991868..2452f0f 100644 --- a/gamemode/engine/derma/menus/menu_intro.lua +++ b/gamemode/engine/derma/menus/menu_intro.lua @@ -162,32 +162,32 @@ local scenes = { ang1 = Angle( 2.8831143379211, 25.221273422241, 0 ), ang2 = Angle( 1.5103136301041, 28.336471557617, 0 ) }, - [5] = { -- add scenes below + [5] = { -- this map is a pure 11/10 -- for anyone reading this comment -- download it now fov = 60, velocity = 16, - pos1 = Vector( -9168.173828125, 3501.13671875, 8610.853515625 ), - pos2 = Vector( -10148.767578125, -4350.7163085938, 1860.8051757813 ), - ang1 = Angle( 48.132801055908, -50.447017669678, 0 ), - ang2 = Angle( 21.969816207886, -154.96385192871, 0 ) + pos1 = Vector( 7247.7075195313, 5512.6494140625, 295.15692138672 ), + pos2 = Vector( 7598.7036132813, 5533.30078125, 287.36376953125 ), + ang1 = Angle( 2.0800724029541, -169.9822845459, 0 ), + ang2 = Angle( 1.7104697227478, 13.814577102661, 0 ) }, [6] = { fov = 60, velocity = 15, - 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 ) + pos1 = Vector( 8438.470703125, 7902.5375976563, 333.31167602539 ), + pos2 = Vector( 7957.5356445313, 7892.7924804688, 295.12298583984 ), + ang1 = Angle( 89, -0.53721868991852, 0 ), + ang2 = Angle( -0.76005762815475, 114.73434448242, 0 ) }, [7] = { fov = 60, velocity = 14, - 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 ) + pos1 = Vector( -1782.0749511719, 9614.71484375, 207.95947265625 ), + pos2 = Vector( -1143.5295410156, 9264.28125, 215.28564453125 ), + ang1 = Angle( -0.39047741889954, -46.171054840088, 0 ), + ang2 = Angle( -0.39047738909721, -12.801494598389, 0 ) } } } diff --git a/gamemode/engine/derma/menus/menu_main.lua b/gamemode/engine/derma/menus/menu_main.lua index b688afe..9138d3a 100644 --- a/gamemode/engine/derma/menus/menu_main.lua +++ b/gamemode/engine/derma/menus/menu_main.lua @@ -45,8 +45,6 @@ local scenes = { } } }, - -- - ["rp_dunwood_eu"] = { [1] = { [1] = { @@ -56,6 +54,16 @@ local scenes = { ang1 = Angle( -43.528274536133, -141.58242797852, 0 ) } } + }, + ["RP_SouthSide"] = { + [1] = { + [1] = { + fov = 70, + velocity = 1, + pos1 = Vector( 4344.45703125, 4380.2880859375, 74.674728393555 ), + ang1 = Angle( 0.37715777754784, 122.66827392578, 0 ) + } + } } }