From 31b41103c5663cb1e6d11b23a924a84dbe622b92 Mon Sep 17 00:00:00 2001 From: Nicholas Brochu Date: Mon, 6 Jan 2025 22:23:06 -0500 Subject: [PATCH] tweak --- .../fourteen_minesweeper_variants_2_game.py | 36 ++++++++++++++++--- 1 file changed, 32 insertions(+), 4 deletions(-) diff --git a/worlds/keymasters_keep/games/fourteen_minesweeper_variants_2_game.py b/worlds/keymasters_keep/games/fourteen_minesweeper_variants_2_game.py index 3e3efb8d0e60..fcf56f62dd80 100644 --- a/worlds/keymasters_keep/games/fourteen_minesweeper_variants_2_game.py +++ b/worlds/keymasters_keep/games/fourteen_minesweeper_variants_2_game.py @@ -158,7 +158,7 @@ def game_objective_templates(self) -> List[GameObjectiveTemplate]: label="Complete SIZE VARIANT_LEFT + VARIANT_RIGHT board", data={ "SIZE": (self.sizes, 1), - "VARIANT_LEFT": (self.variants_left, 1), + "VARIANT_LEFT": (self.variants_left_no_bonus, 1), "VARIANT_RIGHT": (self.variants_right_one, 1), }, is_time_consuming=False, @@ -170,7 +170,7 @@ def game_objective_templates(self) -> List[GameObjectiveTemplate]: data={ "SIZE": (self.sizes, 1), "VARIANT_LEFT": (self.variants_left_one, 1), - "VARIANT_RIGHT": (self.variants_right, 1), + "VARIANT_RIGHT": (self.variants_right_no_bonus, 1), }, is_time_consuming=False, is_difficult=False, @@ -243,7 +243,7 @@ def game_objective_templates(self) -> List[GameObjectiveTemplate]: label="Perfect SIZE VARIANT_LEFT + VARIANT_RIGHT board", data={ "SIZE": (self.sizes, 1), - "VARIANT_LEFT": (self.variants_left, 1), + "VARIANT_LEFT": (self.variants_left_no_bonus, 1), "VARIANT_RIGHT": (self.variants_right_one, 1), }, is_time_consuming=False, @@ -255,7 +255,7 @@ def game_objective_templates(self) -> List[GameObjectiveTemplate]: data={ "SIZE": (self.sizes, 1), "VARIANT_LEFT": (self.variants_left_one, 1), - "VARIANT_RIGHT": (self.variants_right, 1), + "VARIANT_RIGHT": (self.variants_right_no_bonus, 1), }, is_time_consuming=False, is_difficult=False, @@ -304,6 +304,20 @@ def variants_left(self) -> List[str]: return variants + @staticmethod + def variants_left_no_bonus() -> List[str]: + variants: List[str] = [ + "[2H] Horizontal", + "[2C] Connected", + "[2S] Segment", + "[2G] Group", + "[2F] Flowers", + "[2B] Bridge", + "[2T] Triplet", + ] + + return variants + @staticmethod def variants_double_left() -> List[str]: return [ @@ -336,6 +350,20 @@ def variants_right(self) -> List[str]: return variants + @staticmethod + def variants_right_no_bonus() -> List[str]: + variants: List[str] = [ + "[2X] Cross", + "[2D] Deviation", + "[2P] Product", + "[2E] Encrypted", + "[2M] Modulo", + "[2A] Area", + "[2L] Liar", + ] + + return variants + @staticmethod def variants_double_right() -> List[str]: return [