[Refactor] Move game logic into libcockatrice_game

CMakeLists.txt

@@ -410,6 +410,9 @@ if(WITH_ORACLE OR WITH_CLIENT)
   add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_models ${CMAKE_BINARY_DIR}/libcockatrice_models)
   add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_filters ${CMAKE_BINARY_DIR}/libcockatrice_filters)
 endif()
+if(WITH_CLIENT)
+  add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_game ${CMAKE_BINARY_DIR}/libcockatrice_game)
+endif()
 
 if(WITH_SERVER)
   add_subdirectory(servatrice)

cockatrice/CMakeLists.txt

@@ -66,20 +66,15 @@ set(cockatrice_SOURCES
     src/filters/filter_builder.cpp
     src/filters/filter_tree_model.cpp
     src/filters/syntax_help.cpp
-    src/game/abstract_game.cpp
     src/game_graphics/board/abstract_card_drag_item.cpp
     src/game_graphics/board/abstract_card_item.cpp
     src/game_graphics/board/abstract_counter.cpp
-    src/game/board/arrow_data.cpp
     src/game_graphics/board/arrow_item.cpp
     src/game_graphics/board/arrow_registry.cpp
     src/game_graphics/board/arrow_target.cpp
     src/game_graphics/board/card_drag_item.cpp
     src/game_graphics/board/card_item.cpp
-    src/game/board/card_list.cpp
-    src/game/board/card_state.cpp
     src/game_graphics/board/counter_general.cpp
-    src/game/board/counter_state.cpp
     src/game_graphics/board/translate_counter_name.cpp
     src/game_graphics/deckview/deck_view.cpp
     src/game_graphics/deckview/deck_view_container.cpp
@@ -88,15 +83,10 @@ set(cockatrice_SOURCES
     src/game_graphics/dialogs/dlg_create_token.cpp
     src/game_graphics/dialogs/dlg_move_top_cards_until.cpp
     src/game_graphics/dialogs/dlg_roll_dice.cpp
-    src/game/game.cpp
-    src/game/game_event_handler.cpp
-    src/game/game_meta_info.cpp
     src/game_graphics/game_scene.cpp
-    src/game/game_state.cpp
     src/game_graphics/game_view.cpp
     src/game_graphics/hand_counter.cpp
     src/game_graphics/log/message_log_widget.cpp
-    src/game/phase.cpp
     src/game_graphics/phases_toolbar.cpp
     src/game_graphics/player/menu/card_menu.cpp
     src/game_graphics/player/menu/custom_zone_menu.cpp
@@ -114,23 +104,11 @@ set(cockatrice_SOURCES
     src/game_graphics/tally/stats_tally.cpp
     src/game_graphics/tally/subtype_tally.cpp
     src/game_graphics/tally/tally.cpp
-    src/game/player/player_actions.cpp
     src/game_graphics/player/player_area.cpp
     src/game_graphics/player/player_dialogs.cpp
-    src/game/player/player_event_handler.cpp
     src/game_graphics/player/player_graphics_item.cpp
-    src/game/player/player_info.cpp
     src/game_graphics/player/player_list_widget.cpp
-    src/game/player/player_logic.cpp
-    src/game/player/player_manager.cpp
     src/game_graphics/player/player_target.cpp
-    src/game/replay.cpp
-    src/game/zones/card_zone_logic.cpp
-    src/game/zones/hand_zone_logic.cpp
-    src/game/zones/pile_zone_logic.cpp
-    src/game/zones/stack_zone_logic.cpp
-    src/game/zones/table_zone_logic.cpp
-    src/game/zones/view_zone_logic.cpp
     src/game_graphics/zones/card_zone.cpp
     src/game_graphics/zones/hand_zone.cpp
     src/game_graphics/zones/pile_zone.cpp
@@ -568,6 +546,7 @@ target_link_libraries(
   PUBLIC libcockatrice_card
          libcockatrice_deck_list
          libcockatrice_filters
+         libcockatrice_game
          libcockatrice_utility
          libcockatrice_network
          libcockatrice_models

cockatrice/src/game_graphics/board/abstract_card_item.h

@@ -7,11 +7,18 @@
 #ifndef ABSTRACTCARDITEM_H
 #define ABSTRACTCARDITEM_H
 
-#include "../../game/board/card_state.h"
 #include "../animated_item.h"
 #include "arrow_target.h"
 #include "graphics_item_type.h"
 
+#include <QColor>
+#include <QGraphicsItem>
+#include <QSizeF>
+#include <QString>
+#include <QtGlobal>
+#include <libcockatrice/game/board/card_state.h>
+#include <qtmetamacros.h>
+
 class PlayerLogic;
 class CardInfo;
 class QPainter;

cockatrice/src/game_graphics/board/abstract_counter.cpp

@@ -2,10 +2,6 @@
 
 #include "../../client/settings/cache_settings.h"
 #include "../../client/settings/shortcuts_settings.h"
-#include "../../game/board/counter_state.h"
-#include "../../game/player/player_actions.h"
-#include "../../game/player/player_info.h"
-#include "../../game/player/player_logic.h"
 #include "../../game_graphics/board/translate_counter_name.h"
 #include "../../interface/widgets/menus/tearoff_menu.h"
 
@@ -23,6 +19,10 @@
 #include <QString>
 #include <QVariant>
 #include <QtGlobal>
+#include <libcockatrice/game/board/counter_state.h>
+#include <libcockatrice/game/player/player_actions.h>
+#include <libcockatrice/game/player/player_info.h>
+#include <libcockatrice/game/player/player_logic.h>
 #include <libcockatrice/utility/expression.h>
 #include <qnamespace.h>
 

cockatrice/src/game_graphics/board/arrow_item.cpp

@@ -2,11 +2,6 @@
 #include "arrow_item.h"
 
 #include "../../client/settings/cache_settings.h"
-#include "../../game/board/arrow_data.h"
-#include "../../game/player/player_actions.h"
-#include "../../game/player/player_info.h"
-#include "../../game/player/player_logic.h"
-#include "../../game/zones/card_zone_logic.h"
 #include "../game_scene.h"
 #include "../player/player_target.h"
 #include "../z_values.h"
@@ -27,6 +22,11 @@
 #include <QTransform>
 #include <QtGlobal>
 #include <QtMath>
+#include <libcockatrice/game/board/arrow_data.h>
+#include <libcockatrice/game/player/player_actions.h>
+#include <libcockatrice/game/player/player_info.h>
+#include <libcockatrice/game/player/player_logic.h>
+#include <libcockatrice/game/zones/card_zone_logic.h>
 #include <libcockatrice/settings/cards_display_settings.h>
 #include <libcockatrice/utility/zone_names.h>
 #include <math.h>

cockatrice/src/game_graphics/board/arrow_item.h

@@ -1,7 +1,6 @@
 #ifndef ARROWITEM_H
 #define ARROWITEM_H
 
-#include "../../game/board/arrow_data.h"
 #include "../animated_item.h"
 #include "arrow_target.h"
 #include "graphics_item_type.h"
@@ -18,6 +17,7 @@
 #include <QRectF>
 #include <QSharedPointer>
 #include <QtGlobal>
+#include <libcockatrice/game/board/arrow_data.h>
 #include <qtmetamacros.h>
 
 class CardItem;

cockatrice/src/game_graphics/board/card_item.cpp

@@ -1,17 +1,6 @@
 #include "card_item.h"
 
 #include "../../client/settings/cache_settings.h"
-#include "../../game/abstract_game.h"
-#include "../../game/board/card_state.h"
-#include "../../game/game_state.h"
-#include "../../game/phase.h"
-#include "../../game/player/player_actions.h"
-#include "../../game/player/player_info.h"
-#include "../../game/player/player_logic.h"
-#include "../../game/player/player_manager.h"
-#include "../../game/zones/card_zone_logic.h"
-#include "../../game/zones/table_zone_logic.h"
-#include "../../game/zones/view_zone_logic.h"
 #include "../card_dimensions.h"
 #include "../game_scene.h"
 #include "arrow_item.h"
@@ -41,6 +30,17 @@
 #include <QVariant>
 #include <QtGlobal>
 #include <libcockatrice/card/card_info.h>
+#include <libcockatrice/game/abstract_game.h>
+#include <libcockatrice/game/board/card_state.h>
+#include <libcockatrice/game/game_state.h>
+#include <libcockatrice/game/phase.h>
+#include <libcockatrice/game/player/player_actions.h>
+#include <libcockatrice/game/player/player_info.h>
+#include <libcockatrice/game/player/player_logic.h>
+#include <libcockatrice/game/player/player_manager.h>
+#include <libcockatrice/game/zones/card_zone_logic.h>
+#include <libcockatrice/game/zones/table_zone_logic.h>
+#include <libcockatrice/game/zones/view_zone_logic.h>
 #include <libcockatrice/protocol/pb/serverinfo_card.pb.h>
 #include <libcockatrice/settings/interface_settings.h>
 #include <libcockatrice/utility/card_ref.h>

cockatrice/src/game_graphics/board/card_item.h

@@ -7,7 +7,6 @@
 #ifndef CARDITEM_H
 #define CARDITEM_H
 
-#include "../../game/board/card_state.h"
 #include "abstract_card_item.h"
 #include "graphics_item_type.h"
 
@@ -16,6 +15,7 @@
 #include <QPointF>
 #include <QString>
 #include <QVariantList>
+#include <libcockatrice/game/board/card_state.h>
 #include <qtmetamacros.h>
 
 class CardDragItem;

cockatrice/src/game_graphics/dialogs/dlg_create_token.h

@@ -7,12 +7,11 @@
 #ifndef DLG_CREATETOKEN_H
 #define DLG_CREATETOKEN_H
 
-#include "../../game/player/token_info.h"
-
 #include <QDialog>
 #include <QList>
 #include <QString>
 #include <QStringList>
+#include <libcockatrice/game/player/token_info.h>
 #include <qtmetamacros.h>
 
 class QLabel;

cockatrice/src/game_graphics/dialogs/dlg_move_top_cards_until.h

@@ -7,12 +7,11 @@
 #ifndef DLG_MOVE_TOP_CARDS_UNTIL_H
 #define DLG_MOVE_TOP_CARDS_UNTIL_H
 
-#include "../../game/player/move_top_cards_until_options.h"
-
 #include <QDialog>
 #include <QList>
 #include <QString>
 #include <QStringList>
+#include <libcockatrice/game/player/move_top_cards_until_options.h>
 #include <qtmetamacros.h>
 
 class FilterString;

cockatrice/src/game_graphics/game_scene.cpp

@@ -1,15 +1,6 @@
 #include "game_scene.h"
 
 #include "../client/settings/cache_settings.h"
-#include "../game/abstract_game.h"
-#include "../game/arrow_registry.h"
-#include "../game/board/arrow_data.h"
-#include "../game/player/player_actions.h"
-#include "../game/player/player_event_handler.h"
-#include "../game/player/player_info.h"
-#include "../game/player/player_logic.h"
-#include "../game/zones/card_zone_logic.h"
-#include "../game/zones/view_zone_logic.h"
 #include "animated_item.h"
 #include "board/abstract_card_item.h"
 #include "board/arrow_item.h"
@@ -41,6 +32,14 @@
 #include <QtMath>
 #include <algorithm>
 #include <functional>
+#include <libcockatrice/game/abstract_game.h>
+#include <libcockatrice/game/board/arrow_data.h>
+#include <libcockatrice/game/player/player_actions.h>
+#include <libcockatrice/game/player/player_event_handler.h>
+#include <libcockatrice/game/player/player_info.h>
+#include <libcockatrice/game/player/player_logic.h>
+#include <libcockatrice/game/zones/card_zone_logic.h>
+#include <libcockatrice/game/zones/view_zone_logic.h>
 #include <libcockatrice/settings/interface_settings.h>
 #include <libcockatrice/utility/zone_names.h>
 #include <numeric>

cockatrice/src/game_graphics/log/message_log_widget.cpp

@@ -4,15 +4,6 @@
 #include "../../client/settings/card_counter_settings.h"
 #include "../../client/sound_engine.h"
 #include "../../client/translation.h"
-#include "../../game/abstract_game.h"
-#include "../../game/board/card_list.h"
-#include "../../game/game_state.h"
-#include "../../game/phase.h"
-#include "../../game/player/player_event_handler.h"
-#include "../../game/player/player_info.h"
-#include "../../game/player/player_logic.h"
-#include "../../game/player/player_manager.h"
-#include "../../game/zones/card_zone_logic.h"
 #include "../../interface/card_localization.h"
 #include "../../interface/widgets/server/chat_view/chat_view.h"
 #include "../board/card_item.h"
@@ -24,6 +15,15 @@
 #include <QList>
 #include <QSharedPointer>
 #include <QStringList>
+#include <libcockatrice/game/abstract_game.h>
+#include <libcockatrice/game/board/card_list.h>
+#include <libcockatrice/game/game_state.h>
+#include <libcockatrice/game/phase.h>
+#include <libcockatrice/game/player/player_event_handler.h>
+#include <libcockatrice/game/player/player_info.h>
+#include <libcockatrice/game/player/player_logic.h>
+#include <libcockatrice/game/player/player_manager.h>
+#include <libcockatrice/game/zones/card_zone_logic.h>
 #include <libcockatrice/protocol/pb/context_move_card.pb.h>
 #include <libcockatrice/protocol/pb/context_mulligan.pb.h>
 #include <libcockatrice/settings/chat_settings.h>

cockatrice/src/game_graphics/player/menu/card_menu.cpp

@@ -3,15 +3,7 @@
 #include "../../../client/settings/cache_settings.h"
 #include "../../../client/settings/card_counter_settings.h"
 #include "../../../client/settings/shortcuts_settings.h"
-#include "../../../game/abstract_game.h"
-#include "../../../game/player/card_menu_action_type.h"
-#include "../../../game/player/player_info.h"
-#include "../../../game/player/player_manager.h"
-#include "../../../game/zones/card_zone_logic.h"
 #include "../../board/card_item.h"
-#include "../../game/player/player_actions.h"
-#include "../../game/player/player_logic.h"
-#include "../../game/zones/view_zone_logic.h"
 #include "../../game_scene.h"
 #include "../player_graphics_item.h"
 #include "libcockatrice/card/card_info.h"
@@ -35,6 +27,14 @@
 #include <QtGlobal>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/card/relation/card_relation.h>
+#include <libcockatrice/game/abstract_game.h>
+#include <libcockatrice/game/player/card_menu_action_type.h>
+#include <libcockatrice/game/player/player_actions.h>
+#include <libcockatrice/game/player/player_info.h>
+#include <libcockatrice/game/player/player_logic.h>
+#include <libcockatrice/game/player/player_manager.h>
+#include <libcockatrice/game/zones/card_zone_logic.h>
+#include <libcockatrice/game/zones/view_zone_logic.h>
 #include <libcockatrice/utility/zone_names.h>
 #include <qnamespace.h>
 #include <utility>

cockatrice/src/game_graphics/player/menu/custom_zone_menu.cpp

@@ -1,13 +1,13 @@
 #include "custom_zone_menu.h"
 
-#include "../../../game/player/player_info.h"
-#include "../../game/player/player_logic.h"
 #include "../../game_scene.h"
 #include "../player_graphics_item.h"
 
 #include <QAction>
 #include <QList>
 #include <QVariant>
+#include <libcockatrice/game/player/player_info.h>
+#include <libcockatrice/game/player/player_logic.h>
 
 CustomZoneMenu::CustomZoneMenu(PlayerGraphicsItem *_player) : player(_player)
 {

cockatrice/src/game_graphics/player/menu/grave_menu.cpp

@@ -2,13 +2,7 @@
 
 #include "../../../client/settings/cache_settings.h"
 #include "../../../client/settings/shortcuts_settings.h"
-#include "../../../game/player/player_info.h"
-#include "../../../game/player/player_manager.h"
-#include "../../../game/zones/pile_zone_logic.h"
 #include "../../../interface/widgets/menus/tearoff_menu.h"
-#include "../../game/abstract_game.h"
-#include "../../game/player/player_actions.h"
-#include "../../game/player/player_logic.h"
 #include "../player_graphics_item.h"
 
 #include <QAction>
@@ -19,6 +13,12 @@
 #include <QObject>
 #include <QString>
 #include <QVariant>
+#include <libcockatrice/game/abstract_game.h>
+#include <libcockatrice/game/player/player_actions.h>
+#include <libcockatrice/game/player/player_info.h>
+#include <libcockatrice/game/player/player_logic.h>
+#include <libcockatrice/game/player/player_manager.h>
+#include <libcockatrice/game/zones/pile_zone_logic.h>
 #include <libcockatrice/utility/zone_names.h>
 
 class QWidget;

cockatrice/src/game_graphics/player/menu/hand_menu.cpp

@@ -2,14 +2,7 @@
 
 #include "../../../client/settings/cache_settings.h"
 #include "../../../client/settings/shortcuts_settings.h"
-#include "../../../game/board/card_list.h"
-#include "../../../game/player/player_info.h"
-#include "../../../game/player/player_manager.h"
-#include "../../../game/zones/hand_zone_logic.h"
 #include "../../../interface/widgets/menus/tearoff_menu.h"
-#include "../../game/abstract_game.h"
-#include "../../game/player/player_actions.h"
-#include "../../game/player/player_logic.h"
 #include "../player_graphics_item.h"
 
 #include <QAction>
@@ -20,6 +13,13 @@
 #include <QObject>
 #include <QString>
 #include <QVariant>
+#include <libcockatrice/game/abstract_game.h>
+#include <libcockatrice/game/board/card_list.h>
+#include <libcockatrice/game/player/player_actions.h>
+#include <libcockatrice/game/player/player_info.h>
+#include <libcockatrice/game/player/player_logic.h>
+#include <libcockatrice/game/player/player_manager.h>
+#include <libcockatrice/game/zones/hand_zone_logic.h>
 #include <libcockatrice/utility/zone_names.h>
 
 class QWidget;

cockatrice/src/game_graphics/player/menu/library_menu.cpp

@@ -2,14 +2,7 @@
 
 #include "../../../client/settings/cache_settings.h"
 #include "../../../client/settings/shortcuts_settings.h"
-#include "../../../game/board/card_list.h"
-#include "../../../game/player/player_info.h"
-#include "../../../game/player/player_manager.h"
-#include "../../../game/zones/pile_zone_logic.h"
 #include "../../../interface/widgets/menus/tearoff_menu.h"
-#include "../../game/abstract_game.h"
-#include "../../game/player/player_actions.h"
-#include "../../game/player/player_logic.h"
 #include "../player_graphics_item.h"
 
 #include <QAction>
@@ -23,6 +16,13 @@
 #include <QObject>
 #include <QString>
 #include <QVariant>
+#include <libcockatrice/game/abstract_game.h>
+#include <libcockatrice/game/board/card_list.h>
+#include <libcockatrice/game/player/player_actions.h>
+#include <libcockatrice/game/player/player_info.h>
+#include <libcockatrice/game/player/player_logic.h>
+#include <libcockatrice/game/player/player_manager.h>
+#include <libcockatrice/game/zones/pile_zone_logic.h>
 
 class QWidget;
 

cockatrice/src/game_graphics/player/menu/move_menu.cpp

@@ -2,13 +2,13 @@
 
 #include "../../../client/settings/cache_settings.h"
 #include "../../../client/settings/shortcuts_settings.h"
-#include "../../../game/player/card_menu_action_type.h"
-#include "../../game/player/player_actions.h"
-#include "../../game/player/player_logic.h"
 #include "../../game_scene.h"
 #include "../player_graphics_item.h"
 
 #include <QAction>
+#include <libcockatrice/game/player/card_menu_action_type.h>
+#include <libcockatrice/game/player/player_actions.h>
+#include <libcockatrice/game/player/player_logic.h>
 
 MoveMenu::MoveMenu(PlayerGraphicsItem *player) : QMenu(tr("Move to"))
 {

cockatrice/src/game_graphics/player/menu/pt_menu.cpp

@@ -2,12 +2,12 @@
 
 #include "../../../client/settings/cache_settings.h"
 #include "../../../client/settings/shortcuts_settings.h"
-#include "../../game/player/player_actions.h"
-#include "../../game/player/player_logic.h"
 #include "../../game_scene.h"
 #include "../player_graphics_item.h"
 
 #include <QAction>
+#include <libcockatrice/game/player/player_actions.h>
+#include <libcockatrice/game/player/player_logic.h>
 
 PtMenu::PtMenu(PlayerGraphicsItem *player) : QMenu(tr("Power / toughness"))
 {

cockatrice/src/game_graphics/player/menu/rfg_menu.cpp

@@ -1,10 +1,6 @@
 #include "rfg_menu.h"
 
-#include "../../../game/player/player_info.h"
-#include "../../../game/zones/pile_zone_logic.h"
 #include "../../../interface/widgets/menus/tearoff_menu.h"
-#include "../../game/player/player_actions.h"
-#include "../../game/player/player_logic.h"
 #include "../player_graphics_item.h"
 
 #include <QAction>
@@ -12,6 +8,10 @@
 #include <QMenu>
 #include <QString>
 #include <QVariant>
+#include <libcockatrice/game/player/player_actions.h>
+#include <libcockatrice/game/player/player_info.h>
+#include <libcockatrice/game/player/player_logic.h>
+#include <libcockatrice/game/zones/pile_zone_logic.h>
 #include <libcockatrice/utility/zone_names.h>
 
 class QWidget;

cockatrice/src/game_graphics/player/menu/say_menu.cpp

@@ -1,14 +1,14 @@
 #include "say_menu.h"
 
 #include "../../../client/settings/cache_settings.h"
-#include "../../game/player/player_actions.h"
-#include "../../game/player/player_logic.h"
 #include "../player_graphics_item.h"
 
 #include <QAction>
 #include <QKeySequence>
 #include <QList>
 #include <QString>
+#include <libcockatrice/game/player/player_actions.h>
+#include <libcockatrice/game/player/player_logic.h>
 #include <libcockatrice/settings/message_settings.h>
 
 SayMenu::SayMenu(PlayerGraphicsItem *_player) : player(_player)

cockatrice/src/game_graphics/player/menu/sideboard_menu.cpp

@@ -2,13 +2,13 @@
 
 #include "../../../client/settings/cache_settings.h"
 #include "../../../client/settings/shortcuts_settings.h"
-#include "../../../game/player/player_info.h"
-#include "../../game/player/player_actions.h"
-#include "../../game/player/player_logic.h"
 #include "../player_graphics_item.h"
 
 #include <QAction>
 #include <QKeySequence>
+#include <libcockatrice/game/player/player_actions.h>
+#include <libcockatrice/game/player/player_info.h>
+#include <libcockatrice/game/player/player_logic.h>
 
 SideboardMenu::SideboardMenu(PlayerGraphicsItem *player, QMenu *playerMenu) : QMenu(playerMenu)
 {

cockatrice/src/game_graphics/player/menu/utility_menu.cpp

@@ -2,9 +2,6 @@
 
 #include "../../../client/settings/cache_settings.h"
 #include "../../../client/settings/shortcuts_settings.h"
-#include "../../../game/player/player_info.h"
-#include "../../game/player/player_actions.h"
-#include "../../game/player/player_logic.h"
 #include "../../game_scene.h"
 #include "../player_graphics_item.h"
 #include "libcockatrice/card/card_info.h"
@@ -14,6 +11,9 @@
 #include <QSet>
 #include <libcockatrice/deck_list/tree/deck_list_card_node.h>
 #include <libcockatrice/deck_list/tree/inner_deck_list_node.h>
+#include <libcockatrice/game/player/player_actions.h>
+#include <libcockatrice/game/player/player_info.h>
+#include <libcockatrice/game/player/player_logic.h>
 
 UtilityMenu::UtilityMenu(PlayerGraphicsItem *_player, QMenu *playerMenu) : QMenu(playerMenu), player(_player)
 {

cockatrice/src/game_graphics/player/player_graphics_item.cpp

@@ -1,15 +1,6 @@
 #include "player_graphics_item.h"
 
 #include "../../client/settings/cache_settings.h"
-#include "../../game/board/counter_state.h"
-#include "../../game/player/player_actions.h"
-#include "../../game/player/player_info.h"
-#include "../../game/player/player_logic.h"
-#include "../../game/zones/card_zone_logic.h"
-#include "../../game/zones/hand_zone_logic.h"
-#include "../../game/zones/pile_zone_logic.h"
-#include "../../game/zones/stack_zone_logic.h"
-#include "../../game/zones/table_zone_logic.h"
 #include "../../interface/card_picture_loader/card_picture_loader.h"
 #include "../../interface/widgets/cards/art_crop_attribution.h"
 #include "../../interface/widgets/cards/card_art_utils.h"
@@ -45,6 +36,15 @@
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/deck_list/deck_list.h>
 #include <libcockatrice/deck_list/playmat_resolver.h>
+#include <libcockatrice/game/board/counter_state.h>
+#include <libcockatrice/game/player/player_actions.h>
+#include <libcockatrice/game/player/player_info.h>
+#include <libcockatrice/game/player/player_logic.h>
+#include <libcockatrice/game/zones/card_zone_logic.h>
+#include <libcockatrice/game/zones/hand_zone_logic.h>
+#include <libcockatrice/game/zones/pile_zone_logic.h>
+#include <libcockatrice/game/zones/stack_zone_logic.h>
+#include <libcockatrice/game/zones/table_zone_logic.h>
 #include <libcockatrice/settings/interface_settings.h>
 #include <qnamespace.h>
 #include <qnumeric.h>

cockatrice/src/game_graphics/player/player_target.cpp

@@ -1,8 +1,6 @@
 #include "player_target.h"
 
 #include "../../client/settings/cache_settings.h"
-#include "../../game/player/player_info.h"
-#include "../../game/player/player_logic.h"
 #include "../../interface/pixel_map_generator.h"
 #include "../board/abstract_counter.h"
 #include "../board/abstract_graphics_item.h"
@@ -30,6 +28,8 @@
 #include <QTransform>
 #include <QtGlobal>
 #include <QtMath>
+#include <libcockatrice/game/player/player_info.h>
+#include <libcockatrice/game/player/player_logic.h>
 #include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
 #include <qnamespace.h>
 #include <qnumeric.h>

cockatrice/src/game_graphics/zones/hand_zone.cpp

@@ -1,11 +1,6 @@
 #include "hand_zone.h"
 
 #include "../../client/settings/cache_settings.h"
-#include "../../game/player/player_actions.h"
-#include "../../game/player/player_info.h"
-#include "../../game/player/player_logic.h"
-#include "../../game/zones/card_zone_logic.h"
-#include "../../game/zones/hand_zone_logic.h"
 #include "../../interface/theme_manager.h"
 #include "../board/card_drag_item.h"
 #include "../board/card_item.h"
@@ -18,6 +13,11 @@
 #include <QPointF>
 #include <QRectF>
 #include <QString>
+#include <libcockatrice/game/player/player_actions.h>
+#include <libcockatrice/game/player/player_info.h>
+#include <libcockatrice/game/player/player_logic.h>
+#include <libcockatrice/game/zones/card_zone_logic.h>
+#include <libcockatrice/game/zones/hand_zone_logic.h>
 #include <libcockatrice/settings/interface_settings.h>
 #include <string>
 

cockatrice/src/game_graphics/zones/hand_zone.h

@@ -7,10 +7,10 @@
 #ifndef HANDZONE_H
 #define HANDZONE_H
 
-#include "../../game/board/card_list.h"
 #include "select_zone.h"
 
 #include <QtGlobal>
+#include <libcockatrice/game/board/card_list.h>
 #include <qtmetamacros.h>
 
 class HandZoneLogic;

cockatrice/src/game_graphics/zones/pile_zone.cpp

@@ -1,12 +1,6 @@
 #include "pile_zone.h"
 
 #include "../../client/settings/cache_settings.h"
-#include "../../game/board/card_list.h"
-#include "../../game/player/player_actions.h"
-#include "../../game/player/player_info.h"
-#include "../../game/player/player_logic.h"
-#include "../../game/zones/card_zone_logic.h"
-#include "../../game/zones/pile_zone_logic.h"
 #include "../board/card_drag_item.h"
 #include "../board/card_item.h"
 #include "../card_dimensions.h"
@@ -24,6 +18,12 @@
 #include <QString>
 #include <QTransform>
 #include <QtGlobal>
+#include <libcockatrice/game/board/card_list.h>
+#include <libcockatrice/game/player/player_actions.h>
+#include <libcockatrice/game/player/player_info.h>
+#include <libcockatrice/game/player/player_logic.h>
+#include <libcockatrice/game/zones/card_zone_logic.h>
+#include <libcockatrice/game/zones/pile_zone_logic.h>
 #include <libcockatrice/settings/cards_display_settings.h>
 #include <qnamespace.h>
 #include <string>

cockatrice/src/game_graphics/zones/stack_zone.cpp

@@ -1,11 +1,5 @@
 #include "stack_zone.h"
 
-#include "../../game/board/card_list.h"
-#include "../../game/player/player_actions.h"
-#include "../../game/player/player_info.h"
-#include "../../game/player/player_logic.h"
-#include "../../game/zones/card_zone_logic.h"
-#include "../../game/zones/stack_zone_logic.h"
 #include "../../interface/theme_manager.h"
 #include "../board/card_drag_item.h"
 #include "../board/card_item.h"
@@ -19,6 +13,12 @@
 #include <QPoint>
 #include <QRectF>
 #include <QString>
+#include <libcockatrice/game/board/card_list.h>
+#include <libcockatrice/game/player/player_actions.h>
+#include <libcockatrice/game/player/player_info.h>
+#include <libcockatrice/game/player/player_logic.h>
+#include <libcockatrice/game/zones/card_zone_logic.h>
+#include <libcockatrice/game/zones/stack_zone_logic.h>
 #include <qnumeric.h>
 #include <string>
 

cockatrice/src/game_graphics/zones/table_zone.cpp

@@ -1,12 +1,6 @@
 #include "table_zone.h"
 
 #include "../../client/settings/cache_settings.h"
-#include "../../game/board/card_list.h"
-#include "../../game/player/player_actions.h"
-#include "../../game/player/player_info.h"
-#include "../../game/player/player_logic.h"
-#include "../../game/zones/card_zone_logic.h"
-#include "../../game/zones/table_zone_logic.h"
 #include "../../interface/theme_manager.h"
 #include "../board/abstract_card_item.h"
 #include "../board/card_drag_item.h"
@@ -32,6 +26,12 @@
 #include <algorithm>
 #include <iterator>
 #include <libcockatrice/card/card_info.h>
+#include <libcockatrice/game/board/card_list.h>
+#include <libcockatrice/game/player/player_actions.h>
+#include <libcockatrice/game/player/player_info.h>
+#include <libcockatrice/game/player/player_logic.h>
+#include <libcockatrice/game/zones/card_zone_logic.h>
+#include <libcockatrice/game/zones/table_zone_logic.h>
 #include <libcockatrice/settings/interface_settings.h>
 #include <libcockatrice/utility/zone_names.h>
 #include <string>

cockatrice/src/game_graphics/zones/view_zone.cpp

@@ -1,11 +1,6 @@
 #include "view_zone.h"
 
 #include "../../client/settings/cache_settings.h"
-#include "../../game/player/player_actions.h"
-#include "../../game/player/player_info.h"
-#include "../../game/player/player_logic.h"
-#include "../../game/zones/card_zone_logic.h"
-#include "../../game/zones/view_zone_logic.h"
 #include "../board/card_drag_item.h"
 #include "../board/card_item.h"
 #include "../card_dimensions.h"
@@ -26,6 +21,11 @@
 #include <QtMath>
 #include <functional>
 #include <libcockatrice/card/card_localization.h>
+#include <libcockatrice/game/player/player_actions.h>
+#include <libcockatrice/game/player/player_info.h>
+#include <libcockatrice/game/player/player_logic.h>
+#include <libcockatrice/game/zones/card_zone_logic.h>
+#include <libcockatrice/game/zones/view_zone_logic.h>
 #include <libcockatrice/protocol/pb/response_dump_zone.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_card.pb.h>
 #include <libcockatrice/protocol/pending_command.h>

cockatrice/src/game_graphics/zones/view_zone.h

@@ -7,7 +7,6 @@
 #ifndef ZONEVIEWERZONE_H
 #define ZONEVIEWERZONE_H
 
-#include "../../game/board/card_list.h"
 #include "select_zone.h"
 
 #include <QGraphicsLayoutItem>
@@ -17,6 +16,7 @@
 #include <QSizeF>
 #include <QString>
 #include <libcockatrice/filters/filter_string.h>
+#include <libcockatrice/game/board/card_list.h>
 #include <qnamespace.h>
 #include <qtmetamacros.h>
 

cockatrice/src/game_graphics/zones/view_zone_widget.cpp

@@ -3,11 +3,6 @@
 #include "../../client/settings/cache_settings.h"
 #include "../../client/translation.h"
 #include "../../filters/syntax_help.h"
-#include "../../game/board/card_list.h"
-#include "../../game/player/player_actions.h"
-#include "../../game/player/player_logic.h"
-#include "../../game/zones/card_zone_logic.h"
-#include "../../game/zones/view_zone_logic.h"
 #include "../../interface/pixel_map_generator.h"
 #include "../card_dimensions.h"
 #include "../z_values.h"
@@ -44,6 +39,11 @@
 #include <QVariant>
 #include <QWidget>
 #include <QtGlobal>
+#include <libcockatrice/game/board/card_list.h>
+#include <libcockatrice/game/player/player_actions.h>
+#include <libcockatrice/game/player/player_logic.h>
+#include <libcockatrice/game/zones/card_zone_logic.h>
+#include <libcockatrice/game/zones/view_zone_logic.h>
 #include <libcockatrice/settings/cards_display_settings.h>
 #include <libcockatrice/settings/interface_settings.h>
 #include <qnamespace.h>

cockatrice/src/interface/widgets/replay/replay_manager.h

@@ -1,11 +1,10 @@
 #ifndef COCKATRICE_REPLAY_MANAGER_H
 #define COCKATRICE_REPLAY_MANAGER_H
 
-#include "../../../game/player/event_processing_options.h"
-
 #include <QList>
 #include <QObject>
 #include <QtGlobal>
+#include <libcockatrice/game/player/event_processing_options.h>
 #include <qtmetamacros.h>
 
 class GameReplay;

cockatrice/src/interface/widgets/tabs/tab_game.cpp

@@ -2,16 +2,7 @@
 
 #include "../../../client/settings/cache_settings.h"
 #include "../../../client/settings/shortcuts_settings.h"
-#include "../../../game/abstract_game.h"
-#include "../../../game/game_event_handler.h"
-#include "../../../game/game_meta_info.h"
-#include "../../../game/game_state.h"
-#include "../../../game/player/player_info.h"
-#include "../../../game/player/player_manager.h"
 #include "../../../game_graphics/board/abstract_card_item.h"
-#include "../game/game.h"
-#include "../game/player/player_logic.h"
-#include "../game/replay.h"
 #include "../game_graphics/deckview/deck_view_container.h"
 #include "../game_graphics/deckview/tabbed_deck_view_container.h"
 #include "../game_graphics/game_scene.h"
@@ -71,6 +62,15 @@
 #include <QWidget>
 #include <QtGlobal>
 #include <libcockatrice/card/database/card_database_manager.h>
+#include <libcockatrice/game/abstract_game.h>
+#include <libcockatrice/game/game.h>
+#include <libcockatrice/game/game_event_handler.h>
+#include <libcockatrice/game/game_meta_info.h>
+#include <libcockatrice/game/game_state.h>
+#include <libcockatrice/game/player/player_info.h>
+#include <libcockatrice/game/player/player_logic.h>
+#include <libcockatrice/game/player/player_manager.h>
+#include <libcockatrice/game/replay.h>
 #include <libcockatrice/network/client/abstract/abstract_client.h>
 #include <libcockatrice/protocol/pb/serverinfo_player.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_user.pb.h>

libcockatrice_game/CMakeLists.txt

@@ -0,0 +1,87 @@
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTOUIC ON)
+set(CMAKE_AUTORCC ON)
+
+set(HEADERS
+    libcockatrice/game/abstract_game.h
+    libcockatrice/game/board/arrow_data.h
+    libcockatrice/game/board/card_list.h
+    libcockatrice/game/board/card_state.h
+    libcockatrice/game/board/counter_state.h
+    libcockatrice/game/game.h
+    libcockatrice/game/game_event_handler.h
+    libcockatrice/game/game_meta_info.h
+    libcockatrice/game/game_state.h
+    libcockatrice/game/phase.h
+    libcockatrice/game/player/card_menu_action_type.h
+    libcockatrice/game/player/card_move_request.h
+    libcockatrice/game/player/event_processing_options.h
+    libcockatrice/game/player/move_top_cards_until_options.h
+    libcockatrice/game/player/player_actions.h
+    libcockatrice/game/player/player_event_handler.h
+    libcockatrice/game/player/player_info.h
+    libcockatrice/game/player/player_logic.h
+    libcockatrice/game/player/player_manager.h
+    libcockatrice/game/player/token_info.h
+    libcockatrice/game/replay.h
+    libcockatrice/game/translation.h
+    libcockatrice/game/zones/card_zone_algorithms.h
+    libcockatrice/game/zones/card_zone_logic.h
+    libcockatrice/game/zones/hand_zone_logic.h
+    libcockatrice/game/zones/pile_zone_logic.h
+    libcockatrice/game/zones/stack_zone_logic.h
+    libcockatrice/game/zones/table_zone_logic.h
+    libcockatrice/game/zones/view_zone_logic.h
+)
+
+qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
+
+add_library(
+  libcockatrice_game STATIC
+  ${MOC_SOURCES}
+  libcockatrice/game/abstract_game.cpp
+  libcockatrice/game/board/arrow_data.cpp
+  libcockatrice/game/board/card_list.cpp
+  libcockatrice/game/board/card_state.cpp
+  libcockatrice/game/board/counter_state.cpp
+  libcockatrice/game/game.cpp
+  libcockatrice/game/game_event_handler.cpp
+  libcockatrice/game/game_meta_info.cpp
+  libcockatrice/game/game_state.cpp
+  libcockatrice/game/phase.cpp
+  libcockatrice/game/player/player_actions.cpp
+  libcockatrice/game/player/player_event_handler.cpp
+  libcockatrice/game/player/player_info.cpp
+  libcockatrice/game/player/player_logic.cpp
+  libcockatrice/game/player/player_manager.cpp
+  libcockatrice/game/replay.cpp
+  libcockatrice/game/zones/card_zone_logic.cpp
+  libcockatrice/game/zones/hand_zone_logic.cpp
+  libcockatrice/game/zones/pile_zone_logic.cpp
+  libcockatrice/game/zones/stack_zone_logic.cpp
+  libcockatrice/game/zones/table_zone_logic.cpp
+  libcockatrice/game/zones/view_zone_logic.cpp
+)
+
+target_include_directories(
+  libcockatrice_game
+  PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
+  # SettingsCache, the client-side settings facade the game logic still reads, lives in the
+  # application sources rather than in libcockatrice_settings.
+  PRIVATE ${CMAKE_SOURCE_DIR}/cockatrice/src
+)
+
+target_link_libraries(
+  libcockatrice_game
+  PUBLIC libcockatrice_card
+         libcockatrice_deck_list
+         libcockatrice_filters
+         libcockatrice_network
+         libcockatrice_protocol
+         libcockatrice_settings
+         libcockatrice_utility
+         ${QT_CORE_MODULE}
+         ${COCKATRICE_QT_VERSION_NAME}::Concurrent
+         ${COCKATRICE_QT_VERSION_NAME}::Gui
+         ${COCKATRICE_QT_VERSION_NAME}::Widgets
+)

libcockatrice_game/libcockatrice/game/game_event_handler.h

@@ -37,7 +37,6 @@
 class AbstractClient;
 class AbstractGame;
 class GameEventContainer;
-class GameEventContext;
 class PendingCommand;
 class PlayerLogic;
 class Response;

libcockatrice_game/libcockatrice/game/player/player_actions.cpp

@@ -1,9 +1,6 @@
 #include "player_actions.h"
 
-#include "../../client/settings/cache_settings.h"
+"
-#include "../../game_graphics/board/card_item.h"
-#include "../../game_graphics/dialogs/dlg_create_token.h"
-#include "../../interface/deck_loader/loaded_deck.h"
 #include "../abstract_game.h"
 #include "../board/arrow_data.h"
 #include "../board/card_state.h"
@@ -14,6 +11,7 @@
 #include "../zones/pile_zone_logic.h"
 #include "../zones/table_zone_logic.h"
 #include "../zones/view_zone_logic.h"
+#include "client/settings/cache_settings.h"
 #include "libcockatrice/card/database/card_database_querier.h"
 #include "libcockatrice/card/printing/exact_card.h"
 #include "libcockatrice/card/printing/printing_info.h"

libcockatrice_game/libcockatrice/game/zones/card_zone_logic.h

@@ -7,8 +7,8 @@
 #ifndef COCKATRICE_CARD_ZONE_LOGIC_H
 #define COCKATRICE_CARD_ZONE_LOGIC_H
 
-#include "../../client/translation.h"
 #include "../board/card_list.h"
+#include "../translation.h"
 
 #include <QList>
 #include <QLoggingCategory>

libcockatrice_game/libcockatrice/game/zones/view_zone_logic.cpp

@@ -1,7 +1,8 @@
 #include "view_zone_logic.h"
 
-#include "../../client/settings/cache_settings.h"
+"
 #include "../board/card_state.h"
+#include "client/settings/cache_settings.h"
 
 #include <QtGlobal>
 #include <libcockatrice/settings/interface_settings.h>

tests/CMakeLists.txt

@@ -400,6 +400,11 @@ add_subdirectory(movecard_tests)
 add_subdirectory(oracle)
 add_subdirectory(settings)
 
+# libcockatrice_game only exists when the client is built.
+if(WITH_CLIENT)
+  add_subdirectory(game)
+endif()
+
 # theme_migration_test compiles client sources, whose headers are only reachable from a client build.
 if(WITH_CLIENT)
   add_subdirectory(theme_migration)

tests/card_zone_algorithms/CMakeLists.txt

@@ -1,4 +1,4 @@
 cockatrice_add_test(
   NAME card_zone_algorithms_test SOURCES card_zone_algorithms_test.cpp INCLUDE_DIRS
-  ${CMAKE_SOURCE_DIR}/cockatrice/src/game/zones
+  ${CMAKE_SOURCE_DIR}/libcockatrice_game/libcockatrice/game/zones
 )

tests/game/CMakeLists.txt

@@ -0,0 +1,28 @@
+add_executable(
+  game_smoke_test
+  ${CMAKE_SOURCE_DIR}/cockatrice/src/client/settings/cache_settings.cpp
+  ${CMAKE_SOURCE_DIR}/cockatrice/src/client/settings/card_counter_settings.cpp
+  ${CMAKE_SOURCE_DIR}/cockatrice/src/client/settings/shortcuts_settings.cpp
+  ${CMAKE_SOURCE_DIR}/cockatrice/src/client/network/update/client/release_channel.cpp
+  ${VERSION_STRING_CPP}
+  game_smoke_test.cpp
+)
+
+# SettingsCache is still reached from the game logic, but it lives in the application sources
+# rather than in libcockatrice_settings, so the client settings sources are compiled in here
+# exactly like loader_local_matching_test and theme_migration_test do.
+target_include_directories(game_smoke_test PRIVATE ${CMAKE_SOURCE_DIR}/cockatrice/src)
+
+target_link_libraries(
+  game_smoke_test
+  PRIVATE libcockatrice_game
+  PRIVATE Threads::Threads
+  PRIVATE ${GTEST_BOTH_LIBRARIES}
+  PRIVATE ${TEST_QT_MODULES}
+)
+
+add_test(NAME game_smoke_test COMMAND game_smoke_test)
+
+if(NOT GTEST_FOUND)
+  add_dependencies(game_smoke_test gtest)
+endif()

tests/game/game_smoke_test.cpp

@@ -0,0 +1,106 @@
+/**
+ * @file game_smoke_test.cpp
+ *
+ * Links the game logic library into a target that contains no graphics code at all, and drives
+ * the two seams the graphics layer used to own: the attachment graph on CardState and the
+ * card-creation request a zone makes so the graphics side can build the matching card item.
+ */
+
+#include "gtest/gtest.h"
+#include <QCoreApplication>
+#include <QLoggingCategory>
+#include <QSignalSpy>
+#include <QStandardPaths>
+#include <QTemporaryDir>
+#include <libcockatrice/game/board/card_state.h>
+#include <libcockatrice/game/zones/hand_zone_logic.h>
+
+namespace
+{
+
+CardRef cardRefFor(const QString &name)
+{
+    CardRef cardRef;
+    cardRef.name = name;
+    return cardRef;
+}
+
+} // namespace
+
+TEST(CardStateTest, AttachmentGraphKeepsBothEndsConsistent)
+{
+    CardState host(nullptr, nullptr, cardRefFor(QStringLiteral("Host")), 1);
+    CardState guest(nullptr, nullptr, cardRefFor(QStringLiteral("Guest")), 2);
+
+    guest.setAttachedTo(&host);
+    host.addAttachedCard(&guest);
+
+    EXPECT_EQ(guest.getAttachedTo(), &host);
+    ASSERT_EQ(host.getAttachedCards().size(), 1);
+    EXPECT_EQ(host.getAttachedCards().first(), &guest);
+
+    host.removeAttachedCard(&guest);
+    guest.setAttachedTo(nullptr);
+
+    EXPECT_TRUE(host.getAttachedCards().isEmpty());
+    EXPECT_EQ(guest.getAttachedTo(), nullptr);
+}
+
+TEST(CardZoneLogicTest, AddsAndTakesCardsWithoutAGraphicsSide)
+{
+    HandZoneLogic zone(nullptr, QStringLiteral("hand"), false, false, true);
+    CardState card(nullptr, nullptr, cardRefFor(QStringLiteral("Lightning Bolt")), 7);
+
+    QSignalSpy cardAddedSpy(&zone, &CardZoneLogic::cardAdded);
+    QSignalSpy cardCountSpy(&zone, &CardZoneLogic::cardCountChanged);
+
+    zone.addCard(&card, false, 0);
+
+    ASSERT_EQ(zone.getCards().size(), 1);
+    EXPECT_EQ(zone.getCards().first(), &card);
+    EXPECT_EQ(card.getZone(), &zone);
+    EXPECT_EQ(cardAddedSpy.count(), 1);
+    EXPECT_GE(cardCountSpy.count(), 1);
+
+    EXPECT_EQ(zone.takeCard(0, 7), &card);
+    EXPECT_TRUE(zone.getCards().isEmpty());
+    EXPECT_EQ(card.getId(), 7);
+}
+
+TEST(CardZoneLogicTest, AsksTheGraphicsSideToCreateCards)
+{
+    HandZoneLogic zone(nullptr, QStringLiteral("library"), false, true, true);
+    QSignalSpy requestSpy(&zone, &CardZoneLogic::requestCreateCard);
+
+    ServerInfo_Card cardInfo;
+    cardInfo.set_name("Lightning Bolt");
+    cardInfo.set_id(7);
+    cardInfo.set_x(0);
+    cardInfo.set_y(1);
+
+    zone.requestCreateCard(cardInfo, true);
+
+    ASSERT_EQ(requestSpy.count(), 1);
+    const QList<QVariant> arguments = requestSpy.takeFirst();
+    EXPECT_EQ(arguments.at(0).value<ServerInfo_Card>().id(), 7);
+    EXPECT_TRUE(arguments.at(1).toBool());
+}
+
+int main(int argc, char **argv)
+{
+    // Keep SettingsCache reads and writes away from the real user profile: the game logic still
+    // reaches for a handful of settings, and the client settings sources linked into this test
+    // would otherwise touch the developer's own configuration.
+    QStandardPaths::setTestModeEnabled(true);
+
+    QTemporaryDir home;
+    if (home.isValid()) {
+        qputenv("HOME", home.path().toLocal8Bit());
+    }
+
+    QCoreApplication app(argc, argv);
+    QLoggingCategory::setFilterRules("settings_cache.*=false");
+
+    ::testing::InitGoogleTest(&argc, argv);
+    return RUN_ALL_TESTS();
+}