Optimize castle quest

- Track quest status directly
- Come back with umbrella/amulet when appropriate
- Wear mohawk wig
Use shortcuts for the palindome and cellar.
Tweak hidden city to use matches, buy scorpion bowls
Minor fixes after merging