Source/vampires/EXPComponent.cpp

@@ -17,15 +17,14 @@ void UEXPComponent::IncrementEXP(int value)
 {
 	// TODO: I should be updating the level here
 	CurrentEXP += value;
-	OnEXPGained.ExecuteIfBound(value);
+	OnEXPGained.ExecuteIfBound();
-	OnEXPLevelUp.ExecuteIfBound(CurrentLevel);
 }
 
 void UEXPComponent::SetCurrentEXP(int value)
 {
 	// TODO: I should be updating the level here
 	CurrentEXP = value;
-	OnEXPGained.ExecuteIfBound(value);
+	OnEXPGained.ExecuteIfBound();
 }
 
 int UEXPComponent::GetCurrentEXP()
@@ -42,8 +41,6 @@ void UEXPComponent::Reset()
 {
 	CurrentEXP = 0;
 	CurrentLevel = 0;
-	OnEXPGained.ExecuteIfBound(CurrentEXP);
-	OnEXPLevelUp.ExecuteIfBound(CurrentLevel);
 }
 
 // Called when the game starts

Source/vampires/EXPComponent.h

@@ -6,8 +6,8 @@
 #include "Components/ActorComponent.h"
 #include "EXPComponent.generated.h"
 
-DECLARE_DELEGATE_OneParam(FOnEXPGainedDelegate, int)
+DECLARE_DELEGATE(FOnEXPGainedDelegate)
-DECLARE_DELEGATE_OneParam(FOnEXPLevelUpDelegate, int)
+DECLARE_DELEGATE(FOnEXPLevelUpDelegate)
 
 UCLASS(ClassGroup=(Custom), meta=(BlueprintSpawnableComponent))
 class VAMPIRES_API UEXPComponent : public UActorComponent

Source/vampires/PlayerCharacter.cpp

@@ -38,9 +38,6 @@ APlayerCharacter::APlayerCharacter()
 	GarlicSphereComponent = CreateDefaultSubobject<USphereComponent>(TEXT("Garlic Sphere Component"));
 	GarlicSphereComponent->SetupAttachment(RootComponent);
 	GarlicSphereComponent->SetSphereRadius(150.0f);
-
-	//Create Weapon Inventory Component
-	WeaponInventoryComponent = CreateDefaultSubobject<UWeaponInventoryComponent>(TEXT("Weapon Inventory Component"));
 }
 
 void APlayerCharacter::BeginPlay()

Source/vampires/PlayerCharacter.h

@@ -7,7 +7,6 @@
 #include "EXPComponent.h"
 #include "GoldComponent.h"
 #include "VampireCharacter.h"
-#include "WeaponInventoryComponent.h"
 #include "Camera/CameraComponent.h"
 #include "Components/SphereComponent.h"
 #include "GameFramework/SpringArmComponent.h"
@@ -43,21 +42,19 @@ public:
 	UPROPERTY(EditDefaultsOnly, BlueprintReadWrite)
 	float GarlicUpdateTime = 1.0f;
 
+protected:
+	UPROPERTY()
+	UEXPComponent* EXPComponent;
+
 	UPROPERTY(VisibleAnywhere)
 	USphereComponent* GarlicSphereComponent;
 
-	UPROPERTY(EditAnywhere, BlueprintReadWrite)
+	UPROPERTY()
 	TArray<AEnemyCharacter*> OverlappedEnemies;
 
-	UPROPERTY(EditAnywhere, BlueprintReadWrite)
+	UPROPERTY()
-	UEXPComponent* EXPComponent;
-
-	UPROPERTY(EditAnywhere, BlueprintReadWrite)
 	UGoldComponent* GoldComponent;
 
-	UPROPERTY(EditAnywhere, BlueprintReadWrite)
-	UWeaponInventoryComponent* WeaponInventoryComponent;
-
 private:
 	FTimerHandle GarlicTimerHandle;
 

Source/vampires/Weapon.cpp

@@ -1,33 +0,0 @@
-// Fill out your copyright notice in the Description page of Project Settings.
-
-
-#include "Weapon.h"
-
-#include "EXPComponent.h"
-
-// Sets default values
-AWeapon::AWeapon()
-{
- 	// Set this actor to call Tick() every frame.  You can turn this off to improve performance if you don't need it.
-	PrimaryActorTick.bCanEverTick = false;
-}
-
-// Called when the game starts or when spawned
-void AWeapon::BeginPlay()
-{
-	Super::BeginPlay();
-	GetWorldTimerManager().SetTimer(WeaponTimerHandle, this, &AWeapon::FireWeaponAction, WeaponCooldown, true);
-	UEXPComponent* expcomponent = GetOwner()->GetComponentByClass<UEXPComponent>();
-	if (expcomponent)
-	{
-		expcomponent->OnEXPLevelUp.BindUObject(this, &AWeapon::UpgradeWeapon);
-	}
-}
-
-void AWeapon::FireWeaponAction()
-{
-}
-
-void AWeapon::UpgradeWeapon(int newLevel)
-{
-}

Source/vampires/Weapon.h

@@ -1,36 +0,0 @@
-// Fill out your copyright notice in the Description page of Project Settings.
-
-#pragma once
-
-#include "CoreMinimal.h"
-#include "GameFramework/Actor.h"
-#include "Weapon.generated.h"
-
-UCLASS()
-class VAMPIRES_API AWeapon : public AActor
-{
-	GENERATED_BODY()
-
-public:
-
-	UPROPERTY()
-	float WeaponCooldown = 1.0f;
-	
-private:
-	FTimerHandle WeaponTimerHandle;
-	
-public:	
-	// Sets default values for this actor's properties
-	AWeapon();
-
-protected:
-	// Called when the game starts or when spawned
-	virtual void BeginPlay() override;
-public:
-	
-	UFUNCTION(BlueprintCallable)
-	virtual void FireWeaponAction();
-
-	UFUNCTION()
-	virtual void UpgradeWeapon(int newLevel);
-};

Source/vampires/WeaponInventoryComponent.cpp

@@ -1,46 +0,0 @@
-// Fill out your copyright notice in the Description page of Project Settings.
-
-
-#include "WeaponInventoryComponent.h"
-
-#include "Kismet/GameplayStatics.h"
-
-// Sets default values for this component's properties
-UWeaponInventoryComponent::UWeaponInventoryComponent()
-{
-	// Set this component to be initialized when the game starts, and to be ticked every frame.  You can turn these features
-	// off to improve performance if you don't need them.
-	PrimaryComponentTick.bCanEverTick = false;
-
-	// ...
-}
-
-
-// Called when the game starts
-void UWeaponInventoryComponent::BeginPlay()
-{
-	Super::BeginPlay();
-
-	// ...
-	
-}
-
-void UWeaponInventoryComponent::InitializeInventory()
-{
-	inventory.Empty();
-
-	for (TSubclassOf<AWeapon> weapon : initialInventory)
-	{
-		AddWeaponToInventory(weapon);
-	}
-}
-
-void UWeaponInventoryComponent::AddWeaponToInventory(TSubclassOf<AWeapon> Weapon)
-{
-	AWeapon* weapon = GetWorld()->SpawnActor<AWeapon>(Weapon);
-	weapon->SetActorTransform(GetOwner()->GetTransform());
-	weapon->SetOwner(GetOwner());
-	weapon->AttachToActor(GetOwner(), FAttachmentTransformRules::KeepRelativeTransform);
-	inventory.Add(weapon);
-}
-

Source/vampires/WeaponInventoryComponent.h

@@ -1,41 +0,0 @@
-// Fill out your copyright notice in the Description page of Project Settings.
-
-#pragma once
-
-#include "CoreMinimal.h"
-#include "Weapon.h"
-#include "Components/ActorComponent.h"
-#include "WeaponInventoryComponent.generated.h"
-
-
-UCLASS( ClassGroup=(Custom), meta=(BlueprintSpawnableComponent) )
-class VAMPIRES_API UWeaponInventoryComponent : public UActorComponent
-{
-	GENERATED_BODY()
-
-public:
-
-	UPROPERTY()
-	TArray<TSubclassOf<AWeapon>> initialInventory;
-	
-private:
-	UPROPERTY()
-	TArray<AWeapon*> inventory;
-	
-public:	
-	// Sets default values for this component's properties
-	UWeaponInventoryComponent();
-
-protected:
-	// Called when the game starts
-	virtual void BeginPlay() override;
-
-	
-public:
-
-	UFUNCTION()
-	void InitializeInventory();
-	
-	UFUNCTION()
-	void AddWeaponToInventory(TSubclassOf<AWeapon> Weapon);
-};