From 1e85ce380cad72a8af2ef88343474049eb4f9405 Mon Sep 17 00:00:00 2001 From: Twin1 <64933300+Twin1dev@users.noreply.github.com> Date: Thu, 5 Oct 2023 21:05:26 -0500 Subject: [PATCH 1/9] Update README.md --- README.md | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 28a7eeb..87cb74a 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,3 @@ -# Project Reboot 3.0 +# Project Reboot 3.0 Revived -I have quit the community and the project is discontinued 😢. - -S3-S15 (S16-S19 is slightly supported) - -## TODO - -- Rewrite picking up code. -- Rewrite dllmain -- Move hooking to each class (for example, AFortGameModeAthena::InitHooks). +My plan is to add things that reboot v3 never had. From 15647635f1dcaf3e1baf831083674bb62d6f07e9 Mon Sep 17 00:00:00 2001 From: Twin1 Date: Tue, 10 Oct 2023 22:17:07 -0500 Subject: [PATCH 2/9] fix spawn loc for pickups not sure if this is even correct, its what i usually do --- Project Reboot 3.0/BuildingContainer.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Project Reboot 3.0/BuildingContainer.cpp b/Project Reboot 3.0/BuildingContainer.cpp index 2b1c47a..e007a6d 100644 --- a/Project Reboot 3.0/BuildingContainer.cpp +++ b/Project Reboot 3.0/BuildingContainer.cpp @@ -12,8 +12,10 @@ bool ABuildingContainer::SpawnLoot(AFortPawn* Pawn) this->ForceNetUpdate(); auto GameMode = Cast(GetWorld()->GetGameMode()); + // idk + /* this->GetActorForwardVector() * this->GetLootSpawnLocation_Athena().X + this->GetActorRightVector() * this->GetLootSpawnLocation_Athena().Y + this->GetActorUpVector() * this->GetLootSpawnLocation_Athena().Z*/ - FVector LocationToSpawnLoot = this->GetActorLocation() + this->GetActorForwardVector() * this->GetLootSpawnLocation_Athena().X + this->GetActorRightVector() * this->GetLootSpawnLocation_Athena().Y + this->GetActorUpVector() * this->GetLootSpawnLocation_Athena().Z; + FVector LocationToSpawnLoot = this->GetActorLocation() + this->GetActorRightVector() * 70.0f + FVector{ 0,0,50 } ; auto RedirectedLootTier = GameMode->RedirectLootTier(GetSearchLootTierGroup()); From 1e3e59889d3526c1226ad2167e576713a3461730 Mon Sep 17 00:00:00 2001 From: Twin1 Date: Fri, 13 Oct 2023 09:55:53 -0500 Subject: [PATCH 3/9] fix 9.41 monster event issue --- Project Reboot 3.0/events.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project Reboot 3.0/events.h b/Project Reboot 3.0/events.h index 0068514..8b5b5c7 100644 --- a/Project Reboot 3.0/events.h +++ b/Project Reboot 3.0/events.h @@ -476,7 +476,7 @@ static inline Event GetOurEvent() static inline bool HasEvent() { - return GetOurEvent().Version == Fortnite_Version; + return GetOurEvent().Version == Fortnite_Version || Fortnite_Version == 9.41; } static inline bool RequiresEventPlaylist() From 0cd1ff5795a2f55869a9f6cb70dc3ca070a866a8 Mon Sep 17 00:00:00 2001 From: Twin1 Date: Fri, 13 Oct 2023 09:57:05 -0500 Subject: [PATCH 4/9] Update FortGameModeAthena.cpp --- Project Reboot 3.0/FortGameModeAthena.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Project Reboot 3.0/FortGameModeAthena.cpp b/Project Reboot 3.0/FortGameModeAthena.cpp index 36b64c7..343fa8e 100644 --- a/Project Reboot 3.0/FortGameModeAthena.cpp +++ b/Project Reboot 3.0/FortGameModeAthena.cpp @@ -368,8 +368,8 @@ bool AFortGameModeAthena::Athena_ReadyToStartMatchHook(AFortGameModeAthena* Game ShowFoundation(FindObject("/Game/Athena/Maps/Athena_POI_Foundations.Athena_POI_Foundations.PersistentLevel.LF_Athena_POI_25x36")); // Polar Peak ShowFoundation(FindObject("/Game/Athena/Maps/Athena_POI_Foundations.Athena_POI_Foundations.PersistentLevel.ShopsNew")); // Tilted Tower Shops, is this 7.40 specific? } - - else if (Fortnite_Season == 8) + // not sure what other build is needed idrc + else if (Fortnite_Season == 8 || Fortnite_Version == 9.10) { auto Volcano = FindObject(("/Game/Athena/Maps/Athena_POI_Foundations.Athena_POI_Foundations.PersistentLevel.LF_Athena_POI_50x53_Volcano")); ShowFoundation(Volcano); From 409c6b9ad41f0d68b40ee78564bd1d648c5da6f7 Mon Sep 17 00:00:00 2001 From: Twin1 Date: Fri, 13 Oct 2023 09:57:37 -0500 Subject: [PATCH 5/9] Revert "Update FortGameModeAthena.cpp" This reverts commit 0cd1ff5795a2f55869a9f6cb70dc3ca070a866a8. --- Project Reboot 3.0/FortGameModeAthena.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Project Reboot 3.0/FortGameModeAthena.cpp b/Project Reboot 3.0/FortGameModeAthena.cpp index 343fa8e..36b64c7 100644 --- a/Project Reboot 3.0/FortGameModeAthena.cpp +++ b/Project Reboot 3.0/FortGameModeAthena.cpp @@ -368,8 +368,8 @@ bool AFortGameModeAthena::Athena_ReadyToStartMatchHook(AFortGameModeAthena* Game ShowFoundation(FindObject("/Game/Athena/Maps/Athena_POI_Foundations.Athena_POI_Foundations.PersistentLevel.LF_Athena_POI_25x36")); // Polar Peak ShowFoundation(FindObject("/Game/Athena/Maps/Athena_POI_Foundations.Athena_POI_Foundations.PersistentLevel.ShopsNew")); // Tilted Tower Shops, is this 7.40 specific? } - // not sure what other build is needed idrc - else if (Fortnite_Season == 8 || Fortnite_Version == 9.10) + + else if (Fortnite_Season == 8) { auto Volcano = FindObject(("/Game/Athena/Maps/Athena_POI_Foundations.Athena_POI_Foundations.PersistentLevel.LF_Athena_POI_50x53_Volcano")); ShowFoundation(Volcano); From 353db50330313856a88d285887dc4e5363122f73 Mon Sep 17 00:00:00 2001 From: Twin1 Date: Fri, 13 Oct 2023 09:57:58 -0500 Subject: [PATCH 6/9] fix 9.10 volcano not working --- Project Reboot 3.0/FortGameModeAthena.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Project Reboot 3.0/FortGameModeAthena.cpp b/Project Reboot 3.0/FortGameModeAthena.cpp index 36b64c7..343fa8e 100644 --- a/Project Reboot 3.0/FortGameModeAthena.cpp +++ b/Project Reboot 3.0/FortGameModeAthena.cpp @@ -368,8 +368,8 @@ bool AFortGameModeAthena::Athena_ReadyToStartMatchHook(AFortGameModeAthena* Game ShowFoundation(FindObject("/Game/Athena/Maps/Athena_POI_Foundations.Athena_POI_Foundations.PersistentLevel.LF_Athena_POI_25x36")); // Polar Peak ShowFoundation(FindObject("/Game/Athena/Maps/Athena_POI_Foundations.Athena_POI_Foundations.PersistentLevel.ShopsNew")); // Tilted Tower Shops, is this 7.40 specific? } - - else if (Fortnite_Season == 8) + // not sure what other build is needed idrc + else if (Fortnite_Season == 8 || Fortnite_Version == 9.10) { auto Volcano = FindObject(("/Game/Athena/Maps/Athena_POI_Foundations.Athena_POI_Foundations.PersistentLevel.LF_Athena_POI_50x53_Volcano")); ShowFoundation(Volcano); From 673d88b01b7ca32e8e08be7b94a8ea1a6ff3aa28 Mon Sep 17 00:00:00 2001 From: Twin1 Date: Fri, 13 Oct 2023 10:08:26 -0500 Subject: [PATCH 7/9] actual fix for showdown event --- Project Reboot 3.0/events.h | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/Project Reboot 3.0/events.h b/Project Reboot 3.0/events.h index 8b5b5c7..827932e 100644 --- a/Project Reboot 3.0/events.h +++ b/Project Reboot 3.0/events.h @@ -185,6 +185,34 @@ static inline std::vector Events = false ), Event + ( + "The Showdown", + "/Game/Athena/Prototype/Blueprints/Cattus/BP_CattusDoggus_Scripting.BP_CattusDoggus_Scripting_C", + "/Game/Athena/Prototype/Blueprints/Cattus/BP_CattusDoggus_Scripting.BP_CattusDoggus_Scripting_C.LoadCattusLevel", + 1, + { + { + true, + "/Game/Athena/Prototype/Blueprints/Cattus/BP_CattusDoggus_Scripting.BP_CattusDoggus_Scripting_C.OnReady_C11CA7624A74FBAEC54753A3C2BD4506" + } + }, + { + { + { + true, + "/Game/Athena/Prototype/Blueprints/Cattus/BP_CattusDoggus_Scripting.BP_CattusDoggus_Scripting_C.startevent" + }, + + 0 + } + }, + + "/Game/Athena/Prototype/Blueprints/Cattus/BP_CattusDoggus_Scripting.BP_CattusDoggus_Scripting_C", + "/Game/Athena/Playlists/Music/Playlist_Music_High.Playlist_Music_High", + 9.41, // also 9.41 + false + ), + Event ( "The Unvaulting", "/Game/Athena/Prototype/Blueprints/White/BP_SnowScripting.BP_SnowScripting_C", @@ -456,6 +484,7 @@ static inline UFortPlaylistAthena* GetEventPlaylist() { if (CurrentEvent.Version == Fortnite_Version) return FindObject(CurrentEvent.PlaylistName, nullptr, ANY_PACKAGE); + } return nullptr; @@ -476,7 +505,7 @@ static inline Event GetOurEvent() static inline bool HasEvent() { - return GetOurEvent().Version == Fortnite_Version || Fortnite_Version == 9.41; + return GetOurEvent().Version == Fortnite_Version; } static inline bool RequiresEventPlaylist() From 894526946b41779e69d79dacf54e5bd3cfeb7c63 Mon Sep 17 00:00:00 2001 From: Twin1 Date: Thu, 7 Dec 2023 00:01:23 -0600 Subject: [PATCH 8/9] add snow map back --- Project Reboot 3.0/GameModeBase.cpp | 9 +++++++++ Project Reboot 3.0/calendar.h | 18 ++++++++++++++++-- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/Project Reboot 3.0/GameModeBase.cpp b/Project Reboot 3.0/GameModeBase.cpp index 8c2c8a4..aaf3129 100644 --- a/Project Reboot 3.0/GameModeBase.cpp +++ b/Project Reboot 3.0/GameModeBase.cpp @@ -8,6 +8,7 @@ #include "DataTableFunctionLibrary.h" #include "FortAthenaMutator_GG.h" #include "FortAthenaMutator_InventoryOverride.h" +#include "calendar.h" void AGameModeBase::RestartPlayerAtTransform(AController* NewPlayer, FTransform SpawnTransform) { @@ -260,6 +261,14 @@ APawn* AGameModeBase::SpawnDefaultPawnForHook(AGameModeBase* GameMode, AControll // NewPlayerAsAthena->RespawnPlayerAfterDeath(true); } + static bool bFirst = true; + + if (bFirst) + { + bFirst = false; + Calendar::SetSnow(100); + } + // LOG_INFO(LogDev, "Finish SpawnDefaultPawnFor!"); return NewPawn; diff --git a/Project Reboot 3.0/calendar.h b/Project Reboot 3.0/calendar.h index c5d9065..8faea33 100644 --- a/Project Reboot 3.0/calendar.h +++ b/Project Reboot 3.0/calendar.h @@ -8,7 +8,7 @@ namespace Calendar { static inline bool HasSnowModification() { - return Fortnite_Version == 7.30 || Fortnite_Version == 11.31 || Fortnite_Version == 19.10; + return Fortnite_Version == 7.30 || Fortnite_Version == 11.31 || Fortnite_Version == 15.10 || Fortnite_Version == 19.10; } static inline UObject* GetSnowSetup() @@ -42,7 +42,7 @@ namespace Calendar static inline void SetSnow(float NewValue) { - static auto SetSnowFn = FindObject(L"/Game/Athena/Apollo/Environments/Blueprints/CalendarEvents/BP_ApolloSnowSetup.BP_ApolloSnowSetup_C.OnReady_0A511B314AE165C51798519FB84738B8") ? FindObject(L"/Game/Athena/Apollo/Environments/Blueprints/CalendarEvents/BP_ApolloSnowSetup.BP_ApolloSnowSetup_C.OnReady_0A511B314AE165C51798519FB84738B8") : + static auto SetSnowFn = FindObject(L"/Game/Athena/Apollo/Environments/Blueprints/CalendarEvents/BP_ApolloSnowSetup.BP_ApolloSnowSetup_C.SetSnow") ? FindObject(L"/Game/Athena/Apollo/Environments/Blueprints/CalendarEvents/BP_ApolloSnowSetup.BP_ApolloSnowSetup_C.SetSnow") : FindObject(L"/Game/Athena/Environments/Landscape/Blueprints/BP_SnowSetup.BP_SnowSetup_C.SetSnow"); auto SnowSetup = GetSnowSetup(); @@ -53,6 +53,8 @@ namespace Calendar auto GameState = (AFortGameStateAthena*)GetWorld()->GetGameState(); GET_PLAYLIST(GameState) + + /* struct { UObject* GameState; UObject* Playlist; FGameplayTagContainer PlaylistContextTags; } OnReadyParams{ GameState, CurrentPlaylist, FGameplayTagContainer()}; UFunction* OnReadyFunc = FindObject(L"/Game/Athena/Apollo/Environments/Blueprints/CalendarEvents/BP_ApolloSnowSetup.BP_ApolloSnowSetup_C.OnReady_0A511B314AE165C51798519FB84738B8"); @@ -64,8 +66,14 @@ namespace Calendar SnowSetup->ProcessEvent(OnReadyFunc, &OnReadyParams); } + */ + LOG_INFO(LogDev, "Called OnReady!"); + SnowSetup->ProcessEvent(SetSnowFn, &NewValue); + + LOG_INFO(LogDev, "Called SetSnow!"); + return; if (NewValue != -1) @@ -85,6 +93,12 @@ namespace Calendar static auto ada = FindObject(L"/Game/Athena/Apollo/Environments/Blueprints/CalendarEvents/BP_ApolloSnowSetup.BP_ApolloSnowSetup_C.SetFullSnowEd"); SnowSetup->ProcessEvent(ada); + + + } + else + { + LOG_INFO(LogDev, "Failed TO FIND!"); } } } \ No newline at end of file From ef54815efc35c68342a69888d9240d8fd98de7c3 Mon Sep 17 00:00:00 2001 From: Twin1 <64933300+Twin1dev@users.noreply.github.com> Date: Thu, 7 Dec 2023 00:07:02 -0600 Subject: [PATCH 9/9] Update README.md --- README.md | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 87cb74a..28a7eeb 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,11 @@ -# Project Reboot 3.0 Revived +# Project Reboot 3.0 -My plan is to add things that reboot v3 never had. +I have quit the community and the project is discontinued 😢. + +S3-S15 (S16-S19 is slightly supported) + +## TODO + +- Rewrite picking up code. +- Rewrite dllmain +- Move hooking to each class (for example, AFortGameModeAthena::InitHooks).