diff --git a/Ethereal/Private/Characters/Enemy/Signet/EarthGolem.cpp b/Ethereal/Private/Characters/Enemy/Signet/EarthGolem.cpp index 39f1158..d2ac329 100644 --- a/Ethereal/Private/Characters/Enemy/Signet/EarthGolem.cpp +++ b/Ethereal/Private/Characters/Enemy/Signet/EarthGolem.cpp @@ -31,7 +31,7 @@ AEarthGolem::AEarthGolem(const FObjectInitializer& ObjectInitializer) NameText = LOCTEXT("EarthGolemText", "Earth Golem"); Realm = ERealms::R_Arcadia; BattleType = EBattleTypes::BT_Signet; - CommonDrop = EMasterGearList::GL_Potion; + CommonDrop = EMasterGearList::GL_RuneBow; UncommonDrop = EMasterGearList::GL_HuntersHood; RareDrop = EMasterGearList::GL_CrimsonHelm; AttackDelay = 2.0f; diff --git a/Ethereal/Private/Characters/Enemy/Signet/Ghost.cpp b/Ethereal/Private/Characters/Enemy/Signet/Ghost.cpp index de007ae..4f314c9 100644 --- a/Ethereal/Private/Characters/Enemy/Signet/Ghost.cpp +++ b/Ethereal/Private/Characters/Enemy/Signet/Ghost.cpp @@ -31,7 +31,7 @@ AGhost::AGhost(const FObjectInitializer& ObjectInitializer) NameText = LOCTEXT("GhostText", "Ghost"); Realm = ERealms::R_Arcadia; BattleType = EBattleTypes::BT_Signet; - CommonDrop = EMasterGearList::GL_Potion; + CommonDrop = EMasterGearList::GL_PulseArrow; UncommonDrop = EMasterGearList::GL_HuntersBoots; RareDrop = EMasterGearList::GL_CrimsonGreaves; AttackDelay = 2.0f; diff --git a/Ethereal/Private/Characters/Enemy/Signet/ProtoZhan.cpp b/Ethereal/Private/Characters/Enemy/Signet/ProtoZhan.cpp index 89c2658..6a4acf2 100644 --- a/Ethereal/Private/Characters/Enemy/Signet/ProtoZhan.cpp +++ b/Ethereal/Private/Characters/Enemy/Signet/ProtoZhan.cpp @@ -39,8 +39,8 @@ AProtoZhan::AProtoZhan(const FObjectInitializer& ObjectInitializer) NameText = LOCTEXT("ProtoZhanText", "Proto Zhan"); Realm = ERealms::R_Arcadia; BattleType = EBattleTypes::BT_Signet; - CommonDrop = EMasterGearList::GL_Potion; - UncommonDrop = EMasterGearList::GL_Potion; + CommonDrop = EMasterGearList::GL_DeathsVoid; + UncommonDrop = EMasterGearList::GL_Apocalypse; RareDrop = EMasterGearList::GL_Potion; AttackDelay = 1.0f; BaseEyeHeight = 16; diff --git a/Ethereal/Private/Characters/Enemy/Signet/SkyDragon.cpp b/Ethereal/Private/Characters/Enemy/Signet/SkyDragon.cpp index c53baa1..fef34b6 100644 --- a/Ethereal/Private/Characters/Enemy/Signet/SkyDragon.cpp +++ b/Ethereal/Private/Characters/Enemy/Signet/SkyDragon.cpp @@ -31,7 +31,7 @@ ASkyDragon::ASkyDragon(const FObjectInitializer& ObjectInitializer) NameText = LOCTEXT("SkyDragonText", "Sky Dragon"); Realm = ERealms::R_Arcadia; BattleType = EBattleTypes::BT_Signet; - CommonDrop = EMasterGearList::GL_Potion; + CommonDrop = EMasterGearList::GL_DragonShield; UncommonDrop = EMasterGearList::GL_HuntersCoat; RareDrop = EMasterGearList::GL_CrimsonBreastplate; AttackDelay = 2.0f; diff --git a/Ethereal/Private/Gear/Armor/Body/CrimsonBreastplate.cpp b/Ethereal/Private/Gear/Armor/Body/CrimsonBreastplate.cpp index 3b3edec..1a3ef05 100644 --- a/Ethereal/Private/Gear/Armor/Body/CrimsonBreastplate.cpp +++ b/Ethereal/Private/Gear/Armor/Body/CrimsonBreastplate.cpp @@ -43,13 +43,13 @@ ACrimsonBreastplate::ACrimsonBreastplate(const FObjectInitializer& ObjectInitial Type = EMasterGearTypes::GT_Body; TypeText = LOCTEXT("CrimsonBreastplateType", "Body"); Description = "Armor of Ethereal Regents."; - Price = 35000; + Price = 50000; MPCost = 0; - ATK = 10; - DEF = 15; - SPD = 8; - HP = 100; - MP = 50; + ATK = 15; + DEF = 10; + SPD = 15; + HP = 150; + MP = 75; SpecialEffectText = LOCTEXT("CrimsonBreastplateSpecialEffect", "+ Reraise Effect"); } diff --git a/Ethereal/Private/Gear/Armor/Body/HuntersCoat.cpp b/Ethereal/Private/Gear/Armor/Body/HuntersCoat.cpp index 5a0e92a..eb6b372 100644 --- a/Ethereal/Private/Gear/Armor/Body/HuntersCoat.cpp +++ b/Ethereal/Private/Gear/Armor/Body/HuntersCoat.cpp @@ -43,13 +43,13 @@ AHuntersCoat::AHuntersCoat(const FObjectInitializer& ObjectInitializer) Type = EMasterGearTypes::GT_Body; TypeText = LOCTEXT("HuntersCoatType", "Body"); Description = "Armor of Ethereal Hunters."; - Price = 20000; + Price = 45000; MPCost = 0; - ATK = 5; + ATK = 17; DEF = 5; SPD = 5; - HP = 100; - MP = 50; + HP = 50; + MP = 25; SpecialEffectText = LOCTEXT("HuntersCoatSpecialEffect", "Prevents Confuse."); } diff --git a/Ethereal/Private/Gear/Armor/Feet/CrimsonGreaves.cpp b/Ethereal/Private/Gear/Armor/Feet/CrimsonGreaves.cpp index e2e67fe..e10e9fc 100644 --- a/Ethereal/Private/Gear/Armor/Feet/CrimsonGreaves.cpp +++ b/Ethereal/Private/Gear/Armor/Feet/CrimsonGreaves.cpp @@ -43,13 +43,13 @@ ACrimsonGreaves::ACrimsonGreaves(const FObjectInitializer& ObjectInitializer) Type = EMasterGearTypes::GT_Feet; TypeText = LOCTEXT("CrimsonGreavesType", "Feet"); Description = "Armor of Ethereal Regents."; - Price = 35000; + Price = 50000; MPCost = 0; - ATK = 10; - DEF = 15; - SPD = 8; - HP = 100; - MP = 50; + ATK = 15; + DEF = 10; + SPD = 15; + HP = 150; + MP = 75; SpecialEffectText = LOCTEXT("CrimsonGreavesSpecialEffect", "Regen +10."); } diff --git a/Ethereal/Private/Gear/Armor/Feet/HuntersBoots.cpp b/Ethereal/Private/Gear/Armor/Feet/HuntersBoots.cpp index 071b242..8de2925 100644 --- a/Ethereal/Private/Gear/Armor/Feet/HuntersBoots.cpp +++ b/Ethereal/Private/Gear/Armor/Feet/HuntersBoots.cpp @@ -43,13 +43,13 @@ AHuntersBoots::AHuntersBoots(const FObjectInitializer& ObjectInitializer) Type = EMasterGearTypes::GT_Feet; TypeText = LOCTEXT("HuntersBootsType", "Feet"); Description = "Armor of Ethereal Hunters."; - Price = 20000; + Price = 45000; MPCost = 0; - ATK = 5; + ATK = 17; DEF = 5; SPD = 5; - HP = 100; - MP = 50; + HP = 50; + MP = 25; } // Called when the game starts or when spawned diff --git a/Ethereal/Private/Gear/Armor/Hand/CrimsonGauntlets.cpp b/Ethereal/Private/Gear/Armor/Hand/CrimsonGauntlets.cpp index 04d2503..3212975 100644 --- a/Ethereal/Private/Gear/Armor/Hand/CrimsonGauntlets.cpp +++ b/Ethereal/Private/Gear/Armor/Hand/CrimsonGauntlets.cpp @@ -43,13 +43,13 @@ ACrimsonGauntlets::ACrimsonGauntlets(const FObjectInitializer& ObjectInitializer Type = EMasterGearTypes::GT_Hand; TypeText = LOCTEXT("CrimsonGauntletsType", "Hands"); Description = "Armor of Ethereal Regents."; - Price = 35000; + Price = 50000; MPCost = 0; - ATK = 10; - DEF = 15; - SPD = 8; - HP = 100; - MP = 50; + ATK = 15; + DEF = 10; + SPD = 15; + HP = 150; + MP = 75; SpecialEffectText = LOCTEXT("CrimsonGauntletsSpecialEffect", "One Handed Damage +25%."); } diff --git a/Ethereal/Private/Gear/Armor/Hand/HuntersGloves.cpp b/Ethereal/Private/Gear/Armor/Hand/HuntersGloves.cpp index a86a769..d2f3910 100644 --- a/Ethereal/Private/Gear/Armor/Hand/HuntersGloves.cpp +++ b/Ethereal/Private/Gear/Armor/Hand/HuntersGloves.cpp @@ -43,13 +43,13 @@ AHuntersGloves::AHuntersGloves(const FObjectInitializer& ObjectInitializer) Type = EMasterGearTypes::GT_Hand; TypeText = LOCTEXT("HuntersGlovesType", "Hands"); Description = "Armor of Ethereal Hunters."; - Price = 20000; + Price = 45000; MPCost = 0; - ATK = 5; + ATK = 17; DEF = 5; SPD = 5; - HP = 100; - MP = 50; + HP = 50; + MP = 25; SpecialEffectText = LOCTEXT("HuntersGlovesSpecialEffect", "Ranged Damage +25%."); } diff --git a/Ethereal/Private/Gear/Armor/Head/CrimsonHelm.cpp b/Ethereal/Private/Gear/Armor/Head/CrimsonHelm.cpp index 7990554..d4d137e 100644 --- a/Ethereal/Private/Gear/Armor/Head/CrimsonHelm.cpp +++ b/Ethereal/Private/Gear/Armor/Head/CrimsonHelm.cpp @@ -43,13 +43,13 @@ ACrimsonHelm::ACrimsonHelm(const FObjectInitializer& ObjectInitializer) Type = EMasterGearTypes::GT_Head; TypeText = LOCTEXT("CrimsonHelmType", "Head"); Description = "Armor of Ethereal Regents."; - Price = 35000; + Price = 50000; MPCost = 0; - ATK = 10; - DEF = 15; - SPD = 8; - HP = 100; - MP = 50; + ATK = 15; + DEF = 10; + SPD = 15; + HP = 150; + MP = 75; SpecialEffectText = LOCTEXT("CrimsonHelmSpecialEffect", "Refresh +10."); } diff --git a/Ethereal/Private/Gear/Armor/Head/HuntersHood.cpp b/Ethereal/Private/Gear/Armor/Head/HuntersHood.cpp index ddf7f70..583cc9c 100644 --- a/Ethereal/Private/Gear/Armor/Head/HuntersHood.cpp +++ b/Ethereal/Private/Gear/Armor/Head/HuntersHood.cpp @@ -43,13 +43,13 @@ AHuntersHood::AHuntersHood(const FObjectInitializer& ObjectInitializer) Type = EMasterGearTypes::GT_Head; TypeText = LOCTEXT("HuntersHoodType", "Head"); Description = "Armor of Ethereal Hunters."; - Price = 20000; + Price = 45000; MPCost = 0; - ATK = 5; + ATK = 17; DEF = 5; SPD = 5; - HP = 100; - MP = 50; + HP = 50; + MP = 25; } // Called when the game starts or when spawned diff --git a/Ethereal/Private/Gear/Armor/Legs/CrimsonSlacks.cpp b/Ethereal/Private/Gear/Armor/Legs/CrimsonSlacks.cpp index 0948ae3..baa9996 100644 --- a/Ethereal/Private/Gear/Armor/Legs/CrimsonSlacks.cpp +++ b/Ethereal/Private/Gear/Armor/Legs/CrimsonSlacks.cpp @@ -43,13 +43,13 @@ ACrimsonSlacks::ACrimsonSlacks(const FObjectInitializer& ObjectInitializer) Type = EMasterGearTypes::GT_Legs; TypeText = LOCTEXT("CrimsonSlacksType", "Legs"); Description = "Armor of Ethereal Regents."; - Price = 35000; + Price = 50000; MPCost = 0; - ATK = 10; - DEF = 15; - SPD = 8; - HP = 100; - MP = 50; + ATK = 15; + DEF = 10; + SPD = 15; + HP = 150; + MP = 75; SpecialEffectText = LOCTEXT("CrimsonSlacksSpecialEffect", "Increases Movement Speed."); } diff --git a/Ethereal/Private/Gear/Armor/Legs/HuntersPants.cpp b/Ethereal/Private/Gear/Armor/Legs/HuntersPants.cpp index 00d0ee9..f51a38d 100644 --- a/Ethereal/Private/Gear/Armor/Legs/HuntersPants.cpp +++ b/Ethereal/Private/Gear/Armor/Legs/HuntersPants.cpp @@ -43,13 +43,13 @@ AHuntersPants::AHuntersPants(const FObjectInitializer& ObjectInitializer) Type = EMasterGearTypes::GT_Legs; TypeText = LOCTEXT("HuntersPantsType", "Legs"); Description = "Armor of Ethereal Hunters."; - Price = 1500; + Price = 45000; MPCost = 0; - ATK = 0; - DEF = 1; - SPD = 0; - HP = 10; - MP = 0; + ATK = 17; + DEF = 5; + SPD = 5; + HP = 50; + MP = 25; } // Called when the game starts or when spawned diff --git a/Ethereal/Private/Gear/Armor/Ring/DefendingRing.cpp b/Ethereal/Private/Gear/Armor/Ring/DefendingRing.cpp new file mode 100644 index 0000000..4ec83cb --- /dev/null +++ b/Ethereal/Private/Gear/Armor/Ring/DefendingRing.cpp @@ -0,0 +1,72 @@ +// © 2014 - 2016 Soverance Studios +// http://www.soverance.com + +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at + +// http://www.apache.org/licenses/LICENSE-2.0 + +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +#include "Ethereal.h" +#include "DefendingRing.h" + +#define LOCTEXT_NAMESPACE "EtherealText" + +// Sets default values +ADefendingRing::ADefendingRing(const FObjectInitializer& ObjectInitializer) + : Super(ObjectInitializer) +{ + // Get Assets, References Obtained Via Right Click in Editor + static ConstructorHelpers::FObjectFinder LargeIconObject(TEXT("Texture2D'/Game/Blueprints/Widgets/UI-Images/Icons_Gear/ArmorIcon_DefendingRing.ArmorIcon_DefendingRing'")); + static ConstructorHelpers::FObjectFinder SmallIconObject(TEXT("Texture2D'/Game/Blueprints/Widgets/UI-Images/Icons_Gear/ArmorIcon_DefendingRing-small.ArmorIcon_DefendingRing-small'")); + + // Set Default Objects + LargeIcon = LargeIconObject.Object; + SmallIcon = SmallIconObject.Object; + + // Set Default Values + Name = EMasterGearList::GL_DefendingRing; + NameText = LOCTEXT("DefendingRingName", "Defending Ring"); + Type = EMasterGearTypes::GT_Ring; + TypeText = LOCTEXT("DefendingRingType", "Ring"); + Description = "A sturdy ring carried only by the most stoic of Ethereal Knights."; + Price = 100000; + MPCost = 0; + ATK = 0; + DEF = 100; + SPD = 0; + HP = 999; + MP = 0; + SpecialEffectText = LOCTEXT("DefendingRingSpecialEffect", "Perfect Defense."); +} + +// Called when the game starts or when spawned +void ADefendingRing::BeginPlay() +{ + Super::BeginPlay(); + + // Bind this function to the event dispatcher for Bind Gear + OnBindGear.AddDynamic(this, &ADefendingRing::DoSpecialEffect); + OnRemoveGear.AddDynamic(this, &ADefendingRing::RemoveSpecialEffect); +} + + +// Custom code for Special Effect +void ADefendingRing::DoSpecialEffect() +{ + OwnerReference->HasShadowGear = true; +} + +// Custom code for Special Effect +void ADefendingRing::RemoveSpecialEffect() +{ + OwnerReference->HasShadowGear = false; +} + +#undef LOCTEXT_NAMESPACE diff --git a/Ethereal/Private/Gear/Weapons/OneHanded/Excalibur.cpp b/Ethereal/Private/Gear/Weapons/OneHanded/Excalibur.cpp index 786454e..28d43f2 100644 --- a/Ethereal/Private/Gear/Weapons/OneHanded/Excalibur.cpp +++ b/Ethereal/Private/Gear/Weapons/OneHanded/Excalibur.cpp @@ -94,7 +94,7 @@ void AExcalibur::BindWeapon() // Custom code when binding void AExcalibur::RemoveWeapon() { - Super::RemoveWeapon(); + //Super::RemoveWeapon(); HideWeapon(); AuraFX->Deactivate(); } diff --git a/Ethereal/Private/Gear/Weapons/OneHanded/Shields/DeathsVoid.cpp b/Ethereal/Private/Gear/Weapons/OneHanded/Shields/DeathsVoid.cpp index 85fb67f..63328b2 100644 --- a/Ethereal/Private/Gear/Weapons/OneHanded/Shields/DeathsVoid.cpp +++ b/Ethereal/Private/Gear/Weapons/OneHanded/Shields/DeathsVoid.cpp @@ -39,11 +39,11 @@ ADeathsVoid::ADeathsVoid(const FObjectInitializer& ObjectInitializer) Description = "A shield forged from pure darkness, signed by Death himself."; Price = 40000; MPCost = 0.0f; - ATK = 20.0f; - DEF = 20.0f; - SPD = 10.0f; - HP = 300.0f; - MP = 150.0f; + ATK = 30.0f; + DEF = 30.0f; + SPD = 30.0f; + HP = 500.0f; + MP = 250.0f; LargeIcon = LargeIconObject.Object; SmallIcon = SmallIconObject.Object; diff --git a/Ethereal/Private/Gear/Weapons/OneHanded/Shields/DragonShield.cpp b/Ethereal/Private/Gear/Weapons/OneHanded/Shields/DragonShield.cpp index 58501e6..8e56151 100644 --- a/Ethereal/Private/Gear/Weapons/OneHanded/Shields/DragonShield.cpp +++ b/Ethereal/Private/Gear/Weapons/OneHanded/Shields/DragonShield.cpp @@ -40,10 +40,10 @@ ADragonShield::ADragonShield(const FObjectInitializer& ObjectInitializer) Price = 40000; MPCost = 0.0f; ATK = 20.0f; - DEF = 20.0f; - SPD = 10.0f; - HP = 300.0f; - MP = 150.0f; + DEF = 15.0f; + SPD = 0.0f; + HP = 250.0f; + MP = 50.0f; LargeIcon = LargeIconObject.Object; SmallIcon = SmallIconObject.Object; diff --git a/Ethereal/Private/Gear/Weapons/OneHanded/Valkyrie.cpp b/Ethereal/Private/Gear/Weapons/OneHanded/Valkyrie.cpp new file mode 100644 index 0000000..d978dcf --- /dev/null +++ b/Ethereal/Private/Gear/Weapons/OneHanded/Valkyrie.cpp @@ -0,0 +1,105 @@ +// © 2014 - 2016 Soverance Studios +// http://www.soverance.com + +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at + +// http://www.apache.org/licenses/LICENSE-2.0 + +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +#include "Ethereal.h" +#include "Valkyrie.h" + +#define LOCTEXT_NAMESPACE "EtherealText" + +// Sets default values +AValkyrie::AValkyrie(const FObjectInitializer& ObjectInitializer) + : Super(ObjectInitializer) +{ + // Get Assets, References Obtained Via Right Click in Editor + static ConstructorHelpers::FObjectFinder SkeletalMeshObject(TEXT("SkeletalMesh'/Game/InfinityBladeWeapons/Weapons/Dual_Blade/Dual_Blade_Tech/SK_Valkyrie.SK_Valkyrie'")); + static ConstructorHelpers::FObjectFinder StaticMeshObject(TEXT("StaticMesh'/Game/VFX/sphere.sphere'")); + static ConstructorHelpers::FObjectFinder OffhandMeshObject(TEXT("StaticMesh'/Game/VFX/sphere.sphere'")); + static ConstructorHelpers::FObjectFinder LargeIconObject(TEXT("Texture2D'/Game/Blueprints/Widgets/UI-Images/Icons_Gear/WeaponIcon_Valkyrie.WeaponIcon_Valkyrie'")); + static ConstructorHelpers::FObjectFinder SmallIconObject(TEXT("Texture2D'/Game/Blueprints/Widgets/UI-Images/Icons_Gear/WeaponIcon_Valkyrie-small.WeaponIcon_Valkyrie-small'")); + static ConstructorHelpers::FObjectFinder AuraParticleObject(TEXT("ParticleSystem'/Game/ElementalSword/ParticleSystem/PS_ValkyrieAura.PS_ValkyrieAura'")); + + // Set Default Objects + Name = EMasterGearList::GL_Valkyrie; + NameText = LOCTEXT("ValkyrieName", "Valkyrie"); + Type = EMasterGearTypes::GT_OneHanded; + TypeText = LOCTEXT("ValkyrieType", "One-Handed"); + Description = "They say only God can judge them now - but they've never met me."; + Price = 60000; + MPCost = 0.0f; + ATK = 50.0f; + DEF = 50.0f; + SPD = 25.0f; + HP = 500.0f; + MP = 250.0f; + LargeIcon = LargeIconObject.Object; + SmallIcon = SmallIconObject.Object; + + SK_WeaponSkeletalMesh = SkeletalMeshObject.Object; + SM_WeaponStaticMesh = StaticMeshObject.Object; + SM_WeaponOffhandMesh = StaticMeshObject.Object; + P_AuraFX = AuraParticleObject.Object; + + // Set Mesh + WeaponSkeletalMesh->SetSkeletalMesh(SK_WeaponSkeletalMesh); + WeaponSkeletalMesh->SetRelativeLocation(FVector(0, 0, 10)); + WeaponSkeletalMesh->SetRelativeRotation(FRotator(0, 180, 0)); + WeaponSkeletalMesh->SetRelativeScale3D(FVector(1, 1, 1.4f)); + WeaponStaticMesh->SetStaticMesh(SM_WeaponStaticMesh); + WeaponOffhandMesh->SetStaticMesh(SM_WeaponOffhandMesh); + + SwordCollider->SetupAttachment(WeaponSkeletalMesh); + SwordCollider->SetBoxExtent(FVector(10.0f, 10.0f, 60.0f)); + SwordCollider->SetRelativeLocation(FVector(0.0f, 0.0f, 55.0f)); + + // Aura Effect + AuraFX = ObjectInitializer.CreateDefaultSubobject(this, TEXT("AuraFX")); + AuraFX->SetupAttachment(WeaponSkeletalMesh); + AuraFX->Template = P_AuraFX; + AuraFX->bAutoActivate = false; + AuraFX->SetRelativeLocation(FVector(0, 0, 0)); + AuraFX->SetRelativeRotation(FRotator(0, 0, 0)); + AuraFX->SetRelativeScale3D(FVector(1, 1, 1)); +} + +// Called when the game starts or when spawned +void AValkyrie::BeginPlay() +{ + Super::BeginPlay(); + + // Bind this function to the event dispatcher for Bind Gear + OnBindGear.AddDynamic(this, &AValkyrie::BindWeapon); + //OnRemoveGear.AddDynamic(this, &AValkyrie::RemoveWeapon); +} + +// Custom code when binding +void AValkyrie::BindWeapon() +{ + // If this weapon was bound while IsShown is true, set the weapon visible + if (IsShown) + { + ShowWeapon(true, false, false); + AuraFX->Activate(); + } +} + +// Custom code when binding +void AValkyrie::RemoveWeapon() +{ + //Super::RemoveWeapon(); + HideWeapon(); + AuraFX->Deactivate(); +} + +#undef LOCTEXT_NAMESPACE diff --git a/Ethereal/Private/Gear/Weapons/Ranged/RuneBow.cpp b/Ethereal/Private/Gear/Weapons/Ranged/RuneBow.cpp index b4721c3..c9322ae 100644 --- a/Ethereal/Private/Gear/Weapons/Ranged/RuneBow.cpp +++ b/Ethereal/Private/Gear/Weapons/Ranged/RuneBow.cpp @@ -33,14 +33,14 @@ ARuneBow::ARuneBow(const FObjectInitializer& ObjectInitializer) NameText = LOCTEXT("RuneBowName", "RuneBow"); Type = EMasterGearTypes::GT_Ranged; TypeText = LOCTEXT("RuneBowType", "Ranged"); - Description = "An embodiment of the Ethereal Virtue: Wrath."; - Price = 40000; + Description = "An ancient bow carved with glowing runes."; + Price = 45000; MPCost = 0.0f; - ATK = 50.0f; - DEF = 40.0f; - SPD = 20.0f; - HP = 500.0f; - MP = 250.0f; + ATK = 45.0f; + DEF = 55.0f; + SPD = 25.0f; + HP = 300.0f; + MP = 100.0f; LargeIcon = LargeIconObject.Object; SmallIcon = SmallIconObject.Object; diff --git a/Ethereal/Private/Gear/Weapons/TwoHanded/Apocalypse.cpp b/Ethereal/Private/Gear/Weapons/TwoHanded/Apocalypse.cpp index 8547b0e..2d60fed 100644 --- a/Ethereal/Private/Gear/Weapons/TwoHanded/Apocalypse.cpp +++ b/Ethereal/Private/Gear/Weapons/TwoHanded/Apocalypse.cpp @@ -26,8 +26,8 @@ AApocalypse::AApocalypse(const FObjectInitializer& ObjectInitializer) static ConstructorHelpers::FObjectFinder SkeletalMeshObject(TEXT("SkeletalMesh'/Game/VFX/sphere_skeletal.sphere_skeletal'")); static ConstructorHelpers::FObjectFinder StaticMeshObject(TEXT("StaticMesh'/Game/Weapons/TwoHanded/Apocalypse/Apocalypse.Apocalypse'")); static ConstructorHelpers::FObjectFinder OffhandMeshObject(TEXT("StaticMesh'/Game/VFX/sphere.sphere'")); - ConstructorHelpers::FObjectFinder LargeIconObject(TEXT("Texture2D'/Game/Blueprints/Widgets/UI-Images/Icons_Gear/WeaponIcon_Apocalypse.WeaponIcon_Apocalypse'")); - ConstructorHelpers::FObjectFinder SmallIconObject(TEXT("Texture2D'/Game/Blueprints/Widgets/UI-Images/Icons_Gear/WeaponIcon_Apocalypse-small.WeaponIcon_Apocalypse-small'")); + static ConstructorHelpers::FObjectFinder LargeIconObject(TEXT("Texture2D'/Game/Blueprints/Widgets/UI-Images/Icons_Gear/WeaponIcon_Apocalypse.WeaponIcon_Apocalypse'")); + static ConstructorHelpers::FObjectFinder SmallIconObject(TEXT("Texture2D'/Game/Blueprints/Widgets/UI-Images/Icons_Gear/WeaponIcon_Apocalypse-small.WeaponIcon_Apocalypse-small'")); // Set Default Objects @@ -36,14 +36,14 @@ AApocalypse::AApocalypse(const FObjectInitializer& ObjectInitializer) NameText = LOCTEXT("ApocalypseName", "Apocalypse"); Type = EMasterGearTypes::GT_TwoHanded; TypeText = LOCTEXT("ApocalypseType", "Two-Handed"); - Description = "An embodiment of the Ethereal Virtue: Apocalypse."; + Description = "Everything they've built will fall, and a new world born from the ashes."; Price = 40000; MPCost = 0.0f; - ATK = 50.0f; - DEF = 50.0f; - SPD = 15.0f; - HP = 500.0f; - MP = 250.0f; + ATK = 65.0f; + DEF = 30.0f; + SPD = 30.0f; + HP = 450.0f; + MP = 200.0f; LargeIcon = LargeIconObject.Object; SmallIcon = SmallIconObject.Object; diff --git a/Ethereal/Private/Gear/Weapons/TwoHanded/Claymore.cpp b/Ethereal/Private/Gear/Weapons/TwoHanded/Claymore.cpp index 7bbec5b..4b55756 100644 --- a/Ethereal/Private/Gear/Weapons/TwoHanded/Claymore.cpp +++ b/Ethereal/Private/Gear/Weapons/TwoHanded/Claymore.cpp @@ -25,8 +25,8 @@ AClaymore::AClaymore(const FObjectInitializer& ObjectInitializer) static ConstructorHelpers::FObjectFinder SkeletalMeshObject(TEXT("SkeletalMesh'/Game/VFX/sphere_skeletal.sphere_skeletal'")); static ConstructorHelpers::FObjectFinder StaticMeshObject(TEXT("StaticMesh'/Game/InfinityBladeFireLands/Environments/Forge/Env_Forge/StaticMesh/Claymore.Claymore'")); static ConstructorHelpers::FObjectFinder OffhandMeshObject(TEXT("StaticMesh'/Game/VFX/sphere.sphere'")); - ConstructorHelpers::FObjectFinder LargeIconObject(TEXT("Texture2D'/Game/Blueprints/Widgets/UI-Images/Icons_Gear/WeaponIcon_Claymore.WeaponIcon_Claymore'")); - ConstructorHelpers::FObjectFinder SmallIconObject(TEXT("Texture2D'/Game/Blueprints/Widgets/UI-Images/Icons_Gear/WeaponIcon_Claymore-small.WeaponIcon_Claymore-small'")); + static ConstructorHelpers::FObjectFinder LargeIconObject(TEXT("Texture2D'/Game/Blueprints/Widgets/UI-Images/Icons_Gear/WeaponIcon_Claymore.WeaponIcon_Claymore'")); + static ConstructorHelpers::FObjectFinder SmallIconObject(TEXT("Texture2D'/Game/Blueprints/Widgets/UI-Images/Icons_Gear/WeaponIcon_Claymore-small.WeaponIcon_Claymore-small'")); // Set Default Objects diff --git a/Ethereal/Private/Gear/Weapons/TwoHanded/Conquerer.cpp b/Ethereal/Private/Gear/Weapons/TwoHanded/Conquerer.cpp new file mode 100644 index 0000000..d3913f1 --- /dev/null +++ b/Ethereal/Private/Gear/Weapons/TwoHanded/Conquerer.cpp @@ -0,0 +1,83 @@ +// © 2014 - 2016 Soverance Studios +// http://www.soverance.com + +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at + +// http://www.apache.org/licenses/LICENSE-2.0 + +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +#include "Ethereal.h" +#include "Conquerer.h" + +#define LOCTEXT_NAMESPACE "EtherealText" + +// Sets default values +AConquerer::AConquerer(const FObjectInitializer& ObjectInitializer) + : Super(ObjectInitializer) +{ + // Get Assets, References Obtained Via Right Click in Editor + static ConstructorHelpers::FObjectFinder SkeletalMeshObject(TEXT("SkeletalMesh'/Game/InfinityBladeWeapons/Weapons/Blunt/Blunt_Hellhammer_Cine/SK_Conquerer.SK_Conquerer'")); + static ConstructorHelpers::FObjectFinder StaticMeshObject(TEXT("StaticMesh'/Game/VFX/sphere.sphere'")); + static ConstructorHelpers::FObjectFinder OffhandMeshObject(TEXT("StaticMesh'/Game/VFX/sphere.sphere'")); + static ConstructorHelpers::FObjectFinder LargeIconObject(TEXT("Texture2D'/Game/Blueprints/Widgets/UI-Images/Icons_Gear/WeaponIcon_Conquerer.WeaponIcon_Conquerer'")); + static ConstructorHelpers::FObjectFinder SmallIconObject(TEXT("Texture2D'/Game/Blueprints/Widgets/UI-Images/Icons_Gear/WeaponIcon_Conquerer-small.WeaponIcon_Conquerer-small'")); + + + // Set Default Objects + + Name = EMasterGearList::GL_Conquerer; + NameText = LOCTEXT("ConquererName", "Conquerer"); + Type = EMasterGearTypes::GT_TwoHanded; + TypeText = LOCTEXT("ConquererType", "Two-Handed"); + Description = "Every field watered in warrior's blood is sacred ground."; + Price = 40000; + MPCost = 0.0f; + ATK = 40.0f; + DEF = 40.0f; + SPD = 10.0f; + HP = 400.0f; + MP = 150.0f; + LargeIcon = LargeIconObject.Object; + SmallIcon = SmallIconObject.Object; + + SK_WeaponSkeletalMesh = SkeletalMeshObject.Object; + SM_WeaponStaticMesh = StaticMeshObject.Object; + SM_WeaponOffhandMesh = StaticMeshObject.Object; + + // Set Mesh + WeaponSkeletalMesh->SetSkeletalMesh(SK_WeaponSkeletalMesh); + WeaponStaticMesh->SetStaticMesh(SM_WeaponStaticMesh); + WeaponOffhandMesh->SetStaticMesh(SM_WeaponOffhandMesh); + + SwordCollider->SetupAttachment(WeaponSkeletalMesh); + SwordCollider->SetBoxExtent(FVector(20.0f, 30.0f, 55.0f)); + SwordCollider->SetRelativeLocation(FVector(0.0f, 0.0f, 60.0f)); +} + +// Called when the game starts or when spawned +void AConquerer::BeginPlay() +{ + Super::BeginPlay(); + + // Bind this function to the event dispatcher for Bind Gear + OnBindGear.AddDynamic(this, &AConquerer::BindWeapon); +} + +// Custom code when binding +void AConquerer::BindWeapon() +{ + // If this weapon was bound while IsShown is true, set the weapon visible + if (IsShown) + { + ShowWeapon(true, false, false); + } +} + +#undef LOCTEXT_NAMESPACE diff --git a/Ethereal/Private/Gear/Weapons/TwoHanded/Juggernaut.cpp b/Ethereal/Private/Gear/Weapons/TwoHanded/Juggernaut.cpp index ad3a2e7..1890780 100644 --- a/Ethereal/Private/Gear/Weapons/TwoHanded/Juggernaut.cpp +++ b/Ethereal/Private/Gear/Weapons/TwoHanded/Juggernaut.cpp @@ -26,8 +26,8 @@ AJuggernaut::AJuggernaut(const FObjectInitializer& ObjectInitializer) static ConstructorHelpers::FObjectFinder SkeletalMeshObject(TEXT("SkeletalMesh'/Game/InfinityBladeWeapons/Weapons/Blade/Axes/Blade_HeavyAxe/SK_Juggernaut.SK_Juggernaut'")); static ConstructorHelpers::FObjectFinder StaticMeshObject(TEXT("StaticMesh'/Game/VFX/sphere.sphere'")); static ConstructorHelpers::FObjectFinder OffhandMeshObject(TEXT("StaticMesh'/Game/VFX/sphere.sphere'")); - ConstructorHelpers::FObjectFinder LargeIconObject(TEXT("Texture2D'/Game/Blueprints/Widgets/UI-Images/Icons_Gear/WeaponIcon_Juggernaut.WeaponIcon_Juggernaut'")); - ConstructorHelpers::FObjectFinder SmallIconObject(TEXT("Texture2D'/Game/Blueprints/Widgets/UI-Images/Icons_Gear/WeaponIcon_Juggernaut-small.WeaponIcon_Juggernaut-small'")); + static ConstructorHelpers::FObjectFinder LargeIconObject(TEXT("Texture2D'/Game/Blueprints/Widgets/UI-Images/Icons_Gear/WeaponIcon_Juggernaut.WeaponIcon_Juggernaut'")); + static ConstructorHelpers::FObjectFinder SmallIconObject(TEXT("Texture2D'/Game/Blueprints/Widgets/UI-Images/Icons_Gear/WeaponIcon_Juggernaut-small.WeaponIcon_Juggernaut-small'")); // Set Default Objects diff --git a/Ethereal/Private/Gear/Weapons/TwoHanded/Marauder.cpp b/Ethereal/Private/Gear/Weapons/TwoHanded/Marauder.cpp index 63d0b00..9a6a6db 100644 --- a/Ethereal/Private/Gear/Weapons/TwoHanded/Marauder.cpp +++ b/Ethereal/Private/Gear/Weapons/TwoHanded/Marauder.cpp @@ -26,8 +26,8 @@ AMarauder::AMarauder(const FObjectInitializer& ObjectInitializer) static ConstructorHelpers::FObjectFinder SkeletalMeshObject(TEXT("SkeletalMesh'/Game/InfinityBladeWeapons/Weapons/Blade/Axes/Blade_IceElemental/SK_Marauder.SK_Marauder'")); static ConstructorHelpers::FObjectFinder StaticMeshObject(TEXT("StaticMesh'/Game/VFX/sphere.sphere'")); static ConstructorHelpers::FObjectFinder OffhandMeshObject(TEXT("StaticMesh'/Game/VFX/sphere.sphere'")); - ConstructorHelpers::FObjectFinder LargeIconObject(TEXT("Texture2D'/Game/Blueprints/Widgets/UI-Images/Icons_Gear/WeaponIcon_Marauder.WeaponIcon_Marauder'")); - ConstructorHelpers::FObjectFinder SmallIconObject(TEXT("Texture2D'/Game/Blueprints/Widgets/UI-Images/Icons_Gear/WeaponIcon_Marauder-small.WeaponIcon_Marauder-small'")); + static ConstructorHelpers::FObjectFinder LargeIconObject(TEXT("Texture2D'/Game/Blueprints/Widgets/UI-Images/Icons_Gear/WeaponIcon_Marauder.WeaponIcon_Marauder'")); + static ConstructorHelpers::FObjectFinder SmallIconObject(TEXT("Texture2D'/Game/Blueprints/Widgets/UI-Images/Icons_Gear/WeaponIcon_Marauder-small.WeaponIcon_Marauder-small'")); // Set Default Objects diff --git a/Ethereal/Private/Gear/Weapons/TwoHanded/Temperance.cpp b/Ethereal/Private/Gear/Weapons/TwoHanded/Temperance.cpp index 91b717a..062998b 100644 --- a/Ethereal/Private/Gear/Weapons/TwoHanded/Temperance.cpp +++ b/Ethereal/Private/Gear/Weapons/TwoHanded/Temperance.cpp @@ -26,8 +26,8 @@ ATemperance::ATemperance(const FObjectInitializer& ObjectInitializer) static ConstructorHelpers::FObjectFinder SkeletalMeshObject(TEXT("SkeletalMesh'/Game/InfinityBladeWeapons/Weapons/Blunt/Blunt_Temperance/SK_Temperance.SK_Temperance'")); static ConstructorHelpers::FObjectFinder StaticMeshObject(TEXT("StaticMesh'/Game/VFX/sphere.sphere'")); static ConstructorHelpers::FObjectFinder OffhandMeshObject(TEXT("StaticMesh'/Game/VFX/sphere.sphere'")); - ConstructorHelpers::FObjectFinder LargeIconObject(TEXT("Texture2D'/Game/Blueprints/Widgets/UI-Images/Icons_Gear/WeaponIcon_Temperance.WeaponIcon_Temperance'")); - ConstructorHelpers::FObjectFinder SmallIconObject(TEXT("Texture2D'/Game/Blueprints/Widgets/UI-Images/Icons_Gear/WeaponIcon_Temperance-small.WeaponIcon_Temperance-small'")); + static ConstructorHelpers::FObjectFinder LargeIconObject(TEXT("Texture2D'/Game/Blueprints/Widgets/UI-Images/Icons_Gear/WeaponIcon_Temperance.WeaponIcon_Temperance'")); + static ConstructorHelpers::FObjectFinder SmallIconObject(TEXT("Texture2D'/Game/Blueprints/Widgets/UI-Images/Icons_Gear/WeaponIcon_Temperance-small.WeaponIcon_Temperance-small'")); // Set Default Objects diff --git a/Ethereal/Private/Management/CommonLibrary.cpp b/Ethereal/Private/Management/CommonLibrary.cpp index db109cb..31147dc 100644 --- a/Ethereal/Private/Management/CommonLibrary.cpp +++ b/Ethereal/Private/Management/CommonLibrary.cpp @@ -34,6 +34,7 @@ #include "Gear/Weapons/OneHanded/Joyeuse.h" #include "Gear/Weapons/OneHanded/Hauteclaire.h" #include "Gear/Weapons/OneHanded/Excalibur.h" +#include "Gear/Weapons/OneHanded/Valkyrie.h" #include "Gear/Weapons/OneHanded/BalloonSword.h" #include "Gear/Weapons/OneHanded/BeamSaber.h" #include "Gear/Weapons/OneHanded/RubberChicken.h" @@ -60,6 +61,7 @@ #include "Gear/Weapons/TwoHanded/Marauder.h" #include "Gear/Weapons/TwoHanded/Juggernaut.h" #include "Gear/Weapons/TwoHanded/Claymore.h" +#include "Gear/Weapons/TwoHanded/Conquerer.h" #include "Gear/Weapons/TwoHanded/Temperance.h" #include "Gear/Weapons/TwoHanded/Apocalypse.h" // MAGIC ORBS @@ -136,7 +138,6 @@ #include "Gear/Armor/Feet/AssassinsBoots.h" #include "Gear/Armor/Feet/CrimsonGreaves.h" #include "Gear/Armor/Feet/HuntersBoots.h" - // RINGS #include "Gear/Armor/Ring/SilverRing.h" #include "Gear/Armor/Ring/DarksteelRing.h" @@ -144,6 +145,7 @@ #include "Gear/Armor/Ring/RestoreRing.h" #include "Gear/Armor/Ring/SneakRing.h" #include "Gear/Armor/Ring/FeralBand.h" +#include "Gear/Armor/Ring/DefendingRing.h" // SIGNET RINGS #include "Gear/Armor/Ring/AquaSignet.h" #include "Gear/Armor/Ring/FlameSignet.h" @@ -295,6 +297,9 @@ AEtherealGearMaster* UCommonLibrary::CreateGear(UObject* GearOwner, EMasterGearL case EMasterGearList::GL_Excalibur: GearClass = AExcalibur::StaticClass(); break; + case EMasterGearList::GL_Valkyrie: + GearClass = AValkyrie::StaticClass(); + break; case EMasterGearList::GL_BalloonSword: GearClass = ABalloonSword::StaticClass(); break; @@ -376,6 +381,9 @@ AEtherealGearMaster* UCommonLibrary::CreateGear(UObject* GearOwner, EMasterGearL case EMasterGearList::GL_Marauder: GearClass = AMarauder::StaticClass(); break; + case EMasterGearList::GL_Conquerer: + GearClass = AConquerer::StaticClass(); + break; case EMasterGearList::GL_Temperance: GearClass = ATemperance::StaticClass(); break; @@ -627,6 +635,9 @@ AEtherealGearMaster* UCommonLibrary::CreateGear(UObject* GearOwner, EMasterGearL case EMasterGearList::GL_FeralBand: GearClass = AFeralBand::StaticClass(); break; + case EMasterGearList::GL_DefendingRing: + GearClass = ADefendingRing::StaticClass(); + break; /////////////////////////////// // ARMOR - SIGNET RINGS diff --git a/Ethereal/Public/Gear/Armor/Ring/DefendingRing.h b/Ethereal/Public/Gear/Armor/Ring/DefendingRing.h new file mode 100644 index 0000000..b0b9615 --- /dev/null +++ b/Ethereal/Public/Gear/Armor/Ring/DefendingRing.h @@ -0,0 +1,40 @@ +// © 2014 - 2016 Soverance Studios +// http://www.soverance.com + +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at + +// http://www.apache.org/licenses/LICENSE-2.0 + +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +#pragma once + +#include "Gear/Armor/Armor_Master.h" +#include "DefendingRing.generated.h" + +UCLASS() +class ETHEREAL_API ADefendingRing : public AArmor_Master +{ + GENERATED_BODY() + +public: + + ADefendingRing(const FObjectInitializer& ObjectInitializer); + + // BeginPlay Override + virtual void BeginPlay() override; + + // This applies any special effect associated with the item + UFUNCTION(BlueprintCallable, Category = Controls) + void DoSpecialEffect(); + + // This removes any special effect associated with the item + UFUNCTION(BlueprintCallable, Category = Controls) + void RemoveSpecialEffect(); +}; diff --git a/Ethereal/Public/Gear/MasterGearList.h b/Ethereal/Public/Gear/MasterGearList.h index 9c6b66e..6e10e46 100644 --- a/Ethereal/Public/Gear/MasterGearList.h +++ b/Ethereal/Public/Gear/MasterGearList.h @@ -51,13 +51,13 @@ GL_Joyeuse UMETA(DisplayName = "Joyeuse"), GL_Hauteclaire UMETA(DisplayName = "Hauteclaire"), GL_Excalibur UMETA(DisplayName = "Excalibur"), + GL_Valkyrie UMETA(DisplayName = "Valkyrie"), // Novelty GL_BalloonSword UMETA(DisplayName = "Balloon Sword"), GL_BeamSaber UMETA(DisplayName = "Beam Saber"), GL_RubberChicken UMETA(DisplayName = "Rubber Chicken"), - // Shields GL_WarAspis UMETA(DisplayName = "War Aspis"), GL_SpartanShield UMETA(DisplayName = "Spartan Shield"), @@ -84,6 +84,7 @@ GL_Juggernaut UMETA(DisplayName = "Juggernaut"), GL_Claymore UMETA(DisplayName = "Claymore"), GL_Marauder UMETA(DisplayName = "Marauder"), + GL_Conquerer UMETA(DisplayName = "Conquerer"), GL_Temperance UMETA(DisplayName = "Temperance"), GL_Apocalypse UMETA(DisplayName = "Apocalypse"), @@ -180,6 +181,7 @@ GL_RestoreRing UMETA(DisplayName = "Restore Ring"), GL_SneakRing UMETA(DisplayName = "Sneak Ring"), GL_FeralBand UMETA(DisplayName = "Feral Band"), + GL_DefendingRing UMETA(DisplayName = "Defending Ring"), // SIGNET RINGS GL_AquaSignet UMETA(DisplayName = "Aqua Signet"), diff --git a/Ethereal/Public/Gear/Weapons/OneHanded/Valkyrie.h b/Ethereal/Public/Gear/Weapons/OneHanded/Valkyrie.h new file mode 100644 index 0000000..9325b1e --- /dev/null +++ b/Ethereal/Public/Gear/Weapons/OneHanded/Valkyrie.h @@ -0,0 +1,49 @@ +// © 2014 - 2016 Soverance Studios +// http://www.soverance.com + +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at + +// http://www.apache.org/licenses/LICENSE-2.0 + +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +#pragma once + +#include "Gear/Weapons/Weapon_Master.h" +#include "Valkyrie.generated.h" + +UCLASS() +class ETHEREAL_API AValkyrie : public AWeapon_Master +{ + GENERATED_BODY() + +public: + + AValkyrie(const FObjectInitializer& ObjectInitializer); + + // BeginPlay Override + virtual void BeginPlay() override; + + // Collider + UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Collision) + UBoxComponent* SwordCollider = CreateDefaultSubobject(TEXT("SwordCollider")); + + // Aura FX + UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Effects) + UParticleSystemComponent* AuraFX; + UParticleSystem* P_AuraFX; + + // Binds the item. + UFUNCTION(BlueprintCallable, Category = Controls) + void BindWeapon(); + + // Removes the item. + UFUNCTION(BlueprintCallable, Category = Controls) + void RemoveWeapon(); +}; diff --git a/Ethereal/Public/Gear/Weapons/TwoHanded/Conquerer.h b/Ethereal/Public/Gear/Weapons/TwoHanded/Conquerer.h new file mode 100644 index 0000000..0df0f80 --- /dev/null +++ b/Ethereal/Public/Gear/Weapons/TwoHanded/Conquerer.h @@ -0,0 +1,40 @@ +// © 2014 - 2016 Soverance Studios +// http://www.soverance.com + +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at + +// http://www.apache.org/licenses/LICENSE-2.0 + +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +#pragma once + +#include "Gear/Weapons/Weapon_Master.h" +#include "Conquerer.generated.h" + +UCLASS() +class ETHEREAL_API AConquerer : public AWeapon_Master +{ + GENERATED_BODY() + +public: + + AConquerer(const FObjectInitializer& ObjectInitializer); + + // BeginPlay Override + virtual void BeginPlay() override; + + // Collider + UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Collision) + UBoxComponent* SwordCollider = CreateDefaultSubobject(TEXT("SwordCollider")); + + // Binds the item. + UFUNCTION(BlueprintCallable, Category = Controls) + void BindWeapon(); +};