yindo/Project-Reboot-3.0
1
0
Fork 0
mirror of https://github.com/Milxnor/Project-Reboot-3.0.git synced 2026-01-13 10:52:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

work on skyfire

Browse Source
This commit is contained in:
Milxnor
2023-05-19 20:21:24 -04:00
parent 45fbfbef74
commit f37e15927f
22 changed files with 250 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
Project Reboot 3.0/FortPlayerController.cpp
View File

@@ -1229,6 +1229,8 @@ void AFortPlayerController::ClientOnPawnDiedHook(AFortPlayerController* PlayerCo
DeathCause = ToDeathCause(Tags, false, DeadPawn); // DeadPawn->IsDBNO() ??
LOG_INFO(LogDev, "DeathCause: {}", (int)DeathCause);
LOG_INFO(LogDev, "DeadPawn->IsDBNO(): {}", DeadPawn->IsDBNO());
LOG_INFO(LogDev, "KillerPlayerState: {}", __int64(KillerPlayerState));
*(bool*)(__int64(DeathInfo) + MemberOffsets::DeathInfo::bDBNO) = DeadPawn->IsDBNO();
*(uint8*)(__int64(DeathInfo) + MemberOffsets::DeathInfo::DeathCause) = DeathCause;
@@ -1295,11 +1297,37 @@ void AFortPlayerController::ClientOnPawnDiedHook(AFortPlayerController* PlayerCo
// LOG_INFO(LogDev, "Reported kill.");
/* if (KillerPawn && KillerPawn != DeadPawn)
if (AmountOfHealthSiphon != 0)
{
KillerPawn->SetHealth(100);
KillerPawn->SetShield(100);
} */
if (KillerPawn && KillerPawn != DeadPawn)
{
float Health = KillerPawn->GetHealth();
float Shield = KillerPawn->GetShield();
int MaxHealth = 100;
int MaxShield = 100;
int AmountGiven = 0;
if ((MaxHealth - Health) > 0)
{
int AmountToGive = MaxHealth - Health >= AmountOfHealthSiphon ? AmountOfHealthSiphon : MaxHealth - Health;
KillerPawn->SetHealth(Health + AmountToGive);
AmountGiven += AmountToGive;
}
if ((MaxShield - Shield) > 0 && AmountGiven < AmountOfHealthSiphon)
{
int AmountToGive = MaxShield - Shield >= AmountOfHealthSiphon ? AmountOfHealthSiphon : MaxShield - Shield;
AmountToGive -= AmountGiven;
if (AmountToGive > 0)
{
KillerPawn->SetShield(Shield + AmountToGive);
AmountGiven += AmountToGive;
}
}
}
}
}
bool bIsRespawningAllowed = GameState->IsRespawningAllowed(DeadPlayerState);