pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-16 18:52:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Cleanup] Cleanup Stance Code (#4368)

Browse Source 
* [Cleanup] Cleanup Stance-based Code

* Command

* Update emu_constants.h

* Update stance.cpp

* Cleanup
This commit is contained in:
Alex King
2024-07-02 21:50:34 -04:00
committed by GitHub
parent e63f34638b
commit a85f4fb703
15 changed files with 206 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/merc.cpp
+14 -14
View File
@@ -58,7 +58,7 @@ Merc::Merc(const NPCType* d, float x, float y, float z, float heading)
memset(equipment, 0, sizeof(equipment));
SetMercID(0);
SetStance(EQ::constants::stanceBalanced);
SetStance(Stance::Balanced);
rest_timer.Disable();
if (GetClass() == Class::Rogue)
@@ -3192,13 +3192,13 @@ MercSpell Merc::GetBestMercSpellForAENuke(Merc* caster, Mob* tar) {
switch(caster->GetStance())
{
case EQ::constants::stanceBurnAE:
case Stance::AEBurn:
initialCastChance = 50;
break;
case EQ::constants::stanceBalanced:
case Stance::Balanced:
initialCastChance = 25;
break;
case EQ::constants::stanceBurn:
case Stance::Burn:
initialCastChance = 0;
break;
}
@@ -3244,11 +3244,11 @@ MercSpell Merc::GetBestMercSpellForTargetedAENuke(Merc* caster, Mob* tar) {
switch(caster->GetStance())
{
case EQ::constants::stanceBurnAE:
case Stance::AEBurn:
numTargetsCheck = 1;
break;
case EQ::constants::stanceBalanced:
case EQ::constants::stanceBurn:
case Stance::Balanced:
case Stance::Burn:
numTargetsCheck = 2;
break;
}
@@ -3298,11 +3298,11 @@ MercSpell Merc::GetBestMercSpellForPBAENuke(Merc* caster, Mob* tar) {
switch(caster->GetStance())
{
case EQ::constants::stanceBurnAE:
case Stance::AEBurn:
numTargetsCheck = 2;
break;
case EQ::constants::stanceBalanced:
case EQ::constants::stanceBurn:
case Stance::Balanced:
case Stance::Burn:
numTargetsCheck = 3;
break;
}
@@ -3351,11 +3351,11 @@ MercSpell Merc::GetBestMercSpellForAERainNuke(Merc* caster, Mob* tar) {
switch(caster->GetStance())
{
case EQ::constants::stanceBurnAE:
case Stance::AEBurn:
numTargetsCheck = 1;
break;
case EQ::constants::stanceBalanced:
case EQ::constants::stanceBurn:
case Stance::Balanced:
case Stance::Burn:
numTargetsCheck = 2;
break;
}
@@ -5186,7 +5186,7 @@ void Client::SpawnMerc(Merc* merc, bool setMaxStats) {
merc->SetSuspended(false);
SetMerc(merc);
merc->Unsuspend(setMaxStats);
merc->SetStance((EQ::constants::StanceType)GetMercInfo().Stance);
merc->SetStance(GetMercInfo().Stance);
Log(Logs::General, Logs::Mercenaries, "SpawnMerc Success for %s.", GetName());