Add base weapon upgrading

Source/vampires/Weapon.cpp

@@ -32,6 +32,22 @@ void AWeapon::FireWeaponAction_Implementation()
 	// Do stuff
 }
 
-void AWeapon::UpgradeWeapon(int newLevel)
+bool AWeapon::UpgradeWeapon()
 {
+	return UpgradeWeapon(CurrentLevel + 1);
+}
+
+bool AWeapon::UpgradeWeapon(int newLevel)
+{
+	if (newLevel < Upgrades.Num())
+	{
+		WeaponCooldown *= Upgrades[newLevel].WeaponCooldownMultiplier;
+		Damage *= Upgrades[newLevel].WeaponDamageMultiplier;
+		
+		GetWorldTimerManager().ClearTimer(WeaponTimerHandle);
+		GetWorldTimerManager().SetTimer(WeaponTimerHandle, this, &AWeapon::FireWeaponAction, WeaponCooldown, true);
+		return true;
+	}
+	
+	return false;
 }

Source/vampires/Weapon.h

@@ -6,23 +6,33 @@
 #include "GameFramework/Actor.h"
 #include "Weapon.generated.h"
 
+class UPaperSprite;
 class UWeaponDataAsset;
 
+USTRUCT(BlueprintType)
+struct FWeaponLevelUpgrades
+{
+	GENERATED_BODY()
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, meta = (ClampMin = 0.01f, ClampMax = 1.0f))
+	float WeaponCooldownMultiplier = 1.0f;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, meta = (ClampMin = 0.01f))
+	float WeaponDamageMultiplier = 1.0f;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, meta = (ClampMin = 0.01f))
+	float WeaponRangeMultiplier = 1.0f;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite)
+	FText WeaponUpgradeText;
+};
+
 UCLASS()
 class VAMPIRES_API AWeapon : public AActor
 {
 	GENERATED_BODY()
 
 public:
-	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Weapon Properties")
-	float WeaponCooldown = 1.0f;
-
-	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Weapon Properties")
-	float Damage;
-
-	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Weapon Properties")
-	TObjectPtr<UWeaponDataAsset> WeaponDataAsset;
-
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Weapon Properties")
 	FText Name;
 
@@ -32,9 +42,26 @@ public:
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Weapon Properties")
 	TObjectPtr<UTexture2D> Icon;
 
+	UPROPERTY(EditDefaultsOnly, Category = "Weapon Properties")
+	USoundBase* WeaponActivatedSoundBase = nullptr;
+
+	UPROPERTY(EditDefaultsOnly, Category = "Weapon Properties")
+	TObjectPtr<UPaperSprite> WeaponSprite = nullptr;
+	
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Weapon Properties")
+	float WeaponCooldown = 1.0f;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Weapon Properties")
+	float Damage;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Weapon Properties")
+	TArray<FWeaponLevelUpgrades> Upgrades = TArray<FWeaponLevelUpgrades>();
+
 private:
 	FTimerHandle WeaponTimerHandle;
 
+	int CurrentLevel = 0;
+
 public:
 	// Sets default values for this actor's properties
 	AWeapon();
@@ -49,5 +76,6 @@ public:
 	virtual void FireWeaponAction_Implementation();
 
 	UFUNCTION()
-	virtual void UpgradeWeapon(int newLevel);
+	virtual bool UpgradeWeapon();
+	virtual bool UpgradeWeapon(int newLevel);
 };

Source/vampires/Weapons/WeaponDataAsset.cpp

@@ -1,4 +0,0 @@
-// Fill out your copyright notice in the Description page of Project Settings.
-
-
-#include "WeaponDataAsset.h"

Source/vampires/Weapons/WeaponDataAsset.h

@@ -1,50 +0,0 @@
-// Fill out your copyright notice in the Description page of Project Settings.
-
-#pragma once
-
-#include "CoreMinimal.h"
-#include "Engine/DataAsset.h"
-#include "WeaponDataAsset.generated.h"
-
-class UPaperSprite;
-class AProjectile;
-
-USTRUCT(BlueprintType)
-struct FWeaponLevelUpgrades
-{
-	GENERATED_BODY()
-
-	UPROPERTY(EditAnywhere, BlueprintReadWrite)
-	float WeaponCooldownMultiplier;
-
-	UPROPERTY(EditAnywhere, BlueprintReadWrite)
-	float WeaponDamageMultiplier;
-
-	UPROPERTY(EditAnywhere, BlueprintReadWrite)
-	float WeaponRangeMultiplier;
-
-	UPROPERTY(EditAnywhere, BlueprintReadWrite)
-	FText WeaponUpgradeText;
-};
-
-/**
- * 
- */
-UCLASS(BlueprintType)
-class VAMPIRES_API UWeaponDataAsset : public UDataAsset
-{
-	GENERATED_BODY()
-
-public:
-	UPROPERTY(EditDefaultsOnly, Category = "Weapon Properties")
-	TSubclassOf<AProjectile> ProjectileTemplate = nullptr;
-
-	UPROPERTY(EditDefaultsOnly, Category = "Weapon Properties")
-	USoundBase* WeaponActivatedSoundBase = nullptr;
-
-	UPROPERTY(EditDefaultsOnly, Category = "Weapon Properties")
-	TObjectPtr<UPaperSprite> WeaponSprite = nullptr;
-
-	UPROPERTY(EditDefaultsOnly, Category = "Weapon Upgrades")
-	TArray<FWeaponLevelUpgrades> WeaponLevelUpgrades = TArray<FWeaponLevelUpgrades>();
-};