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

inshallah kein fehler

Browse Source
This commit is contained in:
hydrant
2020-05-10 23:18:53 +02:00
parent fbf2cf0533 2c648d52dd
commit ccbf1ff41c
153 changed files with 6517 additions and 3407 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,7 +1,6 @@
using System;
using System.Collections.Generic;
using GTANetworkAPI;
using ReallifeGamemode.Server.Util;
using Newtonsoft.Json;
using ReallifeGamemode.Server.Extensions;
using ReallifeGamemode.Database.Models;

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

@@ -1,19 +1,20 @@
using System.Collections.Generic;
using System.Linq;
using GTANetworkAPI;
using ReallifeGamemode.Database.Entities;
using ReallifeGamemode.Database.Models;
using ReallifeGamemode.Server.Services;
using System;
using System.Collections.Generic;
using System.Linq;
namespace ReallifeGamemode.Server.Job
{
public abstract class JobBase : Script
{
public delegate void JobStartHandler(Player player);
public delegate void JobStopHandler(Player player);
public event JobStartHandler JobStart;
public event JobStopHandler JobStop;
private readonly List<Player> _inJob = new List<Player>();
@@ -59,6 +60,7 @@ namespace ReallifeGamemode.Server.Job
}
public static List<Player> GetPlayerInJob() => jobPlayer;
public List<Player> GetUsersInJob() => _inJob;
}
}

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

@@ -1,7 +1,6 @@
using System;
using System.Collections.Generic;
using GTANetworkAPI;
using ReallifeGamemode.Server.Util;
using Newtonsoft.Json;
using ReallifeGamemode.Server.Extensions;
using ReallifeGamemode.Database.Models;
@@ -10,7 +9,7 @@ using ReallifeGamemode.Server.Managers;
namespace ReallifeGamemode.Server.Job
{
class PilotJob : JobBase
internal class PilotJob : JobBase
{
public override int Id => 3;
@@ -90,8 +89,6 @@ namespace ReallifeGamemode.Server.Job
new Vector3(-710.89, -1836.81, 355.46),
}.AsReadOnly();
public PilotJob()
{
JobStart += PilotJob_JobStart;
@@ -106,7 +103,6 @@ namespace ReallifeGamemode.Server.Job
if ((VehicleHash)veh.Model == VehicleHash.Velum || (VehicleHash)veh.Model == VehicleHash.Velum2)
{
listRouteTexts2.Add("Route 4");
listRouteTexts2.Add("Route 5");
listRouteTexts2.Add("Route 6");
@@ -151,7 +147,6 @@ namespace ReallifeGamemode.Server.Job
break;
}
}*/
}
[RemoteEvent("startPilotRoute")]
public void StartPilotRoute(Player player, string type)
{

17
ReallifeGamemode.Server/Job/RefuseCollectorJob.cs
View File

@@ -202,6 +202,7 @@ namespace ReallifeGamemode.Server.Job
Player target = data.getPartnerClient(player);
if (target != null) target.TriggerEvent("MuellmannUpdateColshape", colshapeIndex);
ChatService.SendMessage((Player)player, "Du hast den Müllsack in der Hand. Bringe ihm zum Müllwagen hinten.");
player.AddAttachment("binbag", false);
return;
}
}
@@ -213,14 +214,10 @@ namespace ReallifeGamemode.Server.Job
{
if (data.getDataFromClient(player) == null) continue;
int count = data.getTrashCount();
count++;
data.setTrashCount(count);
data.setTrashCount(data.getTrashCount() + 1);
Player target = data.getPartnerClient(player);
if (target != null) ChatService.SendMessage((Player)target, $"Es sind jetzt {count} Säcke im Müllwagen.");
ChatService.SendMessage((Player)player, $"Es sind jetzt {count} Säcke im Müllwagen.");
player.AddAttachment("binbag", true);
if (data.getTrashCount() >= 20)
{
ChatService.SendMessage((Player)player, "Auto ist voll fahre nun zu Base.");
@@ -241,11 +238,9 @@ namespace ReallifeGamemode.Server.Job
{
if (data.getDataFromClient(player) == null) continue;
int count = data.getTrashCount();
Player target = data.getPartnerClient(player);
if (target != null) ChatService.SendMessage((Player)target, $"Fahrzeug wurde entleert. Säcke: {count}");
ChatService.SendMessage((Player)player, $"Fahrzeug wurde entleert. Säcke: {count}");
if (target != null) ChatService.SendMessage((Player)target, $"Fahrzeug wurde entleert. Säcke: {data.getTrashCount()}");
ChatService.SendMessage((Player)player, $"Fahrzeug wurde entleert. Säcke: {data.getTrashCount()}");
//bonus pro sack
data.setTrashCount(0);
@@ -331,7 +326,7 @@ namespace ReallifeGamemode.Server.Job
}
CheckDataForDuplicatePlayer(player, data);
data.setClientToData(player);
//destroy veh
MuellmannJobStarten(player, vehicle);
target = data.getPartnerClient(player);

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

@@ -1,21 +1,18 @@
using System;
using System.Collections.Generic;
using System.Text;
using GTANetworkAPI;
using ReallifeGamemode.Server.Util;
using ReallifeGamemode.Server.Services;
using ReallifeGamemode.Server.Extensions;
using System.Timers;
using ReallifeGamemode.Database.Models;
using ReallifeGamemode.Server.Managers;
using ReallifeGamemode.Database.Entities;
using System.Linq;
using GTANetworkAPI;
using Newtonsoft.Json;
using ReallifeGamemode.Database.Entities;
using ReallifeGamemode.Database.Models;
using ReallifeGamemode.Server.Extensions;
using ReallifeGamemode.Server.Services;
using ReallifeGamemode.Server.Types;
using ReallifeGamemode.Server.Util;
namespace ReallifeGamemode.Server.Job
{
class TaxiDriverJob : JobBase
internal class TaxiDriverJob : JobBase
{
public List<TaxiContract> TaxiContracts { get; set; } = new List<TaxiContract>();
@@ -27,7 +24,6 @@ namespace ReallifeGamemode.Server.Job
public override bool NeedVehicleToStart => true;
private static TaxiDriverJob _Instance;
public TaxiDriverJob()
@@ -42,6 +38,7 @@ namespace ReallifeGamemode.Server.Job
_Instance = new TaxiDriverJob();
return _Instance;
}
private void TaxiDriverJobJobStart(Player player)
{
player.Vehicle.SetSharedData("vehicleTaxiLight", true);
@@ -89,24 +86,23 @@ namespace ReallifeGamemode.Server.Job
dbContext.SaveChanges();
target.Player.TriggerEvent("SERVER:SET_HANDMONEY", target.Handmoney);
}
}
/*
public static void StartTaxiTimer()
{
Timer timer = new Timer(500);
timer.Start();
timer.Elapsed += UpdateFare;
}
*/
/*
public static void StartTaxiTimer()
{
Timer timer = new Timer(500);
timer.Start();
timer.Elapsed += UpdateFare;
}
*/
public static void UpdateFare()
{
foreach (var player in GetPlayerInJob())
{
User u = player.GetUser();
if (u.JobId != 1) return;
if (u.JobId != 1) return;
Console.WriteLine(player.Name);
if (!player.HasData("hasPassager")) { player.SetData<bool>("hasPassager", false); continue; }
int playerId = player.GetUser().Id;
@@ -124,9 +120,7 @@ namespace ReallifeGamemode.Server.Job
{
occupant.TriggerEvent("CLIENT:updateFare", JsonConvert.SerializeObject(distance));
}
}
}
}
}