diff --git a/AsaApi/AsaApi.vcxproj b/AsaApi/AsaApi.vcxproj index 9d3ff60..6ddd901 100644 --- a/AsaApi/AsaApi.vcxproj +++ b/AsaApi/AsaApi.vcxproj @@ -396,8 +396,6 @@ copy "$(SolutionDir)$(PlatformName)\$(ConfigurationName)\$(ProjectName).pdb" "F: - - diff --git a/AsaApi/Core/Private/UE/UE.cpp b/AsaApi/Core/Private/UE/UE.cpp index d7b3e74..bc19797 100644 --- a/AsaApi/Core/Private/UE/UE.cpp +++ b/AsaApi/Core/Private/UE/UE.cpp @@ -1,3 +1,4 @@ +// ReSharper disable CppInconsistentNaming #include "API/ARK/Ark.h" #include "API/ARK/UE.h" @@ -9,4 +10,9 @@ ARK_API FProperty* UObject::FindProperty(FName name) return Property; } return nullptr; -} \ No newline at end of file +} + +bool UObjectBaseUtility::IsA(const UClass* base) +{ + return this->ClassPrivateField()->IsChildOf(base); +} diff --git a/AsaApi/Core/Public/API/ARK/Actor.h b/AsaApi/Core/Public/API/ARK/Actor.h index ed23460..0b86834 100644 --- a/AsaApi/Core/Public/API/ARK/Actor.h +++ b/AsaApi/Core/Public/API/ARK/Actor.h @@ -1377,8 +1377,24 @@ struct UInstancedStaticMeshComponent : UStaticMeshComponent void ReceiveComponentDamage(float DamageAmount, const FDamageEvent* DamageEvent, AController* EventInstigator, AActor* DamageCauser) { NativeCall(this, "UInstancedStaticMeshComponent.ReceiveComponentDamage(float,FDamageEvent&,AController*,AActor*)", DamageAmount, DamageEvent, EventInstigator, DamageCauser); } }; -struct AActor : UPrimalActor, ActorExtensions +struct AActor : UPrimalActor { + // Start AsaApi Extensions + FORCEINLINE FVector GetActorForwardVector() + { + if (USceneComponent* root_component = RootComponentField()) + return root_component->ComponentToWorldField().GetUnitAxis(EAxis::X); + return FVector::ZeroVector; + } + + FORCEINLINE FVector GetLocation() + { + if (const auto& root = RootComponentField()) + return root->ComponentToWorldField().GetLocation(); + return FVector::ZeroVector; + } + // End AsaApi Extensions + // Fields FActorTickFunction& PrimaryActorTickField() { return *GetNativePointerField(this, "AActor.PrimaryActorTick"); } @@ -1957,7 +1973,15 @@ struct AInfo : AActor }; struct UPlayer : UObject { - TObjectPtr& PlayerControllerField() { return *GetNativePointerField*>(this, "UPlayer.PlayerController"); } + // Start AsaApi Extensions + FString ConsoleCommand(const FString& Command, bool bWriteToLog) + { + FString result = *ConsoleCommand(&result, &Command, bWriteToLog); + return result; + } + // End AsaApi Extensions + + TObjectPtr& PlayerControllerField() { return *GetNativePointerField*>(this, "UPlayer.PlayerController"); } // int CurrentNetSpeed; // int ConfiguredInternetSpeed; // int ConfiguredLanSpeed; @@ -2584,7 +2608,7 @@ struct APrimalController : AController }; -struct APlayerController : APrimalController, PlayerControllerExtensions +struct APlayerController : APrimalController { // Fields @@ -3056,8 +3080,45 @@ struct ABasePlayerController : APrimalPlayerController struct AShooterPlayerController : ABasePlayerController { - // Fields +public: + // Start AsaApi Extensions + FString GetPlayerCharacterName() + { + FString player_name = *GetPlayerCharacterName(&player_name); + return player_name; + } + + FString GetUniqueNetIdAsString() + { + FString unique_id = *GetUniqueNetIdAsString(&unique_id); + return unique_id; + } + void ClientServerChatDirectMessage(const FString& MessageText, FLinearColor MessageColor, bool bIsBold, const FString& SenderId) + { + ClientServerChatDirectMessage(&MessageText, MessageColor, bIsBold, &SenderId); + } + + void ClientServerNotification(const FString& MessageText, FLinearColor MessageColor, float DisplayScale, float DisplayTime, UTexture2D* MessageIcon, USoundBase* SoundToPlay, int Priority) + { + ClientServerNotification(&MessageText, MessageColor, DisplayScale, DisplayTime, MessageIcon, SoundToPlay, Priority); + } + + FString ConsoleCommand(const FString& Command, bool bWriteToLog) + { + FString result = *ConsoleCommand(&result, &Command, bWriteToLog); + return result; + } + + void RunHiddenCommand(const FString& Command) + { + this->PlayerField().Get()->ConsoleCommand(Command, false); + } + + + // End AsaApi Extensions + + // Fields UPaintingStreamingComponent*& PaintingStreamingComponentField() { return *GetNativePointerField(this, "AShooterPlayerController.PaintingStreamingComponent"); } FieldArray HeldItemSlotField() { return { this, "AShooterPlayerController.HeldItemSlot" }; } FieldArray UsedItemSlotField() { return { this, "AShooterPlayerController.UsedItemSlot" }; } diff --git a/AsaApi/Core/Public/API/ARK/Ark.h b/AsaApi/Core/Public/API/ARK/Ark.h index 4cb84c4..0508753 100644 --- a/AsaApi/Core/Public/API/ARK/Ark.h +++ b/AsaApi/Core/Public/API/ARK/Ark.h @@ -25,7 +25,6 @@ #include "../UE/Math/ColorList.h" #include "UE.h" -#include "ExtensionsDeclaration.h" //#include "Tribe.h" #include "Actor.h" #include "Other.h" @@ -40,4 +39,3 @@ #include "../../ICommands.h" #include "IHooks.h" #include "Tools.h" -#include "ExtensionsDefinition.h" diff --git a/AsaApi/Core/Public/API/ARK/ExtensionsDeclaration.h b/AsaApi/Core/Public/API/ARK/ExtensionsDeclaration.h deleted file mode 100644 index 236ef5b..0000000 --- a/AsaApi/Core/Public/API/ARK/ExtensionsDeclaration.h +++ /dev/null @@ -1,36 +0,0 @@ -#pragma once - -#include "UE.h" -#include -#include - -struct ActorExtensions -{ - /** - * \brief Returns the forward direction vector (length 1.0) from the actor's point of view. - * \return The forward direction vector (length 1.0) from the actor's point of view. - */ - FVector GetActorForwardVector(); - - /** - * \brief Returns if the actor is from SomeBase or a subclass of SomeBase. - * \param SomeBase The base class to check against. - * \return true if the actor is from SomeBase or a subclass of SomeBase. - */ - bool IsA(UClass* SomeBase); - - /** - * \brief Returns the actor's location in world space. - * \return The actor's location in world space. - */ - FVector GetLocation(); -}; - -struct PlayerControllerExtensions -{ - /** - * \brief Returns the player's EOS id (platform unique identifier) - * \return The player's EOS id (platform unique identifier) - */ - FString GetEOSId(); -}; \ No newline at end of file diff --git a/AsaApi/Core/Public/API/ARK/ExtensionsDefinition.h b/AsaApi/Core/Public/API/ARK/ExtensionsDefinition.h deleted file mode 100644 index 3068c68..0000000 --- a/AsaApi/Core/Public/API/ARK/ExtensionsDefinition.h +++ /dev/null @@ -1,45 +0,0 @@ -#pragma once - -#include "../../IApiUtils.h" - -// Actor extensions - -FORCEINLINE FVector ActorExtensions::GetActorForwardVector() -{ - AActor* _this = static_cast(this); - USceneComponent* RootComponent = _this->RootComponentField().Get(); - if (RootComponent) - { - return RootComponent->ComponentToWorldField().GetUnitAxis(EAxis::X); - } - - //return FVector::ZeroVector; - return FVector(0, 0, 0); -} - -FORCEINLINE bool ActorExtensions::IsA(UClass* SomeBase) -{ - return static_cast(this)->ClassPrivateField()->IsChildOf(SomeBase); -} - -FORCEINLINE FVector ActorExtensions::GetLocation() -{ - AActor* _this = static_cast(this); - auto* root = _this->RootComponentField().Get(); - if (root) - { - UE::Math::TTransform transform = root->ComponentToWorldField(); - return transform.GetLocation(); - } - return FVector(); -} - -// Player Controller Extensions - -FORCEINLINE FString PlayerControllerExtensions::GetEOSId() -{ - AShooterPlayerController* _this = static_cast(this); - FString eos_id = ""; - _this->GetUniqueNetIdAsString(&eos_id); - return eos_id; -} \ No newline at end of file diff --git a/AsaApi/Core/Public/API/ARK/GameMode.h b/AsaApi/Core/Public/API/ARK/GameMode.h index 4eb9ca5..ad5366f 100644 --- a/AsaApi/Core/Public/API/ARK/GameMode.h +++ b/AsaApi/Core/Public/API/ARK/GameMode.h @@ -1225,6 +1225,13 @@ struct UPrimalGlobals : UObject struct FMapData { + UE4_SizeOf(128); + + FMapData() + { + UE4_CheckSize(FMapData); + NativeCall(this, "FMapData.FMapData()"); + } // Fields FString& MapNameField() { return *GetNativePointerField(this, "FMapData.MapName"); } diff --git a/AsaApi/Core/Public/API/ARK/Other.h b/AsaApi/Core/Public/API/ARK/Other.h index 5200f75..6401fa7 100644 --- a/AsaApi/Core/Public/API/ARK/Other.h +++ b/AsaApi/Core/Public/API/ARK/Other.h @@ -1900,10 +1900,35 @@ struct FItemMultiplier static UScriptStruct* StaticStruct() { return NativeCall(nullptr, "FItemMultiplier.StaticStruct()"); } }; +#define UE4_SizeOf(size) \ + constexpr static std::size_t size_of = size; \ + char storage[size_of] = { 0 }; + +#define UE4_CheckSize(Name) \ + { \ + const std::ptrdiff_t size_diff = size_of - GetStructSize(); \ + if(size_diff < 0) \ + { \ + Log::GetLog()->critical(#Name" will overrun ({} bytes smaller), please report this.", std::abs(size_diff)); \ + throw std::overflow_error(#Name" is not sufficiently sized."); \ + } \ + if (size_diff > 0) \ + { \ + Log::GetLog()->warn(#Name" exceeds real size ({} bytes larger), please report this.", std::abs(size_diff)); \ + throw std::underflow_error(#Name" is not sufficiently sized."); \ + } \ + } + + struct FItemNetInfo { + UE4_SizeOf(528); + FItemNetInfo() + { + UE4_CheckSize(FItemNetInfo); + NativeCall(this, "FItemNetInfo.FItemNetInfo()"); + } // Fields - TSubclassOf& ItemArchetypeField() { return *GetNativePointerField*>(this, "FItemNetInfo.ItemArchetype"); } FItemNetID& ItemIDField() { return *GetNativePointerField(this, "FItemNetInfo.ItemID"); } unsigned int& ItemQuantityField() { return *GetNativePointerField(this, "FItemNetInfo.ItemQuantity"); } @@ -1976,6 +2001,8 @@ struct FItemNetInfo bool NetSerialize(FArchive* Ar, UPackageMap* Map, bool* bOutSuccess) { return NativeCall(this, "FItemNetInfo.NetSerialize(FArchive&,UPackageMap*,bool&)", Ar, Map, bOutSuccess); } }; + + struct FItemSetup { // Fields diff --git a/AsaApi/Core/Public/API/ARK/UE.h b/AsaApi/Core/Public/API/ARK/UE.h index d78d32e..7f4e4a7 100644 --- a/AsaApi/Core/Public/API/ARK/UE.h +++ b/AsaApi/Core/Public/API/ARK/UE.h @@ -1,5 +1,5 @@ #pragma once - +// ReSharper disable CppInconsistentNaming #ifdef ARK_EXPORTS #define ARK_API __declspec(dllexport) #else @@ -251,6 +251,14 @@ struct UObjectBase struct UObjectBaseUtility : UObjectBase { + // Start AsaApi Extensions + bool IsA(const UClass* base); + template + bool IsA() + { + return IsA(T::StaticClass()); + } + // End AsaApi Extensions // Fields @@ -1507,6 +1515,12 @@ int GetStructSize() // Credits to Substitute#0001 for the idea int size = 0; UScriptStruct* staticStruct = T::StaticStruct(); + + size = staticStruct ? staticStruct->PropertiesSizeField() : 0; + + printf("The size of this struct is %d bytes.", size); + return size; + if (staticStruct) { return staticStruct->PropertiesSizeField(); diff --git a/AsaApi/Core/Public/API/UE/Math/Rotator.h b/AsaApi/Core/Public/API/UE/Math/Rotator.h index e663c28..1d7b79c 100644 --- a/AsaApi/Core/Public/API/UE/Math/Rotator.h +++ b/AsaApi/Core/Public/API/UE/Math/Rotator.h @@ -471,6 +471,11 @@ struct TRotator explicit TRotator(const TRotator& From) : TRotator((T)From.Pitch, (T)From.Yaw, (T)From.Roll) {} }; + +template +inline const TRotator TRotator::ZeroRotator = { 0,0,0 }; + + #if !defined(_MSC_VER) || defined(__clang__) // MSVC can't forward declare explicit specializations template<> const FRotator3f FRotator3f::ZeroRotator; template<> const FRotator3d FRotator3d::ZeroRotator; diff --git a/AsaApi/Core/Public/API/UE/Math/Vector.h b/AsaApi/Core/Public/API/UE/Math/Vector.h index 5fa5690..b182485 100644 --- a/AsaApi/Core/Public/API/UE/Math/Vector.h +++ b/AsaApi/Core/Public/API/UE/Math/Vector.h @@ -73,7 +73,7 @@ struct TVector }; /** A zero vector (0,0,0) */ - static const TVector ZeroVector; + static const TVector ZeroVector; /** One vector (1,1,1) */ static const TVector OneVector; @@ -1184,6 +1184,40 @@ struct TVector explicit TVector(const TVector& From) : TVector((T)From.X, (T)From.Y, (T)From.Z) {} }; + +template +inline const TVector TVector::ZeroVector = { 0,0,0 }; + +template +inline const TVector TVector::OneVector = { 1,1,1 }; + +template +inline const TVector TVector::UpVector = { 0,0,1 }; + +template +inline const TVector TVector::DownVector = { 0,0,-1 }; + +template +inline const TVector TVector::ForwardVector = { 1,0,0 }; + +template +inline const TVector TVector::BackwardVector = { -1,0,0 }; + +template +inline const TVector TVector::RightVector = { 0,1,0 }; + +template +inline const TVector TVector::LeftVector = { 0,-1,0 }; + +template +inline const TVector TVector::XAxisVector = { 1,0,0 }; + +template +inline const TVector TVector::YAxisVector = { 0,1,0 }; + +template +inline const TVector TVector::ZAxisVector = { 0,0,1 }; + /** * Structured archive slot serializer for FVector3f. * diff --git a/AsaApi/Core/Public/Ark/ArkApiUtils.h b/AsaApi/Core/Public/Ark/ArkApiUtils.h index 6b6c150..85fd277 100644 --- a/AsaApi/Core/Public/Ark/ArkApiUtils.h +++ b/AsaApi/Core/Public/Ark/ArkApiUtils.h @@ -1,3 +1,4 @@ +// ReSharper disable CppClangTidyCppcoreguidelinesProTypeStaticCastDowncast #pragma once #include @@ -7,9 +8,26 @@ #include "MessagingManager.h" #include "API/Helpers/Helpers.h" +namespace AsaApi::IApiUtils_Next +{ + FORCEINLINE FString GetSteamName(AController& player_controller) + { + if (const auto& player_state = player_controller.PlayerStateField()) + return player_state->PlayerNamePrivateField(); + return ""; + } + + FORCEINLINE FString GetSteamName(AController* player_controller) + { + if (!player_controller) + return ""; + return GetSteamName(*player_controller); + } +} + namespace AsaApi { - enum class ServerStatus { Loading, Ready }; + enum class ServerStatus { Loading = 0, Ready = 1 }; struct MapCoords { @@ -139,17 +157,23 @@ namespace AsaApi /** * \brief Returns EOS ID from player controller */ - static FORCEINLINE FString GetEOSIDFromController(AController* controller) + static FORCEINLINE FString GetEOSIDFromController(AController& controller) { FString eos_id = ""; - - AShooterPlayerController* playerController = static_cast(controller); - if (playerController != nullptr) - playerController->GetUniqueNetIdAsString(&eos_id); - + static_cast(controller).GetUniqueNetIdAsString(&eos_id); return eos_id; } + /** + * \brief Returns EOS ID from player controller + */ + static FORCEINLINE FString GetEOSIDFromController(AController* controller) + { + if (!controller) + return ""; + return GetEOSIDFromController(*controller); + } + /** * \brief Finds player from the given platform name (can be steam, Playstation, Xbox, etc...) * \param steam_name Platform name @@ -157,21 +181,18 @@ namespace AsaApi */ FORCEINLINE AShooterPlayerController* FindPlayerFromPlatformName(const FString& steam_name) const { - AShooterPlayerController* result = nullptr; - const auto& player_controllers = GetWorld()->PlayerControllerListField(); - for (TWeakObjectPtr player_controller : player_controllers) + for (const auto& player_controllers = GetWorld()->PlayerControllerListField(); auto player_controller_weak : player_controllers) { - const FString current_name = player_controller->PlayerStateField()->PlayerNamePrivateField(); - if (current_name == steam_name) - { - auto* shooter_pc = static_cast(player_controller.Get()); + APlayerController* player_controller = player_controller_weak.Get(); - result = shooter_pc; - break; - } + if (!player_controller || !player_controller->PlayerStateField()) + continue; + + if (steam_name == player_controller->PlayerStateField()->PlayerNamePrivateField()) + return static_cast(player_controller); } - return result; + return nullptr; } /** @@ -179,14 +200,24 @@ namespace AsaApi * \param character Player character * \return Pointer to AShooterPlayerController */ - FORCEINLINE AShooterPlayerController* FindControllerFromCharacter(AShooterCharacter* character) const + FORCEINLINE AShooterPlayerController* FindControllerFromCharacter(AShooterCharacter& character) const { - AShooterPlayerController* result = nullptr; + if (character.IsDead()) + return nullptr; + return static_cast(character.GetOwnerController()); - if (character != nullptr && !character->IsDead()) - result = (AShooterPlayerController*)(character->GetOwnerController()); + } - return result; + /** + * \brief Finds player controller from the given player character + * \param character Player character + * \return Pointer to AShooterPlayerController + */ + FORCEINLINE AShooterPlayerController* FindControllerFromCharacter(AShooterCharacter* character) const + { + if (!character) + return nullptr; + return FindControllerFromCharacter(*character); } /** @@ -217,20 +248,36 @@ namespace AsaApi return found_players; } + + /** + * \brief Returns the character name of player + * \param player_controller Player + */ + static FORCEINLINE FString GetCharacterName(AShooterPlayerController& player_controller) + { + return player_controller.GetPlayerCharacterName(); + } + /** * \brief Returns the character name of player * \param player_controller Player */ static FORCEINLINE FString GetCharacterName(AShooterPlayerController* player_controller) { - if (player_controller != nullptr) - { - FString player_name(""); - player_controller->GetPlayerCharacterName(&player_name); - return player_name; - } + if (!player_controller) + return ""; + return GetCharacterName(*player_controller); + } - return FString(""); + /** + * \brief Returns the steam name of player + * \param player_controller Player + */ + static FORCEINLINE FString GetSteamName(AController& player_controller) + { + if (const auto& player_state = player_controller.PlayerStateField()) + return player_state->PlayerNamePrivateField(); + return ""; } /** @@ -239,7 +286,9 @@ namespace AsaApi */ static FORCEINLINE FString GetSteamName(AController* player_controller) { - return player_controller != nullptr ? player_controller->PlayerStateField()->PlayerNamePrivateField() : ""; + if (!player_controller) + return ""; + return GetSteamName(*player_controller); } /** @@ -252,50 +301,59 @@ namespace AsaApi return FindPlayerFromEOSID_Internal(eos_id); } + /** * \brief Spawns an item drop * \param blueprint Item simplified BP * Example: '/Game/PrimalEarth/CoreBlueprints/Items/Armor/Riot/PrimalItemArmor_RiotPants.PrimalItemArmor_RiotPants_C' - * \param pos Spawn position + * \param position Spawn position * \param amount Quantity * \param item_quality Quality * \param force_blueprint Is blueprint * \param life_span Life span * \return Returns true if drop was spawned, false otherwise */ - FORCEINLINE bool SpawnDrop(const wchar_t* blueprint, FVector pos, int amount, float item_quality = 0.0f, - bool force_blueprint = false, float life_span = 0.0f) const + FORCEINLINE bool SpawnDrop(const FString& blueprint, const FVector& position, const int amount, const float item_quality = 0.0f, const bool force_blueprint = false, const float life_span = 0.0f) const { - APlayerController* player = GetWorld()->GetFirstPlayerController(); + const auto player = GetWorld()->GetFirstPlayerController(); if (!player) return false; - FString bpFstr(blueprint); - - TSubclassOf archetype; - UVictoryCore::StringReferenceToClass(&archetype, &bpFstr); - - UPrimalItem* item = UPrimalItem::AddNewItem(archetype.uClass, nullptr, false, false, item_quality, false, amount, force_blueprint, 0, false, nullptr, 0, 0, 0, true); + TSubclassOf item_archetype; + // This is ugly, we should properly ensure that T is convertible to UObject + UVictoryCore::StringReferenceToClass(std::bit_cast*>(&item_archetype), &blueprint); + UPrimalItem* item = UPrimalItem::AddNewItem(item_archetype.uClass, nullptr, false, false, item_quality, false, amount, force_blueprint, 0, false, nullptr, 0, false, false, true); if (!item) return false; - FItemNetInfo* info = AllocateStruct(); - - item->GetItemNetInfo(info, false); + FItemNetInfo info; - TSubclassOf archetype_dropped; - archetype_dropped.uClass = archetype.uClass; + item->GetItemNetInfo(&info, false); - FVector zero_vector{ 0, 0, 0 }; - FRotator rot{ 0, 0, 0 }; + UPrimalInventoryComponent::StaticDropItem(player, &info, item_archetype, &FRotator::ZeroRotator, true, &position, &FRotator::ZeroRotator, true, false, false, true, nullptr, &FVector::ZeroVector, nullptr, life_span); - UPrimalInventoryComponent::StaticDropItem(player, info, archetype_dropped, &rot, true, &pos, &rot, true, false, false, true, nullptr, &zero_vector, nullptr, life_span); - - FreeStruct(info); return true; } + /** + * \brief Spawns an item drop + * \param blueprint Item simplified BP + * Example: '/Game/PrimalEarth/CoreBlueprints/Items/Armor/Riot/PrimalItemArmor_RiotPants.PrimalItemArmor_RiotPants_C' + * \param pos Spawn position + * \param amount Quantity + * \param item_quality Quality + * \param force_blueprint Is blueprint + * \param life_span Life span + * \return Returns true if drop was spawned, false otherwise + */ + FORCEINLINE bool SpawnDrop(const wchar_t* blueprint, FVector pos, int amount, float item_quality = 0.0f, bool force_blueprint = false, float life_span = 0.0f) const + { + return SpawnDrop(FString(blueprint), pos, amount, item_quality, force_blueprint, life_span); + } + + + /** * \brief Spawns a dino near player or at specific coordinates * \param player Player. If null, random player will be chosen. At least one player should be on the map @@ -359,36 +417,92 @@ namespace AsaApi return nullptr; } + /** + * \brief Returns true if character is riding a dino, false otherwise + * \param player_controller Player + */ + static FORCEINLINE bool IsRidingDino(AShooterPlayerController& player_controller) + { + return !!GetRidingDino(player_controller); + } + /** * \brief Returns true if character is riding a dino, false otherwise * \param player_controller Player */ static FORCEINLINE bool IsRidingDino(AShooterPlayerController* player_controller) { - return player_controller != nullptr && player_controller->GetPlayerCharacter() != nullptr - && player_controller->GetPlayerCharacter()->GetRidingDino() != nullptr; + if (!player_controller) + return false; + return IsRidingDino(*player_controller); } /** * \brief Returns the dino the character is riding - * \param player_controller Player + * \param player_controller AShooterPlayerController& + * \return APrimalDinoCharacter* + */ + static FORCEINLINE APrimalDinoCharacter* GetRidingDino(AShooterPlayerController& player_controller) + { + const auto& player_character = player_controller.GetPlayerCharacter(); + return player_character ? player_character->GetRidingDino() : nullptr; + } + + /** + * \brief Returns the dino the character is riding + * \param player_controller AShooterPlayerController* * \return APrimalDinoCharacter* */ static FORCEINLINE APrimalDinoCharacter* GetRidingDino(AShooterPlayerController* player_controller) { - return player_controller != nullptr && player_controller->GetPlayerCharacter() != nullptr - ? player_controller->GetPlayerCharacter()->GetRidingDino() - : nullptr; + return player_controller ? GetRidingDino(*player_controller) : nullptr; } /** * \brief Returns the position of a player - * \param player_controller Player + * \param player_controller APlayerController& + * \return FVector + */ + static FORCEINLINE FVector GetPosition(APlayerController& player_controller) + { + const auto& player_pawn = player_controller.PawnField(); + if (!player_pawn) + return FVector::ZeroVector; + + return player_pawn->RootComponentField()->RelativeLocationField(); + } + + /** + * \brief Returns the position of a player + * \param player_controller APlayerController* * \return FVector */ static FORCEINLINE FVector GetPosition(APlayerController* player_controller) { - return player_controller != nullptr && player_controller->PawnField() != nullptr ? player_controller->PawnField()->RootComponentField()->RelativeLocationField() : FVector{0, 0, 0}; + if (!player_controller) + return FVector::ZeroVector; + return GetPosition(*player_controller); + } + + static FORCEINLINE bool TeleportToPos(AShooterPlayerController& player_controller, const FVector& position) + { + if (IsPlayerDead(player_controller)) + return false; + player_controller.SetPlayerPos(position.X, position.Y, position.Z); + return true; + } + + /** + * \brief Teleports player to the given position + * \param player_controller Player + * \param pos New position + */ + static FORCEINLINE bool TeleportToPos(AShooterPlayerController* player_controller, const FVector& pos) + { + if (!player_controller) + return false; + + return TeleportToPos(*player_controller, pos); } /** @@ -398,53 +512,49 @@ namespace AsaApi * \param check_for_dino If set true prevents players teleporting with dino's or teleporting to a player on a dino * \param max_dist Is the max distance the characters can be away from each other -1 is disabled */ - static FORCEINLINE std::optional TeleportToPlayer(AShooterPlayerController* me, AShooterPlayerController* him, - bool check_for_dino, float max_dist) + static FORCEINLINE std::optional TeleportToPlayer(AShooterPlayerController& source, AShooterPlayerController& destination, bool check_for_dino = false, float max_dist = -1) { - FVector him_position = GetPosition(him); - if (!(me != nullptr && him != nullptr && me->GetPlayerCharacter() != nullptr && him-> - GetPlayerCharacter() - != nullptr - && !me->GetPlayerCharacter()->IsDead() && !him->GetPlayerCharacter()->IsDead()) - ) - { - return "One of players is dead"; - } + if (IsPlayerDead(source)) + return "Source Player is dead."; - if (check_for_dino && (IsRidingDino(me) || IsRidingDino(him))) - { - return "One of players is riding a dino"; - } + if (IsPlayerDead(destination)) + return "Destination Player is dead."; - if (max_dist != -1 && FVector::Distance(GetPosition(me), him_position) > max_dist) - { - return "Person is too far away"; - } + if (check_for_dino && IsRidingDino(source)) + return "Source Player is riding a dino."; - if (him_position.IsNearlyZero()) - { - return "Player location is invalid"; - } + if (check_for_dino && IsRidingDino(destination)) + return "Destination Player is riding a dino."; + + const FVector source_position = GetPosition(source); + const FVector destination_position = GetPosition(destination); - me->SetPlayerPos((float)him_position.X, (float)him_position.Y, (float)him_position.Z); + if (destination_position.IsNearlyZero()) + return "Destination Location is invalid."; + if (max_dist != -1 && FVector::Distance(source_position, destination_position) > max_dist) + return "Distance between Players is too great."; + + TeleportToPos(source, destination_position); return {}; } /** - * \brief Teleports player to the given position - * \param player_controller Player - * \param pos New position + * \brief Teleport one player to another + * \param me Player + * \param him Other Player + * \param check_for_dino If set true prevents players teleporting with dino's or teleporting to a player on a dino + * \param max_dist Is the max distance the characters can be away from each other -1 is disabled */ - static FORCEINLINE bool TeleportToPos(AShooterPlayerController* player_controller, const FVector& pos) + static FORCEINLINE std::optional TeleportToPlayer(AShooterPlayerController* source, AShooterPlayerController* destination, bool check_for_dino, float max_dist) { - if (player_controller != nullptr && !IsPlayerDead(player_controller)) - { - player_controller->SetPlayerPos((float)pos.X, (float)pos.Y, (float)pos.Z); - return true; - } - return false; + if (!source) + return "Source Player Controller is null."; + + if (!destination) + return "Destination Player Controller is null."; + return TeleportToPlayer(*source, *destination, check_for_dino, max_dist); } /** @@ -483,15 +593,24 @@ namespace AsaApi return item_count; } + /** + * \brief Returns IP address of player + */ + static FORCEINLINE FString GetIPAddress(AShooterPlayerController& player) + { + FString address {}; + player.GetPlayerNetworkAddress(&address); + return address; + } + /** * \brief Returns IP address of player */ static FORCEINLINE FString GetIPAddress(AShooterPlayerController* player) { - FString addr; - if (player) - player->GetPlayerNetworkAddress(&addr); - return addr; + if (!player) + return ""; // Should we replace this with a sane legal value, such as 255.255.255.255? + return GetIPAddress(*player); } /** @@ -505,14 +624,22 @@ namespace AsaApi /** * \brief Returns true if player is dead, false otherwise */ - static FORCEINLINE bool IsPlayerDead(AShooterPlayerController* player) + static FORCEINLINE bool IsPlayerDead(AShooterPlayerController& player) { - if (player == nullptr || player->GetPlayerCharacter() == nullptr) - { + const auto player_character = player.GetPlayerCharacter(); + if (!player_character) return true; - } + return player_character->IsDead(); + } - return player->GetPlayerCharacter()->IsDead(); + /** + * \brief Returns true if player is dead, false otherwise + */ + static FORCEINLINE bool IsPlayerDead(AShooterPlayerController* player) + { + if (!player) + return true; + return IsPlayerDead(*player); } static FORCEINLINE uint64 GetPlayerID(APrimalCharacter* character) @@ -523,10 +650,16 @@ namespace AsaApi : 0; } + static FORCEINLINE uint64 GetPlayerID(AController& controller) + { + return static_cast(controller).LinkedPlayerIDField(); + } + static FORCEINLINE uint64 GetPlayerID(AController* controller) { - auto* player = static_cast(controller); - return player != nullptr ? player->LinkedPlayerIDField() : 0; + if (!controller) + return 0; + return GetPlayerID(*controller); } FORCEINLINE const FString GetEOSIDForPlayerID(int player_id) @@ -561,37 +694,46 @@ namespace AsaApi return eos_id; } + static FORCEINLINE FString GetBlueprint(UObjectBase& object) + { + const auto class_field = object.ClassPrivateField(); + if (!class_field) + return ""; + return GetClassBlueprint(class_field).Replace(L"Default__", L"", ESearchCase::CaseSensitive); + } + /** * \brief Returns blueprint path from any UObject */ static FORCEINLINE FString GetBlueprint(UObjectBase* object) { - if (object != nullptr && object->ClassPrivateField() != nullptr) - { - FString path_name = GetClassBlueprint(object->ClassPrivateField()); - return path_name.Replace(L"Default__", L"", ESearchCase::CaseSensitive); - } - - return FString(""); + if (!object) + return ""; + return GetBlueprint(*object); } /** * \brief Returns blueprint path from any UClass */ - static FORCEINLINE FString GetClassBlueprint(UClass* the_class) + static FORCEINLINE FString GetClassBlueprint(UClass& the_class) { - if (the_class != nullptr) - { - FString path; - auto the_object = UVictoryCore::GetClassDefaultObject(the_class); - the_object->GetPathName(nullptr, &path); - if (path.EndsWith("_C")) - return "Blueprint'" + path.LeftChop(2) + "'"; - else - return "Blueprint'" + path + "'"; - } + FString path; + UVictoryCore::GetClassDefaultObject(&the_class)->GetPathName(nullptr, &path); + + if (path.EndsWith("_C")) + path = path.LeftChop(2); - return FString(""); + return "Blueprint'" + path + "'"; + } + + /** + * \brief Returns blueprint path from any UClass + */ + static FORCEINLINE FString GetClassBlueprint(UClass* the_class) + { + if (!the_class) + return ""; + return GetClassBlueprint(*the_class); } /** @@ -685,50 +827,56 @@ namespace AsaApi return out_actors; } + FORCEINLINE UMinimapData& GetMinimapData() const + { + constexpr auto default_path = "Blueprint'/Game/ASA/Minimap/Core/MinimapData_Base.MinimapData_Base'"; + APrimalWorldSettings& world_settings = *static_cast(GetWorld()->GetWorldSettings(false, true)); + + if(world_settings.CurrentMinimapDataField().uClass) + return *static_cast(world_settings.CurrentMinimapDataField().uClass->GetDefaultObject(true)); + + return *static_cast(UVictoryCore::BPLoadClass(default_path)->GetDefaultObject(true)); + } + + FORCEINLINE FMapData& GetMapDataFromMiniMap(UMinimapData& minimap_data, const FVector& reference_point = FVector::ZeroVector) const + { + if (minimap_data.MinimapDataField().Num() == 1) + return *minimap_data.MinimapDataField().GetData(); + + for (auto& data : minimap_data.MinimapDataField()) + { + if (PointIntersectsRectangle(reference_point, data.PlayableMinField(), data.PlayableMaxField())) + return data; + } + + throw std::invalid_argument("Unable To Find MapData."); + } + /** * \brief Converts FVector into coords that are displayed when you view the ingame map */ - FORCEINLINE MapCoords FVectorToCoords(FVector actor_position) + FORCEINLINE MapCoords FVectorToCoords(const FVector& position) const { - MapCoords coords; - AWorldSettings* world_settings = GetWorld()->GetWorldSettings(false, true); - APrimalWorldSettings* p_world_settings = static_cast(world_settings); + constexpr auto max = 100.f; + constexpr auto min = 0.f; - UMinimapData* minimap_data = nullptr; - if (p_world_settings->CurrentMinimapDataField().uClass) - minimap_data = static_cast(p_world_settings->CurrentMinimapDataField().uClass->GetDefaultObject(true)); - else - minimap_data = static_cast(UVictoryCore::BPLoadClass("Blueprint'/Game/ASA/Minimap/Core/MinimapData_Base.MinimapData_Base'")->GetDefaultObject(true)); + auto& minimap = GetMinimapData(); + auto& map_data = GetMapDataFromMiniMap(minimap, position); - FMapData* map_data = nullptr; - if (minimap_data->MinimapDataField().Num() == 1) - map_data = minimap_data->MinimapDataField().GetData(); - else - { - const int FMapDataSize = GetStructSize(); - for (int i = 0; i < minimap_data->MinimapDataField().Num(); i++) - { - FMapData* data = minimap_data->MinimapDataField().GetData() + (i * FMapDataSize); - - if (actor_position.X < data->PlayableMaxField().X - && actor_position.Y < data->PlayableMaxField().Y - && actor_position.X > data->PlayableMinField().X - && actor_position.Y > data->PlayableMinField().Y - && actor_position.Z < data->PlayableMaxField().Z - && actor_position.Z > data->PlayableMinField().Z) - { - map_data = data; - break; - } - } - } + const auto& map_min = map_data.OriginMinField(); + const auto& map_max = map_data.OriginMaxField(); + const auto& projected = (map_max - position) / (map_max - map_min); - double xAlpha = (actor_position.X - map_data->OriginMaxField().X) / (map_data->OriginMinField().X - map_data->OriginMaxField().X); - double yAlpha = (actor_position.Y - map_data->OriginMaxField().Y) / (map_data->OriginMinField().Y - map_data->OriginMaxField().Y); + return { FMath::Lerp(max, min, projected.X), FMath::Lerp(max, min, projected.Y) }; + + } - coords.x = (float)FMath::Lerp(100.0, 0.0, xAlpha); - coords.y = (float)FMath::Lerp(100.0, 0.0, yAlpha); - return coords; + // N.B., we should use dot projection here as not all rects are axis aligned. + FORCEINLINE bool PointIntersectsRectangle(const FVector& position, const FVector& start, const FVector& end) const + { + return + start.X < position.X && position.X < end.X && + start.Y < position.Y && position.Y < end.Y; } /** @@ -783,12 +931,19 @@ namespace AsaApi * \param _this Player controller * \param Command Command to run */ - void RunHiddenCommand(AShooterPlayerController* _this, FString* Command) + void RunHiddenCommand(AShooterPlayerController* _this, const FString* Command) const + { + _this->RunHiddenCommand(*Command); + } + + /** + * \brief Runs a command that is not logged anywhere + * \param _this Player controller + * \param Command Command to run + */ + void RunHiddenCommand(AShooterPlayerController* _this, const FString& Command) const { - FString result; - HideCommand = true; - _this->ConsoleCommand(&result, Command, false); - HideCommand = false; + RunHiddenCommand(_this, &Command); } /** diff --git a/AsaApi/Core/Public/Ark/AsaApiUtilsMessagingManager.h b/AsaApi/Core/Public/Ark/AsaApiUtilsMessagingManager.h index 3d731ba..870e02d 100644 --- a/AsaApi/Core/Public/Ark/AsaApiUtilsMessagingManager.h +++ b/AsaApi/Core/Public/Ark/AsaApiUtilsMessagingManager.h @@ -18,25 +18,31 @@ class AsaApiUtilsMessagingManager : public MessagingManager FORCEINLINE FString SendNotificationPrettyToPlayer(APlayerController* PC, const FString& Text, const FLinearColor& BackgroundColor, const FLinearColor& TextColor, const double TextScale, const double Duration, const Position TextJustification, const Position ScreenPosition, const bool bAddToChat) { - return SendNotificationPrettyToPlayer(PC->GetEOSId(), Text, BackgroundColor, TextColor, TextScale, Duration, TextJustification, ScreenPosition, bAddToChat); + if (!PC->IsA()) + return ""; + return SendNotificationPrettyToPlayer(std::bit_cast(PC)->GetUniqueNetIdAsString(), Text, BackgroundColor, TextColor, TextScale, Duration, TextJustification, ScreenPosition, bAddToChat); } // this function lets you send a notification to a player using the pretty widgets from the api utils mod, will all the possible params, to specific player FORCEINLINE FString SendNotificationPrettyToPlayer(const FString& EOSid, const FString& Text, const FLinearColor& BackgroundColor, const FLinearColor& TextColor, const double TextScale, const double Duration, const Position TextJustification, const Position ScreenPosition, const bool bAddToChat) { - TArray ids; - ids.Add(EOSid); - return SendNotificationPrettyToPlayers(ids, Text, BackgroundColor, TextColor, TextScale, Duration, TextJustification, ScreenPosition, bAddToChat); + return SendNotificationPrettyToPlayers({ EOSid }, Text, BackgroundColor, TextColor, TextScale, Duration, TextJustification, ScreenPosition, bAddToChat); } // this function lets you send a notification to a player using the pretty widgets from the api utils mod, will all the possible params, to all players - FORCEINLINE FString SendNotificationPrettyToPlayers(TArray PCs, const FString& Text, const FLinearColor& BackgroundColor, const FLinearColor& TextColor, + FORCEINLINE FString SendNotificationPrettyToPlayers(TArray player_controllers, const FString& Text, const FLinearColor& BackgroundColor, const FLinearColor& TextColor, const double TextScale, const double Duration, const Position TextJustification, const Position ScreenPosition, const bool bAddToChat) { TArray ids; - for (APlayerController* PC : PCs) - ids.Add(PC->GetEOSId()); + + for (APlayerController* player_controller : player_controllers) + { + if (!player_controller->IsA()) + continue; + ids.Add(std::bit_cast(player_controller)->GetUniqueNetIdAsString()); + } + return SendNotificationPrettyToPlayers(ids, Text, BackgroundColor, TextColor, TextScale, Duration, TextJustification, ScreenPosition, bAddToChat); } @@ -48,20 +54,15 @@ class AsaApiUtilsMessagingManager : public MessagingManager } protected: // changes the server messages to use pretty widgets from the api utils mod - void SendServerMessage_Impl(AShooterPlayerController* player_controller, FLinearColor msg_color, const FString& msg) override + void SendServerMessage_Impl(AShooterPlayerController* player_controller, const FLinearColor message, const FString& msg) override { - TArray ids; - ids.Add(player_controller->GetEOSId()); - SendNotificationPrettyToPlayers(ids, msg, FLinearColor(0, 0, 0, 0), msg_color, 1.0, 0.0, Position::Center, Position::Center, true); + SendNotificationPrettyToPlayers({ player_controller->GetUniqueNetIdAsString() }, msg, FLinearColor(0, 0, 0, 0), message, 1.0, 0.0, Position::Center, Position::Center, true); } // changes notifications to use pretty widgets from the api utils mod, this version mostly mimics old ASE notifications - void SendNotification_Impl(AShooterPlayerController* player_controller, FLinearColor color, float display_scale, - float display_time, UTexture2D* icon, const FString& msg) override + void SendNotification_Impl(AShooterPlayerController* player_controller, const FLinearColor color, const float display_scale, const float display_time, UTexture2D* icon, const FString& msg) override { - TArray ids; - ids.Add(player_controller->GetEOSId()); - SendNotificationPrettyToPlayers(ids, msg, FLinearColor(0, 0, 0, 0), color, display_scale, display_time, Position::Center, Position::Center, false); + SendNotificationPrettyToPlayers({ player_controller->GetUniqueNetIdAsString() }, msg, FLinearColor(0, 0, 0, 0), color, display_scale, display_time, Position::Center, Position::Center, false); } }; diff --git a/AsaApi/Core/Public/Ark/MessagingManager.h b/AsaApi/Core/Public/Ark/MessagingManager.h index 3602e4f..18945dc 100644 --- a/AsaApi/Core/Public/Ark/MessagingManager.h +++ b/AsaApi/Core/Public/Ark/MessagingManager.h @@ -2,6 +2,8 @@ #include "API/ARK/Ark.h" + + /** * \brief Messaging manager. Allows to send server messages, notifications and chat messages. * \brief Usage: @@ -12,23 +14,37 @@ class ARK_API MessagingManager { public: + virtual ~MessagingManager() = default; + /** * \brief Sends server message to the specific player. Using fmt::format. * \tparam T Either a a char or wchar_t * \tparam Args Optional arguments types * \param player_controller Player - * \param msg_color Message color - * \param msg Message + * \param color Message color + * \param message Message * \param args Optional arguments */ template - FORCEINLINE void SendServerMessage(AShooterPlayerController* player_controller, FLinearColor msg_color, const T* msg, Args&&... args) + FORCEINLINE void SendServerMessage(AShooterPlayerController& player_controller, FLinearColor color, const T* message, Args&&... args) + { + SendServerMessage_Impl(&player_controller, color, FString::Format(message, std::forward(args)...)); + } + /** + * \brief Sends server message to the specific player. Using fmt::format. + * \tparam T Either a a char or wchar_t + * \tparam Args Optional arguments types + * \param player_controller Player + * \param color Message color + * \param message Message + * \param args Optional arguments + */ + template + FORCEINLINE void SendServerMessage(AShooterPlayerController* player_controller, FLinearColor color, const T* message, Args&&... args) { if (!player_controller) return; - - FString message = FString::Format(msg, std::forward(args)...); - SendServerMessage_Impl(player_controller, msg_color, message); + SendServerMessage_Impl(player_controller, color, FString::Format(message, std::forward(args)...)); } /** @@ -104,18 +120,13 @@ class ARK_API MessagingManager * \param args Optional arguments */ template - FORCEINLINE void SendNotificationToAll(FLinearColor color, float display_scale, - float display_time, UTexture2D* icon, const T* msg, Args&&... args) + FORCEINLINE void SendNotificationToAll(const FLinearColor color, const float display_scale, const float display_time, UTexture2D* icon, const T* msg, Args&&... args) { - FString text(FString::Format(msg, std::forward(args)...)); + const FString text(FString::Format(msg, std::forward(args)...)); - const auto& player_controllers = WorldContext->PlayerControllerListField(); - for (TWeakObjectPtr player_controller : player_controllers) - { - AShooterPlayerController* shooter_pc = static_cast(player_controller.Get()); - if (shooter_pc) - SendNotification_Impl(shooter_pc, color, display_scale, display_time, icon, text); - } + for (const auto& controllers = WorldContext->PlayerControllerListField(); auto player_controller : controllers) + if (const auto shooter_controller = static_cast(player_controller.Get())) + SendNotification_Impl(shooter_controller, color, display_scale, display_time, icon, text); } /** @@ -147,8 +158,8 @@ class ARK_API MessagingManager } /** - * \brief Returns wether this messaging manager is able to work in the current session. - * \brief The default one does not depend in any mod or external service so it always returns true. + * \brief Returns weather this messaging manager is able to work in the current session. + * \brief The default one does not depend on any mod or external service, so it always returns true. * \brief Subclasses should redefine this function if they depend on any external service. * \brief If it returns an error, it will be removed and the plugin will fall back to the default API messaging manager. * \return Empty optional if no error, or optional filled with error string. @@ -172,10 +183,9 @@ class ARK_API MessagingManager protected /*overridable functions*/: // these are to be redefined by the child classes // default implementations - virtual void SendServerMessage_Impl(AShooterPlayerController* player_controller, FLinearColor msg_color, const FString& msg) + virtual void SendServerMessage_Impl(AShooterPlayerController* player_controller, FLinearColor color, const FString& message) { - static const FString senderid = "Server"; - player_controller->ClientServerChatDirectMessage(&msg, msg_color, false, &senderid); + player_controller->ClientServerChatDirectMessage(message, color, false, "Server"); } virtual void SendChatMessage_Impl(AShooterPlayerController* player_controller, const FString& sender_name, const FString& msg) @@ -183,14 +193,14 @@ protected /*overridable functions*/: // these are to be redefined by the child c FPrimalChatMessage chat_message; chat_message.SenderName = sender_name; chat_message.Message = msg; - chat_message.UserId = player_controller->GetEOSId(); + chat_message.UserId = player_controller->GetUniqueNetIdAsString(); player_controller->ClientChatMessage(chat_message); } virtual void SendNotification_Impl(AShooterPlayerController* player_controller, FLinearColor color, float display_scale, - float display_time, UTexture2D* icon, const FString& msg) + float display_time, UTexture2D* icon, const FString& message) { - player_controller->ClientServerNotification(&msg, color, display_scale, display_time, icon, nullptr, 1); + player_controller->ClientServerNotification(message, color, display_scale, display_time, icon, nullptr, 1); } protected /*variables*/: