Redo faction data definition

[danbuis]

Goal of Pull Request

Clean up faction type things. Enums etc.

Potential Tasks

• [ ] Connects to #???
• [ ] Meets the DefDone of the linked issue
• [ ] All tests pass (Although the reviewer should run them to make sure)
• [ ] Other?

Any other pertinent information

What else does the reviewer need to know about?