From 6e32407e12c251bb27ddaf9d70be5b97ef47d4ba Mon Sep 17 00:00:00 2001 From: PatR Date: Sat, 21 Sep 2024 16:16:10 -0700 Subject: [PATCH] pauper vs #conduct Starting as a pauper and executing #conduct during play reported "you have gone without possessions", which wasn't accurate unless your inventory remained empty from start until the time #conduct was examined. That isn't tracked. I don't think it needs to be since staying possessionless from start to finish is not a viable goal unless you're on a suicide mission. Change #conduct feedback for pauper to "you are without possessions" if inventory is currently empty and "you started without possessions" when it isn't. Also, report pauper before nudist (which is enabled implicitly when starting without any equipment). The other way around struct me as being a bit strange, although if nudist was specified in addition to pauper it probably makes sense. --- src/insight.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/insight.c b/src/insight.c index 488a5a07a..08fd80b6b 100644 --- a/src/insight.c +++ b/src/insight.c @@ -2073,10 +2073,16 @@ show_conduct(int final) you_have_been("blind from birth"); if (u.uroleplay.deaf) you_have_been("deaf from birth"); + /* note: we don't report "you are without possessions" unless the + game started with the pauper option set */ + if (u.uroleplay.pauper) + enl_msg(You_, gi.invent ? "started" : "are", "started out", + " without possessions", ""); + /* nudist is far more than a subset of possessionless, and a much + more impressive accomplishment, but showing "started out without + possessions" before "faithfully nudist" looks more logical */ if (u.uroleplay.nudist) you_have_been("faithfully nudist"); - if (u.uroleplay.pauper) - enl_msg(You_, "have gone", "started out", " without possessions", ""); if (!u.uconduct.food) enl_msg(You_, "have gone", "went", " without food", "");