fix some bugs related to trash pushes and trash finesses

Author: downvoid

src/conventions/h-group/action-helper.js

@@ -2,6 +2,7 @@ import { isTrash } from '../../basics/hanabi-util.js';
 import { connectable_simple } from '../../basics/helper.js';
 import { unknown_1 } from './hanabi-logic.js';
 import * as Utils from '../../tools/util.js';
+import { CLUE_INTERP } from './h-constants.js';
 
 import logger from '../../tools/logger.js';
 import { logClue } from '../../tools/log.js';
@@ -25,6 +26,8 @@ import { logClue } from '../../tools/log.js';
  */
 export function find_clue_value(clue_result) {
 	const { finesses, new_touched, playables, bad_touch, trash, cm_dupe, avoidable_dupe, elim, remainder } = clue_result;
+	if (clue_result.interp === CLUE_INTERP.TRASH_PUSH)
+		return 1; // trash pushes always meet MCVP because it gets a new card.
 	const good_new_touched = new_touched.filter(c => !trash.includes(c.order));
 
 	// Touching 1 card is much better than touching none, but touching more cards is only marginally better

src/conventions/h-group/clue-interpretation/interpret-clue.js

@@ -1121,10 +1121,10 @@ function interpret_trash_push(game, action, focus_order) {
 	if (clue.type === CLUE.RANK) {
 		const promised_ids = Utils.range(0, state.variant.suits.length).map(suitIndex => ({ suitIndex, rank: clue.value }));
 
-		if (focus_thoughts.possible.intersect(promised_ids).some(i => !isTrash(state, mod_common, i, focus_order, { infer: true })))
+		if (focus_thoughts.inferred.intersect(promised_ids).some(i => !isTrash(state, mod_common, i, focus_order, { infer: true })))
 			return -1;
 	}
-	else if (focus_thoughts.possible.some(c => !isTrash(state, mod_common, c, focus_order, { infer: true })) ||
+	else if (focus_thoughts.inferred.some(c => !isTrash(state, mod_common, c, focus_order, { infer: true })) ||
 		focus_thoughts.inferred.every(i => state.isPlayable(i) && !isTrash(state, mod_common, i, focus_order, { infer: true }))) {
 		return -1;
 	}