aviate/reallife-gamemode
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of ssh://development.life-of-german.org:451/log-gtav/reallife-gamemode into develop

Browse Source
This commit is contained in:
nahkampfaffe
2018-09-19 17:13:21 +02:00
parent 708960f77f baf2e4c50d
commit a775a9e7bb
18 changed files with 388 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Client/Login/login.html
View File

@@ -1,4 +1,9 @@
<!DOCTYPE html> <!--
* @overview Life of German Reallife - Login Login login.html
* @author Orangebox, VegaZ
* @copyright (c) 2008 - 2018 Life of German
*-->
<!DOCTYPE html>
<html> <html>
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">

8
Client/Login/login.js
View File

@@ -1,4 +1,10 @@
$('#loginBtn').click(() => { /**
* @overview Life of German Reallife - Login Login login.js
* @author VegaZ
* @copyright (c) 2008 - 2018 Life of German
*/
$('#loginBtn').click(() => {
$('.alert').remove(); //Remove any alerts when we attempt to login/register $('.alert').remove(); //Remove any alerts when we attempt to login/register
mp.trigger('loginInformationToServer', $('#usernameInputLogin').val(), $('#passwordInputLogin').val()); mp.trigger('loginInformationToServer', $('#usernameInputLogin').val(), $('#passwordInputLogin').val());
}); });

7
Client/Login/main.js
View File

@@ -1,4 +1,9 @@
var loginBrowser = mp.browsers.new('package://Login/login.html'); /**
* @overview Life of German Reallife - Login Main main.js
* @author VegaZ
* @copyright (c) 2008 - 2018 Life of German
*/
var loginBrowser = mp.browsers.new('package://Login/login.html');
mp.gui.cursor.show(true, true); mp.gui.cursor.show(true, true);
mp.events.add('loginInformationToServer', (username, password) => { mp.events.add('loginInformationToServer', (username, password) => {

8
Client/Login/style.css
View File

@@ -1,4 +1,10 @@
.login-page { /**
* @overview Life of German Reallife - Login CSS style.css
* @author Orangebox
* @copyright (c) 2008 - 2018 Life of German
*/
.login-page {
width: 360px; width: 360px;
margin: auto; margin: auto;
} }

6
Client/index.js
View File

@@ -1 +1,7 @@
/**
* @overview Life of German Reallife - Login index.js
* @author VegaZ
* @copyright (c) 2008 - 2018 Life of German
*/
require('./Login/main.js'); require('./Login/main.js');

9
Main.cs
View File

@@ -1,13 +1,22 @@
using System; using System;
using GTANetworkAPI; using GTANetworkAPI;
/**
* @overview Life of German Reallife - Main Class (Main.cs)
* @author VegaZ, hydrant
* @copyright (c) 2008 - 2018 Life of German
*/
namespace reallife_gamemode namespace reallife_gamemode
{ {
public class Main : Script public class Main : Script
{ {
[ServerEvent(Event.ResourceStart)] [ServerEvent(Event.ResourceStart)]
public void OnResourceStart() public void OnResourceStart()
{ {
NAPI.Server.SetCommandErrorMessage("~r~[FEHLER]~s~ Dieser Command existiert nicht.");
NAPI.Util.ConsoleOutput("reallife-gamemode resource loaded!"); NAPI.Util.ConsoleOutput("reallife-gamemode resource loaded!");
} }
} }

15
Model/DatabaseContext.cs
View File

@@ -1,15 +1,15 @@
/** using System;
* @overview Life of German Reallife - DatabaseContext.cs
* @author VegaZ
* @copyright (c) 2008 - 2018 Life of German
*/
using System;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Metadata; using Microsoft.EntityFrameworkCore.Metadata;
/**
* @overview Life of German Reallife - DatabaseContext.cs
* @author VegaZ
* @copyright (c) 2008 - 2018 Life of German
*/
namespace reallife_gamemode.Model namespace reallife_gamemode.Model
{ {
public partial class DatabaseContext : DbContext public partial class DatabaseContext : DbContext
@@ -35,6 +35,5 @@ namespace reallife_gamemode.Model
} }
public DbSet<Server.Entities.User> Users { get; set; } public DbSet<Server.Entities.User> Users { get; set; }
public DbSet<Server.Entities.Character> Characters { get; set; }
} }
} }

195
Server/Commands/Admin.cs
View File

@@ -2,15 +2,202 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Text; using System.Text;
using GTANetworkAPI; using GTANetworkAPI;
using reallife_gamemode.Server.Extensions;
using reallife_gamemode.Server.Services;
using reallife_gamemode.Server.Util;
namespace reallife_gamemode.Server.Command /**
* @overview Life of German Reallife - Admin Commands (Admin.cs)
* @author VegaZ, hydrant
* @copyright (c) 2008 - 2018 Life of German
*/
namespace reallife_gamemode.Server.Commands
{ {
public class Admin : Script public class Admin : Script
{ {
[Command("o")] [Command("o", "~m~Benutzung: ~s~/o [Nachricht]", GreedyArg = true)]
public void sendOChat(Client player, string message) public void CmdAdminO(Client player, string message)
{ {
NAPI.Chat.SendChatMessageToAll("~r~" + player.Name + " sagt:~w~ " + message); if (!player.GetUser()?.IsAdmin(AdminLevel.SUPPORTER) ?? true)
{
ChatService.NotAuthorized(player);
return;
}
string publicMessage = "~b~(( " + player.Name + ": " + message + " ))";
NAPI.Chat.SendChatMessageToAll(publicMessage);
}
[Command("veh", "~m~Benutzung: ~s~/veh [Fahrzeug] (Farbe 1) (Farbe 2)")]
public void CmdAdminVeh(Client player, VehicleHash hash, int color1 = 111, int color2 = 111)
{
if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true)
{
ChatService.NotAuthorized(player);
return;
}
if (player.IsInVehicle) // Man darf keine Autos erstellen, wenn man selbst in einem sitzt (verhindert Bugs)
{
player.SendChatMessage("~r~[FEHLER]~s~ Du sitzt momentan schon in einem Fahrzeug.");
return;
}
Vehicle v = NAPI.Vehicle.CreateVehicle(hash, player.Position, player.Rotation.Z, color1, color2);
player.SetIntoVehicle(v.Handle, -1);
}
[Command("fixveh")]
public void CmdAdminFixveh(Client player)
{
if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true)
{
ChatService.NotAuthorized(player);
return;
}
if (!player.IsInVehicle) // Man darf keine Autos erstellen, wenn man selbst in einem sitzt (verhindert Bugs)
{
player.SendChatMessage("~r~[FEHLER]~s~ Du sitzt momentan nicht in einem Fahrzeug.");
return;
}
player.Vehicle.Repair();
}
[Command("delveh")]
public void CmdAdminDelveh(Client player)
{
if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true)
{
ChatService.NotAuthorized(player);
return;
}
if (!player.IsInVehicle) // Man darf keine Autos erstellen, wenn man selbst in einem sitzt (verhindert Bugs)
{
player.SendChatMessage("~r~[FEHLER]~s~ Du sitzt momentan nicht in einem Fahrzeug.");
return;
}
/* TODO: Checken, ob das Fahrzeug in einem System genutzt wird (Fraktions-Autos / Spieler-Auto)
* Wenn Ja: Abbrechen und mitteilen, dass man den System-spezifischen Befehl zu nutzen hat */
player.Vehicle.Delete();
}
[Command("goto", "~m~Benutzung: ~s~/goto [Name]")]
public void CmdAdminGoto(Client player, string name)
{
if (!player.GetUser()?.IsAdmin(AdminLevel.SUPPORTER) ?? true)
{
ChatService.NotAuthorized(player);
return;
}
Client target = ClientService.GetClientByName(name);
if(target == null)
{
ChatService.PlayerNotFound(player);
return;
}
player.Position = target.Position;
}
[Command("gotoxyz", "~m~Benutzung: ~s~/gotoxyz [X] [Y] [Z]")]
public void CmdAdminGotoxyz(Client player, float x, float y, float z)
{
if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true)
{
ChatService.NotAuthorized(player);
return;
}
player.Position = new Vector3(x, y, z);
}
[Command("gethere", "~m~Benutzung: ~s~/goto [Name]")]
public void CmdAdminGethere(Client player, string name)
{
if (!player.GetUser()?.IsAdmin(AdminLevel.SUPPORTER) ?? true)
{
ChatService.NotAuthorized(player);
return;
}
Client target = ClientService.GetClientByName(name);
if (target == null)
{
ChatService.PlayerNotFound(player);
return;
}
target.Position = player.Position;
}
[Command("ipl", "~m~Benutzung: ~s~/ipl [Load / Remove] [Name]")]
public void CmdAdminIpl(Client player, string option, string name)
{
if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true)
{
ChatService.NotAuthorized(player);
return;
}
option = option.ToLower();
if(option == "load")
{
NAPI.World.RequestIpl(name);
player.SendChatMessage("~g~Das IPL ~s~" + name + " ~g~wurde erfolgreich geladen");
}
else if(option == "remove")
{
NAPI.World.RemoveIpl(name);
player.SendChatMessage("~g~Das IPL ~s~" + name + " ~g~wurde erfolgreich entladen");
}
else
{
player.SendChatMessage("~m~Benutzung: ~s~/ipl [Load / Remove] [Name]");
}
}
[Command("giveweapon", "~m~Benutzung: ~s~/giveweapon [Spieler] [Waffe] [Munition]")]
public void CmdAdminGiveweapon(Client player, string name, string weapon, int ammo)
{
if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true)
{
ChatService.NotAuthorized(player);
return;
}
if (ammo <= 0)
{
player.SendChatMessage("~r~[FEHLER]~s~ Es muss mindestens 1 Munition vergeben werden.");
return;
}
Client target = ClientService.GetClientByName(name);
if (target == null)
{
ChatService.PlayerNotFound(target);
return;
}
WeaponHash wHash = NAPI.Util.WeaponNameToModel(weapon);
if(wHash == default(WeaponHash))
{
player.SendChatMessage("~r~[FEHLER]~s~ Diese Waffe existiert nicht.");
return;
}
target.GiveWeapon(wHash, ammo);
} }
} }
} }

16
Server/Entities/Character.cs
View File

@@ -1,16 +0,0 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.Text;
namespace reallife_gamemode.Server.Entities
{
public class Character
{
[Key]
public int Id { get; set; }
public int UserId { get; set; }
public string Name { get; set; }
public byte Gender { get; set; }
}
}

12
Server/Entities/User.cs
View File

@@ -1,9 +1,16 @@
using System; using reallife_gamemode.Server.Util;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
using System.Text; using System.Text;
/**
* @overview Life of German Reallife - Entities User (User.cs)
* @author VegaZ, hydrant
* @copyright (c) 2008 - 2018 Life of German
*/
namespace reallife_gamemode.Server.Entities namespace reallife_gamemode.Server.Entities
{ {
public class User public class User
@@ -22,5 +29,8 @@ namespace reallife_gamemode.Server.Entities
[EmailAddress] [EmailAddress]
[StringLength(64)] [StringLength(64)]
public string Email { get; set; } public string Email { get; set; }
public AdminLevel AdminLevel { get; set; }
public bool IsAdmin(AdminLevel level) => AdminLevel >= level;
} }
} }

6
Server/Events/Connect.cs
View File

@@ -7,6 +7,12 @@ using Microsoft.EntityFrameworkCore;
using reallife_gamemode.Model; using reallife_gamemode.Model;
using reallife_gamemode.Server.Entities; using reallife_gamemode.Server.Entities;
/**
* @overview Life of German Reallife - Event Login (Login.cs)
* @author VegaZ
* @copyright (c) 2008 - 2018 Life of German
*/
namespace reallife_gamemode.Server.Events namespace reallife_gamemode.Server.Events
{ {
class Connect : Script class Connect : Script

6
Server/Events/Login.cs
View File

@@ -3,6 +3,12 @@ using System.Collections.Generic;
using System.Text; using System.Text;
using GTANetworkAPI; using GTANetworkAPI;
/**
* @overview Life of German Reallife - Event Login (Login.cs)
* @author VegaZ
* @copyright (c) 2008 - 2018 Life of German
*/
namespace reallife_gamemode.Server.Events namespace reallife_gamemode.Server.Events
{ {
public class Login : Script public class Login : Script

6
Server/Events/Spawn.cs
View File

@@ -6,6 +6,12 @@ using GTANetworkAPI;
using GTANetworkMethods; using GTANetworkMethods;
using reallife_gamemode.Model; using reallife_gamemode.Model;
/**
* @overview Life of German Reallife - Event Spawn (Spawn.cs)
* @author VegaZ
* @copyright (c) 2008 - 2018 Life of German
*/
namespace reallife_gamemode.Server.Event namespace reallife_gamemode.Server.Event
{ {
public class Spawn : Script public class Spawn : Script

27
Server/Extensions/ClientExtension.cs Normal file
View File

@@ -0,0 +1,27 @@
using GTANetworkAPI;
using reallife_gamemode.Model;
using reallife_gamemode.Server.Entities;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
/**
* @overview Life of German Reallife - Client Extension (ClientExtension.cs)
* @author VegaZ, hydrant
* @copyright (c) 2008 - 2018 Life of German
*/
namespace reallife_gamemode.Server.Extensions
{
public static class ClientExtension
{
public static User GetUser(this Client client)
{
using(DatabaseContext dbContext = new DatabaseContext())
{
return dbContext.Users.FirstOrDefault(u => u.Name == client.Name);
}
}
}
}

10
Server/Managers/.gitkeep Normal file
View File

@@ -0,0 +1,10 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace reallife_gamemode.Server.Managers
{
class _
{
}
}

26
Server/Services/ChatService.cs Normal file
View File

@@ -0,0 +1,26 @@
using GTANetworkAPI;
using System;
using System.Collections.Generic;
using System.Text;
/**
* @overview Life of German Reallife - Chat Service (ChatService.cs)
* @author hydrant
* @copyright (c) 2008 - 2018 Life of German
*/
namespace reallife_gamemode.Server.Services
{
class ChatService
{
public static void NotAuthorized(Client player)
{
player.SendChatMessage("~r~[FEHLER]~s~ Du kannst diesen Befehl nicht ausführen.");
}
internal static void PlayerNotFound(Client player)
{
player.SendChatMessage("~r~[FEHLER]~s~ Der Spieler wurde nicht gefunden.");
}
}
}

36
Server/Services/ClientService.cs Normal file
View File

@@ -0,0 +1,36 @@
using GTANetworkAPI;
using System;
using System.Collections.Generic;
using System.Text;
/**
* @overview Life of German Reallife - Client Service (ClientService.cs)
* @author hydrant
* @copyright (c) 2008 - 2018 Life of German
*/
namespace reallife_gamemode.Server.Services
{
class ClientService
{
public static Client GetClientByName(string name)
{
/* Funktionsaufbau: Prüft erst, ob ein Spieler mit exakt diesem Namen online ist
* Wenn Ja: Wird dieser zurückgegeben
* Wenn Nein: Wird der erste Spieler zurückgegeben, dessen Namen mit dem eingegebenen Parameter übereinstimmt
* Gibt "null" zurück, falls kein Client gefunden wurde
*/
Client toReturn = null;
List<Client> playerList = NAPI.Pools.GetAllPlayers();
toReturn = playerList.Find(p => p.Name == name);
if(toReturn == null)
{
toReturn = playerList.Find(p => p.Name.StartsWith(name));
}
return toReturn;
}
}
}

21
Server/Util/AdminLevel.cs Normal file
View File

@@ -0,0 +1,21 @@
using System;
using System.Collections.Generic;
using System.Text;
/**
* @overview Life of German Reallife - Admin Levels (AdminLevel.cs)
* @author VegaZ, hydrant
* @copyright (c) 2008 - 2018 Life of German
*/
namespace reallife_gamemode.Server.Util
{
public enum AdminLevel : int
{
PLAYER,
SUPPORTER,
ADMIN
}
}