addiction-tweaking

OK, looks like it's working more or less as intended.  Dialed back the
morale bonuses too.