Merged 'develop' into feature

Server/Commands/Admin.cs

@@ -1,10 +1,9 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using GTANetworkAPI;
 using reallife_gamemode.Model;
 using reallife_gamemode.Server.Entities;
+using reallife_gamemode.Server.Events;
 using reallife_gamemode.Server.Extensions;
 using reallife_gamemode.Server.Services;
 using reallife_gamemode.Server.Util;
@@ -46,7 +45,7 @@ namespace reallife_gamemode.Server.Commands
                 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);
@@ -102,7 +101,7 @@ namespace reallife_gamemode.Server.Commands
 
             Client target = ClientService.GetClientByName(name);
 
-            if(target == null)
+            if (target == null)
             {
                 ChatService.PlayerNotFound(player);
                 return;
@@ -153,13 +152,13 @@ namespace reallife_gamemode.Server.Commands
             }
 
             option = option.ToLower();
-            
-            if(option == "load")
+
+            if (option == "load")
             {
                 NAPI.World.RequestIpl(name);
                 player.SendChatMessage("~g~Das IPL ~s~" + name + " ~g~wurde erfolgreich geladen");
             }
-            else if(option == "remove")
+            else if (option == "remove")
             {
                 NAPI.World.RemoveIpl(name);
                 player.SendChatMessage("~g~Das IPL ~s~" + name + " ~g~wurde erfolgreich entladen");
@@ -194,7 +193,7 @@ namespace reallife_gamemode.Server.Commands
 
             WeaponHash wHash = NAPI.Util.WeaponNameToModel(weapon);
 
-            if(wHash == default(WeaponHash))
+            if (wHash == default(WeaponHash))
             {
                 player.SendChatMessage("~r~[FEHLER]~s~ Diese Waffe existiert nicht.");
                 return;
@@ -241,7 +240,7 @@ namespace reallife_gamemode.Server.Commands
             using (var dbContext = new DatabaseContext())
             {
                 Entities.Faction f = dbContext.Factions.FirstOrDefault(x => x.Id == faction);
-                if(f == null && faction != 0)
+                if (f == null && faction != 0)
                 {
                     player.SendChatMessage("~r~[FEHLER]~s~ Diese Fraktion existiert nicht (Liste: ~m~/factionlist).");
                     return;
@@ -249,7 +248,7 @@ namespace reallife_gamemode.Server.Commands
 
                 User u = dbContext.Users.SingleOrDefault(x => x.Name == target.Name);
 
-                if(faction != 0)
+                if (faction != 0)
                 {
                     u.FactionId = f.Id;
                     u.FactionRankId = dbContext.FactionRanks.
@@ -270,5 +269,29 @@ namespace reallife_gamemode.Server.Commands
                 dbContext.SaveChanges();
             }
         }
+
+        [Command("save", "~m~Benutzung: ~s~/save [Typ = ~g~Blip, ~r~Marker, Ped, Pickup, TextLabel, ~g~Vehicle")]
+        public void CmdAdminSave(Client player, string typ)
+        {
+            switch (typ)
+            {
+                case "Blip":
+                    player.TriggerEvent("saveBlip");
+                    break;
+                case "Ped":
+
+                    break;
+                case "Vehicle":
+                    if (player.IsInVehicle)
+                    {
+                        Vehicle vehicle = player.Vehicle;
+                        SaveData.SaveVehicleData((VehicleHash) vehicle.Model, vehicle.Position, vehicle.Heading, vehicle.NumberPlate,
+                            Convert.ToByte(vehicle.PrimaryColor), Convert.ToByte(vehicle.SecondaryColor), vehicle.Locked, vehicle.EngineStatus, Convert.ToByte(vehicle.Dimension));
+                    }
+                    else player.SendChatMessage("~m~Du sitzt in keinem Fahrzeug!");
+                    break;
+                
+            }
+        }
     }
 }

Server/Events/SaveData.cs

@@ -0,0 +1,78 @@
+using GTANetworkAPI;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace reallife_gamemode.Server.Events
+{
+    public class SaveData : Script
+    {
+        [RemoteEvent("OnSaveBlipData")]
+        public void OnSaveBlipData(Client player, string blipSprite, string blipName, string blipScale, string blipColor,
+            string blipAlpha, string blipDrawDistance, string blipShortRange, string blipRotation, string blipDimension)
+        {
+            float x = player.Position.X;
+            float y = player.Position.Y;
+            float z = player.Position.Z;
+            short sprite = short.Parse(blipSprite);
+            string name = blipName;
+            float scale = float.Parse(blipScale);
+            byte color = Convert.ToByte(blipColor);
+            byte alpha = Convert.ToByte(blipAlpha);
+            float drawDistance = float.Parse(blipDrawDistance);
+            bool shortRange = bool.Parse(blipShortRange);
+            float rotation = float.Parse(blipRotation);
+            byte dimension = Convert.ToByte(blipDimension);
+
+            NAPI.Blip.CreateBlip(uint.Parse(blipSprite), new Vector3(x,y,z), scale, color, name, alpha, drawDistance, shortRange, short.Parse(blipRotation), dimension);
+
+            using (var saveData = new Model.DatabaseContext())
+            {
+                var dataSet = new Server.Saves.SavedBlip
+                {
+                    Sprite = sprite,
+                    PositionX = x,
+                    PositionY = y,
+                    PositionZ = z,
+                    Name = blipName,
+                    Scale = scale,
+                    Color = color,
+                    Alpha = alpha,
+                    DrawDistance = drawDistance,
+                    ShortRange = shortRange,
+                    Rotation = rotation,
+                    Dimension = dimension,
+                    Active = true
+                };
+                saveData.Blips.Add(dataSet);
+                saveData.SaveChanges();
+            }
+        }
+
+        public static void SaveVehicleData(VehicleHash vehicleModel, Vector3 vehiclePosition, float vehicleHeading,
+            string vehicleNumberPlate, byte vehiclePrimaryColor, byte vehicleSecondaryColor, bool vehicleLocked, bool vehicleEngine, byte vehicleDimension)
+        {
+            using (var saveData = new Model.DatabaseContext())
+            {
+                var dataSet = new Server.Saves.SavedVehicle
+                {
+                    Model = vehicleModel,
+                    PositionX = vehiclePosition.X,
+                    PositionY = vehiclePosition.Y,
+                    PositionZ = vehiclePosition.Z,
+                    Heading = vehicleHeading,
+                    NumberPlate = vehicleNumberPlate,
+                    PrimaryColor = vehiclePrimaryColor,
+                    SecondaryColor = vehicleSecondaryColor,
+                    Locked = vehicleLocked,
+                    Engine = vehicleEngine,
+                    Dimension = vehicleDimension,
+                    Active = true
+                };
+                saveData.Vehicles.Add(dataSet);
+                saveData.SaveChanges();
+            }
+        }
+            
+    }
+}

Server/Managers/LoadManager.cs

@@ -0,0 +1,44 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using GTANetworkAPI;
+using reallife_gamemode.Model;
+using reallife_gamemode.Server.Entities;
+
+/**
+* @overview Life of German Reallife - Managers LoadManager (LoadManager.cs)
+* @author VegaZ
+* @copyright (c) 2008 - 2018 Life of German
+*/
+
+namespace reallife_gamemode.Server.Managers
+{
+    public class LoadManager : Script
+    {
+        [ServerEvent(Event.ResourceStart)]
+        public void OnResourceStart()
+        {           
+            using (var loadData = new DatabaseContext())
+            {
+                //LOAD ALL BLIPS
+                foreach (Saves.SavedBlip b in loadData.Blips)
+                {
+                    if(b.Active == true)
+                    { 
+                        NAPI.Blip.CreateBlip((uint) b.Sprite, new Vector3(b.PositionX, b.PositionY, b.PositionZ), b.Scale, 
+                        b.Color, b.Name, b.Alpha, b.DrawDistance, b.ShortRange, (short) b.Rotation, b.Dimension);
+                    }
+                }
+                //LOAD ALL VEHICLES
+                foreach (Saves.SavedVehicle v in loadData.Vehicles)
+                {
+                    if (v.Active == true)
+                    {
+                        NAPI.Vehicle.CreateVehicle((uint)v.Model, new Vector3(v.PositionX, v.PositionY, v.PositionZ), v.Heading, (int)(v.PrimaryColor),
+                            v.SecondaryColor, v.NumberPlate, v.Alpha, v.Locked, v.Engine = false, v.Dimension);
+                    }
+                }
+            }
+        }
+    }
+}

Server/Saves/SavedBlip.cs

@@ -0,0 +1,38 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+/**
+ * @overview Life of German Reallife - Saves SavedBlip.cs
+ * @author VegaZ
+ * @copyright (c) 2008 - 2018 Life of German
+ */
+
+namespace reallife_gamemode.Server.Saves
+{
+    public class SavedBlip
+    {
+        [Key]
+        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+        public int Id { get; set; }
+        [Required]
+        public short Sprite { get; set; }
+        [Required]
+        public float PositionX { get; set; }
+        [Required]
+        public float PositionY { get; set; }
+        [Required]
+        public float PositionZ { get; set; }
+        public string Name { get; set; }
+        public float Scale { get; set; }
+        public byte Color { get; set; }
+        public byte Alpha { get; set; }
+        public float DrawDistance { get; set; }
+        public bool ShortRange { get; set; }
+        public float Rotation { get; set; }
+        public byte Dimension { get; set; }
+        public bool Active { get; set; }
+    }
+}

Server/Saves/SavedMarker.cs

@@ -0,0 +1,39 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+/**
+ * @overview Life of German Reallife - Saves SavedMarker.cs
+ * @author VegaZ
+ * @copyright (c) 2008 - 2018 Life of German
+ */
+
+namespace reallife_gamemode.Server.Saves
+{
+    public class SavedMarker
+    {
+        [Key]
+        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+        public int Id { get; set; }
+        public byte Type { get; set; }
+        public float PositionX { get; set; }
+        public float PositionY { get; set; }
+        public float PositionZ { get; set; }
+        public float Scale { get; set; }
+        public float DirectionX { get; set; }
+        public float DirectionY { get; set; }
+        public float DirectionZ { get; set; }
+        public float RotationX { get; set; }
+        public float RotationY { get; set; }
+        public float RotationZ { get; set; }
+        public byte ColorR { get; set; }
+        public byte ColorG { get; set; }
+        public byte ColorB { get; set; }
+        public byte ColorA { get; set; }
+        public bool Visible { get; set; }
+        public byte Dimension { get; set; }
+        public bool Active { get; set; }
+    }
+}

Server/Saves/SavedPed.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+/**
+ * @overview Life of German Reallife - Saves SavedPed.cs
+ * @author VegaZ
+ * @copyright (c) 2008 - 2018 Life of German
+ */
+
+namespace reallife_gamemode.Server.Saves
+{
+    public class SavedPed
+    {
+        [Key]
+        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+        public int Id { get; set; }
+        public string HashModel { get; set; }
+        public float PositionX { get; set; }
+        public float PositionY { get; set; }
+        public float PositionZ { get; set; }
+        public float Heading { get; set; }
+        public byte Dimension { get; set; }
+        public bool Active { get; set; }
+    }
+}

Server/Saves/SavedPickup.cs

@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+/**
+ * @overview Life of German Reallife - Saves SavedPickup.cs
+ * @author VegaZ
+ * @copyright (c) 2008 - 2018 Life of German
+ */
+
+namespace reallife_gamemode.Server.Saves
+{
+    public class SavedPickup
+    {
+        [Key]
+        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+        public int Id { get; set; }
+        [StringLength(128)]
+        public float PositionX { get; set; }
+        public float PositionY { get; set; }
+        public float PositionZ { get; set; }
+        public float RotationX { get; set; }
+        public float RotationY { get; set; }
+        public float RotationZ { get; set; }
+        public bool Vehicle { get; set; }
+        public int RespawnTime { get; set; }
+        public byte Dimension { get; set; }
+        public bool Active { get; set; }
+    }
+}

Server/Saves/SavedTextLabel.cs

@@ -0,0 +1,38 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+/**
+ * @overview Life of German Reallife - Saves SavedTextLabel.cs
+ * @author VegaZ
+ * @copyright (c) 2008 - 2018 Life of German
+ */
+
+namespace reallife_gamemode.Server.Saves
+{
+    public class SavedTextLabel
+    {
+        [Key]
+        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+        public int Id { get; set; }
+        [Required]
+        public string Text { get; set; }
+        [Required]
+        public float PositionX { get; set; }
+        [Required]
+        public float PositionY { get; set; }
+        [Required]
+        public float PositionZ { get; set; }
+        public bool LOS { get; set; }
+        public byte Font { get; set; }
+        public float DrawDistance { get; set; }
+        public byte ColorR { get; set; }
+        public byte ColorG { get; set; }
+        public byte ColorB { get; set; }
+        public byte ColorA { get; set; }
+        public byte Dimension { get; set; }
+        public bool Active { get; set; }
+    }
+}

Server/Saves/SavedVehicle.cs

@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using GTANetworkAPI;
+
+/**
+ * @overview Life of German Reallife - Saves SavedVehicle.cs
+ * @author VegaZ
+ * @copyright (c) 2008 - 2018 Life of German
+ */
+
+namespace reallife_gamemode.Server.Saves
+{
+    public class SavedVehicle
+    {
+        [Key]
+        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+        public int Id { get; set; }
+        public VehicleHash Model { get; set; }
+        public float PositionX { get; set; }
+        public float PositionY { get; set; }
+        public float PositionZ { get; set; }
+        public float Heading { get; set; }
+        [StringLength(8)]
+        public string NumberPlate { get; set; }
+        public byte Alpha { get; set; }
+        public byte PrimaryColor { get; set; }
+        public byte SecondaryColor { get; set; }
+        public bool Locked { get; set; }
+        public bool Engine { get; set; }
+        public byte Dimension { get; set; }
+        public bool Active { get; set; }
+    }
+}