updated fight mode and villager mode