Revert "In-Combat flag added"

This reverts commit 4cf9bf6cf3d71e4925f193dd3791a50ea892342c.
Revert "Hometown Penalties"

This reverts commit 6d54587b4683c4624642997b7cc5f074f99c4526.