Adapted Save- and LoadManager to new Vehicle System

This commit is contained in:
hydrant
2018-11-29 20:04:40 +01:00
parent b83c071e45
commit fab3f05575
8 changed files with 114 additions and 66 deletions

View File

@@ -1,7 +1,9 @@
using GTANetworkAPI;
using reallife_gamemode.Model;
using reallife_gamemode.Server.Entities;
using reallife_gamemode.Server.Extensions;
using reallife_gamemode.Server.Managers;
using reallife_gamemode.Server.Saves;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -30,9 +32,9 @@ namespace reallife_gamemode.Server.Events
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())
using (var saveData = new DatabaseContext())
{
var dataSet = new Server.Saves.SavedBlip
var dataSet = new SavedBlip
{
Sprite = sprite,
PositionX = x,
@@ -53,12 +55,12 @@ namespace reallife_gamemode.Server.Events
}
}
public static void SaveVehicleData(VehicleHash vehicleModel, Vector3 vehiclePosition, float vehicleHeading,
string vehicleNumberPlate, byte vehiclePrimaryColor, byte vehicleSecondaryColor, bool vehicleLocked, bool vehicleEngine, byte vehicleDimension)
public static Vehicle SaveVehicleData(Vehicle veh, VehicleHash vehicleModel, Vector3 vehiclePosition, float vehicleHeading,
string vehicleNumberPlate, int vehiclePrimaryColor, int vehicleSecondaryColor, bool vehicleLocked)
{
using (var saveData = new Model.DatabaseContext())
using (var saveData = new DatabaseContext())
{
var dataSet = new Server.Saves.SavedVehicle
var dataSet = new SavedVehicle
{
Model = vehicleModel,
PositionX = vehiclePosition.X,
@@ -71,16 +73,19 @@ namespace reallife_gamemode.Server.Events
Locked = vehicleLocked,
Active = true
};
saveData.ServerVehicles.Add(dataSet);
saveData.Vehicles.Add(dataSet);
saveData.SaveChanges();
return dataSet.Spawn(veh);
}
}
public static void SaveFactionVehicleData(VehicleHash vehicleModel, Vector3 vehiclePosition, float vehicleHeading,
string vehicleNumberPlate, byte vehiclePrimaryColor, byte vehicleSecondaryColor, bool vehicleLocked, bool vehicleEngine, byte vehicleDimension, int? factionId)
public static Vehicle SaveFactionVehicleData(Vehicle veh, VehicleHash vehicleModel, Vector3 vehiclePosition, float vehicleHeading,
string vehicleNumberPlate, int vehiclePrimaryColor, int vehicleSecondaryColor, bool vehicleLocked, bool vehicleEngine, int? factionId)
{
using (var saveData = new Model.DatabaseContext())
using (var saveData = new DatabaseContext())
{
var dataSet = new Entities.FactionVehicle
Console.WriteLine("Adding Faction Vehicle Secondary Color: " + vehicleSecondaryColor);
var dataSet = new FactionVehicle
{
Model = vehicleModel,
FactionId = factionId,
@@ -94,16 +99,18 @@ namespace reallife_gamemode.Server.Events
Locked = vehicleLocked,
Active = true
};
saveData.ServerVehicles.Add(dataSet);
saveData.FactionVehicles.Add(dataSet);
saveData.SaveChanges();
return dataSet.Spawn(veh);
}
}
public static void SaveShopVehicleData(VehicleHash vehicleModel, string vehicleModelName, Vector3 vehiclePosition, float vehicleHeading,
string vehicleNumberPlate, byte vehiclePrimaryColor, byte vehicleSecondaryColor, byte vehicleDimension, int? factionId)
public static Vehicle SaveShopVehicleData(Vehicle veh, VehicleHash vehicleModel, string vehicleModelName, Vector3 vehiclePosition, float vehicleHeading,
string vehicleNumberPlate, int vehiclePrimaryColor, int vehicleSecondaryColor)
{
using (var saveData = new Model.DatabaseContext())
using (var saveData = new DatabaseContext())
{
var dataSet = new Entities.ShopVehicle
var dataSet = new ShopVehicle
{
Model = vehicleModel,
PositionX = vehiclePosition.X,
@@ -115,8 +122,10 @@ namespace reallife_gamemode.Server.Events
SecondaryColor = vehicleSecondaryColor,
Active = true
};
saveData.ServerVehicles.Add(dataSet);
saveData.ShopVehicles.Add(dataSet);
saveData.SaveChanges();
return dataSet.Spawn(veh);
}
}