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

fix soem cbgas

Browse Source
This commit is contained in:
Gray
2025-07-15 19:58:13 -04:00
parent 5b26b290e9
commit 131e494cef
2 changed files with 33 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
Project Reboot 3.0/BGA.h
View File

@@ -15,6 +15,7 @@ static inline void SpawnBGAs() // hahah not "proper", there's a function that we
return; return;
auto GameState = Cast<AFortGameStateAthena>(GetWorld()->GetGameState()); auto GameState = Cast<AFortGameStateAthena>(GetWorld()->GetGameState());
auto MapInfo = GameState->GetMapInfo();
auto AllBGAConsumableSpawners = UGameplayStatics::GetAllActorsOfClass(GetWorld(), BGAConsumableSpawnerClass); auto AllBGAConsumableSpawners = UGameplayStatics::GetAllActorsOfClass(GetWorld(), BGAConsumableSpawnerClass);
@@ -36,16 +37,38 @@ static inline void SpawnBGAs() // hahah not "proper", there's a function that we
if (FBuildingGameplayActorSpawnDetails::GetStruct()) if (FBuildingGameplayActorSpawnDetails::GetStruct())
{ {
// todo handle? // todo handle?
auto MapInfo = GameState->GetMapInfo();
} }
bool bDeferConstruction = true; // hm?
static auto SpawnLootTierGroupOffset = BGAConsumableSpawner->GetOffset("SpawnLootTierGroup"); static auto SpawnLootTierGroupOffset = BGAConsumableSpawner->GetOffset("SpawnLootTierGroup");
auto& SpawnLootTierGroup = BGAConsumableSpawner->Get<FName>(SpawnLootTierGroupOffset); auto& SpawnLootTierGroup = BGAConsumableSpawner->Get<FName>(SpawnLootTierGroupOffset);
auto LootDrops = PickLootDrops(SpawnLootTierGroup, GameState->GetWorldLevel()); std::vector<LootDrop> LootDrops;
for (int z = 0; z < LootDrops.size(); z++) if (SpawnLootTierGroup.ToString() == "Loot_ForagedItem_GravityRocks") // on 4.0 atleast, LootPackageCategoryMinArray contains all 0s
{
LootDrop GravityRockDrop{};
auto Class = FindObject<UClass>("/Script/FortniteGame.BGAConsumableWrapperItemDefinition");
auto LowGravItemDef = LoadObject<UFortItemDefinition>(L"/Game/Athena/Items/ForagedItems/LowGravity/Athena_Foraged_LowGravity.Athena_Foraged_LowGravity", Class);
if (!LowGravItemDef)
{
LOG_ERROR(LogDev, "Failed to load LowGravity ItemDefinition!");
continue;
}
GravityRockDrop.ItemEntry = FFortItemEntry::MakeItemEntry(LowGravItemDef);
LootDrops.push_back(GravityRockDrop);
bDeferConstruction = false;
}
else
{
LootDrops = PickLootDrops(SpawnLootTierGroup, GameState->GetWorldLevel());
}
LOG_INFO(LogDev, "LootDrops: {} SpawnLootTierGroup: {}", LootDrops.size(), SpawnLootTierGroup.ToString());
for (int z = 0; z < LootDrops.size(); ++z)
{ {
auto& LootDrop = LootDrops.at(z); auto& LootDrop = LootDrops.at(z);
@@ -57,12 +80,10 @@ static inline void SpawnBGAs() // hahah not "proper", there's a function that we
if (!StrongConsumableClass) if (!StrongConsumableClass)
{ {
LOG_INFO(LogDev, "Invalid consumable class!"); LOG_INFO(LogDev, "Unable to get consumable class!");
continue; continue;
} }
bool bDeferConstruction = true; // hm?
auto ConsumableActor = GetWorld()->SpawnActor<ABuildingGameplayActor>(StrongConsumableClass, SpawnTransform, CreateSpawnParameters(ESpawnActorCollisionHandlingMethod::AdjustIfPossibleButAlwaysSpawn, bDeferConstruction)); auto ConsumableActor = GetWorld()->SpawnActor<ABuildingGameplayActor>(StrongConsumableClass, SpawnTransform, CreateSpawnParameters(ESpawnActorCollisionHandlingMethod::AdjustIfPossibleButAlwaysSpawn, bDeferConstruction));
if (ConsumableActor) if (ConsumableActor)
@@ -111,9 +132,12 @@ static inline void SpawnBGAs() // hahah not "proper", there's a function that we
if (bDeferConstruction) if (bDeferConstruction)
UGameplayStatics::FinishSpawningActor(ConsumableActor, FinalSpawnTransform); UGameplayStatics::FinishSpawningActor(ConsumableActor, FinalSpawnTransform);
ConsumableActor->ForceNetUpdate();
ConsumableActor->SetNetDormancy(ENetDormancy::DORM_Awake);
// ConsumableActor->InitializeBuildingActor(nullptr, nullptr, true); // idk UFortKismetLibrary::SpawnBuildingGameplayActor does this // ConsumableActor->InitializeBuildingActor(nullptr, nullptr, true); // idk UFortKismetLibrary::SpawnBuildingGameplayActor does this
LOG_INFO(LogDev, "[{}/{}] Spawned BGA {} at {} {} {}", z, LootDrops.size(), ConsumableActor->GetName(), FinalSpawnTransform.Translation.X, FinalSpawnTransform.Translation.Y, FinalSpawnTransform.Translation.Z); LOG_INFO(LogDev, "[{}/{}] Spawned BGA {} at {} {} {}", z + 1, LootDrops.size(), ConsumableActor->GetName(), FinalSpawnTransform.Translation.X, FinalSpawnTransform.Translation.Y, FinalSpawnTransform.Translation.Z);
break; // ? break; // ?
} }
} }

2
Project Reboot 3.0/FortLootPackage.cpp
View File

@@ -394,7 +394,7 @@ std::vector<LootDrop> PickLootDrops(FName TierGroupName, int WorldLevel, int For
LTDTables.clear(); LTDTables.clear();
LPTables.clear(); LPTables.clear();
if (Fortnite_Version == 12.00) if (Fortnite_Version == 12.00) // TODO
return LootDrops; return LootDrops;
bool bFoundPlaylistTable = false; bool bFoundPlaylistTable = false;