garrettmills/mtgc
1
0
Fork 0
Code Issues 1 Pull Requests Releases Activity

Spare/rarity filters, owned-only suggestions, and a Game night tab

Browse Source 
Library filters:
- "Only spare copies" quick filter (Library): cards with more copies
  owned than the decks' main boards use, the opposite of the ⚠
  over-assignment warning. Rows show "N spare" while it's on.
- Rarity toggles (C/U/R/M) in the shared criteria panel, so Library,
  Card Search and the set browser all get them. Any printing counts,
  since the library tracks cards rather than printings; within a set
  it's that set's printing. Arena-only printings don't count for a card
  that also exists on paper, so a digital re-rarity can't make a paper
  common read as rare.

Suggestions:
- "From my collection" toggle (remembered) narrows candidates to owned
  cards before scoring and paging, so "Suggest more" keeps finding them.
- Each suggestion reports copies other decks already use, shown as
  "N spare" / "all in other decks". suggest_cards now takes a
  SuggestOptions struct instead of a bare `unusual` flag.

Game tab: a life counter for 2-6 players with tap/hold ±1/±10, a
running change bubble, poison and per-opponent commander damage (which
also comes off life), out-of-the-game markers, dice and a coin, and a
random first player. A seat's deck puts its commander's art behind the
life total. On phones the board fills the screen with the far row
turned to face across the table, and asks to keep the screen awake.
The game is per-device scratch state in localStorage, not synced.

Plain filter chips now show an accent background when active; before,
"Unusual picks" only changed its text colour.
This commit is contained in:
Garrett Mills
2026-10-14 22:09:39 -05:00
parent 00a76a0f19
commit 067e85dc69
13 changed files with 1601 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
crates/mtgc-core/src/synergy.rs
View File

@@ -34,7 +34,7 @@ use std::collections::{HashMap, HashSet};
use rusqlite::params;
use rusqlite::types::Value;
use serde::Serialize;
use serde::{Deserialize, Serialize};
use crate::db::REF_DB;
use crate::error::{CoreError, Result};
@@ -109,6 +109,10 @@ pub struct SynergyReason {
pub struct CardSuggestion {
pub card: CardRef,
pub quantity_owned: i64,
/// Copies other decks' main boards already use. Never this deck's: cards
/// already in it aren't suggested. Lets the UI tell a spare copy from one
/// you'd have to pull out of another deck.
pub quantity_assigned: i64,
pub score: f64,
pub reasons: Vec<SynergyReason>,
/// Scryfall's EDHREC popularity rank (lower = more common in Commander);
@@ -134,6 +138,18 @@ const ARCHETYPE_CAP: usize = 3;
/// to invert the popularity tiebreak toward the least-played matches.
const UNUSUAL_RANK_THRESHOLD: i64 = 2000;
/// How [`Catalog::suggest_cards`] picks its candidate pool.
#[derive(Debug, Clone, Copy, Default, Deserialize)]
#[serde(default)]
pub struct SuggestOptions {
/// Favor cards that fit but aren't widely played — see
/// [`UNUSUAL_RANK_THRESHOLD`].
pub unusual: bool,
/// Only cards you own at least one copy of: build from the collection
/// rather than a shopping list.
pub owned_only: bool,
}
/// A candidate row pulled from the reference db before scoring.
struct Candidate {
card: CardRef,
@@ -146,7 +162,8 @@ impl Catalog {
/// Suggest up to `limit` cards (skipping the first `offset`, for a
/// "suggest more" continuation) that synergize with `deck_id`, scored and
/// explained across the four synergy families. Pulls from the whole
/// reference db (ownership is flagged via `quantity_owned`, not filtered),
/// reference db (ownership is flagged via `quantity_owned`, and filtered
/// only on request — see [`SuggestOptions`]),
/// excludes cards already on any board of the deck, and hard-filters to the
/// deck's (or commander's) color identity.
///
@@ -157,17 +174,19 @@ impl Catalog {
/// candidate pool and can shift later pages by one; acceptable for this
/// feature's scope).
///
/// When `unusual` is set, candidates ranked below [`UNUSUAL_RANK_THRESHOLD`]
/// (Scryfall's own popularity signal) or entirely unranked are favored
/// instead of the usual "float the staples" behavior, surfacing
/// underappreciated cards that still fit the deck's strategy.
/// When `opts.unusual` is set, candidates ranked below
/// [`UNUSUAL_RANK_THRESHOLD`] (Scryfall's own popularity signal) or
/// entirely unranked are favored instead of the usual "float the staples"
/// behavior, surfacing underappreciated cards that still fit the deck's
/// strategy. `opts.owned_only` narrows the pool to cards you own.
pub fn suggest_cards(
&self,
deck_id: i64,
limit: usize,
offset: usize,
unusual: bool,
opts: SuggestOptions,
) -> Result<Vec<CardSuggestion>> {
let SuggestOptions { unusual, owned_only } = opts;
// The `themes`/`edhrec_rank` columns only exist in a reference.db built
// after this feature shipped; an older ingest lacks them. Detect that
// and return a clear, actionable message instead of a raw "no such
@@ -360,6 +379,11 @@ impl Catalog {
sql.push_str(" AND (oc.edhrec_rank IS NULL OR oc.edhrec_rank >= ?)");
vals.push(Value::Integer(UNUSUAL_RANK_THRESHOLD));
}
if owned_only {
// Filtered before scoring and paging, so "Suggest more" keeps
// finding owned cards instead of pages thinning out to nothing.
sql.push_str(" AND COALESCE(lc.quantity_owned, 0) > 0");
}
let candidates: Vec<Candidate> = {
let mut stmt = self.conn.prepare(&sql)?;
@@ -392,6 +416,7 @@ impl Catalog {
let cand_ids: Vec<String> = candidates.iter().map(|c| c.card.oracle_id.clone()).collect();
let sub_map = self.batch_attr(&cand_ids, "card_subtypes", "subtype")?;
let kw_map = self.batch_attr(&cand_ids, "card_keywords", "keyword")?;
let assigned = self.assigned_totals_by_oracle()?;
let empty: Vec<String> = Vec::new();
let mut out: Vec<CardSuggestion> = Vec::new();
@@ -484,6 +509,7 @@ impl Catalog {
continue;
}
out.push(CardSuggestion {
quantity_assigned: assigned.get(oid).copied().unwrap_or(0),
card: cand.card,
quantity_owned: cand.quantity_owned,
score,
@@ -691,7 +717,7 @@ mod tests {
cat.set_deck_card(d.id, "deathrite-shaman", 1, false, false).unwrap();
cat.set_deck_card(d.id, "elf-c", 1, false, false).unwrap();
let out = cat.suggest_cards(d.id, 50, 0, false).unwrap();
let out = cat.suggest_cards(d.id, 50, 0, SuggestOptions::default()).unwrap();
let ids: Vec<&str> = out.iter().map(|s| s.card.oracle_id.as_str()).collect();
// Both Elf candidates appear with a Tribal reason mentioning Elf.
@@ -710,7 +736,7 @@ mod tests {
// `unusual` mode excludes the widely-played candidate entirely and
// keeps the obscure one.
add_ref_card(cat, "elf-unranked", "Unranked Elf", "Creature — Elf", "G", "", &["Elf"], &[], 0, None);
let out = cat.suggest_cards(d.id, 50, 0, true).unwrap();
let out = cat.suggest_cards(d.id, 50, 0, SuggestOptions { unusual: true, ..Default::default() }).unwrap();
let ids: Vec<&str> = out.iter().map(|s| s.card.oracle_id.as_str()).collect();
assert!(!ids.contains(&"elf-lord"), "rank 5 is well below the unusual threshold");
assert!(ids.contains(&"elf-rare"));
@@ -738,7 +764,7 @@ mod tests {
// An Elf candidate whose only possible signal is tribal.
add_ref_card(cat, "lone-elf", "Lone Elf", "Creature — Elf", "G", "", &["Elf"], &[], 0, None);
let out = cat.suggest_cards(d.id, 50, 0, false).unwrap();
let out = cat.suggest_cards(d.id, 50, 0, SuggestOptions::default()).unwrap();
assert!(!out.iter().any(|s| s.card.oracle_id == "lone-elf"));
}
@@ -756,7 +782,7 @@ mod tests {
add_ref_card(cat, "landfall-payoff", "Landfall Payoff", "Creature — Elemental", "G", "", &[], &["Landfall"], 0, None);
add_ref_card(cat, "just-a-flyer", "Just A Flyer", "Creature — Bird", "G", "", &[], &["Flying"], 0, None);
let out = cat.suggest_cards(d.id, 50, 0, false).unwrap();
let out = cat.suggest_cards(d.id, 50, 0, SuggestOptions::default()).unwrap();
let payoff = out.iter().find(|s| s.card.oracle_id == "landfall-payoff");
assert!(payoff.is_some(), "non-evergreen keyword should drive suggestions");
assert!(payoff.unwrap().reasons.iter().any(|r| r.category == "Mechanic" && r.detail.contains("Landfall")));
@@ -776,7 +802,7 @@ mod tests {
add_ref_card(cat, "green-elf", "Green Elf", "Creature — Elf", "G", "", &["Elf"], &[], 0, None);
add_ref_card(cat, "black-elf", "Black Elf", "Creature — Elf", "B", "", &["Elf"], &[], 0, None);
let out = cat.suggest_cards(d.id, 50, 0, false).unwrap();
let out = cat.suggest_cards(d.id, 50, 0, SuggestOptions::default()).unwrap();
let green = out.iter().find(|s| s.card.oracle_id == "green-elf");
assert!(green.is_some(), "commander's own type should be a tribal target");
assert!(green.unwrap().reasons.iter().any(|r| r.detail.contains("commander's type")));
@@ -793,7 +819,7 @@ mod tests {
cat.set_deck_card(d.id, "deathrite-shaman", 1, false, false).unwrap();
add_ref_card(cat, "swamp-dork", "Swamp Dork", "Creature — Elf", "B", "B", &["Elf"], &[], 0, None);
let out = cat.suggest_cards(d.id, 50, 0, false).unwrap();
let out = cat.suggest_cards(d.id, 50, 0, SuggestOptions::default()).unwrap();
let dork = out.iter().find(|s| s.card.oracle_id == "swamp-dork").unwrap();
assert!(dork.reasons.iter().any(|r| r.category == "Mana base" && r.detail.contains("{B}")));
}
@@ -803,7 +829,34 @@ mod tests {
let fx = test_support::make();
let cat = &fx.catalog;
let d = cat.create_deck("Empty", None).unwrap();
assert!(cat.suggest_cards(d.id, 50, 0, false).unwrap().is_empty());
assert!(cat.suggest_cards(d.id, 50, 0, SuggestOptions::default()).unwrap().is_empty());
}
#[test]
fn owned_only_keeps_your_cards_and_reports_copies_other_decks_use() {
let fx = test_support::make();
let cat = &fx.catalog;
add_ref_card(cat, "elf-c", "Elf Cleric", "Creature — Elf Cleric", "G", "", &["Elf"], &[], 0, None);
add_ref_card(cat, "owned-elf", "Owned Elf", "Creature — Elf", "G", "", &["Elf"], &[], 0, None);
add_ref_card(cat, "shop-elf", "Shop Elf", "Creature — Elf", "G", "", &["Elf"], &[], 0, None);
let d = cat.create_deck("Elfball", None).unwrap();
for oid in ["llanowar-elves", "deathrite-shaman", "elf-c"] {
cat.set_deck_card(d.id, oid, 1, false, false).unwrap();
}
cat.add_owned("owned-elf", 2).unwrap();
let other = cat.create_deck("Other", None).unwrap();
cat.set_deck_card(other.id, "owned-elf", 1, false, false).unwrap();
let all = cat.suggest_cards(d.id, 50, 0, SuggestOptions::default()).unwrap();
assert!(all.iter().any(|s| s.card.oracle_id == "shop-elf"));
let owned = cat
.suggest_cards(d.id, 50, 0, SuggestOptions { owned_only: true, ..Default::default() })
.unwrap();
let ids: Vec<&str> = owned.iter().map(|s| s.card.oracle_id.as_str()).collect();
assert_eq!(ids, vec!["owned-elf"]);
assert_eq!(owned[0].quantity_owned, 2);
assert_eq!(owned[0].quantity_assigned, 1, "one copy is already in the other deck");
}
#[cfg(test)]