RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 17:37:35 +00:00
Code Issues Activity Actions

Spider: Add functionality to automatically move cards to valid stacks

Browse source 
This commit adds the possibility to use the secondary mouse button to
let the game move the selected card(s) to the next valid stack.
This commit is contained in:
Neolyum 2022-01-06 19:04:19 +01:00 • committed by Linus Groh
parent fec0829c86
commit 2159385bb6
2 changed files with 49 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

71
Userland/Games/Spider/Game.cpp
View file

@ -1,11 +1,13 @@
/*
* Copyright (c) 2021, Jamie Mansfield <jmansfield@cadixdev.org>
* Copyright (c) 2022, Jonas Höpner <me@jonashoepner.de>
*
* SPDX-License-Identifier: BSD-2-Clause
*/
#include "Game.h"
#include <AK/Random.h>
#include <LibGUI/Event.h>
#include <LibGUI/Painter.h>
#include <LibGfx/Palette.h>
@ -267,7 +269,9 @@ void Game::mousedown_event(GUI::MouseEvent& event)
m_focused_stack->set_focused(false);
to_check.set_focused(true);
m_focused_stack = &to_check;
m_mouse_down = true;
// When the user wants to automatically move cards, do not go into the drag mode.
if (event.button() != GUI::MouseButton::Secondary)
m_mouse_down = true;
start_timer_if_necessary();
}
}
@ -276,6 +280,24 @@ void Game::mousedown_event(GUI::MouseEvent& event)
}
}
void Game::move_focused_cards(CardStack& stack)
{
for (auto& to_intersect : m_focused_cards) {
mark_intersecting_stacks_dirty(to_intersect);
stack.push(to_intersect);
(void)m_focused_stack->pop();
}
update_score(-1);
update(m_focused_stack->bounding_box());
update(stack.bounding_box());
detect_full_stacks();
ensure_top_card_is_visible(*m_focused_stack);
}
void Game::mouseup_event(GUI::MouseEvent& event)
{
GUI::Frame::mouseup_event(event);
@ -284,30 +306,33 @@ void Game::mouseup_event(GUI::MouseEvent& event)
return;
bool rebound = true;
for (auto& stack : m_stacks) {
if (stack.is_focused())
continue;
if (event.button() == GUI::MouseButton::Secondary) {
// This enables the game to move the focused cards to the first possible stack excluding empty stacks.
// NOTE: This ignores empty stacks, as the game has no undo button, and a card, which has been moved to an empty stack without any other possibilities is not reversable.
for (auto& stack : m_stacks) {
if (stack.is_focused())
continue;
for (auto& focused_card : m_focused_cards) {
if (stack.bounding_box().intersects(focused_card.rect())) {
if (stack.is_allowed_to_push(m_focused_cards.at(0), m_focused_cards.size(), Cards::CardStack::Any)) {
for (auto& to_intersect : m_focused_cards) {
mark_intersecting_stacks_dirty(to_intersect);
stack.push(to_intersect);
(void)m_focused_stack->pop();
if (stack.is_allowed_to_push(m_focused_cards.at(0), m_focused_cards.size(), Cards::CardStack::Any) && !stack.is_empty()) {
move_focused_cards(stack);
rebound = false;
break;
}
}
} else {
for (auto& stack : m_stacks) {
if (stack.is_focused())
continue;
for (auto& focused_card : m_focused_cards) {
if (stack.bounding_box().intersects(focused_card.rect())) {
if (stack.is_allowed_to_push(m_focused_cards.at(0), m_focused_cards.size(), Cards::CardStack::Any)) {
move_focused_cards(stack);
rebound = false;
break;
}
update_score(-1);
update(m_focused_stack->bounding_box());
update(stack.bounding_box());
detect_full_stacks();
ensure_top_card_is_visible(*m_focused_stack);
rebound = false;
break;
}
}
}

1
Userland/Games/Spider/Game.h
View file

@ -72,6 +72,7 @@ private:
void ensure_top_card_is_visible(NonnullRefPtr<CardStack> stack);
void detect_full_stacks();
void detect_victory();
void move_focused_cards(CardStack& stack);
ALWAYS_INLINE CardStack& stack(StackLocation location)
{