Skip to content

Commit

Permalink
Update to 33420
Browse files Browse the repository at this point in the history
  • Loading branch information
@ArchangelWTF
ArchangelWTF committed Nov 2, 2024
1 parent 63657c7 commit dda7eb5
Show file tree
Hide file tree
Showing 19 changed files with 34 additions and 34 deletions.
4 changes: 2 additions & 2 deletions Fika.Core/Coop/BotClasses/BotPlayerBridge.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,12 @@ public bool UsingSimplifiedSkeleton
}
}

public void ApplyDamageInfo(DamageInfo damageInfo, EBodyPart bodyPartType, EBodyPartColliderType bodyPartCollider, float absorbed)
public void ApplyDamageInfo(DamageInfoStruct damageInfo, EBodyPart bodyPartType, EBodyPartColliderType bodyPartCollider, float absorbed)
{
bot.ApplyDamageInfo(damageInfo, bodyPartType, bodyPartCollider, absorbed);
}

public ShotInfoClass ApplyShot(DamageInfo damageInfo, EBodyPart bodyPart, EBodyPartColliderType bodyPartCollider, EArmorPlateCollider armorPlateCollider, GStruct420 shotId)
public ShotInfoClass ApplyShot(DamageInfoStruct damageInfo, EBodyPart bodyPart, EBodyPartColliderType bodyPartCollider, EArmorPlateCollider armorPlateCollider, GStruct420 shotId)
{
if (damageInfo.Player != null && (damageInfo.Player.iPlayer.IsYourPlayer || damageInfo.Player.IsAI))
{
Expand Down
4 changes: 2 additions & 2 deletions Fika.Core/Coop/Custom/FikaDebug.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ private void AddPlayer(CoopPlayer player)
alivePlayers.Add(player);
}

private void PlayerDied(EFT.Player player, EFT.IPlayer lastAggressor, DamageInfo damageInfo, EBodyPart part)
private void PlayerDied(EFT.Player player, EFT.IPlayer lastAggressor, DamageInfoStruct damageInfo, EBodyPart part)
{
player.OnPlayerDead -= PlayerDied;
alivePlayers.Remove((CoopPlayer)player);
Expand All @@ -137,7 +137,7 @@ private void AddBot(CoopPlayer bot)
aliveBots.Add(bot);
}

private void BotDied(EFT.Player player, EFT.IPlayer lastAggressor, DamageInfo damageInfo, EBodyPart part)
private void BotDied(EFT.Player player, EFT.IPlayer lastAggressor, DamageInfoStruct damageInfo, EBodyPart part)
{
player.OnPlayerDead -= BotDied;
aliveBots.Remove((CoopPlayer)player);
Expand Down
2 changes: 1 addition & 1 deletion Fika.Core/Coop/Custom/FikaHealthBar.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,7 @@ private void HealthController_BodyPartDestroyedEvent(EBodyPart arg1, EDamageType
UpdateHealth();
}

private void HealthController_HealthChangedEvent(EBodyPart arg1, float arg2, DamageInfo arg3)
private void HealthController_HealthChangedEvent(EBodyPart arg1, float arg2, DamageInfoStruct arg3)
{
UpdateHealth();
}
Expand Down
4 changes: 2 additions & 2 deletions Fika.Core/Coop/ObservedClasses/ObservedStatisticsManager.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,12 @@ public void Init(Player player)

}

public void OnEnemyDamage(DamageInfo damage, EBodyPart bodyPart, string playerProfileId, EPlayerSide playerSide, WildSpawnType role, string groupId, float fullHealth, bool isHeavyDamage, float distance, int hour, List<string> targetEquipment, HealthEffects enemyEffects, List<string> zoneIds)
public void OnEnemyDamage(DamageInfoStruct damage, EBodyPart bodyPart, string playerProfileId, EPlayerSide playerSide, WildSpawnType role, string groupId, float fullHealth, bool isHeavyDamage, float distance, int hour, List<string> targetEquipment, HealthEffects enemyEffects, List<string> zoneIds)
{
// Do nothing
}

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, bool isAI)
public void OnEnemyKill(DamageInfoStruct 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, bool isAI)
{
// Do nothing
}
Expand Down
4 changes: 2 additions & 2 deletions Fika.Core/Coop/ObservedClasses/PlayerBridge/ObservedClientBridge.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public bool UsingSimplifiedSkeleton
}
}

public void ApplyDamageInfo(DamageInfo damageInfo, EBodyPart bodyPartType, EBodyPartColliderType bodyPartCollider, float absorbed)
public void ApplyDamageInfo(DamageInfoStruct damageInfo, EBodyPart bodyPartType, EBodyPartColliderType bodyPartCollider, float absorbed)
{
if (damageInfo.DamageType.IsEnvironmental() || damageInfo.DamageType is EDamageType.Landmine or EDamageType.Artillery)
{
Expand All @@ -47,7 +47,7 @@ public void ApplyDamageInfo(DamageInfo damageInfo, EBodyPart bodyPartType, EBody
}
}

public ShotInfoClass ApplyShot(DamageInfo damageInfo, EBodyPart bodyPart, EBodyPartColliderType bodyPartCollider, EArmorPlateCollider armorPlateCollider, GStruct420 shotId)
public ShotInfoClass ApplyShot(DamageInfoStruct damageInfo, EBodyPart bodyPart, EBodyPartColliderType bodyPartCollider, EArmorPlateCollider armorPlateCollider, GStruct420 shotId)
{
if (damageInfo.Player != null && damageInfo.Player.iPlayer.IsYourPlayer)
{
Expand Down
4 changes: 2 additions & 2 deletions Fika.Core/Coop/ObservedClasses/PlayerBridge/ObservedHostBridge.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public bool UsingSimplifiedSkeleton
}
}

public void ApplyDamageInfo(DamageInfo damageInfo, EBodyPart bodyPartType, EBodyPartColliderType bodyPartCollider, float absorbed)
public void ApplyDamageInfo(DamageInfoStruct damageInfo, EBodyPart bodyPartType, EBodyPartColliderType bodyPartCollider, float absorbed)
{
if (damageInfo.DamageType.IsEnvironmental())
{
Expand All @@ -53,7 +53,7 @@ public void ApplyDamageInfo(DamageInfo damageInfo, EBodyPart bodyPartType, EBody
}
}

public ShotInfoClass ApplyShot(DamageInfo damageInfo, EBodyPart bodyPart, EBodyPartColliderType bodyPartCollider, EArmorPlateCollider armorPlateCollider, GStruct420 shotId)
public ShotInfoClass ApplyShot(DamageInfoStruct damageInfo, EBodyPart bodyPart, EBodyPartColliderType bodyPartCollider, EArmorPlateCollider armorPlateCollider, GStruct420 shotId)
{
if (damageInfo.DamageType is EDamageType.Sniper)
{
Expand Down
2 changes: 1 addition & 1 deletion Fika.Core/Coop/Patches/Lighthouse/Zyriachy_Patches.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public static void Postfix(ref BotOwner ___botOwner_0)
___botOwner_0.GetPlayer.OnPlayerDead += OnZryachiyDead;
}

private static void OnZryachiyDead(Player player, IPlayer lastAggressor, DamageInfo damageInfo, EBodyPart part)
private static void OnZryachiyDead(Player player, IPlayer lastAggressor, DamageInfoStruct damageInfo, EBodyPart part)
{
player.OnPlayerDead -= OnZryachiyDead;

Expand Down
2 changes: 1 addition & 1 deletion Fika.Core/Coop/Patches/LocalGame/TarkovApplication_LocalGameCreator_Patch.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ private static async Task HandleJoinAsSpectator()
// Small delay to ensure the teleport command is processed first
await Task.Delay(250);

DamageInfo damageInfo = new()
DamageInfoStruct damageInfo = new()
{
Damage = 1000,
DamageType = EDamageType.Impact
Expand Down
8 changes: 4 additions & 4 deletions Fika.Core/Coop/Players/CoopBot.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ public override void CreateMovementContext()
MovementContext = BotMovementContext.Create(this, GetBodyAnimatorCommon, GetCharacterControllerCommon, movement_MASK);
}

public override void OnBeenKilledByAggressor(IPlayer aggressor, DamageInfo damageInfo, EBodyPart bodyPart, EDamageType lethalDamageType)
public override void OnBeenKilledByAggressor(IPlayer aggressor, DamageInfoStruct damageInfo, EBodyPart bodyPart, EDamageType lethalDamageType)
{
base.OnBeenKilledByAggressor(aggressor, damageInfo, bodyPart, lethalDamageType);

Expand All @@ -147,7 +147,7 @@ public override void OnBeenKilledByAggressor(IPlayer aggressor, DamageInfo damag
}
}

public override ShotInfoClass ApplyShot(DamageInfo damageInfo, EBodyPart bodyPartType, EBodyPartColliderType colliderType, EArmorPlateCollider armorPlateCollider, GStruct420 shotId)
public override ShotInfoClass ApplyShot(DamageInfoStruct damageInfo, EBodyPart bodyPartType, EBodyPartColliderType colliderType, EArmorPlateCollider armorPlateCollider, GStruct420 shotId)
{
ActiveHealthController activeHealthController = ActiveHealthController;
if (activeHealthController != null && !activeHealthController.IsAlive)
Expand Down Expand Up @@ -186,7 +186,7 @@ public override ShotInfoClass ApplyShot(DamageInfo damageInfo, EBodyPart bodyPar
return hitInfo;
}

public override void ApplyDamageInfo(DamageInfo damageInfo, EBodyPart bodyPartType, EBodyPartColliderType colliderType, float absorbed)
public override void ApplyDamageInfo(DamageInfoStruct damageInfo, EBodyPart bodyPartType, EBodyPartColliderType colliderType, float absorbed)
{
if (damageInfo.Weapon != null)
{
Expand All @@ -195,7 +195,7 @@ public override void ApplyDamageInfo(DamageInfo damageInfo, EBodyPart bodyPartTy
base.ApplyDamageInfo(damageInfo, bodyPartType, colliderType, absorbed);
}

public override void ApplyExplosionDamageToArmor(Dictionary<GStruct209, float> armorDamage, DamageInfo damageInfo)
public override void ApplyExplosionDamageToArmor(Dictionary<GStruct209, float> armorDamage, DamageInfoStruct damageInfo)
{
_preAllocatedArmorComponents.Clear();
Inventory.GetPutOnArmorsNonAlloc(_preAllocatedArmorComponents);
Expand Down
14 changes: 7 additions & 7 deletions Fika.Core/Coop/Players/CoopPlayer.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ public override void OnWeaponMastered(MasterSkillClass masterSkill)
masterSkill.Level.ToString()), ENotificationDurationType.Default, ENotificationIconType.Default, null);
}

public override void ApplyDamageInfo(DamageInfo damageInfo, EBodyPart bodyPartType, EBodyPartColliderType colliderType, float absorbed)
public override void ApplyDamageInfo(DamageInfoStruct damageInfo, EBodyPart bodyPartType, EBodyPartColliderType colliderType, float absorbed)
{
if (IsYourPlayer)
{
Expand Down Expand Up @@ -236,7 +236,7 @@ public override void ApplyDamageInfo(DamageInfo damageInfo, EBodyPart bodyPartTy
base.ApplyDamageInfo(damageInfo, bodyPartType, colliderType, absorbed);
}

public override ShotInfoClass ApplyShot(DamageInfo damageInfo, EBodyPart bodyPartType, EBodyPartColliderType colliderType, EArmorPlateCollider armorPlateCollider, GStruct420 shotId)
public override ShotInfoClass ApplyShot(DamageInfoStruct damageInfo, EBodyPart bodyPartType, EBodyPartColliderType colliderType, EArmorPlateCollider armorPlateCollider, GStruct420 shotId)
{
if (damageInfo.DamageType is EDamageType.Sniper or EDamageType.Landmine)
{
Expand All @@ -255,7 +255,7 @@ public override ShotInfoClass ApplyShot(DamageInfo damageInfo, EBodyPart bodyPar
return null;
}

private ShotInfoClass SimulatedApplyShot(DamageInfo damageInfo, EBodyPart bodyPartType, EBodyPartColliderType colliderType, EArmorPlateCollider armorPlateCollider)
private ShotInfoClass SimulatedApplyShot(DamageInfoStruct damageInfo, EBodyPart bodyPartType, EBodyPartColliderType colliderType, EArmorPlateCollider armorPlateCollider)
{
ActiveHealthController activeHealthController = ActiveHealthController;
if (activeHealthController != null && !activeHealthController.IsAlive)
Expand Down Expand Up @@ -412,7 +412,7 @@ public override void DropCurrentController(Action callback, bool fastDrop, Item
base.DropCurrentController(callback, fastDrop, nextControllerItem);
}

public override void OnBeenKilledByAggressor(IPlayer aggressor, DamageInfo damageInfo, EBodyPart bodyPart, EDamageType lethalDamageType)
public override void OnBeenKilledByAggressor(IPlayer aggressor, DamageInfoStruct damageInfo, EBodyPart bodyPart, EDamageType lethalDamageType)
{
base.OnBeenKilledByAggressor(aggressor, damageInfo, bodyPart, lethalDamageType);

Expand All @@ -436,7 +436,7 @@ public override void OnBeenKilledByAggressor(IPlayer aggressor, DamageInfo damag
}
}

public void HandleTeammateKill(ref DamageInfo damage, EBodyPart bodyPart,
public void HandleTeammateKill(ref DamageInfoStruct damage, EBodyPart bodyPart,
EPlayerSide playerSide, WildSpawnType role, string playerProfileId,
float distance, List<string> targetEquipment,
HealthEffects enemyEffects, List<string> zoneIds, CoopPlayer killer, int experience)
Expand Down Expand Up @@ -1183,7 +1183,7 @@ public void HandleCallbackFromServer(OperationCallbackPacket operationCallbackPa
}
}

public override void ApplyExplosionDamageToArmor(Dictionary<GStruct209, float> armorDamage, DamageInfo damageInfo)
public override void ApplyExplosionDamageToArmor(Dictionary<GStruct209, float> armorDamage, DamageInfoStruct damageInfo)
{
if (IsYourPlayer)
{
Expand Down Expand Up @@ -1239,7 +1239,7 @@ public void QueueArmorDamagePackets(ArmorComponent[] armorComponents)

public virtual void HandleDamagePacket(ref DamagePacket packet)
{
DamageInfo damageInfo = new()
DamageInfoStruct damageInfo = new()
{
Damage = packet.Damage,
DamageType = packet.DamageType,
Expand Down
18 changes: 9 additions & 9 deletions Fika.Core/Coop/Players/ObservedCoopPlayer.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ public override void FaceshieldMarkOperation(FaceShieldComponent armor, bool has
// Do nothing
}

public override void ManageAggressor(DamageInfo DamageInfo, EBodyPart bodyPart, EBodyPartColliderType colliderType)
public override void ManageAggressor(DamageInfoStruct DamageInfo, EBodyPart bodyPart, EBodyPartColliderType colliderType)
{
if (_isDeadAlready)
{
Expand Down Expand Up @@ -311,7 +311,7 @@ public override void ApplyHitDebuff(float damage, float staminaBurnRate, EBodyPa
}
}

public void HandleExplosive(DamageInfo DamageInfo, EBodyPart bodyPartType, EBodyPartColliderType colliderType)
public void HandleExplosive(DamageInfoStruct DamageInfo, EBodyPart bodyPartType, EBodyPartColliderType colliderType)
{
if (HealthController.DamageCoeff == 0)
{
Expand Down Expand Up @@ -341,7 +341,7 @@ public void HandleExplosive(DamageInfo DamageInfo, EBodyPart bodyPartType, EBody
});
}

public override void ApplyDamageInfo(DamageInfo DamageInfo, EBodyPart bodyPartType, EBodyPartColliderType colliderType, float absorbed)
public override void ApplyDamageInfo(DamageInfoStruct DamageInfo, EBodyPart bodyPartType, EBodyPartColliderType colliderType, float absorbed)
{
LastAggressor = DamageInfo.Player.iPlayer;
LastDamagedBodyPart = bodyPartType;
Expand All @@ -350,7 +350,7 @@ public override void ApplyDamageInfo(DamageInfo DamageInfo, EBodyPart bodyPartTy
LastDamageType = DamageInfo.DamageType;
}

public ShotInfoClass HandleSniperShot(DamageInfo DamageInfo, EBodyPart bodyPartType, EBodyPartColliderType colliderType, EArmorPlateCollider armorPlateCollider, GStruct420 shotId)
public ShotInfoClass HandleSniperShot(DamageInfoStruct DamageInfo, EBodyPart bodyPartType, EBodyPartColliderType colliderType, EArmorPlateCollider armorPlateCollider, GStruct420 shotId)
{
if (HealthController.DamageCoeff == 0)
{
Expand Down Expand Up @@ -388,7 +388,7 @@ public ShotInfoClass HandleSniperShot(DamageInfo DamageInfo, EBodyPart bodyPartT
};
}

public override ShotInfoClass ApplyShot(DamageInfo DamageInfo, EBodyPart bodyPartType, EBodyPartColliderType colliderType, EArmorPlateCollider armorPlateCollider, GStruct420 shotId)
public override ShotInfoClass ApplyShot(DamageInfoStruct DamageInfo, EBodyPart bodyPartType, EBodyPartColliderType colliderType, EArmorPlateCollider armorPlateCollider, GStruct420 shotId)
{
if (HealthController != null && !HealthController.IsAlive)
{
Expand Down Expand Up @@ -445,7 +445,7 @@ public override ShotInfoClass ApplyShot(DamageInfo DamageInfo, EBodyPart bodyPar
return hitInfo;
}

public override void ApplyExplosionDamageToArmor(Dictionary<GStruct209, float> armorDamage, DamageInfo DamageInfo)
public override void ApplyExplosionDamageToArmor(Dictionary<GStruct209, float> armorDamage, DamageInfoStruct DamageInfo)
{
if (isServer)
{
Expand Down Expand Up @@ -477,7 +477,7 @@ public override void ApplyExplosionDamageToArmor(Dictionary<GStruct209, float> a
}
}

public ShotInfoClass ApplyClientShot(DamageInfo DamageInfo, EBodyPart bodyPartType, EBodyPartColliderType colliderType, EArmorPlateCollider armorPlateCollider, GStruct420 shotId)
public ShotInfoClass ApplyClientShot(DamageInfoStruct DamageInfo, EBodyPart bodyPartType, EBodyPartColliderType colliderType, EArmorPlateCollider armorPlateCollider, GStruct420 shotId)
{
ShotReactions(DamageInfo, bodyPartType);
LastAggressor = DamageInfo.Player.iPlayer;
Expand Down Expand Up @@ -856,7 +856,7 @@ public override void vmethod_3(GClass1640 controller, int transitPointId, string

public override void HandleDamagePacket(ref DamagePacket packet)
{
DamageInfo DamageInfo = new()
DamageInfoStruct DamageInfo = new()
{
Damage = packet.Damage,
DamageType = packet.DamageType,
Expand Down Expand Up @@ -904,7 +904,7 @@ public override void HandleDamagePacket(ref DamagePacket packet)
LastDamagedBodyPart = packet.BodyPartType;
}

public override void OnBeenKilledByAggressor(IPlayer aggressor, DamageInfo DamageInfo, EBodyPart bodyPart, EDamageType lethalDamageType)
public override void OnBeenKilledByAggressor(IPlayer aggressor, DamageInfoStruct DamageInfo, EBodyPart bodyPart, EDamageType lethalDamageType)
{
// Only handle if it was ourselves as otherwise it's irrelevant
if (LastAggressor.IsYourPlayer)
Expand Down
2 changes: 1 addition & 1 deletion Fika.Core/Networking/FikaClient.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -629,7 +629,7 @@ private void OnReconnectPacketReceived(ReconnectPacket packet)
coopGame.SetMatchmakerStatus(localizedString, progress / total);
try
{
DamageInfo damageInfo = default;
DamageInfoStruct damageInfo = default;
damageInfo.HitPoint = hitPosition;
windowBreaker.MakeHit(in damageInfo, true);
}
Expand Down
Binary file modified References/hollowed.dll
View file
Binary file not shown.
Binary file modified References/spt-common.dll
View file
Binary file not shown.
Binary file modified References/spt-core.dll
View file
Binary file not shown.
Binary file modified References/spt-custom.dll
View file
Binary file not shown.
Binary file modified References/spt-debugging.dll
View file
Binary file not shown.
Binary file modified References/spt-reflection.dll
View file
Binary file not shown.
Binary file modified References/spt-singleplayer.dll
View file
Binary file not shown.

0 comments on commit dda7eb5

Please sign in to comment.