yindo/Project-Reboot-3.0
1
0
Fork 0
mirror of https://github.com/Milxnor/Project-Reboot-3.0.git synced 2026-01-13 10:52:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

15.50

Browse Source
This commit is contained in:
Gray
2024-03-16 18:43:50 -04:00
parent 724cf50267
commit bf5fd426c6
3 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Project Reboot 3.0/FortGameModeAthena.cpp
View File

@@ -384,9 +384,6 @@ bool AFortGameModeAthena::Athena_ReadyToStartMatchHook(AFortGameModeAthena* Game
*/ */
static auto WarmupRequiredPlayerCountOffset = GameMode->GetOffset("WarmupRequiredPlayerCount");
GameMode->Get<int>(WarmupRequiredPlayerCountOffset) = 1;
static auto CurrentPlaylistDataOffset = GameState->GetOffset("CurrentPlaylistData", false); static auto CurrentPlaylistDataOffset = GameState->GetOffset("CurrentPlaylistData", false);
if (CurrentPlaylistDataOffset != -1 || Fortnite_Version >= 6) // idk when they switched off id if (CurrentPlaylistDataOffset != -1 || Fortnite_Version >= 6) // idk when they switched off id
@@ -795,6 +792,9 @@ bool AFortGameModeAthena::Athena_ReadyToStartMatchHook(AFortGameModeAthena* Game
GetWorld()->Listen(); GetWorld()->Listen();
static auto WarmupRequiredPlayerCountOffset = GameMode->GetOffset("WarmupRequiredPlayerCount");
GameMode->Get<int>(WarmupRequiredPlayerCountOffset) = WarmupRequiredPlayerCount;
LOG_INFO(LogNet, "WorldLevel {}", GameState->GetWorldLevel()); LOG_INFO(LogNet, "WorldLevel {}", GameState->GetWorldLevel());
if (Globals::AmountOfListens == 1) // we only want to do this one time. if (Globals::AmountOfListens == 1) // we only want to do this one time.

4
Project Reboot 3.0/FortPawn.cpp
View File

@@ -9,13 +9,13 @@ AFortWeapon* AFortPawn::EquipWeaponDefinition(UFortWeaponItemDefinition* WeaponD
FGuid TrackerGuid{}; FGuid TrackerGuid{};
if (Fortnite_Version < 16) if (Fortnite_Version < 15.50)
{ {
struct { UObject* Def; FGuid Guid; AFortWeapon* Wep; } params{ WeaponData, ItemEntryGuid }; struct { UObject* Def; FGuid Guid; AFortWeapon* Wep; } params{ WeaponData, ItemEntryGuid };
this->ProcessEvent(EquipWeaponDefinitionFn, &params); this->ProcessEvent(EquipWeaponDefinitionFn, &params);
return params.Wep; return params.Wep;
} }
else if (std::floor(Fortnite_Version) == 16) else if (Fortnite_Version >= 15.50 && Fortnite_Version < 17)
{ {
struct { UObject* Def; FGuid Guid; FGuid TrackerGuid; AFortWeapon* Wep; } S16_params{ WeaponData, ItemEntryGuid, TrackerGuid }; struct { UObject* Def; FGuid Guid; FGuid TrackerGuid; AFortWeapon* Wep; } S16_params{ WeaponData, ItemEntryGuid, TrackerGuid };
this->ProcessEvent(EquipWeaponDefinitionFn, &S16_params); this->ProcessEvent(EquipWeaponDefinitionFn, &S16_params);

8
Project Reboot 3.0/gui.h
View File

@@ -86,6 +86,7 @@ extern inline bool bEnableBotTick = false;
extern inline bool bZoneReversing = false; extern inline bool bZoneReversing = false;
extern inline bool bEnableCombinePickup = false; extern inline bool bEnableCombinePickup = false;
extern inline int AmountOfBotsToSpawn = 0; extern inline int AmountOfBotsToSpawn = 0;
extern inline int WarmupRequiredPlayerCount = 1;
extern inline bool bEnableRebooting = false; extern inline bool bEnableRebooting = false;
extern inline bool bEngineDebugLogs = false; extern inline bool bEngineDebugLogs = false;
extern inline bool bStartedBus = false; extern inline bool bStartedBus = false;
@@ -710,6 +711,11 @@ static inline void MainUI()
SetIsLategame(bWillBeLategame); SetIsLategame(bWillBeLategame);
} }
if (!Globals::bStartedListening) // hm
{
ImGui::SliderInt("Players required to start the match", &WarmupRequiredPlayerCount, 1, 100);
}
ImGui::Text(std::format("Joinable {}", Globals::bStartedListening).c_str()); ImGui::Text(std::format("Joinable {}", Globals::bStartedListening).c_str());
static std::string ConsoleCommand; static std::string ConsoleCommand;
@@ -1413,6 +1419,8 @@ static inline void PregameUI()
ImGui::SliderInt("Seconds until load into map", &SecondsUntilTravel, 1, 100); ImGui::SliderInt("Seconds until load into map", &SecondsUntilTravel, 1, 100);
} }
ImGui::SliderInt("Players required to start the match", &WarmupRequiredPlayerCount, 1, 100);
if (!Globals::bCreative) if (!Globals::bCreative)
ImGui::InputText("Playlist", &PlaylistName); ImGui::InputText("Playlist", &PlaylistName);
} }