Skip to content

Commit 4cd9f22

Browse files
No one will buy FILTHY clothing (#82754)
1 parent 076bbf4 commit 4cd9f22

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

src/npc.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,6 @@ static const trait_id trait_HALLUCINATION( "HALLUCINATION" );
170170
static const trait_id trait_NO_BASH( "NO_BASH" );
171171
static const trait_id trait_PACIFIST( "PACIFIST" );
172172
static const trait_id trait_PROF_DICEMASTER( "PROF_DICEMASTER" );
173-
static const trait_id trait_SQUEAMISH( "SQUEAMISH" );
174173
static const trait_id trait_TERRIFYING( "TERRIFYING" );
175174

176175
static void starting_clothes( npc &who, const npc_class_id &type, bool male );
@@ -2008,6 +2007,7 @@ ret_val<void> npc::wants_to_sell( const item_location &it, int at_price ) const
20082007

20092008
bool npc::wants_to_buy( const item &it ) const
20102009
{
2010+
20112011
return wants_to_buy( it, value( it ) ).success();
20122012
}
20132013

@@ -2021,11 +2021,12 @@ ret_val<void> npc::wants_to_buy( const item &it, int at_price ) const
20212021
return ret_val<void>::make_success();
20222022
}
20232023

2024+
20242025
if( it.has_flag( flag_TRADER_AVOID ) || it.has_var( VAR_TRADE_IGNORE ) ) {
20252026
return ret_val<void>::make_failure( _( "Will never buy this" ) );
20262027
}
20272028

2028-
if( !is_shopkeeper() && has_trait( trait_SQUEAMISH ) && it.is_filthy() ) {
2029+
if( it.is_filthy() ) {
20292030
return ret_val<void>::make_failure( _( "Will not buy filthy items" ) );
20302031
}
20312032

0 commit comments

Comments
 (0)