Merge branch 'master' of https://github.com/Pelayori/ARK-Server-API

Author: Pelayori

version/Core/Public/API/ARK/PrimalStructure.h

@@ -1161,3 +1161,14 @@ struct APrimalStructureItemContainer_CropPlot : APrimalStructureItemContainer
 	bool AllowBlueprintCraftingRequirement(TSubclassOf<UPrimalItem> ItemTemplate, int ItemQuantity) { return NativeCall<bool, TSubclassOf<UPrimalItem>, int>(this, "APrimalStructureItemContainer_CropPlot.AllowBlueprintCraftingRequirement", ItemTemplate, ItemQuantity); }
 	bool AllowCraftingResourceConsumption(TSubclassOf<UPrimalItem> ItemTemplate, int ItemQuantity) { return NativeCall<bool, TSubclassOf<UPrimalItem>, int>(this, "APrimalStructureItemContainer_CropPlot.AllowCraftingResourceConsumption", ItemTemplate, ItemQuantity); }
 };
+
+struct UPrimalStructureSettings : UObject
+{
+	float& DecayDestructionPeriodMultiplierField() { return *GetNativePointerField<float*>(this, "UPrimalStructureSettings.DecayDestructionPeriodMultiplier"); }
+};
+
+struct APrimalStructureExplosive : APrimalStructure
+{
+	unsigned int& ConstructorPlayerDataIDField() { return *GetNativePointerField<unsigned int*>(this, "APrimalStructureExplosive.ConstructorPlayerDataID"); }
+	static UClass* StaticClass() { return NativeCall<UClass*>(nullptr, "APrimalStructureExplosive.StaticClass"); }
+};

version/Core/Public/API/Base.h

@@ -628,7 +628,6 @@ struct APrimalWorldSettings;
 struct FWeightedObjectList;
 struct UNetDriver;
 struct AHUD;
-struct APrimalStructureExplosive;
 struct UPaintingTexture;
 struct APrimalStructureExplosiveTransGPS;
 struct ITargetableInterface;

version/Core/Public/API/UE/UE.h

@@ -203,12 +203,30 @@ struct TSubclassOf
 struct IOnlinePlatformData
 {
 	void* vfptr;
+	FString* ToHumanReadableString(FString* result) { return NativeCall<FString*, FString*>(this, "IOnlinePlatformData.ToHumanReadableString", result); }
 };
 
 struct FUniqueNetId : IOnlinePlatformData
 {
 };
 
+struct FUniqueNetIdUInt64 : FUniqueNetId
+{
+	unsigned __int64& UniqueNetIdField() { return *GetNativePointerField<unsigned __int64*>(this, "FUniqueNetIdUInt64.UniqueNetId"); }
+
+	// Functions
+
+	FUniqueNetIdUInt64(FString* Str) { NativeCall<void, FString*>(this, "FUniqueNetIdUInt64.FUniqueNetIdUInt64", Str); }
+	FUniqueNetIdUInt64(FUniqueNetIdUInt64* Src) { NativeCall<void, FUniqueNetIdUInt64*>(this, "FUniqueNetIdUInt64.FUniqueNetIdUInt64", Src); }
+	FUniqueNetIdUInt64(FUniqueNetId* InUniqueNetId) { NativeCall<void, FUniqueNetId*>(this, "FUniqueNetIdUInt64.FUniqueNetIdUInt64", InUniqueNetId); }
+	FUniqueNetIdUInt64(uint64 InUniqueNetId) { NativeCall<void, uint64>(this, "FUniqueNetIdUInt64.FUniqueNetIdUInt64", InUniqueNetId); }
+
+	bool IsValid() { return NativeCall<bool>(this, "FUniqueNetIdUInt64.IsValid"); }
+	FString* ToDebugString(FString* result) { return NativeCall<FString*, FString*>(this, "FUniqueNetIdUInt64.ToDebugString", result); }
+	unsigned int GetHash() { return NativeCall<int>(this, "FUniqueNetIdUInt64.GetHash"); }
+	FString* ToString(FString* result) { return NativeCall<FString*, FString*>(this, "FUniqueNetIdUInt64.ToString", result); }
+};
+
 struct FUniqueNetIdSteam : FUniqueNetId
 {
 	unsigned __int64 UniqueNetId;

version/Core/Public/Ark/ArkApiUtils.h

@@ -8,6 +8,12 @@ namespace ArkApi
 {
 	enum class ServerStatus { Loading, Ready };
 
+	struct MapCoords
+	{
+		float x = 0.f;
+		float y = 0.f;
+	};
+
 	class ARK_API IApiUtils
 	{
 	public:
@@ -734,6 +740,57 @@ namespace ArkApi
 
 			return out_actors;
 		}
+
+		/**
+		* \brief Converts FVector into coords that are displayed when you view the ingame map
+		*/
+		FORCEINLINE MapCoords FVectorToCoords(FVector actor_position)
+		{
+			AWorldSettings* world_settings = GetWorld()->GetWorldSettings(false, true);
+			APrimalWorldSettings* p_world_settings = static_cast<APrimalWorldSettings*>(world_settings);
+			MapCoords coords;
+
+			float lat_scale = p_world_settings->LatitudeScaleField() != 0 ? p_world_settings->LatitudeScaleField() : 800.0f;
+			float lon_scale = p_world_settings->LongitudeScaleField() != 0 ? p_world_settings->LongitudeScaleField() : 800.0f;
+
+			float lat_origin = p_world_settings->LatitudeOriginField() != 0 ? p_world_settings->LatitudeOriginField() : -400000.0f;
+			float lon_origin = p_world_settings->LongitudeOriginField() != 0 ? p_world_settings->LongitudeOriginField() : -400000.0f;
+
+			float lat_div = 100.f / lat_scale;
+			float lat = (lat_div * actor_position.Y + lat_div * abs(lat_origin)) / 1000.f;
+
+			float lon_div = 100.f / lon_scale;
+			float lon = (lon_div * actor_position.X + lon_div * abs(lon_origin)) / 1000.f;
+
+			coords.x = std::floor(lon * 10.0f) / 10.0f;
+			coords.y = std::floor(lat * 10.0f) / 10.0f;
+
+			return coords;
+		}
+
+		/**
+		* \brief obtains the steam ID of an attacker, meant to be used in hooks such as TakeDamage
+		* \param tribe_check if set to true will return NULL if the target is from the same tribe as the attacker
+		*/
+		FORCEINLINE uint64 GetAttackerSteamID(AActor* target, AController* killer, AActor* damage_causer, bool tribe_check = true)
+		{
+			uint64 steam_id = NULL;
+
+			if (target)
+			{
+				if (killer && !killer->IsLocalController() && killer->IsA(AShooterPlayerController::GetPrivateStaticClass()) 
+					&& (!tribe_check || (tribe_check && target->TargetingTeamField() != killer->TargetingTeamField())))
+					steam_id = GetSteamIdFromController(static_cast<AShooterPlayerController*>(killer));
+				else if (damage_causer && (!tribe_check || (tribe_check && target->TargetingTeamField() != damage_causer->TargetingTeamField())) 
+					&& damage_causer->IsA(APrimalStructureExplosive::StaticClass()))
+				{
+					APrimalStructureExplosive* explosive = static_cast<APrimalStructureExplosive*>(damage_causer);
+					steam_id = GetSteamIDForPlayerID(explosive->ConstructorPlayerDataIDField());
+				}
+			}
+
+			return steam_id;
+		}
 private:
 		virtual AShooterPlayerController* FindPlayerFromSteamId_Internal(uint64 steam_id) const = 0;
 	};