fix(v1.3.1): prevent multiple suit order rules from being enabled

Author: AdoryVo

CHANGELOG.md

@@ -14,6 +14,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Improved bot skill
 - More to come soon!
 
+## [1.3.1] - 2025-10-05
+
+### Changed
+
+- Bugfix: Refactored suit order editing logic to prevent having multiple suit order rules enabled
+
 ## [1.3.0] - 2025-10-02
 
 ### Added
@@ -98,6 +104,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - All existing functionality as of 10-22-2023
 
 [unreleased]: https://github.com/AdoryVo/big-two/compare/v1.1.0...HEAD
+[1.3.1]: https://github.com/AdoryVo/big-two/releases/tag/v1.3.1
 [1.3.0]: https://github.com/AdoryVo/big-two/releases/tag/v1.3.0
 [1.2.1]: https://github.com/AdoryVo/big-two/releases/tag/v1.2.1
 [1.2.0]: https://github.com/AdoryVo/big-two/releases/tag/v1.2.0

package.json

@@ -1,6 +1,6 @@
 {
   "name": "big-two",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "private": true,
   "scripts": {
     "dev": "next dev",

src/components/LobbyForm.tsx

@@ -28,20 +28,29 @@ interface Props {
   submitForm: (body: object) => void;
 }
 
+const SUIT_ORDER_BITS = sum(
+  // Note: Don't directly pass in parseInt as the map() function
+  // to prevent passing in `index` to the `radix` argument.
+  Object.keys(SUIT_RANKING_ORDERS).map((bitAsStr) => Number.parseInt(bitAsStr)),
+);
+
 export default function LobbyForm({ game, submitForm }: Props) {
   const defaults = game?.settings ?? {
-    rules: Rules.DEFAULT,
+    // In this form, suit order is tracked separately than other rules.
+    rules: Rules.DEFAULT & ~SUIT_ORDER_BITS,
     public: false,
     spectating: true,
     playerMax: 4,
     deckCount: 1,
   };
 
+  // Capture existing suit order or default to alpha.
   const [suitOrder, setSuitOrder] = useState(
-    `${defaults.rules & Rules.SUIT_ORDER_ALPHA}`,
+    `${defaults.rules & SUIT_ORDER_BITS || Rules.SUIT_ORDER_ALPHA}`,
   );
+  // In this form, suit order is tracked separately than other rules.
   const [rules, setRules] = useState<number[]>(
-    rulesToArray(defaults.rules & ~Rules.SUIT_ORDER_ALPHA),
+    rulesToArray(defaults.rules & ~SUIT_ORDER_BITS),
   );
 
   const formik = useFormik({

src/components/Version.tsx

@@ -16,7 +16,7 @@ export default function Version(props: TextProps) {
           href="https://github.com/AdoryVo/big-two/blob/main/CHANGELOG.md"
           isExternal
         >
-          v1.3.0
+          v1.3.1
         </Link>
       </Text>
     </Tooltip>

src/lib/big-two/Rules.ts

@@ -1,7 +1,7 @@
 enum Rules {
   // Suit ordering
   SUIT_ORDER_ALPHA = 1,
-  SUIT_ORDER_BETA = 0,
+  SUIT_ORDER_BETA = 1 << 7,
   SUIT_ORDER_GAMMA = 1 << 6,
 
   // Straights
@@ -58,11 +58,7 @@ export function describe(rule: Rules) {
 }
 
 export function rulesToArray(rules: number) {
-  const array = ALL_RULES.filter((rule) => rules & rule);
-  if (!(rules & Rules.SUIT_ORDER_ALPHA)) {
-    array.unshift(0);
-  }
-  return array;
+  return ALL_RULES.filter((rule) => rules & rule);
 }
 
 export default Rules;

src/lib/big-two/Util.ts

@@ -54,11 +54,12 @@ class Util {
 
   _suit_val(card: Card) {
     const suit = card.suit.name;
-    if (this.rules & Rules.SUIT_ORDER_ALPHA)
-      return SUIT_RANKING_ORDERS[Rules.SUIT_ORDER_ALPHA].indexOf(suit);
-    else if (this.rules & Rules.SUIT_ORDER_BETA)
+    if (this.rules & Rules.SUIT_ORDER_BETA)
       return SUIT_RANKING_ORDERS[Rules.SUIT_ORDER_BETA].indexOf(suit);
-    else return SUIT_RANKING_ORDERS[Rules.SUIT_ORDER_GAMMA].indexOf(suit);
+    else if (this.rules & Rules.SUIT_ORDER_GAMMA)
+      return SUIT_RANKING_ORDERS[Rules.SUIT_ORDER_GAMMA].indexOf(suit);
+    // Default to suit order alpha.
+    else return SUIT_RANKING_ORDERS[Rules.SUIT_ORDER_ALPHA].indexOf(suit);
   }
 
   compare_cards(c1: Card, c2: Card) {