diff --git a/Content/Weapons/FireWand/BP_FireWandWeapon.uasset b/Content/Weapons/FireWand/BP_FireWandWeapon.uasset index 1876d50..e57ce99 100644 --- a/Content/Weapons/FireWand/BP_FireWandWeapon.uasset +++ b/Content/Weapons/FireWand/BP_FireWandWeapon.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b3144c811a307f21ecc7b915d375e59e4e75c6b51e1cd4c347a2712ebd15e1f2 -size 25300 +oid sha256:41d274db0dc269c4f7712216dd9346f6292ecf398b967ba1a2b2786e6d6e9d8f +size 24461 diff --git a/Source/vampires/Weapons/FireWandWeapon.cpp b/Source/vampires/Weapons/FireWandWeapon.cpp index 9cd546b..a881352 100644 --- a/Source/vampires/Weapons/FireWandWeapon.cpp +++ b/Source/vampires/Weapons/FireWandWeapon.cpp @@ -9,6 +9,7 @@ #include "vampires/ObjectPoolManager.h" #include "vampires/Interfaces/Pools.h" #include "vampires/Projectile.h" +#include "vampires/ProjectileDataAsset.h" AFireWandWeapon::AFireWandWeapon() { @@ -50,3 +51,41 @@ void AFireWandWeapon::FireWeaponAction_Implementation() } } } + +bool AFireWandWeapon::UpgradeWeapon_Implementation() +{ + if (!Super::UpgradeWeapon_Implementation()) return false; + + switch (CurrentLevel) + { + case 1: + Damage += 10; + break; + case 2: + Damage += 10; + ProjectileTemplate->ProjectileSpeed *= 1.2f; + break; + case 3: + Damage += 10; + break; + case 4: + Damage += 10; + ProjectileTemplate->ProjectileSpeed *= 1.2f; + break; + case 5: + Damage += 10; + break; + case 6: + Damage += 10; + ProjectileTemplate->ProjectileSpeed *= 1.2f; + break; + case 7: + Damage += 10; + break; + default: + return false; + } + + ResetWeaponTimer(); + return true; +} diff --git a/Source/vampires/Weapons/FireWandWeapon.h b/Source/vampires/Weapons/FireWandWeapon.h index 3069f47..c7007ee 100644 --- a/Source/vampires/Weapons/FireWandWeapon.h +++ b/Source/vampires/Weapons/FireWandWeapon.h @@ -22,4 +22,6 @@ protected: public: virtual void FireWeaponAction_Implementation() override; + + virtual bool UpgradeWeapon_Implementation() override; };