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

code formatiert

Browse Source
This commit is contained in:
hydrant
2020-08-04 21:51:38 +02:00
parent c4d4b16006
commit 76d72eebdf
40 changed files with 237 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
ReallifeGamemode.Client/assets/sound/fun/bitcoinnect.mp3 Normal file
View File

Binary file not shown.

32
ReallifeGamemode.Database/Migrations/20200424163014_UserTimePlayed.cs
View File

@@ -2,22 +2,22 @@
namespace ReallifeGamemode.Database.Migrations 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<int>(
{ name: "PlayedMinutes",
migrationBuilder.AddColumn<int>( table: "Users",
name: "PlayedMinutes", nullable: false,
table: "Users", defaultValue: 0);
nullable: false,
defaultValue: 0);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "PlayedMinutes",
table: "Users");
}
} }
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "PlayedMinutes",
table: "Users");
}
}
} }

50
ReallifeGamemode.Database/Migrations/20200427131454_UserJobSkillBusPilot.cs
View File

@@ -2,32 +2,32 @@
namespace ReallifeGamemode.Database.Migrations 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<int>(
{ name: "BusSkill",
migrationBuilder.AddColumn<int>( table: "Users",
name: "BusSkill", nullable: false,
table: "Users", defaultValue: 0);
nullable: false,
defaultValue: 0);
migrationBuilder.AddColumn<int>( migrationBuilder.AddColumn<int>(
name: "PilotSkill", name: "PilotSkill",
table: "Users", table: "Users",
nullable: false, nullable: false,
defaultValue: 0); defaultValue: 0);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "BusSkill",
table: "Users");
migrationBuilder.DropColumn(
name: "PilotSkill",
table: "Users");
}
} }
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "BusSkill",
table: "Users");
migrationBuilder.DropColumn(
name: "PilotSkill",
table: "Users");
}
}
} }

30
ReallifeGamemode.Database/Migrations/20200506184310_FactionVehicleBuyPrice.cs
View File

@@ -2,21 +2,21 @@
namespace ReallifeGamemode.Database.Migrations 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<int>(
{ name: "BuyPrice",
migrationBuilder.AddColumn<int>( table: "ServerVehicles",
name: "BuyPrice", nullable: true);
table: "ServerVehicles",
nullable: true);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "BuyPrice",
table: "ServerVehicles");
}
} }
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "BuyPrice",
table: "ServerVehicles");
}
}
} }

68
ReallifeGamemode.Database/Migrations/20200802143111_AddUserOtherAmount.cs
View File

@@ -2,42 +2,42 @@
namespace ReallifeGamemode.Database.Migrations 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<int>(
{ name: "otheramount",
migrationBuilder.AddColumn<int>( table: "Users",
name: "otheramount", nullable: false,
table: "Users", defaultValue: 0);
nullable: false,
defaultValue: 0);
migrationBuilder.AddColumn<int>( migrationBuilder.AddColumn<int>(
name: "trashcount", name: "trashcount",
table: "Users", table: "Users",
nullable: false, nullable: false,
defaultValue: 0); defaultValue: 0);
migrationBuilder.AddColumn<bool>( migrationBuilder.AddColumn<bool>(
name: "GangOwned", name: "GangOwned",
table: "Factions", table: "Factions",
nullable: false, nullable: false,
defaultValue: 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");
}
} }
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "otheramount",
table: "Users");
migrationBuilder.DropColumn(
name: "trashcount",
table: "Users");
migrationBuilder.DropColumn(
name: "GangOwned",
table: "Factions");
}
}
} }

19
ReallifeGamemode.Server/Bank/bank.cs
View File

@@ -23,7 +23,7 @@ namespace ReallifeGamemode.Server.Bank
private static ColShape _colShape; private static ColShape _colShape;
private static ColShape _factioncolShape; private static ColShape _factioncolShape;
public static Vector3 Position { get; } public static Vector3 Position { get; }
public static void Setup() public static void Setup()
{ {
@@ -61,8 +61,8 @@ namespace ReallifeGamemode.Server.Bank
if (client.IsInVehicle || !client.IsLoggedIn()) return; if (client.IsInVehicle || !client.IsLoggedIn()) return;
if (client.GetUser().FactionLeader == true) 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()); client.TriggerEvent("showFactionBankMenu", client.GetUser().Faction.BankAccount.Balance.ToString());
} }
@@ -125,19 +125,20 @@ namespace ReallifeGamemode.Server.Bank
string nameOrId = (string)JsonConvert.DeserializeObject(jsonNameOrId); string nameOrId = (string)JsonConvert.DeserializeObject(jsonNameOrId);
int amount = Int32.Parse(stringAmount); int amount = Int32.Parse(stringAmount);
Player target = PlayerService.GetPlayerByNameOrId(nameOrId); Player target = PlayerService.GetPlayerByNameOrId(nameOrId);
using (var dbContext = new DatabaseContext()) 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."); player.SendNotification($"~r~Du kannst dir selber kein Geld überweisen.");
return; return;
}else if(!target.IsLoggedIn()) }
else if (!target.IsLoggedIn())
{ {
player.SendNotification($"~r~Dieser Spieler ist nicht Online."); 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."); player.SendNotification($"~r~Dieser Betrag kann nicht überwiesen werden.");
return; return;
@@ -145,7 +146,7 @@ namespace ReallifeGamemode.Server.Bank
else else
{ {
player.SendNotification($"~w~Du hast {target.Name} $~g~{amount} ~w~Überwiesen."); 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; target.GetUser(dbContext).otheramount = amount;
dbContext.SaveChanges(); dbContext.SaveChanges();
} }
@@ -204,5 +205,5 @@ namespace ReallifeGamemode.Server.Bank
} }
} }
} }
} }

19
ReallifeGamemode.Server/Commands/AdminCommands.cs
View File

@@ -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 #endregion Support
#region ALevel1 #region ALevel1

2
ReallifeGamemode.Server/Commands/GroupCommands.cs
View File

@@ -1,4 +1,4 @@
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using GTANetworkAPI; using GTANetworkAPI;
using ReallifeGamemode.Server.Extensions; using ReallifeGamemode.Server.Extensions;
using ReallifeGamemode.Server.Services; using ReallifeGamemode.Server.Services;

3
ReallifeGamemode.Server/Commands/UserCommands.cs
View File

@@ -41,7 +41,8 @@ namespace ReallifeGamemode.Server.Commands
if (player.IsInVehicle) if (player.IsInVehicle)
{ {
pVeh = player.Vehicle; pVeh = player.Vehicle;
} else }
else
{ {
pVeh = NAPI.Pools.GetAllVehicles().Where(v => v.Position.DistanceTo(player.Position) <= 5).FirstOrDefault(); pVeh = NAPI.Pools.GetAllVehicles().Where(v => v.Position.DistanceTo(player.Position) <= 5).FirstOrDefault();
} }

8
ReallifeGamemode.Server/DrivingSchool/DrivingSchool.cs
View File

@@ -108,7 +108,7 @@ namespace ReallifeGamemode.Server.DrivingSchool
[RemoteEvent("startDrivingSchool")] [RemoteEvent("startDrivingSchool")]
public void StartDrivingSchool(Player client) public void StartDrivingSchool(Player client)
{ {
User user = client.GetUser(); User user = client.GetUser();
if (user.DriverLicenseVehicle || client.HasData("ActiveSchool")) if (user.DriverLicenseVehicle || client.HasData("ActiveSchool"))
{ {
@@ -125,7 +125,7 @@ namespace ReallifeGamemode.Server.DrivingSchool
{ {
User payer = client.GetUser(dbContext); User payer = client.GetUser(dbContext);
payer.Handmoney -= 2500; payer.Handmoney -= 2500;
// client.TriggerEvent("SERVER:SET_HANDMONEY", payer.Handmoney); // client.TriggerEvent("SERVER:SET_HANDMONEY", payer.Handmoney);
dbContext.SaveChanges(); dbContext.SaveChanges();
} }
@@ -207,7 +207,7 @@ namespace ReallifeGamemode.Server.DrivingSchool
{ {
User user = client.GetUser(); User user = client.GetUser();
if (user.DriverLicenseBike || client.HasData("ActiveSchool")) if (user.DriverLicenseBike || client.HasData("ActiveSchool"))
{ {
client.SendChatMessage("~b~[INFO]~s~ Du besitzt schon einen Motorradschein."); client.SendChatMessage("~b~[INFO]~s~ Du besitzt schon einen Motorradschein.");
return; return;
} }
@@ -221,7 +221,7 @@ namespace ReallifeGamemode.Server.DrivingSchool
{ {
User payer = client.GetUser(dbContext); User payer = client.GetUser(dbContext);
payer.Handmoney -= 3500; payer.Handmoney -= 3500;
// client.TriggerEvent("SERVER:SET_HANDMONEY", payer.Handmoney); // client.TriggerEvent("SERVER:SET_HANDMONEY", payer.Handmoney);
dbContext.SaveChanges(); dbContext.SaveChanges();
} }

2
ReallifeGamemode.Server/DrivingSchool/Licenses.cs
View File

@@ -1,4 +1,4 @@
using Newtonsoft.Json; using Newtonsoft.Json;
namespace ReallifeGamemode.Server.DrivingSchool namespace ReallifeGamemode.Server.DrivingSchool
{ {

4
ReallifeGamemode.Server/DrivingSchool/PlaneSchool.cs
View File

@@ -1,4 +1,4 @@
using System.Collections.Generic; using System.Collections.Generic;
using GTANetworkAPI; using GTANetworkAPI;
using ReallifeGamemode.Database.Entities; using ReallifeGamemode.Database.Entities;
using ReallifeGamemode.Database.Models; using ReallifeGamemode.Database.Models;
@@ -70,7 +70,7 @@ namespace ReallifeGamemode.Server.DrivingSchool
User user = client.GetUser(); User user = client.GetUser();
if (user.FlyingLicensePlane || client.HasData("ActiveSchool")) if (user.FlyingLicensePlane || client.HasData("ActiveSchool"))
{ {
client.SendChatMessage("~b~[INFO]~s~ Du besitzt schon einen Flugschein."); client.SendChatMessage("~b~[INFO]~s~ Du besitzt schon einen Flugschein.");
return; return;
} }

2
ReallifeGamemode.Server/Events/Chat.cs
View File

@@ -1,4 +1,4 @@
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using GTANetworkAPI; using GTANetworkAPI;
using ReallifeGamemode.Server.Services; using ReallifeGamemode.Server.Services;

12
ReallifeGamemode.Server/Events/Disconnect.cs
View File

@@ -63,12 +63,12 @@ namespace ReallifeGamemode.Server.Events
{ {
//if (player.Vehicle.GetData<bool>("timerJobVehicleRespawn") == true) //if (player.Vehicle.GetData<bool>("timerJobVehicleRespawn") == true)
//{ //{
if (player.Vehicle.GetServerVehicle() is JobVehicle vehJ) if (player.Vehicle.GetServerVehicle() is JobVehicle vehJ)
{ {
player.Vehicle.ResetData("timerJobVehicleRespawn"); player.Vehicle.ResetData("timerJobVehicleRespawn");
ServerVehicle sVeh = VehicleManager.GetServerVehicleFromVehicle(player.Vehicle); ServerVehicle sVeh = VehicleManager.GetServerVehicleFromVehicle(player.Vehicle);
ServerVehicleExtensions.Spawn(sVeh, player.Vehicle); ServerVehicleExtensions.Spawn(sVeh, player.Vehicle);
} }
//} //}
} }
if (Managers.JobManager.playerTimersJobVehicleRespawn.ContainsKey(player)) if (Managers.JobManager.playerTimersJobVehicleRespawn.ContainsKey(player))

4
ReallifeGamemode.Server/Events/EnterVehicleAttempt.cs
View File

@@ -50,13 +50,13 @@ namespace ReallifeGamemode.Server.Events
player.SendNotification("~r~Du darfst dieses Fahrzeug nicht benutzen!", true); player.SendNotification("~r~Du darfst dieses Fahrzeug nicht benutzen!", true);
return; return;
} }
else if(u.IsAdmin(AdminLevel.HEADADMIN) && player.IsAdminDuty()) else if (u.IsAdmin(AdminLevel.HEADADMIN) && player.IsAdminDuty())
{ {
} }
else else
{ {
if ((VehicleHash)vehicle.Model == VehicleHash.Velum && player.GetUser().PilotSkill < 300) if ((VehicleHash)vehicle.Model == VehicleHash.Velum && player.GetUser().PilotSkill < 300)
{ {
player.SetData("JobVehicleFrei", true); player.SetData("JobVehicleFrei", true);
player.StopAnimation(); player.StopAnimation();
player.SendNotification("~y~[JOB] ~r~Du besitzt nicht das nötige Skill Level(2)!"); player.SendNotification("~y~[JOB] ~r~Du besitzt nicht das nötige Skill Level(2)!");

8
ReallifeGamemode.Server/Events/ExitVehicle.cs
View File

@@ -88,10 +88,10 @@ namespace ReallifeGamemode.Server.Events
{ {
//if (!p.IsInVehicle) //if (!p.IsInVehicle)
//{ //{
if (p.GetData<bool>("HatNoobSpawnVehicle") == true) if (p.GetData<bool>("HatNoobSpawnVehicle") == true)
{ {
p.ResetData("HatNoobSpawnVehicle"); p.ResetData("HatNoobSpawnVehicle");
} }
//} //}
}); });
}); });

2
ReallifeGamemode.Server/Events/Faction.cs
View File

@@ -1,4 +1,4 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using GTANetworkAPI; using GTANetworkAPI;
using Newtonsoft.Json; using Newtonsoft.Json;

2
ReallifeGamemode.Server/Events/PlayerSpawn.cs
View File

@@ -1,4 +1,4 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Text; using System.Text;
using GTANetworkAPI; using GTANetworkAPI;

2
ReallifeGamemode.Server/Events/Siren.cs
View File

@@ -1,4 +1,4 @@
using System.Collections.Generic; using System.Collections.Generic;
using GTANetworkAPI; using GTANetworkAPI;
namespace ReallifeGamemode.Server.Events namespace ReallifeGamemode.Server.Events

8
ReallifeGamemode.Server/Events/UpdateCharacterCloth.cs
View File

@@ -61,7 +61,7 @@ namespace ReallifeGamemode.Server.Events
int[] clothId = JsonConvert.DeserializeObject<int[]>(JClothId); int[] clothId = JsonConvert.DeserializeObject<int[]>(JClothId);
user = client.GetUser(context); user = client.GetUser(context);
var character = user.GetCharacter(context); var character = user.GetCharacter(context);
var charClothes = context.CharacterClothes.FirstOrDefault(c => c.UserId == user.Id && c.Duty); var charClothes = context.CharacterClothes.FirstOrDefault(c => c.UserId == user.Id && c.Duty);
@@ -137,7 +137,7 @@ namespace ReallifeGamemode.Server.Events
if (user.GetData<bool>("duty") == false) if (user.GetData<bool>("duty") == false)
{ {
LoadCharacterDefaults(client); LoadCharacterDefaults(client);
} }
} }
[RemoteEvent("defaultCharacterCloth")] [RemoteEvent("defaultCharacterCloth")]
@@ -159,10 +159,10 @@ namespace ReallifeGamemode.Server.Events
{ {
if (cloth.SlotType == 1) if (cloth.SlotType == 1)
{ {
if(cloth.ClothId != -1) if (cloth.ClothId != -1)
{ {
NAPI.Player.SetPlayerAccessory(player, cloth.SlotId, cloth.ClothId, 0); NAPI.Player.SetPlayerAccessory(player, cloth.SlotId, cloth.ClothId, 0);
} }
} }
else else
{ {

2
ReallifeGamemode.Server/Events/UpdateCharacterElevator.cs
View File

@@ -1,4 +1,4 @@
using GTANetworkAPI; using GTANetworkAPI;
using ReallifeGamemode.Server.Managers; using ReallifeGamemode.Server.Managers;
namespace ReallifeGamemode.Server.Events namespace ReallifeGamemode.Server.Events

20
ReallifeGamemode.Server/Events/UpdateCharacterWeapon.cs
View File

@@ -84,16 +84,16 @@ namespace ReallifeGamemode.Server.Events
client.GiveWeapon((WeaponHash)primary, 300); client.GiveWeapon((WeaponHash)primary, 300);
client.GiveWeapon((WeaponHash)secondary, 100); client.GiveWeapon((WeaponHash)secondary, 100);
client.GiveWeapon((WeaponHash)melee, 1); client.GiveWeapon((WeaponHash)melee, 1);
if (!uint.TryParse(specialModel, out uint special)) if (!uint.TryParse(specialModel, out uint special))
{ {
if (specialModel.Contains("mk2") && !specialModel.Contains("_mk2")) specialModel = specialModel.Replace("mk2", "_mk2"); if (specialModel.Contains("mk2") && !specialModel.Contains("_mk2")) specialModel = specialModel.Replace("mk2", "_mk2");
special = NAPI.Util.GetHashKey($"weapon_{specialModel}"); special = NAPI.Util.GetHashKey($"weapon_{specialModel}");
} }
client.GiveWeapon((WeaponHash)special, 30); client.GiveWeapon((WeaponHash)special, 30);
if(armor == "Schutzweste") if (armor == "Schutzweste")
{ {
client.Armor = 100; client.Armor = 100;
} }

2
ReallifeGamemode.Server/Events/Vehicle.cs
View File

@@ -69,7 +69,7 @@ namespace ReallifeGamemode.Server.Events
} }
} }
VehicleStreaming.SetEngineState(v, !state); VehicleStreaming.SetEngineState(v, !state);
} }
} }

2
ReallifeGamemode.Server/Events/Voice.cs
View File

@@ -1,4 +1,4 @@
using GTANetworkAPI; using GTANetworkAPI;
/** /**
* @overview Life of German Reallife - Event Voice (Voice.cs) * @overview Life of German Reallife - Event Voice (Voice.cs)

2
ReallifeGamemode.Server/Extensions/EnumExtensions.cs
View File

@@ -1,4 +1,4 @@
using ReallifeGamemode.Server.Types; using ReallifeGamemode.Server.Types;
using static ReallifeGamemode.Server.Types.AdminLevel; using static ReallifeGamemode.Server.Types.AdminLevel;
namespace ReallifeGamemode.Server.Extensions namespace ReallifeGamemode.Server.Extensions

2
ReallifeGamemode.Server/Extensions/HouseExtensions.cs
View File

@@ -1,4 +1,4 @@
using System.Linq; using System.Linq;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using ReallifeGamemode.Database.Entities; using ReallifeGamemode.Database.Entities;
using ReallifeGamemode.Database.Models; using ReallifeGamemode.Database.Models;

2
ReallifeGamemode.Server/Extensions/IntegerExtension.cs
View File

@@ -1,4 +1,4 @@
namespace ReallifeGamemode.Server.Extensions namespace ReallifeGamemode.Server.Extensions
{ {
public static class IntegerExtension public static class IntegerExtension
{ {

2
ReallifeGamemode.Server/Extensions/ListExtensions.cs
View File

@@ -1,4 +1,4 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using GTANetworkAPI; using GTANetworkAPI;

2
ReallifeGamemode.Server/Factions/Medic/Medic.cs
View File

@@ -15,7 +15,7 @@ namespace ReallifeGamemode.Server.Factions.Medic
public static List<MedicTask> ReviveTasks = new List<MedicTask>(); public static List<MedicTask> ReviveTasks = new List<MedicTask>();
public static List<MedicTask> HealTasks = new List<MedicTask>(); public static List<MedicTask> HealTasks = new List<MedicTask>();
public static List<MedicTask> FireTasks = new List<MedicTask>(); public static List<MedicTask> FireTasks = new List<MedicTask>();
public static void AddTaskToList(MedicTask task) public static void AddTaskToList(MedicTask task)
{ {
if (task == null) if (task == null)

2
ReallifeGamemode.Server/Finance/Economy.cs
View File

@@ -76,7 +76,7 @@ namespace ReallifeGamemode.Server.Finance
float propertyTax = GetPropertyTaxation(client); float propertyTax = GetPropertyTaxation(client);
int vehicleTaxation = GetVehicleTaxation(client); int vehicleTaxation = GetVehicleTaxation(client);
int rentalFees = GetRentalFees(client); int rentalFees = GetRentalFees(client);
int healthInsurance = (int)(user.BankAccount.Balance * 0.001); int healthInsurance = (int)(user.BankAccount.Balance * 0.001);
if (healthInsurance < 0) if (healthInsurance < 0)
{ {

2
ReallifeGamemode.Server/Job/BusDriverJob.cs
View File

@@ -1,4 +1,4 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using GTANetworkAPI; using GTANetworkAPI;
using Newtonsoft.Json; using Newtonsoft.Json;

4
ReallifeGamemode.Server/Job/JobBase.cs
View File

@@ -45,7 +45,7 @@ namespace ReallifeGamemode.Server.Job
_inJob.Remove(player); _inJob.Remove(player);
jobPlayer.Remove(player); jobPlayer.Remove(player);
User user = player.GetUser(); 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."); ChatService.SendMessage(player, $"~y~Job:~s~ Du hast deinen Job (~o~{this.Name}~s~) beendet.");
} }
JobStop?.Invoke(player); JobStop?.Invoke(player);
} }

28
ReallifeGamemode.Server/Job/PilotJob.cs
View File

@@ -186,13 +186,13 @@ namespace ReallifeGamemode.Server.Job
player.SetData("Route", "Skill1Route2"); player.SetData("Route", "Skill1Route2");
break; break;
} }
/*case 3: /*case 3:
{ {
CheckPointHandle.StartCheckPointRoute(player, Skill1Route3, 0, 26, 40, 10, true, "pilotJob"); //6, 23, 25, 26, 27, 28 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.SendChatMessage("~y~[JOB] ~w~Route wurde gesetzt: ~g~Route 3");
player.SetData("Route", "Skill1Route3"); player.SetData("Route", "Skill1Route3");
break; break;
}*/ }*/
} }
} }
if (player.HasData("PilotenBase") && player.GetData<int>("PilotenBase") == 2) if (player.HasData("PilotenBase") && player.GetData<int>("PilotenBase") == 2)
@@ -215,13 +215,13 @@ namespace ReallifeGamemode.Server.Job
player.SetData("Route", "Skill2Route2"); player.SetData("Route", "Skill2Route2");
break; break;
} }
/*case 3: /*case 3:
{ {
CheckPointHandle.StartCheckPointRoute(player, Skill2Route3, 0, 26, 40, 10, true, "pilotJob"); //6, 23, 25, 26, 27, 28 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.SendChatMessage("~y~[JOB] ~w~Route wurde gesetzt: ~g~Route 3");
player.SetData("Route", "Skill2Route3"); player.SetData("Route", "Skill2Route3");
break; break;
}*/ }*/
} }
} }
} }

37
ReallifeGamemode.Server/Job/TaxiDriverJob.cs
View File

@@ -83,12 +83,13 @@ namespace ReallifeGamemode.Server.Job
if (targetId == 0) return; if (targetId == 0) return;
using (var dbContext = new DatabaseContext()) using (var dbContext = new DatabaseContext())
{ {
if(player.HasData("hasPassager")){ if (player.HasData("hasPassager"))
User target = dbContext.Users.Where(u => u.Id == targetId).FirstOrDefault(); {
target.Handmoney -= amount; User target = dbContext.Users.Where(u => u.Id == targetId).FirstOrDefault();
player.GetUser(dbContext).Wage += amount; target.Handmoney -= amount;
dbContext.SaveChanges(); player.GetUser(dbContext).Wage += amount;
//target.Player.TriggerEvent("SERVER:SET_HANDMONEY", target.Handmoney); dbContext.SaveChanges();
//target.Player.TriggerEvent("SERVER:SET_HANDMONEY", target.Handmoney);
} }
} }
} }
@@ -111,19 +112,19 @@ namespace ReallifeGamemode.Server.Job
if (!player.HasData("hasPassager")) { player.SetData<bool>("hasPassager", false); continue; } if (!player.HasData("hasPassager")) { player.SetData<bool>("hasPassager", false); continue; }
int playerId = player.GetUser().Id; int playerId = player.GetUser().Id;
if (player.IsInVehicle) 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<bool>("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<bool>("hasPassager")) continue;
foreach (Player occupant in v.Occupants)
{
occupant.TriggerEvent("CLIENT:updateFare", JsonConvert.SerializeObject(distance));
}
} }
} }
} }

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

@@ -134,7 +134,8 @@ namespace ReallifeGamemode.Server.Managers
else if (checkATM.Balance < inputField1) 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 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!"); client.SendNotification("~r~Du kannst keine negativen Beträge abheben!");
} }

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

@@ -172,8 +172,8 @@ namespace ReallifeGamemode.Server.Managers
{ {
player.SendNotification("~r~Du hast nicht genug Geld: " + price.ToMoneyString()); player.SendNotification("~r~Du hast nicht genug Geld: " + price.ToMoneyString());
return; return;
} }
player.SendChatMessage("~y~Du hast das Fahrzeug erfolgreich gekauft"); player.SendChatMessage("~y~Du hast das Fahrzeug erfolgreich gekauft");
newVeh = new UserVehicle newVeh = new UserVehicle
{ {
@@ -198,9 +198,9 @@ namespace ReallifeGamemode.Server.Managers
{ {
player.SendNotification("~r~Die Fraktion hat nicht genug Geld: " + (price * 3).ToMoneyString()); player.SendNotification("~r~Die Fraktion hat nicht genug Geld: " + (price * 3).ToMoneyString());
return; return;
} }
player.SendChatMessage("~y~Deine Fraktion hat das Fahrzeug erfolgreich gekauft"); player.SendChatMessage("~y~Deine Fraktion hat das Fahrzeug erfolgreich gekauft");
newVeh = new FactionVehicle newVeh = new FactionVehicle
{ {
Heading = business.CarSpawnHeading, Heading = business.CarSpawnHeading,

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

@@ -156,7 +156,7 @@ namespace ReallifeGamemode.Server.Managers
user.CharacterId = character.Id; user.CharacterId = character.Id;
for (var x = 1; x <= 11; x++) for (var x = 1; x <= 11; x++)
{ {
var s = 0; var s = 0;
if (x == 10) s = -1; if (x == 10) s = -1;
@@ -233,7 +233,7 @@ namespace ReallifeGamemode.Server.Managers
else else
{ {
continue; continue;
} }
} }
saveCharacter.SaveChanges(); saveCharacter.SaveChanges();

2
ReallifeGamemode.Server/Report/Report.cs
View File

@@ -211,7 +211,7 @@ namespace ReallifeGamemode.Server.Report
if (type == "Quick Report") if (type == "Quick Report")
{ {
ChatService.BroadcastAdmin("!{#008fff}[QR]~w~ " + user.Name + " (" + user.Handle.Value + ")~w~: " + text, AdminLevel.SUPPORTER); 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");
} }
} }

24
ReallifeGamemode.Server/WeaponDeal/WeaponDealManager.cs
View File

@@ -52,13 +52,13 @@ namespace ReallifeGamemode.Server.WeaponDeal
ChatService.ErrorMessage(client, "Der Transporter ist zu weit entfernt"); ChatService.ErrorMessage(client, "Der Transporter ist zu weit entfernt");
return; return;
} }
WeaponDealPoints.factionWeaponDeal[user.FactionId.Value] = -1; WeaponDealPoints.factionWeaponDeal[user.FactionId.Value] = -1;
Vector3 vector; Vector3 vector;
vector = WeaponDealPoints.getRndWD_Route(client.GetUser().FactionId.Value); vector = WeaponDealPoints.getRndWD_Route(client.GetUser().FactionId.Value);
if (vector == new Vector3()) if (vector == new Vector3())
return; return;
fVeh.SetData<Vector3>("weaponDealPoint", vector); fVeh.SetData<Vector3>("weaponDealPoint", vector);
if (user.Faction.WeaponDealTime <= 0) if (user.Faction.WeaponDealTime <= 0)
{ {
@@ -115,9 +115,11 @@ namespace ReallifeGamemode.Server.WeaponDeal
{ {
fac.WeaponDealTime = 180; fac.WeaponDealTime = 180;
context.SaveChanges(); context.SaveChanges();
}else { }
fac.WeaponDealTime = 60; else
context.SaveChanges(); {
fac.WeaponDealTime = 60;
context.SaveChanges();
} }
} }
else else
@@ -186,7 +188,8 @@ namespace ReallifeGamemode.Server.WeaponDeal
InventoryManager.RemoveAllItemsfromVehicleInventory(fVeh); InventoryManager.RemoveAllItemsfromVehicleInventory(fVeh);
int oMembers = NAPI.Pools.GetAllPlayers().Where(p => p.IsLoggedIn() && p.GetUser(context).FactionId == user.FactionId).Count(); 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 VehicleItem item = new VehicleItem() { ItemId = 2, VehicleId = factionVehicle.Id, Amount = WEAPON_AMOUNT_GANG * oMembers }; //pistol50
InventoryManager.AddItemToVehicleInventory(fVeh, item.ItemId, item.Amount); InventoryManager.AddItemToVehicleInventory(fVeh, item.ItemId, item.Amount);
VehicleItem item3 = new VehicleItem() { ItemId = 9, VehicleId = factionVehicle.Id, Amount = WEAPON_AMOUNT_GANG * oMembers }; //PumpShotgun 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 VehicleItem item4 = new VehicleItem() { ItemId = 7, VehicleId = factionVehicle.Id, Amount = WEAPON_AMOUNT_GANG * oMembers }; //CompactRifle
InventoryManager.AddItemToVehicleInventory(fVeh, item4.ItemId, item4.Amount); 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 VehicleItem item = new VehicleItem() { ItemId = 1, VehicleId = factionVehicle.Id, Amount = WEAPON_AMOUNT_COP * oMembers }; //pistol
InventoryManager.AddItemToVehicleInventory(fVeh, item.ItemId, item.Amount); InventoryManager.AddItemToVehicleInventory(fVeh, item.ItemId, item.Amount);
VehicleItem item2 = new VehicleItem() { ItemId = 2, VehicleId = factionVehicle.Id, Amount = WEAPON_AMOUNT_COP * oMembers }; //Pistol50 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); InventoryManager.AddItemToVehicleInventory(fVeh, item5.ItemId, item5.Amount);
VehicleItem item6 = new VehicleItem() { ItemId = 11, VehicleId = factionVehicle.Id, Amount = WEAPON_AMOUNT_COP_STUNGUN * oMembers }; //Stungun VehicleItem item6 = new VehicleItem() { ItemId = 11, VehicleId = factionVehicle.Id, Amount = WEAPON_AMOUNT_COP_STUNGUN * oMembers }; //Stungun
InventoryManager.AddItemToVehicleInventory(fVeh, item6.ItemId, item6.Amount); 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 VehicleItem item = new VehicleItem() { ItemId = 3, VehicleId = factionVehicle.Id, Amount = WEAPON_AMOUNT_COP * oMembers }; //pistol_mk2
InventoryManager.AddItemToVehicleInventory(fVeh, item.ItemId, item.Amount); InventoryManager.AddItemToVehicleInventory(fVeh, item.ItemId, item.Amount);
VehicleItem item2 = new VehicleItem() { ItemId = 4, VehicleId = factionVehicle.Id, Amount = WEAPON_AMOUNT_COP * oMembers }; //Combatpistol VehicleItem item2 = new VehicleItem() { ItemId = 4, VehicleId = factionVehicle.Id, Amount = WEAPON_AMOUNT_COP * oMembers }; //Combatpistol

18
ReallifeGamemode.Server/WeaponDeal/WeaponDealPoints.cs
View File

@@ -32,7 +32,7 @@ namespace ReallifeGamemode.Server.WeaponDeal
if (!factionWeaponDeal.ContainsKey(factionID)) if (!factionWeaponDeal.ContainsKey(factionID))
return new Vector3(); return new Vector3();
if(factionID == 1 | factionID == 3) if (factionID == 1 | factionID == 3)
{ {
Random rnd = new Random(); Random rnd = new Random();
factionWeaponDeal[factionID] = rnd.Next(0, StaatsFrakWT_Route.Count - 1); factionWeaponDeal[factionID] = rnd.Next(0, StaatsFrakWT_Route.Count - 1);
@@ -45,14 +45,14 @@ namespace ReallifeGamemode.Server.WeaponDeal
return WT_Route.ElementAt(factionWeaponDeal[factionID]); return WT_Route.ElementAt(factionWeaponDeal[factionID]);
} }
/* if (factionWeaponDeal[factionID] == -1) /* if (factionWeaponDeal[factionID] == -1)
{ {
Random rnd = new Random(); Random rnd = new Random();
factionWeaponDeal[factionID] = rnd.Next(0, WT_Route.Count - 1); factionWeaponDeal[factionID] = rnd.Next(0, WT_Route.Count - 1);
} }
return WT_Route.ElementAt(factionWeaponDeal[factionID]); return WT_Route.ElementAt(factionWeaponDeal[factionID]);
*/ */
} }
} }
} }