Fix Machinegun Throwable

Source/Nakatomi/Throwable.cpp

@@ -19,6 +19,15 @@ AThrowable::AThrowable()
 	StaticMeshComponent->SetGenerateOverlapEvents(true);
 	StaticMeshComponent->SetNotifyRigidBodyCollision(true);
 	SetRootComponent(StaticMeshComponent);
+	
+	SphereComponent = CreateDefaultSubobject<USphereComponent>(TEXT("SphereComponent"));
+	SphereComponent->SetSphereRadius(25.0f, true);
+	SphereComponent->SetCollisionEnabled(ECollisionEnabled::QueryAndProbe);
+	SphereComponent->SetCollisionObjectType(ECC_WorldDynamic);
+	SphereComponent->SetSimulatePhysics(true);
+	SphereComponent->SetGenerateOverlapEvents(true);
+	SphereComponent->SetNotifyRigidBodyCollision(true);
+	SphereComponent->SetupAttachment(RootComponent);
 }
 
 // Called when the game starts or when spawned

Source/Nakatomi/Throwable.h

@@ -18,8 +18,7 @@ public:
 	UPROPERTY(EditDefaultsOnly, BlueprintReadWrite, meta = (ClampMin = "0.0", ClampMax = "1.0"))
 	float ImpulseAngle = 0.5f;
 	
-protected:
+	UPROPERTY(VisibleAnywhere, BlueprintReadWrite)
-	UPROPERTY(EditDefaultsOnly, BlueprintReadWrite)
 	USphereComponent* SphereComponent;
 
 public:

Source/Nakatomi/Weapon.h

@@ -28,8 +28,8 @@ class NAKATOMI_API AWeapon : public AActor
 {
 	GENERATED_BODY()
 
-protected:
+public:
-	UPROPERTY(BlueprintReadWrite)
+	UPROPERTY(VisibleAnywhere, BlueprintReadWrite)
 	USkeletalMeshComponent* WeaponSkeletalMeshComponent;
 
 	UPROPERTY(EditDefaultsOnly)

Source/Nakatomi/WeaponThrowable.cpp

@@ -9,7 +9,7 @@
 AWeaponThrowable::AWeaponThrowable()
 {
 	WeaponSkeletalMeshComponent = CreateDefaultSubobject<USkeletalMeshComponent>(TEXT("Skeletal Mesh Component"));
-	WeaponSkeletalMeshComponent->SetCollisionProfileName(FName("BlockAll"));
+	WeaponSkeletalMeshComponent->SetCollisionProfileName(FName("OverlapAll"));
 	WeaponSkeletalMeshComponent->SetCollisionEnabled(ECollisionEnabled::QueryAndPhysics);
 	WeaponSkeletalMeshComponent->SetCollisionObjectType(ECC_WorldDynamic);
 	WeaponSkeletalMeshComponent->SetSimulatePhysics(true);
@@ -22,7 +22,7 @@ void AWeaponThrowable::BeginPlay()
 {
 	Super::BeginPlay();
 
-	WeaponSkeletalMeshComponent->OnComponentHit.AddDynamic(this, &AWeaponThrowable::OnOverlapBegin);
+	WeaponSkeletalMeshComponent->OnComponentBeginOverlap.AddDynamic(this, &AWeaponThrowable::OnSphereBeginOverlap);
 
 	auto playerCharacter = UGameplayStatics::GetPlayerCharacter(GetWorld(), 0);
 	auto playerForwardVector = playerCharacter->GetActorForwardVector();
@@ -43,3 +43,20 @@ void AWeaponThrowable::SetWeaponSkeletalMesh(USkeletalMesh* SkeletalMesh)
 		WeaponSkeletalMeshComponent->AddImpulse(playerForwardVector * ImpulseForce);
 	}
 }
+
+void AWeaponThrowable::OnSphereBeginOverlap(UPrimitiveComponent* OverlappedComponent, 
+								AActor* OtherActor, 
+								UPrimitiveComponent* OtherComp, 
+								int32 OtherBodyIndex, 
+								bool bFromSweep, 
+								const FHitResult &SweepResult)
+{
+	if (!OtherActor->ActorHasTag(FName("Player")) && OtherActor != this)
+	{
+		if (HealthComponent)
+		{
+			HealthComponent->TakeDamage(this, HealthComponent->GetMaxHealth(), nullptr,
+										nullptr, this);
+		}
+	}
+}

Source/Nakatomi/WeaponThrowable.h

@@ -28,4 +28,13 @@ protected:
 
 public:
 	void SetWeaponSkeletalMesh(USkeletalMesh* SkeletalMesh);
+
+private:
+	UFUNCTION()
+	void OnSphereBeginOverlap(UPrimitiveComponent* OverlappedComponent, 
+								AActor* OtherActor, 
+								UPrimitiveComponent* OtherComp, 
+								int32 OtherBodyIndex, 
+								bool bFromSweep, 
+								const FHitResult &SweepResult);
 };