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

Testserver push

Browse Source
This commit is contained in:
Lukas Moungos
2021-04-07 01:08:22 +02:00
parent e34cd3bd01
commit 52bb80a70a
9 changed files with 70 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,6 +30,7 @@ namespace ReallifeGamemode.Server.Events
public class Key : Script
{
#region User Key
[RemoteEvent("keyPress:NUM2")]
public void KeyPressNUM2(Player player)
{
@@ -60,6 +61,7 @@ namespace ReallifeGamemode.Server.Events
GroundItem.PickUpGroundItem(player);
}
/*
[RemoteEvent("keyPress:LEFT_ARROW")]
public void KeyPressLeftArrow(Player player)
@@ -85,6 +87,7 @@ namespace ReallifeGamemode.Server.Events
}
}
*/
[RemoteEvent("keyPress:RIGHT_ARROW")]
public void KeyPressRightArrow(Player player)
{
@@ -115,7 +118,7 @@ namespace ReallifeGamemode.Server.Events
{
using var dbContext = new DatabaseContext();
User u = player.GetUser(dbContext);
if (u == null) return;
if (u == null) return;
if (player.GetData<bool>("isDead")) return;
var vehicles = dbContext.UserVehicles.Where(veh => veh.UserId == u.Id).OrderBy(veh => veh.Id).Select(v => new
@@ -169,7 +172,7 @@ namespace ReallifeGamemode.Server.Events
int pay_amount = 0;
bool house = false;
if(u.House != null)
if (u.House != null)
{
house = true;
}
@@ -185,7 +188,6 @@ namespace ReallifeGamemode.Server.Events
}
player.TriggerEvent("SERVER:InteractionMenu_OpenMenu", JsonConvert.SerializeObject(accountData), factionleader, faction, group, factionInvite, groupInvite, ticket_boolean, ticket_amount, pay_amount, house);
}
[RemoteEvent("keyPress:E")]
@@ -194,16 +196,15 @@ namespace ReallifeGamemode.Server.Events
if (!player.IsLoggedIn()) return;
var user = player.GetUser();
if (player.HasData("nearATM"))
{
ATMManager.ShowAtmUi(player, player.GetData<int>("nearATM"));
return;
}
if(!player.IsInVehicle)
if (!player.IsInVehicle)
{
if(GroundItem.PickUpGroundItem(player))
if (GroundItem.PickUpGroundItem(player))
{
return;
}
@@ -217,7 +218,7 @@ namespace ReallifeGamemode.Server.Events
FriseurPoint nearestFriseurPoint = PositionManager.friseurPoints.Find(s => s.Position.DistanceTo(player.Position) <= 1.5 && (!user.GetData<bool>("duty")));
ItemshopPoint nearestItemShopPoint = PositionManager.itemshopPoints.Find(s => s.Position.DistanceTo(player.Position) <= 1.5);
JobPoint nearestJobPoint = PositionManager.JobPoints.Find(s => s.Position.DistanceTo(player.Position) <= 1.6);
if (user?.FactionId != null)
{
BehindVehiclePoint nearestBehindVehiclePoint = MarkerBehinVehicle.behindVehiclePoints.Find(s => s.marker.Position.DistanceTo(player.Position) <= 3 && (user.FactionId == 8 || user.FactionId == 7 || user.FactionId == 1 || user.FactionId == 3));
@@ -229,7 +230,6 @@ namespace ReallifeGamemode.Server.Events
List<VehicleItem> vehicleItems = dbContext.VehicleItems.ToList().Where(f => f.GetVehicle().GetVehicle() == nearestBehindVehiclePoint.vehicle && InventoryManager.GetItemById(f.ItemId) is IWeaponDealItem).ToList();
if (vehicleItems.Count == 0)
{
GTANetworkAPI.Vehicle vehicle = nearestBehindVehiclePoint.vehicle;
if (vehicle.HasAttachment("weapondeal"))
@@ -367,7 +367,7 @@ namespace ReallifeGamemode.Server.Events
if (player.HasAttachment("ammobox"))
{
player.AddAttachment("ammobox", true);
player.StopAnimation();
player.ClearAnimation();
}
bool unloadedWeaponPackage = false;
@@ -430,13 +430,12 @@ namespace ReallifeGamemode.Server.Events
if (user.FactionRank.Order >= weapon.Rank)
specials.Add(weapon.WeaponModel.ToString());
break;
case 5:
if (user.FactionRank.Order >= weapon.Rank)
armor.Add(weapon.WeaponModel.ToString());
break;
}
}
foreach (var weapon in weapons)
{
@@ -496,7 +495,7 @@ namespace ReallifeGamemode.Server.Events
foreach (Player target in NAPI.Pools.GetAllPlayers())
{
User c = target.GetUser();
if(c == null)
if (c == null)
{
continue;
}
@@ -556,7 +555,7 @@ namespace ReallifeGamemode.Server.Events
player.TriggerEvent("renderTextOnScreen", "Steige nun in eines der Fahrzeuge und starte den Motor mit der Taste 'N'.");
return;
}
}
}
else if (nearestJobPoint.jobId == 3 && player.GetUser().JobId == 3)
{
if (nearestJobPoint.Skill < 300 && player.GetUser().PilotSkill >= 0)
@@ -679,7 +678,6 @@ namespace ReallifeGamemode.Server.Events
player.TriggerEvent("SERVER:Job_ShowJobMenu", job.Name, json);
}
[RemoteEvent("keyPress:O")]
public void KeyPressO(Player player)
{
@@ -688,13 +686,13 @@ namespace ReallifeGamemode.Server.Events
List<Player> players = NAPI.Pools.GetAllPlayers().Where(p => p.IsLoggedIn() == true).OrderBy(o => o.Handle.Value).ToList();
var listPlayers = players.Select(p => new
{
Id = p.Handle.Value,
p.Name,
p.Ping,
FactionName = p.GetUser()?.Faction?.Name ?? "Zivilist",
});
player.TriggerEvent("showPlayerlist", JsonConvert.SerializeObject(listPlayers));
{
Id = p.Handle.Value,
p.Name,
p.Ping,
FactionName = p.GetUser()?.Faction?.Name ?? "Zivilist",
});
player.TriggerEvent("showPlayerlist", JsonConvert.SerializeObject(listPlayers));
}
[RemoteEvent("keyPress:K")]
@@ -801,9 +799,9 @@ namespace ReallifeGamemode.Server.Events
}
else if (sV is FactionVehicle fV)
{
if(fV.Model == VehicleHash.Burrito3 && u.FactionId == 1
|| fV.Model == VehicleHash.Burrito3 && u.FactionId == 3
|| fV.Model == VehicleHash.Burrito3 && u.FactionId == 7
if (fV.Model == VehicleHash.Burrito3 && u.FactionId == 1
|| fV.Model == VehicleHash.Burrito3 && u.FactionId == 3
|| fV.Model == VehicleHash.Burrito3 && u.FactionId == 7
|| fV.Model == VehicleHash.Burrito3 && u.FactionId == 8
|| fV.Model == VehicleHash.Policet && u.FactionId == 1
|| fV.Model == VehicleHash.Policet && u.FactionId == 3
@@ -967,8 +965,17 @@ namespace ReallifeGamemode.Server.Events
player.TriggerEvent("ToggleVehicleMenu");
}
}
#endregion
#region Faction Key
#endregion
[RemoteEvent("keyPress:ControllH")]
public void KeyPressControllH(Player player)
{
if (player.HasAnimation())
return;
player.SyncAnimation("hup");
ChatService.SendInRange(player.Position, 20, $"~m~{player.Name} stellt sich...");
}
#endregion User Key
}
}