diff --git a/Ethereal/Private/Gear/Weapons/OneHanded/Shields/Aegis.cpp b/Ethereal/Private/Gear/Weapons/OneHanded/Shields/Aegis.cpp index c74e3e8..562412d 100644 --- a/Ethereal/Private/Gear/Weapons/OneHanded/Shields/Aegis.cpp +++ b/Ethereal/Private/Gear/Weapons/OneHanded/Shields/Aegis.cpp @@ -24,7 +24,7 @@ AAegis::AAegis(const FObjectInitializer& ObjectInitializer) { // Get Assets, References Obtained Via Right Click in Editor static ConstructorHelpers::FObjectFinder SkeletalMeshObject(TEXT("SkeletalMesh'/Game/VFX/sphere_skeletal.sphere_skeletal'")); - static ConstructorHelpers::FObjectFinder StaticMeshObject(TEXT("StaticMesh'/Game/Weapons/Shields/AegisShield.AegisShield'")); + static ConstructorHelpers::FObjectFinder StaticMeshObject(TEXT("StaticMesh'/Game/Weapons/Shields/Aegis/AegisShield.AegisShield'")); static ConstructorHelpers::FObjectFinder OffhandMeshObject(TEXT("StaticMesh'/Game/VFX/sphere.sphere'")); ConstructorHelpers::FObjectFinder LargeIconObject(TEXT("Texture2D'/Game/Blueprints/Widgets/UI-Images/Icons_Gear/WeaponIcon_Aegis.WeaponIcon_Aegis'")); ConstructorHelpers::FObjectFinder SmallIconObject(TEXT("Texture2D'/Game/Blueprints/Widgets/UI-Images/Icons_Gear/WeaponIcon_Aegis-small.WeaponIcon_Aegis-small'")); diff --git a/Ethereal/Private/Gear/Weapons/OneHanded/Shields/DeathsVoid.cpp b/Ethereal/Private/Gear/Weapons/OneHanded/Shields/DeathsVoid.cpp new file mode 100644 index 0000000..bd77882 --- /dev/null +++ b/Ethereal/Private/Gear/Weapons/OneHanded/Shields/DeathsVoid.cpp @@ -0,0 +1,87 @@ +// © 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 "DeathsVoid.h" + +#define LOCTEXT_NAMESPACE "EtherealText" + +// Sets default values +ADeathsVoid::ADeathsVoid(const FObjectInitializer& ObjectInitializer) + : Super(ObjectInitializer) +{ + // Get Assets, References Obtained Via Right Click in Editor + static ConstructorHelpers::FObjectFinder SkeletalMeshObject(TEXT("SkeletalMesh'/Game/Weapons/Shields/DeathsVoid/DeathsVoid.DeathsVoid'")); + 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_DeathsHead.WeaponIcon_DeathsHead'")); + ConstructorHelpers::FObjectFinder SmallIconObject(TEXT("Texture2D'/Game/Blueprints/Widgets/UI-Images/Icons_Gear/WeaponIcon_DeathsHead-small.WeaponIcon_DeathsHead-small'")); + + + // Set Default Objects + + Name = EMasterGearList::GL_DeathsVoid; + NameText = LOCTEXT("DeathsVoidName", "Death's Void"); + Type = EMasterGearTypes::GT_Shield; + TypeText = LOCTEXT("DeathsVoidType", "Shield"); + 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; + LargeIcon = LargeIconObject.Object; + SmallIcon = SmallIconObject.Object; + + SK_WeaponSkeletalMesh = SkeletalMeshObject.Object; + SM_WeaponStaticMesh = StaticMeshObject.Object; + SM_WeaponOffhandMesh = StaticMeshObject.Object; + + // Set Mesh + WeaponSkeletalMesh->SetSkeletalMesh(SK_WeaponSkeletalMesh); + WeaponSkeletalMesh->SetRelativeLocation(FVector(0, 35, -42)); // location correction + WeaponSkeletalMesh->SetWorldScale3D(FVector(28, 20, 20)); // Scale correction + WeaponStaticMesh->SetStaticMesh(SM_WeaponStaticMesh); + WeaponStaticMesh->SetHiddenInGame(true); + WeaponOffhandMesh->SetStaticMesh(SM_WeaponOffhandMesh); + WeaponOffhandMesh->SetHiddenInGame(true); + + //WeaponStaticMesh->SetVisibility(true); + //SwordCollider->SetBoxExtent(FVector(5.0f, 5.0f, 25.0f)); + //SwordCollider->SetRelativeLocation(FVector(0.0f, 0.0f, 5.0f)); +} + +// Called when the game starts or when spawned +void ADeathsVoid::BeginPlay() +{ + Super::BeginPlay(); + + // Bind this function to the event dispatcher for Bind Gear + OnBindGear.AddDynamic(this, &ADeathsVoid::BindWeapon); +} + +// Custom code when binding +void ADeathsVoid::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/OneHanded/Shields/DragonShield.cpp b/Ethereal/Private/Gear/Weapons/OneHanded/Shields/DragonShield.cpp new file mode 100644 index 0000000..4444850 --- /dev/null +++ b/Ethereal/Private/Gear/Weapons/OneHanded/Shields/DragonShield.cpp @@ -0,0 +1,88 @@ +// © 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 "DragonShield.h" + +#define LOCTEXT_NAMESPACE "EtherealText" + +// Sets default values +ADragonShield::ADragonShield(const FObjectInitializer& ObjectInitializer) + : Super(ObjectInitializer) +{ + // Get Assets, References Obtained Via Right Click in Editor + static ConstructorHelpers::FObjectFinder SkeletalMeshObject(TEXT("SkeletalMesh'/Game/VFX/sphere_skeletal.sphere_skeletal'")); + static ConstructorHelpers::FObjectFinder StaticMeshObject(TEXT("StaticMesh'/Game/Weapons/Shields/Dragon/dragon_shield.dragon_shield'")); + static ConstructorHelpers::FObjectFinder OffhandMeshObject(TEXT("StaticMesh'/Game/VFX/sphere.sphere'")); + ConstructorHelpers::FObjectFinder LargeIconObject(TEXT("Texture2D'/Game/Blueprints/Widgets/UI-Images/Icons_Gear/WeaponIcon_DragonShield.WeaponIcon_DragonShield'")); + ConstructorHelpers::FObjectFinder SmallIconObject(TEXT("Texture2D'/Game/Blueprints/Widgets/UI-Images/Icons_Gear/WeaponIcon_DragonShield-small.WeaponIcon_DragonShield-small'")); + + + // Set Default Objects + + Name = EMasterGearList::GL_DragonShield; + NameText = LOCTEXT("DragonShieldName", "Dragon Shield"); + Type = EMasterGearTypes::GT_Shield; + TypeText = LOCTEXT("DragonShieldType", "Shield"); + Description = "Harder than dragon scales."; + Price = 40000; + MPCost = 0.0f; + ATK = 20.0f; + DEF = 20.0f; + SPD = 10.0f; + HP = 300.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); + WeaponSkeletalMesh->SetHiddenInGame(true); + WeaponStaticMesh->SetStaticMesh(SM_WeaponStaticMesh); + WeaponStaticMesh->SetWorldScale3D(FVector(50.0f, 50.0f, 50.0f)); // scale correction + WeaponStaticMesh->SetRelativeLocation(FVector(0, 74, -15)); // location correction + WeaponStaticMesh->SetRelativeRotation(FRotator(0, 0, 0)); // rotation correction + WeaponOffhandMesh->SetStaticMesh(SM_WeaponOffhandMesh); + WeaponOffhandMesh->SetHiddenInGame(true); + + //WeaponStaticMesh->SetVisibility(true); + //SwordCollider->SetBoxExtent(FVector(5.0f, 5.0f, 25.0f)); + //SwordCollider->SetRelativeLocation(FVector(0.0f, 0.0f, 5.0f)); +} + +// Called when the game starts or when spawned +void ADragonShield::BeginPlay() +{ + Super::BeginPlay(); + + // Bind this function to the event dispatcher for Bind Gear + OnBindGear.AddDynamic(this, &ADragonShield::BindWeapon); +} + +// Custom code when binding +void ADragonShield::BindWeapon() +{ + // If this weapon was bound while IsShown is true, set the weapon visible + if (IsShown) + { + ShowWeapon(false, true, false); + } +} + +#undef LOCTEXT_NAMESPACE diff --git a/Ethereal/Private/Gear/Weapons/Ranged/Ammo/PulseArrow.cpp b/Ethereal/Private/Gear/Weapons/Ranged/Ammo/PulseArrow.cpp index f74ab1f..1a48e30 100644 --- a/Ethereal/Private/Gear/Weapons/Ranged/Ammo/PulseArrow.cpp +++ b/Ethereal/Private/Gear/Weapons/Ranged/Ammo/PulseArrow.cpp @@ -25,8 +25,8 @@ APulseArrow::APulseArrow(const FObjectInitializer& ObjectInitializer) static ConstructorHelpers::FObjectFinder SkeletalMeshObject(TEXT("SkeletalMesh'/Game/VFX/sphere_skeletal.sphere_skeletal'")); static ConstructorHelpers::FObjectFinder StaticMeshObject(TEXT("StaticMesh'/Game/Weapons/Ranged/Ammo/DemonArrow.DemonArrow'")); static ConstructorHelpers::FObjectFinder OffhandMeshObject(TEXT("StaticMesh'/Game/VFX/sphere.sphere'")); - static ConstructorHelpers::FObjectFinder LargeIconObject(TEXT("Texture2D'/Game/Blueprints/Widgets/UI-Images/Icons_Gear/WeaponIcon_DemonArrows.WeaponIcon_DemonArrows'")); - static ConstructorHelpers::FObjectFinder SmallIconObject(TEXT("Texture2D'/Game/Blueprints/Widgets/UI-Images/Icons_Gear/WeaponIcon_DemonArrows-small.WeaponIcon_DemonArrows-small'")); + static ConstructorHelpers::FObjectFinder LargeIconObject(TEXT("Texture2D'/Game/Blueprints/Widgets/UI-Images/Icons_Gear/WeaponIcon_PulseArrows.WeaponIcon_PulseArrows'")); + static ConstructorHelpers::FObjectFinder SmallIconObject(TEXT("Texture2D'/Game/Blueprints/Widgets/UI-Images/Icons_Gear/WeaponIcon_PulseArrows-small.WeaponIcon_PulseArrows-small'")); Name = EMasterGearList::GL_PulseArrow; NameText = LOCTEXT("PulseArrowName", "Pulse Arrow"); diff --git a/Ethereal/Private/Gear/Weapons/Ranged/RuneBow.cpp b/Ethereal/Private/Gear/Weapons/Ranged/RuneBow.cpp new file mode 100644 index 0000000..b4721c3 --- /dev/null +++ b/Ethereal/Private/Gear/Weapons/Ranged/RuneBow.cpp @@ -0,0 +1,81 @@ +// © 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 "RuneBow.h" + +#define LOCTEXT_NAMESPACE "EtherealText" + +// Sets default values +ARuneBow::ARuneBow(const FObjectInitializer& ObjectInitializer) + : Super(ObjectInitializer) +{ + // Get Assets, References Obtained Via Right Click in Editor + static ConstructorHelpers::FObjectFinder SkeletalMeshObject(TEXT("SkeletalMesh'/Game/VFX/sphere_skeletal.sphere_skeletal'")); + static ConstructorHelpers::FObjectFinder StaticMeshObject(TEXT("StaticMesh'/Game/Weapons/Ranged/RuneBow.RuneBow'")); + static ConstructorHelpers::FObjectFinder OffhandMeshObject(TEXT("StaticMesh'/Game/VFX/sphere.sphere'")); + static ConstructorHelpers::FObjectFinder LargeIconObject(TEXT("Texture2D'/Game/Blueprints/Widgets/UI-Images/Icons_Gear/WeaponIcon_RuneBow.WeaponIcon_RuneBow'")); + static ConstructorHelpers::FObjectFinder SmallIconObject(TEXT("Texture2D'/Game/Blueprints/Widgets/UI-Images/Icons_Gear/WeaponIcon_RuneBow-small.WeaponIcon_RuneBow-small'")); + + Name = EMasterGearList::GL_RuneBow; + NameText = LOCTEXT("RuneBowName", "RuneBow"); + Type = EMasterGearTypes::GT_Ranged; + TypeText = LOCTEXT("RuneBowType", "Ranged"); + Description = "An embodiment of the Ethereal Virtue: Wrath."; + Price = 40000; + MPCost = 0.0f; + ATK = 50.0f; + DEF = 40.0f; + SPD = 20.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; + + // Set Mesh + WeaponSkeletalMesh->SetSkeletalMesh(SK_WeaponSkeletalMesh); + WeaponSkeletalMesh->SetHiddenInGame(true); + WeaponStaticMesh->SetStaticMesh(SM_WeaponStaticMesh); + WeaponStaticMesh->SetWorldScale3D(FVector(0.4f, 0.4f, 0.4f)); // scale correction + WeaponStaticMesh->SetRelativeLocation(FVector(20, 0, -5)); // location correction + WeaponStaticMesh->SetRelativeRotation(FRotator(15, 90, 0)); // rotation correction + WeaponOffhandMesh->SetStaticMesh(SM_WeaponOffhandMesh); + WeaponOffhandMesh->SetHiddenInGame(true); +} + +// Called when the game starts or when spawned +void ARuneBow::BeginPlay() +{ + Super::BeginPlay(); + + // Bind this function to the event dispatcher for Bind Gear + OnBindGear.AddDynamic(this, &ARuneBow::BindWeapon); +} + +// Custom code when binding +void ARuneBow::BindWeapon() +{ + // If this weapon was bound while IsShown is true, set the weapon visible + if (IsShown) + { + ShowWeapon(false, true, false); + } +} + +#undef LOCTEXT_NAMESPACE diff --git a/Ethereal/Private/Gear/Weapons/TwoHanded/Apocalypse.cpp b/Ethereal/Private/Gear/Weapons/TwoHanded/Apocalypse.cpp new file mode 100644 index 0000000..8547b0e --- /dev/null +++ b/Ethereal/Private/Gear/Weapons/TwoHanded/Apocalypse.cpp @@ -0,0 +1,86 @@ +// © 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 "Apocalypse.h" + +#define LOCTEXT_NAMESPACE "EtherealText" + +// Sets default values +AApocalypse::AApocalypse(const FObjectInitializer& ObjectInitializer) + : Super(ObjectInitializer) +{ + // Get Assets, References Obtained Via Right Click in Editor + 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'")); + + + // Set Default Objects + + Name = EMasterGearList::GL_Apocalypse; + NameText = LOCTEXT("ApocalypseName", "Apocalypse"); + Type = EMasterGearTypes::GT_TwoHanded; + TypeText = LOCTEXT("ApocalypseType", "Two-Handed"); + Description = "An embodiment of the Ethereal Virtue: Apocalypse."; + Price = 40000; + MPCost = 0.0f; + ATK = 50.0f; + DEF = 50.0f; + SPD = 15.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; + + // Set Mesh + WeaponSkeletalMesh->SetSkeletalMesh(SK_WeaponSkeletalMesh); + WeaponStaticMesh->SetStaticMesh(SM_WeaponStaticMesh); + WeaponStaticMesh->SetWorldScale3D(FVector(1.5f, 1.5f, 1.8f)); // scale correction + WeaponStaticMesh->SetRelativeLocation(FVector(-15, 0, -40)); // location correction + WeaponStaticMesh->SetRelativeRotation(FRotator(0, -70, 0)); // rotation correction + WeaponOffhandMesh->SetStaticMesh(SM_WeaponOffhandMesh); + + SwordCollider->SetupAttachment(WeaponStaticMesh); + SwordCollider->SetBoxExtent(FVector(10.0f, 10.0f, 50.0f)); + SwordCollider->SetRelativeLocation(FVector(0.0f, 10.0f, 60.0f)); +} + +// Called when the game starts or when spawned +void AApocalypse::BeginPlay() +{ + Super::BeginPlay(); + + // Bind this function to the event dispatcher for Bind Gear + OnBindGear.AddDynamic(this, &AApocalypse::BindWeapon); +} + +// Custom code when binding +void AApocalypse::BindWeapon() +{ + // If this weapon was bound while IsShown is true, set the weapon visible + if (IsShown) + { + ShowWeapon(false, true, false); + } +} + +#undef LOCTEXT_NAMESPACE diff --git a/Ethereal/Private/Management/CommonLibrary.cpp b/Ethereal/Private/Management/CommonLibrary.cpp index 5271b06..db109cb 100644 --- a/Ethereal/Private/Management/CommonLibrary.cpp +++ b/Ethereal/Private/Management/CommonLibrary.cpp @@ -42,11 +42,14 @@ #include "Gear/Weapons/OneHanded/Shields/DiablosDread.h" #include "Gear/Weapons/OneHanded/Shields/SpartanShield.h" #include "Gear/Weapons/OneHanded/Shields/WarAspis.h" +#include "Gear/Weapons/OneHanded/Shields/DragonShield.h" +#include "Gear/Weapons/OneHanded/Shields/DeathsVoid.h" // RANGED #include "Gear/Weapons/Ranged/ShortBow.h" #include "Gear/Weapons/Ranged/EagleEye.h" #include "Gear/Weapons/Ranged/EurytosBow.h" #include "Gear/Weapons/Ranged/Annihilator.h" +#include "Gear/Weapons/Ranged/RuneBow.h" // AMMO #include "Gear/Weapons/Ranged/Ammo/PulseArrow.h" #include "Gear/Weapons/Ranged/Ammo/DemonArrow.h" @@ -58,6 +61,7 @@ #include "Gear/Weapons/TwoHanded/Juggernaut.h" #include "Gear/Weapons/TwoHanded/Claymore.h" #include "Gear/Weapons/TwoHanded/Temperance.h" +#include "Gear/Weapons/TwoHanded/Apocalypse.h" // MAGIC ORBS #include "Gear/Weapons/Casting/MagicOrbs.h" // CONSUMABLE ITEMS @@ -316,6 +320,12 @@ AEtherealGearMaster* UCommonLibrary::CreateGear(UObject* GearOwner, EMasterGearL case EMasterGearList::GL_Aegis: GearClass = AAegis::StaticClass(); break; + case EMasterGearList::GL_DragonShield: + GearClass = ADragonShield::StaticClass(); + break; + case EMasterGearList::GL_DeathsVoid: + GearClass = ADeathsVoid::StaticClass(); + break; /////////////////////////////// // RANGED @@ -332,6 +342,9 @@ AEtherealGearMaster* UCommonLibrary::CreateGear(UObject* GearOwner, EMasterGearL case EMasterGearList::GL_Annihilator: GearClass = AAnnihilator::StaticClass(); break; + case EMasterGearList::GL_RuneBow: + GearClass = ARuneBow::StaticClass(); + break; /////////////////////////////// // AMMUNITION @@ -366,6 +379,9 @@ AEtherealGearMaster* UCommonLibrary::CreateGear(UObject* GearOwner, EMasterGearL case EMasterGearList::GL_Temperance: GearClass = ATemperance::StaticClass(); break; + case EMasterGearList::GL_Apocalypse: + GearClass = AApocalypse::StaticClass(); + break; /////////////////////////////// // CASTING ORBS diff --git a/Ethereal/Public/Gear/MasterGearList.h b/Ethereal/Public/Gear/MasterGearList.h index 0b5e1f7..9c6b66e 100644 --- a/Ethereal/Public/Gear/MasterGearList.h +++ b/Ethereal/Public/Gear/MasterGearList.h @@ -63,12 +63,15 @@ GL_SpartanShield UMETA(DisplayName = "Spartan Shield"), GL_DiablosDread UMETA(DisplayName = "Diablo's Dread"), GL_Aegis UMETA(DisplayName = "Aegis"), + GL_DragonShield UMETA(DisplayName = "Dragon Shield"), + GL_DeathsVoid UMETA(DisplayName = "Deaths Void"), // Ranged GL_ShortBow UMETA(DisplayName = "ShortBow"), GL_EagleEye UMETA(DisplayName = "EagleEye"), GL_EurytosBow UMETA(DisplayName = "Eurytos' Bow"), GL_Annihilator UMETA(DisplayName = "Annihilator"), + GL_RuneBow UMETA(DisplayName = "Rune Bow"), // Ammo GL_PulseArrow UMETA(DisplayName = "Pulse Arrow"), @@ -82,6 +85,7 @@ GL_Claymore UMETA(DisplayName = "Claymore"), GL_Marauder UMETA(DisplayName = "Marauder"), GL_Temperance UMETA(DisplayName = "Temperance"), + GL_Apocalypse UMETA(DisplayName = "Apocalypse"), // Casting Orbs GL_MagicOrbs UMETA(DisplayName = "Magic Orbs"), diff --git a/Ethereal/Public/Gear/Weapons/OneHanded/Shields/DeathsVoid.h b/Ethereal/Public/Gear/Weapons/OneHanded/Shields/DeathsVoid.h new file mode 100644 index 0000000..d262fc4 --- /dev/null +++ b/Ethereal/Public/Gear/Weapons/OneHanded/Shields/DeathsVoid.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 "DeathsVoid.generated.h" + +UCLASS() +class ETHEREAL_API ADeathsVoid : public AWeapon_Master +{ + GENERATED_BODY() + +public: + + ADeathsVoid(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(); +}; diff --git a/Ethereal/Public/Gear/Weapons/OneHanded/Shields/DragonShield.h b/Ethereal/Public/Gear/Weapons/OneHanded/Shields/DragonShield.h new file mode 100644 index 0000000..ad56b73 --- /dev/null +++ b/Ethereal/Public/Gear/Weapons/OneHanded/Shields/DragonShield.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 "DragonShield.generated.h" + +UCLASS() +class ETHEREAL_API ADragonShield : public AWeapon_Master +{ + GENERATED_BODY() + +public: + + ADragonShield(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(); +}; diff --git a/Ethereal/Public/Gear/Weapons/Ranged/RuneBow.h b/Ethereal/Public/Gear/Weapons/Ranged/RuneBow.h new file mode 100644 index 0000000..eba02eb --- /dev/null +++ b/Ethereal/Public/Gear/Weapons/Ranged/RuneBow.h @@ -0,0 +1,36 @@ +// © 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 "RuneBow.generated.h" + +UCLASS() +class ETHEREAL_API ARuneBow : public AWeapon_Master +{ + GENERATED_BODY() + +public: + + ARuneBow(const FObjectInitializer& ObjectInitializer); + + // BeginPlay Override + virtual void BeginPlay() override; + + // Binds the item. + UFUNCTION(BlueprintCallable, Category = Controls) + void BindWeapon(); +}; diff --git a/Ethereal/Public/Gear/Weapons/TwoHanded/Apocalypse.h b/Ethereal/Public/Gear/Weapons/TwoHanded/Apocalypse.h new file mode 100644 index 0000000..a45a468 --- /dev/null +++ b/Ethereal/Public/Gear/Weapons/TwoHanded/Apocalypse.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 "Apocalypse.generated.h" + +UCLASS() +class ETHEREAL_API AApocalypse : public AWeapon_Master +{ + GENERATED_BODY() + +public: + + AApocalypse(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(); +};