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

Fix Refuse

Browse Source
This commit is contained in:
kookroach
2021-04-04 16:17:40 +02:00
parent 03617a2336
commit 0d963d362f
2 changed files with 32 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ReallifeGamemode.Client/Interaction/clothes/ClotheShop.ts
View File

@@ -177,8 +177,14 @@ export default function clotheShopList(globalData: IGlobalData) {
if (item.ComponentId == key) { if (item.ComponentId == key) {
var txData = getClothingName(key, item.ClotheId, gender); var txData = getClothingName(key, item.ClotheId, gender);
mp.gui.chat.push('Key ' + key);
mp.gui.chat.push(item);
if (key === 11 || key === 4 || key === 6) {
categoryMenu.AddItem(new UIMenuItem(mp.game.ui.getLabelText(txData[0].data[0].GXT), "")); categoryMenu.AddItem(new UIMenuItem(mp.game.ui.getLabelText(txData[0].data[0].GXT), ""));
let clotheUpperMenu = new UIMenu(" ", mp.game.ui.getLabelText(txData[0].data[0].GXT), new Point(0, 0), bannerSprite.library, bannerSprite.texture); let clotheUpperMenu = new UIMenu(" ", mp.game.ui.getLabelText(txData[0].data[0].GXT), new Point(0, 0), bannerSprite.library, bannerSprite.texture);
}
clotheUpperMenu.Visible = false; clotheUpperMenu.Visible = false;
for (const x of txData) { for (const x of txData) {

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

@@ -19,6 +19,8 @@ namespace ReallifeGamemode.Server.Job
public override bool NeedVehicleToStart => false; public override bool NeedVehicleToStart => false;
const int MAX_BAG = 50;
public RefuseCollectorJob() public RefuseCollectorJob()
{ {
JobStart += RefuseCollectorJobJobStart; JobStart += RefuseCollectorJobJobStart;
@@ -168,7 +170,7 @@ namespace ReallifeGamemode.Server.Job
if (data.getDataFromClient(player) == null) continue; if (data.getDataFromClient(player) == null) continue;
veh = data.vehicle; veh = data.vehicle;
JobBase job = JobManager.GetJob(player.GetUser().JobId ?? -1); JobBase job = JobManager.GetJob(player.GetUser().JobId ?? -1);
ChatService.SendMessage((Player)player, $"~y~Job: ~s~Du hast deinen Job (~o~{job.Name}~s~) gestartet."); ChatService.SendMessage((Player)player, $"~y~[Job] ~s~Du hast deinen Job (~o~{job.Name}~s~) gestartet.");
player.TriggerEvent("SERVER:MuellmannStatusTrue"); player.TriggerEvent("SERVER:MuellmannStatusTrue");
player.TriggerEvent("SERVER:MuellmannBCSErstellen", JsonConvert.SerializeObject(vector3s.ToArray()), veh); player.TriggerEvent("SERVER:MuellmannBCSErstellen", JsonConvert.SerializeObject(vector3s.ToArray()), veh);
return; return;
@@ -179,10 +181,8 @@ namespace ReallifeGamemode.Server.Job
public void MuellmannJobBeenden(Player player) public void MuellmannJobBeenden(Player player)
{ {
JobBase job = JobManager.GetJob(player.GetUser().JobId ?? -1); JobBase job = JobManager.GetJob(player.GetUser().JobId ?? -1);
ChatService.SendMessage((Player)player, $"~y~Job: ~s~Du hast deinen Job (~o~{job.Name}~s~) beendet.");
player.TriggerEvent("SERVER:MuellmannStatusFalse"); player.TriggerEvent("SERVER:MuellmannStatusFalse");
player.TriggerEvent("SERVER:MuellmannBCSEntfernen"); player.TriggerEvent("SERVER:MuellmannBCSEntfernen");
job.StopJob(player, true);
foreach (var data in muellmanData) foreach (var data in muellmanData)
{ {
@@ -195,6 +195,7 @@ namespace ReallifeGamemode.Server.Job
muellmanData.Remove(data); muellmanData.Remove(data);
return; return;
} }
ChatService.SendMessage(data.getPartnerClient(player), $"~y~[Job] ~s~Dein Partner hat den Job beendet.");
data.removeClientFromData(player); data.removeClientFromData(player);
return; return;
@@ -233,28 +234,30 @@ namespace ReallifeGamemode.Server.Job
User user2 = target.GetUser(dbContext); User user2 = target.GetUser(dbContext);
data.setTrashCount(data.getTrashCount() + 1);
player.SendNotification("Müllsack: " + data.getTrashCount() + " von 20.");
if (target != null)
{
target.SendNotification("Müllsack: " + data.getTrashCount() + " von 20.");
}
dbContext.SaveChanges();
// player.AddAttachment("binbag", true); // player.AddAttachment("binbag", true);
if (data.getTrashCount() >= 20) if (data.getTrashCount() == MAX_BAG)
{ {
ChatService.SendMessage((Player)player, "~y~Job: ~s~Der Müllwagen ist voll. Fahre nun zurück zur Recyclinganlage!"); ChatService.SendMessage((Player)player, "~y~[Job] ~s~Der Müllwagen ist voll. Fahre nun zurück zur Recyclinganlage!");
if (target != null) if (target != null)
{ {
ChatService.SendMessage((Player)target, "~y~Job: ~s~Der Müllwagen ist voll! Er muss entleert werden."); ChatService.SendMessage((Player)target, "~y~[Job] ~s~Der Müllwagen ist voll! Er muss entleert werden.");
target.TriggerEvent("SERVER:MuellmannZuBase"); target.TriggerEvent("SERVER:MuellmannZuBase");
} }
player.TriggerEvent("SERVER:MuellmannZuBase"); player.TriggerEvent("SERVER:MuellmannZuBase");
}else if(data.getTrashCount() > MAX_BAG)
{
ChatService.ErrorMessage((Player)player, "Der Müllwagen ist schon voll.");
} }
else else
{ {
data.setTrashCount(data.getTrashCount() + 1);
player.SendNotification("Müllsack: " + data.getTrashCount() + " von " + MAX_BAG + ".");
if (target != null)
{
target.SendNotification("Müllsack: " + data.getTrashCount() + " von " + MAX_BAG + ".");
}
if (target != null) if (target != null)
{ {
@@ -282,15 +285,15 @@ namespace ReallifeGamemode.Server.Job
if (data.getDataFromClient(player) == null) continue; if (data.getDataFromClient(player) == null) continue;
Player target = data.getPartnerClient(player); Player target = data.getPartnerClient(player);
if (target != null) ChatService.SendMessage((Player)target, $"~y~Job: ~s~Fahrzeug wurde entleert. Säcke: {data.getTrashCount()}"); if (target != null) ChatService.SendMessage((Player)target, $"~y~[Job] ~s~Fahrzeug wurde entleert. Säcke: {data.getTrashCount()}");
ChatService.SendMessage((Player)player, $"~y~Job: ~s~Fahrzeug wurde entleert. Säcke: {data.getTrashCount()}"); ChatService.SendMessage((Player)player, $"~y~[Job] ~s~Fahrzeug wurde entleert. Säcke: {data.getTrashCount()}");
//bonus pro sack //bonus pro sack
using (var dbContext = new DatabaseContext()) using (var dbContext = new DatabaseContext())
{ {
User user1 = player.GetUser(dbContext); User user1 = player.GetUser(dbContext);
User user2 = target.GetUser(dbContext); User user2 = target.GetUser(dbContext);
int bonus = 25 * data.getTrashCount(); int bonus = 5 * data.getTrashCount();
if (target != null) if (target != null)
{ {
@@ -372,8 +375,8 @@ namespace ReallifeGamemode.Server.Job
if (target == null) if (target == null)
return; return;
ChatService.SendMessage((Player)player, $"~y~Job: ~s~Dein Partner ist {target.Name}!"); ChatService.SendMessage((Player)player, $"~y~[Job] ~s~Dein Partner ist {target.Name}!");
ChatService.SendMessage((Player)target, $"~y~Job: ~s~Dein Partner ist {player.Name}!"); ChatService.SendMessage((Player)target, $"~y~[Job] ~s~Dein Partner ist {player.Name}!");
return; return;
} }
} }
@@ -389,8 +392,8 @@ namespace ReallifeGamemode.Server.Job
if (target == null) if (target == null)
return; return;
ChatService.SendMessage((Player)player, $"~y~Job: ~s~Dein Partner ist {target.Name}!"); ChatService.SendMessage((Player)player, $"~y~[Job] ~s~Dein Partner ist {target.Name}!");
ChatService.SendMessage((Player)target, $"~y~Job: ~s~Dein Partner ist {player.Name}!"); ChatService.SendMessage((Player)target, $"~y~[Job] ~s~Dein Partner ist {player.Name}!");
} }
} }