diff --git a/Project Reboot 3.0/FortGameModeAthena.cpp b/Project Reboot 3.0/FortGameModeAthena.cpp index 42cbbef..8b273a3 100644 --- a/Project Reboot 3.0/FortGameModeAthena.cpp +++ b/Project Reboot 3.0/FortGameModeAthena.cpp @@ -1426,7 +1426,7 @@ void AFortGameModeAthena::Athena_HandleStartingNewPlayerHook(AFortGameModeAthena std::vector LootDrops = PickLootDrops(SpawnIslandTierGroup, GameState->GetWorldLevel(), -1, bPrintWarmup); - for (auto& LootDrop : LootDrops) + for (LootDrop& LootDrop : LootDrops) { PickupCreateData CreateData; CreateData.bToss = true; diff --git a/Project Reboot 3.0/FortKismetLibrary.cpp b/Project Reboot 3.0/FortKismetLibrary.cpp index 20078fe..c26fccd 100644 --- a/Project Reboot 3.0/FortKismetLibrary.cpp +++ b/Project Reboot 3.0/FortKismetLibrary.cpp @@ -570,6 +570,8 @@ UObject* UFortKismetLibrary::GetAIGoalManagerHook(UObject* Context, FFrame& Stac AFortPickup* UFortKismetLibrary::K2_SpawnPickupInWorldHook(UObject* Context, FFrame& Stack, AFortPickup** Ret) { + LOG_INFO(LogDev, "K2_SpawnPickupInWorldHook!"); + UObject* WorldContextObject; // (Parm, ZeroConstructor, IsPlainOldData, NoDestructor, HasGetValueTypeHash, NativeAccessSpecifierPublic) UFortWorldItemDefinition* ItemDefinition; // (Parm, ZeroConstructor, IsPlainOldData, NoDestructor, HasGetValueTypeHash, NativeAccessSpecifierPublic) int NumberToSpawn; // (Parm, ZeroConstructor, IsPlainOldData, NoDestructor, HasGetValueTypeHash, NativeAccessSpecifierPublic) diff --git a/Project Reboot 3.0/FortLootPackage.cpp b/Project Reboot 3.0/FortLootPackage.cpp index 643ec8d..01201cf 100644 --- a/Project Reboot 3.0/FortLootPackage.cpp +++ b/Project Reboot 3.0/FortLootPackage.cpp @@ -373,7 +373,9 @@ std::vector PickLootDrops(FName TierGroupName, int WorldLevel, int For { std::vector LootDrops; - if (!TierGroupName.IsValid() || recursive > 6) + if (!TierGroupName.IsValid() + || Fortnite_Version >= 23 // RANDOMC RASH BRO??? + || recursive > 6) return LootDrops; auto GameState = ((AFortGameModeAthena*)GetWorld()->GetGameMode())->GetGameStateAthena(); diff --git a/Project Reboot 3.0/FortPickup.cpp b/Project Reboot 3.0/FortPickup.cpp index 0a69f25..752c760 100644 --- a/Project Reboot 3.0/FortPickup.cpp +++ b/Project Reboot 3.0/FortPickup.cpp @@ -39,7 +39,7 @@ void AFortPickup::SpawnMovementComponent() AFortPickup* AFortPickup::SpawnPickup(PickupCreateData& PickupData) { - if (Fortnite_Version >= 24) return nullptr; // location is scrweed + if (Fortnite_Version >= 23) return nullptr; // location is scrweed (floor loot issue orrr?) if (PickupData.Source == -1) PickupData.Source = 0; diff --git a/Project Reboot 3.0/addresses.cpp b/Project Reboot 3.0/addresses.cpp index 28cbbbf..f01a199 100644 --- a/Project Reboot 3.0/addresses.cpp +++ b/Project Reboot 3.0/addresses.cpp @@ -519,7 +519,11 @@ void Offsets::FindAll() } if (Fortnite_Version >= 23) { - Offsets::ReplicationFrame = 0x440; // checked on 23.40 & 23.50 + Offsets::ReplicationFrame = 0x440; // checked on 23.40 & 23.50 & 24.00 & 24.10 & 24.30 & 24.40 + } + if (Fortnite_Version == 24.20) // GG + { + Offsets::ReplicationFrame = 0x438; } Offsets::IsNetRelevantFor = FindIsNetRelevantForOffset(); diff --git a/Project Reboot 3.0/commands.cpp b/Project Reboot 3.0/commands.cpp index a2044b7..743677b 100644 --- a/Project Reboot 3.0/commands.cpp +++ b/Project Reboot 3.0/commands.cpp @@ -466,7 +466,7 @@ void ServerCheatHook(AFortPlayerControllerAthena* PlayerController, FString Msg) CreateData.SpawnLocation = Location; CreateData.bShouldFreeItemEntryWhenDeconstructed = true; - for (int i = 0; i < amount; i++) + for (int i = 0; i < amount; ++i) { AFortPickup::SpawnPickup(CreateData); } diff --git a/Project Reboot 3.0/dllmain.cpp b/Project Reboot 3.0/dllmain.cpp index 4670502..ea622aa 100644 --- a/Project Reboot 3.0/dllmain.cpp +++ b/Project Reboot 3.0/dllmain.cpp @@ -1258,7 +1258,7 @@ DWORD WINAPI Main(LPVOID) } } - LOG_INFO(LogMatchmaker, "Matchmaking will {}", (Engine_Version >= 420 && bMatchmakingSupported // since tcp for most isnt supported we wont say + LOG_INFO(LogMatchmaker, "Matchmaking will {}", (Engine_Version >= 420 && bMatchmakingSupported // since tcp for most isnt supported we wont say its supported ? "be supported" : "not be supported")); if (bMatchmakingSupported) diff --git a/Project Reboot 3.0/finder.h b/Project Reboot 3.0/finder.h index 20bab82..83a7911 100644 --- a/Project Reboot 3.0/finder.h +++ b/Project Reboot 3.0/finder.h @@ -678,7 +678,7 @@ static inline uint64 FindOnDamageServer() { if (Fortnite_Version >= 20) // pawn has one too gg { - return 0; + // return 0; } auto Addr = FindFunctionCall(L"OnDamageServer", diff --git a/Project Reboot 3.0/inc.h b/Project Reboot 3.0/inc.h index f159ef8..f8698d4 100644 --- a/Project Reboot 3.0/inc.h +++ b/Project Reboot 3.0/inc.h @@ -23,7 +23,7 @@ extern inline int Fortnite_CL = 0; // #define PROD // this doesnt do anything besides remove processeventhook and some assert stuff // DEPRECATED ^^^ (see Globals::bDeveloperMode) -// #define ABOVE_S20 +#define ABOVE_S20 struct PlaceholderBitfield {