aa

2026-01-13 19:02:21 +01:00 · 2023-03-05 22:30:29 -05:00
parent 472fbdb809
commit ae259f97eb
23 changed files with 982 additions and 54 deletions
--- a/3.0/FortGameModeAthena.cpp
+++ b/3.0/FortGameModeAthena.cpp
@@ -9,6 +9,7 @@
 #include "FortPickup.h"
 #include "FortLootPackage.h"
 #include "BuildingContainer.h"
+#include "events.h"

 static bool bFirstPlayerJoined = false;

@@ -31,10 +32,16 @@ enum class EDynamicFoundationType : uint8_t
 	EDynamicFoundationType_MAX = 4
 };

-void ShowFoundation(AActor* BuildingFoundation)
+void ShowFoundation(UObject* BuildingFoundation)
 {
+	if (!BuildingFoundation)
+		return;
+
 	SetBitfield(BuildingFoundation->GetPtr<PlaceholderBitfield>("bServerStreamedInLevel"), 2, true);

+	static auto DynamicFoundationTypeOffset = BuildingFoundation->GetOffset("DynamicFoundationType");
+	BuildingFoundation->Get<uint8_t>(DynamicFoundationTypeOffset) = true ? 0 : 3;
+
 	static auto OnRep_ServerStreamedInLevelFn = FindObject<UFunction>("/Script/FortniteGame.BuildingFoundation.OnRep_ServerStreamedInLevel");
 	BuildingFoundation->ProcessEvent(OnRep_ServerStreamedInLevelFn);

@@ -52,8 +59,10 @@ void ShowFoundation(AActor* BuildingFoundation)
 		BuildingFoundation->ProcessEvent(OnRep_DynamicFoundationRepDataFn);
 	}

-	static auto FoundationEnabledStateOffset = BuildingFoundation->GetOffset("FoundationEnabledState");
-	BuildingFoundation->Get<EDynamicFoundationEnabledState>(FoundationEnabledStateOffset) = EDynamicFoundationEnabledState::Enabled;
+	static auto FoundationEnabledStateOffset = BuildingFoundation->GetOffset("FoundationEnabledState", false);
+
+	if (FoundationEnabledStateOffset != 0)
+		BuildingFoundation->Get<EDynamicFoundationEnabledState>(FoundationEnabledStateOffset) = EDynamicFoundationEnabledState::Enabled;
 }

 static void StreamLevel(std::string LevelName, FVector Location = {})
@@ -91,6 +100,12 @@ UObject* GetPlaylistToUse()
 	if (Globals::bCreative)
 		Playlist = FindObject("/Game/Athena/Playlists/Creative/Playlist_PlaygroundV2.Playlist_PlaygroundV2");

+	if (Globals::bGoingToPlayEvent)
+	{
+		if (Fortnite_Version != 12.61)
+			Playlist = GetEventPlaylist();
+	}
+
 	return Playlist;
 }

@@ -137,6 +152,136 @@ bool AFortGameModeAthena::Athena_ReadyToStartMatchHook(AFortGameModeAthena* Game

 		GameMode->Get<int>("WarmupRequiredPlayerCount") = 1;	
 		
+		SetPlaylist(GetPlaylistToUse());
+		
+		auto Fortnite_Season = std::floor(Fortnite_Version);
+
+		if (Fortnite_Season == 6)
+		{
+			if (Fortnite_Version != 6.10)
+			{
+				auto Lake = FindObject(("/Game/Athena/Maps/Athena_POI_Foundations.Athena_POI_Foundations.PersistentLevel.LF_Lake1"));
+				auto Lake2 = FindObject("/Game/Athena/Maps/Athena_POI_Foundations.Athena_POI_Foundations.PersistentLevel.LF_Lake2");
+
+				Fortnite_Version <= 6.21 ? ShowFoundation(Lake) : ShowFoundation(Lake2);
+				// ^ This shows the lake after or before the event i dont know if this is needed.
+			}
+			else
+			{
+				auto Lake = FindObject(("/Game/Athena/Maps/Athena_POI_Foundations.Athena_POI_Foundations.PersistentLevel.LF_Athena_StreamingTest12"));
+				ShowFoundation(Lake);
+			}
+
+			auto FloatingIsland = Fortnite_Version == 6.10 ? FindObject(("/Game/Athena/Maps/Athena_POI_Foundations.Athena_POI_Foundations.PersistentLevel.LF_Athena_StreamingTest13")) :
+				FindObject(("/Game/Athena/Maps/Athena_POI_Foundations.Athena_POI_Foundations.PersistentLevel.LF_FloatingIsland"));
+
+			ShowFoundation(FloatingIsland);
+		}
+
+		if (Fortnite_Season >= 7 && Fortnite_Season <= 10)
+		{
+			if (Fortnite_Season == 7)
+			{
+				if (Fortnite_Version == 7.30)
+				{
+					auto PleasantParkIdk = FindObject(("/Game/Athena/Maps/Athena_POI_Foundations.Athena_POI_Foundations.PersistentLevel.PleasentParkFestivus"));
+					ShowFoundation(PleasantParkIdk);
+
+					auto PleasantParkGround = FindObject("/Game/Athena/Maps/Athena_POI_Foundations.Athena_POI_Foundations.PersistentLevel.PleasentParkDefault");
+					ShowFoundation(PleasantParkGround);
+				}
+
+				auto PolarPeak = FindObject(("/Game/Athena/Maps/Athena_POI_Foundations.Athena_POI_Foundations.PersistentLevel.LF_Athena_POI_25x36"));
+				ShowFoundation(PolarPeak);
+
+				auto tiltedtower = FindObject("/Game/Athena/Maps/Athena_POI_Foundations.Athena_POI_Foundations.PersistentLevel.ShopsNew");
+				ShowFoundation(tiltedtower); // 7.40 specific?
+			}
+
+			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);
+			}
+
+			else if (Fortnite_Season == 10)
+			{
+				if (Fortnite_Version >= 10.20)
+				{
+					auto Island = FindObject("/Game/Athena/Maps/Athena_POI_Foundations.Athena_POI_Foundations.PersistentLevel.LF_Athena_StreamingTest16");
+					ShowFoundation(Island);
+				}
+			}
+
+			auto TheBlock = FindObject("/Game/Athena/Maps/Athena_POI_Foundations.Athena_POI_Foundations.PersistentLevel.SLAB_2"); // SLAB_3 is blank
+			ShowFoundation(TheBlock);
+		}
+
+		if (Fortnite_Version == 17.50f) {
+			auto FarmAfter = FindObject(("/Game/Athena/Apollo/Maps/Apollo_Mother.Apollo_Mother.PersistentLevel.farmbase_2"));
+			ShowFoundation(FarmAfter);
+
+			auto FarmPhase = FindObject(("/Game/Athena/Apollo/Maps/Apollo_Mother.Apollo_Mother.PersistentLevel.Farm_Phase_03")); // Farm Phases (Farm_Phase_01, Farm_Phase_02 and Farm_Phase_03)
+			ShowFoundation(FarmPhase);
+		}
+
+		if (Fortnite_Version == 17.40f) {
+			auto AbductedCoral = FindObject(("/Game/Athena/Apollo/Maps/Apollo_Mother.Apollo_Mother.PersistentLevel.CoralPhase_02")); // Coral Castle Phases (CoralPhase_01, CoralPhase_02 and CoralPhase_03)
+			ShowFoundation(AbductedCoral);
+
+			auto CoralFoundation_01 = FindObject(("/Game/Athena/Apollo/Maps/Apollo_Mother.Apollo_Mother.PersistentLevel.LF_Athena_16x16_Foundation_0"));
+			ShowFoundation(CoralFoundation_01);
+
+			auto CoralFoundation_05 = FindObject(("/Game/Athena/Apollo/Maps/Apollo_Mother.Apollo_Mother.PersistentLevel.LF_Athena_16x16_Foundation6"));
+			ShowFoundation(CoralFoundation_05);
+
+			auto CoralFoundation_07 = FindObject(("/Game/Athena/Apollo/Maps/Apollo_Mother.Apollo_Mother.PersistentLevel.LF_Athena_16x16_Foundation3"));
+			ShowFoundation(CoralFoundation_07);
+
+			auto CoralFoundation_10 = FindObject(("/Game/Athena/Apollo/Maps/Apollo_Mother.Apollo_Mother.PersistentLevel.LF_Athena_16x16_Foundation2_1"));
+			ShowFoundation(CoralFoundation_10);
+
+			auto CoralFoundation_13 = FindObject(("/Game/Athena/Apollo/Maps/Apollo_Mother.Apollo_Mother.PersistentLevel.LF_Athena_16x16_Foundation4"));
+			ShowFoundation(CoralFoundation_13);
+
+			auto CoralFoundation_17 = FindObject(("/Game/Athena/Apollo/Maps/Apollo_Mother.Apollo_Mother.PersistentLevel.LF_Athena_16x16_Foundation5"));
+			ShowFoundation(CoralFoundation_17);
+		}
+
+		if (Fortnite_Version == 17.30f) {
+			auto AbductedSlurpy = FindObject(("LF_Athena_POI_50x50_C /Game/Athena/Apollo/Maps/Apollo_Mother.Apollo_Mother.PersistentLevel.Slurpy_Phase03")); // Slurpy Swamp Phases (Slurpy_Phase01, Slurpy_Phase02 and Slurpy_Phase03)
+			ShowFoundation(AbductedSlurpy);
+		}
+
+		if (Fortnite_Season == 13)
+		{
+			auto SpawnIsland = FindObject("/Game/Athena/Apollo/Maps/Apollo_POI_Foundations.Apollo_POI_Foundations.PersistentLevel.Lobby_Foundation");
+			ShowFoundation(SpawnIsland);
+
+			// SpawnIsland->RepData->Soemthing = FoundationSetup->LobbyLocation;
+		}
+
+		if (Fortnite_Version == 12.41)
+		{
+			auto JS03 = FindObject(("/Game/Athena/Apollo/Maps/Apollo_POI_Foundations.Apollo_POI_Foundations.PersistentLevel.LF_Athena_POI_19x19_2"));
+			ShowFoundation(JS03);
+
+			auto JH00 = FindObject(("/Game/Athena/Apollo/Maps/Apollo_POI_Foundations.Apollo_POI_Foundations.PersistentLevel.BP_Jerky_Head6_18"));
+			ShowFoundation(JH00);
+
+			auto JH01 = FindObject(("/Game/Athena/Apollo/Maps/Apollo_POI_Foundations.Apollo_POI_Foundations.PersistentLevel.BP_Jerky_Head5_14"));
+			ShowFoundation(JH01);
+
+			auto JH02 = FindObject(("/Game/Athena/Apollo/Maps/Apollo_POI_Foundations.Apollo_POI_Foundations.PersistentLevel.BP_Jerky_Head3_8"));
+			ShowFoundation(JH02);
+
+			auto JH03 = FindObject(("/Game/Athena/Apollo/Maps/Apollo_POI_Foundations.Apollo_POI_Foundations.PersistentLevel.BP_Jerky_Head_2"));
+			ShowFoundation(JH03);
+
+			auto JH04 = FindObject(("/Game/Athena/Apollo/Maps/Apollo_POI_Foundations.Apollo_POI_Foundations.PersistentLevel.BP_Jerky_Head4_11"));
+			ShowFoundation(JH04);
+		}
+
 		auto PlaylistToUse = GetPlaylistToUse();

 		if (PlaylistToUse)
@@ -153,6 +298,35 @@ bool AFortGameModeAthena::Athena_ReadyToStartMatchHook(AFortGameModeAthena* Game
 		}
 	}

+	static int LastNum6 = 1;
+
+	if (AmountOfRestarts != LastNum6)
+	{
+		LastNum6 = AmountOfRestarts;
+
+		if (Globals::bGoingToPlayEvent && DoesEventRequireLoading())
+		{
+			bool bb;
+			LoadEvent(&bb);
+
+			if (!bb)
+				LastNum6 = -1;
+		}
+	}
+
+	static int LastNum5 = 1;
+
+	if (AmountOfRestarts != LastNum5 && LastNum6 == AmountOfRestarts)
+	{
+		LastNum5 = AmountOfRestarts;
+
+		bool bb;
+		CallOnReadys(&bb);
+
+		if (!bb)
+			LastNum5 = -1;
+	}
+
 	/* static auto FortPlayerStartWarmupClass = FindObject<UClass>("/Script/FortniteGame.FortPlayerStartWarmup");
 	TArray<AActor*> Actors = UGameplayStatics::GetAllActorsOfClass(GetWorld(), FortPlayerStartWarmupClass);

@@ -163,17 +337,6 @@ bool AFortGameModeAthena::Athena_ReadyToStartMatchHook(AFortGameModeAthena* Game
 	if (ActorsNum == 0)
 		return false; */

-	/* static int LastNum4 = 1;
-
-	if (AmountOfRestarts != LastNum4)
-	{
-		LastNum4 = AmountOfRestarts;
-
-		auto Playlist = FindObject("/Game/Athena/Playlists/Playlist_DefaultSolo.Playlist_DefaultSolo");
-		SetPlaylist(Playlist);
-		LOG_INFO(LogLoading, "Set playlist!");
-	} */
-
 	static auto MapInfoOffset = GameState->GetOffset("MapInfo");
 	auto MapInfo = GameState->Get(MapInfoOffset);
 	
@@ -182,9 +345,6 @@ bool AFortGameModeAthena::Athena_ReadyToStartMatchHook(AFortGameModeAthena* Game

 	static auto FlightInfosOffset = MapInfo->GetOffset("FlightInfos");

-	// if (MapInfo->Get<TArray<__int64>>(FlightInfosOffset).ArrayNum <= 0)
-		// return false;
-
 	static int LastNum3 = 1;

 	if (AmountOfRestarts != LastNum3)
@@ -220,22 +380,24 @@ bool AFortGameModeAthena::Athena_ReadyToStartMatchHook(AFortGameModeAthena* Game
 			GameState->OnRep_GamePhase();
 		}

-		SetPlaylist(GetPlaylistToUse());
-
 		GameState->Get<float>("WarmupCountdownEndTime") = TimeSeconds + Duration;
 		GameMode->Get<float>("WarmupCountdownDuration") = Duration;

 		GameState->Get<float>("WarmupCountdownStartTime") = TimeSeconds;
 		GameMode->Get<float>("WarmupEarlyCountdownDuration") = EarlyDuration;

+		GameState->OnRep_CurrentPlaylistInfo();
+
 		LOG_INFO(LogDev, "Initialized!");
 	}

 	if (Engine_Version >= 424) // returning true is stripped on c2+
 	{
-		// if (GameState->GetPlayersLeft() >= GameMode->Get<int>("WarmupRequiredPlayerCount"))
-		if (MapInfo->Get<TArray<__int64>>(FlightInfosOffset).ArrayNum <= 0)
-			return true;
+		if (GameState->GetPlayersLeft() >= GameMode->Get<int>("WarmupRequiredPlayerCount"))
+		{
+			if (MapInfo->Get<TArray<__int64>>(FlightInfosOffset).ArrayNum <= 0)
+				return true;
+		}
 	}

 	return Athena_ReadyToStartMatchOriginal(GameMode);
@@ -261,6 +423,9 @@ enum class EFortCustomPartType : uint8_t // todo move

 void AFortGameModeAthena::Athena_HandleStartingNewPlayerHook(AFortGameModeAthena* GameMode, AActor* NewPlayerActor)
 {
+	if (!NewPlayerActor)
+		return;
+
 	auto SpawnIsland_FloorLoot = FindObject<UClass>("/Game/Athena/Environments/Blueprints/Tiered_Athena_FloorLoot_Warmup.Tiered_Athena_FloorLoot_Warmup_C");
 	auto BRIsland_FloorLoot = FindObject<UClass>("/Game/Athena/Environments/Blueprints/Tiered_Athena_FloorLoot_01.Tiered_Athena_FloorLoot_01_C");

@@ -343,11 +508,11 @@ void AFortGameModeAthena::Athena_HandleStartingNewPlayerHook(AFortGameModeAthena
 	static UFortItemDefinition* WoodItemData = FindObject<UFortItemDefinition>(L"/Game/Items/ResourcePickups/WoodItemData.WoodItemData");

 	WorldInventory->AddItem(EditToolItemDefinition, nullptr);
-	WorldInventory->AddItem(PickaxeDefinition, nullptr);
 	WorldInventory->AddItem(BuildingItemData_Wall, nullptr);
 	WorldInventory->AddItem(BuildingItemData_Floor, nullptr);
 	WorldInventory->AddItem(BuildingItemData_Stair_W, nullptr);
 	WorldInventory->AddItem(BuildingItemData_RoofS, nullptr);
+	WorldInventory->AddItem(PickaxeDefinition, nullptr);
 	WorldInventory->AddItem(WoodItemData, nullptr, 100);

 	WorldInventory->Update(true);
@@ -392,7 +557,7 @@ void AFortGameModeAthena::Athena_HandleStartingNewPlayerHook(AFortGameModeAthena
 		PlayerStateAthena->ProcessEvent(OnRep_bHasStartedPlayingFn);
 	}

-	if (false)
+	// if (false)
 	{
 		static auto GameplayAbilitySet = LoadObject<UObject>(L"/Game/Abilities/Player/Generic/Traits/DefaultPlayer/GAS_AthenaPlayer.GAS_AthenaPlayer") ? 
 			LoadObject<UObject>(L"/Game/Abilities/Player/Generic/Traits/DefaultPlayer/GAS_AthenaPlayer.GAS_AthenaPlayer") :
@@ -471,7 +636,7 @@ void AFortGameModeAthena::Athena_HandleStartingNewPlayerHook(AFortGameModeAthena
 			GameMemberInfo->MemberUniqueId = PlayerStateAthena->Get<FUniqueNetIdRepl>("UniqueId");
 		}

-		static auto GameMemberInfoArray_MembersOffset = 0x0108;
+		static auto GameMemberInfoArray_MembersOffset = FindOffsetStruct("/Script/FortniteGame.GameMemberInfoArray", "Members");

 		auto GameMemberInfoArray = GameState->GetPtr<FFastArraySerializer>(GameMemberInfoArrayOffset);

@@ -479,5 +644,5 @@ void AFortGameModeAthena::Athena_HandleStartingNewPlayerHook(AFortGameModeAthena
 		GameMemberInfoArray->MarkArrayDirty();
 	}

-	return Athena_HandleStartingNewPlayerOriginal(GameMode, NewPlayer);
+	return Athena_HandleStartingNewPlayerOriginal(GameMode, NewPlayerActor);
 }