Skip to content

Commit

Permalink
Balancing new items
Browse files Browse the repository at this point in the history 
New item additions, including Valkyrie, Conquerer, and Defending Ring.
Initial balancing was applied to the new armor pieces.  I still need to
make special effects on some of the armor pieces.
  • Loading branch information
@smccutchen
smccutchen committed Mar 19, 2017
1 parent 35a67ee commit bab2a3c
Show file tree
Hide file tree
Showing 31 changed files with 494 additions and 92 deletions.
2 changes: 1 addition & 1 deletion Ethereal/Private/Characters/Enemy/Signet/EarthGolem.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion Ethereal/Private/Characters/Enemy/Signet/Ghost.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions Ethereal/Private/Characters/Enemy/Signet/ProtoZhan.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion Ethereal/Private/Characters/Enemy/Signet/SkyDragon.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
12 changes: 6 additions & 6 deletions Ethereal/Private/Gear/Armor/Body/CrimsonBreastplate.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}

Expand Down
8 changes: 4 additions & 4 deletions Ethereal/Private/Gear/Armor/Body/HuntersCoat.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.");
}

Expand Down
12 changes: 6 additions & 6 deletions Ethereal/Private/Gear/Armor/Feet/CrimsonGreaves.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.");
}

Expand Down
8 changes: 4 additions & 4 deletions Ethereal/Private/Gear/Armor/Feet/HuntersBoots.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions Ethereal/Private/Gear/Armor/Hand/CrimsonGauntlets.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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%.");
}

Expand Down
8 changes: 4 additions & 4 deletions Ethereal/Private/Gear/Armor/Hand/HuntersGloves.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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%.");
}

Expand Down
12 changes: 6 additions & 6 deletions Ethereal/Private/Gear/Armor/Head/CrimsonHelm.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.");
}

Expand Down
8 changes: 4 additions & 4 deletions Ethereal/Private/Gear/Armor/Head/HuntersHood.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions Ethereal/Private/Gear/Armor/Legs/CrimsonSlacks.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.");
}

Expand Down
12 changes: 6 additions & 6 deletions Ethereal/Private/Gear/Armor/Legs/HuntersPants.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
72 changes: 72 additions & 0 deletions Ethereal/Private/Gear/Armor/Ring/DefendingRing.cpp
View file
Original file line number Diff line number Diff line change
@@ -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<UTexture2D> LargeIconObject(TEXT("Texture2D'/Game/Blueprints/Widgets/UI-Images/Icons_Gear/ArmorIcon_DefendingRing.ArmorIcon_DefendingRing'"));
static ConstructorHelpers::FObjectFinder<UTexture2D> 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
2 changes: 1 addition & 1 deletion Ethereal/Private/Gear/Weapons/OneHanded/Excalibur.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ void AExcalibur::BindWeapon()
// Custom code when binding
void AExcalibur::RemoveWeapon()
{
Super::RemoveWeapon();
//Super::RemoveWeapon();
HideWeapon();
AuraFX->Deactivate();
}
Expand Down
10 changes: 5 additions & 5 deletions Ethereal/Private/Gear/Weapons/OneHanded/Shields/DeathsVoid.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
8 changes: 4 additions & 4 deletions Ethereal/Private/Gear/Weapons/OneHanded/Shields/DragonShield.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Loading

0 comments on commit bab2a3c

Please sign in to comment.