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

Fix Count Duty Medics

Browse Source
This commit is contained in:
VegaZ
2021-02-05 20:29:06 +01:00
parent 3f59982855
commit 466ab4cc63
6 changed files with 23 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ReallifeGamemode.Client/Interaction/factioninteraction.ts
View File

@@ -26,6 +26,7 @@ export default function factionInteraction(globalData: IGlobalData) {
var rangeLeft;
var sortText;
var deadRespawned = false;
var isRevived = false;
var ticketName: string;
var pointsName: string;
@@ -482,6 +483,9 @@ export default function factionInteraction(globalData: IGlobalData) {
mp.events.callRemote("delReviveTask");
mp.events.callRemote("payCutMedicEarnings");
deadRespawned = false;
} else {
activeTask = false;
activeCheckpoint.destroy();
}
});
@@ -504,10 +508,7 @@ export default function factionInteraction(globalData: IGlobalData) {
mp.game.graphics.drawSprite("medicimages", "ambulance", ambulanceImagePos + 0.01, 0.915, 0.04, 0.07, 0, 255, 255, 255, 255);
} else {
mp.game.graphics.drawSprite("medicimages", "running", ambulanceImagePos + 0.02, 0.915, 0.02, 0.035, 0, 255, 0, 0, 255);
}
} else {
activeTask = false;
activeCheckpoint.destroy();
}
}
}
});

5
ReallifeGamemode.Server/Events/Death.cs
View File

@@ -235,10 +235,5 @@ namespace ReallifeGamemode.Server.Events
Medic.delReviveTask(player);
NAPI.Player.SpawnPlayer(player, new Vector3(-495.45, -336.33, 34.5), -98.36f);
}
[RemoteEvent("MedicTaskTimeout")]
public void RemoveMedicTask(Player player)
{
Medic.delReviveTask(player);
}
}
}

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

@@ -274,15 +274,7 @@ namespace ReallifeGamemode.Server.Events
player.TriggerEvent("toggleDutyMode", true);
if (player.GetUser().FactionId == 2) //Fire Department
{
int medicCount = 0;
foreach (Player c in NAPI.Pools.GetAllPlayers())
{
if ((c.GetUser()?.Faction?.Id ?? 0) == 2)
{
medicCount++;
}
}
NAPI.ClientEvent.TriggerClientEventForAll("updateDutyMedics", medicCount);
Medic.UpdateDutyMedics(1);
}
switch (factionId)
{
@@ -334,7 +326,7 @@ namespace ReallifeGamemode.Server.Events
user.SetData("duty", false);
player.SendNotification("Du bist nun ~r~außer Dienst.");
player.TriggerEvent("toggleDutyMode", false);
NAPI.ClientEvent.TriggerClientEventForAll("updateDutyMedics", false);
Medic.UpdateDutyMedics(-1);
player.SetSharedData("blipColor", 0);
UpdateCharacterCloth.LoadCharacterDefaults(player);
}

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

@@ -22,6 +22,7 @@ namespace ReallifeGamemode.Server.Factions.Medic
public static List<MedicTask> HealTasks = new List<MedicTask>();
public static List<MedicTask> FireTasks = new List<MedicTask>();
public static int ReviveIncome = 500;
public static int dutyMedics = 0;
public static void AddTaskToList(MedicTask task)
{
@@ -152,5 +153,17 @@ namespace ReallifeGamemode.Server.Factions.Medic
player.SendNotification($"Du hast den Einsatzort erreicht und ~g~{Medic.ReviveIncome / 2}$ ~s~für die Fraktion verdient.");
dbContext.SaveChanges();
}
[RemoteEvent("MedicTaskTimeout")]
public void RemoveMedicTask(Player player)
{
Medic.delReviveTask(player);
}
public static void UpdateDutyMedics(int modifier)
{
dutyMedics = dutyMedics + modifier;
NAPI.ClientEvent.TriggerClientEventForAll("updateDutyMedics", dutyMedics);
}
}
}

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

@@ -276,7 +276,7 @@ namespace ReallifeGamemode.Server.Managers
{
target.SetData("duty", false);
target.TriggerEvent("toggleDutyMode", false);
NAPI.ClientEvent.TriggerClientEventForAll("updateDutyMedics", false);
Medic.UpdateDutyMedics(-1);
target.SetSharedData("blipColor", 0);
UpdateCharacterCloth.LoadCharacterDefaults(target);
target.GetUser(dbContext).FactionRankId = null;

11
ReallifeGamemode.Server/Util/FactionHelper.cs
View File

@@ -4,6 +4,7 @@ using Microsoft.EntityFrameworkCore;
using ReallifeGamemode.Database.Entities;
using ReallifeGamemode.Database.Models;
using ReallifeGamemode.Server.Extensions;
using ReallifeGamemode.Server.Factions.Medic;
using ReallifeGamemode.Server.Managers;
namespace ReallifeGamemode.Server.Util
@@ -44,15 +45,7 @@ namespace ReallifeGamemode.Server.Util
Events.UpdateCharacterCloth.LoadCharacterDefaults(player);
player.TriggerEvent("toggleDutyMode", false);
int medicCount = 0;
foreach (Player c in NAPI.Pools.GetAllPlayers())
{
if ((c.GetUser()?.Faction?.Id ?? 0) == 2)
{
medicCount++;
}
}
NAPI.ClientEvent.TriggerClientEventForAll("updateDutyMedics", medicCount);
Medic.UpdateDutyMedics(1);
}
}
}