#238 Fixed practice range and added spawner on dust (#242)

Source/Cloud9/Character/Cloud9Character.cpp

@@ -44,13 +44,15 @@
 #include "Cloud9/Tools/Extensions/AActor.h"
 #include "Components/Cloud9HealthComponent.h"
 #include "Components/Cloud9AnimationComponent.h"
+#include "Components/WidgetInteractionComponent.h"
 
 const FName ACloud9Character::SpringArmComponentName = TEXT("CameraBoom");
 const FName ACloud9Character::CameraComponentName = TEXT("TopDownCamera");
 const FName ACloud9Character::DecalComponentName = TEXT("CursorToWorld");
 const FName ACloud9Character::InventoryComponentName = TEXT("InventoryComponent");
 const FName ACloud9Character::HealthComponentName = TEXT("HealthComponent");
 const FName ACloud9Character::AnimationComponentName = TEXT("AnimationComponent");
+const FName ACloud9Character::WidgetInteractionComponentName = TEXT("WidgetInteractionComponent");
 
 ACloud9Character::ACloud9Character(const FObjectInitializer& ObjectInitializer) : Super(
 	ObjectInitializer.SetDefaultSubobjectClass<UCloud9CharacterMovement>(CharacterMovementComponentName))
@@ -108,6 +110,10 @@ ACloud9Character::ACloud9Character(const FObjectInitializer& ObjectInitializer)
 	InventoryComponent = CreateDefaultSubobject<UCloud9InventoryComponent>(InventoryComponentName);
 	HealthComponent = CreateDefaultSubobject<UCloud9HealthComponent>(HealthComponentName);
 	AnimationComponent = CreateDefaultSubobject<UCloud9AnimationComponent>(AnimationComponentName);
+	WidgetInteractionComponent = CreateDefaultSubobject<UWidgetInteractionComponent>(WidgetInteractionComponentName);
+	WidgetInteractionComponent->SetupAttachment(RootComponent);
+	WidgetInteractionComponent->InteractionSource = EWidgetInteractionSource::Custom;
+	WidgetInteractionComponent->bShowDebug = false;
 
 	HealthComponent->OnCharacterDie.AddDynamic(this, &ACloud9Character::OnCharacterDie);
 
@@ -225,6 +231,11 @@ void ACloud9Character::SetDestroyAfter(float NewTime)
 	DestroyAfterTime = NewTime;
 }
 
+UWidgetInteractionComponent* ACloud9Character::GetWidgetInteractionComponent() const
+{
+	return WidgetInteractionComponent;
+}
+
 void ACloud9Character::SetCameraRotationYaw(float Angle) const
 {
 	var Rotation = CameraBoom->GetRelativeRotation();

Source/Cloud9/Character/Cloud9Character.h

@@ -30,6 +30,7 @@
 
 #include "Cloud9Character.generated.h"
 
+class UWidgetInteractionComponent;
 class ACloud9PlayerController;
 class UCloud9InventoryComponent;
 class UCloud9AnimationComponent;
@@ -50,6 +51,7 @@ class ACloud9Character : public ACharacter
 	static const FName InventoryComponentName;
 	static const FName HealthComponentName;
 	static const FName AnimationComponentName;
+	static const FName WidgetInteractionComponentName;
 
 	ACloud9Character(const FObjectInitializer& ObjectInitializer);
 
@@ -80,6 +82,8 @@ class ACloud9Character : public ACharacter
 	UFUNCTION(BlueprintCallable)
 	float GetViewVerticalRotation() const { return ViewVerticalRotation; }
 
+	UWidgetInteractionComponent* GetWidgetInteractionComponent() const;
+
 	void SetCameraRotationYaw(float Angle) const;
 	void AddCameraRotationYaw(float Angle) const;
 	float GetCameraRotationRoll() const;
@@ -177,6 +181,10 @@ class ACloud9Character : public ACharacter
 	UPROPERTY(VisibleAnywhere, BlueprintReadOnly, Category=Utility, meta=(AllowPrivateAccess))
 	UCloud9AnimationComponent* AnimationComponent;
 
+	/** Helper to play animation montages for character */
+	UPROPERTY(VisibleAnywhere, BlueprintReadOnly, Category=Utility, meta=(AllowPrivateAccess))
+	UWidgetInteractionComponent* WidgetInteractionComponent;
+
 	/** Current number of frags made by character */
 	UPROPERTY(BlueprintReadOnly, Category=State, meta=(AllowPrivateAccess))
 	int Score;

Source/Cloud9/Environment/Cloud9PracticeSpawner.cpp

@@ -11,11 +11,12 @@ FName ACloud9PracticeSpawner::ZoneComponentName = "ZoneComponentName";
 ACloud9PracticeSpawner::ACloud9PracticeSpawner()
 {
 	// Disable collision to remove firearms hit screen
-	SetActorEnableCollision(false);
+	// SetActorEnableCollision(false);
 	PrimaryActorTick.bCanEverTick = true;
 	ZoneComponent = CreateDefaultSubobject<UBoxComponent>(ZoneComponentName);
 	RootComponent = ZoneComponent;
 	ZoneSize = {100.0f, 100.0f, 100.0f};
+	ZoneComponent->SetCollisionEnabled(ECollisionEnabled::NoCollision);
 	MaxTargetsCount = 10;
 	GridSize = FVector::OneVector;
 	bIsEnabled = true;
@@ -37,11 +38,16 @@ float ACloud9PracticeSpawner::GetKillPerMinute() const
 
 void ACloud9PracticeSpawner::RestartShooting()
 {
+	for (let Actor : Actors)
+	{
+		Actor->OnDestroyed.RemoveAll(this);
+		Actor->Destroy();
+	}
+	Actors.Reset();
+	AddPracticeTargets();
 	bIsStarted = false;
 	Killed = 0;
 	TimeElapsed = 0.0f;
-	Actors.Empty();
-	AddPracticeTargets();
 	OnRestartShooting.Broadcast();
 }
 
@@ -84,10 +90,13 @@ void ACloud9PracticeSpawner::Tick(float DeltaTime)
 
 void ACloud9PracticeSpawner::OnChildActorDestroyed(AActor* DestroyedActor)
 {
-	bIsStarted = true;
-	OnTargetDestroyed.Broadcast(++Killed);
-	Actors.Remove(DestroyedActor);
-	AddPracticeTargets();
+	if (bIsEnabled)
+	{
+		bIsStarted = true;
+		OnTargetDestroyed.Broadcast(++Killed);
+		Actors.Remove(DestroyedActor);
+		AddPracticeTargets();
+	}
 }
 
 AActor* ACloud9PracticeSpawner::SpawnTarget_Implementation(FVector Location)
@@ -100,7 +109,10 @@ AActor* ACloud9PracticeSpawner::SpawnTarget_Implementation(FVector Location)
 		return nullptr;
 	}
 
-	return GetWorld()->SpawnActor(Template, &Location, nullptr);
+	FActorSpawnParameters ActorSpawnParameters;
+	ActorSpawnParameters.Owner = this;
+
+	return GetWorld()->SpawnActor(Template, &Location, nullptr, ActorSpawnParameters);
 }
 
 bool ACloud9PracticeSpawner::AddPracticeTargets()

Source/Cloud9/Weapon/Classes/Cloud9WeaponFirearm.cpp

@@ -24,6 +24,7 @@
 #include "Cloud9WeaponFirearm.h"
 #include "Engine/StaticMeshActor.h"
 #include "NiagaraFunctionLibrary.h"
+#include "Components/WidgetInteractionComponent.h"
 
 #include "Cloud9/Tools/Macro/Common.h"
 #include "Cloud9/Tools/Macro/Logging.h"
@@ -41,8 +42,8 @@
 #include "Cloud9/Weapon/Sounds/Cloud9SoundPlayer.h"
 #include "Cloud9/Weapon/Structures/WeaponConfig.h"
 #include "Cloud9/Weapon/Tables/WeaponTableFirearm.h"
+#include "Components/WidgetComponent.h"
 #include "Kismet/GameplayStatics.h"
-#include "Kismet/KismetMathLibrary.h"
 
 const FName ACloud9WeaponFirearm::TracerProbabilityParameterName = TEXT("Probability");
 const FName ACloud9WeaponFirearm::TracerDirectionParameterName = TEXT("Direction");
@@ -415,6 +416,15 @@ EFirearmFireStatus ACloud9WeaponFirearm::Fire(
 
 	if (IsHit)
 	{
+		if (Cast<UWidgetComponent>(LineHit.Component))
+		{
+			let Component = Character->GetWidgetInteractionComponent();
+			Component->SetCustomHitResult(LineHit);
+			Component->PressPointerKey(EKeys::LeftMouseButton);
+			Component->ReleasePointerKey(EKeys::LeftMouseButton);
+			return EFirearmFireStatus::Success;
+		}
+
 		let Direction = LineHit.Location - StartLocation | EFVector::Normalize{};
 
 		if (IsValid(FirearmCommonData.Tracer))

Source/Cloud9/Weapon/Utils/EquipmentSpawner.cpp

@@ -64,6 +64,7 @@ bool AEquipmentSpawner::CanBeDestroyed() const
 		not(bHelmetActivated xor bHelmet);
 }
 
+#if WITH_EDITOR
 void AEquipmentSpawner::PostEditChangeProperty(FPropertyChangedEvent& PropertyChangedEvent)
 {
 	Super::PostEditChangeProperty(PropertyChangedEvent);
@@ -74,5 +75,6 @@ void AEquipmentSpawner::PostEditChangeProperty(FPropertyChangedEvent& PropertyCh
 		bHelmet = false;
 	}
 }
+#endif
 
 AActor* AEquipmentSpawner::CreateChildActor() { return InitializeStaticMeshSample(SampleMesh); }