mirror of
https://github.com/Milxnor/Project-Reboot-3.0.git
synced 2026-01-13 02:42:22 +01:00
Revert "add snow map 11.31 15.10 7.10 and fly speed up comand and more"
This commit is contained in:
@@ -13,7 +13,7 @@ bool ABuildingContainer::SpawnLoot(AFortPawn* Pawn)
|
||||
|
||||
auto GameMode = Cast<AFortGameModeAthena>(GetWorld()->GetGameMode());
|
||||
|
||||
FVector LocationToSpawnLoot = this->GetActorLocation() + this->GetActorRightVector() * 70.0f + FVector{ 0,0,50 } ;
|
||||
FVector LocationToSpawnLoot = this->GetActorLocation() + this->GetActorForwardVector() * this->GetLootSpawnLocation_Athena().X + this->GetActorRightVector() * this->GetLootSpawnLocation_Athena().Y + this->GetActorUpVector() * this->GetLootSpawnLocation_Athena().Z;
|
||||
|
||||
auto RedirectedLootTier = GameMode->RedirectLootTier(GetSearchLootTierGroup());
|
||||
|
||||
@@ -46,4 +46,4 @@ bool ABuildingContainer::SpawnLoot(AFortPawn* Pawn)
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
}
|
||||
@@ -369,7 +369,7 @@ bool AFortGameModeAthena::Athena_ReadyToStartMatchHook(AFortGameModeAthena* Game
|
||||
ShowFoundation(FindObject<AActor>("/Game/Athena/Maps/Athena_POI_Foundations.Athena_POI_Foundations.PersistentLevel.ShopsNew")); // Tilted Tower Shops, is this 7.40 specific?
|
||||
}
|
||||
|
||||
else if (Fortnite_Season == 8 || Fortnite_Version == 9.10)
|
||||
else if (Fortnite_Season == 8)
|
||||
{
|
||||
auto Volcano = FindObject<AActor>(("/Game/Athena/Maps/Athena_POI_Foundations.Athena_POI_Foundations.PersistentLevel.LF_Athena_POI_50x53_Volcano"));
|
||||
ShowFoundation(Volcano);
|
||||
|
||||
@@ -8,7 +8,6 @@
|
||||
#include "DataTableFunctionLibrary.h"
|
||||
#include "FortAthenaMutator_GG.h"
|
||||
#include "FortAthenaMutator_InventoryOverride.h"
|
||||
#include "calendar.h"
|
||||
|
||||
void AGameModeBase::RestartPlayerAtTransform(AController* NewPlayer, FTransform SpawnTransform)
|
||||
{
|
||||
@@ -263,14 +262,5 @@ APawn* AGameModeBase::SpawnDefaultPawnForHook(AGameModeBase* GameMode, AControll
|
||||
|
||||
// LOG_INFO(LogDev, "Finish SpawnDefaultPawnFor!");
|
||||
|
||||
static bool bFirst = Fortnite_Version == 11.31 || Fortnite_Version == 15.10;
|
||||
|
||||
if (bFirst)
|
||||
{
|
||||
bFirst = false;
|
||||
// Calendar::EnableFog();
|
||||
Calendar::SetSnow(100);
|
||||
// Calendar::EnableFog();
|
||||
}
|
||||
return NewPawn;
|
||||
}
|
||||
}
|
||||
@@ -8,7 +8,7 @@ namespace Calendar
|
||||
{
|
||||
static inline bool HasSnowModification()
|
||||
{
|
||||
return Fortnite_Version == 7.30 || Fortnite_Version == 11.31 || Fortnite_Version == 15.10 || Fortnite_Version == 19.10;
|
||||
return Fortnite_Version == 7.30 || Fortnite_Version == 11.31 || Fortnite_Version == 19.10;
|
||||
}
|
||||
|
||||
static inline UObject* GetSnowSetup()
|
||||
@@ -40,42 +40,9 @@ namespace Calendar
|
||||
return -1;
|
||||
}
|
||||
|
||||
static inline void EnableFog()
|
||||
{
|
||||
auto SnowSetup = GetSnowSetup();
|
||||
|
||||
if (SnowSetup)
|
||||
{
|
||||
static auto Onready1 = FindObject<UFunction>(L"/Game/Athena/Apollo/Environments/Blueprints/CalendarEvents/BP_ApolloSnowSetup.BP_ApolloSnowSetup_C.OnReady_E426AA7F4F2319EA06FBA2B9905F0B24");
|
||||
static auto Onready2 = FindObject<UFunction>(L"/Game/Athena/Apollo/Environments/Blueprints/CalendarEvents/BP_ApolloSnowSetup.BP_ApolloSnowSetup_C.OnReady_0A511B314AE165C51798519FB84738B8");
|
||||
static auto refrehsdmap = FindObject<UFunction>(L"/Game/Athena/Apollo/Environments/Blueprints/CalendarEvents/BP_ApolloSnowSetup.BP_ApolloSnowSetup_C:RefreshMapLocations");
|
||||
|
||||
auto GameState = (AFortGameStateAthena*)GetWorld()->GetGameState();
|
||||
|
||||
GET_PLAYLIST(GameState)
|
||||
|
||||
struct { UObject* GameState; UObject* Playlist; FGameplayTagContainer PlaylistContextTags; } OnReadyParams{ GameState, CurrentPlaylist, FGameplayTagContainer()};
|
||||
|
||||
SnowSetup->ProcessEvent(Onready1, &OnReadyParams);
|
||||
SnowSetup->ProcessEvent(Onready2, &OnReadyParams);
|
||||
SnowSetup->ProcessEvent(refrehsdmap); // needed?
|
||||
}
|
||||
}
|
||||
|
||||
static inline void SetSnowfall(float NewValue) // idk bruh i think setsnow also does this math things who knows
|
||||
{
|
||||
static auto SetSnowfallFn = FindObject<UFunction>(L"/Game/Athena/Apollo/Environments/Blueprints/CalendarEvents/BP_ApolloSnowSetup.BP_ApolloSnowSetup_C.SetSnowFall");
|
||||
auto SnowSetup = GetSnowSetup();
|
||||
|
||||
if (SetSnowfallFn && SnowSetup)
|
||||
{
|
||||
SnowSetup->ProcessEvent(SetSnowfallFn, &NewValue);
|
||||
}
|
||||
}
|
||||
|
||||
static inline void SetSnow(float NewValue)
|
||||
{
|
||||
static auto SetSnowFn = FindObject<UFunction>(L"/Game/Athena/Apollo/Environments/Blueprints/CalendarEvents/BP_ApolloSnowSetup.BP_ApolloSnowSetup_C.SetSnow") ? FindObject<UFunction>(L"/Game/Athena/Apollo/Environments/Blueprints/CalendarEvents/BP_ApolloSnowSetup.BP_ApolloSnowSetup_C.SetSnow") :
|
||||
static auto SetSnowFn = FindObject<UFunction>(L"/Game/Athena/Apollo/Environments/Blueprints/CalendarEvents/BP_ApolloSnowSetup.BP_ApolloSnowSetup_C.OnReady_0A511B314AE165C51798519FB84738B8") ? FindObject<UFunction>(L"/Game/Athena/Apollo/Environments/Blueprints/CalendarEvents/BP_ApolloSnowSetup.BP_ApolloSnowSetup_C.OnReady_0A511B314AE165C51798519FB84738B8") :
|
||||
FindObject<UFunction>(L"/Game/Athena/Environments/Landscape/Blueprints/BP_SnowSetup.BP_SnowSetup_C.SetSnow");
|
||||
auto SnowSetup = GetSnowSetup();
|
||||
|
||||
@@ -86,8 +53,6 @@ namespace Calendar
|
||||
auto GameState = (AFortGameStateAthena*)GetWorld()->GetGameState();
|
||||
|
||||
GET_PLAYLIST(GameState)
|
||||
|
||||
/*
|
||||
struct { UObject* GameState; UObject* Playlist; FGameplayTagContainer PlaylistContextTags; } OnReadyParams{ GameState, CurrentPlaylist, FGameplayTagContainer()};
|
||||
|
||||
UFunction* OnReadyFunc = FindObject<UFunction>(L"/Game/Athena/Apollo/Environments/Blueprints/CalendarEvents/BP_ApolloSnowSetup.BP_ApolloSnowSetup_C.OnReady_0A511B314AE165C51798519FB84738B8");
|
||||
@@ -99,14 +64,8 @@ namespace Calendar
|
||||
SnowSetup->ProcessEvent(OnReadyFunc, &OnReadyParams);
|
||||
}
|
||||
|
||||
*/
|
||||
|
||||
LOG_INFO(LogDev, "Called OnReady!");
|
||||
|
||||
SnowSetup->ProcessEvent(SetSnowFn, &NewValue);
|
||||
|
||||
LOG_INFO(LogDev, "Called SetSnow!");
|
||||
|
||||
return;
|
||||
|
||||
if (NewValue != -1)
|
||||
@@ -126,12 +85,6 @@ namespace Calendar
|
||||
|
||||
static auto ada = FindObject<UFunction>(L"/Game/Athena/Apollo/Environments/Blueprints/CalendarEvents/BP_ApolloSnowSetup.BP_ApolloSnowSetup_C.SetFullSnowEd");
|
||||
SnowSetup->ProcessEvent(ada);
|
||||
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
LOG_INFO(LogDev, "Failed TO FIND!");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -919,75 +919,6 @@ void ServerCheatHook(AFortPlayerControllerAthena* PlayerController, FString Msg)
|
||||
Pawn->TeleportTo(FVector(X, Y, Z), Pawn->GetActorRotation());
|
||||
SendMessageToConsole(PlayerController, L"Teleported!");
|
||||
}
|
||||
else if (Command == "fly")
|
||||
{
|
||||
auto Pawn = Cast<APawn>(ReceivingController->GetPawn());
|
||||
|
||||
if (!Pawn)
|
||||
{
|
||||
SendMessageToConsole(PlayerController, L"No pawn found!");
|
||||
return;
|
||||
}
|
||||
|
||||
static auto CharMovementOffset = Pawn->GetOffset("CharacterMovement");
|
||||
if (CharMovementOffset != -1)
|
||||
{
|
||||
auto CharMovement = Pawn->Get<UObject*>(CharMovementOffset);
|
||||
|
||||
static auto MovementOffset = CharMovement->GetOffset("MovementMode", false);
|
||||
if (MovementOffset != -1)
|
||||
{
|
||||
uint8_t MovementMode = CharMovement->Get<uint8_t>(MovementOffset);
|
||||
static auto SetMovementModeFn = FindObject<UFunction>(L"/Script/Engine.CharacterMovementComponent.SetMovementMode");
|
||||
uint8_t NewMode = 1;
|
||||
if (MovementMode != 5)
|
||||
{
|
||||
NewMode = 5;
|
||||
}
|
||||
if (SetMovementModeFn)
|
||||
{
|
||||
CharMovement->ProcessEvent(SetMovementModeFn, &NewMode);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
SendMessageToConsole(PlayerController, L"Movement mode not found!");
|
||||
return;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
SendMessageToConsole(PlayerController, L"Character movement not found!");
|
||||
return;
|
||||
}
|
||||
}
|
||||
else if (Command == "setspeed")
|
||||
{
|
||||
float Speed = 1.0f;
|
||||
|
||||
if (Arguments.size() > 1 && Arguments[1] != " ")
|
||||
{
|
||||
try { Speed = std::stof(Arguments[1]); }
|
||||
catch (...) {}
|
||||
}
|
||||
|
||||
auto Pawn = Cast<APawn>(ReceivingController->GetPawn());
|
||||
|
||||
if (!Pawn)
|
||||
{
|
||||
SendMessageToConsole(PlayerController, L"No pawn to set speed!");
|
||||
return;
|
||||
}
|
||||
|
||||
static auto SetMovementSpeedFn = FindObject<UFunction>(L"/Script/FortniteGame.FortPawn.SetMovementSpeed");
|
||||
SetMovementSpeedFn = SetMovementSpeedFn ? SetMovementSpeedFn : FindObject<UFunction>(L"/Script/FortniteGame.FortPawn.SetMovementSpeedMultiplier"); // extremely clean code that totally works
|
||||
if (!SetMovementSpeedFn)
|
||||
{
|
||||
SendMessageToConsole(PlayerController, L"Function not found!");
|
||||
return;
|
||||
}
|
||||
Pawn->ProcessEvent(SetMovementSpeedFn, &Speed);
|
||||
}
|
||||
else { bSendHelpMessage = true; };
|
||||
}
|
||||
else { bSendHelpMessage = true; };
|
||||
@@ -1018,4 +949,4 @@ If you want to execute a command on a certain player, surround their name (case
|
||||
|
||||
SendMessageToConsole(PlayerController, HelpMessage);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -185,34 +185,6 @@ static inline std::vector<Event> Events =
|
||||
false
|
||||
),
|
||||
Event
|
||||
(
|
||||
"The Showdown",
|
||||
"/Game/Athena/Prototype/Blueprints/Cattus/BP_CattusDoggus_Scripting.BP_CattusDoggus_Scripting_C",
|
||||
"/Game/Athena/Prototype/Blueprints/Cattus/BP_CattusDoggus_Scripting.BP_CattusDoggus_Scripting_C.LoadCattusLevel",
|
||||
1,
|
||||
{
|
||||
{
|
||||
true,
|
||||
"/Game/Athena/Prototype/Blueprints/Cattus/BP_CattusDoggus_Scripting.BP_CattusDoggus_Scripting_C.OnReady_C11CA7624A74FBAEC54753A3C2BD4506"
|
||||
}
|
||||
},
|
||||
{
|
||||
{
|
||||
{
|
||||
true,
|
||||
"/Game/Athena/Prototype/Blueprints/Cattus/BP_CattusDoggus_Scripting.BP_CattusDoggus_Scripting_C.startevent"
|
||||
},
|
||||
|
||||
0
|
||||
}
|
||||
},
|
||||
|
||||
"/Game/Athena/Prototype/Blueprints/Cattus/BP_CattusDoggus_Scripting.BP_CattusDoggus_Scripting_C",
|
||||
"/Game/Athena/Playlists/Music/Playlist_Music_High.Playlist_Music_High",
|
||||
9.41, // also 9.41
|
||||
false
|
||||
),
|
||||
Event
|
||||
(
|
||||
"The Unvaulting",
|
||||
"/Game/Athena/Prototype/Blueprints/White/BP_SnowScripting.BP_SnowScripting_C",
|
||||
@@ -484,7 +456,6 @@ static inline UFortPlaylistAthena* GetEventPlaylist()
|
||||
{
|
||||
if (CurrentEvent.Version == Fortnite_Version)
|
||||
return FindObject<UFortPlaylistAthena>(CurrentEvent.PlaylistName, nullptr, ANY_PACKAGE);
|
||||
|
||||
}
|
||||
|
||||
return nullptr;
|
||||
@@ -853,4 +824,4 @@ static inline bool DoesEventRequireLoading()
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user