beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-22 15:40:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Solitaire: Add setting for number of cards to be drawn

Browse source 
Klondike Solitaire has a couple more modes, but this adds modes for 1-
and 3-card draws.
This commit is contained in:
Timothy Flynn 2021-05-14 23:59:23 -04:00 committed by Andreas Kling
parent 3a45bf5254
commit e310b9cd0d
Notes: sideshowbarker 2024-07-18 18:02:39 +09:00 
Author: https://github.com/trflynn89
Commit: https://github.com/SerenityOS/serenity/commit/e310b9cd0d3
Pull-request: https://github.com/SerenityOS/serenity/pull/7148
Reviewed-by: https://github.com/awesomekling
3 changed files with 58 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
Userland/Games/Solitaire/Game.cpp
View file

@ -93,9 +93,10 @@ void Game::stop_game_over_animation()
stop_timer();
}
void Game::setup()
void Game::setup(Mode mode)
{
stop_game_over_animation();
m_mode = mode;
if (on_game_end)
on_game_end();
@ -178,8 +179,30 @@ void Game::mousedown_event(GUI::MouseEvent& event)
update_score(-100);
update(stock.bounding_box());
} else {
auto play_bounding_box = play.bounding_box();
play.move_to_stack(waste);
move_card(stock, play);
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;
}
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);
}
} else if (!to_check.is_empty()) {
auto& top_card = to_check.peek();
@ -290,7 +313,7 @@ void Game::doubleclick_event(GUI::MouseEvent& event)
if (m_game_over_animation) {
start_game_over_animation();
setup();
setup(mode());
return;
}

11
Userland/Games/Solitaire/Game.h
View file

@ -12,6 +12,11 @@
namespace Solitaire {
enum class Mode {
SingleCardDraw,
ThreeCardDraw,
};
class Game final : public GUI::Frame {
C_OBJECT(Game)
public:
@ -19,7 +24,9 @@ public:
static constexpr int height = 480;
virtual ~Game() override;
void setup();
Mode mode() const { return m_mode; }
void setup(Mode);
Function<void(uint32_t)> on_score_update;
Function<void()> on_game_start;
@ -121,6 +128,8 @@ private:
virtual void keydown_event(GUI::KeyEvent&) override;
virtual void timer_event(Core::TimerEvent&) override;
Mode m_mode { Mode::SingleCardDraw };
NonnullRefPtrVector<Card> m_focused_cards;
NonnullRefPtrVector<Card> m_new_deck;
CardStack m_stacks[StackLocation::__Count];

24
Userland/Games/Solitaire/main.cpp
View file

@ -8,6 +8,7 @@
#include <Games/Solitaire/SolitaireGML.h>
#include <LibCore/Timer.h>
#include <LibGUI/Action.h>
#include <LibGUI/ActionGroup.h>
#include <LibGUI/Application.h>
#include <LibGUI/Icon.h>
#include <LibGUI/Menu.h>
@ -86,13 +87,32 @@ int main(int argc, char** argv)
timer->stop();
};
GUI::ActionGroup draw_settng_actions;
draw_settng_actions.set_exclusive(true);
auto single_card_draw_action = GUI::Action::create_checkable("&Single Card Draw", [&](auto&) {
game.setup(Solitaire::Mode::SingleCardDraw);
});
single_card_draw_action->set_checked(true);
single_card_draw_action->set_status_tip("Draw one card at a time");
draw_settng_actions.add_action(single_card_draw_action);
auto three_card_draw_action = GUI::Action::create_checkable("&Three Card Draw", [&](auto&) {
game.setup(Solitaire::Mode::ThreeCardDraw);
});
three_card_draw_action->set_status_tip("Draw three cards at a time");
draw_settng_actions.add_action(three_card_draw_action);
auto menubar = GUI::Menubar::construct();
auto& game_menu = menubar->add_menu("&Game");
game_menu.add_action(GUI::Action::create("&New Game", { Mod_None, Key_F2 }, [&](auto&) {
game.setup();
game.setup(game.mode());
}));
game_menu.add_separator();
game_menu.add_action(single_card_draw_action);
game_menu.add_action(three_card_draw_action);
game_menu.add_separator();
game_menu.add_action(GUI::CommonActions::make_quit_action([&](auto&) { app->quit(); }));
auto& help_menu = menubar->add_menu("&Help");
@ -103,7 +123,7 @@ int main(int argc, char** argv)
window->set_menubar(move(menubar));
window->set_icon(app_icon.bitmap_for_size(16));
window->show();
game.setup();
game.setup(game.mode());
return app->exec();
}