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

formatted code

Browse Source
This commit is contained in:
Lennart Kampshoff
2019-05-05 17:59:11 +02:00
parent a34c03eae9
commit a88d5256a8
54 changed files with 290 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ReallifeGamemode.Server/Managers/ATMManager.cs
View File

@@ -28,7 +28,7 @@ namespace ReallifeGamemode.Server.Managers
{
if (currentATM.Sprite == 500)
{
if(dbContext.ATMs.FirstOrDefault(a => a.Id == currentATM.Id) == null)
if (dbContext.ATMs.FirstOrDefault(a => a.Id == currentATM.Id) == null)
{
var dataSet = new ATM
{
@@ -46,7 +46,7 @@ namespace ReallifeGamemode.Server.Managers
}
}
}
if(addedATMs > 0)
if (addedATMs > 0)
{
NAPI.Util.ConsoleOutput(addedATMs + " Geldautomaten hinzugefügt");
}
@@ -54,7 +54,7 @@ namespace ReallifeGamemode.Server.Managers
{
NAPI.Util.ConsoleOutput("Keine Geldautomaten hinzugefügt");
}
dbContext.SaveChanges();
LoadATMs();
}
@@ -83,7 +83,7 @@ namespace ReallifeGamemode.Server.Managers
}
public static void ShowAtmUi(Client player, int atmId)
{
player.TriggerEvent("SERVER:ShowAtmUi", atmId);
player.TriggerEvent("SERVER:ShowAtmUi", atmId);
}
[RemoteEvent("CLIENT:ATM_MAN:CHECK_BALANCE")]
public void CheckATMBalance(Client client, int inputField1)
@@ -94,7 +94,7 @@ namespace ReallifeGamemode.Server.Managers
using (var dbContext = new DatabaseContext())
{
var checkATM = dbContext.ATMs.FirstOrDefault(a => a.Id == nearATM);
if(checkATM.Balance < inputField1)
if (checkATM.Balance < inputField1)
{
//TODO im CEFBrowser anzeigen client.SendChatMessage("Nicht genügend Geld im Automaten. Maximal Verfügbar: " + checkATM.Balance);
client.TriggerEvent("SERVER:WORLD_INTERACTION:ATM_ERROR", 0, checkATM.Balance);
@@ -118,7 +118,7 @@ namespace ReallifeGamemode.Server.Managers
{
//GELD EINZAHLEN in1
case 0:
var updateHandMoneyIn = dbContext.Users.FirstOrDefault(u => u.Id == user.Id);
var updateBankMoneyIn = dbContext.UserBankAccounts.FirstOrDefault(b => b.UserId == user.Id);
var updateATMBalanceIn = dbContext.ATMs.FirstOrDefault(a => a.Id == nearATM);
@@ -144,6 +144,6 @@ namespace ReallifeGamemode.Server.Managers
}
dbContext.SaveChanges();
}
}
}
}
}

26
ReallifeGamemode.Server/Managers/BusinessManager.cs
View File

@@ -1,4 +1,5 @@
using GTANetworkAPI;
using Newtonsoft.Json;
using ReallifeGamemode.Server.Business;
using ReallifeGamemode.Server.Entities;
using ReallifeGamemode.Server.Extensions;
@@ -51,7 +52,7 @@ namespace ReallifeGamemode.Server.Managers
public void BusinessDepositMoney(Client player, int amount)
{
User user = player.GetUser();
if(user == null)
if (user == null)
{
return;
}
@@ -70,7 +71,8 @@ namespace ReallifeGamemode.Server.Managers
player.SendNotification("~r~Du hast nicht genug Geld");
return;
}
else */if(result == TransactionResult.SUCCESS)
else */
if (result == TransactionResult.SUCCESS)
{
player.TriggerEvent("business_updateMoney", playerBusiness.GetBankAccount().Balance.ToMoneyString());
player.SendNotification("~g~Du hast erfolgreich ~s~" + amount.ToMoneyString() + " ~g~ überwiesen");
@@ -114,14 +116,24 @@ namespace ReallifeGamemode.Server.Managers
{
ServerVehicle sVeh = veh.GetServerVehicle();
if (sVeh == null) return;
if(!(sVeh is ShopVehicle)) return;
if (!(sVeh is ShopVehicle)) return;
ShopVehicle shopVehicle = (ShopVehicle)sVeh;
player.TriggerEvent("ShopVehicle_OpenMenu", GetBusiness(shopVehicle.BusinessId).Name, shopVehicle.Price);
List<string> availableTargets = new List<string>()
{
"Spieler (dich selbst)"
};
if (player.GetUser().FactionLeader && !player.GetUser().Faction.StateOwned) availableTargets.Add("Fraktion");
if (player.GetUser().GroupRank == GroupRank.OWNER) availableTargets.Add("Gruppe");
player.TriggerEvent("ShopVehicle_OpenMenu", GetBusiness(shopVehicle.BusinessId).Name, shopVehicle.Price, availableTargets.ToArray());
}
[RemoteEvent("VehShop_BuyVehicle")]
public void CarDealerBusiness_BuyVehicle(Client player)
public void CarDealerBusiness_BuyVehicle(Client player, string target)
{
player.SendChatMessage(target);
ServerVehicle sVeh = player.Vehicle?.GetServerVehicle();
if (sVeh == null) return;
if (!(sVeh is ShopVehicle)) return;
@@ -129,7 +141,7 @@ namespace ReallifeGamemode.Server.Managers
int price = shopVehicle.Price;
CarDealerBusinessBase business = GetBusiness(shopVehicle.BusinessId) as CarDealerBusinessBase;
TransactionResult result = BankManager.TransferMoney(player.GetUser(), business, price, "Auto gekauft");
if(result == TransactionResult.SENDER_NOT_ENOUGH_MONEY)
if (result == TransactionResult.SENDER_NOT_ENOUGH_MONEY)
{
player.SendNotification("~r~Du hast nicht genug Geld: " + price.ToMoneyString());
return;
@@ -153,7 +165,7 @@ namespace ReallifeGamemode.Server.Managers
Active = true,
};
using(var dbContext = new DatabaseContext())
using (var dbContext = new DatabaseContext())
{
dbContext.UserVehicles.Add(newVeh);
dbContext.SaveChanges();

4
ReallifeGamemode.Server/Managers/CharacterCreator.cs
View File

@@ -302,7 +302,7 @@ namespace ReallifeGamemode.Server.Managers
player.SetHeadOverlay(11, blemishes);
player.SetHeadOverlay(12, blemishes);
//Gesicht (Vererbung durch Mutter / Vater)
HeadBlend headBlend = new HeadBlend()
{
@@ -324,7 +324,7 @@ namespace ReallifeGamemode.Server.Managers
//Augenfarbe
NAPI.Player.SetPlayerEyeColor(player, character.EyeColor);
}
}
}

16
ReallifeGamemode.Server/Managers/DoorManager.cs
View File

@@ -21,7 +21,7 @@ namespace ReallifeGamemode.Server.Managers
{
using (var dbContext = new DatabaseContext())
{
foreach(Door door in dbContext.Doors)
foreach (Door door in dbContext.Doors)
{
_doorColShapes[door.Id] = NAPI.ColShape.CreateSphereColShape(door.Position, 30f);
}
@@ -30,7 +30,7 @@ namespace ReallifeGamemode.Server.Managers
public static void ReloadDoors()
{
foreach(var doorPair in _doorColShapes)
foreach (var doorPair in _doorColShapes)
{
doorPair.Value.Entity<ColShape>().Delete();
}
@@ -44,12 +44,12 @@ namespace ReallifeGamemode.Server.Managers
using (var dbContext = new DatabaseContext())
{
IQueryable<Door> NearDoors = dbContext.Doors.Where(d => d.Position.DistanceTo(player.Position) <= d.Radius);
IQueryable<Door> NearDoors = dbContext.Doors.Where(d => d.Position.DistanceTo(player.Position) <= d.Radius);
foreach (Door d in NearDoors)
{
if(!user.IsAdmin(AdminLevel.ADMIN) && (d.FactionId != user.FactionId || d.FactionId == null))
if (!user.IsAdmin(AdminLevel.ADMIN) && (d.FactionId != user.FactionId || d.FactionId == null))
{
string lockState = "~r~Du hast kein Recht diese T\u00fcr " + (d.Locked == true ? "auf" : "ab") + "zuschlie\u00dfen!";
string lockState = "~r~Du hast kein Recht diese T\u00fcr " + (d.Locked == true ? "auf" : "ab") + "zuschlie\u00dfen!";
player.SendNotification(lockState, true);
continue;
}
@@ -57,7 +57,7 @@ namespace ReallifeGamemode.Server.Managers
d.Locked = !d.Locked;
string notStr = d.Name + " " + (d.Locked == false ? "~g~auf" : "~r~ab") + "geschlossen";
player.SendNotification(notStr, true);
NAPI.Pools.GetAllPlayers().ForEach(p => p.TriggerEvent("changeDoorState", d.Model, d.X, d.Y, d.Z, (d.Locked ? 1 : 0), 0.0f, 0.0f, 0.0f));
@@ -69,11 +69,11 @@ namespace ReallifeGamemode.Server.Managers
[ServerEvent(Event.PlayerEnterColshape)]
public void DoorManagerPlayerEnterColShapeEvent(ColShape colShape, Client player)
{
if(_doorColShapes.ContainsValue(colShape.Handle))
if (_doorColShapes.ContainsValue(colShape.Handle))
{
int doorId = _doorColShapes.Where(d => d.Value.Value == colShape.Handle.Value).FirstOrDefault().Key;
using(var dbContext = new DatabaseContext())
using (var dbContext = new DatabaseContext())
{
Door door = dbContext.Doors.Where(d => d.Id == doorId).First();
player.TriggerEvent("changeDoorState", door.Model, door.X, door.Y, door.Z, (door.Locked ? 1 : 0), 0.0f, 0.0f, 0.0f);

8
ReallifeGamemode.Server/Managers/InteriorManager.cs
View File

@@ -17,7 +17,7 @@ namespace ReallifeGamemode.Server.Managers
public static Interior GetInteriorByName(string name, DatabaseContext dbContext = null)
{
if(dbContext == null)
if (dbContext == null)
{
using (dbContext = new DatabaseContext())
{
@@ -114,12 +114,12 @@ namespace ReallifeGamemode.Server.Managers
{
int enterId = GetInteriorIdFromEnterColShape(colShape);
int exitId = GetInteriorIdFromExitColShape(colShape);
if(enterId != 0)
if (enterId != 0)
{
Interior interior = GetInteriorById(enterId);
player.TriggerEvent("InteriorManager_ShowHelpText", interior.Name, interior.Id, 0);
}
else if(exitId != 0)
else if (exitId != 0)
{
Interior interior = GetInteriorById(exitId);
player.TriggerEvent("InteriorManager_ShowHelpText", interior.Name, interior.Id, 1);
@@ -129,7 +129,7 @@ namespace ReallifeGamemode.Server.Managers
[ServerEvent(Event.PlayerExitColshape)]
public void InteriorManagerPlayerExitColshapeEvent(ColShape colShape, Client player)
{
if(GetInteriorIdFromEnterColShape(colShape) != 0 || GetInteriorIdFromExitColShape(colShape) != 0)
if (GetInteriorIdFromEnterColShape(colShape) != 0 || GetInteriorIdFromExitColShape(colShape) != 0)
{
player.TriggerEvent("InteriorManager_ClearHelpText");
}

8
ReallifeGamemode.Server/Managers/InventoryManager.cs
View File

@@ -218,7 +218,7 @@ namespace ReallifeGamemode.Server.Managers
int newSlot = slotArr.Min();
item.Slot = newSlot;
context.UserItems.Add(item);
context.UserItems.Add(item);
IItem iItem = GetItemById(item.ItemId);
@@ -303,14 +303,14 @@ namespace ReallifeGamemode.Server.Managers
{
Vector3 dropPosition = ClientExtension.GetPositionFromPlayer(player, 0.6f, 0);
dropPosition.Z -= 0.8f;
//new Vector3(player.Position.X, player.Position.Y, player.Position.Z - 0.8f);
//new Vector3(player.Position.X, player.Position.Y, player.Position.Z - 0.8f);
Random r = new Random();
GTANetworkAPI.Object grndObject = NAPI.Object.CreateObject(3777723516, dropPosition, new Vector3(0, 0, r.Next(0, 360)), 0);
GroundItem grndItem = new GroundItem { ItemId = iItem.Id, Amount = amount, Position = dropPosition};
GroundItem grndItem = new GroundItem { ItemId = iItem.Id, Amount = amount, Position = dropPosition };
TextLabel grndTxtLbl = NAPI.TextLabel.CreateTextLabel(iItem.Name + " ~s~(~y~" + amount + "~s~)", dropPosition, 5, 0.5f, 4, new Color(255, 255, 255), false, 0);
GroundItem.AddGroundItem(grndItem, grndObject, grndTxtLbl);
fItem.Amount -= amount;
player.TriggerEvent("removeItem", itemId, amount);
player.TriggerEvent("removeItem", itemId, amount);
}
break;
}

10
ReallifeGamemode.Server/Managers/LoadManager.cs
View File

@@ -21,14 +21,14 @@ namespace ReallifeGamemode.Server.Managers
{
foreach (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);
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);
}
}
foreach(ServerVehicle veh in loadData.ServerVehicles)
foreach (ServerVehicle veh in loadData.ServerVehicles)
{
if (!veh.Active) continue;

6
ReallifeGamemode.Server/Managers/PositionManager.cs
View File

@@ -24,11 +24,11 @@ namespace ReallifeGamemode.Server.Managers
foreach (DutyPoint d in DutyPoints)
{
NAPI.Marker.CreateMarker(1, new Vector3(d.Position.X, d.Position.Y, d.Position.Z - 2), new Vector3(d.Position.X, d.Position.Y, d.Position.Z + 1),
new Vector3(0,0,0), 3, new Color(255, 255, 255, 50), false, 0);
NAPI.Marker.CreateMarker(1, new Vector3(d.Position.X, d.Position.Y, d.Position.Z - 2), new Vector3(d.Position.X, d.Position.Y, d.Position.Z + 1),
new Vector3(0, 0, 0), 3, new Color(255, 255, 255, 50), false, 0);
NAPI.TextLabel.CreateTextLabel("Stempeluhr - Dr\u00fccke ~y~E\n~s~Dienstkleidung - Dr\u00fccke ~y~K", d.Position, 7, 1, 0, new Color(255, 255, 255), false, 0);
}
}
}
}
public class DutyPoint

4
ReallifeGamemode.Server/Managers/SaveManager.cs
View File

@@ -28,7 +28,7 @@ namespace ReallifeGamemode.Server.Managers
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);
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 DatabaseContext())
{
@@ -170,7 +170,7 @@ namespace ReallifeGamemode.Server.Managers
}
saveAll.SaveChanges();
}
}
}
}
}

2
ReallifeGamemode.Server/Managers/TimeManager.cs
View File

@@ -12,7 +12,7 @@ namespace ReallifeGamemode.Server.Managers
public static void StartTimeManager()
{
if(realTimeTimer == null)
if (realTimeTimer == null)
{
realTimeTimer = new Timer(1000);
realTimeTimer.Elapsed += SetTime;

18
ReallifeGamemode.Server/Managers/TuningManager.cs
View File

@@ -31,10 +31,10 @@ namespace ReallifeGamemode.Server.Managers
colShape.OnEntityEnterColShape += (cs, c) =>
{
if(c.IsInVehicle)
if (c.IsInVehicle)
{
Vehicle v = c.Vehicle;
if(v.GetServerVehicle() is FactionVehicle fV && fV.GetFaction().StateOwned)
if (v.GetServerVehicle() is FactionVehicle fV && fV.GetFaction().StateOwned)
{
return;
}
@@ -60,13 +60,13 @@ namespace ReallifeGamemode.Server.Managers
using (var dbContext = new DatabaseContext())
{
foreach(VehicleMod vMod in dbContext.VehicleMods.ToList().FindAll(vM => vM.ServerVehicleId == sVeh.Id))
foreach (VehicleMod vMod in dbContext.VehicleMods.ToList().FindAll(vM => vM.ServerVehicleId == sVeh.Id))
{
if(vMod.Slot == 18)
if (vMod.Slot == 18)
{
veh.SetSharedData("mod" + vMod.Slot, true);
}
else if(vMod.Slot == 22)
else if (vMod.Slot == 22)
{
int color = vMod.ModId - 2;
if (vMod.ModId == 0) color = -1;
@@ -99,9 +99,9 @@ namespace ReallifeGamemode.Server.Managers
Vehicle pV = player.Vehicle;
if (index == 0) index--;
if(slot != 18)
if (slot != 18)
{
if(slot == 22)
if (slot == 22)
{
int color = index - 2;
if (index == 0) color = -1;
@@ -126,7 +126,7 @@ namespace ReallifeGamemode.Server.Managers
using (var dbContext = new DatabaseContext())
{
VehicleMod vMod = dbContext.VehicleMods.FirstOrDefault(m => m.ServerVehicleId == sV.Id && m.Slot == slot);
if(vMod == null && index != -1)
if (vMod == null && index != -1)
{
vMod = new VehicleMod
{
@@ -136,7 +136,7 @@ namespace ReallifeGamemode.Server.Managers
};
dbContext.VehicleMods.Add(vMod);
}
else if(vMod != null && index == -1)
else if (vMod != null && index == -1)
{
dbContext.VehicleMods.Remove(vMod);
}

10
ReallifeGamemode.Server/Managers/VehicleManager.cs
View File

@@ -117,7 +117,7 @@ namespace ReallifeGamemode.Server.Managers
public static void AddVehicle(ServerVehicle serverVehicle, Vehicle vehicle)
{
if(_serverVehicles.ContainsKey(serverVehicle.Id))
if (_serverVehicles.ContainsKey(serverVehicle.Id))
{
return;
}
@@ -152,7 +152,7 @@ namespace ReallifeGamemode.Server.Managers
public static Vehicle GetVehicleFromServerVehicle(ServerVehicle serverVehicle)
{
if(!_serverVehicles.ContainsKey(serverVehicle.Id))
if (!_serverVehicles.ContainsKey(serverVehicle.Id))
{
return null;
}
@@ -162,7 +162,7 @@ namespace ReallifeGamemode.Server.Managers
public static ServerVehicle GetServerVehicleFromVehicle(Vehicle veh, DatabaseContext dbContext = null)
{
if(dbContext == null)
if (dbContext == null)
{
using (dbContext = new DatabaseContext())
{
@@ -191,12 +191,12 @@ namespace ReallifeGamemode.Server.Managers
public static bool IsValidHash(uint hash)
{
foreach(VehicleHash vh in Enum.GetValues(typeof(VehicleHash)))
foreach (VehicleHash vh in Enum.GetValues(typeof(VehicleHash)))
{
if ((uint)vh == hash) return true;
}
foreach(string mod in _enabledMods)
foreach (string mod in _enabledMods)
{
if (NAPI.Util.GetHashKey(mod) == hash) return true;
}