pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-12 13:41:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Cleanup] Fix SEResist array settings duplicate code (#3225)

Browse Source 
# Notes
- These conditions did the same thing, combining them is simpler.
This commit is contained in:
Alex King 2023-04-03 16:53:48 -04:00 committed by GitHub
parent 5dd849ac75
commit 26fd52fb06
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
zone/bonuses.cpp
View File

@ -1505,12 +1505,14 @@ void Mob::ApplyAABonuses(const AA::Rank &rank, StatBonuses *newbon)
case SE_SpellEffectResistChance: { case SE_SpellEffectResistChance: {
for (int e = 0; e < MAX_RESISTABLE_EFFECTS * 2; e += 2) { for (int e = 0; e < MAX_RESISTABLE_EFFECTS * 2; e += 2) {
if (newbon->SEResist[e + 1] && (newbon->SEResist[e] == limit_value) && if (
(newbon->SEResist[e + 1] < base_value)) { !newbon->SEResist[e + 1] ||
newbon->SEResist[e] = limit_value; // Spell Effect ID (
newbon->SEResist[e + 1] = base_value; // Resist Chance newbon->SEResist[e + 1] &&
break; newbon->SEResist[e] == limit_value &&
} else if (!newbon->SEResist[e + 1]) { newbon->SEResist[e + 1] < base_value
)
) {
newbon->SEResist[e] = limit_value; // Spell Effect ID newbon->SEResist[e] = limit_value; // Spell Effect ID
newbon->SEResist[e + 1] = base_value; // Resist Chance newbon->SEResist[e + 1] = base_value; // Resist Chance
break; break;
@ -3492,12 +3494,14 @@ void Mob::ApplySpellsBonuses(uint16 spell_id, uint8 casterlevel, StatBonuses *ne
{ {
for(int e = 0; e < MAX_RESISTABLE_EFFECTS*2; e+=2) for(int e = 0; e < MAX_RESISTABLE_EFFECTS*2; e+=2)
{ {
if(new_bonus->SEResist[e+1] && (new_bonus->SEResist[e] == limit_value) && (new_bonus->SEResist[e+1] < effect_value)){ if (
new_bonus->SEResist[e] = limit_value; //Spell Effect ID !new_bonus->SEResist[e + 1] ||
new_bonus->SEResist[e+1] = effect_value; //Resist Chance (
break; new_bonus->SEResist[e + 1] &&
} new_bonus->SEResist[e] == limit_value &&
else if (!new_bonus->SEResist[e+1]){ new_bonus->SEResist[e + 1] < effect_value
)
) {
new_bonus->SEResist[e] = limit_value; //Spell Effect ID new_bonus->SEResist[e] = limit_value; //Spell Effect ID
new_bonus->SEResist[e + 1] = effect_value; //Resist Chance new_bonus->SEResist[e + 1] = effect_value; //Resist Chance
break; break;