From fcdfe802613488230843b1386a1fa21486d8f27e Mon Sep 17 00:00:00 2001 From: Jeff Stapleton Date: Wed, 4 Aug 2021 23:56:50 -0600 Subject: [PATCH 1/2] default stats --- Data/CharacterAttributes.csv | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 Data/CharacterAttributes.csv diff --git a/Data/CharacterAttributes.csv b/Data/CharacterAttributes.csv new file mode 100644 index 0000000..10e4a07 --- /dev/null +++ b/Data/CharacterAttributes.csv @@ -0,0 +1,2 @@ +,1 +MaxHealth,100 From 1676fea9bbc07cde4719092c577f3cd840e9e35b Mon Sep 17 00:00:00 2001 From: Jeff Stapleton Date: Thu, 12 Aug 2021 21:40:18 -0600 Subject: [PATCH 2/2] fixes --- Content/Data/CharacterAttributes.uasset | 3 +++ Content/Effects/GE_CharacterAttributes.uasset | 3 +++ .../Blueprints/ThirdPersonCharacter.uasset | 4 ++-- .../ThirdPersonCPP/Maps/ThirdPersonExampleMap.umap | 4 ++-- .../Maps/ThirdPersonExampleMap_BuiltData.uasset | 4 ++-- Source/Tutorial/TutorialCharacter.cpp | 13 +++++++++++-- Source/Tutorial/TutorialCharacter.h | 14 ++++++++++---- 7 files changed, 33 insertions(+), 12 deletions(-) create mode 100644 Content/Data/CharacterAttributes.uasset create mode 100644 Content/Effects/GE_CharacterAttributes.uasset diff --git a/Content/Data/CharacterAttributes.uasset b/Content/Data/CharacterAttributes.uasset new file mode 100644 index 0000000..b9bb598 --- /dev/null +++ b/Content/Data/CharacterAttributes.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:479f56294fde0cfd00da7417f47e9dd0bbc2a908e36a9c5d296e45c3b15a8e2c +size 2474 diff --git a/Content/Effects/GE_CharacterAttributes.uasset b/Content/Effects/GE_CharacterAttributes.uasset new file mode 100644 index 0000000..d6424c6 --- /dev/null +++ b/Content/Effects/GE_CharacterAttributes.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cdbddcae8f476ae7d243607f708aa612db2030b9fb4c2f55e56e3c965d49a393 +size 11054 diff --git a/Content/ThirdPersonCPP/Blueprints/ThirdPersonCharacter.uasset b/Content/ThirdPersonCPP/Blueprints/ThirdPersonCharacter.uasset index 9fce028..7d77e16 100644 --- a/Content/ThirdPersonCPP/Blueprints/ThirdPersonCharacter.uasset +++ b/Content/ThirdPersonCPP/Blueprints/ThirdPersonCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1072d038c6cc1ff92265dfc9b31f7e038500393da0526adbec89ac2a7c8edc2f -size 106410 +oid sha256:13660d3a8edb59a5e4594db471fba97d40b06469a65bb87becb78e74fa0dbc27 +size 118733 diff --git a/Content/ThirdPersonCPP/Maps/ThirdPersonExampleMap.umap b/Content/ThirdPersonCPP/Maps/ThirdPersonExampleMap.umap index 45317ae..1656519 100644 --- a/Content/ThirdPersonCPP/Maps/ThirdPersonExampleMap.umap +++ b/Content/ThirdPersonCPP/Maps/ThirdPersonExampleMap.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e55ecc976a922df51c2d2d031f4550a2f0b6e38b1b191052984f6114ae193199 -size 8532869 +oid sha256:0fc9e3819d081b3015cef5500f90698a9f9df0de996cc59d3b74b634c4670a9b +size 8547014 diff --git a/Content/ThirdPersonCPP/Maps/ThirdPersonExampleMap_BuiltData.uasset b/Content/ThirdPersonCPP/Maps/ThirdPersonExampleMap_BuiltData.uasset index 397b2e5..6411165 100644 --- a/Content/ThirdPersonCPP/Maps/ThirdPersonExampleMap_BuiltData.uasset +++ b/Content/ThirdPersonCPP/Maps/ThirdPersonExampleMap_BuiltData.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:95511985168890840fff74cd928d20798f799162f9dd09b6894f11603407abb9 -size 3960680 +oid sha256:a09015a7a34cac007c95ea9100a073367f5c4a731ecc701a4a010b7236889787 +size 4089189 diff --git a/Source/Tutorial/TutorialCharacter.cpp b/Source/Tutorial/TutorialCharacter.cpp index ccecaaf..236cb80 100644 --- a/Source/Tutorial/TutorialCharacter.cpp +++ b/Source/Tutorial/TutorialCharacter.cpp @@ -16,6 +16,10 @@ ATutorialCharacter::ATutorialCharacter() { + AbilitySystemComponent = CreateDefaultSubobject(TEXT("AbilitySystemComponent")); + AbilitySystemComponent->SetIsReplicated(true); + AbilitySystemComponent->SetReplicationMode(EGameplayEffectReplicationMode::Full); + Attributes = CreateDefaultSubobject(TEXT("CharacterAttributes")); // Set size for collision capsule @@ -91,6 +95,11 @@ void ATutorialCharacter::BeginPlay() InitEffects(); } +class UAbilitySystemComponent* ATutorialCharacter::GetAbilitySystemComponent() const +{ + return AbilitySystemComponent; +} + void ATutorialCharacter::OnResetVR() { // If Tutorial is added to a project via 'Add Feature' in the Unreal Editor the dependency on HeadMountedDisplay in Tutorial.Build.cs is not automatically propagated @@ -104,12 +113,12 @@ void ATutorialCharacter::OnResetVR() void ATutorialCharacter::TouchStarted(ETouchIndex::Type FingerIndex, FVector Location) { - Jump(); + Jump(); } void ATutorialCharacter::TouchStopped(ETouchIndex::Type FingerIndex, FVector Location) { - StopJumping(); + StopJumping(); } void ATutorialCharacter::TurnAtRate(float Rate) diff --git a/Source/Tutorial/TutorialCharacter.h b/Source/Tutorial/TutorialCharacter.h index d578b1c..2304f78 100644 --- a/Source/Tutorial/TutorialCharacter.h +++ b/Source/Tutorial/TutorialCharacter.h @@ -6,13 +6,14 @@ #include "GameFramework/Character.h" #include "TutorialAttributeSet.h" #include "AbilitySystemComponent.h" +#include "AbilitySystemInterface.h" #include "TutorialGameplayEffect.h" #include "TutorialCharacter.generated.h" class UTutorialGameplayEffect; UCLASS(config=Game) -class ATutorialCharacter : public ACharacter +class ATutorialCharacter : public ACharacter, public IAbilitySystemInterface { GENERATED_BODY() @@ -25,9 +26,6 @@ class ATutorialCharacter : public ACharacter class UCameraComponent* FollowCamera; public: - ATutorialCharacter(); - - virtual void BeginPlay() override; UPROPERTY(EditDefaultsOnly, Category = "Abilities") UAbilitySystemComponent* AbilitySystemComponent; @@ -49,6 +47,14 @@ class ATutorialCharacter : public ACharacter UPROPERTY(Replicated, BlueprintReadWrite, Category = "Effects") TArray Effects; +public: + + ATutorialCharacter(); + + virtual void BeginPlay() override; + + virtual class UAbilitySystemComponent* GetAbilitySystemComponent() const override; + protected: UFUNCTION(BlueprintCallable, Category = "Effects")