implemented 2 remaining damage types, combat is now complete for the moment