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

make commands actually reply to console

Browse Source
This commit is contained in:
Milxnor
2023-04-03 21:13:34 -04:00
parent fa6fac754a
commit bd4a8da94f
14 changed files with 182 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Project Reboot 3.0/EngineTypes.cpp Normal file
View File

@@ -0,0 +1,14 @@
#include "EngineTypes.h"
#include "reboot.h"
UStruct* FHitResult::GetStruct()
{
static auto Struct = FindObject<UStruct>("/Script/Engine.HitResult");
return Struct;
}
int FHitResult::GetStructSize()
{
return GetStruct()->GetPropertiesSize();
}

6
Project Reboot 3.0/EngineTypes.h
View File

@@ -9,4 +9,10 @@ enum class ESpawnActorCollisionHandlingMethod : uint8
AdjustIfPossibleButAlwaysSpawn,
AdjustIfPossibleButDontSpawnIfColliding,
DontSpawnIfColliding
};
struct FHitResult
{
static class UStruct* GetStruct();
static int GetStructSize();
};

2
Project Reboot 3.0/FortGameModeAthena.cpp
View File

@@ -693,7 +693,7 @@ void AFortGameModeAthena::Athena_HandleStartingNewPlayerHook(AFortGameModeAthena
bool bPrintWarmup = false;
if (false)
if (Engine_Version != 419)
{
for (int i = 0; i < SpawnIsland_FloorLoot_Actors.Num(); i++)
{

76
Project Reboot 3.0/FortPlayerPawnAthena.cpp Normal file
View File

@@ -0,0 +1,76 @@
#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;
FHitResult SweepResult = *Alloc<FHitResult>(FHitResult::GetStructSize());
LOG_INFO(LogDev, "OnCapsuleBeginOverlapHook!");
Stack->StepCompiledIn(&OverlappedComp);
Stack->StepCompiledIn(&OtherActor);
Stack->StepCompiledIn(&OtherComp);
Stack->StepCompiledIn(&OtherBodyIndex);
Stack->StepCompiledIn(&bFromSweep);
Stack->StepCompiledIn(&SweepResult);
if (auto Pickup = Cast<AFortPickup>(OtherActor))
{
static auto PawnWhoDroppedPickupOffset = Pickup->GetOffset("PawnWhoDroppedPickup");
if (Pickup->Get<AFortPawn*>(PawnWhoDroppedPickupOffset) != Pawn)
{
auto ItemDefinition = Pickup->GetPrimaryPickupItemEntry()->GetItemDefinition();
auto PlayerController = Cast<AFortPlayerControllerAthena>(Pawn->GetController(), false);
auto& ItemInstances = PlayerController->GetWorldInventory()->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);
auto CurrentItemDefinition = ItemInstance->GetItemEntry()->GetItemDefinition();
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 OnCapsuleBeginOverlapOriginal(Context, Stack, Ret);
}
// 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);
}

11
Project Reboot 3.0/FortPlayerPawnAthena.h Normal file
View File

@@ -0,0 +1,11 @@
#pragma once
#include "FortPlayerPawn.h"
class AFortPlayerPawnAthena : public AFortPlayerPawn
{
public:
static inline void (*OnCapsuleBeginOverlapOriginal)(UObject* Context, FFrame* Stack, void* Ret);
static void OnCapsuleBeginOverlapHook(UObject* Context, FFrame* Stack, void* Ret);
};

2
Project Reboot 3.0/NetDriver.cpp
View File

@@ -10,7 +10,7 @@
FNetworkObjectList& UNetDriver::GetNetworkObjectList()
{
return *(*(TSharedPtr<FNetworkObjectList>*)(__int64(this) + 0x490));
return *(*(TSharedPtr<FNetworkObjectList>*)(__int64(this) + Offsets::NetworkObjectList));
}
void UNetDriver::RemoveNetworkActor(AActor* Actor)

3
Project Reboot 3.0/Project Reboot 3.0.vcxproj
View File

@@ -177,6 +177,7 @@
<ClCompile Include="Controller.cpp" />
<ClCompile Include="DataTableFunctionLibrary.cpp" />
<ClCompile Include="dllmain.cpp" />
<ClCompile Include="EngineTypes.cpp" />
<ClCompile Include="events.cpp" />
<ClCompile Include="FortAthenaCreativePortal.cpp" />
<ClCompile Include="FortAthenaSupplyDrop.cpp" />
@@ -198,6 +199,7 @@
<ClCompile Include="FortPlayerController.cpp" />
<ClCompile Include="FortPlayerControllerAthena.cpp" />
<ClCompile Include="FortPlayerPawn.cpp" />
<ClCompile Include="FortPlayerPawnAthena.cpp" />
<ClCompile Include="FortPlayerStateAthena.cpp" />
<ClCompile Include="FortPlaysetItemDefinition.cpp" />
<ClCompile Include="FortWeapon.cpp" />
@@ -271,6 +273,7 @@
<ClInclude Include="FortPlayerController.h" />
<ClInclude Include="FortPlayerControllerAthena.h" />
<ClInclude Include="FortPlayerPawn.h" />
<ClInclude Include="FortPlayerPawnAthena.h" />
<ClInclude Include="FortPlayerState.h" />
<ClInclude Include="FortPlayerStateAthena.h" />
<ClInclude Include="FortPlaysetItemDefinition.h" />

9
Project Reboot 3.0/Project Reboot 3.0.vcxproj.filters
View File

@@ -173,6 +173,12 @@
<ClCompile Include="NetworkObjectList.cpp">
<Filter>Engine\Source\Runtime\Engine\Private</Filter>
</ClCompile>
<ClCompile Include="FortPlayerPawnAthena.cpp">
<Filter>FortniteGame\Source\FortniteGame\Private\Pawns</Filter>
</ClCompile>
<ClCompile Include="EngineTypes.cpp">
<Filter>Engine\Source\Runtime\Engine\Private</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="log.h" />
@@ -497,6 +503,9 @@
<ClInclude Include="Level.h">
<Filter>Engine\Source\Runtime\Engine\Classes\Engine</Filter>
</ClInclude>
<ClInclude Include="FortPlayerPawnAthena.h">
<Filter>FortniteGame\Source\FortniteGame\Public\Pawns</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Filter Include="Engine">

24
Project Reboot 3.0/Stack.h
View File

@@ -18,16 +18,26 @@ public:
// MORE STUFF HERE
void* MostRecentProperty;
uint8_t* MostRecentPropertyAddress;
void* MostRecentProperty; // 48
uint8_t* MostRecentPropertyAddress; // 56
void*& GetPropertyChainForCompiledIn()
{
static auto PropertyChainForCompiledInOffset = 0x80;
return *(void**)(__int64(this) + PropertyChainForCompiledInOffset);
}
uint8_t*& GetMostRecentPropertyAddress()
{
auto off = (void*)(&((struct FFrame*)NULL)->MostRecentPropertyAddress);
LOG_INFO(LogDev, "{}", off);
return MostRecentPropertyAddress;
static auto MostRecentPropertyAddressOffset = 56;
return *(uint8_t**)(__int64(this) + MostRecentPropertyAddressOffset);
}
void StepExplicitProperty(void* const Result, void* Property)
{
static void (*StepExplicitPropertyOriginal)(__int64 frame, void* const Result, void* Property) = decltype(StepExplicitPropertyOriginal)(Addresses::FrameStepExplicitProperty);
StepExplicitPropertyOriginal(__int64(this), Result, Property);
}
void Step(UObject* Context, RESULT_DECL)
@@ -39,7 +49,7 @@ public:
// (GNatives[B])(Context, *this, RESULT_PARAM);
}
__forceinline void StepCompiledIn(void* Result/*, const FFieldClass* ExpectedPropertyType*/) // https://github.com/EpicGames/UnrealEngine/blob/cdaec5b33ea5d332e51eee4e4866495c90442122/Engine/Source/Runtime/CoreUObject/Public/UObject/Stack.h#L444
__forceinline void StepCompiledIn(void* const Result/*, const FFieldClass* ExpectedPropertyType*/) // https://github.com/EpicGames/UnrealEngine/blob/cdaec5b33ea5d332e51eee4e4866495c90442122/Engine/Source/Runtime/CoreUObject/Public/UObject/Stack.h#L444
{
if (Code)
{
@@ -53,6 +63,10 @@ public:
FProperty* Property = (FProperty*)PropertyChainForCompiledIn;
PropertyChainForCompiledIn = Property->Next;
StepExplicitProperty(Result, Property); */
auto& Property = GetPropertyChainForCompiledIn();
GetPropertyChainForCompiledIn() = Engine_Version >= 425 ? *(void**)(__int64(Property) + 0x20) : ((UField*)Property)->Next;
StepExplicitProperty(Result, Property);
}
}

17
Project Reboot 3.0/addresses.cpp
View File

@@ -239,6 +239,9 @@ void Addresses::FindAll()
LOG_INFO(LogDev, "Finding ActorChannelClose");
Addresses::ActorChannelClose = FindActorChannelClose();
LOG_INFO(LogDev, "Finding StepExplicitProperty");
Addresses::FrameStepExplicitProperty = FindStepExplicitProperty();
LOG_INFO(LogDev, "Finished finding!");
}
@@ -291,6 +294,7 @@ void Addresses::Print()
LOG_INFO(LogDev, "GetMaxTickRate: 0x{:x}", GetMaxTickRate - Base);
LOG_INFO(LogDev, "RemoveFromAlivePlayers: 0x{:x}", RemoveFromAlivePlayers - Base);
LOG_INFO(LogDev, "ActorChannelClose: 0x{:x}", ActorChannelClose - Base);
LOG_INFO(LogDev, "FrameStepExplicitProperty: 0x{:x}", FrameStepExplicitProperty - Base);
}
void Offsets::FindAll()
@@ -332,13 +336,24 @@ void Offsets::FindAll()
Offsets::ServerReplicateActors = 0x67; // checked onb 22.30
if (Engine_Version == 416) // checked on 1.7.2 & 1.8
{
Offsets::NetworkObjectList = 0x3F8;
Offsets::ReplicationFrame = 0x288;
}
if (Fortnite_Version == 2.42)
{
Offsets::ReplicationFrame = 0x2C8;
}
if (Fortnite_Version == 2.5)
{
Offsets::NetworkObjectList = 0x4F0;
Offsets::ReplicationFrame = 0x328;
if (Fortnite_Version == 1.11)
}
if (Engine_Version == 419) // checked 2.4.2 & 1.11
{
Offsets::NetworkObjectList = 0x490;
Offsets::ReplicationFrame = 0x2C8;
}
Offsets::IsNetRelevantFor = FindIsNetRelevantForOffset();
}

2
Project Reboot 3.0/addresses.h
View File

@@ -53,6 +53,7 @@ namespace Addresses
extern inline uint64 OnRep_ZiplineState = 0;
extern inline uint64 RemoveFromAlivePlayers = 0;
extern inline uint64 ActorChannelClose = 0;
extern inline uint64 FrameStepExplicitProperty = 0;
void SetupVersion(); // Finds Engine Version
void FindAll();
@@ -72,6 +73,7 @@ namespace Offsets
extern inline uint64 ServerReplicateActors = 0;
extern inline uint64 ReplicationFrame = 0;
extern inline uint64 IsNetRelevantFor = 0;
extern inline uint64 NetworkObjectList = 0;
void FindAll();
void Print();

16
Project Reboot 3.0/commands.h
View File

@@ -24,9 +24,18 @@ inline void SendMessageToConsole(AFortPlayerController* PlayerController, const
float MsgLifetime = 1; // unused by ue
FName TypeName = FName(); // auto set to "Event"
// PlayerController->ClientMessage(Msg, TypeName, MsgLifetime);
auto brah = Msg.ToString();
LOG_INFO(LogDev, "{}", brah);
static auto ClientMessageFn = FindObject<UFunction>("/Script/Engine.PlayerController.ClientMessage");
struct
{
FString S; // (Parm, ZeroConstructor, HasGetValueTypeHash, NativeAccessSpecifierPublic)
FName Type; // (Parm, ZeroConstructor, IsPlainOldData, NoDestructor, HasGetValueTypeHash, NativeAccessSpecifierPublic)
float MsgLifeTime; // (Parm, ZeroConstructor, IsPlainOldData, NoDestructor, HasGetValueTypeHash, NativeAccessSpecifierPublic)
} APlayerController_ClientMessage_Params{Msg, TypeName, MsgLifetime};
PlayerController->ProcessEvent(ClientMessageFn, &APlayerController_ClientMessage_Params);
// auto brah = Msg.ToString();
// LOG_INFO(LogDev, "{}", brah);
}
void ServerCheatHook(AFortPlayerControllerAthena* PlayerController, FString Msg)
@@ -435,6 +444,7 @@ void ServerCheatHook(AFortPlayerControllerAthena* PlayerController, FString Msg)
}
Pawn->TeleportTo(FVector(X, Y, Z), Pawn->GetActorRotation());
SendMessageToConsole(PlayerController, L"Teleported!");
}
}
}

6
Project Reboot 3.0/dllmain.cpp
View File

@@ -25,6 +25,7 @@
#include "KismetSystemLibrary.h"
#include "die.h"
#include "InventoryManagementLibrary.h"
#include "FortPlayerPawnAthena.h"
enum ENetMode
{
@@ -330,6 +331,9 @@ DWORD WINAPI Main(LPVOID)
}
}
auto off = (void*)(&((struct FFrame*)NULL)->MostRecentPropertyAddress);
LOG_INFO(LogDev, "{}", off);
LOG_INFO(LogDev, "OnPlayImpactFX: 0x{:x}", OnPlayImpactFXAddr - __int64(GetModuleHandleW(0)));
Hooking::MinHook::Hook((PVOID)OnPlayImpactFXAddr, AFortWeapon::OnPlayImpactFXHook, (PVOID*)&AFortWeapon::OnPlayImpactFXOriginal);
@@ -370,6 +374,8 @@ DWORD WINAPI Main(LPVOID)
AFortPawn::NetMulticast_Athena_BatchedDamageCuesHook, (PVOID*)&AFortPawn::NetMulticast_Athena_BatchedDamageCuesOriginal, false, true);
Hooking::MinHook::Hook(FortPlayerPawnAthenaDefault, FindObject<UFunction>(L"/Script/FortniteGame.FortPlayerPawn.ServerSendZiplineState"),
AFortPlayerPawn::ServerSendZiplineStateHook, nullptr, false);
/* Hooking::MinHook::Hook(FortPlayerPawnAthenaDefault, FindObject<UFunction>(L"/Script/FortniteGame.FortPlayerPawnAthena.OnCapsuleBeginOverlap") ? FindObject<UFunction>(L"/Script/FortniteGame.FortPlayerPawnAthena.OnCapsuleBeginOverlap") : FindObject<UFunction>(L"/Script/FortniteGame.FortPlayerPawn.OnCapsuleBeginOverlap"),
AFortPlayerPawnAthena::OnCapsuleBeginOverlapHook, (PVOID*)&AFortPlayerPawnAthena::OnCapsuleBeginOverlapOriginal, false, true); */
if (Addresses::FrameStep) // put all non rpc exec hooks in this scope
{

5
Project Reboot 3.0/finder.h
View File

@@ -363,6 +363,11 @@ static inline uint64 FindGetPlayerViewpoint()
return 0;
}
static inline uint64 FindStepExplicitProperty()
{
return Memcury::Scanner::FindPattern("41 8B 40 ? 4D 8B C8").Get();
}
static inline uint64 FindIsNetRelevantForOffset()
{
if (Engine_Version == 416) // checked on 1.7.2 & 1.8