refactor: Fix lint collapsible-if (SIM102) (#173)

* refactor: Fix lint collapsible-if (SIM102)

* refactor: Remove unnecessary parentheses

* refactor: Merge duplicated sashikomi yaku conditions

Author: Apricot-S

mahjong/hand_calculating/fu.py

@@ -111,9 +111,8 @@ def calculate_fu(
                 continue
 
             # chi: count matches for win_group open/closed detection
-            if win_group_is_chi and grp_len == 3:
-                if grp[0] == wg0 and grp[1] == wg1 and grp[2] == wg2:
-                    win_group_chi_count_in_hand += 1
+            if win_group_is_chi and grp_len == 3 and grp[0] == wg0 and grp[1] == wg1 and grp[2] == wg2:
+                win_group_chi_count_in_hand += 1
 
         # preprocess melds into a fixed-size state table (tile_34 -> bit flags)
         is_open_hand = False

mahjong/hand_calculating/hand.py

@@ -195,9 +195,8 @@ def estimate_hand_value(
                 kan_sets = [x for x in hand if is_kan(x)]
                 chi_sets = [x for x in hand if is_chi(x)]
 
-                if config.is_tsumo:
-                    if not is_open_hand:
-                        hand_yaku.append(config.yaku.tsumo)
+                if config.is_tsumo and not is_open_hand:
+                    hand_yaku.append(config.yaku.tsumo)
 
                 if is_pinfu:
                     hand_yaku.append(config.yaku.pinfu)
@@ -234,7 +233,7 @@ def estimate_hand_value(
                 if (
                     not config.is_tsumo
                     and config.options.has_sashikomi_yakuman
-                    and ((config.yaku.daburu_open_riichi in hand_yaku) or (config.yaku.open_riichi in hand_yaku))
+                    and (config.yaku.daburu_open_riichi in hand_yaku or config.yaku.open_riichi in hand_yaku)
                 ):
                     hand_yaku.append(config.yaku.sashikomi)
 
@@ -449,14 +448,13 @@ def estimate_hand_value(
             else:
                 hand_yaku.append(config.yaku.kokushi)
 
-            if not config.is_tsumo and config.options.has_sashikomi_yakuman:
-                if config.is_riichi and not config.is_daburu_riichi:
-                    if config.is_open_riichi:
-                        hand_yaku.append(config.yaku.sashikomi)
-
-                if config.is_daburu_riichi:
-                    if config.is_open_riichi:
-                        hand_yaku.append(config.yaku.sashikomi)
+            if (
+                not config.is_tsumo
+                and config.options.has_sashikomi_yakuman
+                and config.is_open_riichi
+                and (config.is_daburu_riichi or config.is_riichi)
+            ):
+                hand_yaku.append(config.yaku.sashikomi)
 
             if config.is_renhou and config.options.renhou_as_yakuman:
                 hand_yaku.append(config.yaku.renhou_yakuman)

mahjong/hand_calculating/scores.py

@@ -200,22 +200,22 @@ def aotenjou_filter_yaku(hand_yaku: MutableSequence[Yaku] | MutableSet[Yaku], co
             # for daisuushi we need to remove toitoi
             hand_yaku.remove(config.yaku.toitoi)
 
-        if config.yaku.suuankou in hand_yaku or config.yaku.suuankou_tanki in hand_yaku:
+        if (
+            config.yaku.suuankou in hand_yaku or config.yaku.suuankou_tanki in hand_yaku
+        ) and config.yaku.toitoi in hand_yaku:
             # for suu ankou we need to remove toitoi and sanankou (sanankou is already removed by default)
-            if config.yaku.toitoi in hand_yaku:
-                # toitoi is "optional" in closed suukantsu, maybe a bug? or toitoi is not given when it's kans?
-                hand_yaku.remove(config.yaku.toitoi)
+            # toitoi is "optional" in closed suukantsu, maybe a bug? or toitoi is not given when it's kans?
+            hand_yaku.remove(config.yaku.toitoi)
 
         if config.yaku.chinroto in hand_yaku:
             # for chinroto we need to remove toitoi and honroto
             hand_yaku.remove(config.yaku.toitoi)
             hand_yaku.remove(config.yaku.honroto)
 
-        if config.yaku.suukantsu in hand_yaku:
+        if config.yaku.suukantsu in hand_yaku and config.yaku.toitoi in hand_yaku:
             # for suukantsu we need to remove toitoi and sankantsu (sankantsu is already removed by default)
-            if config.yaku.toitoi in hand_yaku:
-                # same as above?
-                hand_yaku.remove(config.yaku.toitoi)
+            # same as above?
+            hand_yaku.remove(config.yaku.toitoi)
 
         if config.yaku.chuuren_poutou in hand_yaku or config.yaku.daburu_chuuren_poutou in hand_yaku:
             # for chuuren poutou we need to remove chinitsu
@@ -232,7 +232,6 @@ def aotenjou_filter_yaku(hand_yaku: MutableSequence[Yaku] | MutableSet[Yaku], co
             if config.yaku.chiitoitsu in hand_yaku:
                 hand_yaku.remove(config.yaku.chiitoitsu)
 
-        if config.yaku.ryuisou in hand_yaku:
+        if config.yaku.ryuisou in hand_yaku and config.yaku.honitsu in hand_yaku:
             # for ryuisou we need to remove honitsu, if it is there
-            if config.yaku.honitsu in hand_yaku:
-                hand_yaku.remove(config.yaku.honitsu)
+            hand_yaku.remove(config.yaku.honitsu)

mahjong/shanten.py

@@ -211,9 +211,12 @@ def _update_result(self) -> None:
         n_mentsu_kouho = self._number_melds + self._number_tatsu
         if self._number_pairs:
             n_mentsu_kouho += self._number_pairs - 1
-        elif self._flag_four_copies and self._flag_isolated_tiles:
-            if (self._flag_four_copies | self._flag_isolated_tiles) == self._flag_four_copies:
-                ret_shanten += 1
+        elif (
+            self._flag_four_copies
+            and self._flag_isolated_tiles
+            and (self._flag_four_copies | self._flag_isolated_tiles) == self._flag_four_copies
+        ):
+            ret_shanten += 1
 
         if n_mentsu_kouho > 4:
             ret_shanten += n_mentsu_kouho - 4

pyproject.toml

@@ -86,7 +86,6 @@ ignore = [
     # Will be fixed later
     "COM812",
     "PLW1641",
-    "SIM102",
     "SIM108",
     "PLW2901",
     "PGH003",