[Spells] Rework for SPA 413 SE_FcBaseEffects and Bard updates (#1629)

* baseline start

* update1

* updates

* base effect implemented for bard

* instrument mod updates

amplification amps itself

* updates

* updates

* debug

* base effect updates

* baseeffects for spell focus updated

* update skill attack baseeffects

* focus will remain for quest functions

* song cap mod added back in

* remove debugs1

* fix cr

* base effects functionalish

* remove debug

* Update client_mods.cpp

* spdat instrumentmod

* Update spell_effects.cpp

* Update spdat.h

* remove new instrument mod check

split PR
This commit is contained in:
KayenEQ
2021-10-24 19:38:28 -04:00
committed by GitHub
parent 060be606e7
commit 987de17e93
7 changed files with 179 additions and 121 deletions
+10 -5
View File
@@ -1687,6 +1687,10 @@ void Mob::ApplyAABonuses(const AA::Rank &rank, StatBonuses *newbon)
newbon->SpellDamageShield += base1;
break;
case SE_Amplification:
newbon->Amplification += base1;
break;
// to do
case SE_PetDiscipline:
break;
@@ -1795,18 +1799,19 @@ void Mob::ApplySpellsBonuses(uint16 spell_id, uint8 casterlevel, StatBonuses *ne
if (focus)
{
if (WornType){
if (RuleB(Spells, UseAdditiveFocusFromWornSlot))
if (RuleB(Spells, UseAdditiveFocusFromWornSlot)) {
new_bonus->FocusEffectsWorn[focus] += spells[spell_id].base[i];
}
}
else
else {
new_bonus->FocusEffects[focus] = static_cast<uint8>(spells[spell_id].effectid[i]);
}
continue;
}
if (WornType && (RuleI(Spells, AdditiveBonusWornType) == WornType))
if (WornType && (RuleI(Spells, AdditiveBonusWornType) == WornType)) {
AdditiveWornBonus = true;
}
effectid = spells[spell_id].effectid[i];
effect_value = CalcSpellEffectValue(spell_id, i, casterlevel, instrument_mod, nullptr, ticsremaining, casterId);