Merge pull request #67 from alecrem/feature/issue-66/search-by-mana-value

Middle_School_Card_Search.py

@@ -79,8 +79,19 @@ if colorcol5.checkbox(_["basic"]["color_g"][l]):
 if colorcol6.checkbox(_["basic"]["color_c"][l]):
     results_df = results_df[results_df["c"] == True]
 
-col1, col2 = st.columns(2)
+# Filter by mana value
+min_mv = mslist_df["mv"].min()
+max_mv = mslist_df["mv"].max()
+mv_options = [mv for mv in range(min_mv, max_mv + 1)]
+start_mv, end_mv = st.select_slider(
+    f'**{_["search"]["search_by_mv"][l]}**', options=mv_options, value=(min_mv, max_mv)
+)
+cond1 = results_df["mv"] >= start_mv
+cond2 = results_df["mv"] <= end_mv
+results_df = results_df[cond1 & cond2]
+
 # Filter by type (select)
+col1, col2 = st.columns(2)
 type_list = streamlit_common.locale.get_type_options()
 select_types = col1.multiselect(
     f'**{_["search"]["select_type"][l]}**',

list_scripts/8_add_other_fields.py

@@ -6,7 +6,7 @@ def add_other_fields(row: pd.DataFrame) -> pd.DataFrame:
     print(f"{row['name']} | {row['oracle_id']}")
     for index, card in enumerate(cards):
         if card["identifiers"]["scryfallOracleId"] == row["oracle_id"]:
-            row["mw"] = card["manaValue"]
+            row["mv"] = card["manaValue"]
             row["rarity"] = card["rarity"]
             row["text"] = card["text"] if "text" in card else None
             row["type"] = card["type"]

output/middleschool_extra_fields.csv

@@ -1,4 +1,4 @@
-,Unnamed: 0,oracle_id,name,name_ja,mw,rarity,text,type,power,toughness,w,u,b,r,g,c
+,Unnamed: 0,oracle_id,name,name_ja,mv,rarity,text,type,power,toughness,w,u,b,r,g,c
 0,0,8adbba6e-03ef-4278-aec5-8a4496b377a8,Abandon Hope,断念,2,uncommon,"As an additional cost to cast this spell, discard X cards.
 Look at target opponent's hand and choose X cards from it. That player discards those cards.",Sorcery,,,False,False,True,False,False,False
 1,1,5a70ccfa-d12d-4e62-a1a4-f05cda2fd442,Abandoned Outpost,見捨てられた前哨地,0,common,"Abandoned Outpost enters the battlefield tapped.

streamlit_common/locale.py

@@ -50,6 +50,10 @@ def get_locale():
                 "en": "Color:",
                 "ja": "色：",
             },
+            "search_by_mv": {
+                "en": "Mana value:",
+                "ja": "マナ総量：",
+            },
             "cards_found": {
                 "en": " cards were found.",
                 "ja": "枚 のカードが見つかりました。",