Rework the Goofball trait to prefer "funny" interactions

We don't seem to really have a proper "funny" trait since "Goofball" seems to heavily prioritize mischief instead. Kind of a massive empty niche, IMO. Now that we have some really good candidates for...