Bugfix:  Fix inconcistency when describing damage from ammo. + moria changes

Signed-off-by: nppangband <nppangbanddev@verizon.net>