Added DM combat focus and non-function combat toolbox