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

Made some last changes to faction interaction

Browse Source
This commit is contained in:
VegaZ
2019-03-06 20:03:02 +01:00
parent fd06c11a0d
commit 13142edbb7
4 changed files with 40 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
ReallifeGamemode.Client/Interaction/factioninteraction.js
View File

@@ -31,7 +31,7 @@ mp.events.add("updateFactionBlips", (type, taskList) => {
}); });
mp.events.add("showFactionInteraction", (userFactionId, userFactionName, isFactionLeader, reviveTaskCount, healTaskCount, fireTaskCount) => { mp.events.add("showFactionInteraction", (userFactionId, isDuty, userFactionName, isFactionLeader, reviveTaskCount, healTaskCount, fireTaskCount) => {
mp.gui.chat.activate(false); mp.gui.chat.activate(false);
globalData.Interaction = true; globalData.Interaction = true;
@@ -49,21 +49,24 @@ mp.events.add("showFactionInteraction", (userFactionId, userFactionName, isFacti
let reviveTaskMenu; let reviveTaskMenu;
let healTaskMenu; let healTaskMenu;
let fireTaskMenu; let fireTaskMenu;
if (isDuty)
{
switch (userFactionId)
{
case 2:
reviveTaskMenu = new UIMenuItem("Reviveauftr\u00e4ge");
reviveTaskMenu.SetRightLabel(rP + reviveTaskCount)
factionInteractionMenu.AddItem(reviveTaskMenu);
switch (userFactionId) { healTaskMenu = new UIMenuItem("Healauftr\u00e4ge");
case 2: healTaskMenu.SetRightLabel(hP + healTaskCount)
reviveTaskMenu = new UIMenuItem("Reviveauftr\u00e4ge"); factionInteractionMenu.AddItem(healTaskMenu);
reviveTaskMenu.SetRightLabel(rP + reviveTaskCount)
factionInteractionMenu.AddItem(reviveTaskMenu);
healTaskMenu = new UIMenuItem("Healauftr\u00e4ge"); fireTaskMenu = new UIMenuItem("Feuerauftr\u00e4ge");
healTaskMenu.SetRightLabel(hP + healTaskCount) fireTaskMenu.SetRightLabel(fP + fireTaskCount)
factionInteractionMenu.AddItem(healTaskMenu); factionInteractionMenu.AddItem(fireTaskMenu);
break;
fireTaskMenu = new UIMenuItem("Feuerauftr\u00e4ge"); }
fireTaskMenu.SetRightLabel(fP + fireTaskCount)
factionInteractionMenu.AddItem(fireTaskMenu);
break;
} }
let cancelItem = new UIMenuItem("Schlie\u00dfen", "Schlie\u00dft die Fraktionsinteraktion"); let cancelItem = new UIMenuItem("Schlie\u00dfen", "Schlie\u00dft die Fraktionsinteraktion");
@@ -240,7 +243,8 @@ mp.events.add('render', () => {
scale: [0.35, 0.35], scale: [0.35, 0.35],
outline: true, outline: true,
centre: true centre: true
}); });
if (taskRange < rangeLeft) ambulanceImagePos = 0.3;
mp.game.graphics.drawSprite("medicimages", "finish", 0.655, 0.898, 0.04, 0.07, 0, 255, 255, 255, 255); mp.game.graphics.drawSprite("medicimages", "finish", 0.655, 0.898, 0.04, 0.07, 0, 255, 255, 255, 255);
if (player.isInAnyVehicle(false)) { if (player.isInAnyVehicle(false)) {
mp.game.graphics.drawSprite("medicimages", "ambulance", ambulanceImagePos + 0.01, 0.915, 0.04, 0.07, 0, 255, 255, 255, 255); mp.game.graphics.drawSprite("medicimages", "ambulance", ambulanceImagePos + 0.01, 0.915, 0.04, 0.07, 0, 255, 255, 255, 255);

20
ReallifeGamemode.Client/Player/keys.js
View File

@@ -34,11 +34,11 @@ mp.keys.bind(0x26, false, function () {
}); });
//RIGHT ARROW (Interaktion mit anderen Spielern) //RIGHT ARROW (Interaktion mit anderen Spielern)
//mp.keys.bind(0x27, false, function () { mp.keys.bind(0x27, false, function () {
// if (!globalData.InChat && !showInv && !globalData.Interaction) { if (!globalData.InChat && !showInv && !globalData.Interaction) {
// mp.events.callRemote("keyPress:RIGHT_ARROW"); mp.events.callRemote("keyPress:RIGHT_ARROW");
// } }
//}); });
//DOWN ARROW (Interaktion mit anderen Spielern) //DOWN ARROW (Interaktion mit anderen Spielern)
mp.keys.bind(0x28, false, function () { mp.keys.bind(0x28, false, function () {
@@ -65,11 +65,11 @@ mp.keys.bind(0x62, false, function () {
}); });
//NUM5 //Fraktionsinteraktion (Tasks sortieren) //NUM5 //Fraktionsinteraktion (Tasks sortieren)
mp.keys.bind(0x65, false, function () { //mp.keys.bind(0x65, false, function () {
if (!globalData.InChat && globalData.Interaction) { // if (!globalData.InChat && globalData.Interaction) {
mp.events.call("sortFactionTasks", true); // mp.events.call("sortFactionTasks", true);
} // }
}); //});
//E //E
mp.keys.bind(0x45, false, function () { mp.keys.bind(0x45, false, function () {

10
ReallifeGamemode.Server/Commands/Faction.cs
View File

@@ -267,6 +267,16 @@ namespace reallife_gamemode.Server.Commands
[Command("duty", "~m~Benutzung: ~s~/duty")] [Command("duty", "~m~Benutzung: ~s~/duty")]
public void CmdFactionDuty(Client player) public void CmdFactionDuty(Client player)
{ {
if(player.GetData("duty") == false)
{
player.SetData("duty", true);
player.SendNotification("~g~Du bist jetzt im Dienst!", false);
}
else
{
player.SetData("duty", false);
player.SendNotification("~r~Schönen Feierabend!", false);
}
} }
#endregion #endregion
} }

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

@@ -66,7 +66,7 @@ namespace reallife_gamemode.Server.Events
{ {
//LSFD //LSFD
case 2: case 2:
player.TriggerEvent("showFactionInteraction", user.FactionId, user.GetFaction().Name, user.FactionLeader, Medic.ReviveTasks.Count.ToString(), Medic.HealTasks.Count.ToString(), Medic.FireTasks.Count.ToString()); player.TriggerEvent("showFactionInteraction", user.FactionId, player.GetData("duty"), user.GetFaction().Name, user.FactionLeader, Medic.ReviveTasks.Count.ToString(), Medic.HealTasks.Count.ToString(), Medic.FireTasks.Count.ToString());
break; break;
} }
} }