From b3de39bffbd50b9694170a6ae371396b25222386 Mon Sep 17 00:00:00 2001 From: mwisnowski Date: Thu, 26 Dec 2024 10:02:12 -0800 Subject: [PATCH] Fixed logic in setup for determining the 'face' of double sided cards --- setup.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/setup.py b/setup.py index 938c11e..e50be85 100644 --- a/setup.py +++ b/setup.py @@ -45,9 +45,9 @@ def filter_by_color(df, column_name, value, new_csv_name): filtered_df = filtered_df[~filtered_df['type'].str.contains(card_type)] filtered_df['faceName'] = filtered_df['faceName'].fillna(filtered_df['name']) filtered_df.drop_duplicates(subset='faceName', keep='first', inplace=True) - columns_to_keep = ['name', 'faceName','edhrecRank','colorIdentity', 'colors', 'manaCost', 'manaValue', 'type', 'layout', 'text', 'power', 'toughness', 'keywords'] + columns_to_keep = ['name', 'faceName','edhrecRank','colorIdentity', 'colors', 'manaCost', 'manaValue', 'type', 'layout', 'text', 'power', 'toughness', 'keywords', 'side'] filtered_df = filtered_df[columns_to_keep] - filtered_df.sort_values(by='name', key=lambda col: col.str.lower(), inplace=True) + filtered_df.sort_values(by=['name', 'side'], key=lambda col: col.str.lower(), inplace=True) filtered_df.to_csv(new_csv_name, index=False) @@ -170,10 +170,11 @@ def determine_commanders(): filtered_df = filtered_df[~filtered_df['type'].str.contains(card_type)] filtered_df['faceName'] = filtered_df['faceName'].fillna(filtered_df['name']) filtered_df.drop_duplicates(subset='faceName', keep='first', inplace=True) - columns_to_keep = ['name', 'faceName','edhrecRank','colorIdentity', 'colors', 'manaCost', 'manaValue', 'type', 'layout', 'text', 'power', 'toughness', 'keywords'] + columns_to_keep = ['name', 'faceName','edhrecRank','colorIdentity', 'colors', 'manaCost', 'manaValue', 'type', 'layout', 'text', 'power', 'toughness', 'keywords', 'side'] filtered_df = filtered_df[columns_to_keep] - filtered_df.sort_values(by='name', key=lambda col: col.str.lower(), inplace=True) + filtered_df.sort_values(by=['name', 'side'], key=lambda col: col.str.lower(), inplace=True) filtered_df.to_csv(f'{csv_directory}/commander_cards.csv', index=False) + print('commander_cards.csv file generated.') def initial_setup():