Update Doxyfile

Added user information and commit message for documentation deployment.

.ci/compile.sh

@@ -122,7 +122,7 @@ if [[ $MAKE_SERVER ]]; then
   flags+=("-DWITH_SERVER=1")
 fi
 if [[ $MAKE_NO_CLIENT ]]; then
-  flags+=("-DWITH_CLIENT=0" "-DWITH_ORACLE=0")
+  flags+=("-DWITH_CLIENT=0" "-DWITH_ORACLE=0" "-DWITH_DBCONVERTER=0")
 fi
 if [[ $MAKE_TEST ]]; then
   flags+=("-DTEST=1")
@@ -246,7 +246,7 @@ fi
 
 if [[ $RUNNER_OS == macOS ]]; then
   echo "::group::Inspect Mach-O binaries"
-  for app in cockatrice oracle servatrice; do
+  for app in cockatrice oracle servatrice dbconverter; do
     binary="$GITHUB_WORKSPACE/build/$app/$app.app/Contents/MacOS/$app"
     echo "Inspecting $app..."
     vtool -show-build "$binary"

.dockerignore

@@ -1,8 +1,10 @@
-.git/
+.*/
 build/
-.github/
-.tx/
 cockatrice/
 doc/
+docs/
 oracle/
+tests/
+webclient/
+.*
 Dockerfile

.github/workflows/desktop-build.yml

@@ -70,7 +70,7 @@ jobs:
 
       - name: Checkout
         if: steps.configure.outputs.tag != null
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
 
@@ -162,11 +162,11 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
 
       - name: Restore compiler cache (ccache)
         id: ccache_restore
-        uses: actions/cache/restore@v5
+        uses: actions/cache/restore@v4
         env:
           BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
         with:
@@ -205,7 +205,7 @@ jobs:
 
       - name: Save compiler cache (ccache)
         if: github.ref == 'refs/heads/master'
-        uses: actions/cache/save@v5
+        uses: actions/cache/save@v4
         with:
           path: ${{env.CACHE}}
           key: ${{ steps.ccache_restore.outputs.cache-primary-key }}
@@ -345,7 +345,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
         with:
           submodules: recursive
 

.github/workflows/desktop-lint.yml

@@ -24,7 +24,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v6
+      uses: actions/checkout@v5
       with:
         fetch-depth: 20 # should be enough to find merge base
 

.github/workflows/docker-release.yml

@@ -23,7 +23,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
 
       - name: Docker metadata
         id: metadata

.github/workflows/documentation-build.yml

@@ -21,7 +21,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
 
       - name: Install Graphviz
         run: |
@@ -56,6 +56,9 @@ jobs:
         with:
           deploy_key: ${{ secrets.DOCS_DEPLOY_KEY }}
           external_repository: Cockatrice/cockatrice.github.io
-          publish_branch: master
-          publish_dir: ./docs/html
+          publish_branch: master    # GH Pages branch
+          publish_dir: ./docs/html    # Source directory
           destination_dir: docs   # Docs will live under https://cockatrice.github.io/docs/
+          user_name: 'github-actions[bot]'
+          user_email: 'github-actions[bot]@users.noreply.github.com'
+          commit_message: Deploy Docs    # ${GITHUB_SHA} will get appended

.github/workflows/translations-pull.yml

@@ -20,7 +20,7 @@ jobs:
 
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
 
       - name: Pull translated strings from Transifex
         uses: transifex/cli-action@v2
@@ -33,7 +33,7 @@ jobs:
       - name: Create pull request
         if: github.event_name != 'pull_request'
         id: create_pr
-        uses: peter-evans/create-pull-request@v8
+        uses: peter-evans/create-pull-request@v7
         with:
           add-paths: |
             cockatrice/translations/*.ts

.github/workflows/translations-push.yml

@@ -20,7 +20,7 @@ jobs:
 
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
 
       - name: Install lupdate
         shell: bash
@@ -57,7 +57,7 @@ jobs:
       - name: Create pull request
         if: github.event_name != 'pull_request'
         id: create_pr
-        uses: peter-evans/create-pull-request@v8
+        uses: peter-evans/create-pull-request@v7
         with:
           add-paths: |
             cockatrice/cockatrice_en@source.ts

.github/workflows/web-build.yml

@@ -35,7 +35,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
 
       - name: Setup Node.js
         uses: actions/setup-node@v6

.github/workflows/web-lint.yml

@@ -18,7 +18,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v6
+      uses: actions/checkout@v5
 
     - name: Setup Node.js
       uses: actions/setup-node@v6

.gitignore

@@ -1,17 +1,17 @@
-tags
-build*
-*.qm
-.directory
-mysql.cnf
-.DS_Store
-.idea/
 *.aps
-cmake-build*
-preferences
-compile_commands.json
+*.qm
+.cache
+.directory
+.DS_Store
+.gdb_history
+.idea/
 .vs/
 .vscode/
-.cache
-.gdb_history
+build*
+cmake-build*
+compile_commands.json
 cockatrice/resources/config/qtlogging.ini
 docs/
+mysql.cnf
+preferences
+tags

CMakeLists.txt

@@ -20,6 +20,8 @@ option(WITH_SERVER "build servatrice" OFF)
 option(WITH_CLIENT "build cockatrice" ON)
 # Compile oracle
 option(WITH_ORACLE "build oracle" ON)
+# Compile dbconverter
+option(WITH_DBCONVERTER "build dbconverter" ON)
 # Compile tests
 option(TEST "build tests" OFF)
 # Use vcpkg regardless of OS
@@ -354,6 +356,11 @@ if(WITH_ORACLE)
   set(CPACK_INSTALL_CMAKE_PROJECTS "Oracle;Oracle;ALL;/" ${CPACK_INSTALL_CMAKE_PROJECTS})
 endif()
 
+if(WITH_DBCONVERTER)
+  add_subdirectory(dbconverter)
+  set(CPACK_INSTALL_CMAKE_PROJECTS "Dbconverter;Dbconverter;ALL;/" ${CPACK_INSTALL_CMAKE_PROJECTS})
+endif()
+
 if(TEST)
   include(CTest)
   add_subdirectory(tests)

Dockerfile

@@ -20,7 +20,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 WORKDIR /src
 COPY . .
 RUN mkdir build && cd build && \
-    cmake .. -DWITH_SERVER=1 -DWITH_CLIENT=0 -DWITH_ORACLE=0 && \
+    cmake .. -DWITH_SERVER=1 -DWITH_CLIENT=0 -DWITH_ORACLE=0 -DWITH_DBCONVERTER=0 && \
     make -j$(nproc) && \
     make install
 

Doxyfile

@@ -1068,6 +1068,8 @@ RECURSIVE              = YES
 
 EXCLUDE                = build/ \
                          cmake/ \
+                         dbconverter/ \
+                         docs/ \
                          vcpkg/ \
                          webclient/
 
@@ -2613,7 +2615,7 @@ DOT_NUM_THREADS        = 0
 # The default value is: fontname=Helvetica,fontsize=10.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-DOT_COMMON_ATTR        = "fontname=Helvetica,fontsize=10"
+DOT_COMMON_ATTR        = "fontname=Helvetica, fontsize=10"
 
 # DOT_EDGE_ATTR is concatenated with DOT_COMMON_ATTR. For elegant style you can
 # add 'arrowhead=open, arrowtail=open, arrowsize=0.5'. <a
@@ -2622,7 +2624,7 @@ DOT_COMMON_ATTR        = "fontname=Helvetica,fontsize=10"
 # The default value is: labelfontname=Helvetica,labelfontsize=10.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-DOT_EDGE_ATTR          = "labelfontname=Helvetica,labelfontsize=10,arrowhead=open, arrowtail=open, arrowsize=0.5"
+DOT_EDGE_ATTR          = "labelfontname=Helvetica, labelfontsize=10, arrowhead=open, arrowtail=open, arrowsize=0.5"
 
 # DOT_NODE_ATTR is concatenated with DOT_COMMON_ATTR. For view without boxes
 # around nodes set 'shape=plain' or 'shape=plaintext' <a
@@ -2630,7 +2632,7 @@ DOT_EDGE_ATTR          = "labelfontname=Helvetica,labelfontsize=10,arrowhead=ope
 # The default value is: shape=box,height=0.2,width=0.4.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-DOT_NODE_ATTR          = "shape=box,height=0.2,width=0.4"
+DOT_NODE_ATTR          = "shape=box, height=0.2, width=0.4"
 
 # You can set the path where dot can find font specified with fontname in
 # DOT_COMMON_ATTR and others dot attributes.

README.md

@@ -46,8 +46,7 @@ Latest <kbd>beta</kbd> version:
 
 - [Magic-Token](https://github.com/Cockatrice/Magic-Token): MtG token data to use in Cockatrice
 - [Magic-Spoiler](https://github.com/Cockatrice/Magic-Spoiler): Script to generate MtG spoiler data from [MTGJSON](https://github.com/mtgjson/mtgjson) to use in Cockatrice
-- [cockatrice.github.io](https://github.com/Cockatrice/cockatrice.github.io): Code of the official Cockatrice webpage
-- [Cockatrice @Flathub](https://github.com/flathub/io.github.Cockatrice.cockatrice): Configuration for our Linux `flatpak` package
+- [cockatrice.github.io](https://github.com/Cockatrice/cockatrice.github.io): Code of the official webpage of the Cockatrice project
 
 
 # Community Resources [![Discord](https://img.shields.io/discord/314987288398659595?label=Discord&logo=discord&logoColor=white)](https://discord.gg/3Z9yzmA)
@@ -55,12 +54,11 @@ Latest <kbd>beta</kbd> version:
 Join our [Discord community](https://discord.gg/3Z9yzmA) to connect with other projet contributors (`#dev` channel) or fellow users of the app. Come here to talk about the application, features, or just to hang out.
 - [Official Website](https://cockatrice.github.io)
 - [Official Wiki](https://github.com/Cockatrice/Cockatrice/wiki)
-- [Official Code Documentation](https://cockatrice.github.io/docs)
 - [Official Discord](https://discord.gg/3Z9yzmA)
 - [reddit r/Cockatrice](https://reddit.com/r/cockatrice)
 
-> [!IMPORTANT]
-> For support regarding specific servers, please contact that server's admin/mods and use their dedicated communication channels rather than contacting the team building the software.
+>[!IMPORTANT]
+>For support regarding specific servers, please contact that server's admin/mods and use their dedicated communication channels rather than contacting the team building the software.
 
 
 # Contribute
@@ -77,15 +75,10 @@ This tag is used for issues that we are looking for somebody to pick up. Often t
 For both tags, we're willing to provide help to contributors in showing them where and how they can make changes, as well as code reviews for submitted changes.<br>
 We'll happily advice on how best to implement a feature, or we can show you where the codebase is doing something similar before you get too far along - put a note on an issue you want to discuss more on!
 
-You can also have a look at our `Todo List` in our [Code Documentation](https://cockatrice.github.io/docs) or search the repo for [`\todo` comments](https://github.com/search?q=repo%3ACockatrice%2FCockatrice%20%5Ctodo&type=code).
-
 Cockatrice tries to use the [Google Developer Documentation Style Guide](https://developers.google.com/style/) to ensure consistent documentation. We encourage you to improve the documentation by suggesting edits based on this guide.
 
-#### Repository Activity
-![Cockatrice Repo Analytics](https://repobeats.axiom.co/api/embed/c7cec938789a5bbaeb4182a028b4dbb96db8f181.svg "Cockatrice Repo Analytics by Repobeats")
-
 <details>
-<summary><b>Kudos to all our amazing contributors ❤️</b></summary>
+<summary><b>Kudos to our amazing contributors ❤️</b></summary>
 <br>
    <a href="https://github.com/Cockatrice/Cockatrice/graphs/contributors">
       <img src="https://contrib.rocks/image?repo=Cockatrice/Cockatrice" />
@@ -131,8 +124,8 @@ You can then
     make package
     ```
 
-> [!NOTE]
-> Detailed compiling instructions can be found in the Cockatrice wiki at [Compiling Cockatrice](https://github.com/Cockatrice/Cockatrice/wiki/Compiling-Cockatrice)
+>[!NOTE]
+>Detailed compiling instructions can be found in the Cockatrice wiki at [Compiling Cockatrice](https://github.com/Cockatrice/Cockatrice/wiki/Compiling-Cockatrice)
 
 <br>
 

cmake/CMakeDMGSetup.script

@@ -42,6 +42,7 @@ tell disk image_name
       set position of item "Cockatrice.app" to { 139, 214 }
       set position of item "Oracle.app" to { 139, 414 }
       set position of item "Servatrice.app" to { 139, 614 }
+      set position of item "dbconverter.app" to { 1400, 1400 }
       set position of item "Applications" to { 861, 414 }
     end tell
     update without registering applications

cmake/FindQtRuntime.cmake

@@ -1,11 +1,12 @@
 # Find a compatible Qt version
-# Inputs: WITH_SERVER, WITH_CLIENT, WITH_ORACLE, FORCE_USE_QT5
+# Inputs: WITH_SERVER, WITH_CLIENT, WITH_ORACLE, WITH_DBCONVERTER, FORCE_USE_QT5
 # Optional Input: QT6_DIR -- Hint as to where Qt6 lives on the system
 # Optional Input: QT5_DIR -- Hint as to where Qt5 lives on the system
 # Output: COCKATRICE_QT_VERSION_NAME -- Example values: Qt5, Qt6
 # Output: SERVATRICE_QT_MODULES
 # Output: COCKATRICE_QT_MODULES
 # Output: ORACLE_QT_MODULES
+# Output: DBCONVERTER_QT_MODULES
 # Output: TEST_QT_MODULES
 
 set(REQUIRED_QT_COMPONENTS Core)
@@ -28,12 +29,15 @@ endif()
 if(WITH_ORACLE)
   set(_ORACLE_NEEDED Concurrent Network Svg Widgets)
 endif()
+if(WITH_DBCONVERTER)
+  set(_DBCONVERTER_NEEDED Network Widgets)
+endif()
 if(TEST)
   set(_TEST_NEEDED Widgets)
 endif()
 
 set(REQUIRED_QT_COMPONENTS ${REQUIRED_QT_COMPONENTS} ${_SERVATRICE_NEEDED} ${_COCKATRICE_NEEDED} ${_ORACLE_NEEDED}
-                           ${_TEST_NEEDED}
+                           ${_DBCONVERTER_NEEDED} ${_TEST_NEEDED}
 )
 list(REMOVE_DUPLICATES REQUIRED_QT_COMPONENTS)
 
@@ -108,6 +112,7 @@ message(DEBUG "QT_LIBRARY_DIR = ${QT_LIBRARY_DIR}")
 string(REGEX REPLACE "([^;]+)" "${COCKATRICE_QT_VERSION_NAME}::\\1" SERVATRICE_QT_MODULES "${_SERVATRICE_NEEDED}")
 string(REGEX REPLACE "([^;]+)" "${COCKATRICE_QT_VERSION_NAME}::\\1" COCKATRICE_QT_MODULES "${_COCKATRICE_NEEDED}")
 string(REGEX REPLACE "([^;]+)" "${COCKATRICE_QT_VERSION_NAME}::\\1" ORACLE_QT_MODULES "${_ORACLE_NEEDED}")
+string(REGEX REPLACE "([^;]+)" "${COCKATRICE_QT_VERSION_NAME}::\\1" DB_CONVERTER_QT_MODULES "${_DBCONVERTER_NEEDED}")
 string(REGEX REPLACE "([^;]+)" "${COCKATRICE_QT_VERSION_NAME}::\\1" TEST_QT_MODULES "${_TEST_NEEDED}")
 
 # Core-only export (useful for headless libs)

cmake/NSIS.template.in

@@ -213,6 +213,7 @@ ${AndIf} ${FileExists} "$INSTDIR\portable.dat"
 	Delete "$INSTDIR\uninstall.exe"
 	Delete "$INSTDIR\cockatrice.exe"
 	Delete "$INSTDIR\oracle.exe"
+	Delete "$INSTDIR\dbconverter.exe"
 	Delete "$INSTDIR\servatrice.exe"
 	Delete "$INSTDIR\Qt*.dll"
 	Delete "$INSTDIR\libmysql.dll"

cmake/SignMacApplications.cmake

@@ -3,7 +3,7 @@
 string(LENGTH "$ENV{MACOS_CERTIFICATE_NAME}" MACOS_CERTIFICATE_NAME_LEN)
 
 if(APPLE AND MACOS_CERTIFICATE_NAME_LEN GREATER 0)
-  set(APPLICATIONS "cockatrice" "servatrice" "oracle")
+  set(APPLICATIONS "cockatrice" "servatrice" "oracle" "dbconverter")
   foreach(app_name IN LISTS APPLICATIONS)
     set(FULL_APP_PATH "${CPACK_TEMPORARY_INSTALL_DIRECTORY}/${app_name}.app")
 

cockatrice/CMakeLists.txt

@@ -19,10 +19,7 @@ set(cockatrice_SOURCES
     src/client/settings/card_counter_settings.cpp
     src/client/settings/shortcut_treeview.cpp
     src/client/settings/shortcuts_settings.cpp
-    src/interface/deck_loader/card_node_function.cpp
-    src/interface/deck_loader/deck_file_format.cpp
     src/interface/deck_loader/deck_loader.cpp
-    src/interface/deck_loader/loaded_deck.cpp
     src/interface/widgets/dialogs/dlg_connect.cpp
     src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp
     src/interface/widgets/dialogs/dlg_create_game.cpp
@@ -145,7 +142,6 @@ set(cockatrice_SOURCES
     src/interface/widgets/cards/deck_card_zone_display_widget.cpp
     src/interface/widgets/cards/deck_preview_card_picture_widget.cpp
     src/interface/widgets/deck_analytics/deck_analytics_widget.cpp
-    src/interface/widgets/deck_analytics/deck_list_statistics_analyzer.cpp
     src/interface/widgets/deck_analytics/mana_base_widget.cpp
     src/interface/widgets/deck_analytics/mana_curve_widget.cpp
     src/interface/widgets/deck_analytics/mana_devotion_widget.cpp
@@ -157,10 +153,8 @@ set(cockatrice_SOURCES
     src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp
     src/interface/widgets/deck_editor/deck_list_style_proxy.cpp
     src/interface/widgets/general/background_sources.cpp
-    src/interface/widgets/general/display/background_plate_widget.cpp
     src/interface/widgets/general/display/banner_widget.cpp
     src/interface/widgets/general/display/bar_widget.cpp
-    src/interface/widgets/general/display/color_bar.cpp
     src/interface/widgets/general/display/dynamic_font_size_label.cpp
     src/interface/widgets/general/display/dynamic_font_size_push_button.cpp
     src/interface/widgets/general/display/labeled_input.cpp
@@ -202,14 +196,12 @@ set(cockatrice_SOURCES
     src/interface/widgets/utility/sequence_edit.cpp
     src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp
     src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp
-    src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp
     src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp
     src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp
     src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp
     src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp
     src/interface/widgets/visual_database_display/visual_database_display_widget.cpp
     src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp
-    src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp
     src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp
     src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp
     src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp
@@ -228,20 +220,6 @@ set(cockatrice_SOURCES
     src/interface/window_main.cpp
     src/main.cpp
     src/interface/widgets/tabs/abstract_tab_deck_editor.cpp
-    src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp
-    src/interface/widgets/tabs/api/archidekt/api_response/archidekt_deck_listing_api_response.cpp
-    src/interface/widgets/tabs/api/archidekt/api_response/archidekt_formats.h
-    src/interface/widgets/tabs/api/archidekt/api_response/card/archidekt_api_response_card.cpp
-    src/interface/widgets/tabs/api/archidekt/api_response/card/archidekt_api_response_card_entry.cpp
-    src/interface/widgets/tabs/api/archidekt/api_response/card/archidekt_api_response_edition.cpp
-    src/interface/widgets/tabs/api/archidekt/api_response/deck/archidekt_api_response_deck.cpp
-    src/interface/widgets/tabs/api/archidekt/api_response/deck/archidekt_api_response_deck_category.cpp
-    src/interface/widgets/tabs/api/archidekt/api_response/deck_listings/archidekt_api_response_deck_listing_container.cpp
-    src/interface/widgets/tabs/api/archidekt/api_response/deck_listings/archidekt_api_response_deck_owner.cpp
-    src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp
-    src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_entry_display_widget.cpp
-    src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_listings_display_widget.cpp
-    src/interface/widgets/tabs/api/archidekt/display/archidekt_deck_preview_image_display_widget.cpp
     src/interface/widgets/tabs/api/edhrec/api_response/archidekt_links/edhrec_api_response_archidekt_links.cpp
     src/interface/widgets/tabs/api/edhrec/api_response/average_deck/edhrec_average_deck_api_response.cpp
     src/interface/widgets/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.cpp

cockatrice/resources/config/qtlogging.ini

@@ -1,10 +1,6 @@
 [Rules]
 # The default log level is info
 *.debug = false
-#*.info = true
-#*.warning = true
-#*.critical = true
-#*.fatal = true
 
 # Uncomment a rule to see debug level logs for that category,
 # or set <category> = false to disable logging

cockatrice/resources/help/deck_search.md

@@ -15,18 +15,15 @@ searches are case insensitive.
 <dd>[n:red n:deck n:wins](#n:red n:deck n:wins) <small>(Any deck with a name containing the words red, deck, and wins)</small></dd>
 <dd>[n:"red deck wins"](#n:%22red deck wins%22) <small>(Any deck with a name containing the exact phrase "red deck wins")</small></dd>
 
-<dt><u>F</u>ile <u>N</u>ame:</dt>
-<dd>[fn:aggro](#fn:aggro) <small>(Any deck with a filename containing the word aggro)</small></dd>
-<dd>[fn:red fn:deck fn:wins](#fn:red fn:deck fn:wins) <small>(Any deck with a filename containing the words red, deck, and wins)</small></dd>
-<dd>[fn:"red deck wins"](#fn:%22red deck wins%22) <small>(Any deck with a filename containing the exact phrase "red deck wins")</small></dd>
+<dt><u>F</u>ile Name:</dt>
+<dd>[f:aggro](#f:aggro) <small>(Any deck with a filename containing the word aggro)</small></dd>
+<dd>[f:red f:deck f:wins](#f:red f:deck f:wins) <small>(Any deck with a filename containing the words red, deck, and wins)</small></dd>
+<dd>[f:"red deck wins"](#f:%22red deck wins%22) <small>(Any deck with a filename containing the exact phrase "red deck wins")</small></dd>
 
 <dt>Relative <u>P</u>ath (starting from the deck folder):</dt>
 <dd>[p:aggro](#p:aggro) <small>(Any deck that has "aggro" somewhere in its relative path)</small></dd>
 <dd>[p:edh/](#p:edh/) <small>(Any deck with "edh/" in its relative path, A.K.A. decks in the "edh" folder)</small></dd>
 
-<dt><u>F</u>ormat:</dt>
-<dd>[f:standard](#f:standard) <small>(Any deck with format set to standard)</small></dd>
-
 <dt>Deck Contents (Uses [card search expressions](#cardSearchSyntaxHelp)):</dt>
 <dd><a href="#[[plains]]">[[plains]]</a> <small>(Any deck that contains at least one card with "plains" in its name)</small></dd>
 <dd><a href="#[[t:legendary]]">[[t:legendary]]</a> <small>(Any deck that contains at least one legendary)</small></dd>

cockatrice/resources/usericons/pawn_donator_double.svg

@@ -350,11 +350,11 @@
        style="fill-opacity:1;stroke:black;stroke-width:2.78220296;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
        d="M 49.84375 1.71875 C 36.719738 1.71875 26.0625 12.375988 26.0625 25.5 C 26.0625 32.977454 29.538325 39.612734 34.9375 43.96875 C 24.439951 49.943698 17.919149 62.196126 14.3125 75.65625 C 9.0380874 95.34065 30.224013 98.21875 49.84375 98.21875 C 69.463486 98.21875 90.549327 94.96715 85.375 75.65625 C 81.693381 61.916246 75.224585 49.827177 64.8125 43.9375 C 70.181573 39.580662 73.59375 32.953205 73.59375 25.5 C 73.59375 12.375988 62.967762 1.71875 49.84375 1.71875 z "
        transform="translate(0,952.36218)"
-       id="left" />
+       id="right" />
     <path
        style="opacity:1;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.73577702;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 51.28696,1001.834 0,-46.98372 1.434151,0.16768 c 5.155008,0.60274 9.462857,2.72154 12.938257,6.36366 4.74393,4.9715 6.87913,11.35611 6.16464,18.43328 -0.53702,5.31935 -3.09008,10.59498 -6.83833,14.13074 l -1.94072,1.83069 3.04083,2.20427 c 3.58084,2.5957 7.18975,6.4912 9.55296,10.3116 4.89572,7.9144 9.23593,21.4918 8.50487,26.6055 -0.81312,5.6877 -5.43872,9.6977 -13.62216,11.8093 -3.80822,0.9826 -7.68056,1.4713 -14.763321,1.8633 l -4.471177,0.2474 0,-46.9837 z"
-       id="right"
+       id="left"
        inkscape:connector-curvature="0" />
     <path
        style="display:inline;fill:url(#linearGradient3);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3.77952756;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"

cockatrice/resources/usericons/pawn_judge_double.svg

@@ -321,11 +321,11 @@
        style="fill-opacity:1;stroke:black;stroke-width:2.78220296;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
        d="M 49.84375 1.71875 C 36.719738 1.71875 26.0625 12.375988 26.0625 25.5 C 26.0625 32.977454 29.538325 39.612734 34.9375 43.96875 C 24.439951 49.943698 17.919149 62.196126 14.3125 75.65625 C 9.0380874 95.34065 30.224013 98.21875 49.84375 98.21875 C 69.463486 98.21875 90.549327 94.96715 85.375 75.65625 C 81.693381 61.916246 75.224585 49.827177 64.8125 43.9375 C 70.181573 39.580662 73.59375 32.953205 73.59375 25.5 C 73.59375 12.375988 62.967762 1.71875 49.84375 1.71875 z "
        transform="translate(0,952.36218)"
-       id="left" />
+       id="right" />
     <path
        style="opacity:1;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.73577702;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 51.28696,1001.834 0,-46.98372 1.434151,0.16768 c 5.155008,0.60274 9.462857,2.72154 12.938257,6.36366 4.74393,4.9715 6.87913,11.35611 6.16464,18.43328 -0.53702,5.31935 -3.09008,10.59498 -6.83833,14.13074 l -1.94072,1.83069 3.04083,2.20427 c 3.58084,2.5957 7.18975,6.4912 9.55296,10.3116 4.89572,7.9144 9.23593,21.4918 8.50487,26.6055 -0.81312,5.6877 -5.43872,9.6977 -13.62216,11.8093 -3.80822,0.9826 -7.68056,1.4713 -14.763321,1.8633 l -4.471177,0.2474 0,-46.9837 z"
-       id="right"
+       id="left"
        inkscape:connector-curvature="0" />
     <path
        d="m 46.656521,12.167234 18.055171,18.054184 a 6.6081919,6.6078288 0 0 1 -0.126303,9.352065 6.6804126,6.6800456 0 0 1 -8.233169,1.011048 l -7.944268,7.943843 6.463762,6.445343 a 6.9331851,6.9328042 0 0 1 5.741536,2.022073 l 28.057729,28.092294 a 6.9962797,6.9958953 0 0 1 -9.894222,9.893685 L 50.719018,66.907526 A 7.0595711,7.0591833 0 0 1 49.18433,59.270613 l -5.741527,-5.741238 -7.944298,7.943843 A 6.716523,6.7161541 0 0 1 25.134866,69.832263 L 7.079684,51.778091 a 6.716523,6.7161541 0 0 1 8.39566,-10.345064 L 36.31101,20.59853 a 6.716523,6.7161541 0 0 1 10.345612,-8.431329 z"

cockatrice/resources/usericons/pawn_vip_double.svg

@@ -340,11 +340,11 @@
        style="fill-opacity:1;stroke:black;stroke-width:2.78220296;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
        d="M 49.84375 1.71875 C 36.719738 1.71875 26.0625 12.375988 26.0625 25.5 C 26.0625 32.977454 29.538325 39.612734 34.9375 43.96875 C 24.439951 49.943698 17.919149 62.196126 14.3125 75.65625 C 9.0380874 95.34065 30.224013 98.21875 49.84375 98.21875 C 69.463486 98.21875 90.549327 94.96715 85.375 75.65625 C 81.693381 61.916246 75.224585 49.827177 64.8125 43.9375 C 70.181573 39.580662 73.59375 32.953205 73.59375 25.5 C 73.59375 12.375988 62.967762 1.71875 49.84375 1.71875 z "
        transform="translate(0,952.36218)"
-       id="left" />
+       id="right" />
     <path
        style="opacity:1;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.73577702;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 51.28696,1001.834 0,-46.98372 1.434151,0.16768 c 5.155008,0.60274 9.462857,2.72154 12.938257,6.36366 4.74393,4.9715 6.87913,11.35611 6.16464,18.43328 -0.53702,5.31935 -3.09008,10.59498 -6.83833,14.13074 l -1.94072,1.83069 3.04083,2.20427 c 3.58084,2.5957 7.18975,6.4912 9.55296,10.3116 4.89572,7.9144 9.23593,21.4918 8.50487,26.6055 -0.81312,5.6877 -5.43872,9.6977 -13.62216,11.8093 -3.80822,0.9826 -7.68056,1.4713 -14.763321,1.8633 l -4.471177,0.2474 0,-46.9837 z"
-       id="right"
+       id="left"
        inkscape:connector-curvature="0" />
     <path
        sodipodi:type="star"

cockatrice/src/client/network/interfaces/deck_stats_interface.cpp

@@ -2,13 +2,13 @@
 
 #include <QDesktopServices>
 #include <QMessageBox>
+#include <QNetworkAccessManager>
 #include <QNetworkReply>
 #include <QNetworkRequest>
 #include <QRegularExpression>
 #include <QUrlQuery>
 #include <libcockatrice/deck_list/deck_list.h>
-#include <libcockatrice/deck_list/tree/deck_list_card_node.h>
-#include <version_string.h>
+#include <libcockatrice/deck_list/deck_list_card_node.h>
 
 DeckStatsInterface::DeckStatsInterface(CardDatabase &_cardDatabase, QObject *parent)
     : QObject(parent), cardDatabase(_cardDatabase)
@@ -63,7 +63,6 @@ void DeckStatsInterface::analyzeDeck(DeckList *deck)
 
     QNetworkRequest request(QUrl("https://deckstats.net/index.php"));
     request.setHeader(QNetworkRequest::ContentTypeHeader, "application/x-www-form-urlencoded");
-    request.setHeader(QNetworkRequest::UserAgentHeader, QString("Cockatrice %1").arg(VERSION_STRING));
 
     manager->post(request, data);
 }

cockatrice/src/client/network/interfaces/deck_stats_interface.h

@@ -7,6 +7,7 @@
 #ifndef DECKSTATS_INTERFACE_H
 #define DECKSTATS_INTERFACE_H
 
+#include <QObject>
 #include <libcockatrice/card/database/card_database.h>
 #include <libcockatrice/deck_list/deck_list.h>
 

cockatrice/src/client/network/interfaces/tapped_out_interface.cpp

@@ -2,13 +2,13 @@
 
 #include <QDesktopServices>
 #include <QMessageBox>
+#include <QNetworkAccessManager>
 #include <QNetworkReply>
 #include <QNetworkRequest>
 #include <QRegularExpression>
 #include <QUrlQuery>
 #include <libcockatrice/deck_list/deck_list.h>
-#include <libcockatrice/deck_list/tree/deck_list_card_node.h>
-#include <version_string.h>
+#include <libcockatrice/deck_list/deck_list_card_node.h>
 
 TappedOutInterface::TappedOutInterface(CardDatabase &_cardDatabase, QObject *parent)
     : QObject(parent), cardDatabase(_cardDatabase)
@@ -88,7 +88,6 @@ void TappedOutInterface::analyzeDeck(DeckList *deck)
 
     QNetworkRequest request(QUrl("https://tappedout.net/mtg-decks/paste/"));
     request.setHeader(QNetworkRequest::ContentTypeHeader, "application/x-www-form-urlencoded");
-    request.setHeader(QNetworkRequest::UserAgentHeader, QString("Cockatrice %1").arg(VERSION_STRING));
 
     manager->post(request, data);
 }

cockatrice/src/client/network/interfaces/tapped_out_interface.h

@@ -7,6 +7,8 @@
 #ifndef TAPPEDOUT_INTERFACE_H
 #define TAPPEDOUT_INTERFACE_H
 
+#include <QLoggingCategory>
+#include <QObject>
 #include <libcockatrice/card/database/card_database.h>
 #include <libcockatrice/deck_list/deck_list.h>
 

cockatrice/src/client/network/parsers/interface_json_deck_parser.h

@@ -6,8 +6,6 @@
 
 #ifndef INTERFACE_JSON_DECK_PARSER_H
 #define INTERFACE_JSON_DECK_PARSER_H
-
-#include "../../../interface/deck_loader/card_node_function.h"
 #include "../../../interface/deck_loader/deck_loader.h"
 
 #include <QJsonArray>
@@ -18,21 +16,21 @@ class IJsonDeckParser
 public:
     virtual ~IJsonDeckParser() = default;
 
-    virtual DeckList parse(const QJsonObject &obj) = 0;
+    virtual DeckLoader *parse(const QJsonObject &obj) = 0;
 };
 
 class ArchidektJsonParser : public IJsonDeckParser
 {
 public:
-    DeckList parse(const QJsonObject &obj) override
+    DeckLoader *parse(const QJsonObject &obj) override
     {
-        DeckList deckList;
+        DeckLoader *loader = new DeckLoader(nullptr);
 
         QString deckName = obj.value("name").toString();
         QString deckDescription = obj.value("description").toString();
 
-        deckList.setName(deckName);
-        deckList.setComments(deckDescription);
+        loader->getDeckList()->setName(deckName);
+        loader->getDeckList()->setComments(deckDescription);
 
         QString outputText;
         QTextStream outStream(&outputText);
@@ -49,25 +47,25 @@ public:
             outStream << quantity << ' ' << cardName << " (" << setName << ") " << collectorNumber << '\n';
         }
 
-        deckList.loadFromStream_Plain(outStream, false);
-        deckList.forEachCard(CardNodeFunction::ResolveProviderId());
+        loader->getDeckList()->loadFromStream_Plain(outStream, false);
+        DeckLoader::resolveSetNameAndNumberToProviderID(loader->getDeckList());
 
-        return deckList;
+        return loader;
     }
 };
 
 class MoxfieldJsonParser : public IJsonDeckParser
 {
 public:
-    DeckList parse(const QJsonObject &obj) override
+    DeckLoader *parse(const QJsonObject &obj) override
     {
-        DeckList deckList;
+        DeckLoader *loader = new DeckLoader(nullptr);
 
         QString deckName = obj.value("name").toString();
         QString deckDescription = obj.value("description").toString();
 
-        deckList.setName(deckName);
-        deckList.setComments(deckDescription);
+        loader->getDeckList()->setName(deckName);
+        loader->getDeckList()->setComments(deckDescription);
 
         QString outputText;
         QTextStream outStream(&outputText);
@@ -96,8 +94,8 @@ public:
             outStream << quantity << ' ' << cardName << " (" << setName << ") " << collectorNumber << '\n';
         }
 
-        deckList.loadFromStream_Plain(outStream, false);
-        deckList.forEachCard(CardNodeFunction::ResolveProviderId());
+        loader->getDeckList()->loadFromStream_Plain(outStream, false);
+        DeckLoader::resolveSetNameAndNumberToProviderID(loader->getDeckList());
 
         QJsonObject commandersObj = obj.value("commanders").toObject();
         if (!commandersObj.isEmpty()) {
@@ -108,12 +106,12 @@ public:
                 QString collectorNumber = cardData.value("cn").toString();
                 QString providerId = cardData.value("scryfall_id").toString();
 
-                deckList.setBannerCard({commanderName, providerId});
-                deckList.addCard(commanderName, DECK_ZONE_MAIN, -1, setName, collectorNumber, providerId);
+                loader->getDeckList()->setBannerCard({commanderName, providerId});
+                loader->getDeckList()->addCard(commanderName, DECK_ZONE_MAIN, -1, setName, collectorNumber, providerId);
             }
         }
 
-        return deckList;
+        return loader;
     }
 };
 

cockatrice/src/client/network/update/card_spoiler/spoiler_background_updater.cpp

@@ -4,17 +4,18 @@
 #include "../../../../main.h"
 #include "../../../settings/cache_settings.h"
 
+#include <QApplication>
 #include <QCryptographicHash>
 #include <QDateTime>
 #include <QDebug>
 #include <QFile>
 #include <QLocale>
+#include <QMessageBox>
 #include <QNetworkReply>
 #include <QUrl>
 #include <QtConcurrent>
 #include <libcockatrice/card/database/card_database.h>
 #include <libcockatrice/card/database/card_database_manager.h>
-#include <version_string.h>
 
 #define SPOILERS_STATUS_URL "https://raw.githubusercontent.com/Cockatrice/Magic-Spoiler/files/SpoilerSeasonEnabled"
 #define SPOILERS_URL "https://raw.githubusercontent.com/Cockatrice/Magic-Spoiler/files/spoiler.xml"
@@ -40,9 +41,7 @@ void SpoilerBackgroundUpdater::startSpoilerDownloadProcess(QString url, bool sav
 void SpoilerBackgroundUpdater::downloadFromURL(QUrl url, bool saveResults)
 {
     auto *nam = new QNetworkAccessManager(this);
-    auto request = QNetworkRequest(url);
-    request.setHeader(QNetworkRequest::UserAgentHeader, QString("Cockatrice %1").arg(VERSION_STRING));
-    QNetworkReply *reply = nam->get(request);
+    QNetworkReply *reply = nam->get(QNetworkRequest(url));
 
     if (saveResults) {
         // This will write out to the file (used for spoiler.xml)

cockatrice/src/client/network/update/card_spoiler/spoiler_background_updater.h

@@ -22,7 +22,7 @@ public:
     inline QString getCardUpdaterBinaryName()
     {
         return "oracle";
-    }
+    };
     QByteArray getHash(const QString fileName);
     QByteArray getHash(QByteArray data);
     static bool deleteSpoilerFile();

cockatrice/src/client/network/update/client/update_downloader.cpp

@@ -1,5 +1,6 @@
 #include "update_downloader.h"
 
+#include <QDebug>
 #include <QUrl>
 
 UpdateDownloader::UpdateDownloader(QObject *parent) : QObject(parent), response(nullptr)

cockatrice/src/client/network/update/client/update_downloader.h

@@ -7,7 +7,9 @@
 #ifndef COCKATRICE_UPDATEDOWNLOADER_H
 #define COCKATRICE_UPDATEDOWNLOADER_H
 
+#include <QDate>
 #include <QObject>
+#include <QUrl>
 #include <QtNetwork>
 
 class UpdateDownloader : public QObject

cockatrice/src/client/settings/cache_settings.cpp

@@ -261,7 +261,6 @@ SettingsCache::SettingsCache()
     doubleClickToPlay = settings->value("interface/doubleclicktoplay", true).toBool();
     clickPlaysAllSelected = settings->value("interface/clickPlaysAllSelected", true).toBool();
     playToStack = settings->value("interface/playtostack", true).toBool();
-    doNotDeleteArrowsInSubPhases = settings->value("interface/doNotDeleteArrowsInSubPhases", true).toBool();
     startingHandSize = settings->value("interface/startinghandsize", 7).toInt();
     annotateTokens = settings->value("interface/annotatetokens", false).toBool();
     tabGameSplitterSizes = settings->value("interface/tabgame_splittersizes").toByteArray();
@@ -310,15 +309,10 @@ SettingsCache::SettingsCache()
         settings->value("interface/visualdeckstorageselectionanimation", true).toBool();
     defaultDeckEditorType = settings->value("interface/defaultDeckEditorType", 1).toInt();
     visualDatabaseDisplayFilterToMostRecentSetsEnabled =
-        settings->value("interface/visualdatabasedisplayfiltertomostrecentsetsenabled", false).toBool();
+        settings->value("interface/visualdatabasedisplayfiltertomostrecentsetsenabled", true).toBool();
     visualDatabaseDisplayFilterToMostRecentSetsAmount =
         settings->value("interface/visualdatabasedisplayfiltertomostrecentsetsamount", 10).toInt();
     visualDeckEditorSampleHandSize = settings->value("interface/visualdeckeditorsamplehandsize", 7).toInt();
-    visualDeckEditorCardSize = settings->value("interface/visualdeckeditorcardsize", 100).toInt();
-    visualDatabaseDisplayCardSize = settings->value("interface/visualdatabasedisplaycardsize", 100).toInt();
-    edhrecCardSize = settings->value("interface/edhreccardsize", 100).toInt();
-    archidektPreviewSize = settings->value("interface/archidektpreviewsize", 100).toInt();
-
     horizontalHand = settings->value("hand/horizontal", true).toBool();
     invertVerticalCoordinate = settings->value("table/invert_vertical", false).toBool();
     minPlayersForMultiColumnLayout = settings->value("interface/min_players_multicolumn", 4).toInt();
@@ -670,12 +664,6 @@ void SettingsCache::setPlayToStack(QT_STATE_CHANGED_T _playToStack)
     settings->setValue("interface/playtostack", playToStack);
 }
 
-void SettingsCache::setDoNotDeleteArrowsInSubPhases(QT_STATE_CHANGED_T _doNotDeleteArrowsInSubPhases)
-{
-    doNotDeleteArrowsInSubPhases = static_cast<bool>(_doNotDeleteArrowsInSubPhases);
-    settings->setValue("interface/doNotDeleteArrowsInSubPhases", doNotDeleteArrowsInSubPhases);
-}
-
 void SettingsCache::setStartingHandSize(int _startingHandSize)
 {
     startingHandSize = _startingHandSize;
@@ -868,34 +856,6 @@ void SettingsCache::setVisualDeckStorageSelectionAnimation(QT_STATE_CHANGED_T va
     emit visualDeckStorageSelectionAnimationChanged(visualDeckStorageSelectionAnimation);
 }
 
-void SettingsCache::setVisualDeckEditorCardSize(int _visualDeckEditorCardSize)
-{
-    visualDeckEditorCardSize = _visualDeckEditorCardSize;
-    settings->setValue("interface/visualdeckeditorcardsize", visualDeckEditorCardSize);
-    emit visualDeckEditorCardSizeChanged();
-}
-
-void SettingsCache::setVisualDatabaseDisplayCardSize(int _visualDatabaseDisplayCardSize)
-{
-    visualDatabaseDisplayCardSize = _visualDatabaseDisplayCardSize;
-    settings->setValue("interface/visualdatabasedisplaycardsize", visualDatabaseDisplayCardSize);
-    emit visualDatabaseDisplayCardSizeChanged();
-}
-
-void SettingsCache::setEDHRecCardSize(int _edhrecCardSize)
-{
-    edhrecCardSize = _edhrecCardSize;
-    settings->setValue("interface/edhreccardsize", edhrecCardSize);
-    emit edhRecCardSizeChanged();
-}
-
-void SettingsCache::setArchidektPreviewCardSize(int _archidektPreviewCardSize)
-{
-    archidektPreviewSize = _archidektPreviewCardSize;
-    settings->setValue("interface/archidektpreviewsize", archidektPreviewSize);
-    emit archidektPreviewSizeChanged();
-}
-
 void SettingsCache::setDefaultDeckEditorType(int value)
 {
     defaultDeckEditorType = value;

cockatrice/src/client/settings/cache_settings.h

@@ -11,6 +11,7 @@
 
 #include <QDate>
 #include <QLoggingCategory>
+#include <QObject>
 #include <QSize>
 #include <QStringList>
 #include <libcockatrice/interfaces/interface_card_database_path_provider.h>
@@ -166,10 +167,6 @@ signals:
     void visualDatabaseDisplayFilterToMostRecentSetsEnabledChanged(bool enabled);
     void visualDatabaseDisplayFilterToMostRecentSetsAmountChanged(int amount);
     void visualDeckEditorSampleHandSizeAmountChanged(int amount);
-    void visualDeckEditorCardSizeChanged();
-    void visualDatabaseDisplayCardSizeChanged();
-    void edhRecCardSizeChanged();
-    void archidektPreviewSizeChanged();
     void horizontalHandChanged();
     void handJustificationChanged();
     void invertVerticalCoordinateChanged();
@@ -231,7 +228,6 @@ private:
     bool doubleClickToPlay;
     bool clickPlaysAllSelected;
     bool playToStack;
-    bool doNotDeleteArrowsInSubPhases;
     int startingHandSize;
     bool annotateTokens;
     QByteArray tabGameSplitterSizes;
@@ -253,10 +249,6 @@ private:
     QStringList visualDeckStorageDefaultTagsList;
     bool visualDeckStorageSearchFolderNames;
     int visualDeckStorageCardSize;
-    int visualDeckEditorCardSize;
-    int visualDatabaseDisplayCardSize;
-    int edhrecCardSize;
-    int archidektPreviewSize;
     bool visualDeckStorageDrawUnusedColorIdentities;
     int visualDeckStorageUnusedColorIdentitiesOpacity;
     int visualDeckStorageTooltipType;
@@ -324,8 +316,8 @@ private:
     int keepalive;
     int timeout;
     void translateLegacySettings();
-    [[nodiscard]] QString getSafeConfigPath(QString configEntry, QString defaultPath) const;
-    [[nodiscard]] QString getSafeConfigFilePath(QString configEntry, QString defaultPath) const;
+    QString getSafeConfigPath(QString configEntry, QString defaultPath) const;
+    QString getSafeConfigFilePath(QString configEntry, QString defaultPath) const;
     void loadPaths();
     bool rememberGameSettings;
     QList<ReleaseChannel *> releaseChannels;
@@ -337,137 +329,137 @@ public:
     SettingsCache();
     QString getDataPath();
     QString getSettingsPath();
-    [[nodiscard]] QString getCachePath() const;
-    [[nodiscard]] QString getNetworkCachePath() const;
-    [[nodiscard]] const QByteArray &getMainWindowGeometry() const
+    QString getCachePath() const;
+    QString getNetworkCachePath() const;
+    const QByteArray &getMainWindowGeometry() const
     {
         return mainWindowGeometry;
     }
-    [[nodiscard]] const QByteArray &getTokenDialogGeometry() const
+    const QByteArray &getTokenDialogGeometry() const
     {
         return tokenDialogGeometry;
     }
-    [[nodiscard]] const QByteArray &getSetsDialogGeometry() const
+    const QByteArray &getSetsDialogGeometry() const
     {
         return setsDialogGeometry;
     }
-    [[nodiscard]] QString getLang() const
+    QString getLang() const
     {
         return lang;
     }
-    [[nodiscard]] QString getDeckPath() const
+    QString getDeckPath() const
     {
         return deckPath;
     }
-    [[nodiscard]] QString getFiltersPath() const
+    QString getFiltersPath() const
     {
         return filtersPath;
     }
-    [[nodiscard]] QString getReplaysPath() const
+    QString getReplaysPath() const
     {
         return replaysPath;
     }
-    [[nodiscard]] QString getThemesPath() const
+    QString getThemesPath() const
     {
         return themesPath;
     }
-    [[nodiscard]] QString getPicsPath() const
+    QString getPicsPath() const
     {
         return picsPath;
     }
-    [[nodiscard]] QString getRedirectCachePath() const
+    QString getRedirectCachePath() const
     {
         return redirectCachePath;
     }
-    [[nodiscard]] QString getCustomPicsPath() const
+    QString getCustomPicsPath() const
     {
         return customPicsPath;
     }
-    [[nodiscard]] QString getCustomCardDatabasePath() const override
+    QString getCustomCardDatabasePath() const override
     {
         return customCardDatabasePath;
     }
-    [[nodiscard]] QString getCardDatabasePath() const override
+    QString getCardDatabasePath() const override
     {
         return cardDatabasePath;
     }
-    [[nodiscard]] QString getSpoilerCardDatabasePath() const override
+    QString getSpoilerCardDatabasePath() const override
     {
         return spoilerDatabasePath;
     }
-    [[nodiscard]] QString getTokenDatabasePath() const override
+    QString getTokenDatabasePath() const override
     {
         return tokenDatabasePath;
     }
-    [[nodiscard]] QString getThemeName() const
+    QString getThemeName() const
     {
         return themeName;
     }
-    [[nodiscard]] QString getHomeTabBackgroundSource() const
+    QString getHomeTabBackgroundSource() const
     {
         return homeTabBackgroundSource;
     }
-    [[nodiscard]] int getHomeTabBackgroundShuffleFrequency() const
+    int getHomeTabBackgroundShuffleFrequency() const
     {
         return homeTabBackgroundShuffleFrequency;
     }
-    [[nodiscard]] bool getTabVisualDeckStorageOpen() const
+    bool getTabVisualDeckStorageOpen() const
     {
         return tabVisualDeckStorageOpen;
     }
-    [[nodiscard]] bool getTabServerOpen() const
+    bool getTabServerOpen() const
     {
         return tabServerOpen;
     }
-    [[nodiscard]] bool getTabAccountOpen() const
+    bool getTabAccountOpen() const
     {
         return tabAccountOpen;
     }
-    [[nodiscard]] bool getTabDeckStorageOpen() const
+    bool getTabDeckStorageOpen() const
     {
         return tabDeckStorageOpen;
     }
-    [[nodiscard]] bool getTabReplaysOpen() const
+    bool getTabReplaysOpen() const
     {
         return tabReplaysOpen;
     }
-    [[nodiscard]] bool getTabAdminOpen() const
+    bool getTabAdminOpen() const
     {
         return tabAdminOpen;
     }
-    [[nodiscard]] bool getTabLogOpen() const
+    bool getTabLogOpen() const
     {
         return tabLogOpen;
     }
-    [[nodiscard]] QString getChatMentionColor() const
+    QString getChatMentionColor() const
     {
         return chatMentionColor;
     }
-    [[nodiscard]] QString getChatHighlightColor() const
+    QString getChatHighlightColor() const
     {
         return chatHighlightColor;
     }
-    [[nodiscard]] bool getPicDownload() const
+    bool getPicDownload() const
     {
         return picDownload;
     }
-    [[nodiscard]] bool getShowStatusBar() const
+    bool getShowStatusBar() const
     {
         return showStatusBar;
     }
-    [[nodiscard]] bool getNotificationsEnabled() const
+    bool getNotificationsEnabled() const
     {
         return notificationsEnabled;
     }
-    [[nodiscard]] bool getSpectatorNotificationsEnabled() const
+    bool getSpectatorNotificationsEnabled() const
     {
         return spectatorNotificationsEnabled;
     }
-    [[nodiscard]] bool getBuddyConnectNotificationsEnabled() const
+    bool getBuddyConnectNotificationsEnabled() const
     {
         return buddyConnectNotificationsEnabled;
     }
-    [[nodiscard]] bool getCheckUpdatesOnStartup() const
+    bool getCheckUpdatesOnStartup() const
     {
         return checkUpdatesOnStartup;
     }
@@ -479,263 +471,243 @@ public:
     {
         return startupCardUpdateCheckAlwaysUpdate;
     }
-    [[nodiscard]] int getCardUpdateCheckInterval() const
+    int getCardUpdateCheckInterval() const
     {
         return cardUpdateCheckInterval;
     }
-    [[nodiscard]] QDate getLastCardUpdateCheck() const
+    QDate getLastCardUpdateCheck() const
     {
         return lastCardUpdateCheck;
     }
-    [[nodiscard]] bool getCardUpdateCheckRequired() const
+    bool getCardUpdateCheckRequired() const
     {
         return getLastCardUpdateCheck().daysTo(QDateTime::currentDateTime().date()) >= getCardUpdateCheckInterval() &&
                getLastCardUpdateCheck() != QDateTime::currentDateTime().date();
     }
-    [[nodiscard]] bool getNotifyAboutUpdates() const override
+    bool getNotifyAboutUpdates() const override
     {
         return notifyAboutUpdates;
     }
-    [[nodiscard]] bool getNotifyAboutNewVersion() const
+    bool getNotifyAboutNewVersion() const
     {
         return notifyAboutNewVersion;
     }
-    [[nodiscard]] bool getShowTipsOnStartup() const
+    bool getShowTipsOnStartup() const
     {
         return showTipsOnStartup;
     }
-    [[nodiscard]] QList<int> getSeenTips() const
+    QList<int> getSeenTips() const
     {
         return seenTips;
     }
-    [[nodiscard]] int getUpdateReleaseChannelIndex() const
+    int getUpdateReleaseChannelIndex() const
     {
         return updateReleaseChannel;
     }
-    [[nodiscard]] ReleaseChannel *getUpdateReleaseChannel() const
+    ReleaseChannel *getUpdateReleaseChannel() const
     {
         return releaseChannels.at(qMax(0, updateReleaseChannel));
     }
-    [[nodiscard]] QList<ReleaseChannel *> getUpdateReleaseChannels() const
+    QList<ReleaseChannel *> getUpdateReleaseChannels() const
     {
         return releaseChannels;
     }
 
-    [[nodiscard]] bool getDoubleClickToPlay() const
+    bool getDoubleClickToPlay() const
     {
         return doubleClickToPlay;
     }
-    [[nodiscard]] bool getClickPlaysAllSelected() const
+    bool getClickPlaysAllSelected() const
     {
         return clickPlaysAllSelected;
     }
-    [[nodiscard]] bool getPlayToStack() const
+    bool getPlayToStack() const
     {
         return playToStack;
     }
-    [[nodiscard]] bool getDoNotDeleteArrowsInSubPhases() const
-    {
-        return doNotDeleteArrowsInSubPhases;
-    }
-    [[nodiscard]] int getStartingHandSize() const
+    int getStartingHandSize() const
     {
         return startingHandSize;
     }
-    [[nodiscard]] bool getAnnotateTokens() const
+    bool getAnnotateTokens() const
     {
         return annotateTokens;
     }
-    [[nodiscard]] QByteArray getTabGameSplitterSizes() const
+    QByteArray getTabGameSplitterSizes() const
     {
         return tabGameSplitterSizes;
     }
-    [[nodiscard]] bool getShowShortcuts() const
+    bool getShowShortcuts() const
     {
         return showShortcuts;
     }
-    [[nodiscard]] bool getDisplayCardNames() const
+    bool getDisplayCardNames() const
     {
         return displayCardNames;
     }
-    [[nodiscard]] bool getOverrideAllCardArtWithPersonalPreference() const
+    bool getOverrideAllCardArtWithPersonalPreference() const
     {
         return overrideAllCardArtWithPersonalPreference;
     }
-    [[nodiscard]] bool getBumpSetsWithCardsInDeckToTop() const
+    bool getBumpSetsWithCardsInDeckToTop() const
     {
         return bumpSetsWithCardsInDeckToTop;
     }
-    [[nodiscard]] int getPrintingSelectorSortOrder() const
+    int getPrintingSelectorSortOrder() const
     {
         return printingSelectorSortOrder;
     }
-    [[nodiscard]] int getPrintingSelectorCardSize() const
+    int getPrintingSelectorCardSize() const
     {
         return printingSelectorCardSize;
     }
-    [[nodiscard]] bool getIncludeRebalancedCards() const
+    bool getIncludeRebalancedCards() const
     {
         return includeRebalancedCards;
     }
-    [[nodiscard]] bool getPrintingSelectorNavigationButtonsVisible() const
+    bool getPrintingSelectorNavigationButtonsVisible() const
     {
         return printingSelectorNavigationButtonsVisible;
     }
-    [[nodiscard]] bool getDeckEditorBannerCardComboBoxVisible() const
+    bool getDeckEditorBannerCardComboBoxVisible() const
     {
         return deckEditorBannerCardComboBoxVisible;
     }
-    [[nodiscard]] bool getDeckEditorTagsWidgetVisible() const
+    bool getDeckEditorTagsWidgetVisible() const
     {
         return deckEditorTagsWidgetVisible;
     }
-    [[nodiscard]] int getVisualDeckStorageSortingOrder() const
+    int getVisualDeckStorageSortingOrder() const
     {
         return visualDeckStorageSortingOrder;
     }
-    [[nodiscard]] bool getVisualDeckStorageShowFolders() const
+    bool getVisualDeckStorageShowFolders() const
     {
         return visualDeckStorageShowFolders;
     }
-    [[nodiscard]] bool getVisualDeckStorageShowTagFilter() const
+    bool getVisualDeckStorageShowTagFilter() const
     {
         return visualDeckStorageShowTagFilter;
     }
-    [[nodiscard]] QStringList getVisualDeckStorageDefaultTagsList() const
+    QStringList getVisualDeckStorageDefaultTagsList() const
     {
         return visualDeckStorageDefaultTagsList;
     }
-    [[nodiscard]] bool getVisualDeckStorageSearchFolderNames() const
+    bool getVisualDeckStorageSearchFolderNames() const
     {
         return visualDeckStorageSearchFolderNames;
     }
-    [[nodiscard]] bool getVisualDeckStorageShowBannerCardComboBox() const
+    bool getVisualDeckStorageShowBannerCardComboBox() const
     {
         return visualDeckStorageShowBannerCardComboBox;
     }
-    [[nodiscard]] bool getVisualDeckStorageShowTagsOnDeckPreviews() const
+    bool getVisualDeckStorageShowTagsOnDeckPreviews() const
     {
         return visualDeckStorageShowTagsOnDeckPreviews;
     }
-    [[nodiscard]] int getVisualDeckStorageCardSize() const
+    int getVisualDeckStorageCardSize() const
     {
         return visualDeckStorageCardSize;
     }
-    [[nodiscard]] bool getVisualDeckStorageDrawUnusedColorIdentities() const
+    bool getVisualDeckStorageDrawUnusedColorIdentities() const
     {
         return visualDeckStorageDrawUnusedColorIdentities;
     }
-    [[nodiscard]] int getVisualDeckStorageUnusedColorIdentitiesOpacity() const
+    int getVisualDeckStorageUnusedColorIdentitiesOpacity() const
     {
         return visualDeckStorageUnusedColorIdentitiesOpacity;
     }
-    [[nodiscard]] int getVisualDeckStorageTooltipType() const
+    int getVisualDeckStorageTooltipType() const
     {
         return visualDeckStorageTooltipType;
     }
-    [[nodiscard]] bool getVisualDeckStoragePromptForConversion() const
+    bool getVisualDeckStoragePromptForConversion() const
     {
         return visualDeckStoragePromptForConversion;
     }
-    [[nodiscard]] bool getVisualDeckStorageAlwaysConvert() const
+    bool getVisualDeckStorageAlwaysConvert() const
     {
         return visualDeckStorageAlwaysConvert;
     }
-    [[nodiscard]] bool getVisualDeckStorageInGame() const
+    bool getVisualDeckStorageInGame() const
     {
         return visualDeckStorageInGame;
     }
-    [[nodiscard]] bool getVisualDeckStorageSelectionAnimation() const
+    bool getVisualDeckStorageSelectionAnimation() const
     {
         return visualDeckStorageSelectionAnimation;
     }
-    [[nodiscard]] int getVisualDeckEditorCardSize() const
-    {
-        return visualDeckEditorCardSize;
-    }
-    [[nodiscard]] int getVisualDatabaseDisplayCardSize() const
-    {
-        return visualDatabaseDisplayCardSize;
-    }
-    [[nodiscard]] int getEDHRecCardSize() const
-    {
-        return edhrecCardSize;
-    }
-    [[nodiscard]] int getArchidektPreviewSize() const
-    {
-        return archidektPreviewSize;
-    }
-    [[nodiscard]] int getDefaultDeckEditorType() const
+    int getDefaultDeckEditorType() const
     {
         return defaultDeckEditorType;
     }
-    [[nodiscard]] bool getVisualDatabaseDisplayFilterToMostRecentSetsEnabled() const
+    bool getVisualDatabaseDisplayFilterToMostRecentSetsEnabled() const
     {
         return visualDatabaseDisplayFilterToMostRecentSetsEnabled;
     }
-    [[nodiscard]] int getVisualDatabaseDisplayFilterToMostRecentSetsAmount() const
+    int getVisualDatabaseDisplayFilterToMostRecentSetsAmount() const
     {
         return visualDatabaseDisplayFilterToMostRecentSetsAmount;
     }
-    [[nodiscard]] int getVisualDeckEditorSampleHandSize() const
+    int getVisualDeckEditorSampleHandSize() const
     {
         return visualDeckEditorSampleHandSize;
     }
-    [[nodiscard]] bool getHorizontalHand() const
+    bool getHorizontalHand() const
     {
         return horizontalHand;
     }
-    [[nodiscard]] bool getInvertVerticalCoordinate() const
+    bool getInvertVerticalCoordinate() const
     {
         return invertVerticalCoordinate;
     }
-    [[nodiscard]] int getMinPlayersForMultiColumnLayout() const
+    int getMinPlayersForMultiColumnLayout() const
     {
         return minPlayersForMultiColumnLayout;
     }
-    [[nodiscard]] bool getTapAnimation() const
+    bool getTapAnimation() const
     {
         return tapAnimation;
     }
-    [[nodiscard]] bool getAutoRotateSidewaysLayoutCards() const
+    bool getAutoRotateSidewaysLayoutCards() const
     {
         return autoRotateSidewaysLayoutCards;
     }
-    [[nodiscard]] bool getOpenDeckInNewTab() const
+    bool getOpenDeckInNewTab() const
     {
         return openDeckInNewTab;
     }
-    [[nodiscard]] int getRewindBufferingMs() const
+    int getRewindBufferingMs() const
     {
         return rewindBufferingMs;
     }
-    [[nodiscard]] bool getChatMention() const
+    bool getChatMention() const
     {
         return chatMention;
     }
-    [[nodiscard]] bool getChatMentionCompleter() const
+    bool getChatMentionCompleter() const
     {
         return chatMentionCompleter;
     }
-    [[nodiscard]] bool getChatMentionForeground() const
+    bool getChatMentionForeground() const
     {
         return chatMentionForeground;
     }
-    [[nodiscard]] bool getChatHighlightForeground() const
+    bool getChatHighlightForeground() const
     {
         return chatHighlightForeground;
     }
     /**
      * Currently selected index for the `Group by X` QComboBox
      */
-    [[nodiscard]] int getZoneViewGroupByIndex() const
+    int getZoneViewGroupByIndex() const
     {
         return zoneViewGroupByIndex;
     }
     /**
      * Currently selected index for the `Sort by X` QComboBox
      */
-    [[nodiscard]] int getZoneViewSortByIndex() const
+    int getZoneViewSortByIndex() const
     {
         return zoneViewSortByIndex;
     }
@@ -743,136 +715,136 @@ public:
        Returns if the view should be sorted into pile view.
        @return zoneViewPileView if the view should be sorted into pile view.
      */
-    [[nodiscard]] bool getZoneViewPileView() const
+    bool getZoneViewPileView() const
     {
         return zoneViewPileView;
     }
-    [[nodiscard]] bool getSoundEnabled() const
+    bool getSoundEnabled() const
     {
         return soundEnabled;
     }
-    [[nodiscard]] QString getSoundThemeName() const
+    QString getSoundThemeName() const
     {
         return soundThemeName;
     }
-    [[nodiscard]] bool getIgnoreUnregisteredUsers() const
+    bool getIgnoreUnregisteredUsers() const
     {
         return ignoreUnregisteredUsers;
     }
-    [[nodiscard]] bool getIgnoreUnregisteredUserMessages() const
+    bool getIgnoreUnregisteredUserMessages() const
     {
         return ignoreUnregisteredUserMessages;
     }
-    [[nodiscard]] int getPixmapCacheSize() const
+    int getPixmapCacheSize() const
     {
         return pixmapCacheSize;
     }
-    [[nodiscard]] int getNetworkCacheSizeInMB() const
+    int getNetworkCacheSizeInMB() const
     {
         return networkCacheSize;
     }
-    [[nodiscard]] int getRedirectCacheTtl() const
+    int getRedirectCacheTtl() const
     {
         return redirectCacheTtl;
     }
-    [[nodiscard]] bool getScaleCards() const
+    bool getScaleCards() const
     {
         return scaleCards;
     }
-    [[nodiscard]] int getStackCardOverlapPercent() const
+    int getStackCardOverlapPercent() const
     {
         return verticalCardOverlapPercent;
     }
-    [[nodiscard]] bool getShowMessagePopup() const
+    bool getShowMessagePopup() const
     {
         return showMessagePopups;
     }
-    [[nodiscard]] bool getShowMentionPopup() const
+    bool getShowMentionPopup() const
     {
         return showMentionPopups;
     }
-    [[nodiscard]] bool getRoomHistory() const
+    bool getRoomHistory() const
     {
         return roomHistory;
     }
-    [[nodiscard]] bool getLeftJustified() const
+    bool getLeftJustified() const
     {
         return leftJustified;
     }
-    [[nodiscard]] int getMasterVolume() const
+    int getMasterVolume() const
     {
         return masterVolume;
     }
-    [[nodiscard]] int getCardInfoViewMode() const
+    int getCardInfoViewMode() const
     {
         return cardInfoViewMode;
     }
-    [[nodiscard]] QStringList getCountries() const;
-    [[nodiscard]] QString getHighlightWords() const
+    QStringList getCountries() const;
+    QString getHighlightWords() const
     {
         return highlightWords;
     }
-    [[nodiscard]] QString getGameDescription() const
+    QString getGameDescription() const
     {
         return gameDescription;
     }
-    [[nodiscard]] int getMaxPlayers() const
+    int getMaxPlayers() const
     {
         return maxPlayers;
     }
-    [[nodiscard]] QString getGameTypes() const
+    QString getGameTypes() const
     {
         return gameTypes;
     }
-    [[nodiscard]] bool getOnlyBuddies() const
+    bool getOnlyBuddies() const
     {
         return onlyBuddies;
     }
-    [[nodiscard]] bool getOnlyRegistered() const
+    bool getOnlyRegistered() const
     {
         return onlyRegistered;
     }
-    [[nodiscard]] bool getSpectatorsAllowed() const
+    bool getSpectatorsAllowed() const
     {
         return spectatorsAllowed;
     }
-    [[nodiscard]] bool getSpectatorsNeedPassword() const
+    bool getSpectatorsNeedPassword() const
     {
         return spectatorsNeedPassword;
     }
-    [[nodiscard]] bool getSpectatorsCanTalk() const
+    bool getSpectatorsCanTalk() const
     {
         return spectatorsCanTalk;
     }
-    [[nodiscard]] bool getSpectatorsCanSeeEverything() const
+    bool getSpectatorsCanSeeEverything() const
     {
         return spectatorsCanSeeEverything;
     }
-    [[nodiscard]] int getDefaultStartingLifeTotal() const
+    int getDefaultStartingLifeTotal() const
     {
         return defaultStartingLifeTotal;
     }
-    [[nodiscard]] bool getShareDecklistsOnLoad() const
+    bool getShareDecklistsOnLoad() const
     {
         return shareDecklistsOnLoad;
     }
-    [[nodiscard]] bool getCreateGameAsSpectator() const
+    bool getCreateGameAsSpectator() const
     {
         return createGameAsSpectator;
     }
-    [[nodiscard]] bool getRememberGameSettings() const
+    bool getRememberGameSettings() const
     {
         return rememberGameSettings;
     }
-    [[nodiscard]] int getKeepAlive() const override
+    int getKeepAlive() const override
     {
         return keepalive;
     }
-    [[nodiscard]] int getTimeOut() const override
+    int getTimeOut() const override
     {
         return timeout;
     }
-    [[nodiscard]] int getMaxFontSize() const
+    int getMaxFontSize() const
     {
         return maxFontSize;
     }
@@ -900,73 +872,73 @@ public:
     {
         return useTearOffMenus;
     }
-    [[nodiscard]] int getCardViewInitialRowsMax() const
+    int getCardViewInitialRowsMax() const
     {
         return cardViewInitialRowsMax;
     }
-    [[nodiscard]] int getCardViewExpandedRowsMax() const
+    int getCardViewExpandedRowsMax() const
     {
         return cardViewExpandedRowsMax;
     }
-    [[nodiscard]] bool getCloseEmptyCardView() const
+    bool getCloseEmptyCardView() const
     {
         return closeEmptyCardView;
     }
-    [[nodiscard]] bool getFocusCardViewSearchBar() const
+    bool getFocusCardViewSearchBar() const
     {
         return focusCardViewSearchBar;
     }
-    [[nodiscard]] ShortcutsSettings &shortcuts() const
+    ShortcutsSettings &shortcuts() const
     {
         return *shortcutsSettings;
     }
-    [[nodiscard]] CardDatabaseSettings *cardDatabase() const
+    CardDatabaseSettings *cardDatabase() const
     {
         return cardDatabaseSettings;
     }
-    [[nodiscard]] ServersSettings &servers() const
+    ServersSettings &servers() const
     {
         return *serversSettings;
     }
-    [[nodiscard]] MessageSettings &messages() const
+    MessageSettings &messages() const
     {
         return *messageSettings;
     }
-    [[nodiscard]] GameFiltersSettings &gameFilters() const
+    GameFiltersSettings &gameFilters() const
     {
         return *gameFiltersSettings;
     }
-    [[nodiscard]] LayoutsSettings &layouts() const
+    LayoutsSettings &layouts() const
     {
         return *layoutsSettings;
     }
-    [[nodiscard]] DownloadSettings &downloads() const
+    DownloadSettings &downloads() const
     {
         return *downloadSettings;
     }
-    [[nodiscard]] RecentsSettings &recents() const
+    RecentsSettings &recents() const
     {
         return *recentsSettings;
     }
-    [[nodiscard]] CardOverrideSettings &cardOverrides() const
+    CardOverrideSettings &cardOverrides() const
     {
         return *cardOverrideSettings;
     }
-    [[nodiscard]] DebugSettings &debug() const
+    DebugSettings &debug() const
     {
         return *debugSettings;
     }
-    [[nodiscard]] CardCounterSettings &cardCounters() const;
+    CardCounterSettings &cardCounters() const;
 
-    [[nodiscard]] bool getIsPortableBuild() const
+    bool getIsPortableBuild() const
     {
         return isPortableBuild;
     }
-    [[nodiscard]] bool getDownloadSpoilersStatus() const
+    bool getDownloadSpoilersStatus() const
     {
         return mbDownloadSpoilers;
     }
-    [[nodiscard]] bool getRoundCardCorners() const
+    bool getRoundCardCorners() const
     {
         return roundCardCorners;
     }
@@ -1012,7 +984,6 @@ public slots:
     void setDoubleClickToPlay(QT_STATE_CHANGED_T _doubleClickToPlay);
     void setClickPlaysAllSelected(QT_STATE_CHANGED_T _clickPlaysAllSelected);
     void setPlayToStack(QT_STATE_CHANGED_T _playToStack);
-    void setDoNotDeleteArrowsInSubPhases(QT_STATE_CHANGED_T _doNotDeleteArrowsInSubPhases);
     void setStartingHandSize(int _startingHandSize);
     void setAnnotateTokens(QT_STATE_CHANGED_T _annotateTokens);
     void setTabGameSplitterSizes(const QByteArray &_tabGameSplitterSizes);
@@ -1041,10 +1012,6 @@ public slots:
     void setVisualDeckStorageAlwaysConvert(bool _visualDeckStorageAlwaysConvert);
     void setVisualDeckStorageInGame(QT_STATE_CHANGED_T value);
     void setVisualDeckStorageSelectionAnimation(QT_STATE_CHANGED_T value);
-    void setVisualDeckEditorCardSize(int _visualDeckEditorCardSize);
-    void setVisualDatabaseDisplayCardSize(int _visualDatabaseDisplayCardSize);
-    void setEDHRecCardSize(int _EDHRecCardSize);
-    void setArchidektPreviewCardSize(int _archidektPreviewCardSize);
     void setDefaultDeckEditorType(int value);
     void setVisualDatabaseDisplayFilterToMostRecentSetsEnabled(QT_STATE_CHANGED_T _enabled);
     void setVisualDatabaseDisplayFilterToMostRecentSetsAmount(int _amount);

cockatrice/src/client/settings/card_counter_settings.h

@@ -7,6 +7,7 @@
 #ifndef CARD_COUNTER_SETTINGS_H
 #define CARD_COUNTER_SETTINGS_H
 
+#include <QObject>
 #include <libcockatrice/settings/settings_manager.h>
 
 class QSettings;
@@ -19,9 +20,9 @@ class CardCounterSettings : public SettingsManager
 public:
     CardCounterSettings(const QString &settingsPath, QObject *parent = nullptr);
 
-    [[nodiscard]] QColor color(int counterId) const;
+    QColor color(int counterId) const;
 
-    [[nodiscard]] QString displayName(int counterId) const;
+    QString displayName(int counterId) const;
 
 public slots:
     void setColor(int counterId, const QColor &color);

cockatrice/src/client/settings/shortcut_treeview.h

@@ -7,6 +7,7 @@
 #ifndef SHORTCUT_TREEVIEW_H
 #define SHORTCUT_TREEVIEW_H
 
+#include <QModelIndex>
 #include <QSortFilterProxyModel>
 #include <QStandardItemModel>
 #include <QTreeView>
@@ -21,7 +22,7 @@ public:
     explicit ShortcutFilterProxyModel(QObject *parent = nullptr);
 
 protected:
-    [[nodiscard]] bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override;
+    bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override;
 };
 
 class ShortcutTreeView : public QTreeView

cockatrice/src/client/settings/shortcuts_settings.h

@@ -99,15 +99,15 @@ public:
     void setSequence(const QList &_sequence)
     {
         QList::operator=(_sequence);
-    }
-    [[nodiscard]] QString getName() const
+    };
+    QString getName() const
     {
         return QApplication::translate("shortcutsTab", name.toUtf8().data());
-    }
-    [[nodiscard]] QString getGroupName() const
+    };
+    QString getGroupName() const
     {
         return ShortcutGroup::getGroupName(group);
-    }
+    };
 
 private:
     QString name;
@@ -120,24 +120,24 @@ class ShortcutsSettings : public QObject
 public:
     explicit ShortcutsSettings(const QString &settingsFilePath, QObject *parent = nullptr);
 
-    [[nodiscard]] ShortcutKey getDefaultShortcut(const QString &name) const;
-    [[nodiscard]] ShortcutKey getShortcut(const QString &name) const;
-    [[nodiscard]] QKeySequence getSingleShortcut(const QString &name) const;
-    [[nodiscard]] QString getDefaultShortcutString(const QString &name) const;
-    [[nodiscard]] QString getShortcutString(const QString &name) const;
-    [[nodiscard]] QString getShortcutFriendlyName(const QString &shortcutName) const;
-    [[nodiscard]] QList<QString> getAllShortcutKeys() const
+    ShortcutKey getDefaultShortcut(const QString &name) const;
+    ShortcutKey getShortcut(const QString &name) const;
+    QKeySequence getSingleShortcut(const QString &name) const;
+    QString getDefaultShortcutString(const QString &name) const;
+    QString getShortcutString(const QString &name) const;
+    QString getShortcutFriendlyName(const QString &shortcutName) const;
+    QList<QString> getAllShortcutKeys() const
     {
         return shortCuts.keys();
-    }
+    };
 
     void setShortcuts(const QString &name, const QList<QKeySequence> &Sequence);
     void setShortcuts(const QString &name, const QKeySequence &Sequence);
     void setShortcuts(const QString &name, const QString &sequences);
 
-    [[nodiscard]] bool isKeyAllowed(const QString &name, const QString &sequences) const;
-    [[nodiscard]] bool isValid(const QString &name, const QString &sequences) const;
-    [[nodiscard]] QStringList findOverlaps(const QString &name, const QString &sequences) const;
+    bool isKeyAllowed(const QString &name, const QString &sequences) const;
+    bool isValid(const QString &name, const QString &sequences) const;
+    QStringList findOverlaps(const QString &name, const QString &sequences) const;
 
     void resetAllShortcuts();
     void clearAllShortcuts();
@@ -152,8 +152,8 @@ private:
     QString settingsFilePath;
     QHash<QString, ShortcutKey> shortCuts;
 
-    [[nodiscard]] QString stringifySequence(const QList<QKeySequence> &Sequence) const;
-    [[nodiscard]] QList<QKeySequence> parseSequenceString(const QString &stringSequence) const;
+    QString stringifySequence(const QList<QKeySequence> &Sequence) const;
+    QList<QKeySequence> parseSequenceString(const QString &stringSequence) const;
 
     const QHash<QString, ShortcutKey> defaultShortCuts = {
         {"MainWindow/aCheckCardUpdates", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Check for Card Updates..."),

cockatrice/src/database/interface/settings_card_preference_provider.h

@@ -7,15 +7,15 @@
 class SettingsCardPreferenceProvider : public ICardPreferenceProvider
 {
 public:
-    [[nodiscard]] QString getCardPreferenceOverride(const QString &cardName) const override
+    QString getCardPreferenceOverride(const QString &cardName) const override
     {
         return SettingsCache::instance().cardOverrides().getCardPreferenceOverride(cardName);
     }
 
-    [[nodiscard]] bool getIncludeRebalancedCards() const override
+    bool getIncludeRebalancedCards() const override
     {
         return SettingsCache::instance().getIncludeRebalancedCards();
-    }
+    };
 };
 
 #endif // COCKATRICE_SETTINGS_CARD_PREFERENCE_PROVIDER_H

cockatrice/src/filters/deck_filter_string.cpp

@@ -1,6 +1,5 @@
 #include "deck_filter_string.h"
 
-#include <QFileInfo>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/filters/filter_string.h>
 #include <libcockatrice/utility/peglib.h>
@@ -13,7 +12,7 @@ QueryPartList <- ComplexQueryPart ( ws ("AND" ws)? ComplexQueryPart)* ws*
 ComplexQueryPart <- SomewhatComplexQueryPart ws "OR" ws ComplexQueryPart / SomewhatComplexQueryPart
 SomewhatComplexQueryPart <- [(] QueryPartList [)] / QueryPart
 
-QueryPart <- NotQuery / DeckContentQuery / DeckNameQuery / FileNameQuery / PathQuery / FormatQuery / GenericQuery
+QueryPart <- NotQuery / DeckContentQuery / DeckNameQuery / FileNameQuery / PathQuery / GenericQuery
 
 NotQuery <- ('NOT' ws/'-') SomewhatComplexQueryPart
 
@@ -22,9 +21,8 @@ CardSearch <- '[[' CardFilterString ']]'
 CardFilterString <- (!']]'.)*
 
 DeckNameQuery <- ([Dd] 'eck')? [Nn] 'ame'? [:] String
-FileNameQuery <- [Ff] ([Nn] / 'ile' ([Nn] 'ame')?) [:] String
+FileNameQuery <- [Ff] ('ile' 'name'?)? [:] String
 PathQuery <- [Pp] 'ath'? [:] String
-FormatQuery <- [Ff] 'ormat'? [:] String
 
 GenericQuery <- String
 
@@ -119,13 +117,12 @@ static void setupParserRules()
 
         return [=](const DeckPreviewWidget *deck, const ExtraDeckSearchInfo &) -> bool {
             int count = 0;
-            auto cardNodes = deck->deckLoader->getDeck().deckList.getCardNodes();
-            for (auto node : cardNodes) {
+            deck->deckLoader->getDeckList()->forEachCard([&](InnerDecklistNode *, const DecklistCardNode *node) {
                 auto cardInfoPtr = CardDatabaseManager::query()->getCardInfo(node->getName());
                 if (!cardInfoPtr.isNull() && cardFilter.check(cardInfoPtr)) {
                     count += node->getNumber();
                 }
-            }
+            });
             return numberMatcher(count);
         };
     };
@@ -139,7 +136,7 @@ static void setupParserRules()
     search["DeckNameQuery"] = [](const peg::SemanticValues &sv) -> DeckFilter {
         auto name = std::any_cast<QString>(sv[0]);
         return [=](const DeckPreviewWidget *deck, const ExtraDeckSearchInfo &) {
-            return deck->deckLoader->getDeck().deckList.getName().contains(name, Qt::CaseInsensitive);
+            return deck->deckLoader->getDeckList()->getName().contains(name, Qt::CaseInsensitive);
         };
     };
 
@@ -158,14 +155,6 @@ static void setupParserRules()
         };
     };
 
-    search["FormatQuery"] = [](const peg::SemanticValues &sv) -> DeckFilter {
-        auto format = std::any_cast<QString>(sv[0]);
-        return [=](const DeckPreviewWidget *deck, const ExtraDeckSearchInfo &) {
-            auto gameFormat = deck->deckLoader->getDeck().deckList.getGameFormat();
-            return QString::compare(format, gameFormat, Qt::CaseInsensitive) == 0;
-        };
-    };
-
     search["GenericQuery"] = [](const peg::SemanticValues &sv) -> DeckFilter {
         auto name = std::any_cast<QString>(sv[0]);
         return [=](const DeckPreviewWidget *deck, const ExtraDeckSearchInfo &) {

cockatrice/src/filters/deck_filter_string.h

@@ -10,8 +10,10 @@
 #include "../interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.h"
 
 #include <QLoggingCategory>
+#include <QMap>
 #include <QString>
 #include <functional>
+#include <utility>
 
 inline Q_LOGGING_CATEGORY(DeckFilterStringLog, "deck_filter_string");
 
@@ -38,7 +40,7 @@ public:
         return filter(deck, info);
     }
 
-    [[nodiscard]] bool valid() const
+    bool valid() const
     {
         return _error.isEmpty();
     }

cockatrice/src/filters/filter_tree_model.h

@@ -24,8 +24,8 @@ public slots:
     void addFilter(const CardFilter *f);
     void removeFilter(const CardFilter *f);
     void clearFiltersOfType(CardFilter::Attr filterType);
-    [[nodiscard]] QList<const CardFilter *> getFiltersOfType(CardFilter::Attr filterType) const;
-    [[nodiscard]] QList<const CardFilter *> allFilters() const;
+    QList<const CardFilter *> getFiltersOfType(CardFilter::Attr filterType) const;
+    QList<const CardFilter *> allFilters() const;
 
 private slots:
     void proxyBeginInsertRow(const FilterTreeNode *, int);
@@ -34,23 +34,23 @@ private slots:
     void proxyEndRemoveRow(const FilterTreeNode *, int);
 
 private:
-    [[nodiscard]] FilterTreeNode *indexToNode(const QModelIndex &idx) const;
+    FilterTreeNode *indexToNode(const QModelIndex &idx) const;
     QModelIndex nodeIndex(const FilterTreeNode *node, int row, int column) const;
 
 public:
     FilterTreeModel(QObject *parent = nullptr);
     ~FilterTreeModel() override;
-    [[nodiscard]] FilterTree *filterTree() const
+    FilterTree *filterTree() const
     {
         return fTree;
     }
-    [[nodiscard]] int rowCount(const QModelIndex &parent = QModelIndex()) const override;
-    [[nodiscard]] int columnCount(const QModelIndex & /*parent*/ = QModelIndex()) const override;
-    [[nodiscard]] QVariant data(const QModelIndex &index, int role) const override;
+    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+    int columnCount(const QModelIndex & /*parent*/ = QModelIndex()) const override;
+    QVariant data(const QModelIndex &index, int role) const override;
     bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override;
-    [[nodiscard]] Qt::ItemFlags flags(const QModelIndex &index) const override;
-    [[nodiscard]] QModelIndex parent(const QModelIndex &ind) const override;
-    [[nodiscard]] QModelIndex index(int row, int column, const QModelIndex &parent) const override;
+    Qt::ItemFlags flags(const QModelIndex &index) const override;
+    QModelIndex parent(const QModelIndex &ind) const override;
+    QModelIndex index(int row, int column, const QModelIndex &parent) const override;
     bool removeRows(int row, int count, const QModelIndex &parent) override;
     void clear();
 };

cockatrice/src/game/board/abstract_counter.cpp

@@ -3,14 +3,15 @@
 #include "../../client/settings/cache_settings.h"
 #include "../../interface/widgets/tabs/tab_game.h"
 #include "../player/player.h"
-#include "../player/player_actions.h"
 #include "translate_counter_name.h"
 
 #include <QAction>
 #include <QApplication>
+#include <QGraphicsSceneHoverEvent>
 #include <QGraphicsSceneMouseEvent>
 #include <QKeyEvent>
 #include <QMenu>
+#include <QPainter>
 #include <QString>
 #include <libcockatrice/protocol/pb/command_inc_counter.pb.h>
 #include <libcockatrice/protocol/pb/command_set_counter.pb.h>

cockatrice/src/game/board/arrow_item.cpp

@@ -3,7 +3,6 @@
 
 #include "../../client/settings/cache_settings.h"
 #include "../player/player.h"
-#include "../player/player_actions.h"
 #include "../player/player_target.h"
 #include "../zones/card_zone.h"
 #include "card_item.h"
@@ -152,8 +151,8 @@ void ArrowItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
     }
 }
 
-ArrowDragItem::ArrowDragItem(Player *_owner, ArrowTarget *_startItem, const QColor &_color, int _deleteInPhase)
-    : ArrowItem(_owner, -1, _startItem, 0, _color), deleteInPhase(_deleteInPhase)
+ArrowDragItem::ArrowDragItem(Player *_owner, ArrowTarget *_startItem, const QColor &_color)
+    : ArrowItem(_owner, -1, _startItem, 0, _color)
 {
 }
 
@@ -232,28 +231,20 @@ void ArrowDragItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
             cmd.set_target_player_id(targetZone->getPlayer()->getPlayerInfo()->getId());
             cmd.set_target_zone(targetZone->getName().toStdString());
             cmd.set_target_card_id(targetCard->getId());
-        } else { // failed to cast target to card, this means it's a player
+        } else {
             PlayerTarget *targetPlayer = qgraphicsitem_cast<PlayerTarget *>(targetItem);
             cmd.set_target_player_id(targetPlayer->getOwner()->getPlayerInfo()->getId());
         }
-
-        // if the card is in hand then we will move the card to stack or table as part of drawing the arrow
-        if (startZone->getName() == "hand") {
+        if (startZone->getName().compare("hand") == 0) {
             startCard->playCard(false);
             CardInfoPtr ci = startCard->getCard().getCardPtr();
-            bool playToStack = SettingsCache::instance().getPlayToStack();
-            if (ci &&
-                ((!playToStack && ci->getUiAttributes().tableRow == 3) ||
-                 (playToStack && ci->getUiAttributes().tableRow != 0 && startCard->getZone()->getName() != "stack")))
+            if (ci && ((!SettingsCache::instance().getPlayToStack() && ci->getUiAttributes().tableRow == 3) ||
+                       (SettingsCache::instance().getPlayToStack() && ci->getUiAttributes().tableRow != 0 &&
+                        startCard->getZone()->getName().toStdString() != "stack")))
                 cmd.set_start_zone("stack");
             else
-                cmd.set_start_zone(playToStack ? "stack" : "table");
+                cmd.set_start_zone(SettingsCache::instance().getPlayToStack() ? "stack" : "table");
         }
-
-        if (deleteInPhase != 0) {
-            cmd.set_delete_in_phase(deleteInPhase);
-        }
-
         player->getPlayerActions()->sendGameCommand(cmd);
     }
     delArrow();

cockatrice/src/game/board/arrow_item.h

@@ -82,11 +82,10 @@ class ArrowDragItem : public ArrowItem
 {
     Q_OBJECT
 private:
-    int deleteInPhase;
     QList<ArrowDragItem *> childArrows;
 
 public:
-    ArrowDragItem(Player *_owner, ArrowTarget *_startItem, const QColor &_color, int _deleteInPhase);
+    ArrowDragItem(Player *_owner, ArrowTarget *_startItem, const QColor &_color);
     void addChildArrow(ArrowDragItem *childArrow);
 
 protected:

cockatrice/src/game/board/card_item.cpp

@@ -3,9 +3,8 @@
 #include "../../client/settings/cache_settings.h"
 #include "../../interface/widgets/tabs/tab_game.h"
 #include "../game_scene.h"
-#include "../phase.h"
 #include "../player/player.h"
-#include "../player/player_actions.h"
+#include "../zones/card_zone.h"
 #include "../zones/logic/view_zone_logic.h"
 #include "../zones/table_zone.h"
 #include "../zones/view_zone.h"
@@ -276,14 +275,9 @@ void CardItem::drawArrow(const QColor &arrowColor)
     if (owner->getGame()->getPlayerManager()->isSpectator())
         return;
 
-    auto *game = owner->getGame();
-    Player *arrowOwner = game->getPlayerManager()->getActiveLocalPlayer(game->getGameState()->getActivePlayer());
-    int phase = 0; // 0 means to not set the phase
-    if (SettingsCache::instance().getDoNotDeleteArrowsInSubPhases()) {
-        int currentPhase = game->getGameState()->getCurrentPhase();
-        phase = Phases::getLastSubphase(currentPhase) + 1;
-    }
-    ArrowDragItem *arrow = new ArrowDragItem(arrowOwner, this, arrowColor, phase);
+    Player *arrowOwner =
+        owner->getGame()->getPlayerManager()->getActiveLocalPlayer(owner->getGame()->getGameState()->getActivePlayer());
+    ArrowDragItem *arrow = new ArrowDragItem(arrowOwner, this, arrowColor);
     scene()->addItem(arrow);
     arrow->grabMouse();
 
@@ -294,7 +288,7 @@ void CardItem::drawArrow(const QColor &arrowColor)
         if (card->getZone() != zone)
             continue;
 
-        ArrowDragItem *childArrow = new ArrowDragItem(arrowOwner, card, arrowColor, phase);
+        ArrowDragItem *childArrow = new ArrowDragItem(arrowOwner, card, arrowColor);
         scene()->addItem(childArrow);
         arrow->addChildArrow(childArrow);
     }

cockatrice/src/game/deckview/deck_view.cpp

@@ -10,7 +10,7 @@
 #include <algorithm>
 #include <libcockatrice/card/card_info.h>
 #include <libcockatrice/deck_list/deck_list.h>
-#include <libcockatrice/deck_list/tree/deck_list_card_node.h>
+#include <libcockatrice/deck_list/deck_list_card_node.h>
 
 DeckViewCardDragItem::DeckViewCardDragItem(DeckViewCard *_item,
                                            const QPointF &_hotSpot,
@@ -343,7 +343,10 @@ void DeckViewScene::rebuildTree()
     if (!deck)
         return;
 
-    for (auto *currentZone : deck->getZoneNodes()) {
+    InnerDecklistNode *listRoot = deck->getRoot();
+    for (int i = 0; i < listRoot->size(); i++) {
+        auto *currentZone = dynamic_cast<InnerDecklistNode *>(listRoot->at(i));
+
         DeckViewCardContainer *container = cardContainers.value(currentZone->getName(), 0);
         if (!container) {
             container = new DeckViewCardContainer(currentZone->getName());

cockatrice/src/game/deckview/deck_view.h

@@ -9,8 +9,11 @@
 
 #include "../board/abstract_card_drag_item.h"
 
+#include <QGraphicsScene>
 #include <QGraphicsView>
 #include <QMap>
+#include <QMultiMap>
+#include <QPixmap>
 #include <libcockatrice/protocol/pb/move_card_to_zone.pb.h>
 
 class DeckList;

cockatrice/src/game/deckview/deck_view_container.cpp

@@ -8,9 +8,13 @@
 #include "../../interface/widgets/dialogs/dlg_load_deck_from_website.h"
 #include "../../interface/widgets/dialogs/dlg_load_remote_deck.h"
 #include "../../interface/widgets/tabs/tab_game.h"
+#include "../game_scene.h"
 #include "deck_view.h"
 
 #include <QMessageBox>
+#include <QMouseEvent>
+#include <QToolButton>
+#include <google/protobuf/descriptor.h>
 #include <libcockatrice/card/database/card_database.h>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/protocol/pb/command_deck_select.pb.h>
@@ -259,7 +263,7 @@ void DeckViewContainer::loadLocalDeck()
 
 void DeckViewContainer::loadDeckFromFile(const QString &filePath)
 {
-    DeckFileFormat::Format fmt = DeckFileFormat::getFormatFromName(filePath);
+    DeckLoader::FileFormat fmt = DeckLoader::getFormatFromName(filePath);
     DeckLoader deck(this);
 
     bool success = deck.loadFromFile(filePath, fmt, true);
@@ -269,12 +273,12 @@ void DeckViewContainer::loadDeckFromFile(const QString &filePath)
         return;
     }
 
-    loadDeckFromDeckList(deck.getDeck().deckList);
+    loadDeckFromDeckLoader(&deck);
 }
 
-void DeckViewContainer::loadDeckFromDeckList(const DeckList &deck)
+void DeckViewContainer::loadDeckFromDeckLoader(DeckLoader *deck)
 {
-    QString deckString = deck.writeToString_Native();
+    QString deckString = deck->getDeckList()->writeToString_Native();
 
     if (deckString.length() > MAX_FILE_LENGTH) {
         QMessageBox::critical(this, tr("Error"), tr("Deck is greater than maximum file size."));
@@ -308,8 +312,8 @@ void DeckViewContainer::loadFromClipboard()
         return;
     }
 
-    DeckList deck = dlg.getDeckList();
-    loadDeckFromDeckList(deck);
+    DeckLoader *deck = dlg.getDeckList();
+    loadDeckFromDeckLoader(deck);
 }
 
 void DeckViewContainer::loadFromWebsite()
@@ -320,15 +324,16 @@ void DeckViewContainer::loadFromWebsite()
         return;
     }
 
-    DeckList deck = dlg.getDeck();
-    loadDeckFromDeckList(deck);
+    DeckLoader *deck = dlg.getDeck();
+    loadDeckFromDeckLoader(deck);
 }
 
 void DeckViewContainer::deckSelectFinished(const Response &r)
 {
     const Response_DeckDownload &resp = r.GetExtension(Response_DeckDownload::ext);
-    DeckList newDeck = DeckList(QString::fromStdString(resp.deck()));
-    CardPictureLoader::cacheCardPixmaps(CardDatabaseManager::query()->getCards(newDeck.getCardRefList()));
+    DeckLoader newDeck(this, new DeckList(QString::fromStdString(resp.deck())));
+    CardPictureLoader::cacheCardPixmaps(
+        CardDatabaseManager::query()->getCards(newDeck.getDeckList()->getCardRefList()));
     setDeck(newDeck);
     switchToDeckLoadedView();
 }
@@ -409,8 +414,8 @@ void DeckViewContainer::setSideboardLocked(bool locked)
         deckView->resetSideboardPlan();
 }
 
-void DeckViewContainer::setDeck(const DeckList &deck)
+void DeckViewContainer::setDeck(DeckLoader &deck)
 {
-    deckView->setDeck(deck);
+    deckView->setDeck(*deck.getDeckList());
     switchToDeckLoadedView();
 }

cockatrice/src/game/deckview/deck_view_container.h

@@ -85,12 +85,12 @@ public:
     void setReadyStart(bool ready);
     void readyAndUpdate();
     void setSideboardLocked(bool locked);
-    void setDeck(const DeckList &deck);
+    void setDeck(DeckLoader &deck);
     void setVisualDeckStorageExists(bool exists);
 
 public slots:
     void loadDeckFromFile(const QString &filePath);
-    void loadDeckFromDeckList(const DeckList &deck);
+    void loadDeckFromDeckLoader(DeckLoader *deck);
 };
 
 #endif // DECK_VIEW_CONTAINER_H

cockatrice/src/game/dialogs/dlg_create_token.cpp

@@ -16,6 +16,7 @@
 #include <QLineEdit>
 #include <QRadioButton>
 #include <QTreeView>
+#include <QVBoxLayout>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/deck_list/deck_list.h>
 #include <libcockatrice/models/database/card_database_model.h>

cockatrice/src/game/dialogs/dlg_create_token.h

@@ -8,6 +8,7 @@
 #define DLG_CREATETOKEN_H
 
 #include <QDialog>
+#include <QModelIndex>
 
 class QLabel;
 class QLineEdit;

cockatrice/src/game/game_event_handler.cpp

@@ -15,6 +15,7 @@
 #include <libcockatrice/protocol/pb/command_set_active_phase.pb.h>
 #include <libcockatrice/protocol/pb/context_connection_state_changed.pb.h>
 #include <libcockatrice/protocol/pb/context_deck_select.pb.h>
+#include <libcockatrice/protocol/pb/context_ping_changed.pb.h>
 #include <libcockatrice/protocol/pb/event_game_closed.pb.h>
 #include <libcockatrice/protocol/pb/event_game_host_changed.pb.h>
 #include <libcockatrice/protocol/pb/event_game_say.pb.h>

cockatrice/src/game/game_scene.cpp

@@ -8,6 +8,7 @@
 #include "zones/view_zone.h"
 #include "zones/view_zone_widget.h"
 
+#include <QAction>
 #include <QBasicTimer>
 #include <QDebug>
 #include <QGraphicsSceneMouseEvent>

cockatrice/src/game/game_state.h

@@ -7,8 +7,10 @@
 #ifndef COCKATRICE_GAME_STATE_H
 #define COCKATRICE_GAME_STATE_H
 
+#include <QObject>
 #include <QTimer>
 #include <libcockatrice/network/client/abstract/abstract_client.h>
+#include <libcockatrice/protocol/pb/serverinfo_game.pb.h>
 
 class AbstractGame;
 class ServerInfo_PlayerProperties;

cockatrice/src/game/log/message_log_widget.cpp

@@ -6,10 +6,12 @@
 #include "../board/translate_counter_name.h"
 #include "../phase.h"
 #include "../player/player.h"
+#include "../zones/card_zone.h"
 
 #include <../../client/settings/card_counter_settings.h>
 #include <libcockatrice/protocol/pb/context_move_card.pb.h>
 #include <libcockatrice/protocol/pb/context_mulligan.pb.h>
+#include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
 #include <utility>
 
 static const QString TABLE_ZONE_NAME = "table";

cockatrice/src/game/log/message_log_widget.h

@@ -7,9 +7,12 @@
 #ifndef MESSAGELOGWIDGET_H
 #define MESSAGELOGWIDGET_H
 
+#include "../../client/translation.h"
 #include "../../interface/widgets/server/chat_view/chat_view.h"
 #include "../zones/logic/card_zone_logic.h"
 
+#include <libcockatrice/network/server/remote/user_level.h>
+
 class AbstractGame;
 class CardItem;
 class GameEventContext;

cockatrice/src/game/phase.cpp

@@ -22,28 +22,6 @@ Phase Phases::getPhase(int phase)
     }
 }
 
-int Phases::getLastSubphase(int phase)
-{
-    if (0 <= phase && phase < Phases::phaseTypesCount) {
-        return subPhasesEnd[phase];
-    } else {
-        return phase;
-    }
-}
-
-QVector<int> getSubPhasesEnd()
-{
-    QVector<int> array(Phases::phaseTypesCount);
-    for (int phaseEnd = Phases::phaseTypesCount - 1; phaseEnd >= 0;) {
-        int subPhase = phaseEnd;
-        for (; subPhase >= 0 && Phases::phases[phaseEnd].color == Phases::phases[subPhase].color; --subPhase) {
-            array[subPhase] = phaseEnd;
-        }
-        phaseEnd = subPhase;
-    }
-    return array;
-}
-
 const Phase Phases::unknownPhase(QT_TRANSLATE_NOOP("Phase", "Unknown Phase"), "black", "unknown_phase");
 const Phase Phases::phases[Phases::phaseTypesCount] = {
     {QT_TRANSLATE_NOOP("Phase", "Untap"), "green", "untap_step"},
@@ -57,4 +35,3 @@ const Phase Phases::phases[Phases::phaseTypesCount] = {
     {QT_TRANSLATE_NOOP("Phase", "End of Combat"), "red", "end_combat"},
     {QT_TRANSLATE_NOOP("Phase", "Second Main"), "blue", "main_2"},
     {QT_TRANSLATE_NOOP("Phase", "End/Cleanup"), "green", "end_step"}};
-const QVector<int> Phases::subPhasesEnd = getSubPhasesEnd();

cockatrice/src/game/phase.h

@@ -28,10 +28,8 @@ struct Phases
     const static int phaseTypesCount = 11;
     const static Phase unknownPhase;
     const static Phase phases[phaseTypesCount];
-    const static QVector<int> subPhasesEnd;
 
     static Phase getPhase(int);
-    static int getLastSubphase(int phase);
 };
 
 #endif // PHASE_H

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

@@ -3,6 +3,7 @@
 #include "../../abstract_game.h"
 #include "../player.h"
 #include "../player_actions.h"
+#include "grave_menu.h"
 
 #include <QAction>
 #include <QMenu>

cockatrice/src/game/player/menu/player_menu.cpp

@@ -3,11 +3,12 @@
 #include "../../../interface/widgets/tabs/tab_game.h"
 #include "../../board/card_item.h"
 #include "../../zones/hand_zone.h"
-#include "../../zones/pile_zone.h"
-#include "../../zones/table_zone.h"
+#include "../card_menu_action_type.h"
+#include "../player_actions.h"
 #include "card_menu.h"
 #include "hand_menu.h"
 
+#include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/protocol/pb/command_reveal_cards.pb.h>
 
 PlayerMenu::PlayerMenu(Player *_player) : player(_player)

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

@@ -1,7 +1,6 @@
 #include "sideboard_menu.h"
 
 #include "../player.h"
-#include "../player_actions.h"
 
 SideboardMenu::SideboardMenu(Player *player, QMenu *playerMenu) : QMenu(playerMenu)
 {

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

@@ -1,13 +1,9 @@
 #include "utility_menu.h"
 
-#include "../../../interface/deck_loader/deck_loader.h"
 #include "../player.h"
 #include "../player_actions.h"
 #include "player_menu.h"
 
-#include <libcockatrice/deck_list/tree/deck_list_card_node.h>
-#include <libcockatrice/deck_list/tree/inner_deck_list_node.h>
-
 UtilityMenu::UtilityMenu(Player *_player, QMenu *playerMenu) : QMenu(playerMenu), player(_player)
 {
     PlayerActions *playerActions = player->getPlayerActions();
@@ -60,19 +56,21 @@ void UtilityMenu::populatePredefinedTokensMenu()
     clear();
     setEnabled(false);
     predefinedTokens.clear();
-    const DeckList &deckList = player->getDeck();
+    DeckLoader *_deck = player->getDeck();
 
-    if (deckList.isEmpty()) {
+    if (!_deck) {
         return;
     }
 
-    auto tokenCardNodes = deckList.getCardNodes({DECK_ZONE_TOKENS});
+    InnerDecklistNode *tokenZone =
+        dynamic_cast<InnerDecklistNode *>(_deck->getDeckList()->getRoot()->findChild(DECK_ZONE_TOKENS));
 
-    if (!tokenCardNodes.isEmpty()) {
-        setEnabled(true);
+    if (tokenZone) {
+        if (!tokenZone->empty())
+            setEnabled(true);
 
-        for (int i = 0; i < tokenCardNodes.size(); ++i) {
-            const QString tokenName = tokenCardNodes[i]->getName();
+        for (int i = 0; i < tokenZone->size(); ++i) {
+            const QString tokenName = tokenZone->at(i)->getName();
             predefinedTokens.append(tokenName);
             QAction *a = addAction(tokenName);
             if (i < 10) {

cockatrice/src/game/player/player.cpp

@@ -11,7 +11,7 @@
 #include "../zones/pile_zone.h"
 #include "../zones/stack_zone.h"
 #include "../zones/table_zone.h"
-#include "player_actions.h"
+#include "../zones/view_zone.h"
 #include "player_target.h"
 
 #include <QDebug>
@@ -32,7 +32,7 @@
 Player::Player(const ServerInfo_User &info, int _id, bool _local, bool _judge, AbstractGame *_parent)
     : QObject(_parent), game(_parent), playerInfo(new PlayerInfo(info, _id, _local, _judge)),
       playerEventHandler(new PlayerEventHandler(this)), playerActions(new PlayerActions(this)), active(false),
-      conceded(false), zoneId(0), dialogSemaphore(false)
+      conceded(false), deck(nullptr), zoneId(0), dialogSemaphore(false)
 {
     initializeZones();
 
@@ -263,9 +263,10 @@ void Player::deleteCard(CardItem *card)
     }
 }
 
-void Player::setDeck(const DeckList &_deck)
+// TODO: Does a player need a DeckLoader?
+void Player::setDeck(DeckLoader &_deck)
 {
-    deck = _deck;
+    deck = new DeckLoader(this, _deck.getDeckList());
 
     emit deckChanged();
 }

cockatrice/src/game/player/player.h

@@ -9,12 +9,9 @@
 
 #include "../../game_graphics/board/abstract_graphics_item.h"
 #include "../../interface/widgets/menus/tearoff_menu.h"
-#include "../interface/deck_loader/loaded_deck.h"
-#include "../zones/logic/hand_zone_logic.h"
-#include "../zones/logic/pile_zone_logic.h"
-#include "../zones/logic/stack_zone_logic.h"
-#include "../zones/logic/table_zone_logic.h"
+#include "../dialogs/dlg_create_token.h"
 #include "menu/player_menu.h"
+#include "player_actions.h"
 #include "player_area.h"
 #include "player_event_handler.h"
 #include "player_graphics_item.h"
@@ -23,7 +20,9 @@
 #include <QInputDialog>
 #include <QLoggingCategory>
 #include <QMap>
+#include <QPoint>
 #include <QTimer>
+#include <libcockatrice/card/card_info.h>
 #include <libcockatrice/filters/filter_string.h>
 #include <libcockatrice/protocol/pb/card_attributes.pb.h>
 #include <libcockatrice/protocol/pb/game_event.pb.h>
@@ -45,6 +44,7 @@ class ArrowTarget;
 class CardDatabase;
 class CardZone;
 class CommandContainer;
+class DeckLoader;
 class GameCommand;
 class GameEvent;
 class PlayerInfo;
@@ -66,7 +66,7 @@ class Player : public QObject
     Q_OBJECT
 
 signals:
-    void openDeckEditor(const LoadedDeck &deck);
+    void openDeckEditor(DeckLoader *deck);
     void deckChanged();
     void newCardAdded(AbstractCardItem *card);
     void rearrangeCounters();
@@ -113,7 +113,7 @@ public:
     [[nodiscard]] PlayerActions *getPlayerActions() const
     {
         return playerActions;
-    }
+    };
 
     [[nodiscard]] PlayerEventHandler *getPlayerEventHandler() const
     {
@@ -123,16 +123,16 @@ public:
     [[nodiscard]] PlayerInfo *getPlayerInfo() const
     {
         return playerInfo;
-    }
+    };
 
     [[nodiscard]] PlayerMenu *getPlayerMenu() const
     {
         return playerMenu;
     }
 
-    void setDeck(const DeckList &_deck);
+    void setDeck(DeckLoader &_deck);
 
-    [[nodiscard]] const DeckList &getDeck() const
+    [[nodiscard]] DeckLoader *getDeck() const
     {
         return deck;
     }
@@ -241,7 +241,7 @@ private:
     bool active;
     bool conceded;
 
-    DeckList deck;
+    DeckLoader *deck;
 
     int zoneId;
     QMap<QString, CardZoneLogic *> zones;

cockatrice/src/game/player/player_actions.cpp

@@ -5,15 +5,14 @@
 #include "../board/card_item.h"
 #include "../dialogs/dlg_move_top_cards_until.h"
 #include "../dialogs/dlg_roll_dice.h"
-#include "../zones/hand_zone.h"
 #include "../zones/logic/view_zone_logic.h"
-#include "../zones/table_zone.h"
 #include "card_menu_action_type.h"
 
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/card/relation/card_relation.h>
 #include <libcockatrice/protocol/pb/command_attach_card.pb.h>
 #include <libcockatrice/protocol/pb/command_change_zone_properties.pb.h>
+#include <libcockatrice/protocol/pb/command_concede.pb.h>
 #include <libcockatrice/protocol/pb/command_create_token.pb.h>
 #include <libcockatrice/protocol/pb/command_draw_cards.pb.h>
 #include <libcockatrice/protocol/pb/command_flip_card.pb.h>
@@ -218,7 +217,7 @@ void PlayerActions::actAlwaysLookAtTopCard()
 
 void PlayerActions::actOpenDeckInDeckEditor()
 {
-    emit player->openDeckEditor({.deckList = player->getDeck()});
+    emit player->openDeckEditor(player->getDeck());
 }
 
 void PlayerActions::actViewGraveyard()

cockatrice/src/game/player/player_actions.h

@@ -7,7 +7,6 @@
 
 #ifndef COCKATRICE_PLAYER_ACTIONS_H
 #define COCKATRICE_PLAYER_ACTIONS_H
-#include "../dialogs/dlg_create_token.h"
 #include "event_processing_options.h"
 #include "player.h"
 

cockatrice/src/game/player/player_event_handler.cpp

@@ -6,7 +6,6 @@
 #include "../board/card_list.h"
 #include "../zones/view_zone.h"
 #include "player.h"
-#include "player_actions.h"
 
 #include <libcockatrice/protocol/pb/command_set_card_attr.pb.h>
 #include <libcockatrice/protocol/pb/context_move_card.pb.h>

cockatrice/src/game/player/player_graphics_item.cpp

@@ -1,12 +1,7 @@
 #include "player_graphics_item.h"
 
 #include "../../interface/widgets/tabs/tab_game.h"
-#include "../board/abstract_card_item.h"
 #include "../hand_counter.h"
-#include "../zones/hand_zone.h"
-#include "../zones/pile_zone.h"
-#include "../zones/stack_zone.h"
-#include "../zones/table_zone.h"
 
 PlayerGraphicsItem::PlayerGraphicsItem(Player *_player) : player(_player)
 {

cockatrice/src/game/player/player_info.h

@@ -7,6 +7,11 @@
 #ifndef COCKATRICE_PLAYER_INFO_H
 #define COCKATRICE_PLAYER_INFO_H
 
+#include "../../interface/deck_loader/deck_loader.h"
+#include "../zones/hand_zone.h"
+#include "../zones/pile_zone.h"
+#include "../zones/stack_zone.h"
+#include "../zones/table_zone.h"
 #include "player_target.h"
 
 #include <QObject>

cockatrice/src/game/player/player_list_widget.cpp

@@ -4,11 +4,15 @@
 #include "../../interface/widgets/server/user/user_context_menu.h"
 #include "../../interface/widgets/server/user/user_list_manager.h"
 #include "../../interface/widgets/server/user/user_list_widget.h"
+#include "../../interface/widgets/tabs/tab_account.h"
 #include "../../interface/widgets/tabs/tab_game.h"
 #include "../../interface/widgets/tabs/tab_supervisor.h"
 
+#include <QAction>
 #include <QHeaderView>
+#include <QMenu>
 #include <QMouseEvent>
+#include <libcockatrice/network/client/abstract/abstract_client.h>
 #include <libcockatrice/protocol/pb/command_kick_from_game.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_playerproperties.pb.h>
 #include <libcockatrice/protocol/pb/session_commands.pb.h>

cockatrice/src/game/player/player_target.h

@@ -11,6 +11,7 @@
 #include "../board/abstract_counter.h"
 #include "../board/arrow_target.h"
 
+#include <QFont>
 #include <QPixmap>
 
 class Player;

cockatrice/src/game/zones/hand_zone.cpp

@@ -5,7 +5,6 @@
 #include "../board/card_drag_item.h"
 #include "../board/card_item.h"
 #include "../player/player.h"
-#include "../player/player_actions.h"
 
 #include <QPainter>
 #include <libcockatrice/protocol/pb/command_move_card.pb.h>

cockatrice/src/game/zones/logic/card_zone_logic.cpp

@@ -2,7 +2,7 @@
 
 #include "../../board/card_item.h"
 #include "../../player/player.h"
-#include "../../player/player_actions.h"
+#include "../pile_zone.h"
 #include "../view_zone.h"
 #include "view_zone_logic.h"
 
@@ -10,6 +10,7 @@
 #include <QDebug>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/protocol/pb/command_move_card.pb.h>
+#include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
 
 /**
  * @param _player the player that the zone belongs to
@@ -147,24 +148,17 @@ void CardZoneLogic::moveAllToZone()
 
 void CardZoneLogic::clearContents()
 {
-    // First gather the cards into a safe temporary list.
-    const CardList toClear = cards;
-
-    // Detach and notify attached cards and zones *before* deleting anything.
-    for (CardItem *card : toClear) {
+    for (int i = 0; i < cards.size(); i++) {
         // If an incorrectly implemented server doesn't return attached cards to whom they belong before dropping a
         // player, we have to return them to avoid a crash.
-        const QList<CardItem *> &attachedCards = card->getAttachedCards();
-        for (CardItem *attachedCard : attachedCards) {
+
+        const QList<CardItem *> &attachedCards = cards[i]->getAttachedCards();
+        for (auto attachedCard : attachedCards) {
             emit attachedCard->getZone()->cardAdded(attachedCard);
         }
-    }
 
-    // Now request deletions after all manipulations are done.
-    for (CardItem *card : toClear) {
-        player->deleteCard(card);
+        player->deleteCard(cards.at(i));
     }
-
     cards.clear();
     emit cardCountChanged();
 }

cockatrice/src/game/zones/logic/card_zone_logic.h

@@ -52,7 +52,7 @@ public:
     void rawInsertCard(CardItem *card, int index)
     {
         cards.insert(index, card);
-    }
+    };
 
     [[nodiscard]] const CardList &getCards() const
     {

cockatrice/src/game/zones/pile_zone.cpp

@@ -3,7 +3,6 @@
 #include "../board/card_drag_item.h"
 #include "../board/card_item.h"
 #include "../player/player.h"
-#include "../player/player_actions.h"
 #include "logic/pile_zone_logic.h"
 #include "view_zone.h"
 

cockatrice/src/game/zones/stack_zone.cpp

@@ -6,10 +6,10 @@
 #include "../board/card_drag_item.h"
 #include "../board/card_item.h"
 #include "../player/player.h"
-#include "../player/player_actions.h"
 #include "logic/stack_zone_logic.h"
 
 #include <QPainter>
+#include <QSet>
 #include <libcockatrice/protocol/pb/command_move_card.pb.h>
 
 StackZone::StackZone(StackZoneLogic *_logic, int _zoneHeight, QGraphicsItem *parent)

cockatrice/src/game/zones/table_zone.cpp

@@ -6,11 +6,11 @@
 #include "../board/card_drag_item.h"
 #include "../board/card_item.h"
 #include "../player/player.h"
-#include "../player/player_actions.h"
 #include "logic/table_zone_logic.h"
 
 #include <QGraphicsScene>
 #include <QPainter>
+#include <QSet>
 #include <libcockatrice/card/card_info.h>
 #include <libcockatrice/protocol/pb/command_move_card.pb.h>
 #include <libcockatrice/protocol/pb/command_set_card_attr.pb.h>

cockatrice/src/game/zones/view_zone.cpp

@@ -3,7 +3,6 @@
 #include "../board/card_drag_item.h"
 #include "../board/card_item.h"
 #include "../player/player.h"
-#include "../player/player_actions.h"
 #include "logic/view_zone_logic.h"
 
 #include <QBrush>
@@ -11,6 +10,7 @@
 #include <QGraphicsSceneWheelEvent>
 #include <QPainter>
 #include <QtMath>
+#include <libcockatrice/card/card_info.h>
 #include <libcockatrice/protocol/pb/command_dump_zone.pb.h>
 #include <libcockatrice/protocol/pb/command_move_card.pb.h>
 #include <libcockatrice/protocol/pb/response_dump_zone.pb.h>

cockatrice/src/game/zones/view_zone_widget.cpp

@@ -6,7 +6,6 @@
 #include "../board/card_item.h"
 #include "../game_scene.h"
 #include "../player/player.h"
-#include "../player/player_actions.h"
 #include "view_zone.h"
 
 #include <QCheckBox>
@@ -17,6 +16,7 @@
 #include <QPainter>
 #include <QScrollBar>
 #include <QStyleOption>
+#include <QStyleOptionTitleBar>
 #include <libcockatrice/protocol/pb/command_shuffle.pb.h>
 
 /**

cockatrice/src/interface/card_picture_loader/card_picture_loader.cpp

@@ -9,6 +9,7 @@
 #include <QFileInfo>
 #include <QMainWindow>
 #include <QMovie>
+#include <QNetworkDiskCache>
 #include <QNetworkRequest>
 #include <QPainter>
 #include <QPixmapCache>

cockatrice/src/interface/card_picture_loader/card_picture_loader.h

@@ -5,6 +5,7 @@
 #include "card_picture_loader_worker.h"
 
 #include <QLoggingCategory>
+#include <libcockatrice/card/card_info.h>
 
 inline Q_LOGGING_CATEGORY(CardPictureLoaderLog, "card_picture_loader");
 inline Q_LOGGING_CATEGORY(CardPictureLoaderCardBackCacheFailLog, "card_picture_loader.card_back_cache_fail");

cockatrice/src/interface/card_picture_loader/card_picture_loader_local.h

@@ -1,6 +1,8 @@
 #ifndef PICTURE_LOADER_LOCAL_H
 #define PICTURE_LOADER_LOCAL_H
 
+#include <QLoggingCategory>
+#include <QObject>
 #include <QTimer>
 #include <libcockatrice/card/printing/exact_card.h>
 
@@ -40,7 +42,7 @@ public:
      *
      * Uses a set of name variants and folder paths to attempt to locate the correct image.
      */
-    [[nodiscard]] QImage tryLoad(const ExactCard &toLoad) const;
+    QImage tryLoad(const ExactCard &toLoad) const;
 
 private:
     QString picsPath;       ///< Path to standard card image folder
@@ -70,10 +72,10 @@ private:
      * Uses several filename patterns to match card images, in order from
      * most-specific to least-specific.
      */
-    [[nodiscard]] QImage tryLoadCardImageFromDisk(const QString &setName,
-                                                  const QString &correctedCardName,
-                                                  const QString &collectorNumber,
-                                                  const QString &providerId) const;
+    QImage tryLoadCardImageFromDisk(const QString &setName,
+                                    const QString &correctedCardName,
+                                    const QString &collectorNumber,
+                                    const QString &providerId) const;
 
 private slots:
     /**

cockatrice/src/interface/card_picture_loader/card_picture_loader_request_status_display_widget.h

@@ -1,11 +1,11 @@
 #ifndef PICTURE_LOADER_REQUEST_STATUS_DISPLAY_WIDGET_H
 #define PICTURE_LOADER_REQUEST_STATUS_DISPLAY_WIDGET_H
 
+#include "card_picture_loader_worker_work.h"
+
 #include <QHBoxLayout>
 #include <QLabel>
-#include <QUrl>
 #include <QWidget>
-#include <libcockatrice/card/printing/exact_card.h>
 
 /**
  * @class CardPictureLoaderRequestStatusDisplayWidget

cockatrice/src/interface/card_picture_loader/card_picture_loader_status_bar.h

@@ -6,6 +6,7 @@
 
 #include <QHBoxLayout>
 #include <QProgressBar>
+#include <QTimer>
 #include <QWidget>
 
 /**

cockatrice/src/interface/card_picture_loader/card_picture_loader_worker.cpp

@@ -9,8 +9,8 @@
 #include <QNetworkDiskCache>
 #include <QNetworkReply>
 #include <QThread>
+#include <libcockatrice/card/database/card_database_manager.h>
 #include <utility>
-#include <version_string.h>
 
 static constexpr int MAX_REQUESTS_PER_SEC = 10;
 
@@ -87,7 +87,6 @@ QNetworkReply *CardPictureLoaderWorker::makeRequest(const QUrl &url, CardPicture
     }
 
     QNetworkRequest req(url);
-    req.setHeader(QNetworkRequest::UserAgentHeader, QString("Cockatrice %1").arg(VERSION_STRING));
     if (!picDownload) {
         req.setAttribute(QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::AlwaysCache);
     }

cockatrice/src/interface/card_picture_loader/card_picture_loader_worker_work.cpp

@@ -7,9 +7,11 @@
 #include <QDirIterator>
 #include <QLoggingCategory>
 #include <QMovie>
+#include <QNetworkDiskCache>
 #include <QNetworkReply>
 #include <QThread>
 #include <QThreadPool>
+#include <libcockatrice/card/database/card_database_manager.h>
 
 // Card back returned by gatherer when card is not found
 static const QStringList MD5_BLACKLIST = {"db0c48db407a907c16ade38de048a441"};

cockatrice/src/interface/card_picture_loader/card_picture_to_load.h

@@ -1,6 +1,7 @@
 #ifndef PICTURE_TO_LOAD_H
 #define PICTURE_TO_LOAD_H
 
+#include <QLoggingCategory>
 #include <libcockatrice/card/printing/exact_card.h>
 
 inline Q_LOGGING_CATEGORY(CardPictureToLoadLog, "card_picture_loader.picture_to_load");

cockatrice/src/interface/deck_loader/card_node_function.cpp

@@ -1,40 +0,0 @@
-#include "card_node_function.h"
-
-#include <libcockatrice/card/database/card_database.h>
-#include <libcockatrice/card/database/card_database_manager.h>
-#include <libcockatrice/deck_list/tree/deck_list_card_node.h>
-
-void CardNodeFunction::SetProviderIdToPreferred::operator()(const InnerDecklistNode *node, DecklistCardNode *card) const
-{
-    Q_UNUSED(node);
-    PrintingInfo preferredPrinting = CardDatabaseManager::query()->getPreferredPrinting(card->getName());
-    QString providerId = preferredPrinting.getUuid();
-    QString setShortName = preferredPrinting.getSet()->getShortName();
-    QString collectorNumber = preferredPrinting.getProperty("num");
-
-    card->setCardProviderId(providerId);
-    card->setCardCollectorNumber(collectorNumber);
-    card->setCardSetShortName(setShortName);
-}
-
-void CardNodeFunction::ClearPrintingData::operator()(const InnerDecklistNode *node, DecklistCardNode *card) const
-{
-    Q_UNUSED(node);
-    card->setCardSetShortName(nullptr);
-    card->setCardCollectorNumber(nullptr);
-    card->setCardProviderId(nullptr);
-}
-
-void CardNodeFunction::ResolveProviderId::operator()(const InnerDecklistNode *node, DecklistCardNode *card) const
-{
-    Q_UNUSED(node);
-    // Retrieve the providerId based on setName and collectorNumber
-    QString providerId =
-        CardDatabaseManager::getInstance()
-            ->query()
-            ->getSpecificPrinting(card->getName(), card->getCardSetShortName(), card->getCardCollectorNumber())
-            .getUuid();
-
-    // Set the providerId on the card
-    card->setCardProviderId(providerId);
-}

cockatrice/src/interface/deck_loader/card_node_function.h

@@ -1,39 +0,0 @@
-#ifndef COCKATRICE_DECK_FUNCTION_H
-#define COCKATRICE_DECK_FUNCTION_H
-
-class DecklistCardNode;
-class InnerDecklistNode;
-
-/**
- * Functions to be used with DeckList::forEachCard
- */
-namespace CardNodeFunction
-{
-
-/**
- * @brief Sets the providerId of the card to the preferred printing.
- */
-struct SetProviderIdToPreferred
-{
-    void operator()(const InnerDecklistNode *node, DecklistCardNode *card) const;
-};
-
-/**
- * @brief Clears all fields on the card related to the printing
- */
-struct ClearPrintingData
-{
-    void operator()(const InnerDecklistNode *node, DecklistCardNode *card) const;
-};
-
-/**
- * @brief Sets the providerId of the card based on its set name and collector number.
- */
-struct ResolveProviderId
-{
-    void operator()(const InnerDecklistNode *node, DecklistCardNode *card) const;
-};
-
-} // namespace CardNodeFunction
-
-#endif // COCKATRICE_DECK_FUNCTION_H

cockatrice/src/interface/deck_loader/deck_file_format.cpp

@@ -1,9 +0,0 @@
-#include "deck_file_format.h"
-
-DeckFileFormat::Format DeckFileFormat::getFormatFromName(const QString &fileName)
-{
-    if (fileName.endsWith(".cod", Qt::CaseInsensitive)) {
-        return Cockatrice;
-    }
-    return PlainText;
-}

cockatrice/src/interface/deck_loader/deck_file_format.h

@@ -1,36 +0,0 @@
-#ifndef COCKATRICE_DECK_FILE_FORMAT_H
-#define COCKATRICE_DECK_FILE_FORMAT_H
-#include <QString>
-
-namespace DeckFileFormat
-{
-
-/**
- * The deck file formats that Cockatrice supports.
- */
-enum Format
-{
-    /**
-     * Plaintext deck files, a format that is intended to be widely supported among different programs.
-     * This format does not support Cockatrice specific features such as banner cards or tags.
-     */
-    PlainText,
-
-    /**
-     * This is cockatrice's native deck file format, and supports deck metadata such as banner cards and tags.
-     * Stored as .cod files.
-     */
-    Cockatrice
-};
-
-/**
- * Determines what deck file format the given filename corresponds to.
- *
- * @param fileName The filename
- * @return The deck format
- */
-Format getFormatFromName(const QString &fileName);
-
-} // namespace DeckFileFormat
-
-#endif // COCKATRICE_DECK_FILE_FORMAT_H

cockatrice/src/interface/deck_loader/deck_loader.cpp

@@ -18,18 +18,24 @@
 #include <libcockatrice/card/database/card_database.h>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/deck_list/deck_list.h>
-#include <libcockatrice/deck_list/tree/deck_list_card_node.h>
+#include <libcockatrice/deck_list/deck_list_card_node.h>
 
 const QStringList DeckLoader::ACCEPTED_FILE_EXTENSIONS = {"*.cod", "*.dec", "*.dek", "*.txt", "*.mwDeck"};
 
 const QStringList DeckLoader::FILE_NAME_FILTERS = {
     tr("Common deck formats (%1)").arg(ACCEPTED_FILE_EXTENSIONS.join(" ")), tr("All files (*.*)")};
 
-DeckLoader::DeckLoader(QObject *parent) : QObject(parent)
+DeckLoader::DeckLoader(QObject *parent)
+    : QObject(parent), deckList(new DeckList()), lastFileFormat(CockatriceFormat), lastRemoteDeckId(-1)
 {
 }
 
-bool DeckLoader::loadFromFile(const QString &fileName, DeckFileFormat::Format fmt, bool userRequest)
+DeckLoader::DeckLoader(QObject *parent, DeckList *_deckList)
+    : QObject(parent), deckList(_deckList), lastFileFormat(CockatriceFormat), lastRemoteDeckId(-1)
+{
+}
+
+bool DeckLoader::loadFromFile(const QString &fileName, FileFormat fmt, bool userRequest)
 {
     QFile file(fileName);
     if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
@@ -37,19 +43,18 @@ bool DeckLoader::loadFromFile(const QString &fileName, DeckFileFormat::Format fm
     }
 
     bool result = false;
-    DeckList deckList = DeckList();
     switch (fmt) {
-        case DeckFileFormat::PlainText:
-            result = deckList.loadFromFile_Plain(&file);
+        case PlainTextFormat:
+            result = deckList->loadFromFile_Plain(&file);
             break;
-        case DeckFileFormat::Cockatrice: {
-            result = deckList.loadFromFile_Native(&file);
+        case CockatriceFormat: {
+            result = deckList->loadFromFile_Native(&file);
             qCInfo(DeckLoaderLog) << "Loaded from" << fileName << "-" << result;
             if (!result) {
                 qCInfo(DeckLoaderLog) << "Retrying as plain format";
                 file.seek(0);
-                result = deckList.loadFromFile_Plain(&file);
-                fmt = DeckFileFormat::PlainText;
+                result = deckList->loadFromFile_Plain(&file);
+                fmt = PlainTextFormat;
             }
             break;
         }
@@ -59,11 +64,8 @@ bool DeckLoader::loadFromFile(const QString &fileName, DeckFileFormat::Format fm
     }
 
     if (result) {
-        loadedDeck.deckList = deckList;
-        loadedDeck.lastLoadInfo = {
-            .fileName = fileName,
-            .fileFormat = fmt,
-        };
+        lastFileName = fileName;
+        lastFileFormat = fmt;
         if (userRequest) {
             updateLastLoadedTimestamp(fileName, fmt);
         }
@@ -75,7 +77,7 @@ bool DeckLoader::loadFromFile(const QString &fileName, DeckFileFormat::Format fm
     return result;
 }
 
-bool DeckLoader::loadFromFileAsync(const QString &fileName, DeckFileFormat::Format fmt, bool userRequest)
+bool DeckLoader::loadFromFileAsync(const QString &fileName, FileFormat fmt, bool userRequest)
 {
     auto *watcher = new QFutureWatcher<bool>(this);
 
@@ -84,10 +86,8 @@ bool DeckLoader::loadFromFileAsync(const QString &fileName, DeckFileFormat::Form
         watcher->deleteLater();
 
         if (result) {
-            loadedDeck.lastLoadInfo = {
-                .fileName = fileName,
-                .fileFormat = fmt,
-            };
+            lastFileName = fileName;
+            lastFileFormat = fmt;
             if (userRequest) {
                 updateLastLoadedTimestamp(fileName, fmt);
             }
@@ -104,14 +104,14 @@ bool DeckLoader::loadFromFileAsync(const QString &fileName, DeckFileFormat::Form
         }
 
         switch (fmt) {
-            case DeckFileFormat::PlainText:
-                return loadedDeck.deckList.loadFromFile_Plain(&file);
-            case DeckFileFormat::Cockatrice: {
+            case PlainTextFormat:
+                return deckList->loadFromFile_Plain(&file);
+            case CockatriceFormat: {
                 bool result = false;
-                result = loadedDeck.deckList.loadFromFile_Native(&file);
+                result = deckList->loadFromFile_Native(&file);
                 if (!result) {
                     file.seek(0);
-                    return loadedDeck.deckList.loadFromFile_Plain(&file);
+                    return deckList->loadFromFile_Plain(&file);
                 }
                 return result;
             }
@@ -127,18 +127,18 @@ bool DeckLoader::loadFromFileAsync(const QString &fileName, DeckFileFormat::Form
 
 bool DeckLoader::loadFromRemote(const QString &nativeString, int remoteDeckId)
 {
-    bool result = loadedDeck.deckList.loadFromString_Native(nativeString);
+    bool result = deckList->loadFromString_Native(nativeString);
     if (result) {
-        loadedDeck.lastLoadInfo = {
-            .remoteDeckId = remoteDeckId,
-        };
+        lastFileName = QString();
+        lastFileFormat = CockatriceFormat;
+        lastRemoteDeckId = remoteDeckId;
 
         emit deckLoaded();
     }
     return result;
 }
 
-bool DeckLoader::saveToFile(const QString &fileName, DeckFileFormat::Format fmt)
+bool DeckLoader::saveToFile(const QString &fileName, FileFormat fmt)
 {
     QFile file(fileName);
     if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) {
@@ -147,20 +147,18 @@ bool DeckLoader::saveToFile(const QString &fileName, DeckFileFormat::Format fmt)
 
     bool result = false;
     switch (fmt) {
-        case DeckFileFormat::PlainText:
-            result = loadedDeck.deckList.saveToFile_Plain(&file);
+        case PlainTextFormat:
+            result = deckList->saveToFile_Plain(&file);
             break;
-        case DeckFileFormat::Cockatrice:
-            result = loadedDeck.deckList.saveToFile_Native(&file);
+        case CockatriceFormat:
+            result = deckList->saveToFile_Native(&file);
             qCInfo(DeckLoaderLog) << "Saving to " << fileName << "-" << result;
             break;
     }
 
     if (result) {
-        loadedDeck.lastLoadInfo = {
-            .fileName = fileName,
-            .fileFormat = fmt,
-        };
+        lastFileName = fileName;
+        lastFileFormat = fmt;
         qCInfo(DeckLoaderLog) << "Deck was saved -" << result;
     }
 
@@ -170,7 +168,7 @@ bool DeckLoader::saveToFile(const QString &fileName, DeckFileFormat::Format fmt)
     return result;
 }
 
-bool DeckLoader::updateLastLoadedTimestamp(const QString &fileName, DeckFileFormat::Format fmt)
+bool DeckLoader::updateLastLoadedTimestamp(const QString &fileName, FileFormat fmt)
 {
     QFileInfo fileInfo(fileName);
     if (!fileInfo.exists()) {
@@ -191,22 +189,20 @@ bool DeckLoader::updateLastLoadedTimestamp(const QString &fileName, DeckFileForm
 
     // Perform file modifications
     switch (fmt) {
-        case DeckFileFormat::PlainText:
-            result = loadedDeck.deckList.saveToFile_Plain(&file);
+        case PlainTextFormat:
+            result = deckList->saveToFile_Plain(&file);
             break;
-        case DeckFileFormat::Cockatrice:
-            loadedDeck.deckList.setLastLoadedTimestamp(QDateTime::currentDateTime().toString());
-            result = loadedDeck.deckList.saveToFile_Native(&file);
+        case CockatriceFormat:
+            deckList->setLastLoadedTimestamp(QDateTime::currentDateTime().toString());
+            result = deckList->saveToFile_Native(&file);
             break;
     }
 
     file.close(); // Close the file to ensure changes are flushed
 
     if (result) {
-        loadedDeck.lastLoadInfo = {
-            .fileName = fileName,
-            .fileFormat = fmt,
-        };
+        lastFileName = fileName;
+        lastFileFormat = fmt;
 
         // Re-open the file and set the original timestamp
         if (!file.open(QIODevice::ReadWrite)) {
@@ -267,20 +263,6 @@ static QString toDecklistExportString(const DecklistCardNode *card)
     return cardString;
 }
 
-/**
- * Converts all cards in the list to their decklist export string and joins them into one string
- */
-static QString toDecklistExportString(const QList<const DecklistCardNode *> &cardNodes)
-{
-    QString result;
-
-    for (auto cardNode : cardNodes) {
-        result += toDecklistExportString(cardNode);
-    }
-
-    return result;
-}
-
 /**
  * Export deck to decklist function, called to format the deck in a way to be sent to a server
  *
@@ -291,11 +273,29 @@ QString DeckLoader::exportDeckToDecklist(const DeckList *deckList, DecklistWebsi
 {
     // Add the base url
     QString deckString = "https://" + getDomainForWebsite(website) + "/?";
+    // Create two strings to pass to function
+    QString mainBoardCards, sideBoardCards;
 
-    // export all cards in zone
-    QString mainBoardCards = toDecklistExportString(deckList->getCardNodes({DECK_ZONE_MAIN}));
-    QString sideBoardCards = toDecklistExportString(deckList->getCardNodes({DECK_ZONE_SIDE}));
+    // Set up the function to call
+    auto formatDeckListForExport = [&mainBoardCards, &sideBoardCards](const auto *node, const auto *card) {
+        // Get the card name
+        CardInfoPtr dbCard = CardDatabaseManager::query()->getCardInfo(card->getName());
+        if (!dbCard || dbCard->getIsToken()) {
+            // If it's a token, we don't care about the card.
+            return;
+        }
 
+        // Check if it's a sideboard card.
+        if (node->getName() == DECK_ZONE_SIDE) {
+            sideBoardCards += toDecklistExportString(card);
+        } else {
+            // If it's a mainboard card, do the same thing, but for the mainboard card string
+            mainBoardCards += toDecklistExportString(card);
+        }
+    };
+
+    // call our struct function for each card in the deck
+    deckList->forEachCard(formatDeckListForExport);
     // Remove the extra return at the end of the last cards
     mainBoardCards.chop(3);
     sideBoardCards.chop(3);
@@ -310,6 +310,112 @@ QString DeckLoader::exportDeckToDecklist(const DeckList *deckList, DecklistWebsi
     return deckString;
 }
 
+// This struct is here to support the forEachCard function call, defined in decklist.
+// It requires a function to be called for each card, and it will set the providerId to the preferred printing.
+struct SetProviderIdToPreferred
+{
+    // Main operator for struct, allowing the foreachcard to work.
+    SetProviderIdToPreferred()
+    {
+    }
+
+    void operator()(const InnerDecklistNode *node, DecklistCardNode *card) const
+    {
+        Q_UNUSED(node);
+        PrintingInfo preferredPrinting = CardDatabaseManager::query()->getPreferredPrinting(card->getName());
+        QString providerId = preferredPrinting.getUuid();
+        QString setShortName = preferredPrinting.getSet()->getShortName();
+        QString collectorNumber = preferredPrinting.getProperty("num");
+
+        card->setCardProviderId(providerId);
+        card->setCardCollectorNumber(collectorNumber);
+        card->setCardSetShortName(setShortName);
+    }
+};
+
+/**
+ * This function iterates through each card in the decklist and sets the providerId
+ * on each card based on its set name and collector number.
+ *
+ * @param deckList The decklist to modify
+ */
+void DeckLoader::setProviderIdToPreferredPrinting(const DeckList *deckList)
+{
+    // Set up the struct to call.
+    SetProviderIdToPreferred setProviderIdToPreferred;
+
+    // Call the forEachCard method for each card in the deck
+    deckList->forEachCard(setProviderIdToPreferred);
+}
+
+/**
+ * Sets the providerId on each card in the decklist based on its set name and collector number.
+ *
+ * @param deckList The decklist to modify
+ */
+void DeckLoader::resolveSetNameAndNumberToProviderID(const DeckList *deckList)
+{
+    auto setProviderId = [](const auto node, const auto card) {
+        Q_UNUSED(node);
+        // Retrieve the providerId based on setName and collectorNumber
+        QString providerId =
+            CardDatabaseManager::getInstance()
+                ->query()
+                ->getSpecificPrinting(card->getName(), card->getCardSetShortName(), card->getCardCollectorNumber())
+                .getUuid();
+
+        // Set the providerId on the card
+        card->setCardProviderId(providerId);
+    };
+
+    deckList->forEachCard(setProviderId);
+}
+
+// This struct is here to support the forEachCard function call, defined in decklist.
+// It requires a function to be called for each card, and it will set the providerId.
+struct ClearSetNameNumberAndProviderId
+{
+    // Main operator for struct, allowing the foreachcard to work.
+    ClearSetNameNumberAndProviderId()
+    {
+    }
+
+    void operator()(const InnerDecklistNode *node, DecklistCardNode *card) const
+    {
+        Q_UNUSED(node);
+        // Set the providerId on the card
+        card->setCardSetShortName(nullptr);
+        card->setCardCollectorNumber(nullptr);
+        card->setCardProviderId(nullptr);
+    }
+};
+
+/**
+ * Clears the set name and numbers on each card in the decklist.
+ *
+ * @param deckList The decklist to modify
+ */
+void DeckLoader::clearSetNamesAndNumbers(const DeckList *deckList)
+{
+    auto clearSetNameAndNumber = [](const auto node, auto card) {
+        Q_UNUSED(node)
+        // Set the providerId on the card
+        card->setCardSetShortName(nullptr);
+        card->setCardCollectorNumber(nullptr);
+        card->setCardProviderId(nullptr);
+    };
+
+    deckList->forEachCard(clearSetNameAndNumber);
+}
+
+DeckLoader::FileFormat DeckLoader::getFormatFromName(const QString &fileName)
+{
+    if (fileName.endsWith(".cod", Qt::CaseInsensitive)) {
+        return CockatriceFormat;
+    }
+    return PlainTextFormat;
+}
+
 void DeckLoader::saveToClipboard(const DeckList *deckList, bool addComments, bool addSetNameAndNumber)
 {
     QString buffer;
@@ -329,7 +435,9 @@ bool DeckLoader::saveToStream_Plain(QTextStream &out,
     }
 
     // loop zones
-    for (auto zoneNode : deckList->getZoneNodes()) {
+    for (int i = 0; i < deckList->getRoot()->size(); i++) {
+        const auto *zoneNode = dynamic_cast<InnerDecklistNode *>(deckList->getRoot()->at(i));
+
         saveToStream_DeckZone(out, zoneNode, addComments, addSetNameAndNumber);
 
         // end of zone
@@ -450,12 +558,12 @@ bool DeckLoader::convertToCockatriceFormat(QString fileName)
     bool result = false;
 
     // Perform file modifications based on the detected format
-    switch (DeckFileFormat::getFormatFromName(fileName)) {
-        case DeckFileFormat::PlainText:
+    switch (getFormatFromName(fileName)) {
+        case PlainTextFormat:
             // Save in Cockatrice's native format
-            result = loadedDeck.deckList.saveToFile_Native(&file);
+            result = deckList->saveToFile_Native(&file);
             break;
-        case DeckFileFormat::Cockatrice:
+        case CockatriceFormat:
             qCInfo(DeckLoaderLog) << "File is already in Cockatrice format. No conversion needed.";
             result = true;
             break;
@@ -474,16 +582,37 @@ bool DeckLoader::convertToCockatriceFormat(QString fileName)
         } else {
             qCInfo(DeckLoaderLog) << "Original file deleted successfully:" << fileName;
         }
-        loadedDeck.lastLoadInfo = {
-            .fileName = newFileName,
-            .fileFormat = DeckFileFormat::Cockatrice,
-        };
+        lastFileName = newFileName;
+        lastFileFormat = CockatriceFormat;
     }
 
     return result;
 }
 
-void DeckLoader::printDeckListNode(QTextCursor *cursor, const InnerDecklistNode *node)
+QString DeckLoader::getCardZoneFromName(const QString &cardName, QString currentZoneName)
+{
+    CardInfoPtr card = CardDatabaseManager::query()->getCardInfo(cardName);
+
+    if (card && card->getIsToken()) {
+        return DECK_ZONE_TOKENS;
+    }
+
+    return currentZoneName;
+}
+
+QString DeckLoader::getCompleteCardName(const QString &cardName)
+{
+    if (CardDatabaseManager::getInstance()) {
+        ExactCard temp = CardDatabaseManager::query()->guessCard({cardName});
+        if (temp) {
+            return temp.getName();
+        }
+    }
+
+    return cardName;
+}
+
+void DeckLoader::printDeckListNode(QTextCursor *cursor, InnerDecklistNode *node)
 {
     const int totalColumns = 2;
 
@@ -566,11 +695,12 @@ void DeckLoader::printDeckList(QPrinter *printer, const DeckList *deckList)
     cursor.insertText(deckList->getComments());
     cursor.insertBlock(headerBlockFormat, headerCharFormat);
 
-    for (auto zoneNode : deckList->getZoneNodes()) {
+    for (int i = 0; i < deckList->getRoot()->size(); i++) {
         cursor.insertHtml("<br><img src=theme:hr.jpg>");
+        // cursor.insertHtml("<hr>");
         cursor.insertBlock(headerBlockFormat, headerCharFormat);
 
-        printDeckListNode(&cursor, zoneNode);
+        printDeckListNode(&cursor, dynamic_cast<InnerDecklistNode *>(deckList->getRoot()->at(i)));
     }
 
     doc.print(printer);

cockatrice/src/interface/deck_loader/deck_loader.h

@@ -7,16 +7,14 @@
 #ifndef DECK_LOADER_H
 #define DECK_LOADER_H
 
-#include "loaded_deck.h"
-
 #include <QLoggingCategory>
 #include <QPrinter>
 #include <QTextCursor>
 #include <libcockatrice/deck_list/deck_list.h>
 
-inline Q_LOGGING_CATEGORY(DeckLoaderLog, "deck_loader");
+inline Q_LOGGING_CATEGORY(DeckLoaderLog, "deck_loader")
 
-class DeckLoader : public QObject
+    class DeckLoader : public QObject
 {
     Q_OBJECT
 signals:
@@ -24,6 +22,12 @@ signals:
     void loadFinished(bool success);
 
 public:
+    enum FileFormat
+    {
+        PlainTextFormat,
+        CockatriceFormat
+    };
+
     /**
      * Supported file extensions for decklist files
      */
@@ -41,26 +45,53 @@ public:
     };
 
 private:
-    LoadedDeck loadedDeck;
+    DeckList *deckList;
+    QString lastFileName;
+    FileFormat lastFileFormat;
+    int lastRemoteDeckId;
 
 public:
     DeckLoader(QObject *parent);
+    DeckLoader(QObject *parent, DeckList *_deckList);
     DeckLoader(const DeckLoader &) = delete;
     DeckLoader &operator=(const DeckLoader &) = delete;
 
-    [[nodiscard]] bool hasNotBeenLoaded() const
+    const QString &getLastFileName() const
     {
-        return loadedDeck.lastLoadInfo.isEmpty();
+        return lastFileName;
+    }
+    void setLastFileName(const QString &_lastFileName)
+    {
+        lastFileName = _lastFileName;
+    }
+    FileFormat getLastFileFormat() const
+    {
+        return lastFileFormat;
+    }
+    int getLastRemoteDeckId() const
+    {
+        return lastRemoteDeckId;
     }
 
-    bool loadFromFile(const QString &fileName, DeckFileFormat::Format fmt, bool userRequest = false);
-    bool loadFromFileAsync(const QString &fileName, DeckFileFormat::Format fmt, bool userRequest);
+    bool hasNotBeenLoaded() const
+    {
+        return getLastFileName().isEmpty() && getLastRemoteDeckId() == -1;
+    }
+
+    static void clearSetNamesAndNumbers(const DeckList *deckList);
+    static FileFormat getFormatFromName(const QString &fileName);
+
+    bool loadFromFile(const QString &fileName, FileFormat fmt, bool userRequest = false);
+    bool loadFromFileAsync(const QString &fileName, FileFormat fmt, bool userRequest);
     bool loadFromRemote(const QString &nativeString, int remoteDeckId);
-    bool saveToFile(const QString &fileName, DeckFileFormat::Format fmt);
-    bool updateLastLoadedTimestamp(const QString &fileName, DeckFileFormat::Format fmt);
+    bool saveToFile(const QString &fileName, FileFormat fmt);
+    bool updateLastLoadedTimestamp(const QString &fileName, FileFormat fmt);
 
     static QString exportDeckToDecklist(const DeckList *deckList, DecklistWebsite website);
 
+    static void setProviderIdToPreferredPrinting(const DeckList *deckList);
+    static void resolveSetNameAndNumberToProviderID(const DeckList *deckList);
+
     static void saveToClipboard(const DeckList *deckList, bool addComments = true, bool addSetNameAndNumber = true);
     static bool saveToStream_Plain(QTextStream &out,
                                    const DeckList *deckList,
@@ -76,21 +107,13 @@ public:
 
     bool convertToCockatriceFormat(QString fileName);
 
-    LoadedDeck &getDeck()
+    DeckList *getDeckList()
     {
-        return loadedDeck;
-    }
-    const LoadedDeck &getDeck() const
-    {
-        return loadedDeck;
-    }
-    void setDeck(const LoadedDeck &deck)
-    {
-        loadedDeck = deck;
+        return deckList;
     }
 
 private:
-    static void printDeckListNode(QTextCursor *cursor, const InnerDecklistNode *node);
+    static void printDeckListNode(QTextCursor *cursor, InnerDecklistNode *node);
     static void saveToStream_DeckHeader(QTextStream &out, const DeckList *deckList);
 
     static void saveToStream_DeckZone(QTextStream &out,
@@ -102,6 +125,9 @@ private:
                                            QList<DecklistCardNode *> cards,
                                            bool addComments = true,
                                            bool addSetNameAndNumber = true);
+
+    [[nodiscard]] static QString getCardZoneFromName(const QString &cardName, QString currentZoneName);
+    [[nodiscard]] static QString getCompleteCardName(const QString &cardName);
 };
 
 #endif

cockatrice/src/interface/deck_loader/loaded_deck.cpp

@@ -1,11 +0,0 @@
-#include "loaded_deck.h"
-
-bool LoadedDeck::LoadInfo::isEmpty() const
-{
-    return fileName.isEmpty() && remoteDeckId == NON_REMOTE_ID;
-}
-
-bool LoadedDeck::isEmpty() const
-{
-    return deckList.isEmpty() && lastLoadInfo.isEmpty();
-}

cockatrice/src/interface/deck_loader/loaded_deck.h

@@ -1,39 +0,0 @@
-#ifndef COCKATRICE_LOADED_DECK_H
-#define COCKATRICE_LOADED_DECK_H
-
-#include "deck_file_format.h"
-#include "libcockatrice/deck_list/deck_list.h"
-
-#include <QString>
-
-/**
- * @brief Represents a deck that was loaded from somewhere.
- * Contains the DeckList itself, as well as info about where it was loaded from.
- */
-struct LoadedDeck
-{
-
-    /**
-     * @brief Information about where the deck was loaded from.
-     *
-     * For local decks, the remoteDeckId field will always be -1.
-     * For remote decks, fileName will be empty and fileFormat will always be CockatriceFormat
-     */
-    struct LoadInfo
-    {
-        static constexpr int NON_REMOTE_ID = -1;
-
-        QString fileName = "";
-        DeckFileFormat::Format fileFormat = DeckFileFormat::Cockatrice;
-        int remoteDeckId = NON_REMOTE_ID;
-
-        bool isEmpty() const;
-    };
-
-    DeckList deckList;          ///< The decklist itself
-    LoadInfo lastLoadInfo = {}; ///< info about where the deck was loaded from
-
-    bool isEmpty() const;
-};
-
-#endif // COCKATRICE_LOADED_DECK_H

cockatrice/src/interface/layouts/flow_layout.h

@@ -23,9 +23,9 @@ public:
     ~FlowLayout() override;
     void insertWidgetAtIndex(QWidget *toInsert, int index);
 
-    [[nodiscard]] QSize calculateMinimumSizeHorizontal() const;
-    [[nodiscard]] QSize calculateSizeHintVertical() const;
-    [[nodiscard]] QSize calculateMinimumSizeVertical() const;
+    QSize calculateMinimumSizeHorizontal() const;
+    QSize calculateSizeHintVertical() const;
+    QSize calculateMinimumSizeVertical() const;
     void addItem(QLayoutItem *item) override;
     [[nodiscard]] int count() const override;
     [[nodiscard]] QLayoutItem *itemAt(int index) const override;
@@ -48,7 +48,7 @@ public:
     void layoutSingleColumn(const QVector<QLayoutItem *> &colItems, int x, int y);
     [[nodiscard]] QSize sizeHint() const override;
     [[nodiscard]] QSize minimumSize() const override;
-    [[nodiscard]] QSize calculateSizeHintHorizontal() const;
+    QSize calculateSizeHintHorizontal() const;
 
 protected:
     QList<QLayoutItem *> items; // List to store layout items

cockatrice/src/interface/widgets/cards/additional_info/color_identity_widget.cpp

@@ -5,6 +5,7 @@
 
 #include <QHBoxLayout>
 #include <QLabel>
+#include <QPixmap>
 #include <QRegularExpression>
 #include <QResizeEvent>
 #include <QSize>

cockatrice/src/interface/widgets/cards/additional_info/mana_cost_widget.cpp

@@ -4,6 +4,7 @@
 
 #include <QHBoxLayout>
 #include <QLabel>
+#include <QPixmap>
 #include <QResizeEvent>
 #include <QSize>
 #include <qregularexpression.h>