Revert "edit frustration curSet.happiness"

This reverts commit b2cf7a59f966b8353a666195015940951881331a.