added injury, move types, happy dance!