From 894526946b41779e69d79dacf54e5bd3cfeb7c63 Mon Sep 17 00:00:00 2001 From: Twin1 Date: Thu, 7 Dec 2023 00:01:23 -0600 Subject: [PATCH] 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