Improve Junkyard spawning

[chaosmonkey]

The most recent patch mentioned this change

• Wagstaff will not use the Junkyard as his workshop if it is occupied by Scrappy Werepig. He will find another location.

This feels bad because even if you are diligently fighting Scrappy Werepig whenever he is up, you'll sometimes run into it where Wagstaff will build a workshop in a random part of the world. I think it would feel better if one of the following changes was implemented:

1. A grace period that simply delays creating the workshop if Scrappy Werepig is in the Junkyard
2. Not spawning the Workshop if Scrappy Werepig is in the Junkyard
3. Wagstaff not caring if Scrappy Werepig is in the Junkyard
4. Making the back-up spawn location repeatable

Thanks for reading.