Status affect refactoring WIP
Finished status affect refactoring