supply drops

fixed supply drops, llamas, and fishing, loot will now combine before spawning
This commit is contained in:
Milxnor
2023-05-21 13:55:20 -04:00
parent 3ba297e72d
commit 63f819ab07
10 changed files with 164 additions and 109 deletions

View File

@@ -46,7 +46,7 @@
#define GAMEMODE_TAB 3
#define THANOS_TAB 4
#define EVENT_TAB 5
#define LATEGAME_TAB 6
#define ZONE_TAB 6
#define DUMP_TAB 7
#define UNBAN_TAB 8
#define DEVELOPER_TAB 9
@@ -347,9 +347,9 @@ static inline void MainTabs()
}
}
if (false && Globals::bLateGame && ImGui::BeginTabItem(("Lategame")))
if (ImGui::BeginTabItem(("Zone")))
{
Tab = LATEGAME_TAB;
Tab = ZONE_TAB;
PlayerTab = -1;
bInformationTab = false;
ImGui::EndTabItem();
@@ -576,13 +576,13 @@ static inline void MainUI()
if (!bStartedBus)
{
if (Globals::bLateGame.load())
if (Globals::bLateGame.load() || Fortnite_Version >= 11)
{
if (ImGui::Button("Start Bus"))
{
bStartedBus = true;
auto GameMode = (AFortGameMode*)GetWorld()->GetGameMode();
auto GameMode = (AFortGameModeAthena*)GetWorld()->GetGameMode();
auto GameState = GameMode->GetGameState();
UKismetSystemLibrary::ExecuteConsoleCommand(GetWorld(), L"startaircraft", nullptr);
@@ -688,6 +688,24 @@ static inline void MainUI()
static auto bAircraftIsLockedOffset = GameState->GetOffset("bAircraftIsLocked");
static auto bAircraftIsLockedFieldMask = GetFieldMask(GameState->GetProperty("bAircraftIsLocked"));
GameState->SetBitfieldValue(bAircraftIsLockedOffset, bAircraftIsLockedFieldMask, false);
UKismetSystemLibrary::ExecuteConsoleCommand(GetWorld(), L"startaircraft", nullptr);
UKismetSystemLibrary::ExecuteConsoleCommand(GetWorld(), L"skipaircraft", nullptr);
auto SafeZoneIndicator = GameMode->GetSafeZoneIndicator();
if (SafeZoneIndicator)
{
UKismetSystemLibrary::ExecuteConsoleCommand(GetWorld(), L"startshrinksafezone", nullptr);
SafeZoneIndicator->SkipShrinkSafeZone();
UKismetSystemLibrary::ExecuteConsoleCommand(GetWorld(), L"startshrinksafezone", nullptr);
SafeZoneIndicator->SkipShrinkSafeZone();
// Sleep(1000);
// SafeZoneIndicator->SkipShrinkSafeZone();
}
LOG_INFO(LogDev, "Finished!");
}
}
else
@@ -785,6 +803,40 @@ static inline void MainUI()
}
}
else if (Tab == ZONE_TAB)
{
if (ImGui::Button("Start Safe Zone"))
{
UKismetSystemLibrary::ExecuteConsoleCommand(GetWorld(), L"startsafezone", nullptr);
}
if (ImGui::Button("Pause Safe Zone"))
{
UKismetSystemLibrary::ExecuteConsoleCommand(GetWorld(), L"pausesafezone", nullptr);
}
if (ImGui::Button("Skip Zone"))
{
UKismetSystemLibrary::ExecuteConsoleCommand(GetWorld(), L"skipsafezone", nullptr);
}
if (ImGui::Button("Start Shrink Safe Zone"))
{
UKismetSystemLibrary::ExecuteConsoleCommand(GetWorld(), L"startshrinksafezone", nullptr);
}
if (ImGui::Button("Skip Shrink Safe Zone"))
{
auto GameMode = Cast<AFortGameModeAthena>(GetWorld()->GetGameMode());
auto SafeZoneIndicator = GameMode->GetSafeZoneIndicator();
if (SafeZoneIndicator)
{
SafeZoneIndicator->SkipShrinkSafeZone();
}
}
}
else if (Tab == DUMP_TAB)
{
ImGui::Text("These will all be in your Win64 folder!");