Unfixed the fix for drowning, changed settings xml.

The fix for drowning in battle caused other bugs (such as change weapon not working properly). This means that status-effects and drowning still happens in real time.

Config changed such that you can decide what mob types can enter turn-based battle with a player.

Old config will be renamed and a new config will be generated in its place.