File tree Expand file tree Collapse file tree 1 file changed +3
-2
lines changed Expand file tree Collapse file tree 1 file changed +3
-2
lines changed Original file line number Diff line number Diff line change @@ -170,7 +170,6 @@ static const trait_id trait_HALLUCINATION( "HALLUCINATION" );
170
170
static const trait_id trait_NO_BASH ( " NO_BASH" );
171
171
static const trait_id trait_PACIFIST ( " PACIFIST" );
172
172
static const trait_id trait_PROF_DICEMASTER ( " PROF_DICEMASTER" );
173
- static const trait_id trait_SQUEAMISH ( " SQUEAMISH" );
174
173
static const trait_id trait_TERRIFYING ( " TERRIFYING" );
175
174
176
175
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
2008
2007
2009
2008
bool npc::wants_to_buy ( const item &it ) const
2010
2009
{
2010
+
2011
2011
return wants_to_buy ( it, value ( it ) ).success ();
2012
2012
}
2013
2013
@@ -2021,11 +2021,12 @@ ret_val<void> npc::wants_to_buy( const item &it, int at_price ) const
2021
2021
return ret_val<void >::make_success ();
2022
2022
}
2023
2023
2024
+
2024
2025
if ( it.has_flag ( flag_TRADER_AVOID ) || it.has_var ( VAR_TRADE_IGNORE ) ) {
2025
2026
return ret_val<void >::make_failure ( _ ( " Will never buy this" ) );
2026
2027
}
2027
2028
2028
- if ( ! is_shopkeeper () && has_trait ( trait_SQUEAMISH ) && it.is_filthy () ) {
2029
+ if ( it.is_filthy () ) {
2029
2030
return ret_val<void >::make_failure ( _ ( " Will not buy filthy items" ) );
2030
2031
}
2031
2032
You can’t perform that action at this time.
0 commit comments