combat, potion, movement working, potion edge cases and merchant combat not ready