Cover merit was typo'd.
some NPCID updates, minor clean-up/fixes
Merge pull request #493 from Killeon/master

some NPCID updates, minor clean-up & fixes
CORE: enmity bonus is applied only on positive changes of CE/VE
Merge branch 'master' of https://github.com/DarkstarProject/darkstar
CORE: standard damage table value adjustments
CORE: ally-targeted and self-targeted JAs and spells generate enmity
CORE: implement enmity loss reduction modifier
SCRIPTS: implement PLD merit Guardian
CORE: remove leftover debug print
CORE: rewrote tranquil heart handlers
CORE: some changes to lua bindings for luajit compatibility
note: a function accessing its parameters on the stack cannot use negative indices if the function can possibly be invoked with no arguments: negative stack indices with no arguments will return as not nil, will pass isnumber, and will return as 0 from tointeger
Merge branch 'master' of https://github.com/DarkstarProject/darkstar
Another typo
Merge pull request #496 from TeoTwawki/misc

Just some typo corrections
database npc_list added new goblins npcs ,woe,adoulin city corrections
database correction batallia downs npcs
database forgot to remove gob's coffer in baflau thickets
Better faceing check
Remove delay between attacks
Allow going to attack mode anytime.