pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-06-11 07:38:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Cleanup] Cleanup classes.cpp/classes.h (#3752)

Browse Source 
* [Cleanup] Cleanup classes.cpp/classes.h

# Notes
- Remove unused methods and cleanup logic.

* Update classes.cpp

* Final push.
This commit is contained in:
Alex King
2023-12-13 18:38:45 -05:00
committed by GitHub
parent df83113cea
commit aeeb350068
49 changed files with 1308 additions and 1486 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/spell_effects.cpp
+33 -33
View File
@@ -441,7 +441,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove
case SE_CurrentMana:
{
// Bards don't get mana from effects, good or bad.
if(GetClass() == BARD)
if(GetClass() == Class::Bard)
break;
if(IsManaTapSpell(spell_id)) {
if(GetCasterClass() != 'N') {
@@ -478,7 +478,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove
case SE_CurrentManaOnce:
{
// Bards don't get mana from effects, good or bad.
if(GetClass() == BARD)
if(GetClass() == Class::Bard)
break;
#ifdef SPELL_EFFECT_SPAM
snprintf(effect_desc, _EDLEN, "Current Mana Once: %+i", effect_value);
@@ -3432,7 +3432,7 @@ int64 Mob::CalcSpellEffectValue(uint16 spell_id, int effect_id, int caster_level
*/
//This is checked from Mob::SpellEffects and applied to instant spells and runes.
if (caster && caster->GetClass() != BARD && caster->HasBaseEffectFocus()) {
if (caster && caster->GetClass() != Class::Bard && caster->HasBaseEffectFocus()) {
oval = effect_value;
int mod = caster->GetFocusEffect(focusFcBaseEffects, spell_id);
@@ -3445,7 +3445,7 @@ int64 Mob::CalcSpellEffectValue(uint16 spell_id, int effect_id, int caster_level
else if (caster_id && instrument_mod > 10) {
Mob* buff_caster = entity_list.GetMob(caster_id);//If targeted bard song needed to confirm caster is not bard.
if (buff_caster && buff_caster->GetClass() != BARD) {
if (buff_caster && buff_caster->GetClass() != Class::Bard) {
oval = effect_value;
effect_value = effect_value * static_cast<int>(instrument_mod) / 10;
@@ -3991,7 +3991,7 @@ void Mob::DoBuffTic(const Buffs_Struct &buff, int slot, Mob *caster)
case SE_Charm: {
if (!caster || !PassCharismaCheck(caster, buff.spellid)) {
BuffFadeByEffect(SE_Charm);
// Remove from hate list of any NPC's hate list and remove all NPCs this hate list
if (IsNPC()) {
entity_list.RemoveFromHateLists(this);
@@ -7248,7 +7248,7 @@ bool Mob::PassLimitClass(uint32 Classes_, uint16 Class_)
return false;
Class_ += 1;
for (int CurrentClass = 1; CurrentClass <= PLAYER_CLASS_COUNT; ++CurrentClass){
for (int CurrentClass = 1; CurrentClass <= Class::PLAYER_CLASS_COUNT; ++CurrentClass){
if (Classes_ % 2 == 1){
if (CurrentClass == Class_)
return true;
@@ -7481,7 +7481,7 @@ bool Mob::PassCastRestriction(int value)
case IS_CLASS_WIZARD:
case IS_WIZARD_USED_ON_MAGE_FIRE_PET:
if (GetClass() == WIZARD)
if (GetClass() == Class::Wizard)
return true;
break;
@@ -7521,12 +7521,12 @@ bool Mob::PassCastRestriction(int value)
break;
case IS_CLASS_MELEE_THAT_CAN_BASH_OR_KICK_EXCEPT_BARD:
if ((GetClass() != BARD) && (GetClass() != ROGUE) && IsFighterClass(GetClass()))
if ((GetClass() != Class::Bard) && (GetClass() != Class::Rogue) && IsFighterClass(GetClass()))
return true;
break;
case IS_CLASS_PURE_MELEE:
if (GetClass() == ROGUE || GetClass() == WARRIOR || GetClass() == BERSERKER || GetClass() == MONK)
if (GetClass() == Class::Rogue || GetClass() == Class::Warrior || GetClass() == Class::Berserker || GetClass() == Class::Monk)
return true;
break;
@@ -7541,78 +7541,78 @@ bool Mob::PassCastRestriction(int value)
break;
case IS_CLASS_WARRIOR:
if (GetClass() == WARRIOR)
if (GetClass() == Class::Warrior)
return true;
break;
case IS_CLASS_CLERIC:
if (GetClass() == CLERIC)
if (GetClass() == Class::Cleric)
return true;
break;
case IS_CLASS_PALADIN:
if (GetClass() == PALADIN)
if (GetClass() == Class::Paladin)
return true;
break;
case IS_CLASS_RANGER:
if (GetClass() == RANGER)
if (GetClass() == Class::Ranger)
return true;
break;
case IS_CLASS_SHADOWKNIGHT:
if (GetClass() == SHADOWKNIGHT)
if (GetClass() == Class::ShadowKnight)
return true;
break;
case IS_CLASS_DRUID:
if (GetClass() == DRUID)
if (GetClass() == Class::Druid)
return true;
break;
case IS_CLASS_MONK:
if (GetClass() == MONK)
if (GetClass() == Class::Monk)
return true;
break;
case IS_CLASS_BARD2:
case IS_CLASS_BARD:
if (GetClass() == BARD)
if (GetClass() == Class::Bard)
return true;
break;
case IS_CLASS_ROGUE:
if (GetClass() == ROGUE)
if (GetClass() == Class::Rogue)
return true;
break;
case IS_CLASS_SHAMAN:
if (GetClass() == SHAMAN)
if (GetClass() == Class::Shaman)
return true;
break;
case IS_CLASS_NECRO:
if (GetClass() == NECROMANCER)
if (GetClass() == Class::Necromancer)
return true;
break;
case IS_CLASS_MAGE:
if (GetClass() == MAGICIAN)
if (GetClass() == Class::Magician)
return true;
break;
case IS_CLASS_ENCHANTER:
if (GetClass() == ENCHANTER)
if (GetClass() == Class::Enchanter)
return true;
break;
case IS_CLASS_BEASTLORD:
if (GetClass() == BEASTLORD)
if (GetClass() == Class::Beastlord)
return true;
break;
case IS_CLASS_BERSERKER:
if (GetClass() == BERSERKER)
if (GetClass() == Class::Berserker)
return true;
break;
@@ -7622,7 +7622,7 @@ bool Mob::PassCastRestriction(int value)
break;
case IS_CLASS_NOT_WAR_PAL_SK:
if ((GetClass() != WARRIOR) && (GetClass() != PALADIN) && (GetClass() != SHADOWKNIGHT))
if ((GetClass() != Class::Warrior) && (GetClass() != Class::Paladin) && (GetClass() != Class::ShadowKnight))
return true;
break;
@@ -7722,8 +7722,8 @@ bool Mob::PassCastRestriction(int value)
}
case IS_CLASS_CHAIN_OR_PLATE:
if ((GetClass() == WARRIOR) || (GetClass() == BARD) || (GetClass() == SHADOWKNIGHT) || (GetClass() == PALADIN) || (GetClass() == CLERIC)
|| (GetClass() == RANGER) || (GetClass() == SHAMAN) || (GetClass() == ROGUE) || (GetClass() == BERSERKER)) {
if ((GetClass() == Class::Warrior) || (GetClass() == Class::Bard) || (GetClass() == Class::ShadowKnight) || (GetClass() == Class::Paladin) || (GetClass() == Class::Cleric)
|| (GetClass() == Class::Ranger) || (GetClass() == Class::Shaman) || (GetClass() == Class::Rogue) || (GetClass() == Class::Berserker)) {
return true;
}
break;
@@ -7914,7 +7914,7 @@ bool Mob::PassCastRestriction(int value)
break;
case IS_CLASS_WARRIOR_CASTER_PRIEST:
if (IsCasterClass(GetClass()) || GetClass() == WARRIOR)
if (IsCasterClass(GetClass()) || GetClass() == Class::Warrior)
return true;
break;
@@ -8082,13 +8082,13 @@ bool Mob::PassCastRestriction(int value)
break;
case IS_CLEINT_AND_MALE_DRUID_ENCHANTER_MAGICIAN_NECROANCER_SHAMAN_OR_WIZARD:
if (IsClient() && GetGender() == MALE && (IsCasterClass(GetClass()) && GetClass() != CLERIC))
if (IsClient() && GetGender() == MALE && (IsCasterClass(GetClass()) && GetClass() != Class::Cleric))
return true;
break;
case IS_CLIENT_AND_MALE_BEASTLORD_BERSERKER_MONK_RANGER_OR_ROGUE:
if (IsClient() && GetGender() == MALE &&
(GetClass() == BEASTLORD || GetClass() == BERSERKER || GetClass() == MONK || GetClass() == RANGER || GetClass() == ROGUE))
(GetClass() == Class::Beastlord || GetClass() == Class::Berserker || GetClass() == Class::Monk || GetClass() == Class::Ranger || GetClass() == Class::Rogue))
return true;
break;
@@ -8098,13 +8098,13 @@ bool Mob::PassCastRestriction(int value)
break;
case IS_CLIENT_AND_FEMALE_DRUID_ENCHANTER_MAGICIAN_NECROANCER_SHAMAN_OR_WIZARD:
if (IsClient() && GetGender() == FEMALE && (IsCasterClass(GetClass()) && GetClass() != CLERIC))
if (IsClient() && GetGender() == FEMALE && (IsCasterClass(GetClass()) && GetClass() != Class::Cleric))
return true;
break;
case IS_CLIENT_AND_FEMALE_BEASTLORD_BERSERKER_MONK_RANGER_OR_ROGUE:
if (IsClient() && GetGender() == FEMALE &&
(GetClass() == BEASTLORD || GetClass() == BERSERKER || GetClass() == MONK || GetClass() == RANGER || GetClass() == ROGUE))
(GetClass() == Class::Beastlord || GetClass() == Class::Berserker || GetClass() == Class::Monk || GetClass() == Class::Ranger || GetClass() == Class::Rogue))
return true;
break;
@@ -8177,7 +8177,7 @@ bool Mob::PassCastRestriction(int value)
}
case IS_NOT_CLASS_BARD:
if (GetClass() != BARD)
if (GetClass() != Class::Bard)
return true;
break;