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

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

@@ -26,12 +26,12 @@ namespace ReallifeGamemode.Server.Events
public class Key : Script
{
[RemoteEvent("keyPress:NUM2")]
public void KeyPressNUM2(Client player)
public void KeyPressNUM2(Player player)
{
if (!player.IsLoggedIn()) return;
if (player.GetData("editmode") == true && player.GetUser().IsAdmin(AdminLevel.HEADADMIN) == true)
if (player.GetData<bool>("editmode") == true && player.GetUser().IsAdmin(AdminLevel.HEADADMIN) == true)
{
var saveMode = player.GetData("quicksavemode");
var saveMode = player.GetData<string>("quicksavemode");
switch (saveMode)
{
case "none":
@@ -56,25 +56,25 @@ namespace ReallifeGamemode.Server.Events
}
[RemoteEvent("keyPress:UP_ARROW")]
public void KeyPressUpArrow(Client player)
public void KeyPressUpArrow(Player player)
{
if (!player.IsLoggedIn()) return;
if (player.HasData("nearATM"))
{
ATMManager.ShowAtmUi(player, player.GetData("nearATM"));
ATMManager.ShowAtmUi(player, player.GetData<int>("nearATM"));
}
}
[RemoteEvent("keyPress:LEFT_ARROW")]
public void KeyPressLeftArrow(Client player)
public void KeyPressLeftArrow(Player player)
{
if (!player.IsLoggedIn()) return;
List<Client> nearbyPlayers = NAPI.Player.GetPlayersInRadiusOfPlayer(3, player);
List<Player> nearbyPlayers = NAPI.Player.GetPlayersInRadiusOfPlayer(3, player);
if (nearbyPlayers.Count > 1)
{
List<string> nearbyPlayerList = new List<string>();
foreach (Client nearPlayer in nearbyPlayers)
foreach (Player nearPlayer in nearbyPlayers)
{
if (nearPlayer.Name != player.Name)
{
@@ -90,7 +90,7 @@ namespace ReallifeGamemode.Server.Events
}
[RemoteEvent("keyPress:RIGHT_ARROW")]
public void KeyPressRightArrow(Client player)
public void KeyPressRightArrow(Player player)
{
if (!player.IsLoggedIn()) return;
User user = player.GetUser();
@@ -104,7 +104,7 @@ namespace ReallifeGamemode.Server.Events
}
[RemoteEvent("keyPress:DOWN_ARROW")]
public void KeyPressDownArrow(Client player)
public void KeyPressDownArrow(Player player)
{
User u = player.GetUser();
if (u == null) return;
@@ -136,7 +136,7 @@ namespace ReallifeGamemode.Server.Events
}
[RemoteEvent("keyPress:E")]
public void KeyPressE(Client player)
public void KeyPressE(Player player)
{
if (!player.IsLoggedIn()) return;
var user = player.GetUser();
@@ -164,7 +164,7 @@ namespace ReallifeGamemode.Server.Events
if (player.GetUser().FactionId == 2) //Fire Department
{
int medicCount = 0;
foreach (Client c in NAPI.Pools.GetAllPlayers())
foreach (Player c in NAPI.Pools.GetAllPlayers())
{
if ((c.GetUser()?.Faction.Id ?? 0) == 2)
{
@@ -194,7 +194,6 @@ namespace ReallifeGamemode.Server.Events
player.SetAccessories(2, 2, 0);
break;
}
player.NametagColor = nameTagColor;
using (var context = new DatabaseContext())
{
List<CharacterCloth> clothes = context.CharacterClothes.Where(u => u.UserId == user.Id && u.Duty == true).ToList();
@@ -225,7 +224,6 @@ namespace ReallifeGamemode.Server.Events
player.SendNotification("Du bist nun ~r~außer Dienst.");
player.TriggerEvent("toggleDutyMode", false);
NAPI.ClientEvent.TriggerClientEventForAll("updateDutyMedics", false);
player.NametagColor = new Color(255, 255, 255);
player.SetSharedData("blipColor", 0);
UpdateCharacterCloth.LoadCharacterDefaults(player);
}
@@ -306,7 +304,7 @@ namespace ReallifeGamemode.Server.Events
{
List<string> criminals = new List<string>();
criminals.Add("Keiner");
foreach (Client target in NAPI.Pools.GetAllPlayers())
foreach (Player target in NAPI.Pools.GetAllPlayers())
{
User c = target.GetUser();
if (c.JailTime > 0)
@@ -344,17 +342,17 @@ namespace ReallifeGamemode.Server.Events
}
[RemoteEvent("keyPress:I")]
public void KeyPressI(Client player)
public void KeyPressI(Player player)
{
if (!player.IsLoggedIn()) return;
InventoryManager.GetUserItems(player);
}
[RemoteEvent("keyPress:O")]
public void KeyPressJ(Client player)
public void KeyPressJ(Player player)
{
if (!player.IsLoggedIn()) return;
List<Client> players = NAPI.Pools.GetAllPlayers();
List<Player> players = NAPI.Pools.GetAllPlayers();
var listPlayers = players.Select(p => new
{
Id = p.Handle.Value,
@@ -365,7 +363,7 @@ namespace ReallifeGamemode.Server.Events
}
[RemoteEvent("keyPress:K")]
public void KeyPressK(Client player)
public void KeyPressK(Player player)
{
if (!player.IsLoggedIn()) return;
var user = player.GetUser();
@@ -418,19 +416,19 @@ namespace ReallifeGamemode.Server.Events
}
[RemoteEvent("keyPress:L")]
public void KeyPressL(Client player)
public void KeyPressL(Player player)
{
if (!player.IsLoggedIn()) return;
DoorManager.ChangeDoorState(player);
}
[RemoteEvent("keyPress:N")]
public void KeyPressN(Client player)
public void KeyPressN(Player player)
{
if (!player.IsLoggedIn()) return;
if (!player.IsInVehicle) return;
if (player.VehicleSeat != -1) return;
if (player.VehicleSeat != 0) return;
GTANetworkAPI.Vehicle v = player.Vehicle;
@@ -481,7 +479,7 @@ namespace ReallifeGamemode.Server.Events
}
[RemoteEvent("keyPress:X")]
public void KeyPressX(Client player)
public void KeyPressX(Player player)
{
if (!player.IsLoggedIn()) return;
@@ -493,7 +491,7 @@ namespace ReallifeGamemode.Server.Events
GroundItem.PickUpGroundItem(player);
}
if (player.IsInVehicle && player.VehicleSeat == -1)
if (player.IsInVehicle && player.VehicleSeat == 0)
{
ServerVehicle veh = player.Vehicle.GetServerVehicle();
if (veh != null)