Spell effect addition / fixes

zone/aggro.cpp

@@ -1414,7 +1414,7 @@ bool Mob::PassCharismaCheck(Mob* caster, Mob* spellTarget, uint16 spell_id) {
 			if (caster->IsClient())
 			{
 				//3: At maxed ability, Total Domination has a 50% chance of preventing the charm break that otherwise would have occurred.
-				uint16 TotalDominationBonus = caster->aabonuses.CharmBreakChance + caster->spellbonuses.CharmBreakChance + caster->itembonuses.CharmBreakChance;
+				int16 TotalDominationBonus = caster->aabonuses.CharmBreakChance + caster->spellbonuses.CharmBreakChance + caster->itembonuses.CharmBreakChance;
 
 				if (MakeRandomInt(0, 99) < TotalDominationBonus)
 					return true;

zone/attack.cpp

@@ -4149,6 +4149,7 @@ void Mob::TryWeaponProc(const ItemInst *inst, const Item_Struct* weapon, Mob *on
 		}
 	}
 
+	int16 SpellProcChance = spellbonuses.SpellProcChance + itembonuses.SpellProcChance + aabonuses.SpellProcChance;
 	uint32 i;
 	for(i = 0; i < MAX_PROCS; i++) {
 		if (PermaProcs[i].spellID != SPELL_UNKNOWN) {
@@ -4169,6 +4170,7 @@ void Mob::TryWeaponProc(const ItemInst *inst, const Item_Struct* weapon, Mob *on
 			else
 			{
 				int chance = ProcChance * (SpellProcs[i].chance);
+				chance += chance*SpellProcChance/100;
 				if(MakeRandomInt(0, 100) < chance) {
 					mlog(COMBAT__PROCS, "Spell proc %d procing spell %d (%d percent chance)", i, SpellProcs[i].spellID, chance);
 					ExecWeaponProc(nullptr, SpellProcs[i].spellID, on);
@@ -4180,6 +4182,7 @@ void Mob::TryWeaponProc(const ItemInst *inst, const Item_Struct* weapon, Mob *on
 		}
 		if (bRangedAttack) {
 			int chance = ProcChance * RangedProcs[i].chance;
+			chance += chance*SpellProcChance/100;
 			if(MakeRandomInt(0, 100) < chance) {
 				mlog(COMBAT__PROCS, "Ranged proc %d procing spell %d", i, RangedProcs[i].spellID, RangedProcs[i].chance);
 				ExecWeaponProc(nullptr, RangedProcs[i].spellID, on);

zone/bonuses.cpp

@@ -1228,6 +1228,14 @@ void Client::ApplyAABonuses(uint32 aaid, uint32 slots, StatBonuses* newbon)
 				break;
 			}
 
+			case SE_FrenziedDevastation:
+				newbon->FrenziedDevastation += base2;
+				break;
+
+			case SE_SpellProcChance:
+				newbon->SpellProcChance += base1;
+				break;
+
 		}
 	}
 }
@@ -2524,6 +2532,10 @@ void Mob::ApplySpellsBonuses(uint16 spell_id, uint8 casterlevel, StatBonuses* ne
 				newbon->DistanceRemoval = true;
 				break;
 
+			case SE_FrenziedDevastation:
+				newbon->FrenziedDevastation += spells[spell_id].base2[i];
+				break;
+
 		}
 	}
 }
@@ -3866,7 +3878,13 @@ void Mob::NegateSpellsBonuses(uint16 spell_id)
 					spellbonuses.ImprovedTaunt[0] = effect_value;
 					spellbonuses.ImprovedTaunt[1] = effect_value;
 					spellbonuses.ImprovedTaunt[2] = -1;
-		
+					break;
+
+				case SE_FrenziedDevastation:
+					spellbonuses.FrenziedDevastation += effect_value;
+					aabonuses.FrenziedDevastation += effect_value;
+					itembonuses.FrenziedDevastation += effect_value;
+					break;
 			}
 		}
 	}

zone/common.h

@@ -311,8 +311,8 @@ struct StatBonuses {
 	//uint16	BlockSpellEffect[EFFECT_COUNT];		// Prevents spells with certain effects from landing on you *no longer used
 	bool	ImmuneToFlee;						// Bypass the fleeing flag
 	uint16	VoiceGraft;							// Stores the ID of the mob with which to talk through
-	uint16	SpellProcChance;					// chance to proc from sympathetic spell effects
-	uint16	CharmBreakChance;					// chance to break charm
+	int16	SpellProcChance;					// chance to proc from sympathetic spell effects
+	int16	CharmBreakChance;					// chance to break charm
 	int16	SongRange;							// increases range of beneficial bard songs
 	uint16	HPToManaConvert;					// Uses HP to cast spells at specific conversion
 	uint16	FocusEffects[HIGHEST_FOCUS+1];		// Stores the focus effectid for each focustype you have.
@@ -335,6 +335,7 @@ struct StatBonuses {
 	bool	DivineAura;							// invulnerability
 	bool	DistanceRemoval;					// Check if Cancle if Moved effect is present
 	int16	ImprovedTaunt[3];					// 0 = Max Level 1 = Aggro modifier 2 = buffid
+	int16	FrenziedDevastation;				// base1= AArank(used) base2= chance increase spell criticals + all DD spells 2x mana.
 	//bool	AbsorbMagicAtt;						// Magic Rune *Need to be implemented for NegateEffect
 	//bool	MeleeRune;							// Melee Rune *Need to be implemented for NegateEffect
 

zone/spell_effects.cpp

@@ -2826,6 +2826,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial)
 			case SE_CriticalMend:
 			case SE_LimitCastTimeMax:
 			case SE_TriggerOnReqCaster:
+			case SE_FrenziedDevastation:
 			{
 				break;
 			}
@@ -5396,14 +5397,12 @@ bool Mob::AffectedBySpellExcludingSlot(int slot, int effect)
 
 float Mob::GetSympatheticProcChances(float &ProcBonus, float &ProcChance, int32 cast_time, int16 ProcRateMod) {
 
-	ProcBonus = spellbonuses.SpellProcChance + itembonuses.SpellProcChance;
 	ProcChance = 0;
 
 	if(cast_time > 0)
 	{
 		ProcChance = ((float)cast_time * RuleR(Casting, AvgSpellProcsPerMinute) / 60000.0f);
 		ProcChance = ProcChance * (float)(ProcRateMod/100);
-		ProcChance = ProcChance+(ProcChance*ProcBonus/100);
 	}
 	return ProcChance;
 }