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

RAGE Multiplayer 1.1.0-DP Update

Browse Source 
/freeze was obselete and removed
/unfreeze was obselete and removed
/spectate was obselete and removed
This commit is contained in:
Siga
2020-02-24 21:18:54 +01:00
parent 0d5731fb11
commit edf06f4478
85 changed files with 804 additions and 643 deletions
Download Patch File Download Diff File Expand all files Collapse all files

437
ReallifeGamemode.Server/Commands/AdminCommands.cs
View File

File diff suppressed because it is too large Load Diff

30
ReallifeGamemode.Server/Commands/FactionCommands.cs
View File

@@ -24,7 +24,7 @@ namespace ReallifeGamemode.Server.Commands
#region Chat Commands
[Command("f", "~m~Benutzung: ~s~/f [Nachricht]", GreedyArg = true)]
public void CmdFactionF(Client player, string message)
public void CmdFactionF(Player player, string message)
{
Faction f = player.GetUser()?.Faction;
if (f == null || f.StateOwned)
@@ -40,7 +40,7 @@ namespace ReallifeGamemode.Server.Commands
}
[Command("r", "~m~Benutzung: ~s~/r [Nachricht]", GreedyArg = true)]
public void CmdFactionR(Client player, string message)
public void CmdFactionR(Player player, string message)
{
Faction f = player.GetUser()?.Faction;
if (f == null || !f.StateOwned)
@@ -56,7 +56,7 @@ namespace ReallifeGamemode.Server.Commands
}
[Command("d", "~m~Benutzung: ~s~/d [Nachricht]", GreedyArg = true)]
public void CmdFactionD(Client player, string message)
public void CmdFactionD(Player player, string message)
{
Faction f = player.GetUser()?.Faction;
if (f == null || !f.StateOwned)
@@ -76,7 +76,7 @@ namespace ReallifeGamemode.Server.Commands
#endregion
#region Leader Commands
[Command("giverank", "~m~Benutzung: ~s~/giverank [Name] [Rang]", GreedyArg = true)]
public void CmdFactionGiverank(Client player, string name, string rank)
public void CmdFactionGiverank(Player player, string name, string rank)
{
if (player.GetUser()?.FactionId == null || player.GetUser().FactionLeader == false)
{
@@ -84,7 +84,7 @@ namespace ReallifeGamemode.Server.Commands
return;
}
Client target = ClientService.GetClientByNameOrId(name);
Player target = PlayerService.GetPlayerByNameOrId(name);
if (target == null || !target.IsLoggedIn())
{
ChatService.PlayerNotFound(player);
@@ -116,7 +116,7 @@ namespace ReallifeGamemode.Server.Commands
}
[Command("lc", "~m~Benutzung: ~s~/lc [Nachricht]", GreedyArg = true)]
public void CmdFactionLc(Client player, string message)
public void CmdFactionLc(Player player, string message)
{
if (player.GetUser()?.FactionId == null || player.GetUser().FactionLeader == false)
{
@@ -135,7 +135,7 @@ namespace ReallifeGamemode.Server.Commands
}
[Command("setweaponrank", "~m~Benutzung: ~s~/setweaponrank [Waffen Name] [Rank]")]
public void CmdFactionWeaponRank(Client player, string weaponModel, int rank)
public void CmdFactionWeaponRank(Player player, string weaponModel, int rank)
{
if (player.GetUser()?.FactionId == null || player.GetUser().FactionLeader == false)
{
@@ -177,7 +177,7 @@ namespace ReallifeGamemode.Server.Commands
#region Sanitäter Commands
[Command("revive", "~m~Benutzung: ~s~/revive")]
public void CmdFactionMedicRevive(Client player)
public void CmdFactionMedicRevive(Player player)
{
if (player.GetUser()?.FactionId == null || player.GetUser().FactionId != 2)
{
@@ -191,7 +191,7 @@ namespace ReallifeGamemode.Server.Commands
}
var nearPlayers = NAPI.Player.GetPlayersInRadiusOfPlayer(2, player);
var deadPlayer = nearPlayers.Where(i => i.GetData("isDead") == true).FirstOrDefault();
var deadPlayer = nearPlayers.Where(i => i.GetData<bool>("isDead") == true).FirstOrDefault();
if (player == deadPlayer)
{
ChatService.ErrorMessage(player, "Du kannst dich nicht selbst wiederbeleben");
@@ -210,7 +210,7 @@ namespace ReallifeGamemode.Server.Commands
}
[Command("heal", "~m~Benutzung: ~s~/heal [Spieler]")] //TODO Eventuell noch mit Geldbetrag wie bei SA:MP
public void CmdFactionMedicHealive(Client player, string receiver)
public void CmdFactionMedicHealive(Player player, string receiver)
{
if (player.GetUser()?.FactionId == null || player.GetUser().FactionId != 2)
{
@@ -222,7 +222,7 @@ namespace ReallifeGamemode.Server.Commands
ChatService.ErrorMessage(player, "Du kannst in einem Auto nicht heilen");
return;
}
Client target = ClientService.GetClientByNameOrId(receiver);
Player target = PlayerService.GetPlayerByNameOrId(receiver);
target.Health = 100;
target.SendNotification("Du wurdest von ~g~" + player.Name + " ~s~geheilt.", false);
player.SendNotification("Du hast ~g~" + target.Name + " ~s~geheilt.", false);
@@ -230,7 +230,7 @@ namespace ReallifeGamemode.Server.Commands
#endregion
#region Staatsfraktionen (LSPD / FBI) Commands
[Command("wanted", "~m~Benutzung: ~s~/wa(nted) [Name / ID] [Anzahl] [Grund]", Alias = "wa", GreedyArg = true)]
public void CmdFactionWanted(Client player, string nameOrId, int amount, string reason)
public void CmdFactionWanted(Player player, string nameOrId, int amount, string reason)
{
User user = player.GetUser();
if (user == null || (user.FactionId != 1 && user.FactionId != 3))
@@ -245,7 +245,7 @@ namespace ReallifeGamemode.Server.Commands
return;
}
Client target = ClientService.GetClientByNameOrId(nameOrId);
Player target = PlayerService.GetPlayerByNameOrId(nameOrId);
if (target == null || !target.IsLoggedIn())
{
ChatService.PlayerNotFound(player);
@@ -263,7 +263,7 @@ namespace ReallifeGamemode.Server.Commands
}
[Command("clear", "~m~Benutzung: ~s~/clear [Name / ID] [Grund]", GreedyArg = true)]
public void CmdFactionClear(Client player, string nameOrId, string reason)
public void CmdFactionClear(Player player, string nameOrId, string reason)
{
User user = player.GetUser();
@@ -273,7 +273,7 @@ namespace ReallifeGamemode.Server.Commands
return;
}
Client target = ClientService.GetClientByNameOrId(nameOrId);
Player target = PlayerService.GetPlayerByNameOrId(nameOrId);
if (target == null || !target.IsLoggedIn())
{
ChatService.PlayerNotFound(player);

2
ReallifeGamemode.Server/Commands/GroupCommands.cs
View File

@@ -12,7 +12,7 @@ namespace ReallifeGamemode.Server.Commands
{
#region Chat Commands
[Command("gc", "~m~Benutzung: ~s~/gc [Nachricht]", GreedyArg = true)]
public void CmdGroupG(Client player, string message)
public void CmdGroupG(Player player, string message)
{
Database.Entities.Group group = player.GetUser().Group;
if (group == null)

12
ReallifeGamemode.Server/Commands/UserCommands.cs
View File

@@ -13,7 +13,7 @@ namespace ReallifeGamemode.Server.Commands
class UserCommands : Script
{
[Command("dice", "~m~Benutzung: ~s~/dice")]
public void CmdUserDice(Client player)
public void CmdUserDice(Player player)
{
if (!player.IsLoggedIn()) return;
@@ -22,15 +22,15 @@ namespace ReallifeGamemode.Server.Commands
var peopleInRange = NAPI.Player.GetPlayersInRadiusOfPlayer(7, player);
foreach (var managedClient in peopleInRange)
foreach (var managedPlayer in peopleInRange)
{
if (!managedClient.IsLoggedIn()) return;
ChatService.SendMessage(managedClient, "* " + player.Name + " hat eine " + number + " gewürfelt.");
if (!managedPlayer.IsLoggedIn()) return;
ChatService.SendMessage(managedPlayer, "* " + player.Name + " hat eine " + number + " gewürfelt.");
}
}
[Command("car", "~m~Benutzung: ~s~/car")]
public void CmdUserCar(Client player)
public void CmdUserCar(Player player)
{
if (!player.IsLoggedIn()) return;
if (!player.IsInVehicle) return;
@@ -49,7 +49,7 @@ namespace ReallifeGamemode.Server.Commands
}
[Command("paycheck", "~m~Benutzung: ~s~/paycheck")]
public void CmdUserPaycheck(Client client)
public void CmdUserPaycheck(Player client)
{
User user = client.GetUser();