Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Cilraaz
2015-11-02 11:25:54 -05:00
43 changed files with 735 additions and 342 deletions
+2
View File
@@ -477,6 +477,8 @@ RULE_BOOL(NPC, ReturnNonQuestNoDropItems, false) // Returns NO DROP items on NPC
RULE_INT(NPC, StartEnrageValue, 9) // % HP that an NPC will begin to enrage
RULE_BOOL(NPC, LiveLikeEnrage, false) // If set to true then only player controlled pets will enrage
RULE_BOOL(NPC, EnableMeritBasedFaction, false) // If set to true, faction will given in the same way as experience (solo/group/raid)
RULE_INT(NPC, NPCToNPCAggroTimerMin, 500)
RULE_INT(NPC, NPCToNPCAggroTimerMax, 6000)
RULE_CATEGORY_END()
RULE_CATEGORY(Aggro)