beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-26 17:40:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7
ladybird/Userland/Games/Solitaire/Game.cpp

643 lines
20 KiB
C++
Raw Normal View History

Games: Added solitaire Added a solitaire game. Currently there are graphics missing on some of the cards, but the game is fully functional. Press F12 to show the game-over animation manually.
2020-03-09 15:09:22 +00:00
/*
* Copyright (c) 2020, Till Mayer <till.mayer@web.de>
*
Everything: Move to SPDX license identifiers in all files. SPDX License Identifiers are a more compact / standardized way of representing file license information. See: https://spdx.dev/resources/use/#identifiers This was done with the `ambr` search and replace tool. ambr --no-parent-ignore --key-from-file --rep-from-file key.txt rep.txt *
2021-04-22 08:24:48 +00:00
* SPDX-License-Identifier: BSD-2-Clause
Games: Added solitaire Added a solitaire game. Currently there are graphics missing on some of the cards, but the game is fully functional. Press F12 to show the game-over animation manually.
2020-03-09 15:09:22 +00:00
*/
Solitaire: Place files in Solitaire namespace and rename main widget The purpose is to allow the Solitaire widget to be used in GML. The macro to register a widget requires a namespace, so this moves all files in the application to the Solitaire namespace. This also renames the SolitaireWidget class to Game - this is to avoid the redundancy / verbosity of typing "Solitaire::SolitaireWidget", and matches many other games in Serenity (Breakout, 2048, etc.).
2021-05-05 13:42:59 +00:00
#include "Game.h"
Solitaire: Add key combo to dump the state of the layout Useful for chasing down bugs.
2021-05-16 02:13:11 +00:00
#include <AK/Debug.h>
Games: Added solitaire Added a solitaire game. Currently there are graphics missing on some of the cards, but the game is fully functional. Press F12 to show the game-over animation manually.
2020-03-09 15:09:22 +00:00
#include <LibGUI/Painter.h>
Solitaire: Refactor painting logic to accomodate to-be-added widgets A series of events led to this change: The goal is to add more widgets to the Solitaire GML, such as a GUI::Statusbar. To do so without this change, the window ends up with some black artifacts between the main Solitaire frame and the added elements, because the GML specifies the main widget to have fill_with_background_color=false. However, setting that property to true results in the background color of the widget interferring with the Solitaire frame trying to manually paint its background green. This results in flickering and some elements in the Solitaire frame being painted over by the main background color. To avoid all of that behavior, this sets fill_with_background_color=true and the Solitaire frame's background color to green in the GML. Further, the frame now only queues a paint update on the specific Gfx::Rect areas that need to be updated. This also means we no longer need to track if a stack of cards is dirty, because we only trigger a paint event for dirty stacks.
2021-05-05 16:19:10 +00:00
#include <LibGfx/Palette.h>
Games: Added solitaire Added a solitaire game. Currently there are graphics missing on some of the cards, but the game is fully functional. Press F12 to show the game-over animation manually.
2020-03-09 15:09:22 +00:00
#include <time.h>
Solitaire: Convert Solitaire window to be created from GML No functionial change here, but this more easily allows for adding GUI elements to the Solitaire window. This nests the SolitaireWidget as a child of the main window's widget so that the SolitaireWidget does not color the entire window green when it paints its background.
2021-05-05 13:54:52 +00:00
REGISTER_WIDGET(Solitaire, Game);
Solitaire: Place files in Solitaire namespace and rename main widget The purpose is to allow the Solitaire widget to be used in GML. The macro to register a widget requires a namespace, so this moves all files in the application to the Solitaire namespace. This also renames the SolitaireWidget class to Game - this is to avoid the redundancy / verbosity of typing "Solitaire::SolitaireWidget", and matches many other games in Serenity (Breakout, 2048, etc.).
2021-05-05 13:42:59 +00:00
namespace Solitaire {
Solitaire: Decrease new game animation delay The current setting is an awful long time to wait for a game to start.
2021-05-05 18:16:02 +00:00
static constexpr uint8_t new_game_animation_delay = 2;
Solitaire: Replace self-owned timer with Core::Object's timer This is just a bit nicer than owning a separate timer in the Solitaire application because LibCore will prevent timer events from firing when e.g. the window is not visible. Therefore SolitaireWidget doesn't need need to check for such conditions.
2021-05-05 03:00:53 +00:00
static constexpr int s_timer_interval_ms = 1000 / 60;
Games: Added solitaire Added a solitaire game. Currently there are graphics missing on some of the cards, but the game is fully functional. Press F12 to show the game-over animation manually.
2020-03-09 15:09:22 +00:00
Solitaire: Convert Solitaire window to be created from GML No functionial change here, but this more easily allows for adding GUI elements to the Solitaire window. This nests the SolitaireWidget as a child of the main window's widget so that the SolitaireWidget does not color the entire window green when it paints its background.
2021-05-05 13:54:52 +00:00
Game::Game()
Games: Added solitaire Added a solitaire game. Currently there are graphics missing on some of the cards, but the game is fully functional. Press F12 to show the game-over animation manually.
2020-03-09 15:09:22 +00:00
{
Solitaire: Don't invoke srand multiple times This doesn't need to be invoked each time the game wants something random.
2021-05-05 14:22:28 +00:00
srand(time(nullptr));
Solitaire: Refactor CardStack layout code
2020-10-26 18:34:46 +00:00
m_stacks[Stock] = CardStack({ 10, 10 }, CardStack::Type::Stock);
m_stacks[Waste] = CardStack({ 10 + Card::width + 10, 10 }, CardStack::Type::Waste);
Solitaire: Add stack for the playable cards on top of the waste stack While the waste stack and the playable card on top of the waste stack are collectively referred to as the "waste", it's programatically nice to separate them to enable 3-card-draw mode. In that mode, the playable stack will contain 3 cards with a slight x-axis shift, while the waste stack underneath will remain unshifted. So rather than introducing some ugly logic to CardStack to handle this, it's more convenient to have a separate stack on top of the waste stack.
2021-05-15 03:09:41 +00:00
m_stacks[Play] = CardStack({ 10 + Card::width + 10, 10 }, CardStack::Type::Play);
Solitaire: Place files in Solitaire namespace and rename main widget The purpose is to allow the Solitaire widget to be used in GML. The macro to register a widget requires a namespace, so this moves all files in the application to the Solitaire namespace. This also renames the SolitaireWidget class to Game - this is to avoid the redundancy / verbosity of typing "Solitaire::SolitaireWidget", and matches many other games in Serenity (Breakout, 2048, etc.).
2021-05-05 13:42:59 +00:00
m_stacks[Foundation4] = CardStack({ Game::width - Card::width - 10, 10 }, CardStack::Type::Foundation);
m_stacks[Foundation3] = CardStack({ Game::width - 2 * Card::width - 20, 10 }, CardStack::Type::Foundation);
m_stacks[Foundation2] = CardStack({ Game::width - 3 * Card::width - 30, 10 }, CardStack::Type::Foundation);
m_stacks[Foundation1] = CardStack({ Game::width - 4 * Card::width - 40, 10 }, CardStack::Type::Foundation);
Solitaire: Refactor CardStack layout code
2020-10-26 18:34:46 +00:00
m_stacks[Pile1] = CardStack({ 10, 10 + Card::height + 10 }, CardStack::Type::Normal);
m_stacks[Pile2] = CardStack({ 10 + Card::width + 10, 10 + Card::height + 10 }, CardStack::Type::Normal);
m_stacks[Pile3] = CardStack({ 10 + 2 * Card::width + 20, 10 + Card::height + 10 }, CardStack::Type::Normal);
m_stacks[Pile4] = CardStack({ 10 + 3 * Card::width + 30, 10 + Card::height + 10 }, CardStack::Type::Normal);
m_stacks[Pile5] = CardStack({ 10 + 4 * Card::width + 40, 10 + Card::height + 10 }, CardStack::Type::Normal);
m_stacks[Pile6] = CardStack({ 10 + 5 * Card::width + 50, 10 + Card::height + 10 }, CardStack::Type::Normal);
m_stacks[Pile7] = CardStack({ 10 + 6 * Card::width + 60, 10 + Card::height + 10 }, CardStack::Type::Normal);
Games: Added solitaire Added a solitaire game. Currently there are graphics missing on some of the cards, but the game is fully functional. Press F12 to show the game-over animation manually.
2020-03-09 15:09:22 +00:00
}
Solitaire: Place files in Solitaire namespace and rename main widget The purpose is to allow the Solitaire widget to be used in GML. The macro to register a widget requires a namespace, so this moves all files in the application to the Solitaire namespace. This also renames the SolitaireWidget class to Game - this is to avoid the redundancy / verbosity of typing "Solitaire::SolitaireWidget", and matches many other games in Serenity (Breakout, 2048, etc.).
2021-05-05 13:42:59 +00:00
Game::~Game()
Games: Added solitaire Added a solitaire game. Currently there are graphics missing on some of the cards, but the game is fully functional. Press F12 to show the game-over animation manually.
2020-03-09 15:09:22 +00:00
{
}
static float rand_float()
{
return rand() / static_cast<float>(RAND_MAX);
}
Solitaire: Place files in Solitaire namespace and rename main widget The purpose is to allow the Solitaire widget to be used in GML. The macro to register a widget requires a namespace, so this moves all files in the application to the Solitaire namespace. This also renames the SolitaireWidget class to Game - this is to avoid the redundancy / verbosity of typing "Solitaire::SolitaireWidget", and matches many other games in Serenity (Breakout, 2048, etc.).
2021-05-05 13:42:59 +00:00
void Game::timer_event(Core::TimerEvent&)
Games: Added solitaire Added a solitaire game. Currently there are graphics missing on some of the cards, but the game is fully functional. Press F12 to show the game-over animation manually.
2020-03-09 15:09:22 +00:00
{
if (m_game_over_animation) {
Everywhere: Rename ASSERT => VERIFY (...and ASSERT_NOT_REACHED => VERIFY_NOT_REACHED) Since all of these checks are done in release builds as well, let's rename them to VERIFY to prevent confusion, as everyone is used to assertions being compiled out in release. We can introduce a new ASSERT macro that is specifically for debug checks, but I'm doing this wholesale conversion first since we've accumulated thousands of these already, and it's not immediately obvious which ones are suitable for ASSERT.
2021-02-23 19:42:32 +00:00
VERIFY(!m_animation.card().is_null());
Solitaire: Refactor painting logic to accomodate to-be-added widgets A series of events led to this change: The goal is to add more widgets to the Solitaire GML, such as a GUI::Statusbar. To do so without this change, the window ends up with some black artifacts between the main Solitaire frame and the added elements, because the GML specifies the main widget to have fill_with_background_color=false. However, setting that property to true results in the background color of the widget interferring with the Solitaire frame trying to manually paint its background green. This results in flickering and some elements in the Solitaire frame being painted over by the main background color. To avoid all of that behavior, this sets fill_with_background_color=true and the Solitaire frame's background color to green in the GML. Further, the frame now only queues a paint update on the specific Gfx::Rect areas that need to be updated. This also means we no longer need to track if a stack of cards is dirty, because we only trigger a paint event for dirty stacks.
2021-05-05 16:19:10 +00:00
if (m_animation.card()->position().x() >= Game::width || m_animation.card()->rect().right() <= 0)
Games: Added solitaire Added a solitaire game. Currently there are graphics missing on some of the cards, but the game is fully functional. Press F12 to show the game-over animation manually.
2020-03-09 15:09:22 +00:00
create_new_animation_card();
Solitaire: Refactor painting logic to accomodate to-be-added widgets A series of events led to this change: The goal is to add more widgets to the Solitaire GML, such as a GUI::Statusbar. To do so without this change, the window ends up with some black artifacts between the main Solitaire frame and the added elements, because the GML specifies the main widget to have fill_with_background_color=false. However, setting that property to true results in the background color of the widget interferring with the Solitaire frame trying to manually paint its background green. This results in flickering and some elements in the Solitaire frame being painted over by the main background color. To avoid all of that behavior, this sets fill_with_background_color=true and the Solitaire frame's background color to green in the GML. Further, the frame now only queues a paint update on the specific Gfx::Rect areas that need to be updated. This also means we no longer need to track if a stack of cards is dirty, because we only trigger a paint event for dirty stacks.
2021-05-05 16:19:10 +00:00
if (m_animation.tick())
update(m_animation.card()->rect());
} else if (m_new_game_animation) {
Games: Added solitaire Added a solitaire game. Currently there are graphics missing on some of the cards, but the game is fully functional. Press F12 to show the game-over animation manually.
2020-03-09 15:09:22 +00:00
update();
}
}
Solitaire: Place files in Solitaire namespace and rename main widget The purpose is to allow the Solitaire widget to be used in GML. The macro to register a widget requires a namespace, so this moves all files in the application to the Solitaire namespace. This also renames the SolitaireWidget class to Game - this is to avoid the redundancy / verbosity of typing "Solitaire::SolitaireWidget", and matches many other games in Serenity (Breakout, 2048, etc.).
2021-05-05 13:42:59 +00:00
void Game::create_new_animation_card()
Games: Added solitaire Added a solitaire game. Currently there are graphics missing on some of the cards, but the game is fully functional. Press F12 to show the game-over animation manually.
2020-03-09 15:09:22 +00:00
{
auto card = Card::construct(static_cast<Card::Type>(rand() % Card::Type::__Count), rand() % Card::card_count);
Solitaire: Place files in Solitaire namespace and rename main widget The purpose is to allow the Solitaire widget to be used in GML. The macro to register a widget requires a namespace, so this moves all files in the application to the Solitaire namespace. This also renames the SolitaireWidget class to Game - this is to avoid the redundancy / verbosity of typing "Solitaire::SolitaireWidget", and matches many other games in Serenity (Breakout, 2048, etc.).
2021-05-05 13:42:59 +00:00
card->set_position({ rand() % (Game::width - Card::width), rand() % (Game::height / 8) });
Games: Added solitaire Added a solitaire game. Currently there are graphics missing on some of the cards, but the game is fully functional. Press F12 to show the game-over animation manually.
2020-03-09 15:09:22 +00:00
Solitaire: Place files in Solitaire namespace and rename main widget The purpose is to allow the Solitaire widget to be used in GML. The macro to register a widget requires a namespace, so this moves all files in the application to the Solitaire namespace. This also renames the SolitaireWidget class to Game - this is to avoid the redundancy / verbosity of typing "Solitaire::SolitaireWidget", and matches many other games in Serenity (Breakout, 2048, etc.).
2021-05-05 13:42:59 +00:00
int x_sgn = card->position().x() > (Game::width / 2) ? -1 : 1;
Everywhere: Add `-Wdouble-promotion` warning This warning informs of float-to-double conversions. The best solution seems to be to do math *either* in 32-bit *or* in 64-bit, and only to cross over when absolutely necessary.
2021-04-15 07:36:14 +00:00
m_animation = Animation(card, rand_float() + .4f, x_sgn * ((rand() % 3) + 2), .6f + rand_float() * .4f);
Games: Added solitaire Added a solitaire game. Currently there are graphics missing on some of the cards, but the game is fully functional. Press F12 to show the game-over animation manually.
2020-03-09 15:09:22 +00:00
}
Solitaire: Place files in Solitaire namespace and rename main widget The purpose is to allow the Solitaire widget to be used in GML. The macro to register a widget requires a namespace, so this moves all files in the application to the Solitaire namespace. This also renames the SolitaireWidget class to Game - this is to avoid the redundancy / verbosity of typing "Solitaire::SolitaireWidget", and matches many other games in Serenity (Breakout, 2048, etc.).
2021-05-05 13:42:59 +00:00
void Game::start_game_over_animation()
Games: Added solitaire Added a solitaire game. Currently there are graphics missing on some of the cards, but the game is fully functional. Press F12 to show the game-over animation manually.
2020-03-09 15:09:22 +00:00
{
if (m_game_over_animation)
return;
create_new_animation_card();
m_game_over_animation = true;
Solitaire: Only start timer when the timer event is needed The timer is no longer used to trigger a paint event for all updates; it is only used to paint the new-game and game-over animations. So only run the timer during those events.
2021-05-05 16:36:18 +00:00
start_timer(s_timer_interval_ms);
Solitaire: Add statusbar segment to display elapsed time The timer begins after the new-game animation ends, and stops when either the game-over animation begins or the new-game animation is started again.
2021-05-05 18:06:28 +00:00
if (on_game_end)
Solitaire: Only update high score after a victorious game Doesn't make much sense to update the high score on a lost game.
2021-05-25 15:44:25 +00:00
on_game_end(GameOverReason::Victory, m_score);
Games: Added solitaire Added a solitaire game. Currently there are graphics missing on some of the cards, but the game is fully functional. Press F12 to show the game-over animation manually.
2020-03-09 15:09:22 +00:00
}
Solitaire: Place files in Solitaire namespace and rename main widget The purpose is to allow the Solitaire widget to be used in GML. The macro to register a widget requires a namespace, so this moves all files in the application to the Solitaire namespace. This also renames the SolitaireWidget class to Game - this is to avoid the redundancy / verbosity of typing "Solitaire::SolitaireWidget", and matches many other games in Serenity (Breakout, 2048, etc.).
2021-05-05 13:42:59 +00:00
void Game::stop_game_over_animation()
Games: Added solitaire Added a solitaire game. Currently there are graphics missing on some of the cards, but the game is fully functional. Press F12 to show the game-over animation manually.
2020-03-09 15:09:22 +00:00
{
if (!m_game_over_animation)
return;
m_game_over_animation = false;
update();
Solitaire: Only start timer when the timer event is needed The timer is no longer used to trigger a paint event for all updates; it is only used to paint the new-game and game-over animations. So only run the timer during those events.
2021-05-05 16:36:18 +00:00
stop_timer();
Games: Added solitaire Added a solitaire game. Currently there are graphics missing on some of the cards, but the game is fully functional. Press F12 to show the game-over animation manually.
2020-03-09 15:09:22 +00:00
}
Solitaire: Add setting for number of cards to be drawn Klondike Solitaire has a couple more modes, but this adds modes for 1- and 3-card draws.
2021-05-15 03:59:23 +00:00
void Game::setup(Mode mode)
Games: Added solitaire Added a solitaire game. Currently there are graphics missing on some of the cards, but the game is fully functional. Press F12 to show the game-over animation manually.
2020-03-09 15:09:22 +00:00
{
Solitaire: Stop timer if new game animation is running Starting a new game before the animation had finished caused a crash since it never stopped the timer before starting a new one. Fixes #7222
2021-05-18 12:59:49 +00:00
if (m_new_game_animation)
stop_timer();
Games: Added solitaire Added a solitaire game. Currently there are graphics missing on some of the cards, but the game is fully functional. Press F12 to show the game-over animation manually.
2020-03-09 15:09:22 +00:00
stop_game_over_animation();
Solitaire: Add setting for number of cards to be drawn Klondike Solitaire has a couple more modes, but this adds modes for 1- and 3-card draws.
2021-05-15 03:59:23 +00:00
m_mode = mode;
Games: Added solitaire Added a solitaire game. Currently there are graphics missing on some of the cards, but the game is fully functional. Press F12 to show the game-over animation manually.
2020-03-09 15:09:22 +00:00
Solitaire: Add statusbar segment to display elapsed time The timer begins after the new-game animation ends, and stops when either the game-over animation begins or the new-game animation is started again.
2021-05-05 18:06:28 +00:00
if (on_game_end)
Solitaire: Only update high score after a victorious game Doesn't make much sense to update the high score on a lost game.
2021-05-25 15:44:25 +00:00
on_game_end(GameOverReason::NewGame, m_score);
Solitaire: Add statusbar segment to display elapsed time The timer begins after the new-game animation ends, and stops when either the game-over animation begins or the new-game animation is started again.
2021-05-05 18:06:28 +00:00
Games: Added solitaire Added a solitaire game. Currently there are graphics missing on some of the cards, but the game is fully functional. Press F12 to show the game-over animation manually.
2020-03-09 15:09:22 +00:00
for (auto& stack : m_stacks)
stack.clear();
Solitaire: Play animation when starting a new game
2020-10-26 19:34:50 +00:00
m_new_deck.clear();
m_new_game_animation_pile = 0;
Solitaire: Tweak scoring for three-card draw mode Currently, the player loses 100 points each time the waste stack is recycled. In three-card draw mode, it's standard to only lose 20 points after the third recycle event.
2021-05-25 16:27:53 +00:00
m_passes_left_before_punishment = recycle_rules().passes_allowed_before_punishment;
Solitaire: Play animation when starting a new game
2020-10-26 19:34:50 +00:00
m_score = 0;
update_score(0);
Solitaire: Add undo functionality
2021-06-03 00:16:49 +00:00
if (on_undo_availability_change)
on_undo_availability_change(false);
Solitaire: Play animation when starting a new game
2020-10-26 19:34:50 +00:00
Games: Added solitaire Added a solitaire game. Currently there are graphics missing on some of the cards, but the game is fully functional. Press F12 to show the game-over animation manually.
2020-03-09 15:09:22 +00:00
for (int i = 0; i < Card::card_count; ++i) {
Solitaire: Play animation when starting a new game
2020-10-26 19:34:50 +00:00
m_new_deck.append(Card::construct(Card::Type::Clubs, i));
m_new_deck.append(Card::construct(Card::Type::Spades, i));
m_new_deck.append(Card::construct(Card::Type::Hearts, i));
m_new_deck.append(Card::construct(Card::Type::Diamonds, i));
Games: Added solitaire Added a solitaire game. Currently there are graphics missing on some of the cards, but the game is fully functional. Press F12 to show the game-over animation manually.
2020-03-09 15:09:22 +00:00
}
Solitaire: Refactor CardStack layout code
2020-10-26 18:34:46 +00:00
for (uint8_t i = 0; i < 200; ++i)
Solitaire: Play animation when starting a new game
2020-10-26 19:34:50 +00:00
m_new_deck.append(m_new_deck.take(rand() % m_new_deck.size()));
Games: Added solitaire Added a solitaire game. Currently there are graphics missing on some of the cards, but the game is fully functional. Press F12 to show the game-over animation manually.
2020-03-09 15:09:22 +00:00
Solitaire: Play animation when starting a new game
2020-10-26 19:34:50 +00:00
m_new_game_animation = true;
Solitaire: Replace self-owned timer with Core::Object's timer This is just a bit nicer than owning a separate timer in the Solitaire application because LibCore will prevent timer events from firing when e.g. the window is not visible. Therefore SolitaireWidget doesn't need need to check for such conditions.
2021-05-05 03:00:53 +00:00
start_timer(s_timer_interval_ms);
Games: Added solitaire Added a solitaire game. Currently there are graphics missing on some of the cards, but the game is fully functional. Press F12 to show the game-over animation manually.
2020-03-09 15:09:22 +00:00
update();
}
Solitaire: Add keys for drawing and moving cards to foundation stacks Also shifts logic of starting game length timer into function `start_timer_if_necessary`, so it can be called from original mouse event handler and new `auto_move_eligible_cards_to_stacks`
2021-06-03 07:43:28 +00:00
void Game::start_timer_if_necessary()
{
if (on_game_start && m_waiting_for_new_game) {
on_game_start();
m_waiting_for_new_game = false;
}
}
Solitaire: Add undo functionality
2021-06-03 00:16:49 +00:00
void Game::score_move(CardStack& from, CardStack& to, bool inverse = false)
{
if (from.type() == CardStack::Type::Play && to.type() == CardStack::Type::Normal) {
update_score(5 * (inverse ? -1 : 1));
} else if (from.type() == CardStack::Type::Play && to.type() == CardStack::Type::Foundation) {
update_score(10 * (inverse ? -1 : 1));
} else if (from.type() == CardStack::Type::Normal && to.type() == CardStack::Type::Foundation) {
update_score(10 * (inverse ? -1 : 1));
} else if (from.type() == CardStack::Type::Foundation && to.type() == CardStack::Type::Normal) {
update_score(-15 * (inverse ? -1 : 1));
}
}
Solitaire: Place files in Solitaire namespace and rename main widget The purpose is to allow the Solitaire widget to be used in GML. The macro to register a widget requires a namespace, so this moves all files in the application to the Solitaire namespace. This also renames the SolitaireWidget class to Game - this is to avoid the redundancy / verbosity of typing "Solitaire::SolitaireWidget", and matches many other games in Serenity (Breakout, 2048, etc.).
2021-05-05 13:42:59 +00:00
void Game::update_score(int to_add)
Games: Added solitaire Added a solitaire game. Currently there are graphics missing on some of the cards, but the game is fully functional. Press F12 to show the game-over animation manually.
2020-03-09 15:09:22 +00:00
{
m_score = max(static_cast<int>(m_score) + to_add, 0);
Solitaire: Convert Solitaire window to be created from GML No functionial change here, but this more easily allows for adding GUI elements to the Solitaire window. This nests the SolitaireWidget as a child of the main window's widget so that the SolitaireWidget does not color the entire window green when it paints its background.
2021-05-05 13:54:52 +00:00
if (on_score_update)
on_score_update(m_score);
Games: Added solitaire Added a solitaire game. Currently there are graphics missing on some of the cards, but the game is fully functional. Press F12 to show the game-over animation manually.
2020-03-09 15:09:22 +00:00
}
Solitaire: Place files in Solitaire namespace and rename main widget The purpose is to allow the Solitaire widget to be used in GML. The macro to register a widget requires a namespace, so this moves all files in the application to the Solitaire namespace. This also renames the SolitaireWidget class to Game - this is to avoid the redundancy / verbosity of typing "Solitaire::SolitaireWidget", and matches many other games in Serenity (Breakout, 2048, etc.).
2021-05-05 13:42:59 +00:00
void Game::keydown_event(GUI::KeyEvent& event)
Games: Added solitaire Added a solitaire game. Currently there are graphics missing on some of the cards, but the game is fully functional. Press F12 to show the game-over animation manually.
2020-03-09 15:09:22 +00:00
{
Solitaire: Play animation when starting a new game
2020-10-26 19:34:50 +00:00
if (m_new_game_animation || m_game_over_animation)
return;
Solitaire: Add keys for drawing and moving cards to foundation stacks Also shifts logic of starting game length timer into function `start_timer_if_necessary`, so it can be called from original mouse event handler and new `auto_move_eligible_cards_to_stacks`
2021-06-03 07:43:28 +00:00
if (event.shift() && event.key() == KeyCode::Key_F12) {
Games: Added solitaire Added a solitaire game. Currently there are graphics missing on some of the cards, but the game is fully functional. Press F12 to show the game-over animation manually.
2020-03-09 15:09:22 +00:00
start_game_over_animation();
Solitaire: Add keys for drawing and moving cards to foundation stacks Also shifts logic of starting game length timer into function `start_timer_if_necessary`, so it can be called from original mouse event handler and new `auto_move_eligible_cards_to_stacks`
2021-06-03 07:43:28 +00:00
} else if (event.key() == KeyCode::Key_Tab) {
auto_move_eligible_cards_to_stacks();
} else if (event.key() == KeyCode::Key_Space) {
draw_cards();
invalidate_layout(); // FIXME: Stock stack won't render properly after draw_cards() without this
} else if (event.shift() && event.key() == KeyCode::Key_F11) {
Solitaire: Add key combo to dump the state of the layout Useful for chasing down bugs.
2021-05-16 02:13:11 +00:00
dump_layout();
Solitaire: Add keys for drawing and moving cards to foundation stacks Also shifts logic of starting game length timer into function `start_timer_if_necessary`, so it can be called from original mouse event handler and new `auto_move_eligible_cards_to_stacks`
2021-06-03 07:43:28 +00:00
}
Games: Added solitaire Added a solitaire game. Currently there are graphics missing on some of the cards, but the game is fully functional. Press F12 to show the game-over animation manually.
2020-03-09 15:09:22 +00:00
}
Solitaire: Place files in Solitaire namespace and rename main widget The purpose is to allow the Solitaire widget to be used in GML. The macro to register a widget requires a namespace, so this moves all files in the application to the Solitaire namespace. This also renames the SolitaireWidget class to Game - this is to avoid the redundancy / verbosity of typing "Solitaire::SolitaireWidget", and matches many other games in Serenity (Breakout, 2048, etc.).
2021-05-05 13:42:59 +00:00
void Game::mousedown_event(GUI::MouseEvent& event)
Games: Added solitaire Added a solitaire game. Currently there are graphics missing on some of the cards, but the game is fully functional. Press F12 to show the game-over animation manually.
2020-03-09 15:09:22 +00:00
{
Solitaire: Convert Solitaire GUI to a frame Looks a bit nicer as a frame with inset edges.
2021-05-05 14:02:35 +00:00
GUI::Frame::mousedown_event(event);
Games: Added solitaire Added a solitaire game. Currently there are graphics missing on some of the cards, but the game is fully functional. Press F12 to show the game-over animation manually.
2020-03-09 15:09:22 +00:00
Solitaire: Play animation when starting a new game
2020-10-26 19:34:50 +00:00
if (m_new_game_animation || m_game_over_animation)
Games: Added solitaire Added a solitaire game. Currently there are graphics missing on some of the cards, but the game is fully functional. Press F12 to show the game-over animation manually.
2020-03-09 15:09:22 +00:00
return;
Solitaire: Add keys for drawing and moving cards to foundation stacks Also shifts logic of starting game length timer into function `start_timer_if_necessary`, so it can be called from original mouse event handler and new `auto_move_eligible_cards_to_stacks`
2021-06-03 07:43:28 +00:00
start_timer_if_necessary();
Solitaire: Start timer when first card is moved Starts the game timer when the first card is clicked or moved instead of when a new game is started. Fixes #7489
2021-05-27 12:27:20 +00:00
Games: Added solitaire Added a solitaire game. Currently there are graphics missing on some of the cards, but the game is fully functional. Press F12 to show the game-over animation manually.
2020-03-09 15:09:22 +00:00
auto click_location = event.position();
for (auto& to_check : m_stacks) {
Solitaire: Add stack for the playable cards on top of the waste stack While the waste stack and the playable card on top of the waste stack are collectively referred to as the "waste", it's programatically nice to separate them to enable 3-card-draw mode. In that mode, the playable stack will contain 3 cards with a slight x-axis shift, while the waste stack underneath will remain unshifted. So rather than introducing some ugly logic to CardStack to handle this, it's more convenient to have a separate stack on top of the waste stack.
2021-05-15 03:09:41 +00:00
if (to_check.type() == CardStack::Type::Waste)
continue;
Games: Added solitaire Added a solitaire game. Currently there are graphics missing on some of the cards, but the game is fully functional. Press F12 to show the game-over animation manually.
2020-03-09 15:09:22 +00:00
if (to_check.bounding_box().contains(click_location)) {
if (to_check.type() == CardStack::Type::Stock) {
Solitaire: Add keys for drawing and moving cards to foundation stacks Also shifts logic of starting game length timer into function `start_timer_if_necessary`, so it can be called from original mouse event handler and new `auto_move_eligible_cards_to_stacks`
2021-06-03 07:43:28 +00:00
draw_cards();
Games: Added solitaire Added a solitaire game. Currently there are graphics missing on some of the cards, but the game is fully functional. Press F12 to show the game-over animation manually.
2020-03-09 15:09:22 +00:00
} else if (!to_check.is_empty()) {
auto& top_card = to_check.peek();
if (top_card.is_upside_down()) {
if (top_card.rect().contains(click_location)) {
top_card.set_upside_down(false);
update_score(5);
Solitaire: Refactor painting logic to accomodate to-be-added widgets A series of events led to this change: The goal is to add more widgets to the Solitaire GML, such as a GUI::Statusbar. To do so without this change, the window ends up with some black artifacts between the main Solitaire frame and the added elements, because the GML specifies the main widget to have fill_with_background_color=false. However, setting that property to true results in the background color of the widget interferring with the Solitaire frame trying to manually paint its background green. This results in flickering and some elements in the Solitaire frame being painted over by the main background color. To avoid all of that behavior, this sets fill_with_background_color=true and the Solitaire frame's background color to green in the GML. Further, the frame now only queues a paint update on the specific Gfx::Rect areas that need to be updated. This also means we no longer need to track if a stack of cards is dirty, because we only trigger a paint event for dirty stacks.
2021-05-05 16:19:10 +00:00
update(top_card.rect());
Solitaire: Add undo functionality
2021-06-03 00:16:49 +00:00
remember_flip_for_undo(top_card);
Games: Added solitaire Added a solitaire game. Currently there are graphics missing on some of the cards, but the game is fully functional. Press F12 to show the game-over animation manually.
2020-03-09 15:09:22 +00:00
}
Solitaire: Make sure to not add card twice to m_focused_cards There is a possibility that the same card gets added twice to m_focused_cards when first mousedown_event fires and then doubleclick_event, without the cards redrawing first. This would cause mouseup_event to try to pop too many cards from the stack, causing an assertion to fail. When the system is laggy there is also a high possibility that mousedown_event would fire twice without redrawing the cards first, causing another assertion to fail. Addditional mousedown_events will just be ignored now.
2020-03-10 13:47:30 +00:00
} else if (m_focused_cards.is_empty()) {
Games: Added solitaire Added a solitaire game. Currently there are graphics missing on some of the cards, but the game is fully functional. Press F12 to show the game-over animation manually.
2020-03-09 15:09:22 +00:00
to_check.add_all_grabbed_cards(click_location, m_focused_cards);
m_mouse_down_location = click_location;
to_check.set_focused(true);
m_focused_stack = &to_check;
m_mouse_down = true;
}
}
break;
}
}
}
Solitaire: Place files in Solitaire namespace and rename main widget The purpose is to allow the Solitaire widget to be used in GML. The macro to register a widget requires a namespace, so this moves all files in the application to the Solitaire namespace. This also renames the SolitaireWidget class to Game - this is to avoid the redundancy / verbosity of typing "Solitaire::SolitaireWidget", and matches many other games in Serenity (Breakout, 2048, etc.).
2021-05-05 13:42:59 +00:00
void Game::mouseup_event(GUI::MouseEvent& event)
Games: Added solitaire Added a solitaire game. Currently there are graphics missing on some of the cards, but the game is fully functional. Press F12 to show the game-over animation manually.
2020-03-09 15:09:22 +00:00
{
Solitaire: Convert Solitaire GUI to a frame Looks a bit nicer as a frame with inset edges.
2021-05-05 14:02:35 +00:00
GUI::Frame::mouseup_event(event);
Games: Added solitaire Added a solitaire game. Currently there are graphics missing on some of the cards, but the game is fully functional. Press F12 to show the game-over animation manually.
2020-03-09 15:09:22 +00:00
Solitaire: Play animation when starting a new game
2020-10-26 19:34:50 +00:00
if (!m_focused_stack || m_focused_cards.is_empty() || m_game_over_animation || m_new_game_animation)
Games: Added solitaire Added a solitaire game. Currently there are graphics missing on some of the cards, but the game is fully functional. Press F12 to show the game-over animation manually.
2020-03-09 15:09:22 +00:00
return;
bool rebound = true;
for (auto& stack : m_stacks) {
if (stack.is_focused())
continue;
for (auto& focused_card : m_focused_cards) {
Solitaire: Remove redundant check and fix formatting mistakes
2020-03-10 14:05:25 +00:00
if (stack.bounding_box().intersects(focused_card.rect())) {
Solitaire: Prevent player dragging entire stack to foundation Currently, it is possible for the player to drag an entire stack of cards to the foundation stack, provided the top card of the stack (i.e the "root" card) can be dropped onto the foundation stack. This causes an invalid state where, e.g, red cards end up in a black foundation stack, or vice versa.
2021-05-18 11:43:02 +00:00
if (stack.is_allowed_to_push(m_focused_cards.at(0), m_focused_cards.size())) {
Games: Added solitaire Added a solitaire game. Currently there are graphics missing on some of the cards, but the game is fully functional. Press F12 to show the game-over animation manually.
2020-03-09 15:09:22 +00:00
for (auto& to_intersect : m_focused_cards) {
mark_intersecting_stacks_dirty(to_intersect);
stack.push(to_intersect);
m_focused_stack->pop();
}
Solitaire: Add undo functionality
2021-06-03 00:16:49 +00:00
remember_move_for_undo(*m_focused_stack, stack, m_focused_cards);
Solitaire: Add stack for the playable cards on top of the waste stack While the waste stack and the playable card on top of the waste stack are collectively referred to as the "waste", it's programatically nice to separate them to enable 3-card-draw mode. In that mode, the playable stack will contain 3 cards with a slight x-axis shift, while the waste stack underneath will remain unshifted. So rather than introducing some ugly logic to CardStack to handle this, it's more convenient to have a separate stack on top of the waste stack.
2021-05-15 03:09:41 +00:00
if (m_focused_stack->type() == CardStack::Type::Play) {
Solitaire: Add keys for drawing and moving cards to foundation stacks Also shifts logic of starting game length timer into function `start_timer_if_necessary`, so it can be called from original mouse event handler and new `auto_move_eligible_cards_to_stacks`
2021-06-03 07:43:28 +00:00
pop_waste_to_play_stack();
Solitaire: Add stack for the playable cards on top of the waste stack While the waste stack and the playable card on top of the waste stack are collectively referred to as the "waste", it's programatically nice to separate them to enable 3-card-draw mode. In that mode, the playable stack will contain 3 cards with a slight x-axis shift, while the waste stack underneath will remain unshifted. So rather than introducing some ugly logic to CardStack to handle this, it's more convenient to have a separate stack on top of the waste stack.
2021-05-15 03:09:41 +00:00
}
Solitaire: Refactor painting logic to accomodate to-be-added widgets A series of events led to this change: The goal is to add more widgets to the Solitaire GML, such as a GUI::Statusbar. To do so without this change, the window ends up with some black artifacts between the main Solitaire frame and the added elements, because the GML specifies the main widget to have fill_with_background_color=false. However, setting that property to true results in the background color of the widget interferring with the Solitaire frame trying to manually paint its background green. This results in flickering and some elements in the Solitaire frame being painted over by the main background color. To avoid all of that behavior, this sets fill_with_background_color=true and the Solitaire frame's background color to green in the GML. Further, the frame now only queues a paint update on the specific Gfx::Rect areas that need to be updated. This also means we no longer need to track if a stack of cards is dirty, because we only trigger a paint event for dirty stacks.
2021-05-05 16:19:10 +00:00
update(m_focused_stack->bounding_box());
update(stack.bounding_box());
Games: Added solitaire Added a solitaire game. Currently there are graphics missing on some of the cards, but the game is fully functional. Press F12 to show the game-over animation manually.
2020-03-09 15:09:22 +00:00
Solitaire: Add undo functionality
2021-06-03 00:16:49 +00:00
score_move(*m_focused_stack, stack);
Games: Added solitaire Added a solitaire game. Currently there are graphics missing on some of the cards, but the game is fully functional. Press F12 to show the game-over animation manually.
2020-03-09 15:09:22 +00:00
rebound = false;
break;
}
}
}
}
if (rebound) {
for (auto& to_intersect : m_focused_cards)
mark_intersecting_stacks_dirty(to_intersect);
m_focused_stack->rebound_cards();
Solitaire: Refactor painting logic to accomodate to-be-added widgets A series of events led to this change: The goal is to add more widgets to the Solitaire GML, such as a GUI::Statusbar. To do so without this change, the window ends up with some black artifacts between the main Solitaire frame and the added elements, because the GML specifies the main widget to have fill_with_background_color=false. However, setting that property to true results in the background color of the widget interferring with the Solitaire frame trying to manually paint its background green. This results in flickering and some elements in the Solitaire frame being painted over by the main background color. To avoid all of that behavior, this sets fill_with_background_color=true and the Solitaire frame's background color to green in the GML. Further, the frame now only queues a paint update on the specific Gfx::Rect areas that need to be updated. This also means we no longer need to track if a stack of cards is dirty, because we only trigger a paint event for dirty stacks.
2021-05-05 16:19:10 +00:00
update(m_focused_stack->bounding_box());
Games: Added solitaire Added a solitaire game. Currently there are graphics missing on some of the cards, but the game is fully functional. Press F12 to show the game-over animation manually.
2020-03-09 15:09:22 +00:00
}
m_mouse_down = false;
}
Solitaire: Place files in Solitaire namespace and rename main widget The purpose is to allow the Solitaire widget to be used in GML. The macro to register a widget requires a namespace, so this moves all files in the application to the Solitaire namespace. This also renames the SolitaireWidget class to Game - this is to avoid the redundancy / verbosity of typing "Solitaire::SolitaireWidget", and matches many other games in Serenity (Breakout, 2048, etc.).
2021-05-05 13:42:59 +00:00
void Game::mousemove_event(GUI::MouseEvent& event)
Games: Added solitaire Added a solitaire game. Currently there are graphics missing on some of the cards, but the game is fully functional. Press F12 to show the game-over animation manually.
2020-03-09 15:09:22 +00:00
{
Solitaire: Convert Solitaire GUI to a frame Looks a bit nicer as a frame with inset edges.
2021-05-05 14:02:35 +00:00
GUI::Frame::mousemove_event(event);
Games: Added solitaire Added a solitaire game. Currently there are graphics missing on some of the cards, but the game is fully functional. Press F12 to show the game-over animation manually.
2020-03-09 15:09:22 +00:00
Solitaire: Play animation when starting a new game
2020-10-26 19:34:50 +00:00
if (!m_mouse_down || m_game_over_animation || m_new_game_animation)
Games: Added solitaire Added a solitaire game. Currently there are graphics missing on some of the cards, but the game is fully functional. Press F12 to show the game-over animation manually.
2020-03-09 15:09:22 +00:00
return;
auto click_location = event.position();
int dx = click_location.dx_relative_to(m_mouse_down_location);
int dy = click_location.dy_relative_to(m_mouse_down_location);
for (auto& to_intersect : m_focused_cards) {
mark_intersecting_stacks_dirty(to_intersect);
LibGfx: Unify Rect, Point, and Size This commit unifies methods and method/param names between the above classes, as well as adds [[nodiscard]] and ALWAYS_INLINE where appropriate. It also renamed the various move_by methods to translate_by, as that more closely matches the transformation terminology.
2021-04-12 18:47:09 +00:00
to_intersect.rect().translate_by(dx, dy);
Solitaire: Refactor painting logic to accomodate to-be-added widgets A series of events led to this change: The goal is to add more widgets to the Solitaire GML, such as a GUI::Statusbar. To do so without this change, the window ends up with some black artifacts between the main Solitaire frame and the added elements, because the GML specifies the main widget to have fill_with_background_color=false. However, setting that property to true results in the background color of the widget interferring with the Solitaire frame trying to manually paint its background green. This results in flickering and some elements in the Solitaire frame being painted over by the main background color. To avoid all of that behavior, this sets fill_with_background_color=true and the Solitaire frame's background color to green in the GML. Further, the frame now only queues a paint update on the specific Gfx::Rect areas that need to be updated. This also means we no longer need to track if a stack of cards is dirty, because we only trigger a paint event for dirty stacks.
2021-05-05 16:19:10 +00:00
update(to_intersect.rect());
Games: Added solitaire Added a solitaire game. Currently there are graphics missing on some of the cards, but the game is fully functional. Press F12 to show the game-over animation manually.
2020-03-09 15:09:22 +00:00
}
m_mouse_down_location = click_location;
}
Solitaire: Place files in Solitaire namespace and rename main widget The purpose is to allow the Solitaire widget to be used in GML. The macro to register a widget requires a namespace, so this moves all files in the application to the Solitaire namespace. This also renames the SolitaireWidget class to Game - this is to avoid the redundancy / verbosity of typing "Solitaire::SolitaireWidget", and matches many other games in Serenity (Breakout, 2048, etc.).
2021-05-05 13:42:59 +00:00
void Game::doubleclick_event(GUI::MouseEvent& event)
Games: Added solitaire Added a solitaire game. Currently there are graphics missing on some of the cards, but the game is fully functional. Press F12 to show the game-over animation manually.
2020-03-09 15:09:22 +00:00
{
Solitaire: Convert Solitaire GUI to a frame Looks a bit nicer as a frame with inset edges.
2021-05-05 14:02:35 +00:00
GUI::Frame::doubleclick_event(event);
Games: Added solitaire Added a solitaire game. Currently there are graphics missing on some of the cards, but the game is fully functional. Press F12 to show the game-over animation manually.
2020-03-09 15:09:22 +00:00
if (m_game_over_animation) {
Solitaire: Add setting for number of cards to be drawn Klondike Solitaire has a couple more modes, but this adds modes for 1- and 3-card draws.
2021-05-15 03:59:23 +00:00
setup(mode());
Games: Added solitaire Added a solitaire game. Currently there are graphics missing on some of the cards, but the game is fully functional. Press F12 to show the game-over animation manually.
2020-03-09 15:09:22 +00:00
return;
}
Solitaire: Play animation when starting a new game
2020-10-26 19:34:50 +00:00
if (m_new_game_animation)
return;
Solitaire: Make sure to not add card twice to m_focused_cards There is a possibility that the same card gets added twice to m_focused_cards when first mousedown_event fires and then doubleclick_event, without the cards redrawing first. This would cause mouseup_event to try to pop too many cards from the stack, causing an assertion to fail. When the system is laggy there is also a high possibility that mousedown_event would fire twice without redrawing the cards first, causing another assertion to fail. Addditional mousedown_events will just be ignored now.
2020-03-10 13:47:30 +00:00
auto click_location = event.position();
Games: Added solitaire Added a solitaire game. Currently there are graphics missing on some of the cards, but the game is fully functional. Press F12 to show the game-over animation manually.
2020-03-09 15:09:22 +00:00
for (auto& to_check : m_stacks) {
Solitaire: Add stack for the playable cards on top of the waste stack While the waste stack and the playable card on top of the waste stack are collectively referred to as the "waste", it's programatically nice to separate them to enable 3-card-draw mode. In that mode, the playable stack will contain 3 cards with a slight x-axis shift, while the waste stack underneath will remain unshifted. So rather than introducing some ugly logic to CardStack to handle this, it's more convenient to have a separate stack on top of the waste stack.
2021-05-15 03:09:41 +00:00
if (to_check.type() == CardStack::Type::Foundation || to_check.type() == CardStack::Type::Stock || to_check.type() == CardStack::Type::Waste)
Games: Added solitaire Added a solitaire game. Currently there are graphics missing on some of the cards, but the game is fully functional. Press F12 to show the game-over animation manually.
2020-03-09 15:09:22 +00:00
continue;
if (to_check.bounding_box().contains(click_location) && !to_check.is_empty()) {
auto& top_card = to_check.peek();
if (!top_card.is_upside_down() && top_card.rect().contains(click_location)) {
if (stack(Foundation1).is_allowed_to_push(top_card))
move_card(to_check, stack(Foundation1));
else if (stack(Foundation2).is_allowed_to_push(top_card))
move_card(to_check, stack(Foundation2));
else if (stack(Foundation3).is_allowed_to_push(top_card))
move_card(to_check, stack(Foundation3));
else if (stack(Foundation4).is_allowed_to_push(top_card))
move_card(to_check, stack(Foundation4));
else
break;
Solitaire: Add stack for the playable cards on top of the waste stack While the waste stack and the playable card on top of the waste stack are collectively referred to as the "waste", it's programatically nice to separate them to enable 3-card-draw mode. In that mode, the playable stack will contain 3 cards with a slight x-axis shift, while the waste stack underneath will remain unshifted. So rather than introducing some ugly logic to CardStack to handle this, it's more convenient to have a separate stack on top of the waste stack.
2021-05-15 03:09:41 +00:00
if (to_check.type() == CardStack::Type::Play) {
auto& waste = this->stack(Waste);
if (to_check.is_empty() && !waste.is_empty()) {
auto card = waste.pop();
m_focused_cards.append(card);
to_check.push(move(card));
}
}
Games: Added solitaire Added a solitaire game. Currently there are graphics missing on some of the cards, but the game is fully functional. Press F12 to show the game-over animation manually.
2020-03-09 15:09:22 +00:00
update_score(10);
}
break;
}
}
}
Solitaire: Place files in Solitaire namespace and rename main widget The purpose is to allow the Solitaire widget to be used in GML. The macro to register a widget requires a namespace, so this moves all files in the application to the Solitaire namespace. This also renames the SolitaireWidget class to Game - this is to avoid the redundancy / verbosity of typing "Solitaire::SolitaireWidget", and matches many other games in Serenity (Breakout, 2048, etc.).
2021-05-05 13:42:59 +00:00
void Game::check_for_game_over()
Games: Added solitaire Added a solitaire game. Currently there are graphics missing on some of the cards, but the game is fully functional. Press F12 to show the game-over animation manually.
2020-03-09 15:09:22 +00:00
{
for (auto& stack : m_stacks) {
if (stack.type() != CardStack::Type::Foundation)
continue;
if (stack.count() != Card::card_count)
return;
}
start_game_over_animation();
}
Solitaire: Place files in Solitaire namespace and rename main widget The purpose is to allow the Solitaire widget to be used in GML. The macro to register a widget requires a namespace, so this moves all files in the application to the Solitaire namespace. This also renames the SolitaireWidget class to Game - this is to avoid the redundancy / verbosity of typing "Solitaire::SolitaireWidget", and matches many other games in Serenity (Breakout, 2048, etc.).
2021-05-05 13:42:59 +00:00
void Game::move_card(CardStack& from, CardStack& to)
Games: Added solitaire Added a solitaire game. Currently there are graphics missing on some of the cards, but the game is fully functional. Press F12 to show the game-over animation manually.
2020-03-09 15:09:22 +00:00
{
Solitaire: Refactor painting logic to accomodate to-be-added widgets A series of events led to this change: The goal is to add more widgets to the Solitaire GML, such as a GUI::Statusbar. To do so without this change, the window ends up with some black artifacts between the main Solitaire frame and the added elements, because the GML specifies the main widget to have fill_with_background_color=false. However, setting that property to true results in the background color of the widget interferring with the Solitaire frame trying to manually paint its background green. This results in flickering and some elements in the Solitaire frame being painted over by the main background color. To avoid all of that behavior, this sets fill_with_background_color=true and the Solitaire frame's background color to green in the GML. Further, the frame now only queues a paint update on the specific Gfx::Rect areas that need to be updated. This also means we no longer need to track if a stack of cards is dirty, because we only trigger a paint event for dirty stacks.
2021-05-05 16:19:10 +00:00
update(from.bounding_box());
Games: Added solitaire Added a solitaire game. Currently there are graphics missing on some of the cards, but the game is fully functional. Press F12 to show the game-over animation manually.
2020-03-09 15:09:22 +00:00
auto card = from.pop();
card->set_moving(true);
Solitaire: Fix automatic moving of cards A previous change trying to fix an assertion error completely broke the automatic moving of cards, this commit will fix this problem
2020-03-12 22:08:56 +00:00
m_focused_cards.clear();
Games: Added solitaire Added a solitaire game. Currently there are graphics missing on some of the cards, but the game is fully functional. Press F12 to show the game-over animation manually.
2020-03-09 15:09:22 +00:00
m_focused_cards.append(card);
mark_intersecting_stacks_dirty(card);
to.push(card);
Solitaire: Add undo functionality
2021-06-03 00:16:49 +00:00
remember_move_for_undo(from, to, m_focused_cards);
Solitaire: Refactor painting logic to accomodate to-be-added widgets A series of events led to this change: The goal is to add more widgets to the Solitaire GML, such as a GUI::Statusbar. To do so without this change, the window ends up with some black artifacts between the main Solitaire frame and the added elements, because the GML specifies the main widget to have fill_with_background_color=false. However, setting that property to true results in the background color of the widget interferring with the Solitaire frame trying to manually paint its background green. This results in flickering and some elements in the Solitaire frame being painted over by the main background color. To avoid all of that behavior, this sets fill_with_background_color=true and the Solitaire frame's background color to green in the GML. Further, the frame now only queues a paint update on the specific Gfx::Rect areas that need to be updated. This also means we no longer need to track if a stack of cards is dirty, because we only trigger a paint event for dirty stacks.
2021-05-05 16:19:10 +00:00
update(to.bounding_box());
Games: Added solitaire Added a solitaire game. Currently there are graphics missing on some of the cards, but the game is fully functional. Press F12 to show the game-over animation manually.
2020-03-09 15:09:22 +00:00
}
Solitaire: Add keys for drawing and moving cards to foundation stacks Also shifts logic of starting game length timer into function `start_timer_if_necessary`, so it can be called from original mouse event handler and new `auto_move_eligible_cards_to_stacks`
2021-06-03 07:43:28 +00:00
void Game::draw_cards()
{
auto& waste = stack(Waste);
auto& stock = stack(Stock);
auto& play = stack(Play);
if (stock.is_empty()) {
if (waste.is_empty() && play.is_empty())
return;
update(waste.bounding_box());
update(play.bounding_box());
while (!play.is_empty()) {
auto card = play.pop();
stock.push(card);
}
while (!waste.is_empty()) {
auto card = waste.pop();
stock.push(card);
}
if (m_passes_left_before_punishment == 0)
update_score(recycle_rules().punishment);
else
--m_passes_left_before_punishment;
update(stock.bounding_box());
} else {
auto play_bounding_box = play.bounding_box();
play.move_to_stack(waste);
size_t cards_to_draw = 0;
switch (m_mode) {
case Mode::SingleCardDraw:
cards_to_draw = 1;
break;
case Mode::ThreeCardDraw:
cards_to_draw = 3;
break;
default:
VERIFY_NOT_REACHED();
break;
}
update(stock.bounding_box());
for (size_t i = 0; (i < cards_to_draw) && !stock.is_empty(); ++i) {
auto card = stock.pop();
play.push(move(card));
}
if (play.bounding_box().size().width() > play_bounding_box.size().width())
update(play.bounding_box());
else
update(play_bounding_box);
}
}
void Game::pop_waste_to_play_stack()
{
auto& waste = this->stack(Waste);
auto& play = this->stack(Play);
if (play.is_empty() && !waste.is_empty()) {
auto card = waste.pop();
m_focused_cards.append(card);
play.push(move(card));
}
}
void Game::auto_move_eligible_cards_to_stacks()
{
bool card_was_moved = false;
for (auto& to_check : m_stacks) {
if (to_check.type() != CardStack::Type::Normal && to_check.type() != CardStack::Type::Play)
continue;
if (to_check.is_empty())
continue;
auto& top_card = to_check.peek();
if (top_card.is_upside_down())
continue;
if (stack(Foundation1).is_allowed_to_push(top_card)) {
move_card(to_check, stack(Foundation1));
card_was_moved = true;
if (to_check.type() == CardStack::Type::Play)
pop_waste_to_play_stack();
} else if (stack(Foundation2).is_allowed_to_push(top_card)) {
move_card(to_check, stack(Foundation2));
card_was_moved = true;
if (to_check.type() == CardStack::Type::Play)
pop_waste_to_play_stack();
} else if (stack(Foundation3).is_allowed_to_push(top_card)) {
move_card(to_check, stack(Foundation3));
card_was_moved = true;
if (to_check.type() == CardStack::Type::Play)
pop_waste_to_play_stack();
} else if (stack(Foundation4).is_allowed_to_push(top_card)) {
move_card(to_check, stack(Foundation4));
card_was_moved = true;
if (to_check.type() == CardStack::Type::Play)
pop_waste_to_play_stack();
}
}
// If at least one card was moved, check again to see if now any additional cards can now be moved
if (card_was_moved) {
start_timer_if_necessary();
auto_move_eligible_cards_to_stacks();
}
}
Solitaire: Place files in Solitaire namespace and rename main widget The purpose is to allow the Solitaire widget to be used in GML. The macro to register a widget requires a namespace, so this moves all files in the application to the Solitaire namespace. This also renames the SolitaireWidget class to Game - this is to avoid the redundancy / verbosity of typing "Solitaire::SolitaireWidget", and matches many other games in Serenity (Breakout, 2048, etc.).
2021-05-05 13:42:59 +00:00
void Game::mark_intersecting_stacks_dirty(Card& intersecting_card)
Games: Added solitaire Added a solitaire game. Currently there are graphics missing on some of the cards, but the game is fully functional. Press F12 to show the game-over animation manually.
2020-03-09 15:09:22 +00:00
{
for (auto& stack : m_stacks) {
Solitaire: Refactor painting logic to accomodate to-be-added widgets A series of events led to this change: The goal is to add more widgets to the Solitaire GML, such as a GUI::Statusbar. To do so without this change, the window ends up with some black artifacts between the main Solitaire frame and the added elements, because the GML specifies the main widget to have fill_with_background_color=false. However, setting that property to true results in the background color of the widget interferring with the Solitaire frame trying to manually paint its background green. This results in flickering and some elements in the Solitaire frame being painted over by the main background color. To avoid all of that behavior, this sets fill_with_background_color=true and the Solitaire frame's background color to green in the GML. Further, the frame now only queues a paint update on the specific Gfx::Rect areas that need to be updated. This also means we no longer need to track if a stack of cards is dirty, because we only trigger a paint event for dirty stacks.
2021-05-05 16:19:10 +00:00
if (intersecting_card.rect().intersects(stack.bounding_box()))
update(stack.bounding_box());
Games: Added solitaire Added a solitaire game. Currently there are graphics missing on some of the cards, but the game is fully functional. Press F12 to show the game-over animation manually.
2020-03-09 15:09:22 +00:00
}
Solitaire: Refactor painting logic to accomodate to-be-added widgets A series of events led to this change: The goal is to add more widgets to the Solitaire GML, such as a GUI::Statusbar. To do so without this change, the window ends up with some black artifacts between the main Solitaire frame and the added elements, because the GML specifies the main widget to have fill_with_background_color=false. However, setting that property to true results in the background color of the widget interferring with the Solitaire frame trying to manually paint its background green. This results in flickering and some elements in the Solitaire frame being painted over by the main background color. To avoid all of that behavior, this sets fill_with_background_color=true and the Solitaire frame's background color to green in the GML. Further, the frame now only queues a paint update on the specific Gfx::Rect areas that need to be updated. This also means we no longer need to track if a stack of cards is dirty, because we only trigger a paint event for dirty stacks.
2021-05-05 16:19:10 +00:00
update(intersecting_card.rect());
Games: Added solitaire Added a solitaire game. Currently there are graphics missing on some of the cards, but the game is fully functional. Press F12 to show the game-over animation manually.
2020-03-09 15:09:22 +00:00
}
Solitaire: Place files in Solitaire namespace and rename main widget The purpose is to allow the Solitaire widget to be used in GML. The macro to register a widget requires a namespace, so this moves all files in the application to the Solitaire namespace. This also renames the SolitaireWidget class to Game - this is to avoid the redundancy / verbosity of typing "Solitaire::SolitaireWidget", and matches many other games in Serenity (Breakout, 2048, etc.).
2021-05-05 13:42:59 +00:00
void Game::paint_event(GUI::PaintEvent& event)
Games: Added solitaire Added a solitaire game. Currently there are graphics missing on some of the cards, but the game is fully functional. Press F12 to show the game-over animation manually.
2020-03-09 15:09:22 +00:00
{
Solitaire: Refactor painting logic to accomodate to-be-added widgets A series of events led to this change: The goal is to add more widgets to the Solitaire GML, such as a GUI::Statusbar. To do so without this change, the window ends up with some black artifacts between the main Solitaire frame and the added elements, because the GML specifies the main widget to have fill_with_background_color=false. However, setting that property to true results in the background color of the widget interferring with the Solitaire frame trying to manually paint its background green. This results in flickering and some elements in the Solitaire frame being painted over by the main background color. To avoid all of that behavior, this sets fill_with_background_color=true and the Solitaire frame's background color to green in the GML. Further, the frame now only queues a paint update on the specific Gfx::Rect areas that need to be updated. This also means we no longer need to track if a stack of cards is dirty, because we only trigger a paint event for dirty stacks.
2021-05-05 16:19:10 +00:00
static Gfx::Color s_background_color = palette().color(background_role());
Games: Added solitaire Added a solitaire game. Currently there are graphics missing on some of the cards, but the game is fully functional. Press F12 to show the game-over animation manually.
2020-03-09 15:09:22 +00:00
Solitaire: Refactor painting logic to accomodate to-be-added widgets A series of events led to this change: The goal is to add more widgets to the Solitaire GML, such as a GUI::Statusbar. To do so without this change, the window ends up with some black artifacts between the main Solitaire frame and the added elements, because the GML specifies the main widget to have fill_with_background_color=false. However, setting that property to true results in the background color of the widget interferring with the Solitaire frame trying to manually paint its background green. This results in flickering and some elements in the Solitaire frame being painted over by the main background color. To avoid all of that behavior, this sets fill_with_background_color=true and the Solitaire frame's background color to green in the GML. Further, the frame now only queues a paint update on the specific Gfx::Rect areas that need to be updated. This also means we no longer need to track if a stack of cards is dirty, because we only trigger a paint event for dirty stacks.
2021-05-05 16:19:10 +00:00
GUI::Frame::paint_event(event);
Games: Added solitaire Added a solitaire game. Currently there are graphics missing on some of the cards, but the game is fully functional. Press F12 to show the game-over animation manually.
2020-03-09 15:09:22 +00:00
GUI::Painter painter(*this);
Solitaire: Convert Solitaire GUI to a frame Looks a bit nicer as a frame with inset edges.
2021-05-05 14:02:35 +00:00
painter.add_clip_rect(frame_inner_rect());
painter.add_clip_rect(event.rect());
Games: Added solitaire Added a solitaire game. Currently there are graphics missing on some of the cards, but the game is fully functional. Press F12 to show the game-over animation manually.
2020-03-09 15:09:22 +00:00
Solitaire: Refactor painting logic to accomodate to-be-added widgets A series of events led to this change: The goal is to add more widgets to the Solitaire GML, such as a GUI::Statusbar. To do so without this change, the window ends up with some black artifacts between the main Solitaire frame and the added elements, because the GML specifies the main widget to have fill_with_background_color=false. However, setting that property to true results in the background color of the widget interferring with the Solitaire frame trying to manually paint its background green. This results in flickering and some elements in the Solitaire frame being painted over by the main background color. To avoid all of that behavior, this sets fill_with_background_color=true and the Solitaire frame's background color to green in the GML. Further, the frame now only queues a paint update on the specific Gfx::Rect areas that need to be updated. This also means we no longer need to track if a stack of cards is dirty, because we only trigger a paint event for dirty stacks.
2021-05-05 16:19:10 +00:00
if (m_game_over_animation) {
m_animation.draw(painter);
return;
}
Games: Added solitaire Added a solitaire game. Currently there are graphics missing on some of the cards, but the game is fully functional. Press F12 to show the game-over animation manually.
2020-03-09 15:09:22 +00:00
Solitaire: Refactor painting logic to accomodate to-be-added widgets A series of events led to this change: The goal is to add more widgets to the Solitaire GML, such as a GUI::Statusbar. To do so without this change, the window ends up with some black artifacts between the main Solitaire frame and the added elements, because the GML specifies the main widget to have fill_with_background_color=false. However, setting that property to true results in the background color of the widget interferring with the Solitaire frame trying to manually paint its background green. This results in flickering and some elements in the Solitaire frame being painted over by the main background color. To avoid all of that behavior, this sets fill_with_background_color=true and the Solitaire frame's background color to green in the GML. Further, the frame now only queues a paint update on the specific Gfx::Rect areas that need to be updated. This also means we no longer need to track if a stack of cards is dirty, because we only trigger a paint event for dirty stacks.
2021-05-05 16:19:10 +00:00
if (m_new_game_animation) {
Solitaire: Play animation when starting a new game
2020-10-26 19:34:50 +00:00
if (m_new_game_animation_delay < new_game_animation_delay) {
++m_new_game_animation_delay;
} else {
m_new_game_animation_delay = 0;
auto& current_pile = stack(piles.at(m_new_game_animation_pile));
if (current_pile.count() < m_new_game_animation_pile) {
auto card = m_new_deck.take_last();
card->set_upside_down(true);
current_pile.push(card);
} else {
current_pile.push(m_new_deck.take_last());
++m_new_game_animation_pile;
}
if (m_new_game_animation_pile == piles.size()) {
while (!m_new_deck.is_empty())
stack(Stock).push(m_new_deck.take_last());
m_new_game_animation = false;
Solitaire: Start timer when first card is moved Starts the game timer when the first card is clicked or moved instead of when a new game is started. Fixes #7489
2021-05-27 12:27:20 +00:00
m_waiting_for_new_game = true;
Solitaire: Only start timer when the timer event is needed The timer is no longer used to trigger a paint event for all updates; it is only used to paint the new-game and game-over animations. So only run the timer during those events.
2021-05-05 16:36:18 +00:00
stop_timer();
Solitaire: Play animation when starting a new game
2020-10-26 19:34:50 +00:00
}
}
}
Solitaire: Refactor painting logic to accomodate to-be-added widgets A series of events led to this change: The goal is to add more widgets to the Solitaire GML, such as a GUI::Statusbar. To do so without this change, the window ends up with some black artifacts between the main Solitaire frame and the added elements, because the GML specifies the main widget to have fill_with_background_color=false. However, setting that property to true results in the background color of the widget interferring with the Solitaire frame trying to manually paint its background green. This results in flickering and some elements in the Solitaire frame being painted over by the main background color. To avoid all of that behavior, this sets fill_with_background_color=true and the Solitaire frame's background color to green in the GML. Further, the frame now only queues a paint update on the specific Gfx::Rect areas that need to be updated. This also means we no longer need to track if a stack of cards is dirty, because we only trigger a paint event for dirty stacks.
2021-05-05 16:19:10 +00:00
if (!m_focused_cards.is_empty()) {
for (auto& focused_card : m_focused_cards)
focused_card.clear(painter, s_background_color);
}
Games: Added solitaire Added a solitaire game. Currently there are graphics missing on some of the cards, but the game is fully functional. Press F12 to show the game-over animation manually.
2020-03-09 15:09:22 +00:00
Solitaire: Refactor painting logic to accomodate to-be-added widgets A series of events led to this change: The goal is to add more widgets to the Solitaire GML, such as a GUI::Statusbar. To do so without this change, the window ends up with some black artifacts between the main Solitaire frame and the added elements, because the GML specifies the main widget to have fill_with_background_color=false. However, setting that property to true results in the background color of the widget interferring with the Solitaire frame trying to manually paint its background green. This results in flickering and some elements in the Solitaire frame being painted over by the main background color. To avoid all of that behavior, this sets fill_with_background_color=true and the Solitaire frame's background color to green in the GML. Further, the frame now only queues a paint update on the specific Gfx::Rect areas that need to be updated. This also means we no longer need to track if a stack of cards is dirty, because we only trigger a paint event for dirty stacks.
2021-05-05 16:19:10 +00:00
for (auto& stack : m_stacks) {
stack.draw(painter, s_background_color);
}
Games: Added solitaire Added a solitaire game. Currently there are graphics missing on some of the cards, but the game is fully functional. Press F12 to show the game-over animation manually.
2020-03-09 15:09:22 +00:00
Solitaire: Refactor painting logic to accomodate to-be-added widgets A series of events led to this change: The goal is to add more widgets to the Solitaire GML, such as a GUI::Statusbar. To do so without this change, the window ends up with some black artifacts between the main Solitaire frame and the added elements, because the GML specifies the main widget to have fill_with_background_color=false. However, setting that property to true results in the background color of the widget interferring with the Solitaire frame trying to manually paint its background green. This results in flickering and some elements in the Solitaire frame being painted over by the main background color. To avoid all of that behavior, this sets fill_with_background_color=true and the Solitaire frame's background color to green in the GML. Further, the frame now only queues a paint update on the specific Gfx::Rect areas that need to be updated. This also means we no longer need to track if a stack of cards is dirty, because we only trigger a paint event for dirty stacks.
2021-05-05 16:19:10 +00:00
if (!m_focused_cards.is_empty()) {
for (auto& focused_card : m_focused_cards) {
focused_card.draw(painter);
focused_card.save_old_position();
Games: Added solitaire Added a solitaire game. Currently there are graphics missing on some of the cards, but the game is fully functional. Press F12 to show the game-over animation manually.
2020-03-09 15:09:22 +00:00
}
Solitaire: Play animation when starting a new game
2020-10-26 19:34:50 +00:00
}
Games: Added solitaire Added a solitaire game. Currently there are graphics missing on some of the cards, but the game is fully functional. Press F12 to show the game-over animation manually.
2020-03-09 15:09:22 +00:00
if (!m_mouse_down) {
if (!m_focused_cards.is_empty()) {
check_for_game_over();
for (auto& card : m_focused_cards)
card.set_moving(false);
m_focused_cards.clear();
}
if (m_focused_stack) {
m_focused_stack->set_focused(false);
m_focused_stack = nullptr;
}
}
}
Solitaire: Place files in Solitaire namespace and rename main widget The purpose is to allow the Solitaire widget to be used in GML. The macro to register a widget requires a namespace, so this moves all files in the application to the Solitaire namespace. This also renames the SolitaireWidget class to Game - this is to avoid the redundancy / verbosity of typing "Solitaire::SolitaireWidget", and matches many other games in Serenity (Breakout, 2048, etc.).
2021-05-05 13:42:59 +00:00
Solitaire: Add undo functionality
2021-06-03 00:16:49 +00:00
void Game::remember_move_for_undo(CardStack& from, CardStack& to, NonnullRefPtrVector<Card> moved_cards)
{
m_last_move.type = LastMove::Type::MoveCards;
m_last_move.from = &from;
m_last_move.cards = moved_cards;
m_last_move.to = &to;
if (on_undo_availability_change)
on_undo_availability_change(true);
}
void Game::remember_flip_for_undo(Card& card)
{
NonnullRefPtrVector<Card> cards;
cards.append(card);
m_last_move.type = LastMove::Type::FlipCard;
m_last_move.cards = cards;
if (on_undo_availability_change)
on_undo_availability_change(true);
}
void Game::perform_undo()
{
if (m_last_move.type == LastMove::Type::Invalid)
return;
if (m_last_move.type == LastMove::Type::FlipCard) {
m_last_move.cards.at(0).set_upside_down(true);
if (on_undo_availability_change)
on_undo_availability_change(false);
invalidate_layout();
return;
}
if (m_last_move.from->type() == CardStack::Type::Play && m_mode == Mode::SingleCardDraw) {
auto& waste = stack(Waste);
if (!m_last_move.from->is_empty())
waste.push(m_last_move.from->pop());
}
for (auto& to_intersect : m_last_move.cards) {
mark_intersecting_stacks_dirty(to_intersect);
m_last_move.from->push(to_intersect);
m_last_move.to->pop();
}
if (m_last_move.from->type() == CardStack::Type::Stock) {
auto& waste = this->stack(Waste);
auto& play = this->stack(Play);
NonnullRefPtrVector<Card> cards_popped;
for (size_t i = 0; i < m_last_move.cards.size(); i++) {
if (!waste.is_empty()) {
auto card = waste.pop();
cards_popped.prepend(card);
}
}
for (auto& card : cards_popped) {
m_focused_cards.append(card);
play.push(move(card));
}
}
score_move(*m_last_move.from, *m_last_move.to, true);
m_last_move = {};
if (on_undo_availability_change)
on_undo_availability_change(false);
invalidate_layout();
}
Solitaire: Add key combo to dump the state of the layout Useful for chasing down bugs.
2021-05-16 02:13:11 +00:00
void Game::dump_layout() const
{
if constexpr (SOLITAIRE_DEBUG) {
dbgln("------------------------------");
for (const auto& stack : m_stacks)
dbgln("{}", stack);
}
}
Solitaire: Place files in Solitaire namespace and rename main widget The purpose is to allow the Solitaire widget to be used in GML. The macro to register a widget requires a namespace, so this moves all files in the application to the Solitaire namespace. This also renames the SolitaireWidget class to Game - this is to avoid the redundancy / verbosity of typing "Solitaire::SolitaireWidget", and matches many other games in Serenity (Breakout, 2048, etc.).
2021-05-05 13:42:59 +00:00
}
Reference in a new issue Copy permalink