diff --git a/Content/Weapons/Pentagram/BP_PentagramWeapon.uasset b/Content/Weapons/Pentagram/BP_PentagramWeapon.uasset index dfb5fa8..e4b9ae2 100644 --- a/Content/Weapons/Pentagram/BP_PentagramWeapon.uasset +++ b/Content/Weapons/Pentagram/BP_PentagramWeapon.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2ef5a15c8a243ddadce18effdfb741c3b03c0abc1cd07faa8c1fdc780bb8d71d -size 23836 +oid sha256:0ba766498c0277dfec28e1933e6384d375b5710986a886aff7f666919940ff34 +size 24248 diff --git a/Source/vampires/Weapons/PentagramWeapon.cpp b/Source/vampires/Weapons/PentagramWeapon.cpp index d218690..3fc33ce 100644 --- a/Source/vampires/Weapons/PentagramWeapon.cpp +++ b/Source/vampires/Weapons/PentagramWeapon.cpp @@ -62,6 +62,42 @@ void APentagramWeapon::FireWeaponAction_Implementation() } } +bool APentagramWeapon::UpgradeWeapon_Implementation() +{ + if (!Super::UpgradeWeapon_Implementation()) return false; + + switch (CurrentLevel) + { + case 1: + WeaponCooldown -= 5.0f; + break; + case 2: + WeaponCooldown -= 5.0f; + break; + case 3: + WeaponCooldown -= 5.0f; + break; + case 4: + WeaponCooldown -= 5.0f; + break; + case 5: + WeaponCooldown -= 5.0f; + break; + case 6: + WeaponCooldown -= 2.5f; + break; + case 7: + WeaponCooldown -= 2.5f; + break; + default: + return false; + } + + ResetWeaponTimer(); + + return true; +} + void APentagramWeapon::OnBeginOverlap(UPrimitiveComponent* OverlappedComponent, AActor* OtherActor, UPrimitiveComponent* OtherComp, int32 OtherBodyIndex, bool bFromSweep, const FHitResult& SweepResult) diff --git a/Source/vampires/Weapons/PentagramWeapon.h b/Source/vampires/Weapons/PentagramWeapon.h index 6f01261..5ff2b89 100644 --- a/Source/vampires/Weapons/PentagramWeapon.h +++ b/Source/vampires/Weapons/PentagramWeapon.h @@ -35,6 +35,8 @@ protected: public: virtual void FireWeaponAction_Implementation() override; + bool UpgradeWeapon_Implementation() override; + protected: UFUNCTION() void OnBeginOverlap(UPrimitiveComponent* OverlappedComponent, AActor* OtherActor,