Skip to content

Commit

Permalink
Updated API
Browse files Browse the repository at this point in the history
  • Loading branch information
@Michidu
Michidu committed Aug 3, 2017
1 parent 2e44088 commit 21dbb12
Show file tree
Hide file tree
Showing 11 changed files with 330 additions and 161 deletions.
164 changes: 115 additions & 49 deletions ArkApi/API/Actor.h
View file

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions ArkApi/API/Base.h
View file
Expand Up @@ -106,6 +106,7 @@ struct UPrimalSupplyCrateItemSets;
struct FItemAttachmentInfo;
struct FItemStatInfo;
struct FSaddlePassengerSeatDefinition;
struct APrimalStructureTurret;

// Address helpers

Expand Down
93 changes: 93 additions & 0 deletions ArkApi/API/PrimalStructure.h
View file
Expand Up @@ -292,6 +292,7 @@ struct APrimalStructure : APrimalTargetableActor

// Functions

static UClass* GetPrivateStaticClass() { return NativeCall<UClass *>(nullptr, "APrimalStructure", "GetPrivateStaticClass"); }
int GetHitPawnCollisionGroup() { return NativeCall<int>((DWORD64)this, "APrimalStructure", "GetHitPawnCollisionGroup"); }
void PreInitializeComponents() { NativeCall<void>((DWORD64)this, "APrimalStructure", "PreInitializeComponents"); }
void BeginPlay() { NativeCall<void>((DWORD64)this, "APrimalStructure", "BeginPlay"); }
Expand Down Expand Up @@ -430,3 +431,95 @@ struct APrimalStructureDoor : APrimalStructure
bool AllowPickupForItem(AShooterPlayerController* ForPC) { return NativeCall<bool, AShooterPlayerController *>((DWORD64)this, "APrimalStructureDoor", "AllowPickupForItem", ForPC); }
void StaticRegisterNativesAPrimalStructureDoor() { NativeCall<void>((DWORD64)this, "APrimalStructureDoor", "StaticRegisterNativesAPrimalStructureDoor"); }
};

struct APrimalStructureTurret
{
TWeakObjectPtr<AActor> GetTargetField() const { return GetNativeField<TWeakObjectPtr<AActor>>(this, "APrimalStructureTurret", "Target"); }
void SetTargetField(TWeakObjectPtr<AActor> newValue) { SetNativeField(this, "APrimalStructureTurret", "Target", newValue); }
TSubclassOf<UPrimalItem> GetAmmoItemTemplateField() const { return GetNativeField<TSubclassOf<UPrimalItem>>(this, "APrimalStructureTurret", "AmmoItemTemplate"); }
void SetAmmoItemTemplateField(TSubclassOf<UPrimalItem> newValue) { SetNativeField(this, "APrimalStructureTurret", "AmmoItemTemplate", newValue); }
float GetFireIntervalField() const { return GetNativeField<float>(this, "APrimalStructureTurret", "FireInterval"); }
void SetFireIntervalField(float newValue) { SetNativeField(this, "APrimalStructureTurret", "FireInterval", newValue); }
long double GetLastFireTimeField() const { return GetNativeField<long double>(this, "APrimalStructureTurret", "LastFireTime"); }
void SetLastFireTimeField(long double newValue) { SetNativeField(this, "APrimalStructureTurret", "LastFireTime", newValue); }
float GetMaxFireYawDeltaField() const { return GetNativeField<float>(this, "APrimalStructureTurret", "MaxFireYawDelta"); }
void SetMaxFireYawDeltaField(float newValue) { SetNativeField(this, "APrimalStructureTurret", "MaxFireYawDelta", newValue); }
float GetMaxFirePitchDeltaField() const { return GetNativeField<float>(this, "APrimalStructureTurret", "MaxFirePitchDelta"); }
void SetMaxFirePitchDeltaField(float newValue) { SetNativeField(this, "APrimalStructureTurret", "MaxFirePitchDelta", newValue); }
FVector GetTargetingLocOffsetField() const { return GetNativeField<FVector>(this, "APrimalStructureTurret", "TargetingLocOffset"); }
void SetTargetingLocOffsetField(FVector newValue) { SetNativeField(this, "APrimalStructureTurret", "TargetingLocOffset", newValue); }
float GetTargetingRotationInterpSpeedField() const { return GetNativeField<float>(this, "APrimalStructureTurret", "TargetingRotationInterpSpeed"); }
void SetTargetingRotationInterpSpeedField(float newValue) { SetNativeField(this, "APrimalStructureTurret", "TargetingRotationInterpSpeed", newValue); }
FVector GetTargetingTraceOffsetField() const { return GetNativeField<FVector>(this, "APrimalStructureTurret", "TargetingTraceOffset"); }
void SetTargetingTraceOffsetField(FVector newValue) { SetNativeField(this, "APrimalStructureTurret", "TargetingTraceOffset", newValue); }
TSubclassOf<UDamageType> GetFireDamageTypeField() const { return GetNativeField<TSubclassOf<UDamageType>>(this, "APrimalStructureTurret", "FireDamageType"); }
void SetFireDamageTypeField(TSubclassOf<UDamageType> newValue) { SetNativeField(this, "APrimalStructureTurret", "FireDamageType", newValue); }
float GetFireDamageAmountField() const { return GetNativeField<float>(this, "APrimalStructureTurret", "FireDamageAmount"); }
void SetFireDamageAmountField(float newValue) { SetNativeField(this, "APrimalStructureTurret", "FireDamageAmount", newValue); }
float GetFireDamageImpulseField() const { return GetNativeField<float>(this, "APrimalStructureTurret", "FireDamageImpulse"); }
void SetFireDamageImpulseField(float newValue) { SetNativeField(this, "APrimalStructureTurret", "FireDamageImpulse", newValue); }
FRotator GetTurretAimRotOffsetField() const { return GetNativeField<FRotator>(this, "APrimalStructureTurret", "TurretAimRotOffset"); }
void SetTurretAimRotOffsetField(FRotator newValue) { SetNativeField(this, "APrimalStructureTurret", "TurretAimRotOffset", newValue); }
FVector GetAimTargetLocOffsetField() const { return GetNativeField<FVector>(this, "APrimalStructureTurret", "AimTargetLocOffset"); }
void SetAimTargetLocOffsetField(FVector newValue) { SetNativeField(this, "APrimalStructureTurret", "AimTargetLocOffset", newValue); }
FVector GetPlayerProneTargetOffsetField() const { return GetNativeField<FVector>(this, "APrimalStructureTurret", "PlayerProneTargetOffset"); }
void SetPlayerProneTargetOffsetField(FVector newValue) { SetNativeField(this, "APrimalStructureTurret", "PlayerProneTargetOffset", newValue); }
float GetAimSpreadField() const { return GetNativeField<float>(this, "APrimalStructureTurret", "AimSpread"); }
void SetAimSpreadField(float newValue) { SetNativeField(this, "APrimalStructureTurret", "AimSpread", newValue); }
char GetRangeSettingField() const { return GetNativeField<char>(this, "APrimalStructureTurret", "RangeSetting"); }
void SetRangeSettingField(char newValue) { SetNativeField(this, "APrimalStructureTurret", "RangeSetting", newValue); }
char GetAISettingField() const { return GetNativeField<char>(this, "APrimalStructureTurret", "AISetting"); }
void SetAISettingField(char newValue) { SetNativeField(this, "APrimalStructureTurret", "AISetting", newValue); }
char GetWarningSettingField() const { return GetNativeField<char>(this, "APrimalStructureTurret", "WarningSetting"); }
void SetWarningSettingField(char newValue) { SetNativeField(this, "APrimalStructureTurret", "WarningSetting", newValue); }
int GetNumBulletsField() const { return GetNativeField<int>(this, "APrimalStructureTurret", "NumBullets"); }
void SetNumBulletsField(int newValue) { SetNativeField(this, "APrimalStructureTurret", "NumBullets", newValue); }
float GetWarningExpirationTimeField() const { return GetNativeField<float>(this, "APrimalStructureTurret", "WarningExpirationTime"); }
void SetWarningExpirationTimeField(float newValue) { SetNativeField(this, "APrimalStructureTurret", "WarningExpirationTime", newValue); }
USkeletalMeshComponent* GetMySkeletalMeshCompField() const { return GetNativeField<USkeletalMeshComponent *>(this, "APrimalStructureTurret", "MySkeletalMeshComp"); }
void SetMySkeletalMeshCompField(USkeletalMeshComponent* newValue) { SetNativeField(this, "APrimalStructureTurret", "MySkeletalMeshComp", newValue); }
bool GetbWarnedField() const { return GetNativeField<bool>(this, "APrimalStructureTurret", "bWarned"); }
void SetbWarnedField(bool newValue) { SetNativeField(this, "APrimalStructureTurret", "bWarned", newValue); }
FRotator GetDefaultTurretAimRotOffsetField() const { return GetNativeField<FRotator>(this, "APrimalStructureTurret", "DefaultTurretAimRotOffset"); }
void SetDefaultTurretAimRotOffsetField(FRotator newValue) { SetNativeField(this, "APrimalStructureTurret", "DefaultTurretAimRotOffset", newValue); }
FVector GetMuzzleLocOffsetField() const { return GetNativeField<FVector>(this, "APrimalStructureTurret", "MuzzleLocOffset"); }
void SetMuzzleLocOffsetField(FVector newValue) { SetNativeField(this, "APrimalStructureTurret", "MuzzleLocOffset", newValue); }
long double GetLastWarningTimeField() const { return GetNativeField<long double>(this, "APrimalStructureTurret", "LastWarningTime"); }
void SetLastWarningTimeField(long double newValue) { SetNativeField(this, "APrimalStructureTurret", "LastWarningTime", newValue); }

// Functions

void BeginPlay() { NativeCall<void>((DWORD64)this, "APrimalStructureTurret", "BeginPlay"); }
AActor* FindTarget() { return NativeCall<AActor *>((DWORD64)this, "APrimalStructureTurret", "FindTarget"); }
void SetTarget(AActor* aTarget) { NativeCall<void, AActor *>((DWORD64)this, "APrimalStructureTurret", "SetTarget", aTarget); }
void DoFire(int RandomSeed) { NativeCall<void, int>((DWORD64)this, "APrimalStructureTurret", "DoFire", RandomSeed); }
void DoFireProjectile(FVector Origin, FVector ShootDir) { NativeCall<void, FVector, FVector>((DWORD64)this, "APrimalStructureTurret", "DoFireProjectile", Origin, ShootDir); }
void SpawnImpactEffects(FHitResult* Impact, FVector* ShootDir) { NativeCall<void, FHitResult *, FVector *>((DWORD64)this, "APrimalStructureTurret", "SpawnImpactEffects", Impact, ShootDir); }
void SpawnTrailEffect(FVector* EndPoint) { NativeCall<void, FVector *>((DWORD64)this, "APrimalStructureTurret", "SpawnTrailEffect", EndPoint); }
bool ShouldDealDamage(AActor* TestActor) { return NativeCall<bool, AActor *>((DWORD64)this, "APrimalStructureTurret", "ShouldDealDamage", TestActor); }
void DealDamage(FHitResult* Impact, FVector* ShootDir, int DamageAmount, TSubclassOf<UDamageType> DamageType, float Impulse) { NativeCall<void, FHitResult *, FVector *, int, TSubclassOf<UDamageType>, float>((DWORD64)this, "APrimalStructureTurret", "DealDamage", Impact, ShootDir, DamageAmount, DamageType, Impulse); }
void StartWarning() { NativeCall<void>((DWORD64)this, "APrimalStructureTurret", "StartWarning"); }
void FinishWarning() { NativeCall<void>((DWORD64)this, "APrimalStructureTurret", "FinishWarning"); }
void Tick(float DeltaSeconds) { NativeCall<void, float>((DWORD64)this, "APrimalStructureTurret", "Tick", DeltaSeconds); }
void DrawHUD(AShooterHUD* HUD) { NativeCall<void, AShooterHUD *>((DWORD64)this, "APrimalStructureTurret", "DrawHUD", HUD); }
bool IsValidToFire() { return NativeCall<bool>((DWORD64)this, "APrimalStructureTurret", "IsValidToFire"); }
FRotator* GetMuzzleRotation(FRotator* result) { return NativeCall<FRotator *, FRotator *>((DWORD64)this, "APrimalStructureTurret", "GetMuzzleRotation", result); }
FVector* GetMuzzleLocation(FVector* result) { return NativeCall<FVector *, FVector *>((DWORD64)this, "APrimalStructureTurret", "GetMuzzleLocation", result); }
FVector* GetAttackingFromLocation(FVector* result) { return NativeCall<FVector *, FVector *>((DWORD64)this, "APrimalStructureTurret", "GetAttackingFromLocation", result); }
FVector* GetAimPivotLocation(FVector* result) { return NativeCall<FVector *, FVector *>((DWORD64)this, "APrimalStructureTurret", "GetAimPivotLocation", result); }
FName* GetMuzzleFlashSocketName(FName* result) { return NativeCall<FName *, FName *>((DWORD64)this, "APrimalStructureTurret", "GetMuzzleFlashSocketName", result); }
bool TryMultiUse(APlayerController* ForPC, int UseIndex) { return NativeCall<bool, APlayerController *, int>((DWORD64)this, "APrimalStructureTurret", "TryMultiUse", ForPC, UseIndex); }
void ClientMultiUse(APlayerController* ForPC, int UseIndex) { NativeCall<void, APlayerController *, int>((DWORD64)this, "APrimalStructureTurret", "ClientMultiUse", ForPC, UseIndex); }
void NotifyItemRemoved(UPrimalItem* anItem) { NativeCall<void, UPrimalItem *>((DWORD64)this, "APrimalStructureTurret", "NotifyItemRemoved", anItem); }
void UpdateNumBullets() { NativeCall<void>((DWORD64)this, "APrimalStructureTurret", "UpdateNumBullets"); }
void PreInitializeComponents() { NativeCall<void>((DWORD64)this, "APrimalStructureTurret", "PreInitializeComponents"); }
void Stasis() { NativeCall<void>((DWORD64)this, "APrimalStructureTurret", "Stasis"); }
void Unstasis() { NativeCall<void>((DWORD64)this, "APrimalStructureTurret", "Unstasis"); }
void UpdatedTargeting() { NativeCall<void>((DWORD64)this, "APrimalStructureTurret", "UpdatedTargeting"); }
FVector* GetTargetAimAtLocation(FVector* result) { return NativeCall<FVector *, FVector *>((DWORD64)this, "APrimalStructureTurret", "GetTargetAimAtLocation", result); }
FVector* GetTargetFireAtLocation(FVector* result, APrimalCharacter* ForTarget) { return NativeCall<FVector *, FVector *, APrimalCharacter *>((DWORD64)this, "APrimalStructureTurret", "GetTargetFireAtLocation", result, ForTarget); }
bool CanFire() { return NativeCall<bool>((DWORD64)this, "APrimalStructureTurret", "CanFire"); }
FName* GetTargetAltAimSocket(FName* result, APrimalCharacter* ForTarget) { return NativeCall<FName *, FName *, APrimalCharacter *>((DWORD64)this, "APrimalStructureTurret", "GetTargetAltAimSocket", result, ForTarget); }
USkeletalMeshComponent* GetSkeletalMeshComponent() { return NativeCall<USkeletalMeshComponent *>((DWORD64)this, "APrimalStructureTurret", "GetSkeletalMeshComponent"); }
void StaticRegisterNativesAPrimalStructureTurret() { NativeCall<void>((DWORD64)this, "APrimalStructureTurret", "StaticRegisterNativesAPrimalStructureTurret"); }
};
9 changes: 6 additions & 3 deletions ArkApi/ApiUtils.cpp
View file
Expand Up @@ -4,10 +4,13 @@

namespace ApiUtils
{
// Game objects
namespace
{
// Game objects

UWorld* uWorld;
AShooterGameMode* aShooterGameMode;
UWorld* uWorld;
AShooterGameMode* aShooterGameMode;
}

// UWorld

Expand Down
1 change: 0 additions & 1 deletion ArkApi/ApiUtils.h
View file
Expand Up @@ -2,7 +2,6 @@
#define H_ApiUtils

#include "API/Base.h"
#include <vector>

namespace ApiUtils
{
Expand Down
27 changes: 15 additions & 12 deletions ArkApi/Commands.cpp
View file
Expand Up @@ -6,13 +6,16 @@

namespace Commands
{
// Commands containers
namespace
{
// Commands containers

std::vector<ChatCommand*> chatCommands;
std::vector<ConsoleCommand*> consoleCommands;
std::vector<RconCommand*> rconCommands;
std::vector<std::function<void(float)>> onTickCallbacks;
std::vector<std::function<void()>> onTimerCallbacks;
std::vector<ChatCommand*> chatCommands;
std::vector<ConsoleCommand*> consoleCommands;
std::vector<RconCommand*> rconCommands;
std::vector<std::function<void(float)>> onTickCallbacks;
std::vector<std::function<void()>> onTimerCallbacks;
}

// Add commands

Expand All @@ -26,7 +29,7 @@ namespace Commands
{
auto& v = chatCommands;

std::vector<ChatCommand*>::iterator iter = std::find_if(v.begin(), v.end(), [command](ChatCommand* data) -> bool { return data->command == command; });
std::vector<ChatCommand*>::const_iterator iter = std::find_if(v.begin(), v.end(), [command](const ChatCommand* data) -> bool { return data->command == command; });

if (iter != v.end())
{
Expand Down Expand Up @@ -72,7 +75,7 @@ namespace Commands

FString chatCommand = Parsed[0];

for (auto command : chatCommands)
for (const auto& command : chatCommands)
{
if (chatCommand.EndsWith(&command->command, ESearchCase::IgnoreCase))
{
Expand All @@ -89,7 +92,7 @@ namespace Commands
{
bool result = false;

for (auto command : consoleCommands)
for (const auto& command : consoleCommands)
{
if (Cmd->StartsWith(command->command, ESearchCase::IgnoreCase))
{
Expand All @@ -108,7 +111,7 @@ namespace Commands

FString commandName = rconPacket->Body;

for (auto command : rconCommands)
for (const auto& command : rconCommands)
{
if (commandName.StartsWith(command->command, ESearchCase::IgnoreCase))
{
Expand All @@ -123,15 +126,15 @@ namespace Commands

void CheckOnTickCallbacks(float DeltaSeconds)
{
for (auto callback : onTickCallbacks)
for (const auto& callback : onTickCallbacks)
{
callback(DeltaSeconds);
}
}

void CheckOnTimerCallbacks()
{
for (auto callback : onTimerCallbacks)
for (const auto& callback : onTimerCallbacks)
{
callback();
}
Expand Down

0 comments on commit 21dbb12

Please sign in to comment.