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

move keys J -> O (Online), 2 -> J (Job)

Browse Source
This commit is contained in:
hydrant
2019-05-21 18:35:09 +02:00
parent 2cc591230e
commit 1a424261ea
2 changed files with 13 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ReallifeGamemode.Client/Player/keys.ts
View File

@@ -94,10 +94,10 @@ export default function keys(globalData: GlobalData) {
} }
}); });
//J //Spielerliste //O //Spielerliste
mp.keys.bind(0x4A, false, function () { mp.keys.bind(0x4F, false, function () {
if (!globalData.InChat) { if (!globalData.InChat) {
mp.events.callRemote("keyPress:J"); mp.events.callRemote("keyPress:O");
//mp.events.call("showPlayerlist"); //mp.events.call("showPlayerlist");
} }
}); });
@@ -140,7 +140,7 @@ export default function keys(globalData: GlobalData) {
}); });
//2 // Job Starten //2 // Job Starten
mp.keys.bind(0x32, false, () => { mp.keys.bind(0x4A, false, () => {
if (!globalData.InChat && !globalData.InInput && !globalData.InMenu && globalData.LoggedIn) { if (!globalData.InChat && !globalData.InInput && !globalData.InMenu && globalData.LoggedIn) {
mp.events.callRemote("CLIENT:JobManager_ShowJobMenu"); mp.events.callRemote("CLIENT:JobManager_ShowJobMenu");
} }

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

@@ -44,7 +44,7 @@ namespace ReallifeGamemode.Server.Events
"0", "200", true.ToString(), 0.ToString(), 0.ToString()); "0", "200", true.ToString(), 0.ToString(), 0.ToString());
player.SendNotification("~y~ATM~s~ erstellt!", false); player.SendNotification("~y~ATM~s~ erstellt!", false);
break; break;
} }
} }
GroundItem.PickUpGroundItem(player); GroundItem.PickUpGroundItem(player);
@@ -112,7 +112,7 @@ namespace ReallifeGamemode.Server.Events
factionRank = u.GetFactionRank().RankName, factionRank = u.GetFactionRank().RankName,
group = u.Group?.Name ?? "Keine", group = u.Group?.Name ?? "Keine",
groupRank = u.GroupRank.GetName(), groupRank = u.GroupRank.GetName(),
job = JobManager.GetJob(u.JobId ?? 0)?.Name ?? "Keiner" job = JobManager.GetJob(u.JobId ?? 0)?.Name ?? "Keiner"
}; };
string faction = u.FactionLeader ? u.Faction.Name : null; string faction = u.FactionLeader ? u.Faction.Name : null;
@@ -201,25 +201,18 @@ namespace ReallifeGamemode.Server.Events
InventoryManager.GetUserItems(player); InventoryManager.GetUserItems(player);
} }
[RemoteEvent("keyPress:J")] [RemoteEvent("keyPress:O")]
public void KeyPressJ(Client player) public void KeyPressJ(Client player)
{ {
if (!player.IsLoggedIn()) return; if (!player.IsLoggedIn()) return;
List<Client> players = NAPI.Pools.GetAllPlayers(); List<Client> players = NAPI.Pools.GetAllPlayers();
List<ListPlayer> ListPlayers = new List<ListPlayer>(); var listPlayers = players.Select(p => new
foreach (Client listPlayer in players)
{ {
var lPlayer = new ListPlayer Id = p.Handle.Value,
{ p.Name,
Id = listPlayer.Handle.Value, p.Ping
Name = listPlayer.Name, });
Ping = listPlayer.Ping player.TriggerEvent("fetchPlayerList", JsonConvert.SerializeObject(listPlayers));
};
ListPlayers.Add(lPlayer);
}
player.TriggerEvent("fetchPlayerList", JsonConvert.SerializeObject(ListPlayers));
} }
[RemoteEvent("keyPress:K")] [RemoteEvent("keyPress:K")]