Skip to content

Commit

Permalink
Fix compile time errors
Browse files Browse the repository at this point in the history
  • Loading branch information
@paulov-t
paulov-t committed Dec 27, 2023
1 parent 395184c commit 8a10c25
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion Source/Coop/CoopGame.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -528,7 +528,7 @@ public static void SendOrReceiveSpawnPoint(EFT.Player player)
/// <param name="statisticsManager"></param>
/// <param name="questController"></param>
/// <returns></returns>
public override async Task<LocalPlayer> vmethod_2(int playerId, Vector3 position, Quaternion rotation, string layerName, string prefix, EPointOfView pointOfView, Profile profile, bool aiControl, EUpdateQueue updateQueue, EFT.Player.EUpdateMode armsUpdateMode, EFT.Player.EUpdateMode bodyUpdateMode, CharacterControllerSpawner.Mode characterControllerMode, Func<float> getSensitivity, Func<float> getAimingSensitivity, IStatisticsManager statisticsManager, QuestControllerClass questController)
public override async Task<LocalPlayer> vmethod_2(int playerId, Vector3 position, Quaternion rotation, string layerName, string prefix, EPointOfView pointOfView, Profile profile, bool aiControl, EUpdateQueue updateQueue, EFT.Player.EUpdateMode armsUpdateMode, EFT.Player.EUpdateMode bodyUpdateMode, CharacterControllerSpawner.Mode characterControllerMode, Func<float> getSensitivity, Func<float> getAimingSensitivity, IStatisticsManager statisticsManager, AbstractQuestController questController, AbstractAchievementsController achievementsController)
{
//Logger.LogInfo("Creating CoopPlayer!");
this.CreateCoopGameComponent();
Expand Down
18 changes: 9 additions & 9 deletions Source/Coop/CoopPlayer.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@ public static async Task<LocalPlayer>
, CharacterControllerSpawner.Mode characterControllerMode
, Func<float> getSensitivity, Func<float> getAimingSensitivity
, IFilterCustomization filter
, QuestControllerClass questController = null
, AbstractQuestController questController = null
, AbstractAchievementsController achievementsController = null
, bool isYourPlayer = false
, bool isClientDrone = false)
{
Expand Down Expand Up @@ -92,6 +93,7 @@ await player
, new CoopHealthController(profile.Health, player, inventoryController, profile.Skills, aiControl)
, isYourPlayer ? new CoopPlayerStatisticsManager() : new NullStatisticsManager()
, questController
, achievementsController
, filter
, aiControl || isClientDrone ? EVoipState.NotAvailable : EVoipState.Available
, aiControl
Expand Down Expand Up @@ -129,7 +131,7 @@ await player
private HashSet<string> PreviousReceivedDamageInfoPackets { get; } = new();
public bool IsFriendlyBot { get; internal set; }

public override void ApplyDamageInfo(DamageInfo damageInfo, EBodyPart bodyPartType, float absorbed, EHeadSegment? headSegment = null)
public override void ApplyDamageInfo(DamageInfo damageInfo, EBodyPart bodyPartType, EBodyPartColliderType colliderType, float absorbed)
{
// Quick check?
if (PreviousDamageInfos.Any(x =>
Expand All @@ -149,16 +151,15 @@ public override void ApplyDamageInfo(DamageInfo damageInfo, EBodyPart bodyPartTy
{
// If we are not using the Client Side Damage, then only run this on the server
if (MatchmakerAcceptPatches.IsServer && !coopGameComponent.SITConfig.useClientSideDamageModel)
SendDamageToAllClients(damageInfo, bodyPartType, absorbed, headSegment);
SendDamageToAllClients(damageInfo, bodyPartType, colliderType, absorbed);
else
SendDamageToAllClients(damageInfo, bodyPartType, absorbed, headSegment);
SendDamageToAllClients(damageInfo, bodyPartType, colliderType, absorbed);
}
}

private void SendDamageToAllClients(DamageInfo damageInfo, EBodyPart bodyPartType, float absorbed, EHeadSegment? headSegment = null)
private void SendDamageToAllClients(DamageInfo damageInfo, EBodyPart bodyPartType, EBodyPartColliderType bodyPartColliderType, float absorbed)
{
Dictionary<string, object> packet = new();
var bodyPartColliderType = ((BodyPartCollider)damageInfo.HittedBallisticCollider).BodyPartColliderType;
damageInfo.HitCollider = null;
damageInfo.HittedBallisticCollider = null;
Dictionary<string, string> playerDict = new();
Expand All @@ -184,7 +185,6 @@ private void SendDamageToAllClients(DamageInfo damageInfo, EBodyPart bodyPartTyp
packet.Add("bpt", bodyPartType.ToString());
packet.Add("bpct", bodyPartColliderType.ToString());
packet.Add("ab", absorbed.ToString());
packet.Add("hs", headSegment.ToString());
packet.Add("m", "ApplyDamageInfo");

// -----------------------------------------------------------
Expand Down Expand Up @@ -214,7 +214,7 @@ public IEnumerator ReceiveDamageFromServerCR(Dictionary<string, object> dict)
//BepInLogger.LogDebug(dict.ToJson());

Enum.TryParse<EBodyPart>(dict["bpt"].ToString(), out var bodyPartType);
Enum.TryParse<EHeadSegment>(dict["hs"].ToString(), out var headSegment);
Enum.TryParse<EBodyPartColliderType>(dict["bpct"].ToString(), out var bodyPartColliderType);
var absorbed = float.Parse(dict["ab"].ToString());

var damageInfo = Player_ApplyShot_Patch.BuildDamageInfoFromPacket(dict);
Expand Down Expand Up @@ -251,7 +251,7 @@ public IEnumerator ReceiveDamageFromServerCR(Dictionary<string, object> dict)
}
}

base.ApplyDamageInfo(damageInfo, bodyPartType, absorbed, headSegment);
base.ApplyDamageInfo(damageInfo, bodyPartType, bodyPartColliderType, absorbed);
//base.ShotReactions(damageInfo, bodyPartType);

yield break;
Expand Down
3 changes: 1 addition & 2 deletions Source/Coop/NullStatisticsManager.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,7 @@ public void OnEnemyDamage(DamageInfo damage, EBodyPart bodyPart, EPlayerSide pla
{
}


public void OnEnemyKill(DamageInfo damage, EDamageType lethalDamageType, EBodyPart bodyPart, EPlayerSide playerSide, WildSpawnType role, string playerAccountId, string playerProfileId, string playerName, string groupId, int level, int killExp, float distance, int hour, List<string> targetEquipment, HealthEffects enemyEffects, List<string> zoneIds)
public void OnEnemyKill(DamageInfo damage, EDamageType lethalDamageType, EBodyPart bodyPart, EPlayerSide playerSide, WildSpawnType role, string playerAccountId, string playerProfileId, string playerName, string groupId, int level, int killExp, float distance, int hour, List<string> targetEquipment, HealthEffects enemyEffects, List<string> zoneIds, bool isFriendly)
{
}

Expand Down
5 changes: 3 additions & 2 deletions Source/Coop/Player/Player_ApplyShot_Patch.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,9 @@ public override void Replicated(EFT.Player player, Dictionary<string, object> di
shotId = new ShotId(dict["ammoid"].ToString(), 1);
}

CallLocally.Add(player.ProfileId);
player.ApplyShot(damageInfo, bodyPartType, shotId);

//CallLocally.Add(player.ProfileId);
//player.ApplyShot(damageInfo, bodyPartType, shotId);
}
catch (Exception e)
{
Expand Down

0 comments on commit 8a10c25

Please sign in to comment.