diff --git a/ReallifeGamemode.Client/assets/sound/fun/bitcoinnect.mp3 b/ReallifeGamemode.Client/assets/sound/fun/bitcoinnect.mp3 new file mode 100644 index 00000000..b224b750 Binary files /dev/null and b/ReallifeGamemode.Client/assets/sound/fun/bitcoinnect.mp3 differ diff --git a/ReallifeGamemode.Database/Migrations/20200424163014_UserTimePlayed.cs b/ReallifeGamemode.Database/Migrations/20200424163014_UserTimePlayed.cs index 108e7330..485855f5 100644 --- a/ReallifeGamemode.Database/Migrations/20200424163014_UserTimePlayed.cs +++ b/ReallifeGamemode.Database/Migrations/20200424163014_UserTimePlayed.cs @@ -2,22 +2,22 @@ namespace ReallifeGamemode.Database.Migrations { - public partial class UserTimePlayed : Migration + public partial class UserTimePlayed : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) { - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.AddColumn( - name: "PlayedMinutes", - table: "Users", - nullable: false, - defaultValue: 0); - } - - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropColumn( - name: "PlayedMinutes", - table: "Users"); - } + migrationBuilder.AddColumn( + name: "PlayedMinutes", + table: "Users", + nullable: false, + defaultValue: 0); } + + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropColumn( + name: "PlayedMinutes", + table: "Users"); + } + } } diff --git a/ReallifeGamemode.Database/Migrations/20200427131454_UserJobSkillBusPilot.cs b/ReallifeGamemode.Database/Migrations/20200427131454_UserJobSkillBusPilot.cs index ea75a465..698f5fd2 100644 --- a/ReallifeGamemode.Database/Migrations/20200427131454_UserJobSkillBusPilot.cs +++ b/ReallifeGamemode.Database/Migrations/20200427131454_UserJobSkillBusPilot.cs @@ -2,32 +2,32 @@ namespace ReallifeGamemode.Database.Migrations { - public partial class UserJobSkillBusPilot : Migration + public partial class UserJobSkillBusPilot : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) { - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.AddColumn( - name: "BusSkill", - table: "Users", - nullable: false, - defaultValue: 0); + migrationBuilder.AddColumn( + name: "BusSkill", + table: "Users", + nullable: false, + defaultValue: 0); - migrationBuilder.AddColumn( - name: "PilotSkill", - table: "Users", - nullable: false, - defaultValue: 0); - } - - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropColumn( - name: "BusSkill", - table: "Users"); - - migrationBuilder.DropColumn( - name: "PilotSkill", - table: "Users"); - } + migrationBuilder.AddColumn( + name: "PilotSkill", + table: "Users", + nullable: false, + defaultValue: 0); } + + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropColumn( + name: "BusSkill", + table: "Users"); + + migrationBuilder.DropColumn( + name: "PilotSkill", + table: "Users"); + } + } } diff --git a/ReallifeGamemode.Database/Migrations/20200506184310_FactionVehicleBuyPrice.cs b/ReallifeGamemode.Database/Migrations/20200506184310_FactionVehicleBuyPrice.cs index cda51a07..6db02682 100644 --- a/ReallifeGamemode.Database/Migrations/20200506184310_FactionVehicleBuyPrice.cs +++ b/ReallifeGamemode.Database/Migrations/20200506184310_FactionVehicleBuyPrice.cs @@ -2,21 +2,21 @@ namespace ReallifeGamemode.Database.Migrations { - public partial class FactionVehicleBuyPrice : Migration + public partial class FactionVehicleBuyPrice : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) { - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.AddColumn( - name: "BuyPrice", - table: "ServerVehicles", - nullable: true); - } - - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropColumn( - name: "BuyPrice", - table: "ServerVehicles"); - } + migrationBuilder.AddColumn( + name: "BuyPrice", + table: "ServerVehicles", + nullable: true); } + + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropColumn( + name: "BuyPrice", + table: "ServerVehicles"); + } + } } diff --git a/ReallifeGamemode.Database/Migrations/20200802143111_AddUserOtherAmount.cs b/ReallifeGamemode.Database/Migrations/20200802143111_AddUserOtherAmount.cs index e1ca995e..eca8ecff 100644 --- a/ReallifeGamemode.Database/Migrations/20200802143111_AddUserOtherAmount.cs +++ b/ReallifeGamemode.Database/Migrations/20200802143111_AddUserOtherAmount.cs @@ -2,42 +2,42 @@ namespace ReallifeGamemode.Database.Migrations { - public partial class AddUserOtherAmount : Migration + public partial class AddUserOtherAmount : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) { - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.AddColumn( - name: "otheramount", - table: "Users", - nullable: false, - defaultValue: 0); + migrationBuilder.AddColumn( + name: "otheramount", + table: "Users", + nullable: false, + defaultValue: 0); - migrationBuilder.AddColumn( - name: "trashcount", - table: "Users", - nullable: false, - defaultValue: 0); + migrationBuilder.AddColumn( + name: "trashcount", + table: "Users", + nullable: false, + defaultValue: 0); - migrationBuilder.AddColumn( - name: "GangOwned", - table: "Factions", - nullable: false, - defaultValue: false); - } - - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropColumn( - name: "otheramount", - table: "Users"); - - migrationBuilder.DropColumn( - name: "trashcount", - table: "Users"); - - migrationBuilder.DropColumn( - name: "GangOwned", - table: "Factions"); - } + migrationBuilder.AddColumn( + name: "GangOwned", + table: "Factions", + nullable: false, + defaultValue: false); } + + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropColumn( + name: "otheramount", + table: "Users"); + + migrationBuilder.DropColumn( + name: "trashcount", + table: "Users"); + + migrationBuilder.DropColumn( + name: "GangOwned", + table: "Factions"); + } + } } diff --git a/ReallifeGamemode.Server/Bank/bank.cs b/ReallifeGamemode.Server/Bank/bank.cs index 0033bf70..30563943 100644 --- a/ReallifeGamemode.Server/Bank/bank.cs +++ b/ReallifeGamemode.Server/Bank/bank.cs @@ -23,7 +23,7 @@ namespace ReallifeGamemode.Server.Bank private static ColShape _colShape; private static ColShape _factioncolShape; public static Vector3 Position { get; } - + public static void Setup() { @@ -61,8 +61,8 @@ namespace ReallifeGamemode.Server.Bank if (client.IsInVehicle || !client.IsLoggedIn()) return; if (client.GetUser().FactionLeader == true) - { - client.TriggerEvent("showFactionBankMenuLeader", client.GetUser().Faction.BankAccount.Balance.ToString()); + { + client.TriggerEvent("showFactionBankMenuLeader", client.GetUser().Faction.BankAccount.Balance.ToString()); } client.TriggerEvent("showFactionBankMenu", client.GetUser().Faction.BankAccount.Balance.ToString()); } @@ -125,19 +125,20 @@ namespace ReallifeGamemode.Server.Bank string nameOrId = (string)JsonConvert.DeserializeObject(jsonNameOrId); int amount = Int32.Parse(stringAmount); Player target = PlayerService.GetPlayerByNameOrId(nameOrId); - + using (var dbContext = new DatabaseContext()) { - if(player.GetUser(dbContext) == target.GetUser(dbContext)) + if (player.GetUser(dbContext) == target.GetUser(dbContext)) { player.SendNotification($"~r~Du kannst dir selber kein Geld überweisen."); return; - }else if(!target.IsLoggedIn()) + } + else if (!target.IsLoggedIn()) { player.SendNotification($"~r~Dieser Spieler ist nicht Online."); } - else if (amount <= 0 || (int)(amount*1.05) > player.GetUser(dbContext).BankAccount.Balance) + else if (amount <= 0 || (int)(amount * 1.05) > player.GetUser(dbContext).BankAccount.Balance) { player.SendNotification($"~r~Dieser Betrag kann nicht überwiesen werden."); return; @@ -145,7 +146,7 @@ namespace ReallifeGamemode.Server.Bank else { player.SendNotification($"~w~Du hast {target.Name} $~g~{amount} ~w~Überwiesen."); - player.GetUser(dbContext).BankAccount.Balance -= (int)(amount*1.05); + player.GetUser(dbContext).BankAccount.Balance -= (int)(amount * 1.05); target.GetUser(dbContext).otheramount = amount; dbContext.SaveChanges(); } @@ -204,5 +205,5 @@ namespace ReallifeGamemode.Server.Bank } } } - + } diff --git a/ReallifeGamemode.Server/Commands/AdminCommands.cs b/ReallifeGamemode.Server/Commands/AdminCommands.cs index db494d96..1cc72d39 100644 --- a/ReallifeGamemode.Server/Commands/AdminCommands.cs +++ b/ReallifeGamemode.Server/Commands/AdminCommands.cs @@ -467,6 +467,25 @@ namespace ReallifeGamemode.Server.Commands } } + [Command("bitcoin", "~m~/bitcoin [ID]")] + public void CmdAdminBitcoin(Player player, string name) + { + if (!player.GetUser()?.IsAdmin(AdminLevel.SUPPORTER) ?? true) + { + ChatService.NotAuthorized(player); + return; + } + + Player target = PlayerService.GetPlayerByNameOrId(name); + if (target == null || !target.IsLoggedIn()) + { + ChatService.PlayerNotFound(player); + return; + } + + target.TriggerEvent("CLIENT:PlaySound", "fun/bitcoinnect", "mp3", 50); + } + #endregion Support #region ALevel1 diff --git a/ReallifeGamemode.Server/Commands/GroupCommands.cs b/ReallifeGamemode.Server/Commands/GroupCommands.cs index 8d86b9c3..47c790e9 100644 --- a/ReallifeGamemode.Server/Commands/GroupCommands.cs +++ b/ReallifeGamemode.Server/Commands/GroupCommands.cs @@ -1,4 +1,4 @@ -using System.Text.RegularExpressions; +using System.Text.RegularExpressions; using GTANetworkAPI; using ReallifeGamemode.Server.Extensions; using ReallifeGamemode.Server.Services; diff --git a/ReallifeGamemode.Server/Commands/UserCommands.cs b/ReallifeGamemode.Server/Commands/UserCommands.cs index 70e657e0..9a170770 100644 --- a/ReallifeGamemode.Server/Commands/UserCommands.cs +++ b/ReallifeGamemode.Server/Commands/UserCommands.cs @@ -41,7 +41,8 @@ namespace ReallifeGamemode.Server.Commands if (player.IsInVehicle) { pVeh = player.Vehicle; - } else + } + else { pVeh = NAPI.Pools.GetAllVehicles().Where(v => v.Position.DistanceTo(player.Position) <= 5).FirstOrDefault(); } diff --git a/ReallifeGamemode.Server/DrivingSchool/DrivingSchool.cs b/ReallifeGamemode.Server/DrivingSchool/DrivingSchool.cs index 7c75a9dc..c82e5ab0 100644 --- a/ReallifeGamemode.Server/DrivingSchool/DrivingSchool.cs +++ b/ReallifeGamemode.Server/DrivingSchool/DrivingSchool.cs @@ -108,7 +108,7 @@ namespace ReallifeGamemode.Server.DrivingSchool [RemoteEvent("startDrivingSchool")] public void StartDrivingSchool(Player client) - { + { User user = client.GetUser(); if (user.DriverLicenseVehicle || client.HasData("ActiveSchool")) { @@ -125,7 +125,7 @@ namespace ReallifeGamemode.Server.DrivingSchool { User payer = client.GetUser(dbContext); payer.Handmoney -= 2500; - // client.TriggerEvent("SERVER:SET_HANDMONEY", payer.Handmoney); + // client.TriggerEvent("SERVER:SET_HANDMONEY", payer.Handmoney); dbContext.SaveChanges(); } @@ -207,7 +207,7 @@ namespace ReallifeGamemode.Server.DrivingSchool { User user = client.GetUser(); if (user.DriverLicenseBike || client.HasData("ActiveSchool")) - { + { client.SendChatMessage("~b~[INFO]~s~ Du besitzt schon einen Motorradschein."); return; } @@ -221,7 +221,7 @@ namespace ReallifeGamemode.Server.DrivingSchool { User payer = client.GetUser(dbContext); payer.Handmoney -= 3500; - // client.TriggerEvent("SERVER:SET_HANDMONEY", payer.Handmoney); + // client.TriggerEvent("SERVER:SET_HANDMONEY", payer.Handmoney); dbContext.SaveChanges(); } diff --git a/ReallifeGamemode.Server/DrivingSchool/Licenses.cs b/ReallifeGamemode.Server/DrivingSchool/Licenses.cs index f666bf10..7b6a8083 100644 --- a/ReallifeGamemode.Server/DrivingSchool/Licenses.cs +++ b/ReallifeGamemode.Server/DrivingSchool/Licenses.cs @@ -1,4 +1,4 @@ -using Newtonsoft.Json; +using Newtonsoft.Json; namespace ReallifeGamemode.Server.DrivingSchool { diff --git a/ReallifeGamemode.Server/DrivingSchool/PlaneSchool.cs b/ReallifeGamemode.Server/DrivingSchool/PlaneSchool.cs index c75ac8b9..3a1cce79 100644 --- a/ReallifeGamemode.Server/DrivingSchool/PlaneSchool.cs +++ b/ReallifeGamemode.Server/DrivingSchool/PlaneSchool.cs @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections.Generic; using GTANetworkAPI; using ReallifeGamemode.Database.Entities; using ReallifeGamemode.Database.Models; @@ -70,7 +70,7 @@ namespace ReallifeGamemode.Server.DrivingSchool User user = client.GetUser(); if (user.FlyingLicensePlane || client.HasData("ActiveSchool")) - { + { client.SendChatMessage("~b~[INFO]~s~ Du besitzt schon einen Flugschein."); return; } diff --git a/ReallifeGamemode.Server/Events/Chat.cs b/ReallifeGamemode.Server/Events/Chat.cs index 38c7d99e..e20a7499 100644 --- a/ReallifeGamemode.Server/Events/Chat.cs +++ b/ReallifeGamemode.Server/Events/Chat.cs @@ -1,4 +1,4 @@ -using System.Text.RegularExpressions; +using System.Text.RegularExpressions; using GTANetworkAPI; using ReallifeGamemode.Server.Services; diff --git a/ReallifeGamemode.Server/Events/Disconnect.cs b/ReallifeGamemode.Server/Events/Disconnect.cs index 84fe2fb8..0c8db44a 100644 --- a/ReallifeGamemode.Server/Events/Disconnect.cs +++ b/ReallifeGamemode.Server/Events/Disconnect.cs @@ -63,12 +63,12 @@ namespace ReallifeGamemode.Server.Events { //if (player.Vehicle.GetData("timerJobVehicleRespawn") == true) //{ - if (player.Vehicle.GetServerVehicle() is JobVehicle vehJ) - { - player.Vehicle.ResetData("timerJobVehicleRespawn"); - ServerVehicle sVeh = VehicleManager.GetServerVehicleFromVehicle(player.Vehicle); - ServerVehicleExtensions.Spawn(sVeh, player.Vehicle); - } + if (player.Vehicle.GetServerVehicle() is JobVehicle vehJ) + { + player.Vehicle.ResetData("timerJobVehicleRespawn"); + ServerVehicle sVeh = VehicleManager.GetServerVehicleFromVehicle(player.Vehicle); + ServerVehicleExtensions.Spawn(sVeh, player.Vehicle); + } //} } if (Managers.JobManager.playerTimersJobVehicleRespawn.ContainsKey(player)) diff --git a/ReallifeGamemode.Server/Events/EnterVehicleAttempt.cs b/ReallifeGamemode.Server/Events/EnterVehicleAttempt.cs index e3135d51..46e58036 100644 --- a/ReallifeGamemode.Server/Events/EnterVehicleAttempt.cs +++ b/ReallifeGamemode.Server/Events/EnterVehicleAttempt.cs @@ -50,13 +50,13 @@ namespace ReallifeGamemode.Server.Events player.SendNotification("~r~Du darfst dieses Fahrzeug nicht benutzen!", true); return; } - else if(u.IsAdmin(AdminLevel.HEADADMIN) && player.IsAdminDuty()) + else if (u.IsAdmin(AdminLevel.HEADADMIN) && player.IsAdminDuty()) { } else { if ((VehicleHash)vehicle.Model == VehicleHash.Velum && player.GetUser().PilotSkill < 300) - { + { player.SetData("JobVehicleFrei", true); player.StopAnimation(); player.SendNotification("~y~[JOB] ~r~Du besitzt nicht das nötige Skill Level(2)!"); diff --git a/ReallifeGamemode.Server/Events/ExitVehicle.cs b/ReallifeGamemode.Server/Events/ExitVehicle.cs index 15f3cb9e..aae975c7 100644 --- a/ReallifeGamemode.Server/Events/ExitVehicle.cs +++ b/ReallifeGamemode.Server/Events/ExitVehicle.cs @@ -88,10 +88,10 @@ namespace ReallifeGamemode.Server.Events { //if (!p.IsInVehicle) //{ - if (p.GetData("HatNoobSpawnVehicle") == true) - { - p.ResetData("HatNoobSpawnVehicle"); - } + if (p.GetData("HatNoobSpawnVehicle") == true) + { + p.ResetData("HatNoobSpawnVehicle"); + } //} }); }); diff --git a/ReallifeGamemode.Server/Events/Faction.cs b/ReallifeGamemode.Server/Events/Faction.cs index a2f41ea5..e2dfb524 100644 --- a/ReallifeGamemode.Server/Events/Faction.cs +++ b/ReallifeGamemode.Server/Events/Faction.cs @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; using GTANetworkAPI; using Newtonsoft.Json; diff --git a/ReallifeGamemode.Server/Events/PlayerSpawn.cs b/ReallifeGamemode.Server/Events/PlayerSpawn.cs index 6eed08d8..26fe7dab 100644 --- a/ReallifeGamemode.Server/Events/PlayerSpawn.cs +++ b/ReallifeGamemode.Server/Events/PlayerSpawn.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Text; using GTANetworkAPI; diff --git a/ReallifeGamemode.Server/Events/Siren.cs b/ReallifeGamemode.Server/Events/Siren.cs index 75e3f199..ec6f6355 100644 --- a/ReallifeGamemode.Server/Events/Siren.cs +++ b/ReallifeGamemode.Server/Events/Siren.cs @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections.Generic; using GTANetworkAPI; namespace ReallifeGamemode.Server.Events diff --git a/ReallifeGamemode.Server/Events/UpdateCharacterCloth.cs b/ReallifeGamemode.Server/Events/UpdateCharacterCloth.cs index 6b089aa9..727053fa 100644 --- a/ReallifeGamemode.Server/Events/UpdateCharacterCloth.cs +++ b/ReallifeGamemode.Server/Events/UpdateCharacterCloth.cs @@ -61,7 +61,7 @@ namespace ReallifeGamemode.Server.Events int[] clothId = JsonConvert.DeserializeObject(JClothId); user = client.GetUser(context); - + var character = user.GetCharacter(context); var charClothes = context.CharacterClothes.FirstOrDefault(c => c.UserId == user.Id && c.Duty); @@ -137,7 +137,7 @@ namespace ReallifeGamemode.Server.Events if (user.GetData("duty") == false) { LoadCharacterDefaults(client); - } + } } [RemoteEvent("defaultCharacterCloth")] @@ -159,10 +159,10 @@ namespace ReallifeGamemode.Server.Events { if (cloth.SlotType == 1) { - if(cloth.ClothId != -1) + if (cloth.ClothId != -1) { NAPI.Player.SetPlayerAccessory(player, cloth.SlotId, cloth.ClothId, 0); - } + } } else { diff --git a/ReallifeGamemode.Server/Events/UpdateCharacterElevator.cs b/ReallifeGamemode.Server/Events/UpdateCharacterElevator.cs index 7015bb25..33955c27 100644 --- a/ReallifeGamemode.Server/Events/UpdateCharacterElevator.cs +++ b/ReallifeGamemode.Server/Events/UpdateCharacterElevator.cs @@ -1,4 +1,4 @@ -using GTANetworkAPI; +using GTANetworkAPI; using ReallifeGamemode.Server.Managers; namespace ReallifeGamemode.Server.Events diff --git a/ReallifeGamemode.Server/Events/UpdateCharacterWeapon.cs b/ReallifeGamemode.Server/Events/UpdateCharacterWeapon.cs index d7dd96c6..5b51c3e6 100644 --- a/ReallifeGamemode.Server/Events/UpdateCharacterWeapon.cs +++ b/ReallifeGamemode.Server/Events/UpdateCharacterWeapon.cs @@ -84,16 +84,16 @@ namespace ReallifeGamemode.Server.Events client.GiveWeapon((WeaponHash)primary, 300); client.GiveWeapon((WeaponHash)secondary, 100); client.GiveWeapon((WeaponHash)melee, 1); - - - if (!uint.TryParse(specialModel, out uint special)) - { - if (specialModel.Contains("mk2") && !specialModel.Contains("_mk2")) specialModel = specialModel.Replace("mk2", "_mk2"); - special = NAPI.Util.GetHashKey($"weapon_{specialModel}"); - } - client.GiveWeapon((WeaponHash)special, 30); - - if(armor == "Schutzweste") + + + if (!uint.TryParse(specialModel, out uint special)) + { + if (specialModel.Contains("mk2") && !specialModel.Contains("_mk2")) specialModel = specialModel.Replace("mk2", "_mk2"); + special = NAPI.Util.GetHashKey($"weapon_{specialModel}"); + } + client.GiveWeapon((WeaponHash)special, 30); + + if (armor == "Schutzweste") { client.Armor = 100; } diff --git a/ReallifeGamemode.Server/Events/Vehicle.cs b/ReallifeGamemode.Server/Events/Vehicle.cs index a756304b..edc9c57c 100644 --- a/ReallifeGamemode.Server/Events/Vehicle.cs +++ b/ReallifeGamemode.Server/Events/Vehicle.cs @@ -69,7 +69,7 @@ namespace ReallifeGamemode.Server.Events } } VehicleStreaming.SetEngineState(v, !state); - + } } diff --git a/ReallifeGamemode.Server/Events/Voice.cs b/ReallifeGamemode.Server/Events/Voice.cs index 871474f2..adbeebac 100644 --- a/ReallifeGamemode.Server/Events/Voice.cs +++ b/ReallifeGamemode.Server/Events/Voice.cs @@ -1,4 +1,4 @@ -using GTANetworkAPI; +using GTANetworkAPI; /** * @overview Life of German Reallife - Event Voice (Voice.cs) diff --git a/ReallifeGamemode.Server/Extensions/EnumExtensions.cs b/ReallifeGamemode.Server/Extensions/EnumExtensions.cs index 01412e79..99c0c7f7 100644 --- a/ReallifeGamemode.Server/Extensions/EnumExtensions.cs +++ b/ReallifeGamemode.Server/Extensions/EnumExtensions.cs @@ -1,4 +1,4 @@ -using ReallifeGamemode.Server.Types; +using ReallifeGamemode.Server.Types; using static ReallifeGamemode.Server.Types.AdminLevel; namespace ReallifeGamemode.Server.Extensions diff --git a/ReallifeGamemode.Server/Extensions/HouseExtensions.cs b/ReallifeGamemode.Server/Extensions/HouseExtensions.cs index 58bb2341..842b6fd1 100644 --- a/ReallifeGamemode.Server/Extensions/HouseExtensions.cs +++ b/ReallifeGamemode.Server/Extensions/HouseExtensions.cs @@ -1,4 +1,4 @@ -using System.Linq; +using System.Linq; using Microsoft.EntityFrameworkCore; using ReallifeGamemode.Database.Entities; using ReallifeGamemode.Database.Models; diff --git a/ReallifeGamemode.Server/Extensions/IntegerExtension.cs b/ReallifeGamemode.Server/Extensions/IntegerExtension.cs index 2e8dd657..6a62a509 100644 --- a/ReallifeGamemode.Server/Extensions/IntegerExtension.cs +++ b/ReallifeGamemode.Server/Extensions/IntegerExtension.cs @@ -1,4 +1,4 @@ -namespace ReallifeGamemode.Server.Extensions +namespace ReallifeGamemode.Server.Extensions { public static class IntegerExtension { diff --git a/ReallifeGamemode.Server/Extensions/ListExtensions.cs b/ReallifeGamemode.Server/Extensions/ListExtensions.cs index a380ea0f..ae9c665f 100644 --- a/ReallifeGamemode.Server/Extensions/ListExtensions.cs +++ b/ReallifeGamemode.Server/Extensions/ListExtensions.cs @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; using GTANetworkAPI; diff --git a/ReallifeGamemode.Server/Factions/Medic/Medic.cs b/ReallifeGamemode.Server/Factions/Medic/Medic.cs index d6dbf693..3dd8a1ff 100644 --- a/ReallifeGamemode.Server/Factions/Medic/Medic.cs +++ b/ReallifeGamemode.Server/Factions/Medic/Medic.cs @@ -15,7 +15,7 @@ namespace ReallifeGamemode.Server.Factions.Medic public static List ReviveTasks = new List(); public static List HealTasks = new List(); public static List FireTasks = new List(); - + public static void AddTaskToList(MedicTask task) { if (task == null) diff --git a/ReallifeGamemode.Server/Finance/Economy.cs b/ReallifeGamemode.Server/Finance/Economy.cs index 44135fd2..2e9127f9 100644 --- a/ReallifeGamemode.Server/Finance/Economy.cs +++ b/ReallifeGamemode.Server/Finance/Economy.cs @@ -76,7 +76,7 @@ namespace ReallifeGamemode.Server.Finance float propertyTax = GetPropertyTaxation(client); int vehicleTaxation = GetVehicleTaxation(client); int rentalFees = GetRentalFees(client); - + int healthInsurance = (int)(user.BankAccount.Balance * 0.001); if (healthInsurance < 0) { diff --git a/ReallifeGamemode.Server/Job/BusDriverJob.cs b/ReallifeGamemode.Server/Job/BusDriverJob.cs index 54a86f06..cb09c192 100644 --- a/ReallifeGamemode.Server/Job/BusDriverJob.cs +++ b/ReallifeGamemode.Server/Job/BusDriverJob.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using GTANetworkAPI; using Newtonsoft.Json; diff --git a/ReallifeGamemode.Server/Job/JobBase.cs b/ReallifeGamemode.Server/Job/JobBase.cs index 21f2178e..e10a76ed 100644 --- a/ReallifeGamemode.Server/Job/JobBase.cs +++ b/ReallifeGamemode.Server/Job/JobBase.cs @@ -45,7 +45,7 @@ namespace ReallifeGamemode.Server.Job _inJob.Remove(player); jobPlayer.Remove(player); - + User user = player.GetUser(); @@ -61,7 +61,7 @@ namespace ReallifeGamemode.Server.Job ChatService.SendMessage(player, $"~y~Job:~s~ Du hast deinen Job (~o~{this.Name}~s~) beendet."); } - + JobStop?.Invoke(player); } diff --git a/ReallifeGamemode.Server/Job/PilotJob.cs b/ReallifeGamemode.Server/Job/PilotJob.cs index 8c4d33ad..5f17ac4b 100644 --- a/ReallifeGamemode.Server/Job/PilotJob.cs +++ b/ReallifeGamemode.Server/Job/PilotJob.cs @@ -186,13 +186,13 @@ namespace ReallifeGamemode.Server.Job player.SetData("Route", "Skill1Route2"); break; } - /*case 3: - { - CheckPointHandle.StartCheckPointRoute(player, Skill1Route3, 0, 26, 40, 10, true, "pilotJob"); //6, 23, 25, 26, 27, 28 - player.SendChatMessage("~y~[JOB] ~w~Route wurde gesetzt: ~g~Route 3"); - player.SetData("Route", "Skill1Route3"); - break; - }*/ + /*case 3: + { + CheckPointHandle.StartCheckPointRoute(player, Skill1Route3, 0, 26, 40, 10, true, "pilotJob"); //6, 23, 25, 26, 27, 28 + player.SendChatMessage("~y~[JOB] ~w~Route wurde gesetzt: ~g~Route 3"); + player.SetData("Route", "Skill1Route3"); + break; + }*/ } } if (player.HasData("PilotenBase") && player.GetData("PilotenBase") == 2) @@ -215,13 +215,13 @@ namespace ReallifeGamemode.Server.Job player.SetData("Route", "Skill2Route2"); break; } - /*case 3: - { - CheckPointHandle.StartCheckPointRoute(player, Skill2Route3, 0, 26, 40, 10, true, "pilotJob"); //6, 23, 25, 26, 27, 28 - player.SendChatMessage("~y~[JOB] ~w~Route wurde gesetzt: ~g~Route 3"); - player.SetData("Route", "Skill2Route3"); - break; - }*/ + /*case 3: + { + CheckPointHandle.StartCheckPointRoute(player, Skill2Route3, 0, 26, 40, 10, true, "pilotJob"); //6, 23, 25, 26, 27, 28 + player.SendChatMessage("~y~[JOB] ~w~Route wurde gesetzt: ~g~Route 3"); + player.SetData("Route", "Skill2Route3"); + break; + }*/ } } } diff --git a/ReallifeGamemode.Server/Job/TaxiDriverJob.cs b/ReallifeGamemode.Server/Job/TaxiDriverJob.cs index 97ea397a..e506eec5 100644 --- a/ReallifeGamemode.Server/Job/TaxiDriverJob.cs +++ b/ReallifeGamemode.Server/Job/TaxiDriverJob.cs @@ -83,12 +83,13 @@ namespace ReallifeGamemode.Server.Job if (targetId == 0) return; using (var dbContext = new DatabaseContext()) { - if(player.HasData("hasPassager")){ - User target = dbContext.Users.Where(u => u.Id == targetId).FirstOrDefault(); - target.Handmoney -= amount; - player.GetUser(dbContext).Wage += amount; - dbContext.SaveChanges(); - //target.Player.TriggerEvent("SERVER:SET_HANDMONEY", target.Handmoney); + if (player.HasData("hasPassager")) + { + User target = dbContext.Users.Where(u => u.Id == targetId).FirstOrDefault(); + target.Handmoney -= amount; + player.GetUser(dbContext).Wage += amount; + dbContext.SaveChanges(); + //target.Player.TriggerEvent("SERVER:SET_HANDMONEY", target.Handmoney); } } } @@ -111,19 +112,19 @@ namespace ReallifeGamemode.Server.Job if (!player.HasData("hasPassager")) { player.SetData("hasPassager", false); continue; } int playerId = player.GetUser().Id; if (player.IsInVehicle) - { - Vehicle v = player.Vehicle; - Vector3 lastPosition = v.Position; - if (lastPositions.ContainsKey(v.Handle)) lastPosition = lastPositions[v.Handle]; - lastPositions[v.Handle] = v.Position; - - double distance = lastPosition.DistanceTo(v.Position) / 1000.0; - if (distance > 0.5) { ChatService.BroadcastAdmin($"Möglicher Cheater - {player.Name}", AdminLevel.MAPPING); continue; } - if (!player.GetData("hasPassager")) continue; - foreach (Player occupant in v.Occupants) { - occupant.TriggerEvent("CLIENT:updateFare", JsonConvert.SerializeObject(distance)); - } + Vehicle v = player.Vehicle; + Vector3 lastPosition = v.Position; + if (lastPositions.ContainsKey(v.Handle)) lastPosition = lastPositions[v.Handle]; + lastPositions[v.Handle] = v.Position; + + double distance = lastPosition.DistanceTo(v.Position) / 1000.0; + if (distance > 0.5) { ChatService.BroadcastAdmin($"Möglicher Cheater - {player.Name}", AdminLevel.MAPPING); continue; } + if (!player.GetData("hasPassager")) continue; + foreach (Player occupant in v.Occupants) + { + occupant.TriggerEvent("CLIENT:updateFare", JsonConvert.SerializeObject(distance)); + } } } } diff --git a/ReallifeGamemode.Server/Managers/ATMManager.cs b/ReallifeGamemode.Server/Managers/ATMManager.cs index ae1a74c4..d04fb6e7 100644 --- a/ReallifeGamemode.Server/Managers/ATMManager.cs +++ b/ReallifeGamemode.Server/Managers/ATMManager.cs @@ -134,7 +134,8 @@ namespace ReallifeGamemode.Server.Managers else if (checkATM.Balance < inputField1) { client.SendNotification("~r~Nicht genügend Geld im Automaten vorhanden!"); //TODO Im Automaten anzeigen lassen |||| oder OUT OF ORDER anzeigen wenn leer - } else if (inputField1 < 0) + } + else if (inputField1 < 0) { client.SendNotification("~r~Du kannst keine negativen Beträge abheben!"); } diff --git a/ReallifeGamemode.Server/Managers/BusinessManager.cs b/ReallifeGamemode.Server/Managers/BusinessManager.cs index c2c7e0c5..b6606aef 100644 --- a/ReallifeGamemode.Server/Managers/BusinessManager.cs +++ b/ReallifeGamemode.Server/Managers/BusinessManager.cs @@ -172,8 +172,8 @@ namespace ReallifeGamemode.Server.Managers { player.SendNotification("~r~Du hast nicht genug Geld: " + price.ToMoneyString()); return; - } - player.SendChatMessage("~y~Du hast das Fahrzeug erfolgreich gekauft"); + } + player.SendChatMessage("~y~Du hast das Fahrzeug erfolgreich gekauft"); newVeh = new UserVehicle { @@ -198,9 +198,9 @@ namespace ReallifeGamemode.Server.Managers { player.SendNotification("~r~Die Fraktion hat nicht genug Geld: " + (price * 3).ToMoneyString()); return; - } + } player.SendChatMessage("~y~Deine Fraktion hat das Fahrzeug erfolgreich gekauft"); - + newVeh = new FactionVehicle { Heading = business.CarSpawnHeading, diff --git a/ReallifeGamemode.Server/Managers/CharacterCreator.cs b/ReallifeGamemode.Server/Managers/CharacterCreator.cs index b0c0e5fe..233563b7 100644 --- a/ReallifeGamemode.Server/Managers/CharacterCreator.cs +++ b/ReallifeGamemode.Server/Managers/CharacterCreator.cs @@ -156,7 +156,7 @@ namespace ReallifeGamemode.Server.Managers user.CharacterId = character.Id; - for (var x = 1; x <= 11; x++) + for (var x = 1; x <= 11; x++) { var s = 0; if (x == 10) s = -1; @@ -233,7 +233,7 @@ namespace ReallifeGamemode.Server.Managers else { continue; - } + } } saveCharacter.SaveChanges(); diff --git a/ReallifeGamemode.Server/Report/Report.cs b/ReallifeGamemode.Server/Report/Report.cs index 6240a36f..05093826 100644 --- a/ReallifeGamemode.Server/Report/Report.cs +++ b/ReallifeGamemode.Server/Report/Report.cs @@ -211,7 +211,7 @@ namespace ReallifeGamemode.Server.Report if (type == "Quick Report") { ChatService.BroadcastAdmin("!{#008fff}[QR]~w~ " + user.Name + " (" + user.Handle.Value + ")~w~: " + text, AdminLevel.SUPPORTER); - user.SendChatMessage("~w~Dein Quick Report wurde an das Adminteam weitergeleitet"); + user.SendChatMessage("~w~Dein Quick Report wurde an das Adminteam weitergeleitet"); } } diff --git a/ReallifeGamemode.Server/WeaponDeal/WeaponDealManager.cs b/ReallifeGamemode.Server/WeaponDeal/WeaponDealManager.cs index 147fb962..fd67ce42 100644 --- a/ReallifeGamemode.Server/WeaponDeal/WeaponDealManager.cs +++ b/ReallifeGamemode.Server/WeaponDeal/WeaponDealManager.cs @@ -52,13 +52,13 @@ namespace ReallifeGamemode.Server.WeaponDeal ChatService.ErrorMessage(client, "Der Transporter ist zu weit entfernt"); return; } - + WeaponDealPoints.factionWeaponDeal[user.FactionId.Value] = -1; Vector3 vector; - vector = WeaponDealPoints.getRndWD_Route(client.GetUser().FactionId.Value); + vector = WeaponDealPoints.getRndWD_Route(client.GetUser().FactionId.Value); if (vector == new Vector3()) return; - fVeh.SetData("weaponDealPoint", vector); + fVeh.SetData("weaponDealPoint", vector); if (user.Faction.WeaponDealTime <= 0) { @@ -115,9 +115,11 @@ namespace ReallifeGamemode.Server.WeaponDeal { fac.WeaponDealTime = 180; context.SaveChanges(); - }else { - fac.WeaponDealTime = 60; - context.SaveChanges(); + } + else + { + fac.WeaponDealTime = 60; + context.SaveChanges(); } } else @@ -186,7 +188,8 @@ namespace ReallifeGamemode.Server.WeaponDeal InventoryManager.RemoveAllItemsfromVehicleInventory(fVeh); int oMembers = NAPI.Pools.GetAllPlayers().Where(p => p.IsLoggedIn() && p.GetUser(context).FactionId == user.FactionId).Count(); - if (factionVehicle.GetOwners().Contains(8) || factionVehicle.GetOwners().Contains(7)){ + if (factionVehicle.GetOwners().Contains(8) || factionVehicle.GetOwners().Contains(7)) + { VehicleItem item = new VehicleItem() { ItemId = 2, VehicleId = factionVehicle.Id, Amount = WEAPON_AMOUNT_GANG * oMembers }; //pistol50 InventoryManager.AddItemToVehicleInventory(fVeh, item.ItemId, item.Amount); VehicleItem item3 = new VehicleItem() { ItemId = 9, VehicleId = factionVehicle.Id, Amount = WEAPON_AMOUNT_GANG * oMembers }; //PumpShotgun @@ -196,7 +199,8 @@ namespace ReallifeGamemode.Server.WeaponDeal VehicleItem item4 = new VehicleItem() { ItemId = 7, VehicleId = factionVehicle.Id, Amount = WEAPON_AMOUNT_GANG * oMembers }; //CompactRifle InventoryManager.AddItemToVehicleInventory(fVeh, item4.ItemId, item4.Amount); } - else if(factionVehicle.GetOwners().Contains(1)) { + else if (factionVehicle.GetOwners().Contains(1)) + { VehicleItem item = new VehicleItem() { ItemId = 1, VehicleId = factionVehicle.Id, Amount = WEAPON_AMOUNT_COP * oMembers }; //pistol InventoryManager.AddItemToVehicleInventory(fVeh, item.ItemId, item.Amount); VehicleItem item2 = new VehicleItem() { ItemId = 2, VehicleId = factionVehicle.Id, Amount = WEAPON_AMOUNT_COP * oMembers }; //Pistol50 @@ -209,7 +213,9 @@ namespace ReallifeGamemode.Server.WeaponDeal InventoryManager.AddItemToVehicleInventory(fVeh, item5.ItemId, item5.Amount); VehicleItem item6 = new VehicleItem() { ItemId = 11, VehicleId = factionVehicle.Id, Amount = WEAPON_AMOUNT_COP_STUNGUN * oMembers }; //Stungun InventoryManager.AddItemToVehicleInventory(fVeh, item6.ItemId, item6.Amount); - }else if (factionVehicle.GetOwners().Contains(3)) { + } + else if (factionVehicle.GetOwners().Contains(3)) + { VehicleItem item = new VehicleItem() { ItemId = 3, VehicleId = factionVehicle.Id, Amount = WEAPON_AMOUNT_COP * oMembers }; //pistol_mk2 InventoryManager.AddItemToVehicleInventory(fVeh, item.ItemId, item.Amount); VehicleItem item2 = new VehicleItem() { ItemId = 4, VehicleId = factionVehicle.Id, Amount = WEAPON_AMOUNT_COP * oMembers }; //Combatpistol diff --git a/ReallifeGamemode.Server/WeaponDeal/WeaponDealPoints.cs b/ReallifeGamemode.Server/WeaponDeal/WeaponDealPoints.cs index 013aa8bc..3906ce52 100644 --- a/ReallifeGamemode.Server/WeaponDeal/WeaponDealPoints.cs +++ b/ReallifeGamemode.Server/WeaponDeal/WeaponDealPoints.cs @@ -32,7 +32,7 @@ namespace ReallifeGamemode.Server.WeaponDeal if (!factionWeaponDeal.ContainsKey(factionID)) return new Vector3(); - if(factionID == 1 | factionID == 3) + if (factionID == 1 | factionID == 3) { Random rnd = new Random(); factionWeaponDeal[factionID] = rnd.Next(0, StaatsFrakWT_Route.Count - 1); @@ -45,14 +45,14 @@ namespace ReallifeGamemode.Server.WeaponDeal return WT_Route.ElementAt(factionWeaponDeal[factionID]); } - /* if (factionWeaponDeal[factionID] == -1) - { - Random rnd = new Random(); - factionWeaponDeal[factionID] = rnd.Next(0, WT_Route.Count - 1); - } - return WT_Route.ElementAt(factionWeaponDeal[factionID]); - - */ + /* if (factionWeaponDeal[factionID] == -1) + { + Random rnd = new Random(); + factionWeaponDeal[factionID] = rnd.Next(0, WT_Route.Count - 1); + } + return WT_Route.ElementAt(factionWeaponDeal[factionID]); + + */ } } }