From bac7c057e9d04b663a21d2e52969991a3bbe886e Mon Sep 17 00:00:00 2001
From: david072 <david.g.ganz@gmail.com>
Date: Sun, 12 Nov 2023 11:47:54 +0100
Subject: [PATCH] Spider: Make non-movable cards disabled :^)

In Spider, cards that can't be moved are now shown as disabled using the
helpers in LibCards. This makes it much easier to see what can be moved
and to where, overall improving the game significantly!
---
 Userland/Games/Spider/Game.cpp | 17 +++++++++++++++++
 Userland/Games/Spider/Game.h   |  2 ++
 2 files changed, 19 insertions(+)

diff --git a/Userland/Games/Spider/Game.cpp b/Userland/Games/Spider/Game.cpp
index 95d7b10925..17b6cc79ce 100644
--- a/Userland/Games/Spider/Game.cpp
+++ b/Userland/Games/Spider/Game.cpp
@@ -2,6 +2,7 @@
  * Copyright (c) 2021, Jamie Mansfield <jmansfield@cadixdev.org>
  * Copyright (c) 2022, Jonas Höpner <me@jonashoepner.de>
  * Copyright (c) 2022, the SerenityOS developers.
+ * Copyright (c) 2023, David Ganz <david.g.ganz@gmail.com>
  *
  * SPDX-License-Identifier: BSD-2-Clause
  */
@@ -102,6 +103,8 @@ void Game::perform_undo()
     m_last_move = {};
     if (on_undo_availability_change)
         on_undo_availability_change(false);
+
+    update_disabled_cards();
     invalidate_layout();
 }
 
@@ -181,6 +184,7 @@ void Game::detect_full_stacks()
         }
     }
 
+    update_disabled_cards();
     detect_victory();
 }
 
@@ -333,6 +337,7 @@ void Game::mouseup_event(GUI::MouseEvent& event)
         update(moving_cards_source_stack()->bounding_box());
     }
 
+    update_disabled_cards();
     m_mouse_down = false;
 }
 
@@ -406,12 +411,23 @@ void Game::deal_next_card()
             stock_pile.push(m_new_deck.take_last()).release_value_but_fixme_should_propagate_errors();
 
         update(stock_pile.bounding_box());
+        update_disabled_cards();
 
         m_state = State::WaitingForNewGame;
         stop_timer();
     }
 }
 
+void Game::update_disabled_cards()
+{
+    for (auto& stack : stacks()) {
+        if (stack->type() != CardStack::Type::Normal)
+            continue;
+        stack->update_disabled_cards(CardStack::MovementRule::Same);
+        update(stack->bounding_box());
+    }
+}
+
 void Game::timer_event(Core::TimerEvent&)
 {
     if (m_state == State::NewGameAnimation) {
@@ -434,6 +450,7 @@ void Game::timer_event(Core::TimerEvent&)
             ++m_draw_animation_pile;
 
             if (m_draw_animation_pile == piles.size()) {
+                update_disabled_cards();
                 update(m_original_stock_rect);
                 detect_full_stacks();
 
diff --git a/Userland/Games/Spider/Game.h b/Userland/Games/Spider/Game.h
index 9223e9eff9..25e3338642 100644
--- a/Userland/Games/Spider/Game.h
+++ b/Userland/Games/Spider/Game.h
@@ -2,6 +2,7 @@
  * Copyright (c) 2021, Jamie Mansfield <jmansfield@cadixdev.org>
  * Copyright (c) 2022, the SerenityOS developers.
  * Copyright (c) 2022, Sam Atkins <atkinssj@serenityos.org>
+ * Copyright (c) 2023, David Ganz <david.g.ganz@gmail.com>
  *
  * SPDX-License-Identifier: BSD-2-Clause
  */
@@ -93,6 +94,7 @@ private:
     void move_focused_cards(CardStack& stack);
     void clear_hovered_stack();
     void deal_next_card();
+    void update_disabled_cards();
 
     virtual void paint_event(GUI::PaintEvent&) override;
     virtual void mousedown_event(GUI::MouseEvent&) override;