mirror of
https://github.com/Milxnor/Project-Reboot-3.0.git
synced 2026-01-13 10:52:22 +01:00
406090ddcd
fix pickup notifications, fix 1.11 crash, remove pickup notifications (to fix restarting and random crashes), fix s7 crash, add delay before switching level, fix some issues with gadgets, fix character parts being buggy.
108 lines
2.8 KiB
C++
108 lines
2.8 KiB
C++
#include "FortPlayerPawnAthena.h"
|
|
#include "FortInventory.h"
|
|
#include "FortPlayerControllerAthena.h"
|
|
|
|
void AFortPlayerPawnAthena::OnCapsuleBeginOverlapHook(UObject* Context, FFrame* Stack, void* Ret)
|
|
{
|
|
using UPrimitiveComponent = UObject;
|
|
|
|
auto Pawn = (AFortPlayerPawnAthena*)Context;
|
|
UPrimitiveComponent* OverlappedComp;
|
|
AActor* OtherActor;
|
|
UPrimitiveComponent* OtherComp;
|
|
int OtherBodyIndex;
|
|
bool bFromSweep;
|
|
auto SweepResultPtr = (FHitResult*)std::realloc(0, FHitResult::GetStructSize());
|
|
|
|
LOG_INFO(LogDev, "OnCapsuleBeginOverlapHook!");
|
|
|
|
Stack->StepCompiledIn(&OverlappedComp);
|
|
Stack->StepCompiledIn(&OtherActor);
|
|
Stack->StepCompiledIn(&OtherComp);
|
|
Stack->StepCompiledIn(&OtherBodyIndex);
|
|
Stack->StepCompiledIn(&bFromSweep);
|
|
Stack->StepCompiledIn(SweepResultPtr);
|
|
|
|
std::free(SweepResultPtr);
|
|
|
|
// LOG_INFO(LogDev, "OtherActor: {}", __int64(OtherActor));
|
|
// LOG_INFO(LogDev, "OtherActorName: {}", OtherActor->IsValidLowLevel() ? OtherActor->GetName() : "BadRead")
|
|
|
|
if (auto Pickup = Cast<AFortPickup>(OtherActor))
|
|
{
|
|
static auto PawnWhoDroppedPickupOffset = Pickup->GetOffset("PawnWhoDroppedPickup");
|
|
|
|
if (Pickup->Get<AFortPawn*>(PawnWhoDroppedPickupOffset) != Pawn)
|
|
{
|
|
auto ItemDefinition = Pickup->GetPrimaryPickupItemEntry()->GetItemDefinition();
|
|
|
|
if (!ItemDefinition)
|
|
{
|
|
return;
|
|
}
|
|
|
|
auto PlayerController = Cast<AFortPlayerControllerAthena>(Pawn->GetController());
|
|
|
|
if (!PlayerController)
|
|
{
|
|
return;
|
|
}
|
|
|
|
auto WorldInventory = PlayerController->GetWorldInventory();
|
|
|
|
if (!WorldInventory)
|
|
{
|
|
return;
|
|
}
|
|
|
|
auto& ItemInstances = WorldInventory->GetItemList().GetItemInstances();
|
|
|
|
bool ItemDefGoingInPrimary = IsPrimaryQuickbar(ItemDefinition);
|
|
int PrimarySlotsFilled = 0;
|
|
bool bCanStack = false;
|
|
bool bFoundStack = false;
|
|
|
|
for (int i = 0; i < ItemInstances.Num(); i++)
|
|
{
|
|
auto ItemInstance = ItemInstances.at(i);
|
|
|
|
if (!ItemInstance)
|
|
continue;
|
|
|
|
auto CurrentItemDefinition = ItemInstance->GetItemEntry()->GetItemDefinition();
|
|
|
|
if (!CurrentItemDefinition)
|
|
continue;
|
|
|
|
if (ItemDefGoingInPrimary && IsPrimaryQuickbar(CurrentItemDefinition))
|
|
PrimarySlotsFilled++;
|
|
|
|
bool bIsInventoryFull = (PrimarySlotsFilled /* - 6 */) >= 5;
|
|
|
|
if (CurrentItemDefinition == ItemDefinition)
|
|
{
|
|
bFoundStack = true;
|
|
|
|
if (ItemInstance->GetItemEntry()->GetCount() < ItemDefinition->GetMaxStackSize())
|
|
{
|
|
bCanStack = true;
|
|
break;
|
|
}
|
|
}
|
|
|
|
if (bIsInventoryFull)
|
|
{
|
|
return;
|
|
}
|
|
}
|
|
|
|
// std::cout << "bCanStack: " << bCanStack << '\n';
|
|
// std::cout << "bFoundStack: " << bFoundStack << '\n';
|
|
|
|
if (!bCanStack ? (!bFoundStack ? true : ItemDefinition->DoesAllowMultipleStacks()) : true)
|
|
ServerHandlePickupHook(Pawn, Pickup, 0.4, FVector(), true);
|
|
}
|
|
}
|
|
|
|
// return OnCapsuleBeginOverlapOriginal(Context, Stack, Ret);
|
|
} |