diff --git a/Content/Legumix/Ennemy/E_EnemyState.uasset b/Content/Legumix/Ennemy/E_EnemyState.uasset new file mode 100644 index 0000000..92e5dec --- /dev/null +++ b/Content/Legumix/Ennemy/E_EnemyState.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a30c0970576d8a12503040f483b0cd3b0f6f9291d7a8c3f2a8cef9e1f432f591 +size 2362 diff --git a/Content/Legumix/Ennemy/MeleeEnemy/AI/BB_MeleeEnemy.uasset b/Content/Legumix/Ennemy/MeleeEnemy/AI/BB_MeleeEnemy.uasset index 9e4468f..f23a510 100644 --- a/Content/Legumix/Ennemy/MeleeEnemy/AI/BB_MeleeEnemy.uasset +++ b/Content/Legumix/Ennemy/MeleeEnemy/AI/BB_MeleeEnemy.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:17b4954d33d02b19a041ab80cb354e1267c0c48855f938a6f60f5f271a2b97e3 -size 3164 +oid sha256:d48ff45c6df936e3c5c0273bc744097f5af9eb6c49efea349f4c49fa3cc84e22 +size 3753 diff --git a/Content/Legumix/Ennemy/MeleeEnemy/AI/BT_MeleeEnemy.uasset b/Content/Legumix/Ennemy/MeleeEnemy/AI/BT_MeleeEnemy.uasset index 0e4831b..93243eb 100644 --- a/Content/Legumix/Ennemy/MeleeEnemy/AI/BT_MeleeEnemy.uasset +++ b/Content/Legumix/Ennemy/MeleeEnemy/AI/BT_MeleeEnemy.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c6c114a3a67b92085baf4239b13b5cc03915aac21c1487bd1adea82a6e37b380 -size 14596 +oid sha256:3c1d0de944be3a186cd83767fcad2b3c45db7992ee4a7b4c113dd94b6b365da0 +size 14578 diff --git a/Content/Legumix/Ennemy/MeleeEnemy/BP_MeleeEnemy.uasset b/Content/Legumix/Ennemy/MeleeEnemy/BP_MeleeEnemy.uasset index d1c5956..5137ae4 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:972f0ab7be3e08dd5b398135218d51de818594c4a7f3a9013f87c6b29ff7dabc -size 163138 +oid sha256:4b99f679157ce353be343093b016d9385ee3f22a716f56c58d3cd9af5ef9fba4 +size 155467 diff --git a/Content/Legumix/Ennemy/RangeEnemy/AI/BB_RangeEnnemy.uasset b/Content/Legumix/Ennemy/RangeEnemy/AI/BB_RangeEnnemy.uasset index 8882c5b..6abcbb6 100644 --- a/Content/Legumix/Ennemy/RangeEnemy/AI/BB_RangeEnnemy.uasset +++ b/Content/Legumix/Ennemy/RangeEnemy/AI/BB_RangeEnnemy.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f0c051b120695df59fc210d0228690187e72d7365d2ff14fe648ab82fe069587 -size 4844 +oid sha256:f7c204b2084e9bcf242cf2b1e273dacc89f398ceb7d0d6caea68e55000c7b3d1 +size 4764 diff --git a/Content/Legumix/Ennemy/RangeEnemy/AI/BT_RangeEnnemy.uasset b/Content/Legumix/Ennemy/RangeEnemy/AI/BT_RangeEnnemy.uasset index 63033a9..a7afc91 100644 --- a/Content/Legumix/Ennemy/RangeEnemy/AI/BT_RangeEnnemy.uasset +++ b/Content/Legumix/Ennemy/RangeEnemy/AI/BT_RangeEnnemy.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b46ec742714bc4daa369f965a18aa057be790fde68a4a2d1e3e03e76dbe505b4 -size 50360 +oid sha256:784e000a3f2cee6e2eedd3d5385317736f6088a309d833fe56d49f76730139bb +size 63522 diff --git a/Content/Legumix/Ennemy/RangeEnemy/AI/Task/BTTask_RangeAttack.uasset b/Content/Legumix/Ennemy/RangeEnemy/AI/Task/BTTask_RangeAttack.uasset index a947653..c1f57fb 100644 --- a/Content/Legumix/Ennemy/RangeEnemy/AI/Task/BTTask_RangeAttack.uasset +++ b/Content/Legumix/Ennemy/RangeEnemy/AI/Task/BTTask_RangeAttack.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:40bc19f91521ce13ecebe56a7e7137cf6a2089e29e47932e514a2266657203e2 +oid sha256:8f6f919369ab935dd7dea39fa41bc7b3fe7a436237e8ede1f9ffb09eb9bf977b size 23377 diff --git a/Content/Legumix/Ennemy/RangeEnemy/AIC_DistantEnnemy.uasset b/Content/Legumix/Ennemy/RangeEnemy/AIC_DistantEnnemy.uasset index 04ab42c..9618c3a 100644 --- a/Content/Legumix/Ennemy/RangeEnemy/AIC_DistantEnnemy.uasset +++ b/Content/Legumix/Ennemy/RangeEnemy/AIC_DistantEnnemy.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0e2737c468d3483de2b45e7f606cfd6f84df298a5baa7a788e746d765fbf536b -size 44086 +oid sha256:2af9306765d7314b9ab33dbc6c7f9cd14f191950152a053a28e80f07cefcce25 +size 129982 diff --git a/Content/Legumix/Ennemy/RangeEnemy/BP_DistantEnemy.uasset b/Content/Legumix/Ennemy/RangeEnemy/BP_DistantEnemy.uasset index 6e5bb11..777b602 100644 --- a/Content/Legumix/Ennemy/RangeEnemy/BP_DistantEnemy.uasset +++ b/Content/Legumix/Ennemy/RangeEnemy/BP_DistantEnemy.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bf09f7315dd6ed8ccad7ffbfa895e37ca97266338ddb8326455065ce452bad25 -size 295981 +oid sha256:1b858f56f6500db366eee61e78aa75418a3ae6eae6462808bf9b32eda916c367 +size 296635 diff --git a/Content/Legumix/Levels/LVL_00.umap b/Content/Legumix/Levels/LVL_00.umap index 18024d9..87eef1f 100644 --- a/Content/Legumix/Levels/LVL_00.umap +++ b/Content/Legumix/Levels/LVL_00.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fe05af22763868ebb24c4664d26ea4b48f7f71431168c5c00fa125d0ab07bb84 -size 116636 +oid sha256:53601be56a5858e1b76ae01857f3aba8f74c5982a7eacd1aba65eab31908027b +size 128808 diff --git a/Source/LegumeMix/Private/Enemy/LMEnemy.cpp b/Source/LegumeMix/Private/Enemy/LMEnemy.cpp index aadbe70..6d8aaca 100644 --- a/Source/LegumeMix/Private/Enemy/LMEnemy.cpp +++ b/Source/LegumeMix/Private/Enemy/LMEnemy.cpp @@ -5,7 +5,6 @@ ALMEnemy::ALMEnemy() { PrimaryActorTick.bCanEverTick = true; - EnemyState = EEnemyState::EES_Chasing; AttackingRadius = 100.f; AttackingDamage = 0.f; } @@ -22,11 +21,6 @@ void ALMEnemy::Attack(const APawn* TargetedPawn) GEngine->AddOnScreenDebugMessage(1, 2.f, FColor::Cyan, Debug); } -double ALMEnemy::GetDistanceToTarget(const AActor* TargetedActor) -{ - return (TargetedActor->GetActorLocation() - GetActorLocation()).Length(); -} - void ALMEnemy::Tick(float DeltaTime) { Super::Tick(DeltaTime); diff --git a/Source/LegumeMix/Public/Enemy/LMEnemy.h b/Source/LegumeMix/Public/Enemy/LMEnemy.h index 001b14d..c3f8b71 100644 --- a/Source/LegumeMix/Public/Enemy/LMEnemy.h +++ b/Source/LegumeMix/Public/Enemy/LMEnemy.h @@ -6,13 +6,6 @@ #include "GameFramework/Character.h" #include "LMEnemy.generated.h" -UENUM(BlueprintType) -enum class EEnemyState : uint8 -{ - EES_Chasing UMETA(DisplayName = "Chasing"), - EES_Attacking UMETA(DisplayName = "Attacking") -}; - UCLASS() class LEGUMEMIX_API ALMEnemy : public ACharacter { @@ -31,23 +24,12 @@ public: protected: virtual void BeginPlay() override; - UPROPERTY(EditAnywhere, BlueprintReadWrite, meta = (AllowPrivateAccess = "true"), Category = "Legumix") - EEnemyState EnemyState; - 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 - * @returns the distance - */ - UFUNCTION(BlueprintCallable, Category="Legumix", meta=(ReturnDisplayName="Distance", DefaultToSelf="TargetedActor")) - double GetDistanceToTarget(const AActor* TargetedActor); - + /** * Performs an attack on the targeted pawn * @param TargetedPawn