From 12a5ba79ad5cbae0b16f4892e3246213ac629d09 Mon Sep 17 00:00:00 2001 From: Lennart Kampshoff Date: Sat, 22 Sep 2018 00:14:38 +0200 Subject: [PATCH] Add camera position on login --- Client/Login/main.js | 14 ++++++++++++-- Main.cs | 6 +++++- Server/Events/Connect.cs | 3 ++- Server/Events/Login.cs | 1 + Server/Events/Register.cs | 1 + 5 files changed, 21 insertions(+), 4 deletions(-) diff --git a/Client/Login/main.js b/Client/Login/main.js index abd8c73c..b0b3789c 100644 --- a/Client/Login/main.js +++ b/Client/Login/main.js @@ -8,6 +8,12 @@ var loginBrowser; loginBrowser = mp.browsers.new('package://Login/login.html'); mp.gui.chat.activate(false); mp.gui.cursor.show(true, true); +mp.game.ui.displayHud(false); +mp.game.ui.displayRadar(false); + +var loginCam = mp.cameras.new('login', new mp.Vector3(-1883.736, -781.4911, 78.27616), new mp.Vector3(3.185999, 0, -79.59519), 40); +loginCam.setActive(true); +mp.game.cam.renderScriptCams(true, false, 0, true, false); mp.events.add('loginInformationToServer', (password) => { @@ -28,7 +34,9 @@ mp.events.add('registerSuccess', () => { } mp.gui.cursor.show(false, false); mp.gui.chat.activate(true); - + loginCam.setActive(false); + mp.game.cam.renderScriptCams(false, false, 0, true, false); + mp.game.ui.displayRadar(true); }); mp.events.add('loginSuccess', () => { mp.gui.chat.push("Erfolgreich eingeloggt!") @@ -38,7 +46,9 @@ mp.events.add('loginSuccess', () => { } mp.gui.cursor.show(false, false); mp.gui.chat.activate(true); - + loginCam.setActive(false); + mp.game.cam.renderScriptCams(false, false, 0, true, false); + mp.game.ui.displayRadar(true); }); mp.events.add('loginFail', (reason) => { diff --git a/Main.cs b/Main.cs index e1aea960..b28102a7 100644 --- a/Main.cs +++ b/Main.cs @@ -11,11 +11,15 @@ namespace reallife_gamemode { public class Main : Script { + public static readonly Vector3 DEFAULT_SPAWN_POSITION = new Vector3(-427.5189, 1116.453, 326.7829); + public static readonly float DEFAULT_SPAWN_HEADING = 340.8f; + [ServerEvent(Event.ResourceStart)] public void OnResourceStart() { NAPI.Server.SetCommandErrorMessage("~r~[FEHLER]~s~ Dieser Command existiert nicht."); - NAPI.Util.ConsoleOutput("reallife-gamemode resource loaded!"); + NAPI.Server.SetDefaultSpawnLocation(DEFAULT_SPAWN_POSITION, DEFAULT_SPAWN_HEADING); + NAPI.Server.SetAutoSpawnOnConnect(false); } } } \ No newline at end of file diff --git a/Server/Events/Connect.cs b/Server/Events/Connect.cs index 59167107..45e95404 100644 --- a/Server/Events/Connect.cs +++ b/Server/Events/Connect.cs @@ -20,7 +20,8 @@ namespace reallife_gamemode.Server.Events [ServerEvent(Event.PlayerConnected)] public void OnPlayerConnected(Client player) { - + player.Position = new Vector3(-1883.736, -781.4911, -10); + player.FreezePosition = true; } } diff --git a/Server/Events/Login.cs b/Server/Events/Login.cs index 06d3ca9d..1c40ec6c 100644 --- a/Server/Events/Login.cs +++ b/Server/Events/Login.cs @@ -40,6 +40,7 @@ namespace reallife_gamemode.Server.Events else { player.TriggerEvent("loginSuccess"); + NAPI.Player.SpawnPlayer(player, Main.DEFAULT_SPAWN_POSITION, Main.DEFAULT_SPAWN_HEADING); } } } diff --git a/Server/Events/Register.cs b/Server/Events/Register.cs index 9aef1742..fbc45ecf 100644 --- a/Server/Events/Register.cs +++ b/Server/Events/Register.cs @@ -29,6 +29,7 @@ namespace reallife_gamemode.Server.Events registerUser.SaveChanges(); } player.TriggerEvent("registerSuccess"); + NAPI.Player.SpawnPlayer(player, Main.DEFAULT_SPAWN_POSITION, Main.DEFAULT_SPAWN_HEADING); } else if (player.SocialClubName == checkedUser.SocialClubName) {