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

Merge branch 'master' into Milxnor-master

Browse Source
This commit is contained in:
Gray
2023-12-07 18:36:35 -05:00
committed by GitHub
parent ef54815efc ed8e7ac15a
commit 0267da0367
5 changed files with 4 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Project Reboot 3.0/BuildingContainer.cpp
View File

@@ -15,7 +15,7 @@ bool ABuildingContainer::SpawnLoot(AFortPawn* Pawn)
// idk
/* this->GetActorForwardVector() * this->GetLootSpawnLocation_Athena().X + this->GetActorRightVector() * this->GetLootSpawnLocation_Athena().Y + this->GetActorUpVector() * this->GetLootSpawnLocation_Athena().Z*/
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());

2
Project Reboot 3.0/GameModeBase.cpp
View File

@@ -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)
{
@@ -268,7 +267,6 @@ APawn* AGameModeBase::SpawnDefaultPawnForHook(AGameModeBase* GameMode, AControll
bFirst = false;
Calendar::SetSnow(100);
}
// LOG_INFO(LogDev, "Finish SpawnDefaultPawnFor!");
return NewPawn;

18
Project Reboot 3.0/calendar.h
View File

@@ -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()
@@ -42,7 +42,7 @@ namespace Calendar
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();
@@ -53,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");
@@ -66,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)
@@ -93,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!");
}
}
}

69
Project Reboot 3.0/commands.cpp
View File

@@ -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; };

29
Project Reboot 3.0/events.h
View File

@@ -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;