expvintl/RAGECOOP-V
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ped sync tweaks

Browse Source
This commit is contained in:
sardelka9515
2022-08-23 10:55:54 +08:00
parent c7e14ef191
commit 6d7fe58719
2 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
RageCoop.Client/Properties/AssemblyInfo.cs
View File

@ -16,7 +16,7 @@ using System.Resources;
// Version informationr( // Version informationr(
[assembly: AssemblyVersion("1.5.2.111")] [assembly: AssemblyVersion("1.5.2.114")]
[assembly: AssemblyFileVersion("1.5.2.111")] [assembly: AssemblyFileVersion("1.5.2.114")]
[assembly: NeutralResourcesLanguageAttribute( "en-US" )] [assembly: NeutralResourcesLanguageAttribute( "en-US" )]

23
RageCoop.Client/Sync/Entities/Ped/SyncedPed.cs
View File

@ -634,7 +634,7 @@ namespace RageCoop.Client
{ {
MainPed.Task.ClearAll(); MainPed.Task.ClearAll();
Function.Call(Hash.SET_PED_STEALTH_MOVEMENT, MainPed, IsInStealthMode, 0); Function.Call(Hash.SET_PED_STEALTH_MOVEMENT, MainPed, IsInStealthMode, 0);
Vector3 predictPosition = Position + (Position - MainPed.ReadPosition()) + Velocity * 0.5f; Vector3 predictPosition = Predict(Position);
float range = predictPosition.DistanceToSquared(MainPed.ReadPosition()); float range = predictPosition.DistanceToSquared(MainPed.ReadPosition());
switch (Speed) switch (Speed)
@ -714,30 +714,39 @@ namespace RageCoop.Client
var head = MainPed.Bones[Bone.SkelHead]; var head = MainPed.Bones[Bone.SkelHead];
var rightFoot = MainPed.Bones[Bone.SkelRightFoot]; var rightFoot = MainPed.Bones[Bone.SkelRightFoot];
var leftFoot = MainPed.Bones[Bone.SkelLeftFoot]; var leftFoot = MainPed.Bones[Bone.SkelLeftFoot];
Vector3 amount;
// 20:head, 3:left foot, 6:right foot, 17:right hand, // 20:head, 3:left foot, 6:right foot, 17:right hand,
amount= 20 * (Predict(HeadPosition) - head.Position);
if (amount.Length() > 50) { amount = amount.Normalized * 50; }
helper.EqualizeAmount = 1; helper.EqualizeAmount = 1;
helper.PartIndex=20; helper.PartIndex=20;
helper.Impulse=20*(Predict(HeadPosition) -head.Position); helper.Impulse = amount;
helper.Start(); helper.Start();
helper.Stop(); helper.Stop();
amount = 20 * (Predict(RightFootPosition) - rightFoot.Position);
if (amount.Length() > 50) { amount = amount.Normalized * 50; }
helper.EqualizeAmount = 1; helper.EqualizeAmount = 1;
helper.PartIndex=6; helper.PartIndex=6;
helper.Impulse=20*(Predict(RightFootPosition) -rightFoot.Position); helper.Impulse = amount;
helper.Start(); helper.Start();
helper.Stop(); helper.Stop();
amount = 20 * (Predict(LeftFootPosition) - leftFoot.Position);
if (amount.Length() > 50) { amount = amount.Normalized * 50; }
helper.EqualizeAmount = 1; helper.EqualizeAmount = 1;
helper.PartIndex=3; helper.PartIndex=3;
helper.Impulse=20*(Predict(LeftFootPosition) -leftFoot.Position); helper.Impulse = amount;
helper.Start(); helper.Start();
helper.Stop(); helper.Stop();
} }
else else
{ {
MainPed.Velocity=Velocity+5*dist*(predicted-MainPed.ReadPosition()); // localRagdoll
var force = Velocity - MainPed.Velocity+5 * dist * (predicted - MainPed.ReadPosition());
if (force.Length() > 20) { force = force.Normalized*20; }
MainPed.ApplyForce(force);
} }
} }
@ -751,7 +760,7 @@ namespace RageCoop.Client
switch (Speed) switch (Speed)
{ {
case 4: case 4:
if (MainPed.CurrentVehicle!=CurrentVehicle.MainVehicle || !MainPed.IsSittingInVehicle() || MainPed.SeatIndex!=Seat) if (MainPed.CurrentVehicle!=CurrentVehicle.MainVehicle || MainPed.SeatIndex != Seat || (!MainPed.IsSittingInVehicle() && !MainPed.IsBeingJacked))
{ {
MainPed.SetIntoVehicle(CurrentVehicle.MainVehicle, Seat); MainPed.SetIntoVehicle(CurrentVehicle.MainVehicle, Seat);
} }