From a1a5f2f3092aaae028e3bf9a299f9b6f382345da Mon Sep 17 00:00:00 2001 From: Ed_ Date: Mon, 21 Oct 2024 22:47:37 -0400 Subject: [PATCH] preparing to generate the attribute set from the table --- .vs/ProjectSettings.json | 3 + .vs/VSWorkspaceState.json | 7 +++ .vs/slnx.sqlite | Bin 0 -> 114688 bytes .vscode/settings.json | 6 +- .../Win64/UnrealEditor-GasaEditor.dll | 4 +- Project/Config/DefaultGame.ini | 6 +- .../DT_AttributeSet.json | 10 +++ .../Gasa/AbilitySystem/GasaAbilitySystem.h | 59 +++++++++++++++++- .../Gasa/AbilitySystem/GasaAttributeSet.cpp | 4 -- Project/Source/Gasa/Game/GasaGameInstance.h | 2 +- Project/Source/Gasa/GasaDevOptions.h | 3 + Project/Source/Gasa/GasaDevOptionsCache.cpp | 6 ++ Project/Source/Gasa/GasaDevOptionsCache.h | 2 + 13 files changed, 100 insertions(+), 12 deletions(-) create mode 100644 .vs/ProjectSettings.json create mode 100644 .vs/VSWorkspaceState.json create mode 100644 .vs/slnx.sqlite create mode 100644 Project/Saved/AssetData/DataTableEditorLayout/DT_AttributeSet.json diff --git a/.vs/ProjectSettings.json b/.vs/ProjectSettings.json new file mode 100644 index 0000000..0cf5ea5 --- /dev/null +++ b/.vs/ProjectSettings.json @@ -0,0 +1,3 @@ +{ + "CurrentProjectSetting": "No Configurations" +} \ No newline at end of file diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json new file mode 100644 index 0000000..aacac9a --- /dev/null +++ b/.vs/VSWorkspaceState.json @@ -0,0 +1,7 @@ +{ + "ExpandedNodes": [ + "" + ], + "SelectedNode": "\\Gasa.sln", + "PreviewInSolutionExplorer": false +} \ No newline at end of file diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite new file mode 100644 index 0000000000000000000000000000000000000000..c892393ec14a240d9118a2598f1159f62546c4bc GIT binary patch literal 114688 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

WmCVyh^pp}ksYFjG(c?<=m=ZmzM2{%Z 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 OutLifetimeProps ) const diff --git a/Project/Source/Gasa/Game/GasaGameInstance.h b/Project/Source/Gasa/Game/GasaGameInstance.h index ded896a..59d0c48 100644 --- a/Project/Source/Gasa/Game/GasaGameInstance.h +++ b/Project/Source/Gasa/Game/GasaGameInstance.h @@ -1,4 +1,4 @@ -#pragma once +#pragma once #include "Networking/GasaNetLibrary.h" #include "GasaDevOptionsCache.h" diff --git a/Project/Source/Gasa/GasaDevOptions.h b/Project/Source/Gasa/GasaDevOptions.h index e0e5917..08eb3e4 100644 --- a/Project/Source/Gasa/GasaDevOptions.h +++ b/Project/Source/Gasa/GasaDevOptions.h @@ -16,6 +16,9 @@ public: // NOTE(Ed): Any Soft-References must have their includes defined in GasaDevOptions.cpp // They are used by GasaGen for the GasaDevOptionsCache + UPROPERTY(Config, EditAnywhere, BlueprintReadOnly, Category="GAS") + TArray< TSoftObjectPtr> AttributeSets; + UPROPERTY(Config, EditAnywhere, BlueprintReadOnly, Category="UI") TSoftObjectPtr TaggedMessageTable; diff --git a/Project/Source/Gasa/GasaDevOptionsCache.cpp b/Project/Source/Gasa/GasaDevOptionsCache.cpp index a887f76..0fcbaff 100644 --- a/Project/Source/Gasa/GasaDevOptionsCache.cpp +++ b/Project/Source/Gasa/GasaDevOptionsCache.cpp @@ -11,6 +11,12 @@ void FGasaDevOptionsCache::CachedDevOptions() { UGasaDevOptions* DevOpts = GetMutDevOptions(); + for ( auto& entry : DevOpts->AttributeSets ) + { + AttributeSets.Push( entry.LoadSynchronous() ); + ensureMsgf( entry != nullptr, TEXT( "An AttributeSets entry is null, DO NOT RUN PIE or else you may get a crash if not handled in BP or C++" ) ); + } + TaggedMessageTable = DevOpts->TaggedMessageTable.LoadSynchronous(); ensureMsgf( TaggedMessageTable != nullptr, TEXT( "TaggedMessageTable is null, DO NOT RUN PIE or else you may get a crash if not handled in BP or C++" ) ); diff --git a/Project/Source/Gasa/GasaDevOptionsCache.h b/Project/Source/Gasa/GasaDevOptionsCache.h index 818c7d3..1cb942a 100644 --- a/Project/Source/Gasa/GasaDevOptionsCache.h +++ b/Project/Source/Gasa/GasaDevOptionsCache.h @@ -8,6 +8,8 @@ struct GASA_API FGasaDevOptionsCache { GENERATED_BODY() + UPROPERTY() + TArray AttributeSets; UPROPERTY() UObject* TaggedMessageTable; UPROPERTY()