/cuff positioning test

This commit is contained in:
2021-04-06 17:34:34 +02:00
parent 8ee68a5a54
commit b4fb23078b
5 changed files with 61 additions and 11 deletions

View File

@@ -46,10 +46,8 @@ namespace ReallifeGamemode.Server.Commands
if (target.Id == player.Id)
return;
float rad = player.Heading * MathF.PI / 180;
Vector3 forwardV3 = new Vector3(player.Position.X + (1.2 * MathF.Sin(rad)), player.Position.Y + (1.2 * MathF.Cos(rad)), player.Position.Z);
target.Position = forwardV3;
target.Position = player.GetInFrontOfPosition();
target.Heading = player.Heading;
if (!target.HasAnimation("Cuffed"))
{

View File

@@ -0,0 +1,16 @@
using System;
using System.Collections.Generic;
using System.Text;
using GTANetworkAPI;
namespace ReallifeGamemode.Server.Events
{
internal class PlayerEvent : Script
{
[RemoteEvent("CLIENT:SET_InFrontOfPos")]
public void SetFrontOfPos(Player player, Vector3 pos)
{
player.SetSharedData("InFrontOf", pos);
}
}
}

View File

@@ -77,10 +77,12 @@ namespace ReallifeGamemode.Server.Extensions
var user = player.GetUser();
return user.GetData("duty", false);
}
public static bool IsAdminDuty(this Player player)
{
return player.HasData("Adminduty") ? player.GetData<bool>("Adminduty") : false;
}
public static Vector3 GetPositionFromPlayer(Player player, float distance, int offset = 0)
{
var pos = player.Position;
@@ -268,11 +270,11 @@ namespace ReallifeGamemode.Server.Extensions
}
else if (user.FactionId != null)
{
if(user.FactionId > 3 || (user.FactionId >= 1 && user.FactionId <= 3 && duty))
if (user.FactionId > 3 || (user.FactionId >= 1 && user.FactionId <= 3 && duty))
{
nameTagColor = user.FactionId.Value;
}
switch (user.FactionId)
{
case 1 when duty:
@@ -314,5 +316,11 @@ namespace ReallifeGamemode.Server.Extensions
user.Player.SetSharedData("nameTagColor", nameTagColor);
user.Player.SetSharedData("blipColor", blipColor);
}
public static Vector3 GetInFrontOfPosition(this Player player)
{
player.TriggerEvent("SERVER:GetInFrontPosition");
return player.GetSharedData<Vector3>("InFrontOf");
}
}
}

View File

@@ -56,6 +56,12 @@ namespace ReallifeGamemode.Server.Util
target.SyncAnimation(transitionTo);
}
[RemoteEvent("CLIENT:ClearAnimationData")]
public void ClearAnimationData(Player player, Player target)
{
target.ClearAnimation();
}
[ServerEvent(Event.PlayerWeaponSwitch)]
public void OnPlayerWeaponSwitch(Player player, WeaponHash oldWeapon, WeaponHash newWeapon)
{