From e61bf40013fcc536a2b45875705d9846e271e98e Mon Sep 17 00:00:00 2001 From: Emilie Schott <43524962+EmilieSchott@users.noreply.github.com> Date: Mon, 3 Mar 2025 00:22:25 +0100 Subject: [PATCH] [UPD] Add AttackingDamage and attack to Melee Enemies --- Content/Legumix/Ennemy/MeleeEnemy/BP_MeleeEnemy.uasset | 4 ++-- Content/Legumix/Levels/LVL_GYM_00.umap | 4 ++-- Source/LegumeMix/Private/Enemy/LMEnemy.cpp | 1 + Source/LegumeMix/Public/Enemy/LMEnemy.h | 3 +++ 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Content/Legumix/Ennemy/MeleeEnemy/BP_MeleeEnemy.uasset b/Content/Legumix/Ennemy/MeleeEnemy/BP_MeleeEnemy.uasset index 53f3de9..fd32e0c 100644 --- a/Content/Legumix/Ennemy/MeleeEnemy/BP_MeleeEnemy.uasset +++ b/Content/Legumix/Ennemy/MeleeEnemy/BP_MeleeEnemy.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:32e22d2020b8e41918b8a91740b511c49ae913daeedac25967e7994c1fdf68bd -size 120824 +oid sha256:534f38474dde37a8637b3476a7a04b14e09c77bf6d3d273b345e0a9464057ff8 +size 140384 diff --git a/Content/Legumix/Levels/LVL_GYM_00.umap b/Content/Legumix/Levels/LVL_GYM_00.umap index d69eae3..7c5a4e3 100644 --- a/Content/Legumix/Levels/LVL_GYM_00.umap +++ b/Content/Legumix/Levels/LVL_GYM_00.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9fe4ba60711197989919c30be4870e15e7f4d24dbff07c99f604a509548e71e1 -size 975850 +oid sha256:9c0f7a83ea411981c11010e37f610332042e1f1d2bcf43c1dc81fb8f3ba21483 +size 979519 diff --git a/Source/LegumeMix/Private/Enemy/LMEnemy.cpp b/Source/LegumeMix/Private/Enemy/LMEnemy.cpp index 3ff5bf9..25abcfa 100644 --- a/Source/LegumeMix/Private/Enemy/LMEnemy.cpp +++ b/Source/LegumeMix/Private/Enemy/LMEnemy.cpp @@ -6,6 +6,7 @@ ALMEnemy::ALMEnemy() { PrimaryActorTick.bCanEverTick = true; EnemyState = EEnemyState::EES_Chasing; + AttackingDamage = 0.f; } void ALMEnemy::BeginPlay() diff --git a/Source/LegumeMix/Public/Enemy/LMEnemy.h b/Source/LegumeMix/Public/Enemy/LMEnemy.h index 6b9da99..919aa54 100644 --- a/Source/LegumeMix/Public/Enemy/LMEnemy.h +++ b/Source/LegumeMix/Public/Enemy/LMEnemy.h @@ -32,6 +32,9 @@ protected: UPROPERTY(EditAnywhere, BlueprintReadWrite, meta = (AllowPrivateAccess = "true"), Category = "Legumix") double AttackingRadius; + UPROPERTY(EditAnywhere, BlueprintReadWrite, meta = (AllowPrivateAccess = "true"), Category = "Legumix") + float AttackingDamage; + /** * Returns the distance between the enemy and a target. * @param TargetedActor