More refactoring / cleaning
More refactoring / cleaning
Finished working on combat modifiers
Fixed a glith on cursor image update