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

[HOTFIX] v0.0.3-h1

Browse Source 
fix bug at LSED checkpoint
fix Message for Cops
This commit is contained in:
Lukas Moungos
2021-04-08 01:56:56 +02:00
parent 015783cb15
commit f4e7aa619c
3 changed files with 34 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,9 +35,7 @@ export default function factionInteraction(globalData: IGlobalData) {
var reviveTaskMenuMedic;
var insDate;
/*mp.events.add("updateFactionBlips", (type, taskList) => {
});
});*/
mp.events.add("showFactionInteractionLSPD", (userFactionId, isDuty, userFactionName, isFactionLeader) => {
//LSPD
@@ -64,8 +62,6 @@ export default function factionInteraction(globalData: IGlobalData) {
TaskMenuLSPD.SetRightLabel("");
factionInteractionMenu.AddItem(TaskMenuLSPD);*/ //weiteres
let cancelItem = new UIMenuItem("Schlie\u00dfen", "Schlie\u00dft die Fraktionsinteraktion.");
cancelItem.BackColor = new Color(213, 0, 0);
cancelItem.HighlightedBackColor = new Color(229, 57, 53);
@@ -172,7 +168,6 @@ export default function factionInteraction(globalData: IGlobalData) {
var wList;
mp.events.add("showWantedlist", (playersJson) => {
if (wantedlistBrowser !== null) {
wantedlistBrowser.destroy();
wantedlistBrowser = null;
@@ -193,7 +188,6 @@ export default function factionInteraction(globalData: IGlobalData) {
});
mp.events.add("removeWantedlist", () => {
if (wantedlistBrowser == null) {
return;
}
@@ -212,7 +206,6 @@ export default function factionInteraction(globalData: IGlobalData) {
mp.gui.chat.activate(false);
globalData.InMenu = true;
var rPM = ((reviveTaskCountMedic === "0") ? "~r~" : "~g~");
var hPM = ((healTaskCountMedic === "0") ? "~r~" : "~g~");
var fPM = ((fireTaskCountMedic === "0") ? "~r~" : "~g~");
@@ -238,7 +231,6 @@ export default function factionInteraction(globalData: IGlobalData) {
fireTaskMenuMedic.SetRightLabel(fPM + fireTaskCountMedic);
factionInteractionMenu.AddItem(fireTaskMenuMedic);
*/
}
}
@@ -277,9 +269,7 @@ export default function factionInteraction(globalData: IGlobalData) {
});
});
mp.events.add("showMedicTasks", (type, taskList) => {
tasks = JSON.parse(taskList);
//mp.events.call("sortFactionTasks", false);
@@ -469,7 +459,7 @@ export default function factionInteraction(globalData: IGlobalData) {
});
mp.events.add("destroyMedicTaskCheckpoint", () => {
if (activeCheckpoint) {
if (activeCheckpoint && mp.checkpoints.exists(activeCheckpoint)) {
activeCheckpoint.destroy();
activeCheckpoint = null;
activeTask = null;
@@ -486,7 +476,7 @@ export default function factionInteraction(globalData: IGlobalData) {
activeTask = null;
deadRespawned = false;
timeLeft = null;
} else if (activeTask.Type == 1){
} else if (activeTask.Type == 1) {
activeCheckpoint.destroy();
activeCheckpoint = null;
mp.events.callRemote("delHealTaskAsMedic", activeTask.Victim);
@@ -502,7 +492,6 @@ export default function factionInteraction(globalData: IGlobalData) {
});
mp.events.add('render', () => {
if (activeTask) {
rangeLeft = mp.game.gameplay.getDistanceBetweenCoords(player.position.x, player.position.y, player.position.z, taskFinish.x, taskFinish.y, taskFinish.z, true).toFixed(2);
if (rangeLeft > 1.9) {

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

@@ -76,6 +76,8 @@ namespace ReallifeGamemode.Server.Events
bool copNearby = NAPI.Pools.GetAllPlayers().Any(u => u.IsDuty() && u.IsAlive() && u.Position.DistanceToSquared(player.Position) <= 200 * 200);
if (user.Wanteds > 0)
{
if (copNearby)
{
user.SetJailTime(true);
@@ -86,6 +88,7 @@ namespace ReallifeGamemode.Server.Events
{
ChatService.HQMessage(user.Name + " wurde soeben ins Krankenhaus eingeliefert.");
}
}
if (user.JailTime <= 0)
{

2
ReallifeGamemode.Server/Gangwar/Turf.cs
View File

@@ -272,10 +272,12 @@ namespace ReallifeGamemode.Server.Gangwar
Player[] attackers = NAPI.Pools.GetAllPlayers().Where(c => c.IsLoggedIn() && c.GetUser().Faction.Name == this.Attacker).ToArray();
foreach (var o in owners)
{
if (o != null)
o.TriggerEvent("CLIENT:loose");
}
foreach (var a in attackers)
{
if (a != null)
a.TriggerEvent("CLIENT:win");
}
this.Owner = FactionName;