Minor refactor to base weapon class

Source/vampires/Projectile.cpp

@@ -110,7 +110,7 @@ void AProjectile::OnProjectileBeginOverlap(UPrimitiveComponent* OverlappedCompon
 			}
 
 			AProjectileWeapon* ownerWeapon = Cast<AProjectileWeapon>(GetOwner());
-			EnemyHealthComponent->TakeDamage(Enemy, ownerWeapon->Damage, nullptr, ownerController, this);
+			EnemyHealthComponent->TakeDamage(Enemy, ownerWeapon->GetDamage(), nullptr, ownerController, this);
 
 			RemainingDamagableEnemies--;
 

Source/vampires/Weapon.cpp

@@ -64,7 +64,8 @@ bool AWeapon::UpgradeWeapon_Implementation()
 }
 
 void AWeapon::OnWeaponBeginOverlap(UPrimitiveComponent* OverlappedComponent, AActor* OtherActor,
-	UPrimitiveComponent* OtherComp, int32 OtherBodyIndex, bool bFromSweep, const FHitResult& SweepResult)
+                                   UPrimitiveComponent* OtherComp, int32 OtherBodyIndex, bool bFromSweep,
+                                   const FHitResult& SweepResult)
 {
 	if (AEnemyCharacter* Enemy = Cast<AEnemyCharacter>(OtherActor))
 	{
@@ -81,10 +82,12 @@ void AWeapon::OnWeaponEndOverlap(UPrimitiveComponent* OverlappedComp, AActor* Ot
 	}
 }
 
-void AWeapon::ResizeBoxComponent(FViewport* Viewport, uint32 unused)
+void AWeapon::ResizeBoxComponent(FViewport* Viewport, const uint32 Unused)
 {
-
+	if (!GEngine->GameViewport)
-	if (!GEngine->GameViewport) return;
+	{
+		return;
+	}
 
 	FVector TopLeft, TopLeftDir;
 	FVector TopRight, TopRightDir;
@@ -108,7 +111,7 @@ void AWeapon::ResizeBoxComponent(FViewport* Viewport, uint32 unused)
 
 	// I am using the unused flag to work around a bug where the DeprojectScreenPositionToWorld doesn't match the
 	// values that I am expecting, in that they are way too small, for any other resize event we can skip this nonsense.
-	if (unused == -2)
+	if (Unused == -2)
 	{
 		width *= 266.666;
 		height *= 266.666;

Source/vampires/Weapon.h

@@ -16,78 +16,86 @@ class VAMPIRES_API AWeapon : public AActor
 {
 	GENERATED_BODY()
 
-public:
+protected:
-	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Weapon Properties")
+	UPROPERTY(EditDefaultsOnly, BlueprintReadWrite, Category = "Weapon | Information")
 	FText Name;
 
-	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Weapon Properties")
+	UPROPERTY(EditDefaultsOnly, BlueprintReadWrite, Category = "Weapon | Information")
 	FText Description;
 
-	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Weapon Properties")
+	UPROPERTY(EditDefaultsOnly, BlueprintReadWrite, Category = "Weapon | Information")
 	TObjectPtr<UTexture2D> Icon;
 
-	UPROPERTY(EditDefaultsOnly, Category = "Weapon Properties")
+	UPROPERTY(EditDefaultsOnly, Category = "Weapon | Properties")
 	TObjectPtr<USoundBase> WeaponActivatedSoundBase = nullptr;
 
-	UPROPERTY(EditDefaultsOnly, Category = "Weapon Properties")
+	UPROPERTY(EditDefaultsOnly, BlueprintReadWrite, Category = "Weapon | Properties")
-	TObjectPtr<UPaperSprite> WeaponSprite = nullptr;
-	
-	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Weapon Properties")
 	float WeaponCooldown = 1.0f;
 
-	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Weapon Properties")
+	UPROPERTY(EditDefaultsOnly, BlueprintReadWrite, Category = "Weapon | Properties")
 	float Damage;
 
-	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Weapon Properties")
+	UPROPERTY(EditDefaultsOnly, BlueprintReadWrite, Category = "Weapon | Properties")
-	TArray<FText> UpgradeDescriptions;
-	
-	int CurrentLevel = 0;
-
-	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Weapon Properties")
 	bool FollowPlayer = true;
 
-	UPROPERTY(EditDefaultsOnly, BlueprintReadOnly)
+	UPROPERTY(EditDefaultsOnly, BlueprintReadWrite, Category = "Weapon | Upgrades")
+	TArray<FText> UpgradeDescriptions;
+
+	UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category = "Weapon | Upgrades")
 	int MaxLevel = 0;
 
-protected:
+	UPROPERTY()
-	UPROPERTY(EditDefaultsOnly, BlueprintReadWrite)
 	TObjectPtr<UBoxComponent> BoxComponent = nullptr;
 
 	TArray<TObjectPtr<AActor>> OverlappedEnemies = TArray<TObjectPtr<AActor>>();
 
+	int CurrentLevel = 0;
+
 private:
 	FTimerHandle WeaponTimerHandle;
 
-
 public:
-	// Sets default values for this actor's properties
+	// Sets default values for this actor's 
 	AWeapon();
 
+	UFUNCTION(BlueprintNativeEvent)
+	bool UpgradeWeapon();
+	virtual bool UpgradeWeapon_Implementation();
+
+	FText GetWeaponName() const { return Name; }
+
+	FText GetDescription() const { return Description; }
+
+	TObjectPtr<UTexture2D> GetIcon() const { return Icon; }
+
+	float GetDamage() const { return Damage; }
+
+	bool GetFollowPlayer() const { return FollowPlayer; }
+
+	TArray<FText> GetUpgradeDescriptions() const { return UpgradeDescriptions; }
+
+	int GetWeaponLevel() const { return CurrentLevel; }
+
 protected:
 	// Called when the game starts or when spawned
 	virtual void BeginPlay() override;
 
 	void ResetWeaponTimer();
 
-public:
 	UFUNCTION(BlueprintNativeEvent)
 	void FireWeaponAction();
 	virtual void FireWeaponAction_Implementation();
 
-	UFUNCTION(BlueprintNativeEvent)
-	bool UpgradeWeapon();
-	virtual bool UpgradeWeapon_Implementation();
-
 	UFUNCTION()
 	virtual void OnWeaponBeginOverlap(UPrimitiveComponent* OverlappedComponent, AActor* OtherActor,
 	                                  UPrimitiveComponent* OtherComp, int32 OtherBodyIndex, bool bFromSweep,
 	                                  const FHitResult& SweepResult);
 
 	UFUNCTION()
-	virtual void OnWeaponEndOverlap(UPrimitiveComponent* OverlappedComp, AActor* OtherActor, UPrimitiveComponent* OtherComp,
+	virtual void OnWeaponEndOverlap(UPrimitiveComponent* OverlappedComp, AActor* OtherActor,
+	                                UPrimitiveComponent* OtherComp,
 	                                int32 OtherBodyIndex);
 
 private:
-	
+	void ResizeBoxComponent(FViewport* Viewport, uint32 Unused);
-	void ResizeBoxComponent(FViewport* Viewport, uint32 unused);
 };

Source/vampires/WeaponInventoryComponent.cpp

@@ -42,7 +42,7 @@ void UWeaponInventoryComponent::AddWeaponToInventory(TSubclassOf<AWeapon> Weapon
 	SpawnParameters.Owner = GetOwner();
 	
 	AWeapon* weapon = GetWorld()->SpawnActor<AWeapon>(Weapon, SpawnParameters.Owner->GetTransform(), SpawnParameters);
-	if (weapon->FollowPlayer)
+	if (weapon->GetFollowPlayer())
 	{
 		weapon->AttachToActor(GetOwner(), FAttachmentTransformRules::KeepWorldTransform);
 	}

Source/vampires/Weapons/GarlicWeapon.h

@@ -28,12 +28,12 @@ class VAMPIRES_API AGarlicWeapon : public AWeapon
 {
 	GENERATED_BODY()
 public:
-	UPROPERTY(VisibleAnywhere, BlueprintReadOnly, meta = (AllowPrivateAccess = "true"))
+	UPROPERTY(VisibleAnywhere, BlueprintReadOnly, meta = (AllowPrivateAccess = "true"), Category = "Weapon | Garlic")
 	TObjectPtr<USphereComponent> SphereComponent;
 
 	TArray<FOverlappedEnemy> GarlicOverlappedEnemies;
 
-	UPROPERTY(VisibleAnywhere, BlueprintReadOnly, meta = (AllowPrivateAccess = "true"))
+	UPROPERTY(VisibleAnywhere, BlueprintReadOnly, meta = (AllowPrivateAccess = "true"), Category = "Weapon | Garlic")
 	TObjectPtr<UStaticMeshComponent> VisualEffectMeshComponent;
 
 private:

Source/vampires/Weapons/LightningRingWeapon.h

@@ -18,13 +18,13 @@ class VAMPIRES_API ALightningRingWeapon : public AWeapon
 	GENERATED_BODY()
 
 public:
-	UPROPERTY(EditAnywhere, BlueprintReadWrite)
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Weapon | Lightning Ring")
 	int LightningBolts = 1;
 
-	UPROPERTY(EditAnywhere, BlueprintReadWrite)
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Weapon | Lightning Ring")
 	float LightingBoltRadius = 200.0f;
 
-	UPROPERTY(EditAnywhere, BlueprintReadWrite)
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Weapon | Lightning Ring")
 	TObjectPtr<UNiagaraSystem> LightningEffectSystem;
 	
 public:

Source/vampires/Weapons/ProjectileWeapon.h

@@ -18,13 +18,13 @@ class VAMPIRES_API AProjectileWeapon : public AWeapon
 	GENERATED_BODY()
 
 public:
-	UPROPERTY(EditAnywhere, Category = "Weapon Properties")
+	UPROPERTY(EditAnywhere, Category = "Weapon | Projectiles")
 	TObjectPtr<UProjectileDataAsset> ProjectileTemplate = nullptr;
 
-	UPROPERTY(EditDefaultsOnly, BlueprintReadWrite)
+	UPROPERTY(EditDefaultsOnly, BlueprintReadWrite, Category = "Weapon | Projectiles")
 	int ProjectilesPerActivation = 1;
 
-	UPROPERTY(EditDefaultsOnly, BlueprintReadWrite)
+	UPROPERTY(EditDefaultsOnly, BlueprintReadWrite, Category = "Weapon | Projectiles")
 	float ProjectileSpawningDelay = 0.25f;
 
 protected:

Source/vampires/Weapons/SwarmAgent.cpp

@@ -52,7 +52,7 @@ void ASwarmAgent::OnSwarmAgentBeginOverlap(UPrimitiveComponent* OverlappedCompon
 				if (AVampireCharacter* character = Cast<AVampireCharacter>(ownerWeapon->GetOwner()))
 				{
 					AController* ownerController = character->GetController();
-					EnemyHealthComponent->TakeDamage(Enemy, ownerWeapon->Damage, nullptr, ownerController, this);
+					EnemyHealthComponent->TakeDamage(Enemy, ownerWeapon->GetDamage(), nullptr, ownerController, this);
 				}
 			}
 		}

Source/vampires/Weapons/SwarmWeapon.h

@@ -15,19 +15,19 @@ class VAMPIRES_API ASwarmWeapon : public AWeapon
 	GENERATED_BODY()
 
 public:
-	UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category = "Timeline")
+	UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category = "Weapon | Swarm")
 	TObjectPtr<UTimelineComponent> TimelineComponent = nullptr;
 
-	UPROPERTY(EditDefaultsOnly, BlueprintReadWrite)
+	UPROPERTY(EditDefaultsOnly, BlueprintReadWrite, Category = "Weapon | Swarm")
 	TObjectPtr<UCurveFloat> SwarmCurve;
 
-	UPROPERTY(EditAnywhere, BlueprintReadWrite)
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Weapon | Swarm")
 	float TimelinePlayRate = 1;
 
-	UPROPERTY(EditDefaultsOnly, BlueprintReadWrite)
+	UPROPERTY(EditDefaultsOnly, BlueprintReadWrite, Category = "Weapon | Swarm")
 	TSubclassOf<ASwarmAgent> SwarmActor;
 
-	UPROPERTY(EditAnywhere, BlueprintReadWrite)
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Weapon | Swarm")
 	float Distance = 250.0f;
 
 private:

Source/vampires/Widgets/LevelUpWidget.cpp

@@ -43,7 +43,7 @@ void ULevelUpWidget::NativeConstruct()
 		TArray<UUpgradeButtonDataObject*> upgradeItems;
 		for (AWeapon* weapon : Inventory)
 		{
-			if (weapon->CurrentLevel < weapon->UpgradeDescriptions.Num())
+			if (weapon->GetWeaponLevel() < weapon->GetUpgradeDescriptions().Num())
 			{
 				UUpgradeButtonDataObject* Temp = NewObject<UUpgradeButtonDataObject>(this);
 				Temp->SetData(weapon, this);

Source/vampires/Widgets/StarterWeaponButtonDataObject.cpp

@@ -7,23 +7,22 @@
 
 void UStarterWeaponButtonDataObject::SetData(AWeapon* Weapon, UUserWidget* parent)
 {
-	WeaponName = Weapon->Name;
+	WeaponName = Weapon->GetWeaponName();
-	Description = Weapon->UpgradeDescriptions[Weapon->CurrentLevel];
+	WeaponIcon = Weapon->GetIcon();
-	WeaponIcon = Weapon->Icon;
 	WeaponInstance = Weapon;
 	Parent = parent;
+	
+	if (Weapon->GetUpgradeDescriptions().Num() > Weapon->GetWeaponLevel())
+	{
+		Description = Weapon->GetUpgradeDescriptions()[Weapon->GetWeaponLevel()];
+	}
 }
 
 void UStarterWeaponButtonDataObject::SetData(TSubclassOf<AWeapon> Weapon, UUserWidget* parent)
 {
-	AWeapon* temp = NewObject<AWeapon>(this, Weapon);
+	if (AWeapon* tempWeapon = NewObject<AWeapon>(this, Weapon))
-	if (temp)
 	{
-		WeaponName = temp->Name;
+		SetData(tempWeapon, parent);
-		Description = temp->Description;
-		WeaponIcon = temp->Icon;
-		WeaponTemplate = Weapon;
-		Parent = parent;
 	}
 }
 

Source/vampires/Widgets/UpgradeButtonDataObject.cpp

@@ -7,23 +7,22 @@
 
 void UUpgradeButtonDataObject::SetData(AWeapon* Weapon, UUserWidget* parent)
 {
-	WeaponName = Weapon->Name;
+	WeaponName = Weapon->GetWeaponName();
-	Description = Weapon->UpgradeDescriptions[Weapon->CurrentLevel];
+	WeaponIcon = Weapon->GetIcon();
-	WeaponIcon = Weapon->Icon;
 	WeaponInstance = Weapon;
 	Parent = parent;
+	
+	if (Weapon->GetUpgradeDescriptions().Num() > Weapon->GetWeaponLevel())
+	{
+		Description = Weapon->GetUpgradeDescriptions()[Weapon->GetWeaponLevel()];
+	}
 }
 
 void UUpgradeButtonDataObject::SetData(TSubclassOf<AWeapon> Weapon, UUserWidget* parent)
 {
-	AWeapon* temp = NewObject<AWeapon>(this, Weapon);
+	if (AWeapon* tempWeapon = NewObject<AWeapon>(this, Weapon))
-	if (temp)
 	{
-		WeaponName = temp->Name;
+		SetData(tempWeapon, parent);
-		Description = temp->Description;
-		WeaponIcon = temp->Icon;
-		WeaponTemplate = Weapon;
-		Parent = parent;
 	}
 }