Merge pull request #682 from Senryoku/OTJ

Outlaws of Thunder Junction

Author: Senryoku

ManageCardData.py

@@ -469,6 +469,24 @@ def addCard(c):
             except:
                 selection['in_booster'] = False
 
+        if c['set'] == "otj":
+            try:
+                selection['in_booster'] = int(c['collector_number']) > 0 and int(c['collector_number']) < 272
+            except:
+                selection['in_booster'] = False
+
+        if c['set'] == "otp":
+            try:
+                selection['in_booster'] = int(c['collector_number']) > 0 and int(c['collector_number']) <= 65
+            except:
+                selection['in_booster'] = False
+
+        if c['set'] == "big":
+            try:
+                selection['in_booster'] = int(c['collector_number']) > 0 and int(c['collector_number']) <= 30
+            except:
+                selection['in_booster'] = False
+
         if c['layout'] == "split":
             if 'Aftermath' in c['keywords']:
                 selection['layout'] = 'split-left'
@@ -867,6 +885,6 @@ def getIcon(mtgset, icon_path):
 with open("src/data/constants.json", 'r', encoding="utf8") as constantsFile:
     constants = json.loads(constantsFile.read())
 constants['PrimarySets'] = [
-    s for s in PrimarySets if s in setinfos and s not in subsets and s not in ["ren", "rin", "a22", "y22", "j22", "sis", "ltc", "who", "wot", "blb", "acr", "mh3", "otj"]]  # Exclude some codes that are actually part of larger sets (tsb, fmb1, h1r... see subsets), or aren't out yet
+    s for s in PrimarySets if s in setinfos and s not in subsets and s not in ["ren", "rin", "a22", "y22", "j22", "sis", "ltc", "who", "wot", "blb", "acr", "mh3"]]  # Exclude some codes that are actually part of larger sets (tsb, fmb1, h1r... see subsets), or aren't out yet
 with open("src/data/constants.json", 'w', encoding="utf8") as constantsFile:
     json.dump(constants, constantsFile, ensure_ascii=False, indent=4)

client/public/img/sets/otc.svg

@@ -1796,8 +1796,8 @@
 							<a href="/draftqueue">
 								<div class="draft-queue-banner">
 									<img
-										src="./assets/img/mkm_draft_queue_banner.webp"
-										alt="Practice Murders at Karlov Manor draft with human players right now in the Draft Queue!"
+										src="./assets/img/otj_draft_queue_banner.webp"
+										alt="Practice Outlaws of Thunder Junction draft with human players right now in the Draft Queue!"
 										width="500"
 										height="260"
 									/>

client/public/img/sets/otj.svg

@@ -1,8 +1,12 @@
 <template>
 	<div class="welcome-section">
 		<div class="news">
-			<em>March, 2024</em>
+			<em>April 4, 2024</em>
 			<ul>
+				<li>
+					<img src="img/sets/otj.svg" class="set-icon" style="--invertedness: 100%" alt="OTJ" />
+					Outlaws of Thunder Junction is now available!
+				</li>
 				<li>New solo game mode: Supreme Draft!<br />Pick 2 cards from each booster and discard the rest.</li>
 				<li>
 					<img
@@ -57,24 +61,6 @@
 				<li>Fixed Arena versions of cards apppearing in Khans of Tarkir boosters.</li>
 			</ul>
 		</div>
-		<div class="news">
-			<em>December 6, 2023</em>
-			<ul>
-				<li>
-					Added a
-					<a href="/draftqueue"
-						>Draft Queue for
-						<img src="img/sets/ktk.svg" class="set-icon" style="--invertedness: 100%" alt="KTK" /> Khans of
-						Tarkir</a
-					>
-					to accompany its release on MTGA!
-				</li>
-				<li>Adjusted mythics/rares ratio depending on the set.</li>
-				<li>Correctly escape special characters, like quotes, in card names for MTGO export.</li>
-				<li>Fixed session collection download.</li>
-				<li>Usual minor tweaks</li>
-			</ul>
-		</div>
 	</div>
 </template>
 

client/src/App.vue

@@ -17628,6 +17628,9 @@
     "Orthion, Hero of Lavabrink": [
         85118
     ],
+    "A-Geological Appraiser": [
+        91484
+    ],
     "Westfold Rider": [
         84729
     ],