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

update

Browse Source
This commit is contained in:
KayenEQ 2015-10-09 14:29:15 -04:00
parent 79c9862131
commit aae073f588
2 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
zone/bonuses.cpp
View File

@ -1201,6 +1201,10 @@ void Mob::ApplyAABonuses(const AA::Rank &rank, StatBonuses *newbon)
// Physically raises skill cap ie if 55/55 it will raise to 55/60 // Physically raises skill cap ie if 55/55 it will raise to 55/60
case SE_RaiseSkillCap: { case SE_RaiseSkillCap: {
if (base2 > HIGHEST_SKILL)
break;
if (newbon->RaiseSkillCap[base2] < base1) if (newbon->RaiseSkillCap[base2] < base1)
newbon->RaiseSkillCap[base2] = base1; newbon->RaiseSkillCap[base2] = base1;
break; break;
@ -1434,9 +1438,14 @@ void Mob::ApplyAABonuses(const AA::Rank &rank, StatBonuses *newbon)
newbon->ReduceFallDamage += base1; newbon->ReduceFallDamage += base1;
break; break;
case SE_ReduceTradeskillFail: case SE_ReduceTradeskillFail:{
if (base2 > HIGHEST_SKILL)
break;
newbon->ReduceTradeskillFail[base2] += base1; newbon->ReduceTradeskillFail[base2] += base1;
break; break;
}
case SE_TradeSkillMastery: case SE_TradeSkillMastery:
if (newbon->TradeSkillMastery < base1) if (newbon->TradeSkillMastery < base1)
@ -3157,19 +3166,28 @@ void Mob::ApplySpellsBonuses(uint16 spell_id, uint8 casterlevel, StatBonuses *ne
new_bonus->ReduceFallDamage += effect_value; new_bonus->ReduceFallDamage += effect_value;
break; break;
case SE_ReduceTradeskillFail: case SE_ReduceTradeskillFail:{
if (base2 > HIGHEST_SKILL)
break;
new_bonus->ReduceTradeskillFail[base2] += effect_value; new_bonus->ReduceTradeskillFail[base2] += effect_value;
break; break;
}
case SE_TradeSkillMastery: case SE_TradeSkillMastery:
if (new_bonus->TradeSkillMastery < effect_value) if (new_bonus->TradeSkillMastery < effect_value)
new_bonus->TradeSkillMastery = effect_value; new_bonus->TradeSkillMastery = effect_value;
break; break;
case SE_RaiseSkillCap: case SE_RaiseSkillCap: {
if (base2 > HIGHEST_SKILL)
break;
if (new_bonus->RaiseSkillCap[base2] < effect_value) if (new_bonus->RaiseSkillCap[base2] < effect_value)
new_bonus->RaiseSkillCap[base2] = effect_value; new_bonus->RaiseSkillCap[base2] = effect_value;
break; break;
}
//Special custom cases for loading effects on to NPC from 'npc_spels_effects' table //Special custom cases for loading effects on to NPC from 'npc_spels_effects' table
if (IsAISpellEffect) { if (IsAISpellEffect) {

8
zone/spells.cpp
View File

@ -750,14 +750,6 @@ bool Client::CheckFizzle(uint16 spell_id)
// always at least 1% chance to fail or 5% to succeed // always at least 1% chance to fail or 5% to succeed
fizzlechance = fizzlechance < 1 ? 1 : (fizzlechance > 95 ? 95 : fizzlechance); fizzlechance = fizzlechance < 1 ? 1 : (fizzlechance > 95 ? 95 : fizzlechance);
/*
if(IsBardSong(spell_id))
{
//This was a channel chance modifier - no evidence for fizzle reduction
fizzlechance -= GetAA(aaInternalMetronome) * 1.5f;
}
*/
float fizzle_roll = zone->random.Real(0, 100); float fizzle_roll = zone->random.Real(0, 100);
Log.Out(Logs::Detail, Logs::Spells, "Check Fizzle %s spell %d fizzlechance: %0.2f%% diff: %0.2f roll: %0.2f", GetName(), spell_id, fizzlechance, diff, fizzle_roll); Log.Out(Logs::Detail, Logs::Spells, "Check Fizzle %s spell %d fizzlechance: %0.2f%% diff: %0.2f roll: %0.2f", GetName(), spell_id, fizzlechance, diff, fizzle_roll);