services/mtg-online-drafter
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: Implement new peasant and standard pack generation algorithms, including special guest support and subset merging, and add relevant documentation.

Browse Source
This commit is contained in:
Daniele Viti
2025-12-20 19:53:48 +01:00
parent 418e9e4507
commit 139aca6f4f
10 changed files with 284 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/server/index.ts
View File

@@ -130,7 +130,8 @@ app.get('/api/sets', async (_req: Request, res: Response) => {
app.get('/api/sets/:code/cards', async (req: Request, res: Response) => {
try {
const cards = await scryfallService.fetchSetCards(req.params.code);
const related = req.query.related ? (req.query.related as string).split(',') : [];
const cards = await scryfallService.fetchSetCards(req.params.code, related);
// Implicitly cache images for these cards so local URLs work
if (cards.length > 0) {
@@ -218,7 +219,18 @@ app.post('/api/packs/generate', async (req: Request, res: Response) => {
ignoreTokens: false
};
const { pools, sets } = packGeneratorService.processCards(poolCards, activeFilters);
// Fetch metadata for merging subsets
const allSets = await scryfallService.fetchSets();
const setsMetadata: { [code: string]: { parent_set_code?: string } } = {};
if (allSets && Array.isArray(allSets)) {
allSets.forEach((s: any) => {
if (selectedSets && selectedSets.includes(s.code)) {
setsMetadata[s.code] = { parent_set_code: s.parent_set_code };
}
});
}
const { pools, sets } = packGeneratorService.processCards(poolCards, activeFilters, setsMetadata);
// Extract available basic lands for deck building
const basicLands = pools.lands.filter(c => c.typeLine?.includes('Basic'));

72
src/server/services/PackGeneratorService.ts
View File

@@ -34,6 +34,7 @@ export interface ProcessedPools {
mythics: DraftCard[];
lands: DraftCard[];
tokens: DraftCard[];
specialGuests: DraftCard[];
}
export interface SetsMap {
@@ -46,6 +47,7 @@ export interface SetsMap {
mythics: DraftCard[];
lands: DraftCard[];
tokens: DraftCard[];
specialGuests: DraftCard[];
}
}
@@ -57,9 +59,9 @@ export interface PackGenerationSettings {
export class PackGeneratorService {
processCards(cards: ScryfallCard[], filters: { ignoreBasicLands: boolean, ignoreCommander: boolean, ignoreTokens: boolean }): { pools: ProcessedPools, sets: SetsMap } {
processCards(cards: ScryfallCard[], filters: { ignoreBasicLands: boolean, ignoreCommander: boolean, ignoreTokens: boolean }, setsMetadata: { [code: string]: { parent_set_code?: string } } = {}): { pools: ProcessedPools, sets: SetsMap } {
console.time('processCards');
const pools: ProcessedPools = { commons: [], uncommons: [], rares: [], mythics: [], lands: [], tokens: [] };
const pools: ProcessedPools = { commons: [], uncommons: [], rares: [], mythics: [], lands: [], tokens: [], specialGuests: [] };
const setsMap: SetsMap = {};
let processedCount = 0;
@@ -118,10 +120,11 @@ export class PackGeneratorService {
else if (rarity === 'uncommon') pools.uncommons.push(cardObj);
else if (rarity === 'rare') pools.rares.push(cardObj);
else if (rarity === 'mythic') pools.mythics.push(cardObj);
else pools.specialGuests.push(cardObj);
// Add to Sets Map
if (!setsMap[cardData.set]) {
setsMap[cardData.set] = { name: cardData.set_name, code: cardData.set, commons: [], uncommons: [], rares: [], mythics: [], lands: [], tokens: [] };
setsMap[cardData.set] = { name: cardData.set_name, code: cardData.set, commons: [], uncommons: [], rares: [], mythics: [], lands: [], tokens: [], specialGuests: [] };
}
const setEntry = setsMap[cardData.set];
@@ -147,11 +150,38 @@ export class PackGeneratorService {
else if (rarity === 'uncommon') { pools.uncommons.push(cardObj); setEntry.uncommons.push(cardObj); }
else if (rarity === 'rare') { pools.rares.push(cardObj); setEntry.rares.push(cardObj); }
else if (rarity === 'mythic') { pools.mythics.push(cardObj); setEntry.mythics.push(cardObj); }
else { pools.specialGuests.push(cardObj); setEntry.specialGuests.push(cardObj); }
}
processedCount++;
});
// 2. Second Pass: Merge Subsets (Masterpieces) into Parents
Object.keys(setsMap).forEach(setCode => {
const meta = setsMetadata[setCode];
if (meta && meta.parent_set_code) {
const parentCode = meta.parent_set_code;
if (setsMap[parentCode]) {
const parentSet = setsMap[parentCode];
const childSet = setsMap[setCode];
const allChildCards = [
...childSet.commons,
...childSet.uncommons,
...childSet.rares,
...childSet.mythics,
...childSet.specialGuests
];
parentSet.specialGuests.push(...allChildCards);
pools.specialGuests.push(...allChildCards);
// Remove child set from map so we don't generate separate packs for it
delete setsMap[setCode];
}
}
});
console.log(`[PackGenerator] Processed ${processedCount} cards.`);
console.timeEnd('processCards');
return { pools, sets: setsMap };
@@ -176,7 +206,8 @@ export class PackGeneratorService {
rares: this.shuffle([...pools.rares]),
mythics: this.shuffle([...pools.mythics]),
lands: this.shuffle([...pools.lands]),
tokens: this.shuffle([...pools.tokens])
tokens: this.shuffle([...pools.tokens]),
specialGuests: this.shuffle([...pools.specialGuests])
};
// Log pool sizes
@@ -197,7 +228,8 @@ export class PackGeneratorService {
rares: this.shuffle([...pools.rares]),
mythics: this.shuffle([...pools.mythics]),
lands: this.shuffle([...pools.lands]),
tokens: this.shuffle([...pools.tokens])
tokens: this.shuffle([...pools.tokens]),
specialGuests: this.shuffle([...pools.specialGuests])
};
}
@@ -256,7 +288,8 @@ export class PackGeneratorService {
rares: this.shuffle([...data.rares]),
mythics: this.shuffle([...data.mythics]),
lands: this.shuffle([...data.lands]),
tokens: this.shuffle([...data.tokens])
tokens: this.shuffle([...data.tokens]),
specialGuests: this.shuffle([...data.specialGuests])
};
let packsGeneratedForSet = 0;
@@ -276,7 +309,8 @@ export class PackGeneratorService {
rares: this.shuffle([...data.rares]),
mythics: this.shuffle([...data.mythics]),
lands: this.shuffle([...data.lands]),
tokens: this.shuffle([...data.tokens])
tokens: this.shuffle([...data.tokens]),
specialGuests: this.shuffle([...data.specialGuests])
};
}
@@ -331,9 +365,29 @@ export class PackGeneratorService {
// Common
draw(pools.commons, 1, 'commons');
} else {
// Uncommon/List
// If pool empty, try fallback if standard? No, strict as per previous instruction.
draw(pools.uncommons, 1, 'uncommons');
// draw(pools.uncommons, 1, 'uncommons');
// Slot 7: Common/List Slot (Strict adherence to standard-pack-generation-algorithm.md)
// 1-87: Common from Main Set
// 88-97: Card from The List (Common/Uncommon) -> Mapped to specialGuests
// 98-99: Rare/Mythic from The List -> Mapped to specialGuests
// 100: Special Guest -> Mapped to specialGuests
// We simplify by drawing from specialGuests for 88-100 (13% chance)
// if specialGuests is empty, fallback to Common or Uncommon?
// Rulebook says "1-87 Common".
const hasGuests = pools.specialGuests.length > 0;
if (roll7 > 87 && hasGuests) {
draw(pools.specialGuests, 1, 'specialGuests');
} else {
// 1-87 or no guests available
draw(pools.commons, 1, 'commons');
// Note: If original rule for 88-97 was "Common from List",
// and we fall back to "Common from Set", it's acceptable if List/Guests missing.
}
}
// 3. Uncommons (3 or 4 dependent on PEASANT vs STANDARD)

34
src/server/services/ScryfallService.ts
View File

@@ -193,13 +193,15 @@ export class ScryfallService {
const data = await resp.json();
const sets = data.data
.filter((s: any) => ['core', 'expansion', 'masters', 'draft_innovation', 'commander', 'funny'].includes(s.set_type))
.filter((s: any) => ['core', 'expansion', 'masters', 'draft_innovation', 'commander', 'funny', 'masterpiece', 'eternal'].includes(s.set_type))
.map((s: any) => ({
code: s.code,
name: s.name,
set_type: s.set_type,
released_at: s.released_at,
digital: s.digital
digital: s.digital,
parent_set_code: s.parent_set_code,
card_count: s.card_count
}));
return sets;
@@ -209,7 +211,7 @@ export class ScryfallService {
}
}
async fetchSetCards(setCode: string): Promise<ScryfallCard[]> {
async fetchSetCards(setCode: string, relatedSets: string[] = []): Promise<ScryfallCard[]> {
const setHash = setCode.toLowerCase();
const setCachePath = path.join(SETS_DIR, `${setHash}.json`);
@@ -226,26 +228,30 @@ export class ScryfallService {
}
}
console.log(`[ScryfallService] Fetching cards for set ${setCode} from API...`);
console.log(`[ScryfallService] Fetching cards for set ${setCode} (related: ${relatedSets.join(',')}) from API...`);
let allCards: ScryfallCard[] = [];
let url = `https://api.scryfall.com/cards/search?q=set:${setCode}&unique=cards`;
// Construct Composite Query: (e:main OR e:sub1 OR e:sub2) is:booster unique=prints
const setClause = `e:${setCode}` + relatedSets.map(s => ` OR e:${s}`).join('');
let url = `https://api.scryfall.com/cards/search?q=(${setClause}) unique=prints is:booster`;
try {
while (url) {
console.log(`[ScryfallService] Requesting: ${url}`);
const r = await fetch(url);
if (!r.ok) {
if (r.status === 404) {
console.log(`[ScryfallService] [API CALL] Requesting: ${url}`);
const resp = await fetch(url);
console.log(`[ScryfallService] [API RESPONSE] Status: ${resp.status}`);
if (!resp.ok) {
if (resp.status === 404) {
console.warn(`[ScryfallService] 404 Not Found for URL: ${url}. Assuming set has no cards.`);
break;
}
const errBody = await r.text();
console.error(`[ScryfallService] Error fetching ${url}: ${r.status} ${r.statusText}`, errBody);
throw new Error(`Failed to fetch set: ${r.statusText} (${r.status}) - ${errBody}`);
const errBody = await resp.text();
console.error(`[ScryfallService] Error fetching ${url}: ${resp.status} ${resp.statusText}`, errBody);
throw new Error(`Failed to fetch set: ${resp.statusText} (${resp.status}) - ${errBody}`);
}
const d = await r.json();
const d = await resp.json();
if (d.data) {
allCards.push(...d.data);