Merge pull request #45 from unrealities/0326

v03.26
unrealities · Jul 28, 2024 · faad8ae · faad8ae
2 parents 7b96771 + a67dddc
commit faad8ae
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 24 deletions.
diff --git a/README.md b/README.md
@@ -251,7 +251,7 @@ The following solution is for P1P1. After you have selected a card, only Arena l
 
 ### Future Considerations
 
-- The Google Cloud Function has a cost, and only 1000 requests each month are free. If used excessively, the endpoint may need to be deactivated.
+- For 30 days in June/July 2024, there were 913 requests, less than 1000 free requests each month for Google Cloud Functions. I will monitor Bloomburrow's release, but the feature is currently in no jeopardy of being removed.
 
 ## Troubleshooting
 

diff --git a/Tools/TierScraper17Lands/README.md b/Tools/TierScraper17Lands/README.md
@@ -3,19 +3,20 @@
 ![Tier_lists](https://user-images.githubusercontent.com/96687942/227722851-9f978440-b313-4375-9503-357cd7b2f1df.png)
 
 ## Steps
+
 - **Step 1**: Open Chrome
 
 - **Step 2:** Go to chrome://extensions/
 
 - **Step 3:** Toggle Developer Mode
 
 - **Step 4:** Click Load Unpacked
-    - Click Update if you've already unpacked the extension
+  - Click Update if you've already unpacked the extension
 
 - **Step 5:** Select the Tools/TierScraper17Lands/src folder and click Select Folder
 
 - **Step 6:** Go to a 17Lands Tier List page (e.g., https://www.17lands.com/tier_list/58d9427911c74212841c04e223556395)
-    - It might take a few seconds for the button to appear
+  - It might take a few seconds for the button to appear
 
 - **Step 7:** Enter a label for the tier list
 
@@ -26,6 +27,6 @@
 - **Step 10:** Start the draft in Arena
 
 - **Step 11:** Select the tier list option from the bottom of any of the column drop-downs in the settings window
-    - The tier list will appear as `TIER#: <label>`
+  - The tier list will appear as `TIER#: <label>`
 
 ![Tier_list_setup](https://user-images.githubusercontent.com/96687942/227722838-1512dd5d-23f3-47fc-bae8-5ea717b97222.png)
diff --git a/builder/Installer.iss b/builder/Installer.iss
@@ -1,7 +1,7 @@
 ; -- MtgaDraft.iss --
 [Setup]
 AppName=MTGA Draft Tool
-AppVersion=3.25
+AppVersion=3.26
 WizardStyle=modern
 DefaultDirName={sd}\MtgaDraftTool
 DefaultGroupName=MtgaDraftTool
@@ -11,7 +11,7 @@ Compression=lzma2
 UsePreviousAppDir=yes
 SolidCompression=yes
 OutputDir={app}
-OutputBaseFilename=MTGA_Draft_Tool_V0325
+OutputBaseFilename=MTGA_Draft_Tool_V0326
 InfoAfterFile=..\release_notes.txt
 [Files]
 Source: "..\dist\MTGA_Draft_Tool.exe"; DestDir: "{app}"

diff --git a/release_notes.txt b/release_notes.txt
@@ -1,3 +1,6 @@
+===================== RELEASE NOTES 3.26 =====================
+* FiYir Fixed issue [Bug]: OTJ ArenaDirect is detected as MH3 ArenaDirect and no picks are detected #42
+
 ===================== RELEASE NOTES 3.25 =====================
 * FiYir released feature: Dataset Pre-Download Check #38
 

diff --git a/src/limited_sets.py b/src/limited_sets.py
@@ -12,7 +12,7 @@
 
 logger = create_logger()
 
-LIMITED_SETS_VERSION = 4
+LIMITED_SETS_VERSION = 5
 TOTAL_SCRYFALL_SETS = 50
 DATE_SHIFT_OFFSET_DAYS = -30
 TEMP_LIMITED_SETS = os.path.join("Temp", "temp_set_list.json")
@@ -54,12 +54,6 @@ class SetDictionary(BaseModel):
             type="Sealed",
             set_code=REPLACE_PHRASE_LATEST,
             keywords=["Qualifier"]
-        ),
-        SpecialEvent(
-            label="ArenaDirect",
-            type="Sealed",
-            set_code=REPLACE_PHRASE_LATEST,
-            keywords=["ArenaDirect"]
         )
     ]
 

diff --git a/src/overlay.py b/src/overlay.py
@@ -40,7 +40,7 @@
 except ImportError:
     pass
 
-APPLICATION_VERSION = 3.25
+APPLICATION_VERSION = 3.26
 
 HOTKEY_CTRL_G = '\x07'
 

diff --git a/tests/test_app_update.py b/tests/test_app_update.py
@@ -27,7 +27,7 @@ def invalid_input_url():
 
 @pytest.fixture
 def valid_input_url_zip():
-    return "https://github.com/unrealities/MTGA_Draft_17Lands/releases/download/MTGA_Draft_Tool_V0324/MTGA_Draft_Tool_V0324.zip"
+    return "https://github.com/unrealities/MTGA_Draft_17Lands/releases/download/MTGA_Draft_Tool_V0325/MTGA_Draft_Tool_V0325.zip"
 
 @pytest.fixture
 def output_filename():

diff --git a/tests/test_log_scanner.py b/tests/test_log_scanner.py
@@ -56,12 +56,6 @@
             type="Sealed",
             set_code="MKM",
             keywords=["Qualifier"]
-        ),
-        SpecialEvent(
-            label="ArenaDirect",
-            type="Sealed",
-            set_code="DMU",
-            keywords=["ArenaDirect"]
         )
     ]
 )
@@ -545,15 +539,15 @@ class EventResults:
     ("Arena Direct Event Start",
     EventResults(new_event=True,
                  data_update=False,
-                 current_set="DMU",
-                 current_event="ArenaDirect",
+                 current_set="OTJ",
+                 current_event="Sealed",
                  current_pack=0,
                  current_pick=0,
                  picks=[],
                  pack=[],
                  card_pool=[],
                  missing=[]),
-    r'[UnityCrossThreadLogger]==> Event_Join {"id":"57d3b2c6-71ef-44ee-a395-1e977fcdd6b6","request":"{\"EventName\":\"ArenaDirect_Sealed\",\"EntryCurrencyType\":\"Gem\",\"EntryCurrencyPaid\":1500,\"CustomTokenId\":null}"}'
+    r'[UnityCrossThreadLogger]==> Event_Join {"id":"57d3b2c6-71ef-44ee-a395-1e977fcdd6b6","request":"{\"EventName\":\"ArenaDirect_OTJ_Sealed_20240726\",\"EntryCurrencyType\":\"Gem\",\"EntryCurrencyPaid\":1500,\"CustomTokenId\":null}"}'
     ),