Merge pull request #113 from iqnite/iqnite/issue100

Add Alter the Future NOW

Author: iqnite

eggsplode/cards/future.py

@@ -23,9 +23,7 @@ async def show_next_cards(
     amount: int = 3,
 ):
     next_cards = "\n".join(
-        format_message(
-            "list_item_1", tooltip(card)
-        )
+        format_message("list_item_1", tooltip(card))
         for card in deck[-1 : -amount - 1 : -1]
     )
     await interaction.respond(
@@ -37,7 +35,7 @@ async def show_next_cards(
 
 
 async def alter_future_finish(game: "Game", _):
-    await game.send(view=TextView("altered_future", game.current_player_id))
+    await game.send(view=TextView("altered_future", game.action_player_id))
     await game.events.action_end()
 
 
@@ -54,33 +52,30 @@ def __init__(
         self.callback_action = callback_action
         self.selects: list[discord.ui.Select] = []
         self.add_item(self.confirm_button)
+        self.add_item(discord.ui.TextDisplay(format_message("next_cards")))
         self.create_selections()
 
     def create_selections(self):
-        card_options = [
-            discord.SelectOption(
-                value=f"{i}:{card}",
-                label=CARDS[card]["title"],
-                description=CARDS[card]["description"][:99],
-                emoji=replace_emojis(CARDS[card]["emoji"]),
-            )
-            for i, card in enumerate(
-                self.game.deck[-1 : -self.amount_of_cards - 1 : -1]
-            )
-        ]
         for select in self.selects:
             self.remove_item(select)
         self.selects = []
         for i in range(self.amount_of_cards):
+            card_options = [
+                discord.SelectOption(
+                    value=f"{j}:{card}",
+                    label=CARDS[card]["title"],
+                    description=CARDS[card]["description"][:99],
+                    emoji=replace_emojis(CARDS[card]["emoji"]),
+                    default=j == i,
+                )
+                for j, card in enumerate(
+                    self.game.deck[-1 : -self.amount_of_cards - 1 : -1]
+                )
+            ]
             select = discord.ui.Select(
-                placeholder=format_message(
-                    "alter_future_placeholder",
-                    i + 1,
-                    CARDS[self.game.deck[-i - 1]]["title"],
-                ),
+                options=card_options,
                 min_values=1,
                 max_values=1,
-                options=card_options,
             )
             select.callback = self.selection_callback
             self.selects.append(select)

eggsplode/core.py

@@ -257,7 +257,7 @@ async def draw(
     async def action_check(self, interaction: discord.Interaction) -> bool:
         if not interaction.user:
             raise TypeError("interaction.user is None")
-        if interaction.user.id != self.current_player_id:
+        if interaction.user.id != self.action_player_id:
             await interaction.respond(
                 view=TextView("not_your_turn"), ephemeral=True, delete_after=5
             )
@@ -285,9 +285,13 @@ async def show_hand(self, interaction: discord.Interaction):
         await self.events.turn_reset()
 
     async def play_callback(self, interaction: discord.Interaction, card: str):
+        if not interaction.user:
+            return
+        if CARDS[card].get("now"):
+            self.action_player_id = interaction.user.id
         if not await self.action_check(interaction):
             return
-        self.current_player_hand.remove(card)
+        self.action_player_hand.remove(card)
         await self.events.action_start()
         if CARDS[card].get("explicit", False):
             await self.play(interaction, card)
@@ -298,7 +302,7 @@ async def play_callback(self, interaction: discord.Interaction, card: str):
                 message=format_message(
                     "play_card",
                     CARDS[card]["emoji"],
-                    self.current_player_id,
+                    self.action_player_id,
                     tooltip(card, emoji=False),
                 ),
             )

eggsplode/ui/play.py

@@ -50,9 +50,13 @@ def update_sections(self):
             return
         for card, count in user_cards.items():
             card_playable = (
-                self.playable
+                not self.game.paused
                 and CARDS[card].get("usable", False)
                 and (CARDS[card].get("combo", 0) == 0 or count > 1)
+                and (
+                    CARDS[card].get("now", False)
+                    or self.game.current_player_id == self.user_id
+                )
             )
             section = discord.ui.Section(
                 discord.ui.TextDisplay(
@@ -115,13 +119,11 @@ async def button_callback(interaction: discord.Interaction):
         return button
 
     async def play_card(self, card: str, interaction: discord.Interaction):
-        if not self.playable:
+        if self.game.paused:
             await interaction.edit(view=TextView("not_your_turn"), delete_after=5)
             return
         if self.action_id != self.game.action_id:
-            await interaction.edit(
-                view=TextView(format_message("invalid_turn")), delete_after=10
-            )
+            await interaction.edit(view=TextView("invalid_turn"), delete_after=10)
             return
         self.game.action_id += 1
         self.action_id = self.game.action_id

resources/cards.json

@@ -115,12 +115,12 @@
         "usable": true
     },
     "alter_future_now": {
-        "title": "Alter the future",
-        "description": "Look at the next 3 cards on the deck and rearrange them how you want.",
+        "title": "Alter the future NOW⚡",
+        "description": "Look at the next 3 cards on the deck and rearrange them how you want. Can be played anytime.",
         "emoji": "🪄",
-        "usable": true
+        "usable": true,
+        "now": true
     },
-
     "reverse": {
         "title": "Reverse",
         "description": "End your turn without drawing and reverse the order of play.",

resources/recipes.json

@@ -82,12 +82,13 @@
             "bury": 2,
             "self_attegg": 4,
             "share_future": 2,
+            "alter_future_now": 2,
             "super_skip": 1,
             "dig_deeper": 4
         }
     },
     "all_cards": {
-        "name": "(Almost) all cards",
+        "name": "All cards",
         "description": "The classic game + the Radioeggtive and Eggsperiment expansions",
         "emoji": "💯",
         "cards": {
@@ -129,8 +130,10 @@
             "bury": 2,
             "self_attegg": 4,
             "share_future": 2,
+            "alter_future_now": 2,
             "super_skip": 1,
-            "dig_deeper": 4
+            "dig_deeper": 4,
+            "swap_top_bottom": 4
         }
     },
     "mind_games": {