Merge remote-tracking branch 'upstream/master' into spaupdate02

common/spdat.h

@@ -857,7 +857,7 @@ typedef enum {
 //#define SE_Ff_FocusTimerMin			511 //
 #define SE_Proc_Timer_Modifier 			512 //
 //#define SE_Mana_Max_Percent			513 //
-//#define SE_Endurance_Max_Percent		514 // 
+//#define SE_Endurance_Max_Percent		514 //
 #define SE_AC_Avoidance_Max_Percent		515 // implemented - stackable avoidance modifier
 #define SE_AC_Mitigation_Max_Percent	516 // implemented - stackable defense modifier
 //#define SE_Attack_Offense_Max_Percent	517 // 

zone/bonuses.cpp

@@ -1561,7 +1561,6 @@ void Mob::ApplyAABonuses(const AA::Rank &rank, StatBonuses *newbon)
 			newbon->Pet_Add_Atk += base1;
 			break;
 
-
 		// to do
 		case SE_PetDiscipline:
 			break;
@@ -5043,6 +5042,7 @@ void Mob::NegateSpellsBonuses(uint16 spell_id)
 					aabonuses.PC_Pet_AE_Rampage[1] = effect_value;
 					break;
 
+
 				case SE_SkillProcSuccess:{
 					for(int e = 0; e < MAX_SKILL_PROCS; e++)
 					{

zone/common.h

@@ -542,6 +542,7 @@ struct StatBonuses {
 	int32   Pet_Crit_Melee_Damage_Pct_Owner;	// base = percent mod for pet critcal damage from owner
 	int32	Pet_Add_Atk;						// base = Pet ATK bonus from owner
 
+
 	// AAs
 	int8	Packrat;							//weight reduction for items, 1 point = 10%
 	uint8	BuffSlotIncrease;					// Increases number of available buff slots

zone/mob.cpp

@@ -4797,7 +4797,6 @@ int16 Mob::GetCritDmgMod(uint16 skill, Mob* owner)
 	if (owner) //Checked in TryPetCriticalHit
 		critDmg_mod += owner->aabonuses.Pet_Crit_Melee_Damage_Pct_Owner + owner->itembonuses.Pet_Crit_Melee_Damage_Pct_Owner + owner->spellbonuses.Pet_Crit_Melee_Damage_Pct_Owner;
 
-	
 	return critDmg_mod;
 }
 

zone/spell_effects.cpp

@@ -2949,7 +2949,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove
 				buffs[buffslot].focusproclimit_procamt = spells[spell_id].base[i]; //Set max amount of procs before lockout timer
 				break;
 			}
-
+	
 			case SE_PersistentEffect:
 				MakeAura(spell_id);
 				break;