Merge from desires refactor, more desires refactoring (mostly filtering) Removed the notion of desire "types" (Attain/Retain), instead just use fulfillment state as the same indicator. DesireTypes now refers to the derived types themselves (Item, Building)