Merge pull request #6 from alecrem/add-box-sets

middleschool-cardlist.ipynb

@@ -34,7 +34,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 2,
+   "execution_count": 1,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -42,7 +42,7 @@
     "           'WTH', 'POR', 'TMP', 'STH', 'EXO', 'P02', 'USG', 'ULG',\n",
     "           '6ED', 'UDS', 'PTK', 'S99', 'MMQ', 'NEM', 'PCY', 'S00',\n",
     "           'INV', 'PLS', '7ED', 'APC', 'ODY', 'TOR', 'JUD', 'ONS',\n",
-    "           'LGN', 'SCG', 'PDRC', 'PHPR']\n",
+    "           'LGN', 'SCG', 'PDRC', 'PHPR', 'ATH', 'BRB', 'BTD', 'DKM']\n",
     "for set in setlist:\n",
     "    command = 'cat data/AllPrintings.json | jq \\'.data.\\\"' + \\\n",
     "        set + '\\\".cards\\' > data/set_' + set + '.json'\n",
@@ -58,7 +58,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 9,
+   "execution_count": 2,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -75,14 +75,19 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 12,
+   "execution_count": 18,
    "metadata": {},
    "outputs": [
     {
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "5793 cards found\n",
+      "                              oracle_id           name name_ja\n",
+      "0  5acc8b39-3c3e-4012-8cfd-ac3c2c4ca982  Arc Lightning   弧状の稲妻\n",
+      "0  5acc8b39-3c3e-4012-8cfd-ac3c2c4ca982  Arc Lightning    None\n",
+      "                              oracle_id           name name_ja\n",
+      "0  5acc8b39-3c3e-4012-8cfd-ac3c2c4ca982  Arc Lightning   弧状の稲妻\n",
+      "5800 cards found\n",
       "                              oracle_id               name    name_ja\n",
       "0  8adbba6e-03ef-4278-aec5-8a4496b377a8       Abandon Hope         断念\n",
       "0  5a70ccfa-d12d-4e62-a1a4-f05cda2fd442  Abandoned Outpost  見捨てられた前哨地\n",
@@ -123,8 +128,10 @@
     "    })\n",
     "    middleschool_df = pd.concat([middleschool_df, temporary_df])\n",
     "\n",
+    "middleschool_df = middleschool_df.sort_values(by=['name', 'name_ja'])\n",
+    "print(middleschool_df[middleschool_df['name'] == 'Arc Lightning'])\n",
     "middleschool_df = middleschool_df.drop_duplicates(subset=['oracle_id'])\n",
-    "middleschool_df = middleschool_df.sort_values(by='name')\n",
+    "print(middleschool_df[middleschool_df['name'] == 'Arc Lightning'])\n",
     "print(middleschool_df.shape[0], 'cards found')\n",
     "print(middleschool_df.head())\n",
     "print(middleschool_df.tail())\n"
@@ -139,16 +146,16 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 13,
+   "execution_count": 19,
    "metadata": {},
    "outputs": [
     {
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "Cards legal by set: 5793\n",
+      "Cards legal by set: 5800\n",
       "Banned cards: 26\n",
-      "Cards legal by set and not banned: 5767\n"
+      "Cards legal by set and not banned: 5774\n"
      ]
     }
    ],
@@ -181,7 +188,7 @@
     "           \"Yawgmoth's Will\"]\n",
     "print('Cards legal by set:', middleschool_df.shape[0])\n",
     "banned_df = middleschool_df[pd.DataFrame(\n",
-    "    middleschool_df.name.tolist()).isin(banlist).any(1).values]\n",
+    "    middleschool_df.name.tolist()).isin(banlist).any(axis=1).values]\n",
     "print('Banned cards:', banned_df.shape[0])\n",
     "middleschool_df = pd.concat(\n",
     "    [middleschool_df, banned_df]).drop_duplicates(keep=False)\n",
@@ -199,7 +206,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 14,
+   "execution_count": 20,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -217,7 +224,7 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python 3.9.12 64-bit",
+   "display_name": "Python 3",
    "language": "python",
    "name": "python3"
   },
@@ -231,7 +238,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.12"
+   "version": "3.10.8"
   },
   "orig_nbformat": 4,
   "vscode": {