fix

.ci/ArchLinux/Dockerfile

@@ -9,7 +9,6 @@ RUN pacman --sync --refresh --sysupgrade --needed --noconfirm \
         mariadb-libs \
         protobuf \
         qt6-base \
-        qt6-imageformats \
         qt6-multimedia \
         qt6-svg \
         qt6-tools \

.ci/Debian11/Dockerfile

@@ -17,7 +17,6 @@ RUN apt-get update && \
         libqt5svg5-dev \
         libqt5websockets5-dev \
         protobuf-compiler \
-        qt5-image-formats-plugins \
         qtmultimedia5-dev \
         qttools5-dev \
         qttools5-dev-tools \

.ci/Debian12/Dockerfile

@@ -18,7 +18,6 @@ RUN apt-get update && \
         qt6-svg-dev \
         qt6-websockets-dev \
         protobuf-compiler \
-        qt6-image-formats-plugins \
         qt6-l10n-tools \
         qt6-multimedia-dev \
         qt6-tools-dev \

.ci/Fedora37/Dockerfile

@@ -1,4 +1,4 @@
-FROM fedora:40
+FROM fedora:37
 
 RUN dnf install -y \
         ccache \
@@ -8,7 +8,6 @@ RUN dnf install -y \
         mariadb-devel \
         protobuf-devel \
         qt6-{qttools,qtsvg,qtmultimedia,qtwebsockets}-devel \
-        qt6-qtimageformats \
         rpm-build \
         xz-devel \
         zlib-devel \

.ci/Fedora38/Dockerfile

@@ -1,4 +1,4 @@
-FROM fedora:41
+FROM fedora:38
 
 RUN dnf install -y \
         ccache \
@@ -8,7 +8,6 @@ RUN dnf install -y \
         mariadb-devel \
         protobuf-devel \
         qt6-{qttools,qtsvg,qtmultimedia,qtwebsockets}-devel \
-        qt6-qtimageformats \
         rpm-build \
         xz-devel \
         zlib-devel \

.ci/UbuntuBionic/Dockerfile

@@ -0,0 +1,24 @@
+FROM ubuntu:bionic
+
+RUN apt-get update && apt-get install -y --no-install-recommends \
+        build-essential \
+        ccache \
+        clang-format \
+        cmake \
+        file \
+        g++ \
+        git \
+        liblzma-dev \
+        libmariadb-dev-compat \
+        libprotobuf-dev \
+        libqt5multimedia5-plugins \
+        libqt5sql5-mysql \
+        libqt5svg5-dev \
+        libqt5websockets5-dev \
+        protobuf-compiler \
+        qt5-default \
+        qtmultimedia5-dev \
+        qttools5-dev \
+        qttools5-dev-tools \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*

.ci/UbuntuFocal/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:20.04
+FROM ubuntu:focal
 
 RUN apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
@@ -18,7 +18,6 @@ RUN apt-get update && \
         libqt5websockets5-dev \
         protobuf-compiler \
         qt5-default \
-        qt5-image-formats-plugins \
         qtmultimedia5-dev \
         qttools5-dev \
         qttools5-dev-tools \

.ci/UbuntuJammy/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:22.04
+FROM ubuntu:jammy
 
 RUN apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
@@ -18,7 +18,6 @@ RUN apt-get update && \
         libqt6svg6-dev \
         libqt6websockets6-dev \
         protobuf-compiler \
-        qt6-image-formats-plugins \
         qt6-l10n-tools \
         qt6-multimedia-dev \
         qt6-tools-dev \

.ci/UbuntuLunar/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:24.04
+FROM ubuntu:lunar
 
 RUN apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
@@ -18,7 +18,6 @@ RUN apt-get update && \
         qt6-svg-dev \
         qt6-websockets-dev \
         protobuf-compiler \
-        qt6-image-formats-plugins \
         qt6-l10n-tools \
         qt6-multimedia-dev \
         qt6-tools-dev \

.ci/compile.sh

@@ -160,13 +160,7 @@ cmake .. "${flags[@]}"
 echo "::endgroup::"
 
 echo "::group::Build project"
-if [[ $RUNNER_OS == Windows ]]; then
-  # Enable MTT, see https://devblogs.microsoft.com/cppblog/improved-parallelism-in-msbuild/
-  # and https://devblogs.microsoft.com/cppblog/cpp-build-throughput-investigation-and-tune-up/#multitooltask-mtt
-  cmake --build . "${buildflags[@]}" -- -p:UseMultiToolTask=true -p:EnableClServerMode=true
-else
-  cmake --build . "${buildflags[@]}"
-fi
+cmake --build . "${buildflags[@]}"
 echo "::endgroup::"
 
 if [[ $USE_CCACHE ]]; then
@@ -189,12 +183,6 @@ fi
 
 if [[ $MAKE_PACKAGE ]]; then
   echo "::group::Create package"
-  
-  if [[ $RUNNER_OS == macOS ]]; then
-    # Workaround https://github.com/actions/runner-images/issues/7522
-    echo "killing XProtectBehaviorService"; sudo pkill -9 XProtect >/dev/null || true;
-    echo "waiting for XProtectBehaviorService kill"; while pgrep "XProtect"; do sleep 3; done;
-  fi
   cmake --build . --target package --config "$BUILDTYPE"
   echo "::endgroup::"
 

.ci/macos.entitlements

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-    <key>com.apple.security.app-sandbox</key>
-    <false/>
-
-    <key>com.apple.security.cs.disable-library-validation</key>
-    <true/>
-
-    <key>com.apple.security.cs.disable-executable-page-protection</key>
-    <true/>
-
-    <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
-    <true/>
-</dict>
-</plist>

.ci/release_template.md

@@ -4,30 +4,24 @@
 git push -d origin --REPLACE-WITH-BETA-LIST--
  -->
 
-<!-- This list of binaries should be updated every time the CI is changed to include all targets -->
+<!-- This list of binaries should be updated every time the ci is changed to
+include different targets -->
 <pre>
-Available pre-compiled binaries for installation:
-
-  <b>Windows</b>
-   • <kbd>Windows 10+</kbd>
-   • <kbd>Windows 7+</kbd>
-
-  <b>macOS</b>
-   • <kbd>macOS 15+</kbd> <sub><i>Sequoia</i></sub> <sub>Apple M</sub>
-   • <kbd>macOS 14+</kbd> <sub><i>Sonoma</i></sub> <sub>Apple M</sub>
-   • <kbd>macOS 13+</kbd> <sub><i>Ventura</i></sub> <sub>Intel</sub>
-
-  <b>Linux</b>
-   • <kbd>Ubuntu 24.04 LTS</kbd> <sub><i>Noble Numbat</i></sub>
-   • <kbd>Ubuntu 22.04 LTS</kbd> <sub><i>Jammy Jellyfish</i></sub>
-   • <kbd>Ubuntu 20.04 LTS</kbd> <sub><i>Focal Fossa</i></sub>
-   • <kbd>Debian 12</kbd> <sub><i>Bookworm</i></sub>
-   • <kbd>Debian 11</kbd> <sub><i>Bullseye</i></sub>
-   • <kbd>Fedora 41</kbd>
-   • <kbd>Fedora 40</kbd>
-
-<sub>We are also packaged in <kbd>Arch Linux</kbd>'s <a href="https://archlinux.org/packages/extra/x86_64/cockatrice">official extra repository</a>, courtesy of @FFY00.</sub>
-<sub>General Linux support is available via a <kbd>flatpak</kbd> package at <a href="https://flathub.org/apps/io.github.Cockatrice.cockatrice">Flathub</a>!</sub>
+<b>Pre-compiled binaries we serve:</b>
+ - <kbd>Windows 7+</kbd>
+ - <kbd>Windows 10+</kbd>
+ - <kbd>macOS 10.15+</kbd> ("Catalina")
+ - <kbd>macOS 12+</kbd> ("Monterey")
+ - <kbd>Ubuntu 18.04 LTS</kbd> ("Bionic Beaver")
+ - <kbd>Ubuntu 20.04 LTS</kbd> ("Focal Fossa")
+ - <kbd>Ubuntu 22.04 LTS</kbd> ("Jammy Jellyfish")
+ - <kbd>Ubuntu 23.04</kbd> ("Lunar Lobster")
+ - <kbd>Debian 11</kbd> ("Bullseye")
+ - <kbd>Debian 12</kbd> ("Bookworm")
+ - <kbd>Fedora 37</kbd>
+ - <kbd>Fedora 38</kbd>
+<kbd>We are also packaged in Arch Linux's official community repository, courtesy of @FFY00</kbd></i>
+<kbd>General Linux support is available via a flatpak package (Flathub)</kbd></i>
 </pre>
 
 
@@ -35,24 +29,22 @@ Available pre-compiled binaries for installation:
 
 We're pleased to announce the newest official release: <kbd>--REPLACE-WITH-RELEASE-TITLE--</kbd>
 
-We hope you enjoy the changes made! All improvements with their corresponding tickets since the last version of Cockatrice are listed in the changelog below.
+We hope you enjoy the changes made and we have listed all changes, with their corresponding tickets, since the last version of Cockatrice was released for your convenience.
 
-If you ever encounter a bug, have a suggestion or idea, or feel a need for a developer to look into something, please feel free to [open a ticket](https://github.com/Cockatrice/Cockatrice/issues). ([How to create a Ticket for Cockatrice](https://github.com/Cockatrice/Cockatrice/wiki/How-to-Create-a-GitHub-Ticket-Regarding-Cockatrice))
+If you ever encounter a bug, have a suggestion or idea, or feel a need for a developer to look into something, please feel free to [open a ticket](https://github.com/Cockatrice/Cockatrice/issues). ([How to create a GitHub Ticket for Cockatrice](https://github.com/Cockatrice/Cockatrice/wiki/How-to-Create-a-GitHub-Ticket-Regarding-Cockatrice))
 
-For basic information related to the app and getting started, please take a look at our official site: **https://cockatrice.github.io**
+For any information relating to Cockatrice, please take a look at our official site: **https://cockatrice.github.io**
 
-If you'd like to help and contribute to Cockatrice in any way, check out our [README](https://github.com/Cockatrice/Cockatrice#get-involved-).  
-We're always available to answer questions you may have on how the program works and how you can provide a meaningful contribution.
+If you'd like to help contribute to Cockatrice in any way, check out our [README](https://github.com/Cockatrice/Cockatrice#get-involved-). We're always available to answer questions you may have on how the program works and how you can provide a meaningful contribution.
 
 
 ## Upgrading Cockatrice
 <!-- this optional section puts a warning banner for problems with updating
-> [!IMPORTANT]  
-> **With this release, we no longer provide a ready-to-install binary for:**  
+> ⚠️ **With this release, we no longer provide a ready-to-install binary for:**
 > --DEPRECATED-OS-HERE--
  -->
 
-Run the internal software updater: <kbd>Help → Check for Client Updates</kbd>
+- Run the internal software updater: <kbd>Help → Check for Client Updates</kbd>
 
 Don't forget to update your card database right after! (<kbd>Help → Check for Card Updates...</kbd>)
 
@@ -69,14 +61,14 @@ Remove empty headers when done.
  -->
 
 <!-- Highlights of the release -->
-### 🔖 Highlights:
+### ⚠️ Important:
 ### ✨ New Features:
-### 🐛 Fixed Bugs / Resolved Issues:
+### 🐛 Fixed Bugs / Resolved issues:
 
 <!-- Complete list of changes (foldable) -->
 <details>
 <summary>
-<b>Show all changes</b> (--REPLACE-WITH-COMMIT-COUNT-- commits)
+📘 <b>Show all changes</b> (--REPLACE-WITH-COMMIT-COUNT-- commits)
 </summary>
 
 ### User Interface
@@ -97,6 +89,5 @@ Remove empty headers when done.
 
 ## Special Thanks
 <!-- Personalise this a bit! -->
-It's amazing that so many people contribute their time, knowledge, code, testing and more to the project.  
-We'd like to thank the entire Cockatrice community for their efforts! 🙏
+We continue to find it amazing that so many people contribute their time, knowledge, code, testing and more to the project. We'd like to thank the entire Cockatrice community for their efforts.
 <!-- We'd like to especially recognize @ZeldaZach, --ADD-CONTRIBUTORS-HERE-- for their help in preparing so many amazing new features for the user base. -->

.ci/update_translation_source_strings.sh

@@ -45,14 +45,12 @@ if ! got="$(lupdate $DIRS -ts "$FILE" | tee /dev/stderr)"; then
 fi
 
 # trim output
-# the line we are interested in is:
-# Found xxx source text(s) (x new and xxx already existing)
-output="${got##* source text(s) (}" # get stuff in between brackets
+output="${got##*(}" # trim everything before last (
 output="${output%%)*}" # trim everything after first )
-if [[ $output == "$got" ]]; then
+if [[ $output == $got ]]; then
   echo "could not parse generated output" >&2
   exit 4;
 fi
 
 # write output to ci environment file
-echo "output=$output" >> "$GITHUB_OUTPUT"
+echo "output=$output" >> $GITHUB_OUTPUT

.github/CONTRIBUTING.md

@@ -7,33 +7,32 @@
 <br>
 
 # Contributing to Cockatrice #
+First off, thanks for taking the time to contribute to our project! 🎉 ❤ ️✨
 
-First off, thanks for taking the time and considering to lend a helping hand to our project! 🎉 ❤ ️✨
-
-> [!NOTE]
-> The following is a set of guidelines for contributing to Cockatrice.  
-> These are mostly guidelines, not rules. Use your best judgment, and feel free to
-> propose changes to this document in a pull request.
->
-> [![Discord](
-> https://img.shields.io/discord/314987288398659595?label=Discord&logo=discord&logoColor=white)](
-> https://discord.gg/3Z9yzmA)  
-> If you'd like to ask questions, get advice, or just want to say "Hi",
-> the Cockatrice Development Team uses [Discord](https://discord.gg/ZASRzKu)
-> for communications and you can reach out in the `#dev` channel.
+The following is a set of guidelines for contributing to Cockatrice. These are
+mostly guidelines, not rules. Use your best judgment, and feel free to propose
+changes to this document in a pull request.
 
 
 # Recommended Setups #
 
-For those developers on **Linux** or **macOS** environment, many of our
+For those developers who like the Linux or MacOS environment, many of our
 developers like working with a nifty program called [CLion](
-https://www.jetbrains.com/clion/). The program is a great asset and one of the
-best tools you'll find on these systems.
+https://www.jetbrains.com/clion/). The program's a great asset and one of the
+best tools you'll find on these systems, but you're welcomed to use any IDE
+you most enjoy.
 
-Developers on **Windows** systems tend to find [Visual Studio](
+Developers who like Windows development tend to find [Visual Studio](
 https://www.visualstudio.com/) the best tool for the job.
 
-But you're welcomed to use any IDE you enjoy most of course!
+[![Discord](https://img.shields.io/discord/314987288398659595?label=Discord&logo=discord&logoColor=white&color=7289da)](https://discord.gg/ZASRzKu)
+[![Gitter Chat](https://img.shields.io/gitter/room/Cockatrice/Cockatrice.svg)](https://gitter.im/Cockatrice/Cockatrice)
+
+If you'd like to ask questions, get advice, or just want to say hi,
+the Cockatrice Development Team uses [Discord](https://discord.gg/ZASRzKu)
+for communications in the #dev channel. If you're not into Discord, we also
+have a [Gitter](https://gitter.im/Cockatrice/Cockatrice) channel available,
+albeit slightly less active.
 
 
 # Code Style Guide #
@@ -55,7 +54,7 @@ The message will look like this:
 ***  Then commit and push those changes to this branch. ***
 ***   Check our CONTRIBUTING.md file for more details.  ***
 ***                                                     ***
-***                    Thank you ❤️                     ***
+***                    Thank you ❤️                      ***
 ***                                                     ***
 ***********************************************************
 ```
@@ -65,7 +64,7 @@ information on our formatting guidelines.
 
 ### Compatibility ###
 
-Cockatrice is currently compiled on all platforms using <kbd>C++20</kbd>.
+Cockatrice is currently compiled on all platforms using <kbd>C++11</kbd>.
 You'll notice <kbd>C++03</kbd> code throughout the codebase. Please feel free
 to help convert it over!
 
@@ -79,12 +78,11 @@ or other appropriate conversion.
 ### Formatting ###
 
 The handy tool `clang-format` can format your code for you, it is available for
-almost any environment. A special [`.clang-format`](
-https://github.com/Cockatrice/Cockatrice/blob/master/.clang-format) configuration file is
+almost any environment. A special `.clang-format` configuration file is
 included in the project and is used to format your code.
 
 We've also included a bash script, `format.sh`, that will use clang-format to
-format all files in your PR in one go. Use `./format.sh --help` to show a full
+format all files in your pr in one go. Use `./format.sh --help` to show a full
 help page.
 
 To run clang-format on a single source file simply use the command
@@ -92,10 +90,10 @@ To run clang-format on a single source file simply use the command
 clang-format with a specific version number appended,
 `find /usr/bin -name clang-format*` should find it for you)
 
-See the [clang-format documentation](
+See [the clang-format documentation](
 https://clang.llvm.org/docs/ClangFormat.html) for more information about the tool.
 
-#### Header Files ####
+#### Header files ####
 
 Use header files with the extension `.h` and source files with the extension
 `.cpp`.
@@ -170,10 +168,10 @@ braces around single line statements is preferred.
 See the following example:
 ```c++
 int main()
-{                                        // function or class: own line
-    if (someCondition) {                 // control statement: same line
-        doSomething();                   // single line statement, braces preferred
-    } else if (someOtherCondition1) {    // else goes on the same line as a closing brace
+{                                     // function or class: own line
+    if (someCondition) {              // control statement: same line
+        doSomething();                // single line statement, braces preferred
+    } else if (someOtherCondition1) { // else goes on the same line as a closing brace
         for (int i = 0; i < 100; i++) {
             doSomethingElse();
         }
@@ -236,7 +234,7 @@ mutating objects.)
 When pointers can't be avoided, try to use a smart pointer of some sort, such
 as `QScopedPointer`, or, less preferably, `QSharedPointer`.
 
-### Database Migrations ###
+### Database migrations ###
 
 The servatrice database's schema can be found at `servatrice/servatrice.sql`.
 Everytime the schema gets modified, some other steps are due:
@@ -257,7 +255,7 @@ Ensure that the migration produces the expected effects; e.g. if you add a
 new column, make sure the migration places it in the same order as
 servatrice.sql.
 
-### Protocol Buffer ###
+### Protocol buffer ###
 
 Cockatrice and Servatrice exchange data using binary messages. The syntax of
 these messages is defined in the `proto` files in the `common/pb` folder. These
@@ -270,7 +268,6 @@ new clients incompatible to the old server and vice versa.
 You can find more information on how we use Protobuf on [our wiki!](
 https://github.com/Cockatrice/Cockatrice/wiki/Client-server-protocol)
 
-
 # Reviewing Pull Requests #
 
 After you have finished your changes to the project you should put them on a
@@ -289,7 +286,6 @@ all changes have been approved your pull request will be squashed into a single
 commit and merged into the master branch by a team member. Your change will then
 be included in the next release 👍
 
-
 # Translations #
 
 Basic workflow for translations:
@@ -298,16 +294,16 @@ Basic workflow for translations:
  3. Maintainer verifies and merges the change;
  4. Transifex picks up the new files from GitHub automatically;
  5. Translators translate the new untranslated strings on Transifex;
- 6. Before a release, a maintainer fetches the newest translations from Transifex.
+ 6. Before a release, a maintainer fetches the updated translations from Transifex.
 
 ### Using Translations (for developers) ###
 
 All user interface strings inside Cockatrice's source code must be written
 in English (US).
 Translations to other languages are managed using [Transifex](
-https://transifex.com/cockatrice/cockatrice/).
+https://www.transifex.com/projects/p/cockatrice/).
 
-Adding a new string for translation is as easy as adding the string in the
+Adding a new string to translate is as easy as adding the string in the
 `tr("")` function, the string will be picked up as translatable automatically
 and translated as needed.
 For example, setting the text of a label in the way that the string
@@ -319,9 +315,9 @@ nameLabel.setText(tr("My name is:"));
 To translate a string that would have plural forms you can add the amount to
 the tr() call, also you can add an extra string as a hint for translators:
 ```c++
-QString message = tr("Everyone draws %n cards", "english hint for translators", amount);
+QString message = tr("Everyone draws %n cards", "pop up message", amount);
 ```
-See [Qt's wiki on translations](
+See [QT's wiki on translations](
 https://doc.qt.io/qt-5/i18n-source-translation.html#handling-plurals)
 
 If you're about to propose a change that adds or modifies any translatable
@@ -329,7 +325,7 @@ string in the code, you don't need to take care of adding the new strings to
 the translation files.<br>
 We have an automated process to update our language source files on a schedule
 and provide the translators on Transifex with the new contents.<br>
-Maintainers can also manually trigger this workflow on demand via GitHub Actions.
+Maintainers can also manually trigger this on demand.
 
 ### Maintaining Translations (for maintainers) ###
 
@@ -393,27 +389,27 @@ Now you are ready to commit your changes and open a PR.
 </details>
 
 Once the changes get merged, Transifex will pick up the modified files
-automatically (checked every few hours) and update the web editor where
+automatically (checked every few hours) and update their online editor where
 translators will be able to translate the new strings right in the browser.
 
 ### Releasing Translations (for maintainers) ###
 
-Before publishing a new release, a maintainer should fetch the most up to date
+Before rushing out a new release, a maintainer should fetch the most up to date
 translations from Transifex and commit them into the Cockatrice source code.
-We utilize the official GitHub integration to push all languages that are 100%
-translated from Transifex to our GitHub repo automatically.
-On top, it runs on a quarterly schedule to update changes for incomplete languages.
-A synchronisation/update can also be triggered manually from the Transifex web interface
-and a translation treshold can be set.
+This can be done manually from the Transifex web interface, but it's quite time
+consuming.
+
+As an alternative, you can install the Transifex CLI:
+
+    http://docs.transifex.com/developer/client/
 
-As an alternative, you can install the [Transifex CLI](https://developers.transifex.com/docs/cli).
 You'll then be able to use a git-like cli command to push and pull translations
 from Transifex to the source code and vice versa.
 
 ### Adding Translations (for translators) ###
 
-As a translator, you can help to translate new strings on [Transifex](
-https://www.transifex.com/projects/p/cockatrice/) to your native language.
+As a translator you can help translate the new strings on [Transifex](
+https://www.transifex.com/projects/p/cockatrice/).
 Please have a look at the specific [FAQ for translators](
 https://github.com/Cockatrice/Cockatrice/wiki/Translation-FAQ).
 
@@ -423,9 +419,9 @@ https://github.com/Cockatrice/Cockatrice/wiki/Translation-FAQ).
 ### Publishing A New Release ###
 
 We use [GitHub Releases](https://github.com/Cockatrice/Cockatrice/releases) to
-publish new stable versions and beta releases.
-Whenever a git tag is pushed to the repository, GitHub will create a draft
-release and upload binaries from our CI automatically.
+publish new stable versions and betas.
+Whenever a git tag is pushed to the repository github will create a draft
+release and upload binaries automatically.
 
 To create a tag, simply do the following:
 ```bash
@@ -437,16 +433,18 @@ git push $UPSTREAM $TAG_NAME
 ```
 
 You should define the variables as such:
- - `$UPSTREAM`: the remote for `git@github.com:Cockatrice/Cockatrice.git`
- - `$TAG_NAME` should be formatted as:
-     - `YYYY-MM-DD-Release-MAJ.MIN.PATCH` for **stable releases**
-     - `YYYY-MM-DD-Development-MAJ.MIN.PATCH-beta.X` for **beta releases**<br>
-       With <kbd>MAJ</kbd>.<kbd>MIN</kbd>.<kbd>PATCH</kbd> being the NEXT release version!
+```
+`$UPSTREAM` - the remote for git@github.com:Cockatrice/Cockatrice.git
+`$TAG_NAME` should be formatted as:
+  - `YYYY-MM-DD-Release-MAJ.MIN.PATCH` for **stable releases**
+  - `YYYY-MM-DD-Development-MAJ.MIN.PATCH-beta.X` for **beta releases**<br>
+    With *MAJ.MIN.PATCH* being the NEXT release version!
+```
 
 This will cause a tagged release to be established on the GitHub repository,
-with the binaries being added to the release whenever they are done building in CI.
-The release is initially a draft, where the release notes can be edited and after
-all is checked and ready, it can be published as GitHub release.
+with the binaries being added to the release whenever they are ready.
+The release is initially a draft, where the path notes can be edited and after
+all is good and ready it can be published on GitHub.
 If you use a SemVer tag including "beta", the release that will be created at
 GitHub will be marked as a "Pre-release" automatically.
 The target of the `.../latest` URL will not be changed in that case, it always
@@ -459,7 +457,7 @@ revoke the tag by doing the following:
 git push --delete upstream $TAG_NAME
 git tag -d $TAG_NAME
 ```
-You can also do this on GitHub, you'll also want to delete the false release.
+You can also do this on GitHub, you'll also want to delete the new release.
 
 In the first lines of [CMakeLists.txt](
 https://github.com/Cockatrice/Cockatrice/blob/master/CMakeLists.txt)
@@ -470,24 +468,25 @@ coming from the tag title, it's good practice to increment the ones at CMake
 after every full release to stress that master is ahead of the last stable
 release.
 The preferred flow of operation is:
- - Just before a release, make sure the version number in CMakeLists.txt is set
-   to the same release version you are about to tag.
- - This is also the time to change the pretty name in CMakeLists.txt called
-   `GIT_TAG_RELEASENAME` and commit and push these changes.
- - Tag the release following the previously described syntax in order to get it
-   correctly built and deployed by CI.
- - Wait for the configuration step to create the release and update the patch
-   notes.
- - Check on the GitHub Actions page for build progress which should be the top
-   listed [here](
+ * Just before a release, make sure the version number in CMakeLists.txt is set
+ to the same release version you are about to tag.
+ * This is also the time to change the pretty name in CMakeLists.txt called
+ GIT_TAG_RELEASENAME and commit and push these changes.
+ * Tag the release following the previously described syntax in order to get it
+ correctly built and deployed by CI.
+ * Wait for the configure step to create the release and update the patch
+ notes.
+ * Check on the github actions page for build progress which should be the top
+ listed [here](
  https://github.com/Cockatrice/Cockatrice/actions?query=event%3Apush+-branch%3Amaster
  ).
- - When the build has been completed, you can verify if all uploaded files on the
-   draft release are included and hit the publish button.
- - After the release is complete, update the CMake version number again to the
-   next targeted beta version, typically increasing `PROJECT_VERSION_PATCH` by
-   one.
+ * When the build has been completed you can verify all uploaded files on the
+ release are in order and hit the publish button.
+ * After the release is complete, update the CMake version number again to the
+ next targeted beta version, typically increasing `PROJECT_VERSION_PATCH` by
+ one.
 
 When releasing a new stable version, all previous beta releases (and tags)
-should be deleted as well.
+should be deleted. This is needed for Cockatrice to update users of the "Beta"
+release channel correctly to the latest stable version as well.
 This can be done the same way as revoking tags, mentioned above.

.github/workflows/desktop-build.yml

@@ -16,7 +16,7 @@ on:
       - '**.md'
       - 'webclient/**'
       - '.github/workflows/web-*.yml'
-      - '.github/workflows/translations-*.yml'
+      - '.github/workflows/translations.yml'
 
 # Cancel earlier, unfinished runs of this workflow on the same branch (unless on master)
 concurrency:
@@ -37,13 +37,13 @@ jobs:
         shell: bash
         run: |
           tag_regex='^refs/tags/'
-          if [[ $GITHUB_EVENT_NAME == pull-request ]]; then    # pull request
+          if [[ $GITHUB_EVENT_NAME == pull-request ]]; then # pull request
             sha="${{github.event.pull_request.head.sha}}"
-          elif [[ $GITHUB_REF =~ $tag_regex ]]; then    # release
+          elif [[ $GITHUB_REF =~ $tag_regex ]]; then # release
             sha="$GITHUB_SHA"
             tag="${GITHUB_REF/refs\/tags\//}"
             echo "tag=$tag" >>"$GITHUB_OUTPUT"
-          else    # push to branch
+          else # push to branch
             sha="$GITHUB_SHA"
           fi
           echo "sha=$sha" >>"$GITHUB_OUTPUT"
@@ -85,52 +85,46 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # These names correspond to the files in ".ci/$distro$version"
+        # these names correspond to the files in .ci/$distro
         include:
-          - distro: Arch
-            package: skip    # We are packaged in Arch already
+          - distro: ArchLinux
+            package: skip # we are packaged in arch already
             allow-failure: yes
 
-          - distro: Debian
-            version: 11
-            package: DEB
-            test: skip    # Running tests on all distros is superfluous
-
-          - distro: Debian
-            version: 12
+          - distro: Debian11
             package: DEB
 
-          - distro: Fedora
-            version: 40
-            package: RPM
-            test: skip    # Running tests on all distros is superfluous
+          - distro: Debian12
+            package: DEB
 
-          - distro: Fedora
-            version: 41
+          - distro: Fedora37
             package: RPM
 
-          - distro: Ubuntu
-            version: 20.04
-            package: DEB
-            test: skip    # Ubuntu 20.04 has a broken Qt for debug builds
+          - distro: Fedora38
+            package: RPM
 
-          - distro: Ubuntu
-            version: 22.04
-            package: DEB
-            test: skip    # Running tests on all distros is superfluous
-
-          - distro: Ubuntu
-            version: 24.04
+          - distro: UbuntuBionic
             package: DEB
 
-    name: ${{matrix.distro}} ${{matrix.version}}
+          - distro: UbuntuFocal
+            package: DEB
+            test: skip # UbuntuFocal has a broken qt for debug builds
+
+          - distro: UbuntuJammy
+            package: DEB
+            test: skip # running tests on all distros is superfluous
+
+          - distro: UbuntuLunar
+            package: DEB
+
+    name: ${{matrix.distro}}
     needs: configure
     runs-on: ubuntu-latest
     continue-on-error: ${{matrix.allow-failure == 'yes'}}
     env:
-      NAME: ${{matrix.distro}}${{matrix.version}}
-      CACHE: /tmp/${{matrix.distro}}${{matrix.version}}-cache    # ${{runner.temp}} does not work?
-      # Cache size over the entire repo is 10Gi:
+      NAME: ${{matrix.distro}}
+      CACHE: /tmp/${{matrix.distro}}-cache # ${{runner.temp}} does not work?
+      # cache size over the entire repo is 10Gi link:
       # https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#usage-limits-and-eviction-policy
       CCACHE_SIZE: 200M
 
@@ -138,31 +132,33 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Generate cache timestamp
+      - name: Get cache timestamp
         id: cache_timestamp
         shell: bash
         run: echo "timestamp=$(date -u '+%Y%m%d%H%M%S')" >>"$GITHUB_OUTPUT"
 
       - name: Restore cache
-        uses: actions/cache@v4
+        uses: actions/cache@v3
         env:
           timestamp: ${{steps.cache_timestamp.outputs.timestamp}}
         with:
           path: ${{env.CACHE}}
-          key: docker-${{matrix.distro}}${{matrix.version}}-cache-${{env.timestamp}}
+          key: docker-${{matrix.distro}}-cache-${{env.timestamp}}
           restore-keys: |
-            docker-${{matrix.distro}}${{matrix.version}}-cache-
+            docker-${{matrix.distro}}-cache-
 
-      - name: Build ${{matrix.distro}} ${{matrix.version}} Docker image
+      - name: Build ${{matrix.distro}} Docker image
         shell: bash
         run: source .ci/docker.sh --build
 
       - name: Build debug and test
         if: matrix.test != 'skip'
         shell: bash
+        env:
+          distro: '${{matrix.distro}}'
         run: |
           source .ci/docker.sh
-          RUN --server --debug --test --ccache "$CCACHE_SIZE" --parallel 4
+          RUN --server --debug --test --ccache "$CCACHE_SIZE" --parallel 2
 
       - name: Build release package
         id: build
@@ -170,19 +166,20 @@ jobs:
         shell: bash
         env:
           BUILD_DIR: build
-          SUFFIX: '-${{matrix.distro}}${{matrix.version}}'
+          SUFFIX: '-${{matrix.distro}}'
+          distro: '${{matrix.distro}}'
           type: '${{matrix.package}}'
         run: |
           source .ci/docker.sh
           RUN --server --release --package "$type" --dir "$BUILD_DIR" \
-                  --ccache "$CCACHE_SIZE" --parallel 4
+                  --ccache "$CCACHE_SIZE" --parallel 2
           .ci/name_build.sh
 
       - name: Upload artifact
         if: matrix.package != 'skip'
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
-          name: ${{matrix.distro}}${{matrix.version}}-package
+          name: ${{matrix.distro}}-package
           path: ${{steps.build.outputs.path}}
           if-no-files-found: error
 
@@ -201,38 +198,41 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - target: 13
-            soc: Intel
-            os: macos-13
-            xcode: "14.3.1"
-            type: Release
-            core_count: 4
-            make_package: 1
-
-          - target: 14
-            soc: Apple
-            os: macos-14
-            xcode: "15.4"
-            type: Release
-            core_count: 3
-            make_package: 1
-
-          - target: 15
-            soc: Apple
-            os: macos-15
-            xcode: "16.2"
-            type: Release
-            core_count: 3
-            make_package: 1
-
-          - target: 15
-            soc: Apple
-            os: macos-15
-            xcode: "16.2"
+          - target: Debug # tests only
+            os: macos-latest
+            xcode: 14.2
+            qt_version: 6.5
+            qt_modules: "qtmultimedia qtwebsockets"
             type: Debug
-            core_count: 3
+            do_tests: 1
 
-    name: macOS ${{matrix.target}}${{ matrix.soc == 'Intel' && ' Intel' || '' }}${{ matrix.type == 'Debug' && ' Debug' || '' }}
+          - target: 10.15_Catalina
+            os: macos-11
+            xcode: 11.7 # allows using macOS 10.15 SDK
+            qt_version: 6.2.* # 6.2 is last LTS compatible with 10.15, see https://doc.qt.io/qt-6.5/macos.html
+            qt_modules: "qtmultimedia qtwebsockets"
+            type: Release
+            do_tests: 1
+            make_package: 1
+            use_old_protobuf: 1
+
+          - target: 12_Monterey
+            os: macos-12
+            xcode: 14.0.1
+            qt_version: homebrew
+            type: Release
+            do_tests: 1
+            make_package: 1
+
+          - target: 13_Ventura
+            os: macos-13
+            xcode: 14.3
+            qt_version: homebrew
+            type: Release
+            do_tests: 1
+            make_package: 0
+
+    name: macOS ${{matrix.target}}
     needs: configure
     runs-on: ${{matrix.os}}
     continue-on-error: ${{matrix.allow-failure == 'yes'}}
@@ -244,93 +244,53 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Install dependencies using Homebrew
+      - name: Install dependencies using homebrew
         shell: bash
-        # CMake cannot find the MySQL connector
-        # Neither of these works: mariadb-connector-c mysql-connector-c++
+        # cmake cannot find the mysql connector
+        # neither of these works: mariadb-connector-c mysql-connector-c++
         env:
-          HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK: 1
+          install_qt: ${{matrix.qt_version}}
+          use_old_protobuf: ${{matrix.use_old_protobuf}}
         run: |
           brew update
-          brew install protobuf qt --force-bottle
+          if [[ $use_old_protobuf == 1 ]]; then
+            brew install protobuf@21
+            brew link --force protobuf@21
+          else
+            brew install protobuf
+            brew link --force protobuf
+          fi
+          if [[ $install_qt == homebrew ]]; then
+            brew install qt --force-bottle
+          else # for some reason the tests fail with the action installed qt?
+            brew install googletest
+          fi
 
-      - name: Build & Sign on Xcode ${{matrix.xcode}}
+      - name: Install Qt ${{matrix.qt_version}} for ${{matrix.target}}
+        if: matrix.qt_version != 'homebrew'
+        uses: jurplel/install-qt-action@v3
+        with:
+          cache: true
+          setup-python: false
+          version: ${{matrix.qt_version}}
+          modules: ${{matrix.qt_modules}}
+
+      - name: Build on Xcode ${{matrix.xcode}}
         shell: bash
         id: build
         env:
           BUILDTYPE: '${{matrix.type}}'
-          MAKE_TEST: 1
+          MAKE_TEST: '${{matrix.do_tests}}'
           MAKE_PACKAGE: '${{matrix.make_package}}'
-          PACKAGE_SUFFIX: '-macOS${{matrix.target}}_${{matrix.soc}}'
-          MACOS_CERTIFICATE: ${{ secrets.PROD_MACOS_CERTIFICATE }}
-          MACOS_CERTIFICATE_PWD: ${{ secrets.PROD_MACOS_CERTIFICATE_PWD }}
-          MACOS_CERTIFICATE_NAME: ${{ secrets.PROD_MACOS_CERTIFICATE_NAME }}
-          MACOS_CI_KEYCHAIN_PWD: ${{ secrets.PROD_MACOS_CI_KEYCHAIN_PWD }}
-        # macOS runner have 3 cores usually - only the macos-13 image has 4:
-        # https://docs.github.com/en/actions/using-github-hosted-runners/using-github-hosted-runners/about-github-hosted-runners#standard-github-hosted-runners-for-public-repositories
-        # https://github.com/actions/runner-images?tab=readme-ov-file#available-images
-        run: |
-          if [[ -n "$MACOS_CERTIFICATE_NAME" ]]
-          then
-            echo $MACOS_CERTIFICATE | base64 --decode > certificate.p12
-            security create-keychain -p "$MACOS_CI_KEYCHAIN_PWD" build.keychain
-            security default-keychain -s build.keychain
-            security set-keychain-settings -t 3600 -l build.keychain
-            security unlock-keychain -p "$MACOS_CI_KEYCHAIN_PWD" build.keychain
-            security import certificate.p12 -k build.keychain -P "$MACOS_CERTIFICATE_PWD" -T /usr/bin/codesign
-            security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k "$MACOS_CI_KEYCHAIN_PWD" build.keychain
-          fi
-          .ci/compile.sh --server --parallel ${{matrix.core_count}}
-
-      - name: Sign app bundle
-        if: matrix.make_package
-        env:
-          MACOS_CERTIFICATE_NAME: ${{ secrets.PROD_MACOS_CERTIFICATE_NAME }}
-          MACOS_CI_KEYCHAIN_PWD: ${{ secrets.PROD_MACOS_CI_KEYCHAIN_PWD }}
-        run: |
-          if [[ -n "$MACOS_CERTIFICATE_NAME" ]]
-          then
-            security unlock-keychain -p "$MACOS_CI_KEYCHAIN_PWD" build.keychain
-            /usr/bin/codesign --sign="$MACOS_CERTIFICATE_NAME" --entitlements=".ci/macos.entitlements" --options=runtime --force --deep --timestamp --verbose ${{steps.build.outputs.path}}
-          fi
-
-      - name: Notarize app bundle
-        if: matrix.make_package
-        env:
-          MACOS_NOTARIZATION_APPLE_ID: ${{ secrets.PROD_MACOS_NOTARIZATION_APPLE_ID }}
-          MACOS_NOTARIZATION_TEAM_ID: ${{ secrets.PROD_MACOS_NOTARIZATION_TEAM_ID }}
-          MACOS_NOTARIZATION_PWD: ${{ secrets.PROD_MACOS_NOTARIZATION_PWD }}
-        run: |
-          if [[ -n "$MACOS_NOTARIZATION_APPLE_ID" ]]
-          then
-            # Store the notarization credentials so that we can prevent a UI password dialog from blocking the CI
-            echo "Create keychain profile"
-            xcrun notarytool store-credentials "notarytool-profile" --apple-id "$MACOS_NOTARIZATION_APPLE_ID" --team-id "$MACOS_NOTARIZATION_TEAM_ID" --password "$MACOS_NOTARIZATION_PWD"
-  
-            # We can't notarize an app bundle directly, but we need to compress it as an archive.
-            # Therefore, we create a zip file containing our app bundle, so that we can send it to the
-            # notarization service
-            echo "Creating temp notarization archive"
-            ditto -c -k --keepParent ${{steps.build.outputs.path}} "notarization.zip"
-  
-            # Here we send the notarization request to the Apple's Notarization service, waiting for the result.
-            # This typically takes a few seconds inside a CI environment, but it might take more depending on the App
-            # characteristics. Visit the Notarization docs for more information and strategies on how to optimize it if
-            # you're curious
-            echo "Notarize app"
-            xcrun notarytool submit "notarization.zip" --keychain-profile "notarytool-profile" --wait
-  
-            # Finally, we need to "attach the staple" to our executable, which will allow our app to be
-            # validated by macOS even when an internet connection is not available.
-            echo "Attach staple"
-            xcrun stapler staple ${{steps.build.outputs.path}}
-          fi
+          PACKAGE_SUFFIX: '-macOS-${{matrix.target}}'
+        # Mac machines actually have 3 cores
+        run: .ci/compile.sh --server --parallel 3
 
       - name: Upload artifact
         if: matrix.make_package
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
-          name: macOS${{matrix.target}}${{ matrix.soc == 'Intel' && '_Intel' || '' }}${{ matrix.type == 'Debug' && '_Debug' || '' }}-package
+          name: macOS-${{matrix.target}}-dmg
           path: ${{steps.build.outputs.path}}
           if-no-files-found: error
 
@@ -352,24 +312,24 @@ jobs:
           - target: 7
             qt_version: 5.15.*
             qt_arch: msvc2019_64
+            qt_tools: "tools_opensslv3_x64"
 
           - target: 10
-            qt_version: 6.6.*
+            qt_version: 6.5.*
             qt_arch: msvc2019_64
-            qt_modules: "qtimageformats qtmultimedia qtwebsockets"
+            qt_tools: "tools_opensslv3_x64"
+            qt_modules: "qtmultimedia qtwebsockets"
 
     name: Windows ${{matrix.target}}
     needs: configure
-    runs-on: windows-2022
+    runs-on: windows-2019
     env:
-      CMAKE_GENERATOR: 'Visual Studio 17 2022'
+      CMAKE_GENERATOR: 'Visual Studio 16 2019'
 
     steps:
       - name: Add msbuild to PATH
         id: add-msbuild
-        uses: microsoft/setup-msbuild@v2
-        with:
-          msbuild-architecture: x64
+        uses: microsoft/setup-msbuild@v1
 
       - name: Checkout
         uses: actions/checkout@v4
@@ -377,7 +337,7 @@ jobs:
           submodules: recursive
 
       - name: Install Qt ${{matrix.qt_version}}
-        uses: jurplel/install-qt-action@v4
+        uses: jurplel/install-qt-action@v3
         with:
           cache: true
           setup-python: false
@@ -403,26 +363,15 @@ jobs:
           CMAKE_GENERATOR: '${{env.CMAKE_GENERATOR}}'
           CMAKE_GENERATOR_PLATFORM: 'x64'
           QTDIR: '${{github.workspace}}\Qt\${{matrix.qt_version}}\win64_${{matrix.qt_arch}}'
-        # No need for --parallel flag, MTT is added in the compile script to let cmake/msbuild manage core count,
-        # project and process parallelism: https://devblogs.microsoft.com/cppblog/improved-parallelism-in-msbuild/
-        run: .ci/compile.sh --server --release --test --package
+        run: .ci/compile.sh --server --release --test --package --parallel 2
 
       - name: Upload artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
           name: Windows${{matrix.target}}-installer
           path: ${{steps.build.outputs.path}}
           if-no-files-found: error
 
-      - name: Upload pdb database
-        uses: actions/upload-artifact@v4
-        with:
-          name: Windows${{matrix.target}}-debug-pdbs
-          path: |
-            build/cockatrice/Release/*.pdb
-            build/servatrice/Release/*.pdb
-          if-no-files-found: error
-
       - name: Upload to release
         if: matrix.package != 'skip' && needs.configure.outputs.tag != null
         shell: bash

.github/workflows/translations-pull.yml

@@ -32,7 +32,7 @@ jobs:
       - name: Create pull request
         if: github.event_name != 'pull_request'
         id: create_pr
-        uses: peter-evans/create-pull-request@v7
+        uses: peter-evans/create-pull-request@v5
         with:
           add-paths: |
             cockatrice/translations/*.ts
@@ -64,9 +64,9 @@ jobs:
         env:
           STATUS: ${{ steps.create_pr.outputs.pull-request-operation }}
         run: |
-          if [[ "$STATUS" == "none" ]]; then
-            echo "PR #${{ steps.create_pr.outputs.pull-request-number }} unchanged!" >> $GITHUB_STEP_SUMMARY
+          if [[ "$STATUS" == "" ]]; then
+            echo "PR #${{ steps.create_pr.outputs.pull-request-number }} unchanged!"
           else
-            echo "PR #${{ steps.create_pr.outputs.pull-request-number }} $STATUS!" >> $GITHUB_STEP_SUMMARY
+            echo "PR #${{ steps.create_pr.outputs.pull-request-number }} $STATUS!"
           fi
-          echo "URL: ${{ steps.create_pr.outputs.pull-request-url }}" >> $GITHUB_STEP_SUMMARY
+          echo "URL: ${{ steps.create_pr.outputs.pull-request-url }}"

.github/workflows/translations-push.yml

@@ -56,7 +56,7 @@ jobs:
       - name: Create pull request
         if: github.event_name != 'pull_request'
         id: create_pr
-        uses: peter-evans/create-pull-request@v7
+        uses: peter-evans/create-pull-request@v5
         with:
           add-paths: |
             cockatrice/cockatrice_en@source.ts
@@ -79,9 +79,9 @@ jobs:
         env:
           STATUS: ${{ steps.create_pr.outputs.pull-request-operation }}
         run: |
-          if [[ "$STATUS" == "none" ]]; then
-            echo "PR #${{ steps.create_pr.outputs.pull-request-number }} unchanged!" >> $GITHUB_STEP_SUMMARY
+          if [[ "$STATUS" == "" ]]; then
+            echo "PR #${{ steps.create_pr.outputs.pull-request-number }} unchanged!"
           else
-            echo "PR #${{ steps.create_pr.outputs.pull-request-number }} $STATUS!" >> $GITHUB_STEP_SUMMARY
+            echo "PR #${{ steps.create_pr.outputs.pull-request-number }} $STATUS!"
           fi
-          echo "URL: ${{ steps.create_pr.outputs.pull-request-url }}" >> $GITHUB_STEP_SUMMARY
+          echo "URL: ${{ steps.create_pr.outputs.pull-request-url }}"

.gitignore

@@ -6,11 +6,10 @@ mysql.cnf
 .DS_Store
 .idea/
 *.aps
-cmake-build*
+cmake-build-debug*
 preferences
 compile_commands.json
 .vs/
 .vscode/
 .cache
 .gdb_history
-cockatrice/resources/config/qtlogging.ini

CMakeLists.txt

@@ -74,16 +74,16 @@ endif()
 
 # A project name is needed for CPack
 # Version can be overriden by git tags, see cmake/getversion.cmake
-project("Cockatrice" VERSION 2.10.2)
+project("Cockatrice" VERSION 2.9.0)
 
 # Set release name if not provided via env/cmake var
 if(NOT DEFINED GIT_TAG_RELEASENAME)
-  set(GIT_TAG_RELEASENAME "Omenpath")
+  set(GIT_TAG_RELEASENAME "Rings of the Wild")
 endif()
 
-# Use c++20 for all targets
+# Use c++17 for all targets
 set(CMAKE_CXX_STANDARD
-    20
+    17
     CACHE STRING "C++ ISO Standard"
 )
 set(CMAKE_CXX_STANDARD_REQUIRED True)
@@ -140,17 +140,10 @@ endif()
 
 # Define proper compilation flags
 if(MSVC)
-  # Disable Warning C4251, C++20 compatibility, Multi-threaded Builds, Warn Detection, Unwind Semantics, Debug Symbols
-  set(CMAKE_CXX_FLAGS "/wd4251 /Zc:__cplusplus /std:c++20 /permissive- /W4 /MP /EHsc /Zi")
-  # Visual Studio: Maximum Optimization, Multi-threaded DLL
-  set(CMAKE_CXX_FLAGS_RELEASE "/Ox /MD")
-  # Visual Studio: No Optimization, Multi-threaded Debug DLL
-  set(CMAKE_CXX_FLAGS_DEBUG "/Od /MDd")
-
-  # Generate PDB, even when in release (So developers can better analyze crash logs)
-  set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /DEBUG /OPT:REF /OPT:ICF")
-
-  add_compile_definitions(_SILENCE_STDEXT_ARR_ITERS_DEPRECATION_WARNING)
+  # Visual Studio: Maximum optimization, disable warning C4251, establish C++17 compatibility
+  set(CMAKE_CXX_FLAGS_RELEASE "/Ox /MD /wd4251 /Zc:__cplusplus /std:c++17 /permissive- /W4")
+  # Generate complete debugging information
+  #set(CMAKE_CXX_FLAGS_DEBUG "/Zi")
 elseif(CMAKE_COMPILER_IS_GNUCXX)
   # linux/gcc, bsd/gcc, windows/mingw
   include(CheckCXXCompilerFlag)
@@ -163,7 +156,7 @@ elseif(CMAKE_COMPILER_IS_GNUCXX)
   endif()
 
   if(APPLE)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++20")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++17")
   endif()
 
   set(ADDITIONAL_DEBUG_FLAGS
@@ -271,14 +264,13 @@ if(UNIX)
     set(CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/cockatrice/resources/appicon.icns")
     set(CPACK_DMG_DS_STORE_SETUP_SCRIPT "${CMAKE_CURRENT_SOURCE_DIR}/cmake/CMakeDMGSetup.script")
     set(CPACK_DMG_BACKGROUND_IMAGE "${CMAKE_CURRENT_SOURCE_DIR}/cmake/dmgBackground.tif")
-    set(CPACK_PRE_BUILD_SCRIPTS "${CMAKE_CURRENT_SOURCE_DIR}/cmake/SignMacApplications.cmake")
   else()
     # linux
     if(CPACK_GENERATOR STREQUAL "RPM")
       set(CPACK_RPM_PACKAGE_LICENSE "GPLv2")
       set(CPACK_RPM_MAIN_COMPONENT "cockatrice")
       if(Qt6_FOUND)
-        set(CPACK_RPM_PACKAGE_REQUIRES "protobuf, qt6-qttools, qt6-qtsvg, qt6-qtmultimedia, qt6-qtimageformats")
+        set(CPACK_RPM_PACKAGE_REQUIRES "protobuf, qt6-qttools, qt6-qtsvg, qt6-qtmultimedia")
       elseif(Qt5_FOUND)
         set(CPACK_RPM_PACKAGE_REQUIRES "protobuf, qt5-qttools, qt5-qtsvg, qt5-qtmultimedia")
       endif()
@@ -300,7 +292,7 @@ if(UNIX)
       set(CPACK_DEBIAN_PACKAGE_SECTION "games")
       set(CPACK_DEBIAN_PACKAGE_HOMEPAGE "http://github.com/Cockatrice/Cockatrice")
       if(Qt6_FOUND)
-        set(CPACK_DEBIAN_PACKAGE_DEPENDS "libqt6multimedia6, libqt6svg6, qt6-qpa-plugins, qt6-image-formats-plugins")
+        set(CPACK_DEBIAN_PACKAGE_DEPENDS "libqt6multimedia6, libqt6svg6, qt6-qpa-plugins")
       elseif(Qt5_FOUND)
         set(CPACK_DEBIAN_PACKAGE_DEPENDS "libqt5multimedia5-plugins, libqt5svg5")
       endif()

Dockerfile

@@ -1,20 +1,19 @@
-FROM ubuntu:24.04
-
-ARG DEBIAN_FRONTEND=noninteractive
+FROM ubuntu:bionic
+MAINTAINER Zach Halpern <zahalpern+github@gmail.com>
 
 RUN apt-get update && apt-get install -y\
-  build-essential \
-  cmake \
-  file \
-  g++ \
-  git \
-  libmariadb-dev-compat \
-  libprotobuf-dev \
-  libqt6sql6-mysql \
-  qt6-websockets-dev \
-  protobuf-compiler \
-  qt6-tools-dev \
-  qt6-tools-dev-tools
+  build-essential\
+  cmake\
+  git\
+  libprotobuf-dev\
+  libqt5sql5-mysql\
+  libmysqlclient-dev\
+  libqt5websockets5-dev\
+  protobuf-compiler\
+  qt5-default\
+  qtbase5-dev\
+  qttools5-dev-tools\
+  qttools5-dev
 
 COPY . /home/servatrice/code/
 WORKDIR /home/servatrice/code
@@ -26,6 +25,7 @@ RUN cmake .. -DWITH_SERVER=1 -DWITH_CLIENT=0 -DWITH_ORACLE=0 -DWITH_DBCONVERTER=
 
 WORKDIR /home/servatrice
 
-EXPOSE 4748
+EXPOSE 4747
 
 ENTRYPOINT [ "servatrice", "--log-to-console" ]
+

README.md

@@ -5,7 +5,7 @@
 <p align='center'>
    <a href="#cockatrice"><b>Cockatrice</b></a> <b>|</b>
    <a href="#download-">Download</a> <b>|</b>
-   <a href="#get-involved-">Get Involved</a> <b>|</b>
+   <a href="#get-involved--">Get Involved</a> <b>|</b>
    <a href="#community-resources">Community</a> <b>|</b>
    <a href="#translations-">Translations</a> <b>|</b>
    <a href="#build--">Build</a> <b>|</b>
@@ -18,7 +18,7 @@
 <br><pre>
 <b>To get started, &#8674; [view our webpage](https://cockatrice.github.io/)</b><br>
 <b>To get support or suggest changes &#8674; [file an issue](https://github.com/Cockatrice/Cockatrice/issues) ([How?](https://github.com/Cockatrice/Cockatrice/wiki/How-to-Create-a-GitHub-Ticket-Regarding-Cockatrice))</b>
-<b>To help with development, see how to [get involved](#get-involved-)</b>
+<b>To help with development, see how to [get involved](#get-involved--)</b>
 </pre><br>
 
 
@@ -40,9 +40,9 @@ Downloads are available for full releases and the current beta version in develo
    - To be a Cockatrice Beta Tester, use this version. Find more information [here](https://github.com/Cockatrice/Cockatrice/wiki/Release-Channels)!
    
 
-# Get Involved [![Discord](https://img.shields.io/discord/314987288398659595?label=Discord&logo=discord&logoColor=white)](https://discord.gg/3Z9yzmA)
+# Get Involved [![Discord](https://img.shields.io/discord/314987288398659595?label=Discord&logo=discord&logoColor=white)](https://discord.gg/3Z9yzmA) [![Gitter Chat](https://img.shields.io/gitter/room/Cockatrice/Cockatrice)](https://gitter.im/Cockatrice/Cockatrice)
 
-Join our [Discord community](https://discord.gg/3Z9yzmA) to connect with the project, contributors or fellow users of the app. Come here to talk about the application, features, or just to hang out.<br>
+Join our [Discord community](https://discord.gg/3Z9yzmA) to connect with the project or fellow users of the app. The Cockatrice developers are also available on [Gitter](https://gitter.im/Cockatrice/Cockatrice). Come here to talk about the application, features, or just to hang out.<br>
 For support regarding specific servers, please contact that server's admin or forum for support rather than asking here.<br>
 
 To contribute code to the project, please review [the guidelines](https://github.com/Cockatrice/Cockatrice/blob/master/.github/CONTRIBUTING.md).
@@ -128,9 +128,9 @@ First, create an image from the Dockerfile<br>
 `cd /path/to/Cockatrice-Repo/`
 `docker build -t servatrice .`<br>
 And then run it<br>
-`docker run -i -p 4748:4748 -t servatrice:latest`<br>
+`docker run -i -p 4747:4747/tcp -t servatrice:latest`<br>
 
->Note: Running this command exposes the port 4748 of the docker container<br>
+>Note: Running this command exposes the TCP port 4747 of the docker container<br>
 to permit connections to the server.
 
 Find more information on how to use Servatrice with Docker in our [wiki](https://github.com/Cockatrice/Cockatrice/wiki/Setting-up-Servatrice#using-docker).
@@ -145,7 +145,7 @@ docker-compose build    # Build the Servatrice image using the same Dockerfile a
 docker-compose up       # Setup and run both the MySQL server and Servatrice.
 ```
 
->Note: Similar to the above Docker setup, this will expose port 4748.
+>Note: Similar to the above Docker setup, this will expose TCP ports 4747 and 4748.
 
 >Note: The first time running the docker-compose setup, the MySQL server will take a little time to run the initial setup scripts. Due to this, the Servatrice instance may fail the first few attempts to connect to the database. Servatrice is set to `restart: always` in the docker-compose.yml, which will allow it to continue attempting to start up. Once the MySQL scripts have completed, Servatrice should then connect automatically on the next attempt.
 

cmake/FindQtRuntime.cmake

@@ -23,7 +23,6 @@ if(WITH_CLIENT)
       Svg
       WebSockets
       Widgets
-      Xml
   )
 endif()
 if(WITH_ORACLE)

cmake/FindVCredistRuntime.cmake

@@ -24,7 +24,7 @@ if(WIN32)
     get_filename_component(_path ${_path}/../../ ABSOLUTE)
 
     foreach(redist_file ${REDIST_FILE_NAMES})
-      if(EXISTS "${_path}/${redist_file}")
+      if(EXISTS "${_path}/${REDIST_FILE}")
         set(VCREDISTRUNTIME_FOUND "YES")
         set(VCREDISTRUNTIME_FILE ${_path}/${redist_file})
         break()

cmake/NSIS.template.in

@@ -5,7 +5,7 @@ OutFile "@CPACK_TOPLEVEL_DIRECTORY@/@CPACK_OUTPUT_FILE_NAME@"
 
 !define INST_DIR "@CPACK_TEMPORARY_DIRECTORY@"
 
-RequestExecutionlevel admin
+RequestExecutionlevel highest
 SetCompressor LZMA
 
 Var NormalDestDir
@@ -235,13 +235,6 @@ ${If} $PortableMode = 0
 	WriteUninstaller "$INSTDIR\uninstall.exe"
 	${GetSize} "$INSTDIR" "/S=0K" $0 $1 $2
 	IntFmt $0 "0x%08X" $0
-
-	; Enable Windows User-Mode Dumps
-	; https://learn.microsoft.com/en-us/windows/win32/wer/collecting-user-mode-dumps
-	WriteRegExpandStr HKLM "Software\Microsoft\Windows\Windows Error Reporting\LocalDumps\cockatrice.exe" "DumpFolder" "%LOCALAPPDATA%\CrashDumps\Cockatrice"
-	WriteRegDWORD HKLM "Software\Microsoft\Windows\Windows Error Reporting\LocalDumps\cockatrice.exe" "DumpCount" "5"
-	WriteRegDWORD HKLM "Software\Microsoft\Windows\Windows Error Reporting\LocalDumps\cockatrice.exe" "DumpType" "2"
-
 	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Cockatrice" "DisplayIcon" "$INSTDIR\cockatrice.exe"
 	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Cockatrice" "DisplayName" "Cockatrice"
 	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Cockatrice" "DisplayVersion" "@CPACK_PACKAGE_VERSION_MAJOR@.@CPACK_PACKAGE_VERSION_MINOR@.@CPACK_PACKAGE_VERSION_PATCH@"
@@ -255,20 +248,20 @@ ${If} $PortableMode = 0
 	WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Cockatrice" "VersionMajor" "@CPACK_PACKAGE_VERSION_MAJOR@"
 	WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Cockatrice" "VersionMinor" "@CPACK_PACKAGE_VERSION_MINOR@"
 
-	IfFileExists "$INSTDIR\vc_redist.x86.exe" VcRedist86Exists PastVcRedist86Check
+	IfFileExists "$INSTDIR\vcredist_x86.exe" VcRedist86Exists PastVcRedist86Check
 	VcRedist86Exists:
-		ExecWait '"$INSTDIR\vc_redist.x86.exe" /passive /norestart'
+		ExecWait '"$INSTDIR\vcredist_x86.exe" /passive /norestart'
 		DetailPrint "Wait to ensure unlock of vc_redist file after installation..."
 		Sleep 3000
-		Delete "$INSTDIR\vc_redist.x86.exe"
+		Delete "$INSTDIR\vcredist_x86.exe"
 	PastVcRedist86Check:
 
-	IfFileExists "$INSTDIR\vc_redist.x64.exe" VcRedist64Exists PastVcRedist64Check
+	IfFileExists "$INSTDIR\vcredist_x64.exe" VcRedist64Exists PastVcRedist64Check
 	VcRedist64Exists:
-		ExecWait '"$INSTDIR\vc_redist.x64.exe" /passive /norestart'
+		ExecWait '"$INSTDIR\vcredist_x64.exe" /passive /norestart'
 		DetailPrint "Sleep to ensure unlock of vc_redist file after installation..."
 		Sleep 3000
-		Delete "$INSTDIR\vc_redist.x64.exe"
+		Delete "$INSTDIR\vcredist_x64.exe"
 	PastVcRedist64Check:
 
 ${Else}

cmake/SignMacApplications.cmake

@@ -1,27 +0,0 @@
-# This script re-signs all apps after CPack packages them. This is necessary because CPack modifies
-# the library references used by Cockatrice to App relative paths, invalidating the code signature.
-string(LENGTH "$ENV{MACOS_CERTIFICATE_NAME}" MACOS_CERTIFICATE_NAME_LEN)
-
-if(APPLE AND MACOS_CERTIFICATE_NAME_LEN GREATER 0)
-  set(APPLICATIONS "cockatrice" "servatrice" "oracle" "dbconverter")
-  foreach(app_name IN LISTS APPLICATIONS)
-    set(FULL_APP_PATH "${CPACK_TEMPORARY_INSTALL_DIRECTORY}/${app_name}.app")
-
-    message(STATUS "Signing Interior Dynamically Loaded Libraries for ${app_name}.app")
-    execute_process(COMMAND "find" "${FULL_APP_PATH}" "-name" "*.dylib" OUTPUT_VARIABLE INTERIOR_DLLS)
-    string(REPLACE "\n" ";" INTERIOR_DLLS_LIST ${INTERIOR_DLLS})
-
-    foreach(INTERIOR_DLL IN LISTS INTERIOR_DLLS_LIST)
-      execute_process(
-        COMMAND "codesign" "--sign" "$ENV{MACOS_CERTIFICATE_NAME}" "--entitlements" "../.ci/macos.entitlements"
-                "--options" "runtime" "--force" "--deep" "--timestamp" "--verbose" "${INTERIOR_DLL}"
-      )
-    endforeach()
-
-    message(STATUS "Signing Exterior Applications ${app_name}.app")
-    execute_process(
-      COMMAND "codesign" "--sign" "$ENV{MACOS_CERTIFICATE_NAME}" "--entitlements" "../.ci/macos.entitlements"
-              "--options" "runtime" "--force" "--deep" "--timestamp" "--verbose" "${FULL_APP_PATH}"
-    )
-  endforeach()
-endif()

cmake/getversion.cmake

@@ -19,7 +19,7 @@ function(get_commit_id)
       PARENT_SCOPE
   )
   set(PROJECT_VERSION_LABEL
-      "custom-${GIT_COM_ID}"
+      "custom(${GIT_COM_ID})"
       PARENT_SCOPE
   )
 endfunction()

cockatrice/CMakeLists.txt

@@ -4,15 +4,133 @@
 
 project(Cockatrice VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
 
-file(GLOB_RECURSE cockatrice_CPP_FILES CONFIGURE_DEPENDS ${CMAKE_SOURCE_DIR}/cockatrice/src/*.cpp)
-
-set(cockatrice_SOURCES ${cockatrice_CPP_FILES} ${VERSION_STRING_CPP})
+set(cockatrice_SOURCES
+    src/abstractcarddragitem.cpp
+    src/abstractcarditem.cpp
+    src/abstractclient.cpp
+    src/abstractcounter.cpp
+    src/abstractgraphicsitem.cpp
+    src/arrowitem.cpp
+    src/arrowtarget.cpp
+    src/carddatabase.cpp
+    src/carddatabasemodel.cpp
+    src/carddbparser/carddatabaseparser.cpp
+    src/carddbparser/cockatricexml3.cpp
+    src/carddbparser/cockatricexml4.cpp
+    src/carddragitem.cpp
+    src/cardfilter.cpp
+    src/cardframe.cpp
+    src/cardinfopicture.cpp
+    src/cardinfotext.cpp
+    src/cardinfowidget.cpp
+    src/carditem.cpp
+    src/cardlist.cpp
+    src/cardzone.cpp
+    src/chatview/chatview.cpp
+    src/counter_general.cpp
+    src/customlineedit.cpp
+    src/deck_loader.cpp
+    src/decklistmodel.cpp
+    src/deckstats_interface.cpp
+    src/deckview.cpp
+    src/dlg_connect.cpp
+    src/dlg_create_token.cpp
+    src/dlg_creategame.cpp
+    src/dlg_edit_avatar.cpp
+    src/dlg_edit_password.cpp
+    src/dlg_edit_tokens.cpp
+    src/dlg_edit_user.cpp
+    src/dlg_filter_games.cpp
+    src/dlg_forgotpasswordchallenge.cpp
+    src/dlg_forgotpasswordrequest.cpp
+    src/dlg_forgotpasswordreset.cpp
+    src/dlg_load_deck_from_clipboard.cpp
+    src/dlg_load_remote_deck.cpp
+    src/dlg_manage_sets.cpp
+    src/dlg_register.cpp
+    src/dlg_settings.cpp
+    src/dlg_tip_of_the_day.cpp
+    src/dlg_update.cpp
+    src/dlg_viewlog.cpp
+    src/filter_string.cpp
+    src/filterbuilder.cpp
+    src/filtertree.cpp
+    src/filtertreemodel.cpp
+    src/gamescene.cpp
+    src/gameselector.cpp
+    src/gamesmodel.cpp
+    src/gameview.cpp
+    src/gettextwithmax.cpp
+    src/handcounter.cpp
+    src/handle_public_servers.cpp
+    src/handzone.cpp
+    src/keysignals.cpp
+    src/lineeditcompleter.cpp
+    src/localclient.cpp
+    src/localserver.cpp
+    src/localserverinterface.cpp
+    src/logger.cpp
+    src/main.cpp
+    src/messagelogwidget.cpp
+    src/pending_command.cpp
+    src/phase.cpp
+    src/phasestoolbar.cpp
+    src/pictureloader.cpp
+    src/pilezone.cpp
+    src/pixmapgenerator.cpp
+    src/player.cpp
+    src/playerlistwidget.cpp
+    src/playertarget.cpp
+    src/releasechannel.cpp
+    src/remoteclient.cpp
+    src/remotedecklist_treewidget.cpp
+    src/remotereplaylist_treewidget.cpp
+    src/replay_timeline_widget.cpp
+    src/selectzone.cpp
+    src/sequenceEdit/sequenceedit.cpp
+    src/setsmodel.cpp
+    src/settings/carddatabasesettings.cpp
+    src/settings/downloadsettings.cpp
+    src/settings/gamefilterssettings.cpp
+    src/settings/layoutssettings.cpp
+    src/settings/messagesettings.cpp
+    src/settings/serverssettings.cpp
+    src/settings/settingsmanager.cpp
+    src/settingscache.cpp
+    src/shortcutssettings.cpp
+    src/soundengine.cpp
+    src/spoilerbackgroundupdater.cpp
+    src/stackzone.cpp
+    src/tab.cpp
+    src/tab_account.cpp
+    src/tab_admin.cpp
+    src/tab_deck_editor.cpp
+    src/tab_deck_storage.cpp
+    src/tab_game.cpp
+    src/tab_logs.cpp
+    src/tab_message.cpp
+    src/tab_replays.cpp
+    src/tab_room.cpp
+    src/tab_server.cpp
+    src/tab_supervisor.cpp
+    src/tablezone.cpp
+    src/tappedout_interface.cpp
+    src/thememanager.cpp
+    src/tip_of_the_day.cpp
+    src/translatecountername.cpp
+    src/update_downloader.cpp
+    src/user_context_menu.cpp
+    src/userconnection_information.cpp
+    src/userinfobox.cpp
+    src/userlist.cpp
+    src/window_main.cpp
+    src/zoneviewwidget.cpp
+    src/zoneviewzone.cpp
+    ${VERSION_STRING_CPP}
+)
 
 add_subdirectory(sounds)
 add_subdirectory(themes)
-configure_file(
-  ${CMAKE_SOURCE_DIR}/cockatrice/resources/config/qtlogging.ini ${CMAKE_BINARY_DIR}/cockatrice/qtlogging.ini COPYONLY
-)
 
 set(cockatrice_RESOURCES cockatrice.qrc)
 
@@ -133,7 +251,7 @@ if(APPLE)
   set(plugin_dest_dir cockatrice.app/Contents/Plugins)
   set(qtconf_dest_dir cockatrice.app/Contents/Resources)
 
-  # Qt plugins: audio (Qt5), iconengines, imageformats, multimedia (Qt6), platforms, printsupport (Qt5), styles, tls (Qt6)
+  # Qt plugins: audio (Qt5), iconengines, imageformats, platforms, printsupport (Qt5), styles, tls (Qt6)
   install(
     DIRECTORY "${QT_PLUGINS_DIR}/"
     DESTINATION ${plugin_dest_dir}
@@ -144,20 +262,12 @@ if(APPLE)
     PATTERN "audio/*.dylib"
     PATTERN "iconengines/*.dylib"
     PATTERN "imageformats/*.dylib"
-    PATTERN "multimedia/*.dylib"
     PATTERN "platforms/*.dylib"
     PATTERN "printsupport/*.dylib"
     PATTERN "styles/*.dylib"
     PATTERN "tls/*.dylib"
   )
 
-  install(
-    DIRECTORY "${CMAKE_BINARY_DIR}/cockatrice/"
-    DESTINATION ${qtconf_dest_dir}/
-    FILES_MATCHING
-    PATTERN "*.ini"
-  )
-
   install(
     CODE "
         file(WRITE \"\${CMAKE_INSTALL_PREFIX}/${qtconf_dest_dir}/qt.conf\" \"[Paths]
@@ -192,14 +302,7 @@ if(WIN32)
     PATTERN "*.dll"
   )
 
-  install(
-    DIRECTORY "${CMAKE_BINARY_DIR}/cockatrice/"
-    DESTINATION ./
-    FILES_MATCHING
-    PATTERN "*.ini"
-  )
-
-  # Qt plugins: audio (Qt5), iconengines, imageformats, multimedia (Qt6) platforms, printsupport (Qt5), styles, tls (Qt6)
+  # Qt plugins: audio (Qt5), iconengines, imageformats, platforms, printsupport (Qt5), styles, tls (Qt6)
   install(
     DIRECTORY "${QT_PLUGINS_DIR}/"
     DESTINATION ${plugin_dest_dir}
@@ -208,10 +311,17 @@ if(WIN32)
     PATTERN "audio/qtaudio_wasapi.dll"
     PATTERN "audio/qtaudio_windows.dll"
     PATTERN "iconengines/qsvgicon.dll"
-    PATTERN "imageformats/*.dll"
+    PATTERN "imageformats/qgif.dll"
+    PATTERN "imageformats/qicns.dll"
+    PATTERN "imageformats/qico.dll"
+    PATTERN "imageformats/qjpeg.dll"
+    PATTERN "imageformats/qsvg.dll"
+    PATTERN "imageformats/qtga.dll"
+    PATTERN "imageformats/qtiff.dll"
+    PATTERN "imageformats/qwbmp.dll"
+    PATTERN "imageformats/qwebp.dll"
     PATTERN "mediaservice/dsengine.dll"
     PATTERN "mediaservice/wmfengine.dll"
-    PATTERN "multimedia/*.dll"
     PATTERN "platforms/qdirect2d.dll"
     PATTERN "platforms/qminimal.dll"
     PATTERN "platforms/qoffscreen.dll"

cockatrice/cockatrice.qrc

@@ -1,5 +1,5 @@
 <RCC>
-    <qresource prefix="/">
+    <qresource prefix="/" >
         <file>resources/cardback.svg</file>
         <file>resources/cockatrice.svg</file>
         <file>resources/hand.svg</file>
@@ -13,12 +13,9 @@
         <file>resources/icons/arrow_top_green.svg</file>
         <file>resources/icons/arrow_up_green.svg</file>
         <file>resources/icons/clearsearch.svg</file>
-        <file>resources/icons/cogwheel.svg</file>
         <file>resources/icons/conceded.svg</file>
         <file>resources/icons/decrement.svg</file>
         <file>resources/icons/delete.svg</file>
-        <file>resources/icons/dropdown_collapsed.svg</file>
-        <file>resources/icons/dropdown_expanded.svg</file>
         <file>resources/icons/forgot_password.svg</file>
         <file>resources/icons/increment.svg</file>
         <file>resources/icons/info.svg</file>
@@ -27,25 +24,16 @@
         <file>resources/icons/pencil.svg</file>
         <file>resources/icons/player.svg</file>
         <file>resources/icons/ready_start.svg</file>
-        <file>resources/icons/reload.svg</file>
         <file>resources/icons/remove_row.svg</file>
-        <file>resources/icons/rename.svg</file>
         <file>resources/icons/scales.svg</file>
         <file>resources/icons/search.svg</file>
         <file>resources/icons/settings.svg</file>
         <file>resources/icons/spectator.svg</file>
-        <file>resources/icons/swap.svg</file>
         <file>resources/icons/sync.svg</file>
         <file>resources/icons/tab_changed.svg</file>
         <file>resources/icons/update.png</file>
         <file>resources/icons/view.svg</file>
 
-        <file>resources/icons/mana/B.svg</file>
-        <file>resources/icons/mana/G.svg</file>
-        <file>resources/icons/mana/R.svg</file>
-        <file>resources/icons/mana/U.svg</file>
-        <file>resources/icons/mana/W.svg</file>
-
         <file>resources/config/general.svg</file>
         <file>resources/config/appearance.svg</file>
         <file>resources/config/interface.svg</file>
@@ -53,8 +41,6 @@
         <file>resources/config/deckeditor.svg</file>
         <file>resources/config/shorcuts.svg</file>
         <file>resources/config/sound.svg</file>
-        <file>resources/config/debug.ini</file>
-        <file>resources/config/qtlogging.ini</file>
 
         <file>resources/counters/w.svg</file>
         <file>resources/counters/w_highlight.svg</file>
@@ -340,42 +326,39 @@
         <file>resources/replay/fastforward.svg</file>
         <file>resources/replay/pause.svg</file>
 
-        <file>resources/usericons/pawn_single.svg</file>
-        <file>resources/usericons/pawn_double.svg</file>
-        <file>resources/usericons/pawn_donator_single.svg</file>
-        <file>resources/usericons/pawn_donator_double.svg</file>
-        <file>resources/usericons/pawn_judge_single.svg</file>
-        <file>resources/usericons/pawn_judge_double.svg</file>
-        <file>resources/usericons/pawn_vip_single.svg</file>
-        <file>resources/usericons/pawn_vip_double.svg</file>
-        <file>resources/usericons/star_single.svg</file>
-        <file>resources/usericons/star_double.svg</file>
+        <file>resources/userlevels/normal.svg</file>
+        <file>resources/userlevels/registered.svg</file>
+        <file>resources/userlevels/registered_buddy.svg</file>
+        <file>resources/userlevels/registered_vip.svg</file>
+        <file>resources/userlevels/registered_vip_buddy.svg</file>
+        <file>resources/userlevels/registered_donator.svg</file>
+        <file>resources/userlevels/registered_donator_buddy.svg</file>
+
+        <file>resources/userlevels/moderator.svg</file>
+        <file>resources/userlevels/moderator_buddy.svg</file>
+        <file>resources/userlevels/moderator_vip.svg</file>
+        <file>resources/userlevels/moderator_vip_buddy.svg</file>
+
+        <file>resources/userlevels/admin.svg</file>
+        <file>resources/userlevels/admin_buddy.svg</file>
+        <file>resources/userlevels/admin_vip.svg</file>
+        <file>resources/userlevels/admin_vip_buddy.svg</file>
 
         <!-- ADD TIP OF THE DAY IMAGES HERE -->
         <file>resources/tips/images/accounts_tab.png</file>
-        <file>resources/tips/images/add_card.png</file>
         <file>resources/tips/images/arrows.png</file>
-        <file>resources/tips/images/card_select.png</file>
         <file>resources/tips/images/cockatrice_register.png</file>
         <file>resources/tips/images/cockatrice_wiki.png</file>
         <file>resources/tips/images/coin_flip.png</file>
         <file>resources/tips/images/counter_expression.png</file>
         <file>resources/tips/images/discord.png</file>
-        <file>resources/tips/images/edhrec.png</file>
-        <file>resources/tips/images/expand_card_view.png</file>
         <file>resources/tips/images/face_down.png</file>
         <file>resources/tips/images/filter_games.png</file>
         <file>resources/tips/images/github_logo.png</file>
-        <file>resources/tips/images/highlight_cards.png</file>
-        <file>resources/tips/images/pawns.png</file>
         <file>resources/tips/images/setpt.png</file>
         <file>resources/tips/images/shortcuts.png</file>
-        <file>resources/tips/images/syntax_help.png</file>
         <file>resources/tips/images/themes.png</file>
         <file>resources/tips/images/tip_of_the_day.png</file>
-        <file>resources/tips/images/token.png</file>
-        <file>resources/tips/images/updates.png</file>
-        <file>resources/tips/images/visual_deck_tags.png</file>
         <file>resources/tips/tips_of_the_day.xml</file>
 
         <file>resources/help/search.md</file>

cockatrice/resources/config/debug.ini

@@ -1,11 +0,0 @@
-[debug]
-showCardId=false
-
-[localgame]
-onStartup=false
-playerCount=1
-;deck\Player 1=path/to/deck
-;deck\Player 2=path/to/deck
-
-; Fun Fact: You can assign a deck to your username and it will auto load and ready when you join a server game
-;deck\Your Username Here=path/to/deck

cockatrice/resources/config/qtlogging.ini

@@ -1,62 +0,0 @@
-[Rules]
-# The default log level is info
-*.debug = false
-
-# Uncomment a rule to disable logging for that category,
-# or set .debug = true for that category to see debug level logs
-
-# main = false
-# qt_translator = false
-# window_main.* = false
-# release_channel = false
-# spoiler_background_updater = false
-# theme_manager = false
-# sound_engine = false
-# tapped_out_interface = false
-
-# tab_game = false
-# tab_message = false
-# tab_supervisor = false
-
-# dlg_edit_avatar = false
-# dlg_settings = false
-# dlg_tip_of_the_day = false
-# dlg_update = false
-
-# settings_cache = false
-# servers_settings = false
-# shortcuts_settings = false
-
-# remote_client = false
-
-# player = false
-# game_scene = false
-# game_scene.player_addition_removal = false
-# card_zone = false
-# view_zone = false
-
-# user_info_connection = false
-
-# picture_loader = false
-# picture_loader.worker = false
-# picture_loader.card_back_cache_fail = false
-# picture_loader.picture_to_load = false
-# deck_loader = false
-# card_database = false
-# card_database.loading = false
-# card_database.loading.success_or_failure = false
-# cockatrice_xml.* = false
-# cockatrice_xml.xml_3_parser = false
-# cockatrice_xml.xml_4_parser = false
-# card_info = false
-# card_list = false
-
-#flow_layout = false
-#flow_widget = false
-#flow_widget.size = false
-
-# card_info_picture_widget = false
-
-# pixel_map_generator = false
-
-# filter_string = false

cockatrice/resources/icons/cogwheel.svg

@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-     xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" width="102.5024mm" height="102.24421mm"
-     viewBox="0 0 102.5024 102.24421" version="1.1"
-     id="svg1"
-     inkscape:version="1.4 (e7c3feb100, 2024-10-09)" sodipodi:docname="cog_wheel.svg"
-     xmlns="http://www.w3.org/2000/svg">
-    <sodipodi:namedview id="namedview1" pagecolor="#ffffff" bordercolor="#000000" borderopacity="0.25"
-                        inkscape:showpageshadow="2" inkscape:pageopacity="0.0" inkscape:pagecheckerboard="0"
-                        inkscape:deskcolor="#d1d1d1" inkscape:document-units="mm" inkscape:zoom="0.66101291"
-                        inkscape:cx="146.74449" inkscape:cy="193.64221" inkscape:window-width="1829"
-                        inkscape:window-height="951" inkscape:window-x="0" inkscape:window-y="0"
-                        inkscape:window-maximized="1" inkscape:current-layer="layer1"/>
-    <defs id="defs1"/>
-    <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" transform="translate(-66.148059,-97.377896)">
-        <g id="g1" transform="translate(-165.09777,-82.009607)">
-            <g id="g2" transform="matrix(0.26458333,0,0,0.26458333,64.983323,161.37858)">
-                <path style="fill:#333333;stroke-width:94.4882"
-                      d="m 721.34301,94.413051 40.00966,29.763289 29.51933,-9.27053 14.63768,-46.840589 36.83817,0.48792 13.41787,46.108699 28.29952,9.5145 40.74155,-28.299519 29.0314,21.468599 -15.85748,47.08454 16.58937,23.66426 48.30432,-2.68358 12.93,34.88648 -41.71741,27.07971 -0.48792,29.27536 40.49763,26.10387 -10.2464,34.15459 -48.54834,-0.97584 -18.78502,23.42029 15.85749,45.37681 -28.29952,21.71256 -41.22947,-29.27536 -28.54348,9.75846 -13.66184,47.57246 -38.30194,-0.73188 -14.63768,-48.30435 -27.07971,-9.27054 -40.00966,29.27537 -30.25121,-20.49276 17.32125,-46.35266 -17.80918,-24.64009 -49.76812,3.17149 -11.22222,-34.64251 40.74155,-27.07971 0.48792,-30.00725 -41.71739,-27.32367 12.19807,-32.93479 48.30435,2.68358 20.24879,-24.6401 -17.32126,-47.08455 z"
-                      id="path1"/>
-                <circle style="fill:#f9f9f9;stroke-width:72.1317" id="path2" cx="822.09906" cy="261.28262"
-                        r="83.434792"/>
-                <circle style="fill:#4d4d4d;stroke-width:40.5147" id="circle2" cx="822.09906" cy="261.28262"
-                        r="46.863361"/>
-            </g>
-        </g>
-    </g>
-</svg>

cockatrice/resources/icons/dropdown_collapsed.svg

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 51448)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-        <!ENTITY ns_svg "http://www.w3.org/2000/svg">
-        <!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
-        ]>
-<svg version="1.1" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="460.5" height="531.74"
-     viewBox="0 0 460.5 531.74" overflow="visible" enable-background="new 0 0 460.5 531.74" xml:space="preserve">
-<polygon fill="#918d8d" points="0.5,0.866 459.5,265.87 0.5,530.874 "/>
-</svg>

cockatrice/resources/icons/dropdown_expanded.svg

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 51448)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-        <!ENTITY ns_svg "http://www.w3.org/2000/svg">
-        <!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
-        ]>
-<svg version="1.1" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="531.74" height="460.5"
-     viewBox="0 0 531.74 460.5" overflow="visible" enable-background="new 0 0 531.74 460.5" xml:space="preserve">
-<polygon fill="#918d8d" points="530.874,0.5 265.87,459.5 0.866,0.5 "/>
-</svg>

cockatrice/resources/icons/mana/B.svg

@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-        width="169.34801mm"
-        height="169.34801mm"
-        viewBox="0 0 600 600"
-        version="1.1"
-        id="svg1"
-        sodipodi:docname="B.svg"
-        inkscape:export-filename="B.svg"
-        inkscape:export-xdpi="96"
-        inkscape:export-ydpi="96"
-        xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-        xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-        xmlns="http://www.w3.org/2000/svg">
-  <defs
-          id="defs1"/>
-  <sodipodi:namedview
-          id="namedview1"
-          pagecolor="#505050"
-          bordercolor="#eeeeee"
-          borderopacity="1"
-          inkscape:showpageshadow="0"
-          inkscape:pageopacity="0"
-          inkscape:pagecheckerboard="0"
-          inkscape:deskcolor="#505050"
-          inkscape:document-units="mm">
-    <inkscape:page
-            x="0"
-            y="0"
-            width="600"
-            height="600"
-            id="page2"
-            margin="0"
-            bleed="0"/>
-  </sodipodi:namedview>
-  <path
-          id="Selection"
-          fill="none"
-          stroke="#000000"
-          stroke-width="1"
-          d="m 275,0.21 c 0,0 42,0 42,0 0,0 19,1.51 19,1.51 29.13,3.58 56.99,10.83 84,22.43 33.64,14.45 59.89,32.91 86.91,57.41 17.38,15.76 34.67,37.56 47.14,57.44 22.78,36.31 37.1,74.56 43.22,117 1.28,8.88 2.72,19.08 2.73,28 0,0 0,34 0,34 0,0 -0.91,10 -0.91,10 -2.36,32.29 -11.93,67.59 -25.4,97 -27.01,58.98 -70.49,105.42 -126.69,137.57 -34.3,19.63 -79.56,33.64 -119,36.52 0,0 -12,0.91 -12,0.91 0,0 -34,0 -34,0 0,0 -10,-0.91 -10,-0.91 -26.57,-1.94 -53.09,-8.27 -78,-17.67 C 163.49,569.9 134.12,553.46 109,532.57 79.87,508.33 54.41,478.39 36.31,445 -5.08,368.65 -11.86,276.57 18.05,195 47.85,113.75 113.21,48.92 194,18.42 213.55,11.04 236.32,5.43 257,2.43 Z"
-          style="display:inline;fill:#ababab;fill-opacity:1"/>
-  <path
-          d="m 299.67889,84.945431 c -118.26949,0 -214.122988,83.892719 -214.122988,187.357619 0,58.63289 30.863828,110.90901 79.041488,145.28579 8.02961,5.77129 12.71356,15.13917 11.29165,25.0089 l -7.86234,55.37086 c -1.17098,8.02962 5.01851,15.22281 13.13176,15.22281 h 64.98968 v -46.83939 c 0,-3.68025 3.01111,-6.69135 6.69135,-6.69135 h 13.38268 c 3.68024,0 6.69135,3.0111 6.69135,6.69135 v 46.83939 h 53.53075 v -46.83939 c 0,-3.68025 3.01111,-6.69135 6.69134,-6.69135 h 13.38269 c 3.68023,0 6.69134,3.0111 6.69134,6.69135 v 46.83939 h 64.98967 c 8.11327,0 14.30275,-7.19319 13.13177,-15.22281 l -7.86234,-55.37086 c -1.4219,-9.78609 3.1784,-19.23761 11.29165,-25.0089 48.17767,-34.37678 79.0415,-86.6529 79.0415,-145.28579 0,-103.4649 -95.8535,-187.357619 -214.123,-187.357619 z M 219.38277,352.59917 c -29.52555,0 -53.53075,-24.0052 -53.53075,-53.53075 0,-29.52555 24.0052,-53.53075 53.53075,-53.53075 29.52555,0 53.53075,24.0052 53.53075,53.53075 0,29.52555 -24.0052,53.53075 -53.53075,53.53075 z m 160.59225,0 c -29.52555,0 -53.53075,-24.0052 -53.53075,-53.53075 0,-29.52555 24.0052,-53.53075 53.53075,-53.53075 29.52555,0 53.53075,24.0052 53.53075,53.53075 0,29.52555 -24.0052,53.53075 -53.53075,53.53075 z"
-          id="path1"
-          style="fill:#4d4d4d;fill-opacity:1;stroke:#000000;stroke-width:0.836419;stroke-opacity:1"/>
-</svg>

cockatrice/resources/icons/mana/G.svg

@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-        xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-        xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-        width="169.34801mm"
-        height="169.34801mm"
-        viewBox="0 0 600 600"
-        version="1.1"
-        id="svg1"
-        sodipodi:docname="B.svg"
-        inkscape:export-filename="U.svg"
-        inkscape:export-xdpi="96"
-        inkscape:export-ydpi="96"
-        xmlns="http://www.w3.org/2000/svg">
-    <defs
-            id="defs1"/>
-    <sodipodi:namedview
-            id="namedview1"
-            pagecolor="#505050"
-            bordercolor="#eeeeee"
-            borderopacity="1"
-            inkscape:showpageshadow="0"
-            inkscape:pageopacity="0"
-            inkscape:pagecheckerboard="0"
-            inkscape:deskcolor="#505050"
-            inkscape:document-units="mm">
-        <inkscape:page
-                x="0"
-                y="0"
-                width="600"
-                height="600"
-                id="page2"
-                margin="0"
-                bleed="0"/>
-    </sodipodi:namedview>
-    <path
-            id="Selection"
-            fill="none"
-            stroke="#000000"
-            stroke-width="1"
-            d="m 275,0.21 c 0,0 42,0 42,0 0,0 19,1.51 19,1.51 29.13,3.58 56.99,10.83 84,22.43 33.64,14.45 59.89,32.91 86.91,57.41 17.38,15.76 34.67,37.56 47.14,57.44 22.78,36.31 37.1,74.56 43.22,117 1.28,8.88 2.72,19.08 2.73,28 0,0 0,34 0,34 0,0 -0.91,10 -0.91,10 -2.36,32.29 -11.93,67.59 -25.4,97 -27.01,58.98 -70.49,105.42 -126.69,137.57 -34.3,19.63 -79.56,33.64 -119,36.52 0,0 -12,0.91 -12,0.91 0,0 -34,0 -34,0 0,0 -10,-0.91 -10,-0.91 -26.57,-1.94 -53.09,-8.27 -78,-17.67 C 163.49,569.9 134.12,553.46 109,532.57 79.87,508.33 54.41,478.39 36.31,445 -5.08,368.65 -11.86,276.57 18.05,195 47.85,113.75 113.21,48.92 194,18.42 213.55,11.04 236.32,5.43 257,2.43 Z"
-            style="display:inline;fill:#5f9f56;fill-opacity:1"/>
-    <path
-            d="m 488.52401,428.04591 -80.36527,-83.50228 h 30.81218 c 9.06362,0 17.08104,-4.61393 20.90363,-12.05153 3.82262,-7.41912 2.56521,-15.92714 -3.29949,-22.19282 l -78.59482,-83.87142 h 29.06188 c 9.15413,0 17.40291,-4.93688 20.98411,-12.55902 3.54092,-7.50219 1.87106,-16.23169 -4.26525,-22.22053 L 312.83499,83.240199 c -6.06588,-5.951919 -17.38282,-5.951919 -23.45873,0 L 178.44019,191.64831 c -6.13629,5.98884 -7.79612,14.71834 -4.26523,22.22053 3.58119,7.62214 11.84001,12.55902 20.99414,12.55902 h 29.06189 l -78.60489,83.88987 c -5.84454,6.25645 -7.10199,14.75525 -3.28944,22.18361 3.82262,7.42836 11.82996,12.04229 20.90363,12.04229 h 30.81222 l -80.36527,83.50228 c -6.03569,6.26567 -7.40379,14.84754 -3.58117,22.38663 3.7723,7.42839 12.07138,12.22682 21.13497,12.22682 h 129.63669 c 0,0 -36.12127,66.38546 0,62.75824 h 80.45578 c 33.50708,5.78651 0,-62.75824 0,-62.75824 h 129.63668 c 9.06361,0 17.36266,-4.79843 21.13499,-12.22682 3.82262,-7.53909 2.45452,-16.12096 -3.58117,-22.38663 z"
-            id="ENVIR"
-            style="fill:#3f6e3a;fill-opacity:1;stroke:#000000;stroke-width:1.09833;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"/>
-</svg>

cockatrice/resources/icons/mana/R.svg

@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-        xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-        xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-        width="169.34801mm"
-        height="169.34801mm"
-        viewBox="0 0 600 600"
-        version="1.1"
-        id="svg1"
-        sodipodi:docname="B.svg"
-        inkscape:export-filename="B.svg"
-        inkscape:export-xdpi="96"
-        inkscape:export-ydpi="96"
-        xmlns="http://www.w3.org/2000/svg">
-    <defs
-            id="defs1"/>
-    <sodipodi:namedview
-            id="namedview1"
-            pagecolor="#505050"
-            bordercolor="#eeeeee"
-            borderopacity="1"
-            inkscape:showpageshadow="0"
-            inkscape:pageopacity="0"
-            inkscape:pagecheckerboard="0"
-            inkscape:deskcolor="#505050"
-            inkscape:document-units="mm">
-        <inkscape:page
-                x="0"
-                y="0"
-                width="600"
-                height="600"
-                id="page2"
-                margin="0"
-                bleed="0"/>
-    </sodipodi:namedview>
-    <path
-            id="Selection"
-            fill="none"
-            stroke="#000000"
-            stroke-width="1"
-            d="m 275,0.21 c 0,0 42,0 42,0 0,0 19,1.51 19,1.51 29.13,3.58 56.99,10.83 84,22.43 33.64,14.45 59.89,32.91 86.91,57.41 17.38,15.76 34.67,37.56 47.14,57.44 22.78,36.31 37.1,74.56 43.22,117 1.28,8.88 2.72,19.08 2.73,28 0,0 0,34 0,34 0,0 -0.91,10 -0.91,10 -2.36,32.29 -11.93,67.59 -25.4,97 -27.01,58.98 -70.49,105.42 -126.69,137.57 -34.3,19.63 -79.56,33.64 -119,36.52 0,0 -12,0.91 -12,0.91 0,0 -34,0 -34,0 0,0 -10,-0.91 -10,-0.91 -26.57,-1.94 -53.09,-8.27 -78,-17.67 C 163.49,569.9 134.12,553.46 109,532.57 79.87,508.33 54.41,478.39 36.31,445 -5.08,368.65 -11.86,276.57 18.05,195 47.85,113.75 113.21,48.92 194,18.42 213.55,11.04 236.32,5.43 257,2.43 Z"
-            style="display:inline;fill:#c95e46;fill-opacity:1"/>
-    <path
-            style="display:inline;fill:#7e3525;fill-opacity:1;stroke:#000000;stroke-width:0.999129;stroke-dasharray:none;stroke-opacity:1"
-            d="m 278.25473,537.27772 c -22.36635,-1.29637 -48.78648,-8.31223 -69.74195,-18.51997 -47.30139,-23.04123 -75.19872,-59.72004 -85.45343,-112.35234 -2.77041,-14.21911 -2.51753,-48.32296 0.4755,-64.1246 4.84373,-25.57244 17.23939,-55.03329 30.65191,-72.85059 3.74877,-4.97991 16.33133,-18.11906 30.23479,-31.57223 13.09764,-12.67346 26.64745,-26.67202 30.11069,-31.10792 16.66894,-21.35045 26.46602,-44.71272 29.68313,-70.78286 1.93489,-15.67951 0.37962,-45.867231 -3.5802,-69.491071 -0.58906,-3.51428 0.36584,-3.52724 11.47726,-0.15583 36.51454,11.0792 67.37028,34.791071 89.32423,68.643431 9.96686,15.36862 20.07787,39.31263 24.78919,58.70364 2.23257,9.18886 2.53252,44.73878 0.46396,54.98571 -0.75708,3.75024 -1.10086,7.09425 -0.76396,7.43114 1.5021,1.5021 14.63666,-6.65479 21.98002,-13.65016 10.59844,-10.09621 14.32693,-17.61354 15.94714,-32.15254 l 1.16788,-10.47988 3.4626,3.95724 c 26.80954,30.6392 41.75268,56.11528 54.11775,92.26358 11.02075,32.21825 14.93902,62.79297 12.47422,97.33768 -1.88493,26.41774 -10.16486,50.6958 -24.95555,73.17369 -6.31625,9.59901 -30.86306,34.05172 -40.40914,40.25423 -23.44452,15.23295 -50.15355,25.25695 -77.26806,28.99903 -12.48732,1.72336 -38.04339,2.42637 -54.18798,1.49062 z m 48.34948,-30.34196 c 30.78066,-8.0491 53.53846,-30.12825 59.69792,-57.9177 2.48916,-11.23027 2.26087,-34.25269 -0.43747,-44.11787 -5.3998,-19.74181 -9.72931,-26.61651 -30.6237,-48.62658 -16.92925,-17.8332 -21.73398,-24.64464 -25.45673,-36.0889 -2.38622,-7.33554 -2.63126,-9.53814 -2.57644,-23.15876 0.0334,-8.27872 0.486,-17.4607 1.00593,-20.40441 0.75887,-4.29636 0.66928,-5.45812 -0.45409,-5.88919 -2.12997,-0.81736 -16.25071,4.45522 -21.90917,8.1807 -25.69349,16.91641 -42.62753,52.30879 -40.22917,84.07948 0.39046,5.17228 0.2831,8.79277 -0.26071,8.79277 -1.78935,0 -13.49435,-13.46378 -15.34792,-17.65406 -1.03171,-2.33236 -2.15967,-6.42651 -2.50657,-9.09812 -1.00143,-7.71233 -1.60778,-8.14619 -5.46339,-3.90915 -13.31687,14.63425 -24.58113,35.69359 -29.53283,55.21379 -11.75615,46.34414 2.14731,84.38956 37.55813,102.77397 16.56338,8.59931 29.2427,11.25369 51.26679,10.73261 12.58064,-0.29766 17.41119,-0.85366 25.26942,-2.90858 z"
-            id="path8"/>
-</svg>

cockatrice/resources/icons/mana/U.svg

@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-        xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-        xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-        width="169.34801mm"
-        height="169.34801mm"
-        viewBox="0 0 600 600"
-        version="1.1"
-        id="svg1"
-        sodipodi:docname="U.svg"
-        inkscape:export-filename="U.png"
-        inkscape:export-xdpi="96"
-        inkscape:export-ydpi="96"
-        xmlns="http://www.w3.org/2000/svg">
-    <defs
-            id="defs1"/>
-    <sodipodi:namedview
-            id="namedview1"
-            pagecolor="#505050"
-            bordercolor="#eeeeee"
-            borderopacity="1"
-            inkscape:showpageshadow="0"
-            inkscape:pageopacity="0"
-            inkscape:pagecheckerboard="0"
-            inkscape:deskcolor="#505050"
-            inkscape:document-units="mm">
-        <inkscape:page
-                x="0"
-                y="0"
-                width="600"
-                height="600"
-                id="page2"
-                margin="0"
-                bleed="0"/>
-    </sodipodi:namedview>
-    <path
-            id="Selection"
-            fill="none"
-            stroke="#000000"
-            stroke-width="1"
-            d="m 275,0.21 c 0,0 42,0 42,0 0,0 19,1.51 19,1.51 29.13,3.58 56.99,10.83 84,22.43 33.64,14.45 59.89,32.91 86.91,57.41 17.38,15.76 34.67,37.56 47.14,57.44 22.78,36.31 37.1,74.56 43.22,117 1.28,8.88 2.72,19.08 2.73,28 0,0 0,34 0,34 0,0 -0.91,10 -0.91,10 -2.36,32.29 -11.93,67.59 -25.4,97 -27.01,58.98 -70.49,105.42 -126.69,137.57 -34.3,19.63 -79.56,33.64 -119,36.52 0,0 -12,0.91 -12,0.91 0,0 -34,0 -34,0 0,0 -10,-0.91 -10,-0.91 -26.57,-1.94 -53.09,-8.27 -78,-17.67 C 163.49,569.9 134.12,553.46 109,532.57 79.87,508.33 54.41,478.39 36.31,445 -5.08,368.65 -11.86,276.57 18.05,195 47.85,113.75 113.21,48.92 194,18.42 213.55,11.04 236.32,5.43 257,2.43 Z"
-            style="display:inline;fill:#4a8fd8;fill-opacity:1"/>
-    <path
-            style="display:inline;fill:#3266af;fill-opacity:1;stroke:#000000;stroke-width:1.06525;stroke-opacity:1"
-            d="m 275.20608,536.5693 c -58.69596,-9.5447 -107.01545,-50.69962 -125.66779,-107.0344 -9.25532,-27.95342 -10.39669,-58.82111 -3.22092,-87.1088 5.31307,-20.94475 9.06296,-28.00552 81.87785,-154.17 38.54798,-66.79109 70.40461,-121.77997 70.79251,-122.19751 1.00535,-1.08215 140.3595,240.63696 145.26785,251.97682 8.6735,20.03855 12.6923,39.82747 12.6923,62.49805 0,44.25387 -16.70161,83.24077 -48.85852,114.0514 -21.46938,20.57055 -45.69209,33.39124 -76.46586,40.47213 -12.83139,2.95245 -42.64639,3.75165 -56.41742,1.51231 z"
-            id="path2"
-            sodipodi:nodetypes="ssssssssss"/>
-</svg>

cockatrice/resources/icons/mana/W.svg

@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-        width="169.34801mm"
-        height="169.34801mm"
-        viewBox="0 0 600 600"
-        version="1.1"
-        id="svg1"
-        xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-        xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-        inkscape:export-xdpi="96"
-        inkscape:export-ydpi="96"
-        sodipodi:docname="W.svg"
-        inkscape:export-filename="W.png"
-        xmlns="http://www.w3.org/2000/svg">
-    <defs
-            id="defs1"/>
-    <sodipodi:namedview
-            id="namedview1"
-            pagecolor="#505050"
-            bordercolor="#eeeeee"
-            borderopacity="1"
-            inkscape:showpageshadow="0"
-            inkscape:pageopacity="0"
-            inkscape:pagecheckerboard="0"
-            inkscape:deskcolor="#505050"
-            inkscape:document-units="mm">
-        <inkscape:page
-                x="0"
-                y="0"
-                width="600"
-                height="600"
-                id="page2"
-                margin="0"
-                bleed="0"/>
-    </sodipodi:namedview>
-    <path
-            id="Selection"
-            fill="none"
-            stroke="#000000"
-            stroke-width="1"
-            d="m 275,0.21 c 0,0 42,0 42,0 0,0 19,1.51 19,1.51 29.13,3.58 56.99,10.83 84,22.43 33.64,14.45 59.89,32.91 86.91,57.41 17.38,15.76 34.67,37.56 47.14,57.44 22.78,36.31 37.1,74.56 43.22,117 1.28,8.88 2.72,19.08 2.73,28 0,0 0,34 0,34 0,0 -0.91,10 -0.91,10 -2.36,32.29 -11.93,67.59 -25.4,97 -27.01,58.98 -70.49,105.42 -126.69,137.57 -34.3,19.63 -79.56,33.64 -119,36.52 0,0 -12,0.91 -12,0.91 0,0 -34,0 -34,0 0,0 -10,-0.91 -10,-0.91 -26.57,-1.94 -53.09,-8.27 -78,-17.67 C 163.49,569.9 134.12,553.46 109,532.57 79.87,508.33 54.41,478.39 36.31,445 -5.08,368.65 -11.86,276.57 18.05,195 47.85,113.75 113.21,48.92 194,18.42 213.55,11.04 236.32,5.43 257,2.43 Z"
-            style="display:inline;fill:#ffefb3;fill-opacity:1"/>
-    <path
-            id="circle8"
-            d="M 387.28106,302.711 A 85.962512,85.962512 0 0 1 301.31852,388.67353 85.962512,85.962512 0 0 1 215.35597,302.711 85.962512,85.962512 0 0 1 301.31852,216.74844 85.962512,85.962512 0 0 1 387.28106,302.711 Z M 191.75349,358.6114 143.05798,460.97151 245.4181,412.27601 A 121.73882,121.73882 0 0 1 191.75349,358.6114 Z M 178.33753,302.711 c 0,-13.16763 2.23687,-25.83857 5.96271,-38.01232 L 77.71657,302.711 184.30024,340.7233 a 119.25435,119.25435 0 0 1 -5.96271,-38.0123 z m 178.8814,109.56501 102.36011,48.6955 -48.6955,-102.36011 a 121.73882,121.73882 0 0 1 -53.66461,53.66461 z m -55.90041,13.41595 c -13.16762,0 -26.0869,-2.23687 -38.01232,-5.9627 l 38.01232,106.58368 38.01231,-106.58368 a 119.25435,119.25435 0 0 1 -38.01231,5.9627 z m 109.56502,-178.88139 48.6955,-102.36012 -102.36011,48.69551 a 122.98106,122.98106 0 0 1 53.66461,53.66461 z M 245.66643,193.14596 143.30658,144.45045 192.00209,246.81057 a 121.73882,121.73882 0 0 1 53.66434,-53.66461 z M 524.92046,302.711 418.33679,264.69868 a 119.25435,119.25435 0 0 1 0,76.02462 z M 301.31852,179.73 c 13.16761,0 26.0869,2.23688 38.01231,5.96271 L 301.31852,79.109036 263.3062,185.69271 A 119.25435,119.25435 0 0 1 301.31852,179.73 Z"
-            style="fill:#b4a35e;fill-opacity:1;stroke:#000000;stroke-width:1.09833;stroke-dasharray:none;stroke-opacity:1"/>
-</svg>

cockatrice/resources/icons/reload.svg

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
-     viewBox="0 0 1000 1000" enable-background="new 0 0 1000 1000" xml:space="preserve">
-<metadata> Svg Vector Icons : http://www.onlinewebfonts.com/icon </metadata>
-    <g><path d="M586.9,373.6l95.6-84.4c-49.6-39.2-129.4-79.1-198.2-79.1c-134.9,0-248.2,90.5-280.2,212.8L10.6,374.5C64.4,168.3,255.2,15.8,482.5,15.8c126.7,0,258.8,63.7,345.4,141.4l90.8-80.1L990,479.6L586.9,373.6z M317.5,710.8c49.6,39.2,129.4,79.1,198.2,79.1c134.9,0,248.2-90.5,280.2-212.8l193.5,48.5c-53.7,206.2-244.6,358.7-471.9,358.7c-126.7,0-258.8-63.7-345.4-141.4l-90.8,80.1L10,520.4l403.1,106L317.5,710.8z"/></g>
-</svg>

cockatrice/resources/icons/rename.svg

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="1200pt" height="1200pt" version="1.1" viewBox="0 0 1200 1200" xmlns="http://www.w3.org/2000/svg">
-    <path transform="scale(50)" d="m17 16h4v-8h-4" fill="none" stroke="#000" stroke-miterlimit="10" stroke-width="2"/>
-    <path transform="scale(50)" d="m12 8h-9v8h9" fill="none" stroke="#000" stroke-miterlimit="10" stroke-width="2"/>
-    <path transform="scale(50)" d="m6 12h5" fill="none" stroke="#000" stroke-miterlimit="10" stroke-width="2"/>
-    <path transform="scale(50)" d="m20 4h-2c-1.1 0-2 0.9-2 2v12c0 1.1 0.9 2 2 2h2" fill="none" stroke="#000"
-          stroke-linejoin="round" stroke-miterlimit="10" stroke-width="2"/>
-    <path transform="scale(50)" d="m12 20h2c1.1 0 2-0.9 2-2v-12c0-1.1-0.9-2-2-2h-2" fill="none" stroke="#000"
-          stroke-linejoin="round" stroke-miterlimit="10" stroke-width="2"/>
-</svg>

cockatrice/resources/icons/swap.svg

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" fill="#000000" version="1.1" id="Capa_1"
-     xmlns="http://www.w3.org/2000/svg"
-     width="800px" height="800px" viewBox="0 0 71.753 71.753"
-     xml:space="preserve">
-<g>
-	<path d="M39.798,20.736H28.172v20.738L11.625,41.47V20.736H0L19.899,0.839L39.798,20.736z M51.855,70.914l19.897-19.896H60.129
-		V30.282l-16.547-0.004v20.74H31.957L51.855,70.914z"/>
-</g>
-</svg>

cockatrice/resources/tips/tips_of_the_day.xml

@@ -1,222 +1,99 @@
 <tips>
-	<tip>
-		<title>Tip of the Day</title>
-		<text>Tip of the Day is a feature to Cockatrice that allows users to get information about the newest features of the program and some of the most commonly asked questions!
-Check back in with major updates for new tips to be added or old tips to be updated as features are added or expanded upon!
-		</text>
-		<image>tip_of_the_day.png</image>
-		<date>2025-02-10</date>
-	</tip>
-	<tip>
-		<title>Join the Community</title>
-		<text>You can join the community to find games, interact with other players, suggest new 'Tips of the Day' and provide user feedback to the development or support teams on &lt;a href="https://discord.gg/3Z9yzmA"&gt;Discord&lt;/a&gt;!</text>
-		<image>discord.png</image>
-		<date>2025-02-09</date>
-	</tip>
-	<tip>
-		<title>Reporting Bugs and Requesting Features</title>
-		<text>If you encounter a bug while using Cockatrice, you can report the bug to and request the feature from the development team via &lt;a href="https://github.com/cockatrice/cockatrice/issues"&gt;GitHub&lt;a&gt;</text>
-		<image>github_logo.png</image>
-		<date>2025-02-09</date>
-	</tip>
-	<tip>
-		<title>FAQ/Troubleshooting Wiki</title>
-		<text>You can find answers to the most common questions and some helpful Cockatrice troubleshooting over on the &lt;a href="https://github.com/cockatrice/cockatrice/wiki"&gt;GitHub wiki&lt;a&gt;</text>
-		<image>cockatrice_wiki.png</image>
-		<date>2018-03-01</date>
-	</tip>
-	<tip>
-		<title>Register for a Server</title>
-		<text>Click on either Cockatrice (Windows) or Actions (Mac) and then Register to server...  When the dialogue appears, fill out the desired server information.</text>
-		<image>cockatrice_register.png</image>
-		<date>2018-03-01</date>
-	</tip>
-	<tip>
-		<title>Filtering Games</title>
-		<text>Don't see an open game or want to see a smaller selection? Use the Game Filters to change your horizon!</text>
-		<image>filter_games.png</image>
-		<date>2025-02-09</date>
-	</tip>
-	<tip>
-		<title>Common Shortcuts</title>
-		<text>You can find a full list of default shortcuts &lt;a href="https://github.com/Cockatrice/Cockatrice/wiki/Custom-Keyboard-Shortcuts"&gt;on the wiki&lt;/a&gt; or in Settings -> Shortcuts, but a short list:
-&lt;ul&gt;
-&lt;li&gt;Roll a die: CMD/CTRL + I&lt;/li&gt;
-&lt;li&gt;Mulligan: CMD/CTRL + M&lt;/li&gt;
-&lt;li&gt;Draw 1 / X card(s): CMD/CTRL + D / E&lt;/li&gt;
-&lt;li&gt;Undo a draw: CMD/CTRL + SHIFT + D&lt;/li&gt;
-&lt;li&gt;View Library / Sideboard: F3 / CMD/CTRL + F3&lt;/li&gt;
-&lt;li&gt;Change Life: CMD/CTRL + L&lt;/li&gt;
-&lt;li&gt;Show Card Info: Middle Mouse Click&lt;/li&gt;
-&lt;/ul&gt;
-All shortcuts can be customized via Cockatrice -> Settings -> Shortcuts!
-		</text>
-		<image>shortcuts.png</image>
-		<date>2025-02-09</date>
-	</tip>
-	<tip>
-		<title>Power and Toughness</title>
-		<text>You can add and subtract to a creature's stats.
-With a card selected, with the following keybindings:
-
-&lt;ul&gt;
-&lt;li&gt;Set P/T to any value: CTRL + P&lt;/li&gt;
-&lt;li&gt;+1 or -1 to both to P/T: CMD/CTRL + ALT + '+' or '-'&lt;/li&gt;
-&lt;li&gt;+1 or -1 to Power Only: CMD/CTRL + '+' or '-'&lt;/li&gt;
-&lt;li&gt;+1 or -1 to Toughness Only: ALT + '+' or '-'&lt;/li&gt;
-&lt;li&gt;Set P/T to Default: CMD/CTRL + ALT + 0&lt;/li&gt;
-&lt;/ul&gt;
-All shortcuts can be customized via Cockatrice -> Settings -> Shortcuts!
-		</text>
-		<image>setpt.png</image>
-		<date>2025-02-09</date>
-	</tip>
-	<tip>
-		<title>Drawing Arrows</title>
-		<text>You can draw arrows of different color by holding a combination of keys!
-
-&lt;ul&gt;
-&lt;li&gt;Right Click: Red Arrow&lt;/li&gt;
-&lt;li&gt;SHIFT + Right Click: Green Arrow&lt;/li&gt;
-&lt;li&gt;ALT + Right Click: Blue Arrow&lt;/li&gt;
-&lt;li&gt;CMD/CTRL + Right Click: Yellow Arrow&lt;/li&gt;
-&lt;/ul&gt;
-		</text>
-		<image>arrows.png</image>
-		<date>2018-03-01</date>
-	</tip>
-	<tip>
-		<title>General Etiquette</title>
-		<text>When playing on Cockatrice there are general "rules of engagement" for a better play experience for all players.
-The following are some of the expectations a player should reasonably expect for how to operate smooth and enjoyable games:
-&lt;ul&gt;
-&lt;li&gt;Have a "Rule 0" conversation pre-game with your fellow players on the expectations of the game including deck strength, house rules (e.g. no take backs and "may is not must"), etc.&lt;/li&gt;
-&lt;li&gt;When rolling your die for turn order, it is often best to create a token with the text of your roll (using CTRL + T and typing the number into "Name") and then tap this token when created to show that you have resolved your mulligans and are ready to start the game.&lt;/li&gt;
-&lt;li&gt;Use the phases and steps trackers on the left of the client to show others where in the turn you are and announce when moving between them. (Double Click for the action of this button)&lt;/li&gt;
-&lt;li&gt;When your turn is over leave it on your end step and DO NOT HIT PASS. Allow other players to respond if they can, and then if not, let the next player pass to themselves.&lt;/li&gt;
-&lt;li&gt;Please treat others kindly and respect as per &lt;a href="https://cockatrice.us/terms.php"&gt;our Terms of Service&lt;/a&gt;.&lt;/li&gt;
-&lt;/ul&gt;
-		</text>
-		<image>token.png</image>
-		<date>2025-02-10</date>
-	</tip>
-	<tip>
-		<title>Flip of the Coin</title>
-		<text>You can flip a coin instead of rolling a die by rolling a 2 sided die instead!</text>
-		<image>coin_flip.png</image>
-		<date>2018-03-01</date>
-	</tip>
-	<tip>
-		<title>Upload Custom Avatar</title>
-		<text>Want to show off your hippo avatar? Need to update your password? Check out the Accounts Tab for more info!</text>
-		<image>accounts_tab.png</image>
-		<date>2018-03-01</date>
-	</tip>
-	<tip>
-		<title>Player Icon Key</title>
-		<text>Besides your name is a player icon, this is a key for what they mean:
-&lt;ul&gt;
-&lt;li&gt;Flag: Country of Origin Player Selected&lt;/li&gt;
-&lt;li&gt;Purple Heart: Donator (&lt;a href="https://cockatrice.us/donate"&gt;Help support us and donate here!&lt;/a&gt;)&lt;/li&gt;
-&lt;li&gt;Gold Star: VIP (Special Admin Given Role)&lt;/li&gt;
-&lt;li&gt;Brown Gavel (Hammer): Judge / Rule's Lawyer&lt;/li&gt;
-&lt;li&gt;Black/White Pawn: Moderator (Support for Client Issues)&lt;/li&gt;
-&lt;li&gt;Red: Administrator (Sever Operators)&lt;/li&gt;
-&lt;/ul&gt;
-		</text>
-		<image>pawns.png</image>
-		<date>2025-02-09</date>
-	</tip>
-	<tip>
-		<title>Changing Themes</title>
-		<text>Did you know Cockatrice has custom themes? You can either &lt;a href="https://github.com/Cockatrice/Cockatrice/wiki/Themes"&gt;create one yourself&lt;/a&gt; or use one of the several preloaded ones! Go to Settings->Appearance and try them out!</text>
-		<image>themes.png</image>
-		<date>2018-03-01</date>
-	</tip>
-	<tip>
-		<title>Face Down Cards</title>
-		<text>You can hold Shift while dragging or clicking on a card to have it enter play face down.
-You can also hold CTRL + SHIFT and click and drag from your library to move bottom card face down as well!
-		</text>
-		<image>face_down.png</image>
-		<date>2025-02-09</date>
-	</tip>
-	<tip>
-		<title>Counter expressions</title>
-		<text>When setting a counter value, you can type a math expression in the box and the counter will be set to the result.&lt;br&gt;The "x" variable contains the current counter value.</text>
-		<image>counter_expression.png</image>
-		<date>2019-02-02</date>
-	</tip>
-	<tip>
-		<title>Select Multiple Cards</title>
-		<text>You can click and drag in any zone in order to highlight all cards within the created box.
-You can also hold CMD/CTRL and clik or click and drag to maintain other previously selected cards while adding others!
-You can move, alter and attach multiple highlighted cards at the same time!
-Other useful multi-select keybindings:
-&lt;ul&gt;
-&lt;li&gt;Select All Cards in Zone: CMD/CTRL + A&lt;/li&gt;
-&lt;li&gt;Select All Cards in Column: CMD/CTRL + SHIFT + C&lt;/li&gt;
-&lt;li&gt;Select All Cards in Row: CMD/CTRL + SHIFT + X&lt;/li&gt;
-&lt;/ul&gt;
-		</text>
-		<image>highlight_cards.png</image>
-		<date>2025-02-09</date>
-	</tip>
-	<tip>
-		<title>Auto Cascade and Search Parameters</title>
-		<text>You can use the default keybind of CMD/CTRL + SHIFT + Y in order to perform auto cascade or similar effects from your library using Scryfall search syntax.
-If you are unfamiliar with the syntax you may find it by opening a deck in deck editor and clicking the "i" next to the search bar in order to pull up a list of syntax commands.
-This same syntax can be used in the deck editor search bar as well to help you find the best cards for your decks!
-		</text>
-		<image>syntax_help.png</image>
-		<date>2025-02-09</date>
-	</tip>
-	<tip>
-		<title>Visual Deck Storage and Tags</title>
-		<text>You can now view your saved decks visually with integrated folder,tags and filter support!
-Pro Tip: If you want to use emoji's press WinKey + '.' or CTRL + CMD + SPACE on Windows or Mac respectively!
-		</text>
-		<image>visual_deck_tags.png</image>
-		<date>2025-02-09</date>
-	</tip>
-	<tip>
-		<title>Card Selector And Card Preferences</title>
-		<text>Cockatrice's deck editor now has the ability for players to bling out their decks by selecting the arts for cards on a per-card basis!
-You can also have multiple printings of the same card in your deck if you so choose!
-Not only that, other players will see the arts you have chosen by default!
-If you want to disable this feature for other players: Settings -> Appearance -> Select "Override all card art with personal set preference"
-		</text>
-		<image>card_select.png</image>
-		<date>2025-02-10</date>
-	</tip>
-	<tip>
-		<title>EDHREC Integration</title>
-		<text>We now have in-client integration for EDHREC, which allows you to right-click on any card name in the deck editor in order to bring up the contextual menu for the card.</text>
-		<image>edhrec.png</image>
-		<date>2025-02-10</date>
-	</tip>
-	<tip>
-		<title>Add Cards to Deck</title>
-		<text>You can now right-click anywhere on a card in any card info view in order to add it to any decks you have open in your tabs.</text>
-		<image>add_card.png</image>
-		<date>2025-02-10</date>
-	</tip>
-	<tip>
-		<title>Update Client and Card Database</title>
-		<text>You can update your client by going to Help and selecting whichever you wish to update.
-Client Update: Updates the client (if available) for new features, fixes and changes.
-Card Update: Updates card sources for spoilers and new card printings.
-Updating your card sources can often fix issues of cards not working or displaying properly, if not, go to Cockatrice -> Settings -> Card Sources -> Update Spoilers
-		</text>
-		<image>updates.png</image>
-		<date>2025-02-10</date>
-	</tip>
-	<tip>
-		<title>Expand Card View Window</title>
-		<text>Double click on the title bar of the card view window to expand it! Double click again to shrink it back down.
-			You can configure the initial and expanded heights of the window in the settings, under "Appearance".
-		</text>
-		<image>expand_card_view.png</image>
-		<date>2025-02-27</date>
-	</tip>
+    <tip>
+        <title>Tip of the Day</title>
+        <text>Tip of the Day is a new feature to Cockatrice that allows users to get information about the newest features of the program and some of the most commonly asked questions!</text>
+        <image>tip_of_the_day.png</image>
+        <date>2018-03-01</date>
+    </tip>
+    <tip>
+        <title>Suggesting New Tips</title>
+        <text>You can suggest new Tips of the Day by reaching out to the development team on &lt;a href="https://discord.gg/3Z9yzmA"&gt;Discord&lt;/a&gt;!</text>
+        <image>discord.png</image>
+        <date>2023-10-18</date>
+    </tip>
+    <tip>
+        <title>Reporting Bugs</title>
+        <text>If you encounter a bug while using Cockatrice, you can report the bug to the development team via &lt;a href="https://github.com/cockatrice/cockatrice/issues"&gt;GitHub&lt;a&gt;</text>
+        <image>github_logo.png</image>
+        <date>2018-03-01</date>
+    </tip>
+    <tip>
+        <title>FAQ/Troubleshooting Wiki</title>
+        <text>You can find answers to the most common questions and some helpful Cockatrice toubleshooting over on the &lt;a href="https://github.com/cockatrice/cockatrice/wiki"&gt;GitHub wiki&lt;a&gt;</text>
+        <image>cockatrice_wiki.png</image>
+        <date>2018-03-01</date>
+    </tip>
+    <tip>
+        <title>Register for a Server</title>
+        <text>Click on either Cockatrice (Windows) or Actions (Mac) and then Register to server...  When the dialogue appears, fill out the desired server information.</text>
+        <image>cockatrice_register.png</image>
+        <date>2018-03-01</date>
+    </tip>
+    <tip>
+        <title>Drawing Arrows</title>
+        <text>You can draw arrows of different color by holding a combination of keys!
+            Right Click: Red Arrow
+            Shift + Right Click: Green Arrow
+            Alt + Right Click: Blue Arrow
+            Cmd + Right Click: Yellow Arrow
+        </text>
+        <image>arrows.png</image>
+        <date>2018-03-01</date>
+    </tip>
+    <tip>
+        <title>Filtering Games</title>
+        <text>Don't see all the active games? Want to see a smaller selection? Use the Game Filters to change your horizon</text>
+        <image>filter_games.png</image>
+        <date>2018-03-01</date>
+    </tip>
+    <tip>
+        <title>Upload Custom Avatar</title>
+        <text>Want to show off your hippo avatar? Need to update your password? Check out the Accounts Tab for more info!</text>
+        <image>accounts_tab.png</image>
+        <date>2018-03-01</date>
+    </tip>
+    <tip>
+        <title>Common Shortcuts</title>
+        <text>You can find a full list of shortcuts &lt;a href="https://github.com/Cockatrice/Cockatrice/wiki/Custom-Keyboard-Shortcuts"&gt;on the wiki&lt;/a&gt;, but a short list:
+            &lt;br&gt;Roll a die: CTRL + I
+            &lt;br&gt;Mulligan: CTRL + M
+            &lt;br&gt;Draw a card: CTRL + D
+            &lt;br&gt;Undo a draw: CTRL + SHIFT + D
+            &lt;br&gt;View Sideboard: CTRL + F3
+            &lt;br&gt;Change Life: CTRL + L
+            &lt;br&gt;All shortcuts can be customized via Settings->Shortcuts!
+        </text>
+        <image>shortcuts.png</image>
+        <date>2018-03-01</date>
+    </tip>
+    <tip>
+        <title>Changing Themes</title>
+        <text>Did you know Cockatrice has custom themes? You can either &lt;a href="https://github.com/Cockatrice/Cockatrice/wiki/Themes"&gt;create one yourself&lt;/a&gt; or use one of the several pre-loaded ones! Go to Settings->Appearance and try them out!</text>
+        <image>themes.png</image>
+        <date>2018-03-01</date>
+    </tip>
+    <tip>
+        <title>Flip of the Coin</title>
+        <text>You can flip a coin instead of rolling a die by rolling a 2 sided die instead!</text>
+        <image>coin_flip.png</image>
+        <date>2018-03-01</date>
+    </tip>
+    <tip>
+        <title>Face Down Cards</title>
+        <text>You can hold Shift while dragging or clicking on a card to have it enter play face down</text>
+        <image>face_down.png</image>
+        <date>2018-03-01</date>
+    </tip>
+    <tip>
+        <title>Counter expressions</title>
+        <text>When setting a counter value, you can type a math expression in the box and the counter will be set to the result.&lt;br&gt;The "x" variable contains the current counter value.</text>
+        <image>counter_expression.png</image>
+        <date>2019-02-02</date>
+    </tip>
+    <tip>
+        <title>Power and Toughness</title>
+        <text>You can add and subtract to a creature's stats.&lt;br&gt;With a card selected, set the power and toughness ( default: ctrl + p ) and enter +3/-1 to increase power by three while decreasing toughness by one.&lt;br&gt;You can also reset it to the original value ( default: ctrl + alt + 0 ).</text>
+        <image>setpt.png</image>
+        <date>2019-03-02</date>
+    </tip>
 </tips>

cockatrice/resources/usericons/pawn_donator_single.svg

@@ -1,229 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   width="100"
-   height="100"
-   id="svg5322"
-   version="1.1"
-   inkscape:version="1.4 (86a8ad7, 2024-10-11)"
-   sodipodi:docname="pawn_donator_single.svg"
-   xml:space="preserve"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:dc="http://purl.org/dc/elements/1.1/"><defs
-     id="defs3"><linearGradient
-       id="linearGradient2"
-       inkscape:collect="always"><stop
-         style="stop-color:#8c5fd3;stop-opacity:1;"
-         offset="0"
-         id="stop2" /><stop
-         style="stop-color:#b284e9;stop-opacity:1;"
-         offset="0.5"
-         id="stop1" /></linearGradient><inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective5328" /><inkscape:perspective
-       id="perspective5305"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" /><linearGradient
-       id="linearGradient5181"><stop
-         style="stop-color:#0fbb00;stop-opacity:1;"
-         offset="0"
-         id="stop5183" /><stop
-         style="stop-color:#064400;stop-opacity:1;"
-         offset="1"
-         id="stop5185" /></linearGradient><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3600-2"
-       id="radialGradient3606-7"
-       cx="324.32715"
-       cy="131.40274"
-       fx="324.32715"
-       fy="131.40274"
-       r="25.501276"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)" /><linearGradient
-       id="linearGradient3600-2"><stop
-         style="stop-color:#ffc33d;stop-opacity:1;"
-         offset="0"
-         id="stop3602-4" /><stop
-         style="stop-color:#e09900;stop-opacity:1;"
-         offset="1"
-         id="stop3604-9" /></linearGradient><inkscape:perspective
-       id="perspective5478"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" /><linearGradient
-       id="linearGradient5189"><stop
-         style="stop-color:#000ec9;stop-opacity:1;"
-         offset="0"
-         id="stop5191" /><stop
-         style="stop-color:#000657;stop-opacity:1;"
-         offset="1"
-         id="stop5193" /></linearGradient><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3600-4"
-       id="radialGradient3606-1"
-       cx="324.32715"
-       cy="131.40274"
-       fx="324.32715"
-       fy="131.40274"
-       r="25.501276"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)" /><linearGradient
-       id="linearGradient3600-4"><stop
-         style="stop-color:#ffc33d;stop-opacity:1;"
-         offset="0"
-         id="stop3602-3" /><stop
-         style="stop-color:#e09900;stop-opacity:1;"
-         offset="1"
-         id="stop3604-5" /></linearGradient><inkscape:perspective
-       id="perspective5559"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" /><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5173"
-       id="linearGradient5179"
-       x1="167.33386"
-       y1="178.83276"
-       x2="244.78181"
-       y2="178.83276"
-       gradientUnits="userSpaceOnUse" /><linearGradient
-       id="linearGradient5173"><stop
-         style="stop-color:#f50000;stop-opacity:1;"
-         offset="0"
-         id="stop5175" /><stop
-         style="stop-color:#950000;stop-opacity:1;"
-         offset="1"
-         id="stop5177" /></linearGradient><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3600"
-       id="radialGradient5169"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)"
-       cx="324.32715"
-       cy="131.40274"
-       fx="324.32715"
-       fy="131.40274"
-       r="25.501276" /><linearGradient
-       id="linearGradient3600"><stop
-         style="stop-color:#ffc13d;stop-opacity:1;"
-         offset="0"
-         id="stop3602" /><stop
-         style="stop-color:#e09900;stop-opacity:1;"
-         offset="1"
-         id="stop3604" /></linearGradient><radialGradient
-       r="25.501276"
-       fy="131.40274"
-       fx="324.32715"
-       cy="131.40274"
-       cx="324.32715"
-       gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient5574"
-       xlink:href="#linearGradient3600"
-       inkscape:collect="always" /><inkscape:perspective
-       id="perspective5663"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" /><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3600-7"
-       id="radialGradient3606-8"
-       cx="324.32715"
-       cy="131.40274"
-       fx="324.32715"
-       fy="131.40274"
-       r="25.501276"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)" /><linearGradient
-       id="linearGradient3600-7"><stop
-         style="stop-color:#ffc13d;stop-opacity:1;"
-         offset="0"
-         id="stop3602-7" /><stop
-         style="stop-color:#e09900;stop-opacity:1;"
-         offset="1"
-         id="stop3604-6" /></linearGradient><radialGradient
-       r="25.501276"
-       fy="131.40274"
-       fx="324.32715"
-       cy="131.40274"
-       cx="324.32715"
-       gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient5676"
-       xlink:href="#linearGradient3600-7"
-       inkscape:collect="always" /><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2"
-       id="linearGradient3"
-       x1="49.889599"
-       y1="87.971054"
-       x2="50.103622"
-       y2="27.668242"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2878408,0,0,1.2878408,-14.204016,-15.239682)" /></defs><sodipodi:namedview
-     inkscape:document-units="mm"
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.9195959"
-     inkscape:cx="55.179583"
-     inkscape:cy="45.519999"
-     inkscape:current-layer="layer2"
-     showgrid="false"
-     inkscape:window-width="1147"
-     inkscape:window-height="1211"
-     inkscape:window-x="3260"
-     inkscape:window-y="138"
-     inkscape:window-maximized="0"
-     inkscape:showpageshadow="2"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"
-     showguides="true"><sodipodi:guide
-       position="50.002551,111.99556"
-       orientation="1,0"
-       id="guide3"
-       inkscape:locked="false" /></sodipodi:namedview><metadata
-     id="metadata4"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-952.36218)"
-     style="display:inline"><path
-       style="display:inline;opacity:1;fill-opacity:1;stroke:#000000;stroke-width:2.7822;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 49.84375,1.71875 C 36.719738,1.71875 26.0625,12.375988 26.0625,25.5 c 0,7.477454 3.475825,14.112734 8.875,18.46875 -10.497549,5.974948 -17.018351,18.227376 -20.625,31.6875 -5.2744126,19.6844 15.911513,22.5625 35.53125,22.5625 19.619736,0 40.705577,-3.2516 35.53125,-22.5625 C 81.693381,61.916246 75.224585,49.827177 64.8125,43.9375 70.181573,39.580662 73.59375,32.953205 73.59375,25.5 c 0,-13.124012 -10.625988,-23.78125 -23.75,-23.78125 z"
-       id="left"
-       transform="translate(0,952.36218)" /></g><g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Layer 2"><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"
-       d="M 32.759215,70.975878 C 21.325591,59.527249 15.285457,53.364742 14.83416,52.687661 9.63501,44.887358 10.761698,34.682189 17.532813,28.244167 c 0.714467,-0.67932 1.7595,-1.547825 2.322296,-1.930012 1.523368,-1.034499 4.16292,-2.238249 5.970504,-2.722807 1.443337,-0.386915 1.89368,-0.430056 4.60804,-0.441421 3.235152,-0.01355 4.137158,0.122126 6.533598,0.982701 3.134814,1.125736 4.852536,2.328512 8.590659,6.015311 1.655211,1.632489 3.214977,3.046293 3.466142,3.141784 0.581823,0.221209 1.425484,0.221963 2.004581,0.0018 0.248578,-0.09451 1.808341,-1.50526 3.466143,-3.135003 3.106188,-3.053615 4.561863,-4.183076 6.729637,-5.221531 5.163233,-2.473409 10.985326,-2.505514 16.312741,-0.08995 2.006474,0.909779 3.995303,2.393791 5.679043,4.166785 1.393273,1.467129 2.577641,3.132133 3.390238,4.833386 1.300107,2.721904 1.79207,4.98307 1.79207,8.23671 0,4.676126 -1.161204,8.043076 -4.066015,11.789548 -0.567611,0.732076 -8.293484,8.531153 -17.668765,17.836181 l -16.660107,16.53525 z"
-       id="path2"
-       sodipodi:nodetypes="sssssssssssssssssscs"
-       inkscape:label="heart" /></g></svg>

cockatrice/resources/usericons/pawn_judge_single.svg

@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   width="100"
-   height="100"
-   id="svg5322"
-   version="1.1"
-   inkscape:version="1.4 (86a8ad7, 2024-10-11)"
-   sodipodi:docname="pawn_judge_single.svg"
-   xml:space="preserve"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:dc="http://purl.org/dc/elements/1.1/"><defs
-     id="defs3"><inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective5328" /><inkscape:perspective
-       id="perspective5305"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" /><linearGradient
-       id="linearGradient5181"><stop
-         style="stop-color:#0fbb00;stop-opacity:1;"
-         offset="0"
-         id="stop5183" /><stop
-         style="stop-color:#064400;stop-opacity:1;"
-         offset="1"
-         id="stop5185" /></linearGradient><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3600-2"
-       id="radialGradient3606-7"
-       cx="324.32715"
-       cy="131.40274"
-       fx="324.32715"
-       fy="131.40274"
-       r="25.501276"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)" /><linearGradient
-       id="linearGradient3600-2"><stop
-         style="stop-color:#ffc33d;stop-opacity:1;"
-         offset="0"
-         id="stop3602-4" /><stop
-         style="stop-color:#e09900;stop-opacity:1;"
-         offset="1"
-         id="stop3604-9" /></linearGradient><inkscape:perspective
-       id="perspective5478"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" /><linearGradient
-       id="linearGradient5189"><stop
-         style="stop-color:#000ec9;stop-opacity:1;"
-         offset="0"
-         id="stop5191" /><stop
-         style="stop-color:#000657;stop-opacity:1;"
-         offset="1"
-         id="stop5193" /></linearGradient><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3600-4"
-       id="radialGradient3606-1"
-       cx="324.32715"
-       cy="131.40274"
-       fx="324.32715"
-       fy="131.40274"
-       r="25.501276"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)" /><linearGradient
-       id="linearGradient3600-4"><stop
-         style="stop-color:#ffc33d;stop-opacity:1;"
-         offset="0"
-         id="stop3602-3" /><stop
-         style="stop-color:#e09900;stop-opacity:1;"
-         offset="1"
-         id="stop3604-5" /></linearGradient><inkscape:perspective
-       id="perspective5559"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" /><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5173"
-       id="linearGradient5179"
-       x1="167.33386"
-       y1="178.83276"
-       x2="244.78181"
-       y2="178.83276"
-       gradientUnits="userSpaceOnUse" /><linearGradient
-       id="linearGradient5173"><stop
-         style="stop-color:#f50000;stop-opacity:1;"
-         offset="0"
-         id="stop5175" /><stop
-         style="stop-color:#950000;stop-opacity:1;"
-         offset="1"
-         id="stop5177" /></linearGradient><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3600"
-       id="radialGradient5169"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)"
-       cx="324.32715"
-       cy="131.40274"
-       fx="324.32715"
-       fy="131.40274"
-       r="25.501276" /><linearGradient
-       id="linearGradient3600"><stop
-         style="stop-color:#ffc13d;stop-opacity:1;"
-         offset="0"
-         id="stop3602" /><stop
-         style="stop-color:#e09900;stop-opacity:1;"
-         offset="1"
-         id="stop3604" /></linearGradient><radialGradient
-       r="25.501276"
-       fy="131.40274"
-       fx="324.32715"
-       cy="131.40274"
-       cx="324.32715"
-       gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient5574"
-       xlink:href="#linearGradient3600"
-       inkscape:collect="always" /><inkscape:perspective
-       id="perspective5663"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" /><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3600-7"
-       id="radialGradient3606-8"
-       cx="324.32715"
-       cy="131.40274"
-       fx="324.32715"
-       fy="131.40274"
-       r="25.501276"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)" /><linearGradient
-       id="linearGradient3600-7"><stop
-         style="stop-color:#ffc13d;stop-opacity:1;"
-         offset="0"
-         id="stop3602-7" /><stop
-         style="stop-color:#e09900;stop-opacity:1;"
-         offset="1"
-         id="stop3604-6" /></linearGradient><radialGradient
-       r="25.501276"
-       fy="131.40274"
-       fx="324.32715"
-       cy="131.40274"
-       cx="324.32715"
-       gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient5676"
-       xlink:href="#linearGradient3600-7"
-       inkscape:collect="always" /></defs><sodipodi:namedview
-     inkscape:document-units="mm"
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5.6"
-     inkscape:cx="58.035715"
-     inkscape:cy="30.982143"
-     inkscape:current-layer="svg5322"
-     showgrid="false"
-     inkscape:window-width="2560"
-     inkscape:window-height="1369"
-     inkscape:window-x="2552"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1"
-     inkscape:showpageshadow="2"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"
-     showguides="true"><sodipodi:guide
-       position="50.002551,111.99556"
-       orientation="1,0"
-       id="guide3"
-       inkscape:locked="false" /></sodipodi:namedview><metadata
-     id="metadata4"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-952.36218)"
-     style="display:inline">
-    <path
-       style="display:inline;opacity:1;fill-opacity:1;stroke:#000000;stroke-width:2.7822;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 49.84375,1.71875 C 36.719738,1.71875 26.0625,12.375988 26.0625,25.5 c 0,7.477454 3.475825,14.112734 8.875,18.46875 -10.497549,5.974948 -17.018351,18.227376 -20.625,31.6875 -5.2744126,19.6844 15.911513,22.5625 35.53125,22.5625 19.619736,0 40.705577,-3.2516 35.53125,-22.5625 C 81.693381,61.916246 75.224585,49.827177 64.8125,43.9375 70.181573,39.580662 73.59375,32.953205 73.59375,25.5 c 0,-13.124012 -10.625988,-23.78125 -23.75,-23.78125 z"
-       id="left"
-       sodipodi:insensitive="true"
-       transform="translate(0,952.36218)" />
-    <path
-       d="m 46.233565,28.34179 -1.622479,1.622479 a 0.59382712,0.59382712 0 0 1 -0.840444,-0.01135 0.60031703,0.60031703 0 0 1 -0.09086,-0.739851 l -0.713891,-0.71389 -0.579225,0.580848 a 0.62303175,0.62303175 0 0 1 -0.181718,0.515948 l -2.524576,2.521331 a 0.62870157,0.62870157 0 0 1 -0.889118,-0.889117 l 2.522954,-2.521332 a 0.63438908,0.63438908 0 0 1 0.686308,-0.137911 l 0.515949,-0.515947 -0.713891,-0.713892 a 0.603562,0.603562 0 0 1 -0.751204,-0.9313 l 1.622478,-1.62248 a 0.603562,0.603562 0 0 1 0.929682,0.754453 l 1.872338,1.87234 a 0.603562,0.603562 0 0 1 0.7577,0.92968 z"
-       id="path1-2"
-       style="display:inline;fill:#e1964c;fill-rule:nonzero;stroke:#000000;stroke-width:0.34015748;stroke-opacity:1;fill-opacity:1;stroke-dasharray:none"
-       transform="matrix(0,-11.111111,11.111111,0,-268.32014,1478.2316)"
-       inkscape:label="gavel" /></g></svg>

cockatrice/resources/userlevels/admin.svg

@@ -0,0 +1,301 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="100"
+   height="100"
+   id="svg5322"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="admin.svg">
+  <defs
+     id="defs3">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective5328" />
+    <inkscape:perspective
+       id="perspective5305"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       id="linearGradient5181">
+      <stop
+         style="stop-color:#0fbb00;stop-opacity:1;"
+         offset="0"
+         id="stop5183" />
+      <stop
+         style="stop-color:#064400;stop-opacity:1;"
+         offset="1"
+         id="stop5185" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3600-2"
+       id="radialGradient3606-7"
+       cx="324.32715"
+       cy="131.40274"
+       fx="324.32715"
+       fy="131.40274"
+       r="25.501276"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)" />
+    <linearGradient
+       id="linearGradient3600-2">
+      <stop
+         style="stop-color:#ffc33d;stop-opacity:1;"
+         offset="0"
+         id="stop3602-4" />
+      <stop
+         style="stop-color:#e09900;stop-opacity:1;"
+         offset="1"
+         id="stop3604-9" />
+    </linearGradient>
+    <inkscape:perspective
+       id="perspective5478"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       id="linearGradient5189">
+      <stop
+         style="stop-color:#000ec9;stop-opacity:1;"
+         offset="0"
+         id="stop5191" />
+      <stop
+         style="stop-color:#000657;stop-opacity:1;"
+         offset="1"
+         id="stop5193" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3600-4"
+       id="radialGradient3606-1"
+       cx="324.32715"
+       cy="131.40274"
+       fx="324.32715"
+       fy="131.40274"
+       r="25.501276"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)" />
+    <linearGradient
+       id="linearGradient3600-4">
+      <stop
+         style="stop-color:#ffc33d;stop-opacity:1;"
+         offset="0"
+         id="stop3602-3" />
+      <stop
+         style="stop-color:#e09900;stop-opacity:1;"
+         offset="1"
+         id="stop3604-5" />
+    </linearGradient>
+    <inkscape:perspective
+       id="perspective5559"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5173"
+       id="linearGradient5179"
+       x1="167.33386"
+       y1="178.83276"
+       x2="244.78181"
+       y2="178.83276"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient5173">
+      <stop
+         style="stop-color:#f50000;stop-opacity:1;"
+         offset="0"
+         id="stop5175" />
+      <stop
+         style="stop-color:#950000;stop-opacity:1;"
+         offset="1"
+         id="stop5177" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3600"
+       id="radialGradient5169"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)"
+       cx="324.32715"
+       cy="131.40274"
+       fx="324.32715"
+       fy="131.40274"
+       r="25.501276" />
+    <linearGradient
+       id="linearGradient3600">
+      <stop
+         style="stop-color:#ffc13d;stop-opacity:1;"
+         offset="0"
+         id="stop3602" />
+      <stop
+         style="stop-color:#e09900;stop-opacity:1;"
+         offset="1"
+         id="stop3604" />
+    </linearGradient>
+    <radialGradient
+       r="25.501276"
+       fy="131.40274"
+       fx="324.32715"
+       cy="131.40274"
+       cx="324.32715"
+       gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient5574"
+       xlink:href="#linearGradient3600"
+       inkscape:collect="always" />
+    <inkscape:perspective
+       id="perspective5663"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3600-7"
+       id="radialGradient3606-8"
+       cx="324.32715"
+       cy="131.40274"
+       fx="324.32715"
+       fy="131.40274"
+       r="25.501276"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)" />
+    <linearGradient
+       id="linearGradient3600-7">
+      <stop
+         style="stop-color:#ffc13d;stop-opacity:1;"
+         offset="0"
+         id="stop3602-7" />
+      <stop
+         style="stop-color:#e09900;stop-opacity:1;"
+         offset="1"
+         id="stop3604-6" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5189-1"
+       id="linearGradient5394"
+       gradientUnits="userSpaceOnUse"
+       x1="385.03503"
+       y1="180.09546"
+       x2="462.48297"
+       y2="180.09546"
+       gradientTransform="matrix(0.96839241,0,0,0.96839241,-360.365,847.52359)" />
+    <linearGradient
+       id="linearGradient5189-1">
+      <stop
+         style="stop-color:#000ec9;stop-opacity:1;"
+         offset="0"
+         id="stop5191-0" />
+      <stop
+         style="stop-color:#000657;stop-opacity:1;"
+         offset="1"
+         id="stop5193-4" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5173-1"
+       id="linearGradient5436"
+       x1="12.105612"
+       y1="1021.5341"
+       x2="87.549789"
+       y2="1021.5341"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-952.36218)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5173-1"
+       id="linearGradient5581"
+       gradientUnits="userSpaceOnUse"
+       x1="167.33386"
+       y1="178.83276"
+       x2="244.78181"
+       y2="178.83276"
+       gradientTransform="matrix(0.96839241,0,0,0.96839241,-149.54484,848.74636)" />
+    <linearGradient
+       id="linearGradient5173-1">
+      <stop
+         style="stop-color:#ff2700;stop-opacity:1;"
+         offset="0"
+         id="stop5175-5" />
+      <stop
+         style="stop-color:#ff2700;stop-opacity:1;"
+         offset="1"
+         id="stop5177-3" />
+    </linearGradient>
+    <linearGradient
+       y2="178.83276"
+       x2="244.78181"
+       y1="178.83276"
+       x1="167.33386"
+       gradientTransform="matrix(0.96839241,0,0,0.96839241,-52.401983,877.75333)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient5598"
+       xlink:href="#linearGradient5173-1"
+       inkscape:collect="always" />
+  </defs>
+  <sodipodi:namedview
+     inkscape:document-units="mm"
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2.8"
+     inkscape:cx="-32.045264"
+     inkscape:cy="65.284297"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1028"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata4">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-952.36218)">
+    <path
+       style="fill:url(#linearGradient5436);fill-opacity:1;stroke:black;stroke-width:2.78220295999999980;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="path3597-8" />
+  </g>
+</svg>

cockatrice/resources/userlevels/admin_buddy.svg

@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   viewBox="0 0 64 64"
+   enable-background="new 0 0 64 64"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   width="100%"
+   height="100%"
+   sodipodi:docname="admin_buddy.svg">
+  <metadata
+     id="metadata12">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs10">
+    <linearGradient
+       id="linearGradient3766">
+      <stop
+         style="stop-color:#ff2700;stop-opacity:1;"
+         offset="0"
+         id="stop3768" />
+      <stop
+         style="stop-color:#820000;stop-opacity:1;"
+         offset="1"
+         id="stop3770" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5225">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop5227" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop5229" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5219"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop5221" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3758">
+      <stop
+         id="stop3760"
+         offset="0"
+         style="stop-color:#0fbb00;stop-opacity:1;" />
+      <stop
+         id="stop3762"
+         offset="1"
+         style="stop-color:#064400;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3750">
+      <stop
+         style="stop-color:#ece400;stop-opacity:1;"
+         offset="0"
+         id="stop3752" />
+      <stop
+         style="stop-color:#ece400;stop-opacity:0;"
+         offset="1"
+         id="stop3754" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3758-7"
+       id="linearGradient3756-1"
+       x1="1.960216"
+       y1="31.261461"
+       x2="60.456024"
+       y2="31.261461"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3758-7">
+      <stop
+         id="stop3760-4"
+         offset="0"
+         style="stop-color:#ece400;stop-opacity:1;" />
+      <stop
+         id="stop3762-0"
+         offset="1"
+         style="stop-color:#ec8b00;stop-opacity:1;" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1028"
+     id="namedview8"
+     showgrid="false"
+     inkscape:zoom="5.2149125"
+     inkscape:cx="-37.840247"
+     inkscape:cy="51.245759"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <path
+     d="M 61.442826,23.621762 38.532402,23.515555 31.556101,0.331013 24.578789,23.515555 1.6673502,23.621765 20.267785,38.422001 10.863888,63.668987 31.556101,47.626631 52.258426,63.668987 42.843404,38.422001 z"
+     id="path4-9"
+     style="fill:#000000;fill-opacity:1"
+     inkscape:connector-curvature="0" />
+  <path
+     d="M 57.150089,25.064396 37.504323,24.973324 31.522122,5.092503 25.539054,24.973324 5.8924192,25.064399 21.842354,37.75565 13.778482,59.405024 31.522122,45.64865 49.274434,59.405024 41.201022,37.75565 z"
+     id="path4"
+     style="fill:#ff2700;fill-opacity:1;fill-rule:nonzero"
+     inkscape:connector-curvature="0" />
+</svg>

cockatrice/resources/userlevels/admin_vip.svg

@@ -337,14 +337,14 @@
      id="layer1"
      transform="translate(0,-952.36218)">
     <path
-       style="fill-opacity:1;stroke:black;stroke-width:2.78220296;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       style="fill:#ff0000;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="path3597-8" />
     <path
        sodipodi:type="star"
        style="fill:url(#linearGradient3425);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       id="star"
+       id="path3415"
        sodipodi:sides="5"
        sodipodi:cx="27.80283"
        sodipodi:cy="970.9433"

cockatrice/resources/userlevels/admin_vip_buddy.svg

@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   viewBox="0 0 64 64"
+   enable-background="new 0 0 64 64"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   width="100%"
+   height="100%"
+   sodipodi:docname="admin_buddy.svg">
+  <metadata
+     id="metadata12">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs10">
+    <linearGradient
+       id="linearGradient3766">
+      <stop
+         style="stop-color:#ff2700;stop-opacity:1;"
+         offset="0"
+         id="stop3768" />
+      <stop
+         style="stop-color:#820000;stop-opacity:1;"
+         offset="1"
+         id="stop3770" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5225">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop5227" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop5229" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5219"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop5221" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3758">
+      <stop
+         id="stop3760"
+         offset="0"
+         style="stop-color:#0fbb00;stop-opacity:1;" />
+      <stop
+         id="stop3762"
+         offset="1"
+         style="stop-color:#064400;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3750">
+      <stop
+         style="stop-color:#ece400;stop-opacity:1;"
+         offset="0"
+         id="stop3752" />
+      <stop
+         style="stop-color:#ece400;stop-opacity:0;"
+         offset="1"
+         id="stop3754" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3758-7"
+       id="linearGradient3756-1"
+       x1="1.960216"
+       y1="31.261461"
+       x2="60.456024"
+       y2="31.261461"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3758-7">
+      <stop
+         id="stop3760-4"
+         offset="0"
+         style="stop-color:#ece400;stop-opacity:1;" />
+      <stop
+         id="stop3762-0"
+         offset="1"
+         style="stop-color:#ec8b00;stop-opacity:1;" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1028"
+     id="namedview8"
+     showgrid="false"
+     inkscape:zoom="5.2149125"
+     inkscape:cx="-37.840247"
+     inkscape:cy="51.245759"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <path
+     d="M 61.442826,23.621762 38.532402,23.515555 31.556101,0.331013 24.578789,23.515555 1.6673502,23.621765 20.267785,38.422001 10.863888,63.668987 31.556101,47.626631 52.258426,63.668987 42.843404,38.422001 z"
+     id="path4-9"
+     style="fill:#000000;fill-opacity:1"
+     inkscape:connector-curvature="0" />
+  <path
+     d="M 57.150089,25.064396 37.504323,24.973324 31.522122,5.092503 25.539054,24.973324 5.8924192,25.064399 21.842354,37.75565 13.778482,59.405024 31.522122,45.64865 49.274434,59.405024 41.201022,37.75565 z"
+     id="path4"
+     style="fill:#ff2700;fill-opacity:1;fill-rule:nonzero"
+     inkscape:connector-curvature="0" />
+</svg>

cockatrice/resources/userlevels/moderator.svg

@@ -0,0 +1,294 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="100"
+   height="100"
+   id="svg5322"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="moderator.svg">
+  <defs
+     id="defs3">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective5328" />
+    <inkscape:perspective
+       id="perspective5305"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       id="linearGradient5181">
+      <stop
+         style="stop-color:#0fbb00;stop-opacity:1;"
+         offset="0"
+         id="stop5183" />
+      <stop
+         style="stop-color:#064400;stop-opacity:1;"
+         offset="1"
+         id="stop5185" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3600-2"
+       id="radialGradient3606-7"
+       cx="324.32715"
+       cy="131.40274"
+       fx="324.32715"
+       fy="131.40274"
+       r="25.501276"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)" />
+    <linearGradient
+       id="linearGradient3600-2">
+      <stop
+         style="stop-color:#ffc33d;stop-opacity:1;"
+         offset="0"
+         id="stop3602-4" />
+      <stop
+         style="stop-color:#e09900;stop-opacity:1;"
+         offset="1"
+         id="stop3604-9" />
+    </linearGradient>
+    <inkscape:perspective
+       id="perspective5478"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       id="linearGradient5189">
+      <stop
+         style="stop-color:#000ec9;stop-opacity:1;"
+         offset="0"
+         id="stop5191" />
+      <stop
+         style="stop-color:#000657;stop-opacity:1;"
+         offset="1"
+         id="stop5193" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3600-4"
+       id="radialGradient3606-1"
+       cx="324.32715"
+       cy="131.40274"
+       fx="324.32715"
+       fy="131.40274"
+       r="25.501276"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)" />
+    <linearGradient
+       id="linearGradient3600-4">
+      <stop
+         style="stop-color:#ffc33d;stop-opacity:1;"
+         offset="0"
+         id="stop3602-3" />
+      <stop
+         style="stop-color:#e09900;stop-opacity:1;"
+         offset="1"
+         id="stop3604-5" />
+    </linearGradient>
+    <inkscape:perspective
+       id="perspective5559"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5173"
+       id="linearGradient5179"
+       x1="167.33386"
+       y1="178.83276"
+       x2="244.78181"
+       y2="178.83276"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient5173">
+      <stop
+         style="stop-color:#f50000;stop-opacity:1;"
+         offset="0"
+         id="stop5175" />
+      <stop
+         style="stop-color:#950000;stop-opacity:1;"
+         offset="1"
+         id="stop5177" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3600"
+       id="radialGradient5169"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)"
+       cx="324.32715"
+       cy="131.40274"
+       fx="324.32715"
+       fy="131.40274"
+       r="25.501276" />
+    <linearGradient
+       id="linearGradient3600">
+      <stop
+         style="stop-color:#ffc13d;stop-opacity:1;"
+         offset="0"
+         id="stop3602" />
+      <stop
+         style="stop-color:#e09900;stop-opacity:1;"
+         offset="1"
+         id="stop3604" />
+    </linearGradient>
+    <radialGradient
+       r="25.501276"
+       fy="131.40274"
+       fx="324.32715"
+       cy="131.40274"
+       cx="324.32715"
+       gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient5574"
+       xlink:href="#linearGradient3600"
+       inkscape:collect="always" />
+    <inkscape:perspective
+       id="perspective5663"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3600-7"
+       id="radialGradient3606-8"
+       cx="324.32715"
+       cy="131.40274"
+       fx="324.32715"
+       fy="131.40274"
+       r="25.501276"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)" />
+    <linearGradient
+       id="linearGradient3600-7">
+      <stop
+         style="stop-color:#ffc13d;stop-opacity:1;"
+         offset="0"
+         id="stop3602-7" />
+      <stop
+         style="stop-color:#e09900;stop-opacity:1;"
+         offset="1"
+         id="stop3604-6" />
+    </linearGradient>
+    <radialGradient
+       r="25.501276"
+       fy="131.40274"
+       fx="324.32715"
+       cy="131.40274"
+       cx="324.32715"
+       gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient5676"
+       xlink:href="#linearGradient3600-7"
+       inkscape:collect="always" />
+  </defs>
+  <sodipodi:namedview
+     inkscape:document-units="mm"
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.6"
+     inkscape:cx="63.241533"
+     inkscape:cy="46.246766"
+     inkscape:current-layer="g5249"
+     showgrid="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1028"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata4">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-952.36218)">
+    <g
+       id="g5249"
+       transform="translate(0.53874115,0.90502985)">
+      <path
+         style="fill:#ffffff;stroke:#000000;stroke-width:4.45809746000000030;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;fill-opacity:1"
+         d="m 49.582319,954.34642 c -12.850034,0 -23.284789,10.43476 -23.284789,23.28479 0,7.32135 3.403263,13.81811 8.689724,18.08319 -10.278401,5.8502 -16.663073,17.8469 -20.19443,31.0259 -5.1178053,19.1 15.207096,22.0401 34.269334,22.0915 l 0,0.031 c 0.290839,0 0.566498,0.031 0.856734,0.031 19.210152,0 39.855802,-3.1837 34.789494,-22.0914 -3.636192,-13.5705 -10.027831,-25.4711 -20.378015,-31.17899 5.208701,-4.26694 8.506139,-10.73278 8.506139,-17.9914 0,-12.85003 -10.404159,-23.28479 -23.254191,-23.28479 z"
+         id="path3597-8"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:0.97203517px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 50.522358,952.70715 0,95.71425"
+         id="path5303"
+         inkscape:connector-curvature="0" />
+      <path
+         style="opacity:0.5;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.73577702;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 51.062274,1000.5844 0,-46.66155 1.096703,0.005 c 3.640423,0.0175 9.166159,2.51708 12.389647,5.60443 4.895085,4.68835 7.418012,11.18204 6.97848,17.96172 -0.388976,5.99986 -2.630586,10.87224 -6.948405,15.1031 l -2.054611,2.01323 2.95836,2.1147 c 3.465395,2.47714 7.400043,6.67727 9.661364,10.31317 3.324266,5.3451 6.789556,14.1029 8.149825,20.5971 2.583182,12.3327 -5.995009,18.5909 -26.579121,19.3908 l -5.652242,0.2196 0,-46.6616 z"
+         id="path5343"
+         inkscape:connector-curvature="0" />
+      <path
+         style="opacity:0.5;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.73577702;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 51.062274,1000.5844 0,-46.66155 1.096703,0.005 c 3.711439,0.0179 9.230395,2.54932 12.52612,5.74551 2.710429,2.62858 4.363146,5.23853 5.699734,9.00096 0.930917,2.62048 1.042531,3.35671 1.066373,7.03397 0.02902,4.47725 -0.343832,6.4262 -1.860873,9.72679 -1.358173,2.95494 -2.652341,4.81714 -4.971275,7.15326 l -2.043484,2.05863 2.932618,2.09329 c 6.98445,4.98544 12.210204,12.81934 15.750058,23.61084 3.543721,10.8033 3.39602,15.1985 -0.654452,19.4747 -4.329667,4.571 -11.449354,6.7169 -23.88928,7.2003 l -5.652242,0.2196 0,-46.6616 z"
+         id="path5345"
+         inkscape:connector-curvature="0" />
+      <path
+         style="opacity:0.5;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.73577702;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 51.062274,1000.5844 0,-46.66155 1.127086,0 c 1.963684,0 6.316627,1.3793 8.624731,2.73288 1.305624,0.76568 3.277555,2.429 4.764529,4.01888 4.347263,4.6481 6.318993,10.15893 5.954049,16.6411 -0.326518,5.79966 -2.122114,9.97998 -6.25177,14.55473 -1.44716,1.60313 -2.388203,2.91735 -2.210758,3.08744 0.169927,0.16289 1.447842,1.10199 2.839812,2.08691 6.268453,4.43531 11.362918,11.94641 14.960201,22.05661 2.740177,7.7013 3.480992,12.7857 2.399253,16.4664 -0.490882,1.6703 -1.040601,2.5538 -2.66191,4.2781 -4.29247,4.5651 -11.326737,6.6778 -23.892981,7.176 l -5.652242,0.2241 0,-46.6616 z"
+         id="path5347"
+         inkscape:connector-curvature="0" />
+      <path
+         style="opacity:0.5;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.73577702;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 51.062274,1000.5855 0,-46.66265 1.127086,0 c 1.830826,0 6.182017,1.32383 8.427379,2.56398 3.074383,1.69804 7.222246,6.22736 8.789514,9.59784 4.043357,8.69543 2.602054,18.25614 -3.837601,25.45626 -1.482649,1.65774 -2.695724,3.09743 -2.695724,3.19932 0,0.10189 1.186029,0.99046 2.635621,1.97461 3.078254,2.08987 6.81705,5.92344 9.062839,9.29254 3.274171,4.9119 7.232757,14.564 8.731682,21.29 0.646579,2.9014 0.614978,6.1318 -0.08275,8.4594 -0.86467,2.8846 -4.147214,6.2392 -7.573604,7.74 -5.13932,2.251 -10.156844,3.194 -18.763476,3.5265 l -5.820965,0.2249 0,-46.6627 z"
+         id="path5349"
+         inkscape:connector-curvature="0" />
+      <path
+         style="opacity:0.5;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.73577702;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 51.062274,1000.5853 0,-46.66245 1.164456,0 c 4.764705,0 11.112502,3.49049 14.697127,8.08157 5.260553,6.73756 6.190324,16.72129 2.284493,24.53056 -0.608066,1.21576 -2.304134,3.5367 -3.77148,5.16099 -1.466571,1.62342 -2.603753,3.01808 -2.527074,3.09924 0.07667,0.0811 1.300896,0.95003 2.720481,1.93083 6.904062,4.77006 12.487313,13.40446 16.085176,24.87536 1.733472,5.5268 2.208105,8.1847 2.003089,11.2173 -0.604468,8.9414 -9.318247,13.5855 -26.66658,14.2125 l -5.989688,0.2165 0,-46.6624 z"
+         id="path5351"
+         inkscape:connector-curvature="0" />
+      <path
+         style="opacity:0.5;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.73577702;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 51.062274,1000.7111 0,-46.78825 1.265427,0.005 c 4.153532,0.0173 9.758512,2.75815 13.295303,6.50137 1.792452,1.89707 2.63621,3.17089 3.798098,5.73397 1.746736,3.85324 2.225454,6.0014 2.225454,9.98629 0,6.50755 -2.416561,12.11247 -7.223569,16.75421 -0.945331,0.91283 -1.642858,1.7317 -1.550059,1.81971 0.0928,0.088 1.155757,0.85585 2.362131,1.70631 3.35942,2.36829 4.992087,3.86859 7.229212,6.64329 3.924869,4.8681 7.249491,11.7229 9.87191,20.3544 1.173448,3.8623 1.289753,4.5994 1.289753,8.1737 0,3.6878 -0.0614,4.0459 -1.001592,5.8425 -1.309266,2.5017 -3.108338,4.122 -6.422247,5.7839 -4.375689,2.1945 -9.62921,3.3669 -16.70364,3.7278 -2.134354,0.1088 -4.905639,0.2757 -6.158413,0.3708 l -2.277768,0.1729 0,-46.7882 z"
+         id="path5353"
+         inkscape:connector-curvature="0" />
+      <path
+         style="opacity:0.5;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.73577702;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 51.062274,1000.6174 0,-46.98372 1.434151,0.16768 c 5.155008,0.60274 9.462857,2.72154 12.938259,6.36366 4.743924,4.9715 6.879132,11.35611 6.164642,18.43328 -0.537028,5.31935 -3.090083,10.59498 -6.838339,14.13074 l -1.940717,1.83069 3.040832,2.20427 c 3.580837,2.59571 7.189745,6.4912 9.552957,10.3116 4.895721,7.9144 9.235933,21.4918 8.504868,26.6055 -0.813112,5.6877 -5.438715,9.6977 -13.622159,11.8093 -3.808212,0.9826 -7.680557,1.4713 -14.763317,1.8633 l -4.471177,0.2474 0,-46.9837 z"
+         id="path5355"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+</svg>

cockatrice/resources/userlevels/moderator_buddy.svg

@@ -114,18 +114,18 @@
      inkscape:current-layer="svg2" />
   <path
      d="M 61.442826,23.621762 38.532402,23.515555 31.556101,0.331013 24.578789,23.515555 1.6673502,23.621765 20.267785,38.422001 10.863888,63.668987 31.556101,47.626631 52.258426,63.668987 42.843404,38.422001 z"
-     id="outline"
+     id="path4-9"
      style="fill:#000000;fill-opacity:1"
      inkscape:connector-curvature="0" />
   <path
      d="M 55.041981,25.814432 36.921945,25.730432 31.404334,7.3935963 25.885923,25.730432 7.7650846,25.814434 22.476316,37.520057 15.0387,57.488097 31.404334,44.800071 47.777965,57.488097 40.331551,37.520057 z"
-     id="left"
-     style="fill-opacity:1;fill-rule:nonzero"
+     id="path4"
+     style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero"
      inkscape:connector-curvature="0" />
   <path
      d="M 56.276895,25.211993 37.3433,24.856806 31.486705,5.7742084 c 0.04705,37.4359336 -0.01851,2.6744908 -0.0678,40.1841446 L 48.19932,58.580578 40.956295,37.527792 z"
-     id="right"
-     style="fill-opacity:1;fill-rule:nonzero"
+     id="path4-1"
+     style="fill:#000000;fill-opacity:1;fill-rule:nonzero"
      inkscape:connector-curvature="0"
      sodipodi:nodetypes="ccccccc" />
 </svg>

cockatrice/resources/userlevels/moderator_vip.svg

@@ -337,19 +337,19 @@
      id="layer1"
      transform="translate(0,-952.36218)">
     <path
-       style="fill-opacity:1;stroke:black;stroke-width:2.78220296;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       style="fill:#ffffff;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="right" />
+       id="path3597-8" />
     <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"
+       style="opacity:1;fill:#000000;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="left"
+       id="path5355"
        inkscape:connector-curvature="0" />
     <path
        sodipodi:type="star"
        style="fill:url(#linearGradient3425-5);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       id="star"
+       id="path3415-0"
        sodipodi:sides="5"
        sodipodi:cx="27.80283"
        sodipodi:cy="970.9433"

cockatrice/resources/userlevels/moderator_vip_buddy.svg

@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   viewBox="0 0 64 64"
+   enable-background="new 0 0 64 64"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   width="100%"
+   height="100%"
+   sodipodi:docname="moderator_buddy.svg">
+  <metadata
+     id="metadata12">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs10">
+    <linearGradient
+       id="linearGradient5225">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop5227" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop5229" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5219"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop5221" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3758">
+      <stop
+         id="stop3760"
+         offset="0"
+         style="stop-color:#0fbb00;stop-opacity:1;" />
+      <stop
+         id="stop3762"
+         offset="1"
+         style="stop-color:#064400;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3750">
+      <stop
+         style="stop-color:#ece400;stop-opacity:1;"
+         offset="0"
+         id="stop3752" />
+      <stop
+         style="stop-color:#ece400;stop-opacity:0;"
+         offset="1"
+         id="stop3754" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3758-7"
+       id="linearGradient3756-1"
+       x1="1.960216"
+       y1="31.261461"
+       x2="60.456024"
+       y2="31.261461"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3758-7">
+      <stop
+         id="stop3760-4"
+         offset="0"
+         style="stop-color:#ece400;stop-opacity:1;" />
+      <stop
+         id="stop3762-0"
+         offset="1"
+         style="stop-color:#ec8b00;stop-opacity:1;" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1028"
+     id="namedview8"
+     showgrid="false"
+     inkscape:zoom="5.2149125"
+     inkscape:cx="-26.445493"
+     inkscape:cy="31.598459"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <path
+     d="M 61.442826,23.621762 38.532402,23.515555 31.556101,0.331013 24.578789,23.515555 1.6673502,23.621765 20.267785,38.422001 10.863888,63.668987 31.556101,47.626631 52.258426,63.668987 42.843404,38.422001 z"
+     id="path4-9"
+     style="fill:#000000;fill-opacity:1"
+     inkscape:connector-curvature="0" />
+  <path
+     d="M 55.041981,25.814432 36.921945,25.730432 31.404334,7.3935963 25.885923,25.730432 7.7650846,25.814434 22.476316,37.520057 15.0387,57.488097 31.404334,44.800071 47.777965,57.488097 40.331551,37.520057 z"
+     id="path4"
+     style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero"
+     inkscape:connector-curvature="0" />
+  <path
+     d="M 56.276895,25.211993 37.3433,24.856806 31.486705,5.7742084 c 0.04705,37.4359336 -0.01851,2.6744908 -0.0678,40.1841446 L 48.19932,58.580578 40.956295,37.527792 z"
+     id="path4-1"
+     style="fill:#000000;fill-opacity:1;fill-rule:nonzero"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccccccc" />
+</svg>

cockatrice/resources/userlevels/normal.svg

@@ -2,20 +2,20 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
 <svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="100"
    height="100"
    id="svg5322"
    version="1.1"
-   inkscape:version="1.4 (86a8ad7, 2024-10-11)"
-   sodipodi:docname="pawn_double.svg"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:dc="http://purl.org/dc/elements/1.1/">
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="normal.svg">
   <defs
      id="defs3">
     <inkscape:perspective
@@ -195,16 +195,66 @@
          id="stop3604-6" />
     </linearGradient>
     <radialGradient
-       r="25.501276"
-       fy="131.40274"
-       fx="324.32715"
-       cy="131.40274"
-       cx="324.32715"
-       gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient5676"
+       inkscape:collect="always"
        xlink:href="#linearGradient3600-7"
+       id="radialGradient5254"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)"
+       cx="324.32715"
+       cy="131.40274"
+       fx="324.32715"
+       fy="131.40274"
+       r="25.501276" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5189-1"
+       id="linearGradient5394"
+       gradientUnits="userSpaceOnUse"
+       x1="385.03503"
+       y1="180.09546"
+       x2="462.48297"
+       y2="180.09546"
+       gradientTransform="matrix(0.96839241,0,0,0.96839241,-360.365,847.52359)" />
+    <linearGradient
+       id="linearGradient5189-1">
+      <stop
+         style="stop-color:#32c8ed;stop-opacity:1;"
+         offset="0"
+         id="stop5191-0" />
+      <stop
+         style="stop-color:#32c8ed;stop-opacity:1;"
+         offset="1"
+         id="stop5193-4" />
+    </linearGradient>
+    <linearGradient
+       y2="180.09546"
+       x2="462.48297"
+       y1="180.09546"
+       x1="385.03503"
+       gradientTransform="matrix(0.96839241,0,0,0.96839241,-318.22214,876.88769)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient5411"
+       xlink:href="#linearGradient5189-1"
        inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5189-1"
+       id="linearGradient5436"
+       x1="12.105612"
+       y1="1021.5341"
+       x2="87.549789"
+       y2="1021.5341"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5189-1"
+       id="linearGradient3795"
+       gradientUnits="userSpaceOnUse"
+       x1="12.105612"
+       y1="1021.5341"
+       x2="87.549789"
+       y2="1021.5341"
+       gradientTransform="translate(0,-952.36218)" />
   </defs>
   <sodipodi:namedview
      inkscape:document-units="mm"
@@ -214,19 +264,16 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="5.6"
-     inkscape:cx="63.214286"
-     inkscape:cy="46.160714"
-     inkscape:current-layer="g5249"
+     inkscape:zoom="2.8"
+     inkscape:cx="-150.71429"
+     inkscape:cy="59.570011"
+     inkscape:current-layer="layer1"
      showgrid="false"
-     inkscape:window-width="1147"
-     inkscape:window-height="1211"
-     inkscape:window-x="2842"
-     inkscape:window-y="58"
-     inkscape:window-maximized="0"
-     inkscape:showpageshadow="2"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1" />
+     inkscape:window-width="1920"
+     inkscape:window-height="1028"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
   <metadata
      id="metadata4">
     <rdf:RDF>
@@ -244,25 +291,10 @@
      inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-952.36218)">
-    <g
-       id="g5249"
-       transform="translate(0.53874115,0.90502985)">
-      <path
-         style="stroke:#000000;stroke-width:4.45809746000000030;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;fill-opacity:1"
-         d="m 49.582319,954.34642 c -12.850034,0 -23.284789,10.43476 -23.284789,23.28479 0,7.32135 3.403263,13.81811 8.689724,18.08319 -10.278401,5.8502 -16.663073,17.8469 -20.19443,31.0259 -5.1178053,19.1 15.207096,22.0401 34.269334,22.0915 l 0,0.031 c 0.290839,0 0.566498,0.031 0.856734,0.031 19.210152,0 39.855802,-3.1837 34.789494,-22.0914 -3.636192,-13.5705 -10.027831,-25.4711 -20.378015,-31.17899 5.208701,-4.26694 8.506139,-10.73278 8.506139,-17.9914 0,-12.85003 -10.404159,-23.28479 -23.254191,-23.28479 z"
-         id="left"
-         inkscape:connector-curvature="0" />
-      <path
-         fill="none"
-         style="stroke:#000000;stroke-width:1.97203517px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 50.522358,952.70715 0,95.71425"
-         id="center"
-         inkscape:connector-curvature="0" />
-      <path
-         style="opacity:1;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.71966;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="m 51.054254,1001.4773 v -45.77683 l 1.097241,0.005 c 3.642211,0.0172 9.170661,2.46935 12.395732,5.49816 4.897489,4.59945 7.421654,10.97001 6.981907,17.62114 -0.389167,5.88609 -2.631878,10.66609 -6.951818,14.81672 l -2.05562,1.97506 2.959813,2.0746 c 3.467097,2.43015 7.403677,6.55065 9.666109,10.11765 3.325898,5.2437 6.79289,13.8355 8.153827,20.2065 2.584451,12.0989 -5.997953,18.2384 -26.592174,19.0232 l -5.655017,0.2154 v -45.7768 z"
-         id="right"
-         inkscape:connector-curvature="0" />
-    </g>
+    <path
+       style="fill:url(#linearGradient3795);fill-opacity:1;stroke:black;stroke-width:2.78220295999999980;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;opacity:1"
+       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="path3597-8" />
   </g>
 </svg>

cockatrice/resources/userlevels/registered.svg

@@ -2,20 +2,20 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
 <svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="100"
    height="100"
    id="svg5322"
    version="1.1"
-   inkscape:version="1.4 (86a8ad7, 2024-10-11)"
-   sodipodi:docname="pawn_donator_double.svg"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:dc="http://purl.org/dc/elements/1.1/">
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="registered.svg">
   <defs
      id="defs3">
     <inkscape:perspective
@@ -226,6 +226,16 @@
          offset="1"
          id="stop5193-4" />
     </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5181-9"
+       id="linearGradient5436"
+       x1="12.105612"
+       y1="1021.5341"
+       x2="87.549789"
+       y2="1021.5341"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-952.36218)" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5173-1"
@@ -278,28 +288,6 @@
        id="linearGradient5799"
        xlink:href="#linearGradient5181-9"
        inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2"
-       id="linearGradient3"
-       x1="49.889599"
-       y1="87.971054"
-       x2="50.103622"
-       y2="27.668242"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2878408,0,0,1.2878408,-14.204862,937.12313)" />
-    <linearGradient
-       id="linearGradient2"
-       inkscape:collect="always">
-      <stop
-         style="stop-color:#8c5fd3;stop-opacity:1;"
-         offset="0"
-         id="stop2" />
-      <stop
-         style="stop-color:#b284e9;stop-opacity:1;"
-         offset="0.5"
-         id="stop1" />
-    </linearGradient>
   </defs>
   <sodipodi:namedview
      inkscape:document-units="mm"
@@ -309,26 +297,16 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="6.0735294"
-     inkscape:cx="53.675545"
-     inkscape:cy="53.922518"
+     inkscape:zoom="2.8"
+     inkscape:cx="-150.71429"
+     inkscape:cy="59.570011"
      inkscape:current-layer="layer1"
      showgrid="false"
-     inkscape:window-width="1147"
-     inkscape:window-height="1211"
-     inkscape:window-x="2678"
-     inkscape:window-y="120"
-     inkscape:window-maximized="0"
-     inkscape:showpageshadow="2"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"
-     showguides="true">
-    <sodipodi:guide
-       position="49.829627,61.114263"
-       orientation="1,0"
-       id="guide1"
-       inkscape:locked="false" />
-  </sodipodi:namedview>
+     inkscape:window-width="1920"
+     inkscape:window-height="1028"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
   <metadata
      id="metadata4">
     <rdf:RDF>
@@ -347,20 +325,9 @@
      id="layer1"
      transform="translate(0,-952.36218)">
     <path
-       style="fill-opacity:1;stroke:black;stroke-width:2.78220296;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       style="fill:url(#linearGradient5436);fill-opacity:1;stroke:black;stroke-width:2.78220295999999980;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="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="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"
-       d="m 32.758369,1023.3386 c -11.433625,-11.4486 -17.473759,-17.611 -17.925056,-18.2881 -5.1991493,-7.80033 -4.072462,-18.0055 2.698653,-24.44352 0.714467,-0.67932 1.7595,-1.54783 2.322296,-1.93001 1.523368,-1.0345 4.16292,-2.23825 5.970504,-2.72281 1.443337,-0.38692 1.89368,-0.43006 4.608041,-0.44142 3.235152,-0.0136 4.137158,0.12212 6.533598,0.9827 3.134814,1.12573 4.852536,2.32851 8.590659,6.01531 1.655211,1.63249 3.214977,3.04629 3.466142,3.14178 0.581823,0.22121 1.425484,0.22197 2.004581,0.002 0.248578,-0.0945 1.808341,-1.50526 3.466143,-3.135 3.106188,-3.05362 4.561863,-4.18308 6.729637,-5.22153 5.163233,-2.47341 10.985326,-2.50551 16.312741,-0.0899 2.006474,0.90978 3.995303,2.39379 5.679043,4.16678 1.393273,1.46713 2.577641,3.13214 3.390238,4.83339 1.300107,2.7219 1.79207,4.98307 1.79207,8.23671 0,4.67613 -1.161204,8.04312 -4.066015,11.78952 -0.567611,0.7321 -8.293484,8.5311 -17.668765,17.8362 l -16.660107,16.5352 z"
-       id="path2"
-       sodipodi:nodetypes="sssssssssssssssssscs"
-       inkscape:label="heart" />
+       id="path3597-8" />
   </g>
 </svg>

cockatrice/resources/userlevels/registered_buddy.svg

@@ -109,7 +109,7 @@
      inkscape:connector-curvature="0" />
   <path
      d="M 57.150089,25.064396 37.504323,24.973324 31.522122,5.092503 25.539054,24.973324 5.8924192,25.064399 21.842354,37.75565 13.778482,59.405024 31.522122,45.64865 49.274434,59.405024 41.201022,37.75565 z"
-     id="left"
-     style="fill-opacity:1"
+     id="path4"
+     style="fill:url(#linearGradient3756);fill-opacity:1"
      inkscape:connector-curvature="0" />
 </svg>

cockatrice/resources/userlevels/registered_donator.svg

@@ -2,20 +2,20 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
 <svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="100"
    height="100"
    id="svg5322"
    version="1.1"
-   inkscape:version="1.4 (86a8ad7, 2024-10-11)"
-   sodipodi:docname="pawn_single.svg"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:dc="http://purl.org/dc/elements/1.1/">
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="vip.svg">
   <defs
      id="defs3">
     <inkscape:perspective
@@ -194,16 +194,57 @@
          offset="1"
          id="stop3604-6" />
     </linearGradient>
-    <radialGradient
-       r="25.501276"
-       fy="131.40274"
-       fx="324.32715"
-       cy="131.40274"
-       cx="324.32715"
-       gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)"
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5189-1"
+       id="linearGradient5394"
        gradientUnits="userSpaceOnUse"
-       id="radialGradient5676"
-       xlink:href="#linearGradient3600-7"
+       x1="385.03503"
+       y1="180.09546"
+       x2="462.48297"
+       y2="180.09546"
+       gradientTransform="matrix(0.96839241,0,0,0.96839241,-360.365,847.52359)" />
+    <linearGradient
+       id="linearGradient5189-1">
+      <stop
+         style="stop-color:#000ec9;stop-opacity:1;"
+         offset="0"
+         id="stop5191-0" />
+      <stop
+         style="stop-color:#000657;stop-opacity:1;"
+         offset="1"
+         id="stop5193-4" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5173-1"
+       id="linearGradient5581"
+       gradientUnits="userSpaceOnUse"
+       x1="167.33386"
+       y1="178.83276"
+       x2="244.78181"
+       y2="178.83276"
+       gradientTransform="matrix(0.96839241,0,0,0.96839241,-149.54484,848.74636)" />
+    <linearGradient
+       id="linearGradient5173-1">
+      <stop
+         style="stop-color:#ff2700;stop-opacity:1;"
+         offset="0"
+         id="stop5175-5" />
+      <stop
+         style="stop-color:#ff2700;stop-opacity:1;"
+         offset="1"
+         id="stop5177-3" />
+    </linearGradient>
+    <linearGradient
+       y2="178.83276"
+       x2="244.78181"
+       y1="178.83276"
+       x1="167.33386"
+       gradientTransform="matrix(0.96839241,0,0,0.96839241,-52.401983,877.75333)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient5598"
+       xlink:href="#linearGradient5173-1"
        inkscape:collect="always" />
   </defs>
   <sodipodi:namedview
@@ -214,19 +255,16 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="5.6"
-     inkscape:cx="63.214286"
-     inkscape:cy="46.160714"
+     inkscape:zoom="1.979899"
+     inkscape:cx="-59.166471"
+     inkscape:cy="4.9508223"
      inkscape:current-layer="layer1"
      showgrid="false"
-     inkscape:window-width="1147"
-     inkscape:window-height="1211"
-     inkscape:window-x="3185"
-     inkscape:window-y="44"
-     inkscape:window-maximized="0"
-     inkscape:showpageshadow="2"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1" />
+     inkscape:window-width="1440"
+     inkscape:window-height="792"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1" />
   <metadata
      id="metadata4">
     <rdf:RDF>
@@ -245,9 +283,9 @@
      id="layer1"
      transform="translate(0,-952.36218)">
     <path
-       style="fill-opacity:1;stroke:black;stroke-width:2.78220296;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;opacity:1"
+       style="fill:#8d5fd3;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 "
-       id="left"
+       id="path3597-8"
        transform="translate(0,952.36218)" />
   </g>
 </svg>

cockatrice/resources/userlevels/registered_donator_buddy.svg

@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   viewBox="0 0 64 64"
+   enable-background="new 0 0 64 64"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   width="100%"
+   height="100%"
+   sodipodi:docname="vip_buddy.svg">
+  <metadata
+     id="metadata12">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs10">
+    <linearGradient
+       id="linearGradient3766">
+      <stop
+         style="stop-color:#ff2700;stop-opacity:1;"
+         offset="0"
+         id="stop3768" />
+      <stop
+         style="stop-color:#820000;stop-opacity:1;"
+         offset="1"
+         id="stop3770" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5225">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop5227" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop5229" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5219"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop5221" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3758">
+      <stop
+         id="stop3760"
+         offset="0"
+         style="stop-color:#0fbb00;stop-opacity:1;" />
+      <stop
+         id="stop3762"
+         offset="1"
+         style="stop-color:#064400;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3750">
+      <stop
+         style="stop-color:#ece400;stop-opacity:1;"
+         offset="0"
+         id="stop3752" />
+      <stop
+         style="stop-color:#ece400;stop-opacity:0;"
+         offset="1"
+         id="stop3754" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3758-7"
+       id="linearGradient3756-1"
+       x1="1.960216"
+       y1="31.261461"
+       x2="60.456024"
+       y2="31.261461"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3758-7">
+      <stop
+         id="stop3760-4"
+         offset="0"
+         style="stop-color:#ece400;stop-opacity:1;" />
+      <stop
+         id="stop3762-0"
+         offset="1"
+         style="stop-color:#ec8b00;stop-opacity:1;" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1440"
+     inkscape:window-height="792"
+     id="namedview8"
+     showgrid="false"
+     inkscape:zoom="5.2149125"
+     inkscape:cx="14.509163"
+     inkscape:cy="51.245759"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <path
+     d="M 61.442826,23.621762 38.532402,23.515555 31.556101,0.331013 24.578789,23.515555 1.6673502,23.621765 20.267785,38.422001 10.863888,63.668987 31.556101,47.626631 52.258426,63.668987 42.843404,38.422001 z"
+     id="path4-9"
+     style="fill:#000000;fill-opacity:1"
+     inkscape:connector-curvature="0" />
+  <path
+     d="M 57.150089,25.064396 37.504323,24.973324 31.522122,5.092503 25.539054,24.973324 5.8924192,25.064399 21.842354,37.75565 13.778482,59.405024 31.522122,45.64865 49.274434,59.405024 41.201022,37.75565 z"
+     id="path4"
+     style="fill:#8d5fd3;fill-opacity:1;fill-rule:nonzero"
+     inkscape:connector-curvature="0" />
+</svg>

cockatrice/resources/userlevels/registered_vip.svg

@@ -2,22 +2,33 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
 <svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="100"
    height="100"
    id="svg5322"
    version="1.1"
-   inkscape:version="1.4 (86a8ad7, 2024-10-11)"
-   sodipodi:docname="pawn_judge_double.svg"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:dc="http://purl.org/dc/elements/1.1/">
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="registered_vip.svg">
   <defs
      id="defs3">
+    <linearGradient
+       id="linearGradient5181-9-1">
+      <stop
+         id="stop4188"
+         offset="0"
+         style="stop-color:#ece400;stop-opacity:1" />
+      <stop
+         id="stop4190"
+         offset="1"
+         style="stop-color:#ec8b00;stop-opacity:1" />
+    </linearGradient>
     <inkscape:perspective
        sodipodi:type="inkscape:persp3d"
        inkscape:vp_x="0 : 526.18109 : 1"
@@ -226,6 +237,16 @@
          offset="1"
          id="stop5193-4" />
     </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5181-9-1"
+       id="linearGradient5436"
+       x1="47.268291"
+       y1="933.14362"
+       x2="48.665382"
+       y2="1050.2666"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-952.36218)" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5173-1"
@@ -288,18 +309,15 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="4.2946338"
-     inkscape:cx="34.112338"
-     inkscape:cy="64.964794"
-     inkscape:current-layer="svg5322"
+     inkscape:cx="35.27742"
+     inkscape:cy="65.175571"
+     inkscape:current-layer="layer1"
      showgrid="false"
-     inkscape:window-width="1440"
-     inkscape:window-height="792"
-     inkscape:window-x="2921"
-     inkscape:window-y="661"
-     inkscape:window-maximized="0"
-     inkscape:showpageshadow="2"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1" />
+     inkscape:window-width="1152"
+     inkscape:window-height="811"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
   <metadata
      id="metadata4">
     <rdf:RDF>
@@ -308,7 +326,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -318,20 +336,9 @@
      id="layer1"
      transform="translate(0,-952.36218)">
     <path
-       style="fill-opacity:1;stroke:black;stroke-width:2.78220296;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       style="fill:url(#linearGradient5436);fill-opacity:1;stroke:black;stroke-width:2.78149606;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="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="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"
-       id="path1-2"
-       style="display:inline;fill:#e1964c;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.7852;stroke-dasharray:none;stroke-opacity:1"
-       inkscape:label="gavel"
-       transform="translate(0,952.36218)" />
+       id="path3597-8" />
   </g>
 </svg>

cockatrice/resources/userlevels/registered_vip_buddy.svg

@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   viewBox="0 0 64 64"
+   enable-background="new 0 0 64 64"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   width="100%"
+   height="100%"
+   sodipodi:docname="registered_vip_buddy.svg">
+  <metadata
+     id="metadata12">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs10">
+    <linearGradient
+       id="linearGradient4153">
+      <stop
+         style="stop-color:#ffec79;stop-opacity:1"
+         offset="0"
+         id="stop4155" />
+      <stop
+         style="stop-color:#f2c15b;stop-opacity:1"
+         offset="1"
+         id="stop4157" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3758">
+      <stop
+         id="stop3760"
+         offset="0"
+         style="stop-color:#80d600;stop-opacity:1;" />
+      <stop
+         id="stop3762"
+         offset="1"
+         style="stop-color:#80d600;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3750">
+      <stop
+         style="stop-color:#ece400;stop-opacity:1;"
+         offset="0"
+         id="stop3752" />
+      <stop
+         style="stop-color:#ece400;stop-opacity:0;"
+         offset="1"
+         id="stop3754" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3758-7"
+       id="linearGradient3756"
+       x1="31.290251"
+       y1="-19.003599"
+       x2="31.135509"
+       y2="67.496323"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.87626222,0,0,0.87626222,4.174756,4.8555263)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3758-7"
+       id="linearGradient3756-1"
+       x1="1.960216"
+       y1="31.261461"
+       x2="60.456024"
+       y2="31.261461"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3758-7">
+      <stop
+         id="stop3760-4"
+         offset="0"
+         style="stop-color:#ece400;stop-opacity:1;" />
+      <stop
+         id="stop3762-0"
+         offset="1"
+         style="stop-color:#ec8b00;stop-opacity:1;" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1152"
+     inkscape:window-height="811"
+     id="namedview8"
+     showgrid="false"
+     inkscape:zoom="7.375"
+     inkscape:cx="29.258475"
+     inkscape:cy="35.341768"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <path
+     d="M 61.442826,23.621762 38.532402,23.515555 31.556101,0.331013 24.578789,23.515555 1.6673502,23.621765 20.267785,38.422001 10.863888,63.668987 31.556101,47.626631 52.258426,63.668987 42.843404,38.422001 z"
+     id="path4-9"
+     style="fill:#000000;fill-opacity:1"
+     inkscape:connector-curvature="0" />
+  <path
+     d="M 57.150089,25.064396 37.504323,24.973324 31.522122,5.092503 25.539054,24.973324 5.8924192,25.064399 21.842354,37.75565 13.778482,59.405024 31.522122,45.64865 49.274434,59.405024 41.201022,37.75565 z"
+     id="path4"
+     style="fill:url(#linearGradient3756);fill-opacity:1"
+     inkscape:connector-curvature="0" />
+</svg>

cockatrice/src/abstractcarddragitem.cpp

@@ -1,6 +1,6 @@
-#include "abstract_card_drag_item.h"
+#include "abstractcarddragitem.h"
 
-#include "../../settings/cache_settings.h"
+#include "carddatabase.h"
 
 #include <QCursor>
 #include <QDebug>
@@ -20,8 +20,13 @@ AbstractCardDragItem::AbstractCardDragItem(AbstractCardItem *_item,
         parentDrag->addChildDrag(this);
         setZValue(2000000007 + hotSpot.x() * 1000000 + hotSpot.y() * 1000 + 1000);
     } else {
-        hotSpot = QPointF{qBound(0.0, hotSpot.x(), static_cast<qreal>(CARD_WIDTH - 1)),
-                          qBound(0.0, hotSpot.y(), static_cast<qreal>(CARD_HEIGHT - 1))};
+        if ((hotSpot.x() < 0) || (hotSpot.y() < 0)) {
+            qDebug() << "CardDragItem: coordinate overflow: x =" << hotSpot.x() << ", y =" << hotSpot.y();
+            hotSpot = QPointF();
+        } else if ((hotSpot.x() > CARD_WIDTH) || (hotSpot.y() > CARD_HEIGHT)) {
+            qDebug() << "CardDragItem: coordinate overflow: x =" << hotSpot.x() << ", y =" << hotSpot.y();
+            hotSpot = QPointF(CARD_WIDTH, CARD_HEIGHT);
+        }
         setCursor(Qt::ClosedHandCursor);
         setZValue(2000000007);
     }
@@ -32,13 +37,6 @@ AbstractCardDragItem::AbstractCardDragItem(AbstractCardItem *_item,
                          .translate(-CARD_WIDTH_HALF, -CARD_HEIGHT_HALF));
 
     setCacheMode(DeviceCoordinateCache);
-
-    connect(&SettingsCache::instance(), &SettingsCache::roundCardCornersChanged, this, [this](bool _roundCardCorners) {
-        Q_UNUSED(_roundCardCorners);
-
-        prepareGeometryChange();
-        update();
-    });
 }
 
 AbstractCardDragItem::~AbstractCardDragItem()
@@ -50,8 +48,7 @@ AbstractCardDragItem::~AbstractCardDragItem()
 QPainterPath AbstractCardDragItem::shape() const
 {
     QPainterPath shape;
-    qreal cardCornerRadius = SettingsCache::instance().getRoundCardCorners() ? 0.05 * CARD_WIDTH : 0.0;
-    shape.addRoundedRect(boundingRect(), cardCornerRadius, cardCornerRadius);
+    shape.addRoundedRect(boundingRect(), 0.05 * CARD_WIDTH, 0.05 * CARD_WIDTH);
     return shape;
 }
 

cockatrice/src/abstractcarddragitem.h

@@ -1,7 +1,7 @@
 #ifndef ABSTRACTCARDDRAGITEM_H
 #define ABSTRACTCARDDRAGITEM_H
 
-#include "abstract_card_item.h"
+#include "abstractcarditem.h"
 
 class QGraphicsScene;
 class CardZone;
@@ -26,7 +26,7 @@ public:
         return Type;
     }
     AbstractCardDragItem(AbstractCardItem *_item, const QPointF &_hotSpot, AbstractCardDragItem *parentDrag = 0);
-    ~AbstractCardDragItem() override;
+    ~AbstractCardDragItem();
     QRectF boundingRect() const override
     {
         return QRectF(0, 0, CARD_WIDTH, CARD_HEIGHT);

cockatrice/src/abstractcarditem.cpp

@@ -1,10 +1,10 @@
-#include "abstract_card_item.h"
+#include "abstractcarditem.h"
 
-#include "../../client/ui/picture_loader/picture_loader.h"
-#include "../../settings/cache_settings.h"
-#include "../game_scene.h"
-#include "card_database.h"
-#include "card_database_manager.h"
+#include "carddatabase.h"
+#include "gamescene.h"
+#include "main.h"
+#include "pictureloader.h"
+#include "settingscache.h"
 
 #include <QCursor>
 #include <QGraphicsScene>
@@ -12,27 +12,16 @@
 #include <QPainter>
 #include <algorithm>
 
-AbstractCardItem::AbstractCardItem(QGraphicsItem *parent,
-                                   const QString &_name,
-                                   const QString &_providerId,
-                                   Player *_owner,
-                                   int _id)
-    : ArrowTarget(_owner, parent), id(_id), name(_name), providerId(_providerId), tapped(false), facedown(false),
-      tapAngle(0), bgColor(Qt::transparent), isHovered(false), realZValue(0)
+AbstractCardItem::AbstractCardItem(const QString &_name, Player *_owner, int _id, QGraphicsItem *parent)
+    : ArrowTarget(_owner, parent), id(_id), name(_name), tapped(false), facedown(false), tapAngle(0),
+      bgColor(Qt::transparent), isHovered(false), realZValue(0)
 {
     setCursor(Qt::OpenHandCursor);
     setFlag(ItemIsSelectable);
     setCacheMode(DeviceCoordinateCache);
 
-    connect(&SettingsCache::instance(), &SettingsCache::displayCardNamesChanged, this, [this] { update(); });
-    refreshCardInfo();
-
-    connect(&SettingsCache::instance(), &SettingsCache::roundCardCornersChanged, this, [this](bool _roundCardCorners) {
-        Q_UNUSED(_roundCardCorners);
-
-        prepareGeometryChange();
-        update();
-    });
+    connect(&SettingsCache::instance(), SIGNAL(displayCardNamesChanged()), this, SLOT(callUpdate()));
+    cardInfoUpdated();
 }
 
 AbstractCardItem::~AbstractCardItem()
@@ -48,8 +37,7 @@ QRectF AbstractCardItem::boundingRect() const
 QPainterPath AbstractCardItem::shape() const
 {
     QPainterPath shape;
-    qreal cardCornerRadius = SettingsCache::instance().getRoundCardCorners() ? 0.05 * CARD_WIDTH : 0.0;
-    shape.addRoundedRect(boundingRect(), cardCornerRadius, cardCornerRadius);
+    shape.addRoundedRect(boundingRect(), 0.05 * CARD_WIDTH, 0.05 * CARD_WIDTH);
     return shape;
 }
 
@@ -59,18 +47,18 @@ void AbstractCardItem::pixmapUpdated()
     emit sigPixmapUpdated();
 }
 
-void AbstractCardItem::refreshCardInfo()
+void AbstractCardItem::cardInfoUpdated()
 {
-    info = CardDatabaseManager::getInstance()->getCardByNameAndProviderId(name, providerId);
+    info = db->getCard(name);
 
     if (!info && !name.isEmpty()) {
         QVariantHash properties = QVariantHash();
 
         info = CardInfo::newInstance(name, "", true, QVariantHash(), QList<CardRelation *>(), QList<CardRelation *>(),
-                                     CardInfoPerSetMap(), false, false, -1, false);
+                                     CardInfoPerSetMap(), false, -1, false);
     }
     if (info.data()) {
-        connect(info.data(), &CardInfo::pixmapUpdated, this, &AbstractCardItem::pixmapUpdated);
+        connect(info.data(), SIGNAL(pixmapUpdated()), this, SLOT(pixmapUpdated()));
     }
 
     cacheBgColor();
@@ -149,13 +137,8 @@ void AbstractCardItem::paintPicture(QPainter *painter, const QSizeF &translatedS
         QString nameStr;
         if (facedown)
             nameStr = "# " + QString::number(id);
-        else {
-            QString prefix = "";
-            if (SettingsCache::instance().debug().getShowCardId()) {
-                prefix = "#" + QString::number(id) + " ";
-            }
-            nameStr = prefix + name;
-        }
+        else
+            nameStr = name;
         painter->drawText(QRectF(3 * scaleFactor, 3 * scaleFactor, translatedSize.width() - 6 * scaleFactor,
                                  translatedSize.height() - 6 * scaleFactor),
                           Qt::AlignTop | Qt::AlignLeft | Qt::TextWrapAnywhere, nameStr);
@@ -198,22 +181,7 @@ void AbstractCardItem::setName(const QString &_name)
         disconnect(info.data(), nullptr, this, nullptr);
     name = _name;
 
-    refreshCardInfo();
-}
-
-void AbstractCardItem::setProviderId(const QString &_providerId)
-{
-    if (providerId == _providerId) {
-        return;
-    }
-
-    emit deleteCardInfoPopup(name);
-    if (info) {
-        disconnect(info.data(), nullptr, this, nullptr);
-    }
-    providerId = _providerId;
-
-    refreshCardInfo();
+    cardInfoUpdated();
 }
 
 void AbstractCardItem::setHovered(bool _hovered)
@@ -309,7 +277,7 @@ void AbstractCardItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
     if (event->button() == Qt::LeftButton)
         setCursor(Qt::ClosedHandCursor);
     else if (event->button() == Qt::MiddleButton)
-        emit showCardInfoPopup(event->screenPos(), name, providerId);
+        emit showCardInfoPopup(event->screenPos(), name);
     event->accept();
 }
 
@@ -333,5 +301,5 @@ QVariant AbstractCardItem::itemChange(QGraphicsItem::GraphicsItemChange change,
         update();
         return value;
     } else
-        return ArrowTarget::itemChange(change, value);
+        return QGraphicsItem::itemChange(change, value);
 }

cockatrice/src/abstractcarditem.h

@@ -1,8 +1,8 @@
 #ifndef ABSTRACTCARDITEM_H
 #define ABSTRACTCARDITEM_H
 
-#include "../board/arrow_target.h"
-#include "card_database.h"
+#include "arrowtarget.h"
+#include "carddatabase.h"
 
 class Player;
 
@@ -16,7 +16,6 @@ protected:
     CardInfoPtr info;
     int id;
     QString name;
-    QString providerId;
     bool tapped;
     bool facedown;
     int tapAngle;
@@ -28,13 +27,14 @@ private:
     qreal realZValue;
 private slots:
     void pixmapUpdated();
-
-public slots:
-    void refreshCardInfo();
-
+    void cardInfoUpdated();
+    void callUpdate()
+    {
+        update();
+    }
 signals:
     void hovered(AbstractCardItem *card);
-    void showCardInfoPopup(const QPoint &pos, const QString &cardName, const QString &providerId);
+    void showCardInfoPopup(QPoint pos, QString cardName);
     void deleteCardInfoPopup(QString cardName);
     void sigPixmapUpdated();
     void cardShiftClicked(QString cardName);
@@ -48,12 +48,11 @@ public:
     {
         return Type;
     }
-    explicit AbstractCardItem(QGraphicsItem *parent = nullptr,
-                              const QString &_name = QString(),
-                              const QString &_providerId = QString(),
-                              Player *_owner = nullptr,
-                              int _id = -1);
-    ~AbstractCardItem() override;
+    AbstractCardItem(const QString &_name = QString(),
+                     Player *_owner = nullptr,
+                     int _id = -1,
+                     QGraphicsItem *parent = nullptr);
+    ~AbstractCardItem();
     QRectF boundingRect() const override;
     QPainterPath shape() const override;
     QSizeF getTranslatedSize(QPainter *painter) const;
@@ -76,11 +75,6 @@ public:
         return name;
     }
     void setName(const QString &_name = QString());
-    QString getProviderId() const
-    {
-        return providerId;
-    }
-    void setProviderId(const QString &_providerId = QString());
     qreal getRealZValue() const
     {
         return realZValue;

cockatrice/src/abstractclient.cpp

@@ -1,6 +1,5 @@
-#include "abstract_client.h"
+#include "abstractclient.h"
 
-#include "../../server/pending_command.h"
 #include "featureset.h"
 #include "get_pb_extension.h"
 #include "pb/commands.pb.h"
@@ -18,6 +17,7 @@
 #include "pb/event_user_left.pb.h"
 #include "pb/event_user_message.pb.h"
 #include "pb/server_message.pb.h"
+#include "pending_command.h"
 
 #include <google/protobuf/descriptor.h>
 
@@ -52,7 +52,7 @@ AbstractClient::AbstractClient(QObject *parent)
     FeatureSet features;
     features.initalizeFeatureList(clientFeatures);
 
-    connect(this, &AbstractClient::sigQueuePendingCommand, this, &AbstractClient::queuePendingCommand);
+    connect(this, SIGNAL(sigQueuePendingCommand(PendingCommand *)), this, SLOT(queuePendingCommand(PendingCommand *)));
 }
 
 AbstractClient::~AbstractClient()

cockatrice/src/abstractclient.h

@@ -48,7 +48,6 @@ class AbstractClient : public QObject
     Q_OBJECT
 signals:
     void statusChanged(ClientStatus _status);
-    void maxPingTime(int seconds, int maxSeconds);
 
     // Room events
     void roomEventReceived(const RoomEvent &event);
@@ -98,8 +97,8 @@ protected:
     virtual void sendCommandContainer(const CommandContainer &cont) = 0;
 
 public:
-    explicit AbstractClient(QObject *parent = nullptr);
-    ~AbstractClient() override;
+    AbstractClient(QObject *parent = nullptr);
+    ~AbstractClient();
 
     ClientStatus getStatus() const
     {

cockatrice/src/abstractcounter.cpp

@@ -1,11 +1,11 @@
-#include "abstract_counter.h"
+#include "abstractcounter.h"
 
-#include "../../client/translate_counter_name.h"
-#include "../../settings/cache_settings.h"
-#include "../player/player.h"
 #include "expression.h"
 #include "pb/command_inc_counter.pb.h"
 #include "pb/command_set_counter.pb.h"
+#include "player.h"
+#include "settingscache.h"
+#include "translatecountername.h"
 
 #include <QAction>
 #include <QApplication>
@@ -36,7 +36,7 @@ AbstractCounter::AbstractCounter(Player *_player,
         QString displayName = TranslateCounterName::getDisplayName(_name);
         menu = new TearOffMenu(displayName);
         aSet = new QAction(this);
-        connect(aSet, &QAction::triggered, this, &AbstractCounter::setCounter);
+        connect(aSet, SIGNAL(triggered()), this, SLOT(setCounter()));
         menu->addAction(aSet);
         menu->addSeparator();
         for (int i = 10; i >= -10; --i) {
@@ -49,7 +49,7 @@ AbstractCounter::AbstractCounter(Player *_player,
                 else if (i == 1)
                     aInc = aIncrement;
                 aIncrement->setData(i);
-                connect(aIncrement, &QAction::triggered, this, &AbstractCounter::incrementCounter);
+                connect(aIncrement, SIGNAL(triggered()), this, SLOT(incrementCounter()));
                 menu->addAction(aIncrement);
             }
         }
@@ -57,8 +57,7 @@ AbstractCounter::AbstractCounter(Player *_player,
         menu = nullptr;
     }
 
-    connect(&SettingsCache::instance().shortcuts(), &ShortcutsSettings::shortCutChanged, this,
-            &AbstractCounter::refreshShortcuts);
+    connect(&SettingsCache::instance().shortcuts(), SIGNAL(shortCutChanged()), this, SLOT(refreshShortcuts()));
     refreshShortcuts();
     retranslateUi();
 }

cockatrice/src/abstractcounter.h

@@ -1,7 +1,7 @@
 #ifndef COUNTER_H
 #define COUNTER_H
 
-#include "../../client/tearoff_menu.h"
+#include "tearoffmenu.h"
 
 #include <QGraphicsItem>
 #include <QInputDialog>
@@ -88,7 +88,7 @@ public:
     AbstractCounterDialog(const QString &name, const QString &value, QWidget *parent = nullptr);
 
 protected:
-    bool eventFilter(QObject *obj, QEvent *event) override;
+    bool eventFilter(QObject *obj, QEvent *event);
     void changeValue(int diff);
 };
 

cockatrice/src/abstractgraphicsitem.cpp

@@ -1,4 +1,4 @@
-#include "abstract_graphics_item.h"
+#include "abstractgraphicsitem.h"
 
 #include <QPainter>
 

cockatrice/src/abstractgraphicsitem.h

@@ -13,9 +13,6 @@ enum GraphicsItemType
     typeOther = QGraphicsItem::UserType + 6
 };
 
-/**
- * Parent class of all objects that appear in a game.
- */
 class AbstractGraphicsItem : public QObject, public QGraphicsItem
 {
     Q_OBJECT
@@ -24,7 +21,7 @@ protected:
     void paintNumberEllipse(int number, int radius, const QColor &color, int position, int count, QPainter *painter);
 
 public:
-    explicit AbstractGraphicsItem(QGraphicsItem *parent = nullptr) : QGraphicsItem(parent)
+    AbstractGraphicsItem(QGraphicsItem *parent = nullptr) : QObject(), QGraphicsItem(parent)
     {
     }
 };

cockatrice/src/arrowitem.cpp

@@ -1,16 +1,16 @@
 #define _USE_MATH_DEFINES
-#include "arrow_item.h"
+#include "arrowitem.h"
 
-#include "../../settings/cache_settings.h"
-#include "../cards/card_database.h"
-#include "../cards/card_item.h"
-#include "../player/player.h"
-#include "../player/player_target.h"
-#include "../zones/card_zone.h"
+#include "carddatabase.h"
+#include "carditem.h"
+#include "cardzone.h"
 #include "color.h"
 #include "pb/command_attach_card.pb.h"
 #include "pb/command_create_arrow.pb.h"
 #include "pb/command_delete_arrow.pb.h"
+#include "player.h"
+#include "playertarget.h"
+#include "settingscache.h"
 
 #include <QDebug>
 #include <QGraphicsScene>
@@ -19,9 +19,10 @@
 #include <QtMath>
 
 ArrowItem::ArrowItem(Player *_player, int _id, ArrowTarget *_startItem, ArrowTarget *_targetItem, const QColor &_color)
-    : QGraphicsItem(), player(_player), id(_id), startItem(_startItem), targetItem(_targetItem), targetLocked(false),
-      color(_color), fullColor(true)
+    : QGraphicsItem(), player(_player), id(_id), startItem(_startItem), targetItem(_targetItem), color(_color),
+      fullColor(true)
 {
+    qDebug() << "ArrowItem constructor: startItem=" << static_cast<QGraphicsItem *>(startItem);
     setZValue(2000000005);
 
     if (startItem)
@@ -35,6 +36,7 @@ ArrowItem::ArrowItem(Player *_player, int _id, ArrowTarget *_startItem, ArrowTar
 
 ArrowItem::~ArrowItem()
 {
+    qDebug() << "ArrowItem destructor";
 }
 
 void ArrowItem::delArrow()
@@ -165,7 +167,7 @@ void ArrowDragItem::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
 {
     // This ensures that if a mouse move event happens after a call to delArrow(),
     // the event will be discarded as it would create some stray pointers.
-    if (targetLocked || !startItem)
+    if (!startItem)
         return;
 
     QPointF endPos = event->scenePos();
@@ -266,7 +268,7 @@ void ArrowAttachItem::addChildArrow(ArrowAttachItem *childArrow)
 
 void ArrowAttachItem::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
 {
-    if (targetLocked || !startItem)
+    if (!startItem)
         return;
 
     QPointF endPos = event->scenePos();
@@ -305,48 +307,25 @@ void ArrowAttachItem::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
     }
 }
 
-void ArrowAttachItem::attachCards(CardItem *startCard, const CardItem *targetCard)
-{
-    // do nothing if target is already attached to another card or is not in play
-    if (targetCard->getAttachedTo() || targetCard->getZone()->getName() != "table") {
-        return;
-    }
-
-    CardZone *startZone = startCard->getZone();
-    CardZone *targetZone = targetCard->getZone();
-
-    // move card onto table first if attaching from some other zone
-    if (startZone->getName() != "table") {
-        player->playCardToTable(startCard, false);
-    }
-
-    Command_AttachCard cmd;
-    cmd.set_start_zone("table");
-    cmd.set_card_id(startCard->getId());
-    cmd.set_target_player_id(targetZone->getPlayer()->getId());
-    cmd.set_target_zone(targetZone->getName().toStdString());
-    cmd.set_target_card_id(targetCard->getId());
-
-    player->sendGameCommand(cmd);
-}
-
 void ArrowAttachItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
 {
     if (!startItem)
         return;
 
-    // Attaching could move startItem under the current cursor position, causing all children to retarget to it right
-    // before they are processed. Prevent that.
-    for (ArrowAttachItem *child : childArrows) {
-        child->setTargetLocked(true);
-    }
-
     if (targetItem && (targetItem != startItem)) {
-        auto startCard = qgraphicsitem_cast<CardItem *>(startItem);
-        auto targetCard = qgraphicsitem_cast<CardItem *>(targetItem);
-        if (startCard && targetCard) {
-            attachCards(startCard, targetCard);
-        }
+        CardItem *startCard = qgraphicsitem_cast<CardItem *>(startItem);
+        CardZone *startZone = startCard->getZone();
+        CardItem *targetCard = qgraphicsitem_cast<CardItem *>(targetItem);
+        CardZone *targetZone = targetCard->getZone();
+
+        Command_AttachCard cmd;
+        cmd.set_start_zone(startZone->getName().toStdString());
+        cmd.set_card_id(startCard->getId());
+        cmd.set_target_player_id(targetZone->getPlayer()->getId());
+        cmd.set_target_zone(targetZone->getName().toStdString());
+        cmd.set_target_card_id(targetCard->getId());
+
+        player->sendGameCommand(cmd);
     }
 
     delArrow();

cockatrice/src/arrowitem.h

@@ -21,20 +21,19 @@ protected:
     Player *player;
     int id;
     ArrowTarget *startItem, *targetItem;
-    bool targetLocked;
     QColor color;
     bool fullColor;
-    void mousePressEvent(QGraphicsSceneMouseEvent *event) override;
+    void mousePressEvent(QGraphicsSceneMouseEvent *event);
 
 public:
     ArrowItem(Player *_player, int _id, ArrowTarget *_startItem, ArrowTarget *_targetItem, const QColor &color);
-    ~ArrowItem() override;
-    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
-    QRectF boundingRect() const override
+    ~ArrowItem();
+    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
+    QRectF boundingRect() const
     {
         return path.boundingRect();
     }
-    QPainterPath shape() const override
+    QPainterPath shape() const
     {
         return path;
     }
@@ -65,10 +64,6 @@ public:
     {
         return targetItem;
     }
-    void setTargetLocked(bool _targetLocked)
-    {
-        targetLocked = _targetLocked;
-    }
     void delArrow();
 };
 
@@ -83,8 +78,8 @@ public:
     void addChildArrow(ArrowDragItem *childArrow);
 
 protected:
-    void mouseMoveEvent(QGraphicsSceneMouseEvent *event) override;
-    void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override;
+    void mouseMoveEvent(QGraphicsSceneMouseEvent *event);
+    void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
 };
 
 class ArrowAttachItem : public ArrowItem
@@ -93,15 +88,13 @@ class ArrowAttachItem : public ArrowItem
 private:
     QList<ArrowAttachItem *> childArrows;
 
-    void attachCards(CardItem *startCard, const CardItem *targetCard);
-
 public:
-    explicit ArrowAttachItem(ArrowTarget *_startItem);
+    ArrowAttachItem(ArrowTarget *_startItem);
     void addChildArrow(ArrowAttachItem *childArrow);
 
 protected:
-    void mouseMoveEvent(QGraphicsSceneMouseEvent *event) override;
-    void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override;
+    void mouseMoveEvent(QGraphicsSceneMouseEvent *event);
+    void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
 };
 
 #endif // ARROWITEM_H

cockatrice/src/arrowtarget.cpp

@@ -1,12 +1,11 @@
-#include "arrow_target.h"
+#include "arrowtarget.h"
 
-#include "../player/player.h"
-#include "arrow_item.h"
+#include "arrowitem.h"
+#include "player.h"
 
 ArrowTarget::ArrowTarget(Player *_owner, QGraphicsItem *parent)
     : AbstractGraphicsItem(parent), owner(_owner), beingPointedAt(false)
 {
-    setFlag(ItemSendsScenePositionChanges);
 }
 
 ArrowTarget::~ArrowTarget()
@@ -26,16 +25,3 @@ void ArrowTarget::setBeingPointedAt(bool _beingPointedAt)
     beingPointedAt = _beingPointedAt;
     update();
 }
-
-QVariant ArrowTarget::itemChange(QGraphicsItem::GraphicsItemChange change, const QVariant &value)
-{
-    if (change == ItemScenePositionHasChanged && scene()) {
-        for (auto *arrow : arrowsFrom)
-            arrow->updatePath();
-
-        for (auto *arrow : arrowsTo)
-            arrow->updatePath();
-    }
-
-    return QGraphicsItem::itemChange(change, value);
-}

cockatrice/src/arrowtarget.h

@@ -1,7 +1,7 @@
 #ifndef ARROWTARGET_H
 #define ARROWTARGET_H
 
-#include "abstract_graphics_item.h"
+#include "abstractgraphicsitem.h"
 
 #include <QList>
 
@@ -19,8 +19,8 @@ private:
     QList<ArrowItem *> arrowsFrom, arrowsTo;
 
 public:
-    explicit ArrowTarget(Player *_owner, QGraphicsItem *parent = nullptr);
-    ~ArrowTarget() override;
+    ArrowTarget(Player *_owner, QGraphicsItem *parent = nullptr);
+    ~ArrowTarget();
 
     Player *getOwner() const
     {
@@ -57,8 +57,5 @@ public:
     {
         arrowsTo.removeOne(arrow);
     }
-
-protected:
-    QVariant itemChange(QGraphicsItem::GraphicsItemChange change, const QVariant &value) override;
 };
 #endif

cockatrice/src/carddatabase.cpp

@@ -0,0 +1,738 @@
+#include "carddatabase.h"
+
+#include "carddbparser/cockatricexml3.h"
+#include "carddbparser/cockatricexml4.h"
+#include "game_specific_terms.h"
+#include "pictureloader.h"
+#include "settingscache.h"
+#include "spoilerbackgroundupdater.h"
+
+#include <QCryptographicHash>
+#include <QDebug>
+#include <QDir>
+#include <QDirIterator>
+#include <QFile>
+#include <QMessageBox>
+#include <QRegularExpression>
+#include <algorithm>
+#include <utility>
+
+const char *CardDatabase::TOKENS_SETNAME = "TK";
+
+CardSet::CardSet(const QString &_shortName,
+                 const QString &_longName,
+                 const QString &_setType,
+                 const QDate &_releaseDate)
+    : shortName(_shortName), longName(_longName), releaseDate(_releaseDate), setType(_setType)
+{
+    loadSetOptions();
+}
+
+CardSetPtr CardSet::newInstance(const QString &_shortName,
+                                const QString &_longName,
+                                const QString &_setType,
+                                const QDate &_releaseDate)
+{
+    CardSetPtr ptr(new CardSet(_shortName, _longName, _setType, _releaseDate));
+    // ptr->setSmartPointer(ptr);
+    return ptr;
+}
+
+QString CardSet::getCorrectedShortName() const
+{
+    // For Windows machines.
+    QSet<QString> invalidFileNames;
+    invalidFileNames << "CON"
+                     << "PRN"
+                     << "AUX"
+                     << "NUL"
+                     << "COM1"
+                     << "COM2"
+                     << "COM3"
+                     << "COM4"
+                     << "COM5"
+                     << "COM6"
+                     << "COM7"
+                     << "COM8"
+                     << "COM9"
+                     << "LPT1"
+                     << "LPT2"
+                     << "LPT3"
+                     << "LPT4"
+                     << "LPT5"
+                     << "LPT6"
+                     << "LPT7"
+                     << "LPT8"
+                     << "LPT9";
+
+    return invalidFileNames.contains(shortName) ? shortName + "_" : shortName;
+}
+
+void CardSet::loadSetOptions()
+{
+    sortKey = SettingsCache::instance().cardDatabase().getSortKey(shortName);
+    enabled = SettingsCache::instance().cardDatabase().isEnabled(shortName);
+    isknown = SettingsCache::instance().cardDatabase().isKnown(shortName);
+}
+
+void CardSet::setSortKey(unsigned int _sortKey)
+{
+    sortKey = _sortKey;
+    SettingsCache::instance().cardDatabase().setSortKey(shortName, _sortKey);
+}
+
+void CardSet::setEnabled(bool _enabled)
+{
+    enabled = _enabled;
+    SettingsCache::instance().cardDatabase().setEnabled(shortName, _enabled);
+}
+
+void CardSet::setIsKnown(bool _isknown)
+{
+    isknown = _isknown;
+    SettingsCache::instance().cardDatabase().setIsKnown(shortName, _isknown);
+}
+
+class SetList::KeyCompareFunctor
+{
+public:
+    inline bool operator()(const CardSetPtr &a, const CardSetPtr &b) const
+    {
+        if (a.isNull() || b.isNull()) {
+            qDebug() << "SetList::KeyCompareFunctor a or b is null";
+            return false;
+        }
+
+        return a->getSortKey() < b->getSortKey();
+    }
+};
+
+void SetList::sortByKey()
+{
+    std::sort(begin(), end(), KeyCompareFunctor());
+}
+
+int SetList::getEnabledSetsNum()
+{
+    int num = 0;
+    for (int i = 0; i < size(); ++i) {
+        CardSetPtr set = at(i);
+        if (set && set->getEnabled()) {
+            ++num;
+        }
+    }
+    return num;
+}
+
+int SetList::getUnknownSetsNum()
+{
+    int num = 0;
+    for (int i = 0; i < size(); ++i) {
+        CardSetPtr set = at(i);
+        if (set && !set->getIsKnown() && !set->getIsKnownIgnored()) {
+            ++num;
+        }
+    }
+    return num;
+}
+
+QStringList SetList::getUnknownSetsNames()
+{
+    QStringList sets = QStringList();
+    for (int i = 0; i < size(); ++i) {
+        CardSetPtr set = at(i);
+        if (set && !set->getIsKnown() && !set->getIsKnownIgnored()) {
+            sets << set->getShortName();
+        }
+    }
+    return sets;
+}
+
+void SetList::enableAllUnknown()
+{
+    for (int i = 0; i < size(); ++i) {
+        CardSetPtr set = at(i);
+        if (set && !set->getIsKnown() && !set->getIsKnownIgnored()) {
+            set->setIsKnown(true);
+            set->setEnabled(true);
+        } else if (set && set->getIsKnownIgnored() && !set->getEnabled()) {
+            set->setEnabled(true);
+        }
+    }
+}
+
+void SetList::enableAll()
+{
+    for (int i = 0; i < size(); ++i) {
+        CardSetPtr set = at(i);
+
+        if (set == nullptr) {
+            qDebug() << "enabledAll has null";
+            continue;
+        }
+
+        if (!set->getIsKnownIgnored()) {
+            set->setIsKnown(true);
+        }
+
+        set->setEnabled(true);
+    }
+}
+
+void SetList::markAllAsKnown()
+{
+    for (int i = 0; i < size(); ++i) {
+        CardSetPtr set = at(i);
+        if (set && !set->getIsKnown() && !set->getIsKnownIgnored()) {
+            set->setIsKnown(true);
+            set->setEnabled(false);
+        } else if (set && set->getIsKnownIgnored() && !set->getEnabled()) {
+            set->setEnabled(true);
+        }
+    }
+}
+
+void SetList::guessSortKeys()
+{
+    // sort by release date DESC; invalid dates to the bottom.
+    QDate distantFuture(2050, 1, 1);
+    int aHundredYears = 36500;
+    for (int i = 0; i < size(); ++i) {
+        CardSetPtr set = at(i);
+        if (set.isNull()) {
+            qDebug() << "guessSortKeys set is null";
+            continue;
+        }
+
+        QDate date = set->getReleaseDate();
+        if (date.isNull()) {
+            set->setSortKey(static_cast<unsigned int>(aHundredYears));
+        } else {
+            set->setSortKey(static_cast<unsigned int>(date.daysTo(distantFuture)));
+        }
+    }
+}
+
+CardInfoPerSet::CardInfoPerSet(const CardSetPtr &_set) : set(_set)
+{
+}
+
+CardInfo::CardInfo(const QString &_name,
+                   const QString &_text,
+                   bool _isToken,
+                   QVariantHash _properties,
+                   const QList<CardRelation *> &_relatedCards,
+                   const QList<CardRelation *> &_reverseRelatedCards,
+                   CardInfoPerSetMap _sets,
+                   bool _cipt,
+                   int _tableRow,
+                   bool _upsideDownArt)
+    : name(_name), text(_text), isToken(_isToken), properties(std::move(_properties)), relatedCards(_relatedCards),
+      reverseRelatedCards(_reverseRelatedCards), sets(std::move(_sets)), cipt(_cipt), tableRow(_tableRow),
+      upsideDownArt(_upsideDownArt)
+{
+    pixmapCacheKey = QLatin1String("card_") + name;
+    simpleName = CardInfo::simplifyName(name);
+
+    refreshCachedSetNames();
+}
+
+CardInfo::~CardInfo()
+{
+    PictureLoader::clearPixmapCache(smartThis);
+}
+
+CardInfoPtr CardInfo::newInstance(const QString &_name,
+                                  const QString &_text,
+                                  bool _isToken,
+                                  QVariantHash _properties,
+                                  const QList<CardRelation *> &_relatedCards,
+                                  const QList<CardRelation *> &_reverseRelatedCards,
+                                  CardInfoPerSetMap _sets,
+                                  bool _cipt,
+                                  int _tableRow,
+                                  bool _upsideDownArt)
+{
+    CardInfoPtr ptr(new CardInfo(_name, _text, _isToken, std::move(_properties), _relatedCards, _reverseRelatedCards,
+                                 _sets, _cipt, _tableRow, _upsideDownArt));
+    ptr->setSmartPointer(ptr);
+
+    for (const CardInfoPerSet &set : _sets) {
+        set.getPtr()->append(ptr);
+    }
+
+    return ptr;
+}
+
+QString CardInfo::getCorrectedName() const
+{
+    // remove all the characters reserved in windows file paths,
+    // other oses only disallow a subset of these so it covers all
+    static const QRegularExpression rmrx(R"(( // |[*<>:"\\?\x00-\x08\x10-\x1f]))");
+    static const QRegularExpression spacerx(R"([/\x09-\x0f])");
+    static const QString space(' ');
+    QString result = name;
+    // Fire // Ice, Circle of Protection: Red, "Ach! Hans, Run!", Who/What/When/Where/Why, Question Elemental?
+    return result.remove(rmrx).replace(spacerx, space);
+}
+
+void CardInfo::addToSet(const CardSetPtr &_set, const CardInfoPerSet _info)
+{
+    _set->append(smartThis);
+    sets.insert(_set->getShortName(), _info);
+
+    refreshCachedSetNames();
+}
+
+void CardInfo::refreshCachedSetNames()
+{
+    QStringList setList;
+    // update the cached list of set names
+    for (const auto &set : sets) {
+        if (set.getPtr()->getEnabled()) {
+            setList << set.getPtr()->getShortName();
+        }
+    }
+    setsNames = setList.join(", ");
+}
+
+QString CardInfo::simplifyName(const QString &name)
+{
+    static const QRegularExpression spaceOrSplit("(\\s+|\\/\\/.*)");
+    static const QRegularExpression nonAlnum("[^a-z0-9]");
+
+    QString simpleName = name.toLower();
+
+    // remove spaces and right halves of split cards
+    simpleName.remove(spaceOrSplit);
+
+    // So Aetherling would work, but not Ætherling since 'Æ' would get replaced
+    // with nothing.
+    simpleName.replace("æ", "ae");
+
+    // Replace Jötun Grunt with Jotun Grunt.
+    simpleName = simpleName.normalized(QString::NormalizationForm_KD);
+
+    // remove all non alphanumeric characters from the name
+    simpleName.remove(nonAlnum);
+    return simpleName;
+}
+
+const QChar CardInfo::getColorChar() const
+{
+    QString colors = getColors();
+    switch (colors.size()) {
+        case 0:
+            return QChar();
+        case 1:
+            return colors.at(0);
+        default:
+            return QChar('m');
+    }
+}
+
+CardDatabase::CardDatabase(QObject *parent) : QObject(parent), loadStatus(NotLoaded)
+{
+    qRegisterMetaType<CardInfoPtr>("CardInfoPtr");
+    qRegisterMetaType<CardInfoPtr>("CardSetPtr");
+
+    // add new parsers here
+    availableParsers << new CockatriceXml4Parser;
+    availableParsers << new CockatriceXml3Parser;
+
+    for (auto &parser : availableParsers) {
+        connect(parser, SIGNAL(addCard(CardInfoPtr)), this, SLOT(addCard(CardInfoPtr)), Qt::DirectConnection);
+        connect(parser, SIGNAL(addSet(CardSetPtr)), this, SLOT(addSet(CardSetPtr)), Qt::DirectConnection);
+    }
+
+    connect(&SettingsCache::instance(), SIGNAL(cardDatabasePathChanged()), this, SLOT(loadCardDatabases()));
+}
+
+CardDatabase::~CardDatabase()
+{
+    clear();
+    qDeleteAll(availableParsers);
+}
+
+void CardDatabase::clear()
+{
+    clearDatabaseMutex->lock();
+
+    QHashIterator<QString, CardInfoPtr> i(cards);
+    while (i.hasNext()) {
+        i.next();
+        if (i.value()) {
+            removeCard(i.value());
+        }
+    }
+
+    cards.clear();
+    simpleNameCards.clear();
+
+    sets.clear();
+    ICardDatabaseParser::clearSetlist();
+
+    loadStatus = NotLoaded;
+
+    clearDatabaseMutex->unlock();
+}
+
+void CardDatabase::addCard(CardInfoPtr card)
+{
+    if (card == nullptr) {
+        qDebug() << "addCard(nullptr)";
+        return;
+    }
+
+    // if card already exists just add the new set property
+    if (cards.contains(card->getName())) {
+        CardInfoPtr sameCard = cards[card->getName()];
+        for (const CardInfoPerSet &set : card->getSets()) {
+            sameCard->addToSet(set.getPtr(), set);
+        }
+        return;
+    }
+
+    addCardMutex->lock();
+    cards.insert(card->getName(), card);
+    simpleNameCards.insert(card->getSimpleName(), card);
+    addCardMutex->unlock();
+    emit cardAdded(card);
+}
+
+void CardDatabase::removeCard(CardInfoPtr card)
+{
+    if (card.isNull()) {
+        qDebug() << "removeCard(nullptr)";
+        return;
+    }
+
+    for (auto *cardRelation : card->getRelatedCards())
+        cardRelation->deleteLater();
+
+    for (auto *cardRelation : card->getReverseRelatedCards())
+        cardRelation->deleteLater();
+
+    for (auto *cardRelation : card->getReverseRelatedCards2Me())
+        cardRelation->deleteLater();
+
+    removeCardMutex->lock();
+    cards.remove(card->getName());
+    simpleNameCards.remove(card->getSimpleName());
+    removeCardMutex->unlock();
+    emit cardRemoved(card);
+}
+
+CardInfoPtr CardDatabase::getCard(const QString &cardName) const
+{
+    return getCardFromMap(cards, cardName);
+}
+
+QList<CardInfoPtr> CardDatabase::getCards(const QStringList &cardNames) const
+{
+    QList<CardInfoPtr> cardInfos;
+    foreach (QString cardName, cardNames) {
+        CardInfoPtr ptr = getCardFromMap(cards, cardName);
+        if (ptr)
+            cardInfos.append(ptr);
+    }
+
+    return cardInfos;
+}
+
+CardInfoPtr CardDatabase::getCardBySimpleName(const QString &cardName) const
+{
+    return getCardFromMap(simpleNameCards, CardInfo::simplifyName(cardName));
+}
+
+CardInfoPtr CardDatabase::guessCard(const QString &cardName) const
+{
+    CardInfoPtr temp = getCard(cardName);
+    if (temp == nullptr) { // get card by simple name instead
+        temp = getCardBySimpleName(cardName);
+        if (temp == nullptr) { // still could not find the card, so simplify the cardName too
+            QString simpleCardName = CardInfo::simplifyName(cardName);
+            temp = getCardBySimpleName(simpleCardName);
+        }
+    }
+    return temp; // returns nullptr if not found
+}
+
+CardSetPtr CardDatabase::getSet(const QString &setName)
+{
+    if (sets.contains(setName)) {
+        return sets.value(setName);
+    } else {
+        CardSetPtr newSet = CardSet::newInstance(setName);
+        sets.insert(setName, newSet);
+        return newSet;
+    }
+}
+
+void CardDatabase::addSet(CardSetPtr set)
+{
+    sets.insert(set->getShortName(), set);
+}
+
+SetList CardDatabase::getSetList() const
+{
+    SetList result;
+    QHashIterator<QString, CardSetPtr> i(sets);
+    while (i.hasNext()) {
+        i.next();
+        result << i.value();
+    }
+    return result;
+}
+
+CardInfoPtr CardDatabase::getCardFromMap(const CardNameMap &cardMap, const QString &cardName) const
+{
+    if (cardMap.contains(cardName))
+        return cardMap.value(cardName);
+
+    return {};
+}
+
+LoadStatus CardDatabase::loadFromFile(const QString &fileName)
+{
+    QFile file(fileName);
+    file.open(QIODevice::ReadOnly);
+    if (!file.isOpen()) {
+        return FileError;
+    }
+
+    for (auto parser : availableParsers) {
+        file.reset();
+        if (parser->getCanParseFile(fileName, file)) {
+            file.reset();
+            parser->parseFile(file);
+            return Ok;
+        }
+    }
+
+    return Invalid;
+}
+
+LoadStatus CardDatabase::loadCardDatabase(const QString &path)
+{
+    auto startTime = QTime::currentTime();
+    LoadStatus tempLoadStatus = NotLoaded;
+    if (!path.isEmpty()) {
+        loadFromFileMutex->lock();
+        tempLoadStatus = loadFromFile(path);
+        loadFromFileMutex->unlock();
+    }
+
+    int msecs = startTime.msecsTo(QTime::currentTime());
+    qDebug() << "[CardDatabase] loadCardDatabase(): Path =" << path << "Status =" << tempLoadStatus
+             << "Cards =" << cards.size() << "Sets =" << sets.size() << QString("%1ms").arg(msecs);
+
+    return tempLoadStatus;
+}
+
+LoadStatus CardDatabase::loadCardDatabases()
+{
+    reloadDatabaseMutex->lock();
+
+    qDebug() << "CardDatabase::loadCardDatabases start";
+
+    clear(); // remove old db
+
+    loadStatus = loadCardDatabase(SettingsCache::instance().getCardDatabasePath()); // load main card database
+    loadCardDatabase(SettingsCache::instance().getTokenDatabasePath());             // load tokens database
+    loadCardDatabase(SettingsCache::instance().getSpoilerCardDatabasePath());       // load spoilers database
+
+    // find all custom card databases, recursively & following symlinks
+    // then load them alphabetically
+    QDirIterator customDatabaseIterator(SettingsCache::instance().getCustomCardDatabasePath(), QStringList() << "*.xml",
+                                        QDir::Files, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
+    QStringList databasePaths;
+    while (customDatabaseIterator.hasNext()) {
+        customDatabaseIterator.next();
+        databasePaths.push_back(customDatabaseIterator.filePath());
+    }
+    databasePaths.sort();
+
+    for (auto i = 0; i < databasePaths.size(); ++i) {
+        const auto &databasePath = databasePaths.at(i);
+        qDebug() << "Loading Custom Set" << i << "(" << databasePath << ")";
+        loadCardDatabase(databasePath);
+    }
+
+    // AFTER all the cards have been loaded
+
+    // resolve the reverse-related tags
+    refreshCachedReverseRelatedCards();
+
+    if (loadStatus == Ok) {
+        checkUnknownSets(); // update deck editors, etc
+        qDebug() << "CardDatabase::loadCardDatabases success";
+    } else {
+        qDebug() << "CardDatabase::loadCardDatabases failed";
+        emit cardDatabaseLoadingFailed(); // bring up the settings dialog
+    }
+
+    reloadDatabaseMutex->unlock();
+    return loadStatus;
+}
+
+void CardDatabase::refreshCachedReverseRelatedCards()
+{
+    for (const CardInfoPtr &card : cards)
+        card->resetReverseRelatedCards2Me();
+
+    for (const CardInfoPtr &card : cards) {
+        if (card->getReverseRelatedCards().isEmpty()) {
+            continue;
+        }
+
+        foreach (CardRelation *cardRelation, card->getReverseRelatedCards()) {
+            const QString &targetCard = cardRelation->getName();
+            if (!cards.contains(targetCard)) {
+                continue;
+            }
+
+            auto *newCardRelation = new CardRelation(
+                card->getName(), cardRelation->getAttachType(), cardRelation->getIsCreateAllExclusion(),
+                cardRelation->getIsVariable(), cardRelation->getDefaultCount(), cardRelation->getIsPersistent());
+            cards.value(targetCard)->addReverseRelatedCards2Me(newCardRelation);
+        }
+    }
+}
+
+QStringList CardDatabase::getAllMainCardTypes() const
+{
+    QSet<QString> types;
+    QHashIterator<QString, CardInfoPtr> cardIterator(cards);
+    while (cardIterator.hasNext()) {
+        types.insert(cardIterator.next().value()->getMainCardType());
+    }
+    return types.values();
+}
+
+void CardDatabase::checkUnknownSets()
+{
+    auto _sets = getSetList();
+
+    if (_sets.getEnabledSetsNum()) {
+        // if some sets are first found on this run, ask the user
+        int numUnknownSets = _sets.getUnknownSetsNum();
+        QStringList unknownSetNames = _sets.getUnknownSetsNames();
+        if (numUnknownSets > 0) {
+            emit cardDatabaseNewSetsFound(numUnknownSets, unknownSetNames);
+        } else {
+            _sets.markAllAsKnown();
+        }
+    } else {
+        // No set enabled. Probably this is the first time running trice
+        _sets.guessSortKeys();
+        _sets.sortByKey();
+        _sets.enableAll();
+        notifyEnabledSetsChanged();
+
+        emit cardDatabaseAllNewSetsEnabled();
+    }
+}
+
+void CardDatabase::enableAllUnknownSets()
+{
+    auto _sets = getSetList();
+    _sets.enableAllUnknown();
+}
+
+void CardDatabase::markAllSetsAsKnown()
+{
+    auto _sets = getSetList();
+    _sets.markAllAsKnown();
+}
+
+void CardDatabase::notifyEnabledSetsChanged()
+{
+    // refresh the list of cached set names
+    for (const CardInfoPtr &card : cards)
+        card->refreshCachedSetNames();
+
+    // inform the carddatabasemodels that they need to re-check their list of cards
+    emit cardDatabaseEnabledSetsChanged();
+}
+
+bool CardDatabase::saveCustomTokensToFile()
+{
+    QString fileName =
+        SettingsCache::instance().getCustomCardDatabasePath() + "/" + CardDatabase::TOKENS_SETNAME + ".xml";
+
+    SetNameMap tmpSets;
+    CardSetPtr customTokensSet = getSet(CardDatabase::TOKENS_SETNAME);
+    tmpSets.insert(CardDatabase::TOKENS_SETNAME, customTokensSet);
+
+    CardNameMap tmpCards;
+    for (const CardInfoPtr &card : cards) {
+        if (card->getSets().contains(CardDatabase::TOKENS_SETNAME)) {
+            tmpCards.insert(card->getName(), card);
+        }
+    }
+
+    availableParsers.first()->saveToFile(tmpSets, tmpCards, fileName);
+    return true;
+}
+
+CardRelation::CardRelation(const QString &_name,
+                           AttachType _attachType,
+                           bool _isCreateAllExclusion,
+                           bool _isVariableCount,
+                           int _defaultCount,
+                           bool _isPersistent)
+    : name(_name), attachType(_attachType), isCreateAllExclusion(_isCreateAllExclusion),
+      isVariableCount(_isVariableCount), defaultCount(_defaultCount), isPersistent(_isPersistent)
+{
+}
+
+void CardInfo::resetReverseRelatedCards2Me()
+{
+    foreach (CardRelation *cardRelation, this->getReverseRelatedCards2Me()) {
+        cardRelation->deleteLater();
+    }
+    reverseRelatedCardsToMe = QList<CardRelation *>();
+}
+
+// Back-compatibility methods. Remove ASAP
+const QString CardInfo::getCardType() const
+{
+    return getProperty(Mtg::CardType);
+}
+void CardInfo::setCardType(const QString &value)
+{
+    setProperty(Mtg::CardType, value);
+}
+const QString CardInfo::getCmc() const
+{
+    return getProperty(Mtg::ConvertedManaCost);
+}
+const QString CardInfo::getColors() const
+{
+    return getProperty(Mtg::Colors);
+}
+void CardInfo::setColors(const QString &value)
+{
+    setProperty(Mtg::Colors, value);
+}
+const QString CardInfo::getLoyalty() const
+{
+    return getProperty(Mtg::Loyalty);
+}
+const QString CardInfo::getMainCardType() const
+{
+    return getProperty(Mtg::MainCardType);
+}
+const QString CardInfo::getManaCost() const
+{
+    return getProperty(Mtg::ManaCost);
+}
+const QString CardInfo::getPowTough() const
+{
+    return getProperty(Mtg::PowTough);
+}
+void CardInfo::setPowTough(const QString &value)
+{
+    setProperty(Mtg::PowTough, value);
+}

cockatrice/src/carddatabase.h

@@ -1,19 +1,19 @@
-#ifndef CARD_INFO_H
-#define CARD_INFO_H
+#ifndef CARDDATABASE_H
+#define CARDDATABASE_H
 
+#include <QBasicMutex>
 #include <QDate>
 #include <QHash>
 #include <QList>
-#include <QLoggingCategory>
 #include <QMap>
 #include <QMetaType>
 #include <QSharedPointer>
 #include <QStringList>
 #include <QVariant>
+#include <QVector>
 #include <utility>
 
-inline Q_LOGGING_CATEGORY(CardInfoLog, "card_info");
-
+class CardDatabase;
 class CardInfo;
 class CardInfoPerSet;
 class CardSet;
@@ -23,42 +23,28 @@ class ICardDatabaseParser;
 typedef QMap<QString, QString> QStringMap;
 typedef QSharedPointer<CardInfo> CardInfoPtr;
 typedef QSharedPointer<CardSet> CardSetPtr;
-typedef QMap<QString, QList<CardInfoPerSet>> CardInfoPerSetMap;
+typedef QMap<QString, CardInfoPerSet> CardInfoPerSetMap;
 
 Q_DECLARE_METATYPE(CardInfoPtr)
 
 class CardSet : public QList<CardInfoPtr>
 {
-public:
-    enum Priority
-    {
-        PriorityFallback = 0,
-        PriorityPrimary = 10,
-        PrioritySecondary = 20,
-        PriorityReprint = 30,
-        PriorityOther = 40,
-        PriorityLowest = 100,
-    };
-
 private:
     QString shortName, longName;
     unsigned int sortKey;
     QDate releaseDate;
     QString setType;
-    Priority priority;
     bool enabled, isknown;
 
 public:
     explicit CardSet(const QString &_shortName = QString(),
                      const QString &_longName = QString(),
                      const QString &_setType = QString(),
-                     const QDate &_releaseDate = QDate(),
-                     const Priority _priority = PriorityFallback);
+                     const QDate &_releaseDate = QDate());
     static CardSetPtr newInstance(const QString &_shortName = QString(),
                                   const QString &_longName = QString(),
                                   const QString &_setType = QString(),
-                                  const QDate &_releaseDate = QDate(),
-                                  const Priority _priority = PriorityFallback);
+                                  const QDate &_releaseDate = QDate());
     QString getCorrectedShortName() const;
     QString getShortName() const
     {
@@ -76,10 +62,6 @@ public:
     {
         return releaseDate;
     }
-    Priority getPriority() const
-    {
-        return priority;
-    }
     void setLongName(const QString &_longName)
     {
         longName = _longName;
@@ -92,10 +74,6 @@ public:
     {
         releaseDate = _releaseDate;
     }
-    void setPriority(const Priority _priority)
-    {
-        priority = _priority;
-    }
 
     void loadSetOptions();
     int getSortKey() const
@@ -135,7 +113,6 @@ public:
     int getEnabledSetsNum();
     int getUnknownSetsNum();
     QStringList getUnknownSetsNames();
-    void defaultSort();
 };
 
 class CardInfoPerSet
@@ -144,11 +121,6 @@ public:
     explicit CardInfoPerSet(const CardSetPtr &_set = QSharedPointer<CardSet>(nullptr));
     ~CardInfoPerSet() = default;
 
-    bool operator==(const CardInfoPerSet &other) const
-    {
-        return this->set == other.set && this->properties == other.properties;
-    }
-
 private:
     CardSetPtr set;
     // per-set card properties;
@@ -202,53 +174,32 @@ private:
     QString setsNames;
     // positioning properties; used by UI
     bool cipt;
-    bool landscapeOrientation;
     int tableRow;
     bool upsideDownArt;
 
 public:
-    explicit CardInfo(const QString &_name,
-                      const QString &_text,
-                      bool _isToken,
-                      QVariantHash _properties,
-                      const QList<CardRelation *> &_relatedCards,
-                      const QList<CardRelation *> &_reverseRelatedCards,
-                      CardInfoPerSetMap _sets,
-                      bool _cipt,
-                      bool _landscapeOrientation,
-                      int _tableRow,
-                      bool _upsideDownArt);
-    CardInfo(const CardInfo &other)
-        : QObject(other.parent()), name(other.name), simpleName(other.simpleName), pixmapCacheKey(other.pixmapCacheKey),
-          text(other.text), isToken(other.isToken), properties(other.properties), relatedCards(other.relatedCards),
-          reverseRelatedCards(other.reverseRelatedCards), reverseRelatedCardsToMe(other.reverseRelatedCardsToMe),
-          sets(other.sets), setsNames(other.setsNames), cipt(other.cipt),
-          landscapeOrientation(other.landscapeOrientation), tableRow(other.tableRow), upsideDownArt(other.upsideDownArt)
-    {
-    }
+    explicit CardInfo(const QString &_name = QString(),
+                      const QString &_text = QString(),
+                      bool _isToken = false,
+                      QVariantHash _properties = QVariantHash(),
+                      const QList<CardRelation *> &_relatedCards = QList<CardRelation *>(),
+                      const QList<CardRelation *> &_reverseRelatedCards = QList<CardRelation *>(),
+                      CardInfoPerSetMap _sets = CardInfoPerSetMap(),
+                      bool _cipt = false,
+                      int _tableRow = 0,
+                      bool _upsideDownArt = false);
     ~CardInfo() override;
 
-    static CardInfoPtr newInstance(const QString &_name);
-
-    static CardInfoPtr newInstance(const QString &_name,
-                                   const QString &_text,
-                                   bool _isToken,
-                                   QVariantHash _properties,
-                                   const QList<CardRelation *> &_relatedCards,
-                                   const QList<CardRelation *> &_reverseRelatedCards,
-                                   CardInfoPerSetMap _sets,
-                                   bool _cipt,
-                                   bool _landscapeOrientation,
-                                   int _tableRow,
-                                   bool _upsideDownArt);
-
-    CardInfoPtr clone() const
-    {
-        // Use the copy constructor to create a new instance
-        CardInfoPtr newCardInfo = CardInfoPtr(new CardInfo(*this));
-        newCardInfo->setSmartPointer(newCardInfo); // Set the smart pointer for the new instance
-        return newCardInfo;
-    }
+    static CardInfoPtr newInstance(const QString &_name = QString(),
+                                   const QString &_text = QString(),
+                                   bool _isToken = false,
+                                   QVariantHash _properties = QVariantHash(),
+                                   const QList<CardRelation *> &_relatedCards = QList<CardRelation *>(),
+                                   const QList<CardRelation *> &_reverseRelatedCards = QList<CardRelation *>(),
+                                   CardInfoPerSetMap _sets = CardInfoPerSetMap(),
+                                   bool _cipt = false,
+                                   int _tableRow = 0,
+                                   bool _upsideDownArt = false);
 
     void setSmartPointer(CardInfoPtr _ptr)
     {
@@ -264,10 +215,6 @@ public:
     {
         return simpleName;
     }
-    void setPixmapCacheKey(QString _pixmapCacheKey)
-    {
-        pixmapCacheKey = _pixmapCacheKey;
-    }
     const QString &getPixmapCacheKey() const
     {
         return pixmapCacheKey;
@@ -316,15 +263,15 @@ public:
     {
         if (!sets.contains(setName))
             return "";
+        return sets[setName].getProperty(propertyName);
+    }
+    void setSetProperty(const QString &setName, const QString &_name, const QString &_value)
+    {
+        if (!sets.contains(setName))
+            return;
 
-        for (const auto &set : sets[setName]) {
-            if (QLatin1String("card_") + this->getName() + QString("_") + QString(set.getProperty("uuid")) ==
-                this->getPixmapCacheKey()) {
-                return set.getProperty(propertyName);
-            }
-        }
-
-        return sets[setName][0].getProperty(propertyName);
+        sets[setName].setProperty(_name, _value);
+        emit cardInfoChanged(smartThis);
     }
 
     // related cards
@@ -358,10 +305,6 @@ public:
     {
         return cipt;
     }
-    bool getLandscapeOrientation() const
-    {
-        return landscapeOrientation;
-    }
     int getTableRow() const
     {
         return tableRow;
@@ -395,7 +338,6 @@ public:
     }
     QString getCorrectedName() const;
     void addToSet(const CardSetPtr &_set, CardInfoPerSet _info = CardInfoPerSet());
-    void combineLegalities(const QVariantHash &props);
     void emitPixmapUpdated()
     {
         emit pixmapUpdated();
@@ -413,6 +355,100 @@ signals:
     void cardInfoChanged(CardInfoPtr card);
 };
 
+enum LoadStatus
+{
+    Ok,
+    VersionTooOld,
+    Invalid,
+    NotLoaded,
+    FileError,
+    NoCards
+};
+
+typedef QHash<QString, CardInfoPtr> CardNameMap;
+typedef QHash<QString, CardSetPtr> SetNameMap;
+
+class CardDatabase : public QObject
+{
+    Q_OBJECT
+protected:
+    /*
+     * The cards, indexed by name.
+     */
+    CardNameMap cards;
+
+    /**
+     * The cards, indexed by their simple name.
+     */
+    CardNameMap simpleNameCards;
+
+    /*
+     * The sets, indexed by short name.
+     */
+    SetNameMap sets;
+
+    LoadStatus loadStatus;
+
+    QVector<ICardDatabaseParser *> availableParsers;
+
+private:
+    CardInfoPtr getCardFromMap(const CardNameMap &cardMap, const QString &cardName) const;
+    void checkUnknownSets();
+    void refreshCachedReverseRelatedCards();
+
+    QBasicMutex *reloadDatabaseMutex = new QBasicMutex(), *clearDatabaseMutex = new QBasicMutex(),
+                *loadFromFileMutex = new QBasicMutex(), *addCardMutex = new QBasicMutex(),
+                *removeCardMutex = new QBasicMutex();
+
+public:
+    static const char *TOKENS_SETNAME;
+
+    explicit CardDatabase(QObject *parent = nullptr);
+    ~CardDatabase() override;
+    void clear();
+    void removeCard(CardInfoPtr card);
+    CardInfoPtr getCard(const QString &cardName) const;
+    QList<CardInfoPtr> getCards(const QStringList &cardNames) const;
+    CardInfoPtr guessCard(const QString &cardName) const;
+
+    /*
+     * Get a card by its simple name. The name will be simplified in this
+     * function, so you don't need to simplify it beforehand.
+     */
+    CardInfoPtr getCardBySimpleName(const QString &cardName) const;
+
+    CardSetPtr getSet(const QString &setName);
+    QList<CardInfoPtr> getCardList() const
+    {
+        return cards.values();
+    }
+    SetList getSetList() const;
+    LoadStatus loadFromFile(const QString &fileName);
+    bool saveCustomTokensToFile();
+    QStringList getAllMainCardTypes() const;
+    LoadStatus getLoadStatus() const
+    {
+        return loadStatus;
+    }
+    void enableAllUnknownSets();
+    void markAllSetsAsKnown();
+    void notifyEnabledSetsChanged();
+
+public slots:
+    LoadStatus loadCardDatabases();
+    void addCard(CardInfoPtr card);
+    void addSet(CardSetPtr set);
+protected slots:
+    LoadStatus loadCardDatabase(const QString &path);
+signals:
+    void cardDatabaseLoadingFailed();
+    void cardDatabaseNewSetsFound(int numUnknownSets, QStringList unknownSetsNames);
+    void cardDatabaseAllNewSetsEnabled();
+    void cardDatabaseEnabledSetsChanged();
+    void cardAdded(CardInfoPtr card);
+    void cardRemoved(CardInfoPtr card);
+};
+
 class CardRelation : public QObject
 {
     Q_OBJECT

cockatrice/src/carddatabasemodel.cpp

@@ -1,6 +1,6 @@
-#include "card_database_model.h"
+#include "carddatabasemodel.h"
 
-#include "../filters/filter_tree.h"
+#include "filtertree.h"
 
 #include <QMap>
 
@@ -9,10 +9,9 @@
 CardDatabaseModel::CardDatabaseModel(CardDatabase *_db, bool _showOnlyCardsFromEnabledSets, QObject *parent)
     : QAbstractListModel(parent), db(_db), showOnlyCardsFromEnabledSets(_showOnlyCardsFromEnabledSets)
 {
-    connect(db, &CardDatabase::cardAdded, this, &CardDatabaseModel::cardAdded);
-    connect(db, &CardDatabase::cardRemoved, this, &CardDatabaseModel::cardRemoved);
-    connect(db, &CardDatabase::cardDatabaseEnabledSetsChanged, this,
-            &CardDatabaseModel::cardDatabaseEnabledSetsChanged);
+    connect(db, SIGNAL(cardAdded(CardInfoPtr)), this, SLOT(cardAdded(CardInfoPtr)));
+    connect(db, SIGNAL(cardRemoved(CardInfoPtr)), this, SLOT(cardRemoved(CardInfoPtr)));
+    connect(db, SIGNAL(cardDatabaseEnabledSetsChanged()), this, SLOT(cardDatabaseEnabledSetsChanged()));
 
     cardDatabaseEnabledSetsChanged();
 }
@@ -98,11 +97,9 @@ bool CardDatabaseModel::checkCardHasAtLeastOneEnabledSet(CardInfoPtr card)
     if (!showOnlyCardsFromEnabledSets)
         return true;
 
-    for (const auto &cardInfoPerSetList : card->getSets()) {
-        for (const auto &set : cardInfoPerSetList) {
-            if (set.getPtr()->getEnabled())
-                return true;
-        }
+    for (const auto &set : card->getSets()) {
+        if (set.getPtr()->getEnabled())
+            return true;
     }
 
     return false;
@@ -111,17 +108,15 @@ bool CardDatabaseModel::checkCardHasAtLeastOneEnabledSet(CardInfoPtr card)
 void CardDatabaseModel::cardDatabaseEnabledSetsChanged()
 {
     // remove all the cards no more present in at least one enabled set
-    for (const CardInfoPtr &card : cardList) {
-        if (!checkCardHasAtLeastOneEnabledSet(card)) {
+    foreach (CardInfoPtr card, cardList) {
+        if (!checkCardHasAtLeastOneEnabledSet(card))
             cardRemoved(card);
-        }
     }
 
     // re-check all the card currently not shown, maybe their part of a newly-enabled set
-    for (const CardInfoPtr &card : db->getCardList()) {
-        if (!cardListSet.contains(card)) {
+    foreach (CardInfoPtr card, db->getCardList()) {
+        if (!cardList.contains(card))
             cardAdded(card);
-        }
     }
 }
 
@@ -131,8 +126,7 @@ void CardDatabaseModel::cardAdded(CardInfoPtr card)
         // add the card if it's present in at least one enabled set
         beginInsertRows(QModelIndex(), cardList.size(), cardList.size());
         cardList.append(card);
-        cardListSet.insert(card);
-        connect(card.data(), &CardInfo::cardInfoChanged, this, &CardDatabaseModel::cardInfoChanged);
+        connect(card.data(), SIGNAL(cardInfoChanged(CardInfoPtr)), this, SLOT(cardInfoChanged(CardInfoPtr)));
         endInsertRows();
     }
 }
@@ -146,7 +140,6 @@ void CardDatabaseModel::cardRemoved(CardInfoPtr card)
 
     beginRemoveRows(QModelIndex(), row, row);
     disconnect(card.data(), nullptr, this, nullptr);
-    cardListSet.remove(card);
     card.clear();
     cardList.removeAt(row);
     endRemoveRows();
@@ -175,12 +168,7 @@ void CardDatabaseDisplayModel::fetchMore(const QModelIndex &index)
     int remainder = sourceModel()->rowCount(index) - loadedRowCount;
     int itemsToFetch = qMin(100, remainder);
 
-    if (itemsToFetch == 0) {
-        return;
-    }
-
-    const auto startIndex = qMin(rowCount(QModelIndex()), loadedRowCount);
-    beginInsertRows(QModelIndex(), startIndex, startIndex + itemsToFetch - 1);
+    beginInsertRows(QModelIndex(), loadedRowCount, loadedRowCount + itemsToFetch - 1);
 
     loadedRowCount += itemsToFetch;
     endInsertRows();
@@ -188,7 +176,7 @@ void CardDatabaseDisplayModel::fetchMore(const QModelIndex &index)
 
 int CardDatabaseDisplayModel::rowCount(const QModelIndex &parent) const
 {
-    return QSortFilterProxyModel::rowCount(parent);
+    return qMin(QSortFilterProxyModel::rowCount(parent), loadedRowCount);
 }
 
 bool CardDatabaseDisplayModel::lessThan(const QModelIndex &left, const QModelIndex &right) const
@@ -344,7 +332,7 @@ void CardDatabaseDisplayModel::setFilterTree(FilterTree *_filterTree)
         disconnect(this->filterTree, nullptr, this, nullptr);
 
     this->filterTree = _filterTree;
-    connect(this->filterTree, &FilterTree::changed, this, &CardDatabaseDisplayModel::filterTreeChanged);
+    connect(this->filterTree, SIGNAL(changed()), this, SLOT(filterTreeChanged()));
     invalidate();
 }
 

cockatrice/src/carddatabasemodel.h

@@ -1,8 +1,8 @@
 #ifndef CARDDATABASEMODEL_H
 #define CARDDATABASEMODEL_H
 
-#include "../filters/filter_string.h"
-#include "card_database.h"
+#include "carddatabase.h"
+#include "filter_string.h"
 
 #include <QAbstractListModel>
 #include <QList>
@@ -46,7 +46,6 @@ public:
 
 private:
     QList<CardInfoPtr> cardList;
-    QSet<CardInfoPtr> cardListSet; // Supports faster lookups in cardDatabaseEnabledSetsChanged()
     CardDatabase *db;
     bool showOnlyCardsFromEnabledSets;
 
@@ -117,15 +116,14 @@ public:
     }
     void clearFilterAll();
     int rowCount(const QModelIndex &parent = QModelIndex()) const override;
-    bool canFetchMore(const QModelIndex &parent) const override;
-    void fetchMore(const QModelIndex &parent) override;
 
 protected:
     bool lessThan(const QModelIndex &left, const QModelIndex &right) const override;
     static int lessThanNumerically(const QString &left, const QString &right);
     bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override;
     bool rowMatchesCardName(CardInfoPtr info) const;
-
+    bool canFetchMore(const QModelIndex &parent) const override;
+    void fetchMore(const QModelIndex &parent) override;
 private slots:
     void filterTreeChanged();
     /** Will translate all undesirable characters in DIRTYNAME according to the TABLE. */

cockatrice/src/carddbparser/carddatabaseparser.cpp

@@ -1,4 +1,4 @@
-#include "card_database_parser.h"
+#include "carddatabaseparser.h"
 
 SetNameMap ICardDatabaseParser::sets;
 
@@ -10,8 +10,7 @@ void ICardDatabaseParser::clearSetlist()
 CardSetPtr ICardDatabaseParser::internalAddSet(const QString &setName,
                                                const QString &longName,
                                                const QString &setType,
-                                               const QDate &releaseDate,
-                                               const CardSet::Priority priority)
+                                               const QDate &releaseDate)
 {
     if (sets.contains(setName)) {
         return sets.value(setName);
@@ -21,9 +20,8 @@ CardSetPtr ICardDatabaseParser::internalAddSet(const QString &setName,
     newSet->setLongName(longName);
     newSet->setSetType(setType);
     newSet->setReleaseDate(releaseDate);
-    newSet->setPriority(priority);
 
     sets.insert(setName, newSet);
     emit addSet(newSet);
     return newSet;
-}
+}

cockatrice/src/carddbparser/carddatabaseparser.h

@@ -1,7 +1,7 @@
 #ifndef CARDDATABASE_PARSER_H
 #define CARDDATABASE_PARSER_H
 
-#include "../card_database.h"
+#include "../carddatabase.h"
 
 #include <QIODevice>
 #include <QString>
@@ -10,7 +10,6 @@
 
 class ICardDatabaseParser : public QObject
 {
-    Q_OBJECT
 public:
     ~ICardDatabaseParser() override = default;
 
@@ -33,13 +32,12 @@ protected:
     CardSetPtr internalAddSet(const QString &setName,
                               const QString &longName = "",
                               const QString &setType = "",
-                              const QDate &releaseDate = QDate(),
-                              const CardSet::Priority priority = CardSet::PriorityFallback);
+                              const QDate &releaseDate = QDate());
 signals:
-    void addCard(CardInfoPtr card);
-    void addSet(CardSetPtr set);
+    virtual void addCard(CardInfoPtr card) = 0;
+    virtual void addSet(CardSetPtr set) = 0;
 };
 
 Q_DECLARE_INTERFACE(ICardDatabaseParser, "ICardDatabaseParser")
 
-#endif
+#endif

cockatrice/src/carddbparser/cockatricexml3.cpp

@@ -1,4 +1,4 @@
-#include "cockatrice_xml_3.h"
+#include "cockatricexml3.h"
 
 #include <QCoreApplication>
 #include <QDebug>
@@ -13,10 +13,10 @@
 
 bool CockatriceXml3Parser::getCanParseFile(const QString &fileName, QIODevice &device)
 {
-    qCInfo(CockatriceXml3Log) << "Trying to parse: " << fileName;
+    qDebug() << "[CockatriceXml3Parser] Trying to parse: " << fileName;
 
     if (!fileName.endsWith(".xml", Qt::CaseInsensitive)) {
-        qCInfo(CockatriceXml3Log) << "Parsing failed: wrong extension";
+        qDebug() << "[CockatriceXml3Parser] Parsing failed: wrong extension";
         return false;
     }
 
@@ -28,12 +28,12 @@ bool CockatriceXml3Parser::getCanParseFile(const QString &fileName, QIODevice &d
                 if (version == COCKATRICE_XML3_TAGVER) {
                     return true;
                 } else {
-                    qCInfo(CockatriceXml3Log) << "Parsing failed: wrong version" << version;
+                    qDebug() << "[CockatriceXml3Parser] Parsing failed: wrong version" << version;
                     return false;
                 }
 
             } else {
-                qCInfo(CockatriceXml3Log) << "Parsing failed: wrong element tag" << xml.name();
+                qDebug() << "[CockatriceXml3Parser] Parsing failed: wrong element tag" << xml.name();
                 return false;
             }
         }
@@ -58,7 +58,7 @@ void CockatriceXml3Parser::parseFile(QIODevice &device)
                 } else if (name == "cards") {
                     loadCardsFromXml(xml);
                 } else if (!name.isEmpty()) {
-                    qCInfo(CockatriceXml3Log) << "Unknown item" << name << ", trying to continue anyway";
+                    qDebug() << "[CockatriceXml3Parser] Unknown item" << name << ", trying to continue anyway";
                     xml.skipCurrentElement();
                 }
             }
@@ -93,7 +93,7 @@ void CockatriceXml3Parser::loadSetsFromXml(QXmlStreamReader &xml)
                     releaseDate =
                         QDate::fromString(xml.readElementText(QXmlStreamReader::IncludeChildElements), Qt::ISODate);
                 } else if (!name.isEmpty()) {
-                    qCInfo(CockatriceXml3Log) << "Unknown set property" << name << ", trying to continue anyway";
+                    qDebug() << "[CockatriceXml3Parser] Unknown set property" << name << ", trying to continue anyway";
                     xml.skipCurrentElement();
                 }
             }
@@ -158,7 +158,6 @@ void CockatriceXml3Parser::loadCardsFromXml(QXmlStreamReader &xml)
             auto _sets = CardInfoPerSetMap();
             int tableRow = 0;
             bool cipt = false;
-            bool landscapeOrientation = false;
             bool isToken = false;
             bool upsideDown = false;
 
@@ -173,7 +172,7 @@ void CockatriceXml3Parser::loadCardsFromXml(QXmlStreamReader &xml)
                     name = xml.readElementText(QXmlStreamReader::IncludeChildElements);
                 } else if (xmlName == "text") {
                     text = xml.readElementText(QXmlStreamReader::IncludeChildElements);
-                } else if (xmlName == "color" || xmlName == "colors") {
+                } else if (xmlName == "color") {
                     colors.append(xml.readElementText(QXmlStreamReader::IncludeChildElements));
                 } else if (xmlName == "token") {
                     isToken = static_cast<bool>(xml.readElementText(QXmlStreamReader::IncludeChildElements).toInt());
@@ -195,8 +194,6 @@ void CockatriceXml3Parser::loadCardsFromXml(QXmlStreamReader &xml)
                     tableRow = xml.readElementText(QXmlStreamReader::IncludeChildElements).toInt();
                 } else if (xmlName == "cipt") {
                     cipt = (xml.readElementText(QXmlStreamReader::IncludeChildElements) == "1");
-                } else if (xmlName == "landscapeOrientation") {
-                    landscapeOrientation = (xml.readElementText(QXmlStreamReader::IncludeChildElements) == "1");
                 } else if (xmlName == "upsidedown") {
                     upsideDown = (xml.readElementText(QXmlStreamReader::IncludeChildElements) == "1");
                     // sets
@@ -224,7 +221,7 @@ void CockatriceXml3Parser::loadCardsFromXml(QXmlStreamReader &xml)
                     if (attrs.hasAttribute("rarity")) {
                         setInfo.setProperty("rarity", attrs.value("rarity").toString());
                     }
-                    _sets[setName].append(setInfo);
+                    _sets.insert(setName, setInfo);
                     // related cards
                 } else if (xmlName == "related" || xmlName == "reverse-related") {
                     CardRelation::AttachType attach = CardRelation::DoesNotAttach;
@@ -263,15 +260,15 @@ void CockatriceXml3Parser::loadCardsFromXml(QXmlStreamReader &xml)
                         relatedCards << relation;
                     }
                 } else if (!xmlName.isEmpty()) {
-                    qCInfo(CockatriceXml3Log) << "Unknown card property" << xmlName << ", trying to continue anyway";
+                    qDebug() << "[CockatriceXml3Parser] Unknown card property" << xmlName
+                             << ", trying to continue anyway";
                     xml.skipCurrentElement();
                 }
             }
 
             properties.insert("colors", colors);
-            CardInfoPtr newCard =
-                CardInfo::newInstance(name, text, isToken, properties, relatedCards, reverseRelatedCards, _sets, cipt,
-                                      landscapeOrientation, tableRow, upsideDown);
+            CardInfoPtr newCard = CardInfo::newInstance(name, text, isToken, properties, relatedCards,
+                                                        reverseRelatedCards, _sets, cipt, tableRow, upsideDown);
             emit addCard(newCard);
         }
     }
@@ -280,7 +277,7 @@ void CockatriceXml3Parser::loadCardsFromXml(QXmlStreamReader &xml)
 static QXmlStreamWriter &operator<<(QXmlStreamWriter &xml, const CardSetPtr &set)
 {
     if (set.isNull()) {
-        qCWarning(CockatriceXml3Log) << "&operator<< set is nullptr";
+        qDebug() << "&operator<< set is nullptr";
         return xml;
     }
 
@@ -297,7 +294,7 @@ static QXmlStreamWriter &operator<<(QXmlStreamWriter &xml, const CardSetPtr &set
 static QXmlStreamWriter &operator<<(QXmlStreamWriter &xml, const CardInfoPtr &info)
 {
     if (info.isNull()) {
-        qCWarning(CockatriceXml3Log) << "operator<< info is nullptr";
+        qDebug() << "operator<< info is nullptr";
         return xml;
     }
 
@@ -334,26 +331,24 @@ static QXmlStreamWriter &operator<<(QXmlStreamWriter &xml, const CardInfoPtr &in
 
     // sets
     const CardInfoPerSetMap sets = info->getSets();
-    for (const auto &cardInfoPerSetList : sets) {
-        for (const CardInfoPerSet &set : cardInfoPerSetList) {
-            xml.writeStartElement("set");
-            xml.writeAttribute("rarity", set.getProperty("rarity"));
-            xml.writeAttribute("muId", set.getProperty("muid"));
-            xml.writeAttribute("uuId", set.getProperty("uuid"));
+    for (CardInfoPerSet set : sets) {
+        xml.writeStartElement("set");
+        xml.writeAttribute("rarity", set.getProperty("rarity"));
+        xml.writeAttribute("muId", set.getProperty("muid"));
+        xml.writeAttribute("uuId", set.getProperty("uuid"));
 
-            tmpString = set.getProperty("num");
-            if (!tmpString.isEmpty()) {
-                xml.writeAttribute("num", tmpString);
-            }
-
-            tmpString = set.getProperty("picurl");
-            if (!tmpString.isEmpty()) {
-                xml.writeAttribute("picURL", tmpString);
-            }
-
-            xml.writeCharacters(set.getPtr()->getShortName());
-            xml.writeEndElement();
+        tmpString = set.getProperty("num");
+        if (!tmpString.isEmpty()) {
+            xml.writeAttribute("num", tmpString);
         }
+
+        tmpString = set.getProperty("picurl");
+        if (!tmpString.isEmpty()) {
+            xml.writeAttribute("picURL", tmpString);
+        }
+
+        xml.writeCharacters(set.getPtr()->getShortName());
+        xml.writeEndElement();
     }
 
     // related cards
@@ -408,9 +403,6 @@ static QXmlStreamWriter &operator<<(QXmlStreamWriter &xml, const CardInfoPtr &in
     if (info->getCipt()) {
         xml.writeTextElement("cipt", "1");
     }
-    if (info->getLandscapeOrientation()) {
-        xml.writeTextElement("landscapeOrientation", "1");
-    }
     if (info->getUpsideDownArt()) {
         xml.writeTextElement("upsidedown", "1");
     }

cockatrice/src/carddbparser/cockatricexml3.h

@@ -1,13 +1,10 @@
 #ifndef COCKATRICE_XML3_H
 #define COCKATRICE_XML3_H
 
-#include "card_database_parser.h"
+#include "carddatabaseparser.h"
 
-#include <QLoggingCategory>
 #include <QXmlStreamReader>
 
-inline Q_LOGGING_CATEGORY(CockatriceXml3Log, "cockatrice_xml.xml_3_parser");
-
 class CockatriceXml3Parser : public ICardDatabaseParser
 {
     Q_OBJECT
@@ -27,6 +24,9 @@ private:
     void loadCardsFromXml(QXmlStreamReader &xml);
     void loadSetsFromXml(QXmlStreamReader &xml);
     QString getMainCardType(QString &type);
+signals:
+    void addCard(CardInfoPtr card) override;
+    void addSet(CardSetPtr set) override;
 };
 
 #endif

cockatrice/src/carddbparser/cockatricexml4.cpp

@@ -1,6 +1,4 @@
-#include "cockatrice_xml_4.h"
-
-#include "../../../settings/cache_settings.h"
+#include "cockatricexml4.h"
 
 #include <QCoreApplication>
 #include <QDebug>
@@ -15,10 +13,10 @@
 
 bool CockatriceXml4Parser::getCanParseFile(const QString &fileName, QIODevice &device)
 {
-    qCInfo(CockatriceXml4Log) << "Trying to parse: " << fileName;
+    qDebug() << "[CockatriceXml4Parser] Trying to parse: " << fileName;
 
     if (!fileName.endsWith(".xml", Qt::CaseInsensitive)) {
-        qCInfo(CockatriceXml4Log) << "Parsing failed: wrong extension";
+        qDebug() << "[CockatriceXml4Parser] Parsing failed: wrong extension";
         return false;
     }
 
@@ -30,12 +28,12 @@ bool CockatriceXml4Parser::getCanParseFile(const QString &fileName, QIODevice &d
                 if (version == COCKATRICE_XML4_TAGVER) {
                     return true;
                 } else {
-                    qCInfo(CockatriceXml4Log) << "Parsing failed: wrong version" << version;
+                    qDebug() << "[CockatriceXml4Parser] Parsing failed: wrong version" << version;
                     return false;
                 }
 
             } else {
-                qCInfo(CockatriceXml4Log) << "Parsing failed: wrong element tag" << xml.name();
+                qDebug() << "[CockatriceXml4Parser] Parsing failed: wrong element tag" << xml.name();
                 return false;
             }
         }
@@ -60,7 +58,7 @@ void CockatriceXml4Parser::parseFile(QIODevice &device)
                 } else if (xmlName == "cards") {
                     loadCardsFromXml(xml);
                 } else if (!xmlName.isEmpty()) {
-                    qCInfo(CockatriceXml4Log) << "Unknown item" << xmlName << ", trying to continue anyway";
+                    qDebug() << "[CockatriceXml4Parser] Unknown item" << xmlName << ", trying to continue anyway";
                     xml.skipCurrentElement();
                 }
             }
@@ -79,7 +77,6 @@ void CockatriceXml4Parser::loadSetsFromXml(QXmlStreamReader &xml)
         if (xmlName == "set") {
             QString shortName, longName, setType;
             QDate releaseDate;
-            short priority;
             while (!xml.atEnd()) {
                 if (xml.readNext() == QXmlStreamReader::EndElement) {
                     break;
@@ -95,15 +92,14 @@ void CockatriceXml4Parser::loadSetsFromXml(QXmlStreamReader &xml)
                 } else if (xmlName == "releasedate") {
                     releaseDate =
                         QDate::fromString(xml.readElementText(QXmlStreamReader::IncludeChildElements), Qt::ISODate);
-                } else if (xmlName == "priority") {
-                    priority = xml.readElementText(QXmlStreamReader::IncludeChildElements).toShort();
                 } else if (!xmlName.isEmpty()) {
-                    qCInfo(CockatriceXml4Log) << "Unknown set property" << xmlName << ", trying to continue anyway";
+                    qDebug() << "[CockatriceXml4Parser] Unknown set property" << xmlName
+                             << ", trying to continue anyway";
                     xml.skipCurrentElement();
                 }
             }
 
-            internalAddSet(shortName, longName, setType, releaseDate, static_cast<CardSet::Priority>(priority));
+            internalAddSet(shortName, longName, setType, releaseDate);
         }
     }
 }
@@ -126,7 +122,6 @@ QVariantHash CockatriceXml4Parser::loadCardPropertiesFromXml(QXmlStreamReader &x
 
 void CockatriceXml4Parser::loadCardsFromXml(QXmlStreamReader &xml)
 {
-    bool includeRebalancedCards = SettingsCache::instance().getIncludeRebalancedCards();
     while (!xml.atEnd()) {
         if (xml.readNext() == QXmlStreamReader::EndElement) {
             break;
@@ -142,7 +137,6 @@ void CockatriceXml4Parser::loadCardsFromXml(QXmlStreamReader &xml)
             auto _sets = CardInfoPerSetMap();
             int tableRow = 0;
             bool cipt = false;
-            bool landscapeOrientation = false;
             bool isToken = false;
             bool upsideDown = false;
 
@@ -168,8 +162,6 @@ void CockatriceXml4Parser::loadCardsFromXml(QXmlStreamReader &xml)
                     tableRow = xml.readElementText(QXmlStreamReader::IncludeChildElements).toInt();
                 } else if (xmlName == "cipt") {
                     cipt = (xml.readElementText(QXmlStreamReader::IncludeChildElements) == "1");
-                } else if (xmlName == "landscapeOrientation") {
-                    landscapeOrientation = (xml.readElementText(QXmlStreamReader::IncludeChildElements) == "1");
                 } else if (xmlName == "upsidedown") {
                     upsideDown = (xml.readElementText(QXmlStreamReader::IncludeChildElements) == "1");
                     // sets
@@ -186,17 +178,7 @@ void CockatriceXml4Parser::loadCardsFromXml(QXmlStreamReader &xml)
                                 attrName = "picurl";
                             setInfo.setProperty(attrName, attr.value().toString());
                         }
-
-                        // This is very much a hack and not the right place to
-                        // put this check, as it requires a reload of Cockatrice
-                        // to be apply.
-                        //
-                        // However, this is also true of the `set->getEnabled()`
-                        // check above (which is currently bugged as well), so
-                        // we'll fix both at the same time.
-                        if (includeRebalancedCards || setInfo.getProperty("isRebalanced") != "true") {
-                            _sets[setName].append(setInfo);
-                        }
+                        _sets.insert(setName, setInfo);
                     }
                     // related cards
                 } else if (xmlName == "related" || xmlName == "reverse-related") {
@@ -242,14 +224,14 @@ void CockatriceXml4Parser::loadCardsFromXml(QXmlStreamReader &xml)
                         relatedCards << relation;
                     }
                 } else if (!xmlName.isEmpty()) {
-                    qCInfo(CockatriceXml4Log) << "Unknown card property" << xmlName << ", trying to continue anyway";
+                    qDebug() << "[CockatriceXml4Parser] Unknown card property" << xmlName
+                             << ", trying to continue anyway";
                     xml.skipCurrentElement();
                 }
             }
 
-            CardInfoPtr newCard =
-                CardInfo::newInstance(name, text, isToken, properties, relatedCards, reverseRelatedCards, _sets, cipt,
-                                      landscapeOrientation, tableRow, upsideDown);
+            CardInfoPtr newCard = CardInfo::newInstance(name, text, isToken, properties, relatedCards,
+                                                        reverseRelatedCards, _sets, cipt, tableRow, upsideDown);
             emit addCard(newCard);
         }
     }
@@ -258,7 +240,7 @@ void CockatriceXml4Parser::loadCardsFromXml(QXmlStreamReader &xml)
 static QXmlStreamWriter &operator<<(QXmlStreamWriter &xml, const CardSetPtr &set)
 {
     if (set.isNull()) {
-        qCWarning(CockatriceXml4Log) << "&operator<< set is nullptr";
+        qDebug() << "&operator<< set is nullptr";
         return xml;
     }
 
@@ -267,7 +249,6 @@ static QXmlStreamWriter &operator<<(QXmlStreamWriter &xml, const CardSetPtr &set
     xml.writeTextElement("longname", set->getLongName());
     xml.writeTextElement("settype", set->getSetType());
     xml.writeTextElement("releasedate", set->getReleaseDate().toString(Qt::ISODate));
-    xml.writeTextElement("priority", QString::number(set->getPriority()));
     xml.writeEndElement();
 
     return xml;
@@ -276,7 +257,7 @@ static QXmlStreamWriter &operator<<(QXmlStreamWriter &xml, const CardSetPtr &set
 static QXmlStreamWriter &operator<<(QXmlStreamWriter &xml, const CardInfoPtr &info)
 {
     if (info.isNull()) {
-        qCWarning(CockatriceXml4Log) << "operator<< info is nullptr";
+        qDebug() << "operator<< info is nullptr";
         return xml;
     }
 
@@ -299,16 +280,14 @@ static QXmlStreamWriter &operator<<(QXmlStreamWriter &xml, const CardInfoPtr &in
     xml.writeEndElement();
 
     // sets
-    for (const auto &cardInfoPerSetList : info->getSets()) {
-        for (const CardInfoPerSet &set : cardInfoPerSetList) {
-            xml.writeStartElement("set");
-            for (const QString &propName : set.getProperties()) {
-                xml.writeAttribute(propName, set.getProperty(propName));
-            }
-
-            xml.writeCharacters(set.getPtr()->getShortName());
-            xml.writeEndElement();
+    for (CardInfoPerSet set : info->getSets()) {
+        xml.writeStartElement("set");
+        for (QString propName : set.getProperties()) {
+            xml.writeAttribute(propName, set.getProperty(propName));
         }
+
+        xml.writeCharacters(set.getPtr()->getShortName());
+        xml.writeEndElement();
     }
 
     // related cards
@@ -368,9 +347,6 @@ static QXmlStreamWriter &operator<<(QXmlStreamWriter &xml, const CardInfoPtr &in
     if (info->getCipt()) {
         xml.writeTextElement("cipt", "1");
     }
-    if (info->getLandscapeOrientation()) {
-        xml.writeTextElement("landscapeOrientation", "1");
-    }
     if (info->getUpsideDownArt()) {
         xml.writeTextElement("upsidedown", "1");
     }

cockatrice/src/carddbparser/cockatricexml4.h

@@ -1,13 +1,10 @@
 #ifndef COCKATRICE_XML4_H
 #define COCKATRICE_XML4_H
 
-#include "card_database_parser.h"
+#include "carddatabaseparser.h"
 
-#include <QLoggingCategory>
 #include <QXmlStreamReader>
 
-inline Q_LOGGING_CATEGORY(CockatriceXml4Log, "cockatrice_xml.xml_4_parser");
-
 class CockatriceXml4Parser : public ICardDatabaseParser
 {
     Q_OBJECT
@@ -27,6 +24,9 @@ private:
     QVariantHash loadCardPropertiesFromXml(QXmlStreamReader &xml);
     void loadCardsFromXml(QXmlStreamReader &xml);
     void loadSetsFromXml(QXmlStreamReader &xml);
+signals:
+    void addCard(CardInfoPtr card) override;
+    void addSet(CardSetPtr set) override;
 };
 
 #endif

cockatrice/src/carddragitem.cpp

@@ -1,10 +1,10 @@
-#include "card_drag_item.h"
+#include "carddragitem.h"
 
-#include "../game_scene.h"
-#include "../zones/card_zone.h"
-#include "../zones/table_zone.h"
-#include "../zones/view_zone.h"
-#include "card_item.h"
+#include "carditem.h"
+#include "cardzone.h"
+#include "gamescene.h"
+#include "tablezone.h"
+#include "zoneviewzone.h"
 
 #include <QCursor>
 #include <QGraphicsSceneMouseEvent>
@@ -53,20 +53,8 @@ void CardDragItem::updatePosition(const QPointF &cursorScenePos)
 
     QPointF zonePos = currentZone->scenePos();
     QPointF cursorPosInZone = cursorScenePos - zonePos;
-
-    // If we are on a Table, we center the card around the cursor, because we
-    // snap it into place and no longer see it being dragged.
-    //
-    // For other zones (where we do display the card under the cursor), we use
-    // the hotspot to feel like the card was dragged at the corresponding
-    // position.
-    TableZone *tableZone = qobject_cast<TableZone *>(cursorZone);
-    QPointF closestGridPoint;
-    if (tableZone)
-        closestGridPoint = tableZone->closestGridPoint(cursorPosInZone);
-    else
-        closestGridPoint = cursorPosInZone - hotSpot;
-
+    QPointF cardTopLeft = cursorPosInZone - hotSpot;
+    QPointF closestGridPoint = cursorZone->closestGridPoint(cardTopLeft);
     QPointF newPos = zonePos + closestGridPoint;
 
     if (newPos != pos()) {
@@ -96,23 +84,17 @@ void CardDragItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
     QList<CardDragItem *> dragItemList;
     CardZone *startZone = static_cast<CardItem *>(item)->getZone();
     if (currentZone && !(static_cast<CardItem *>(item)->getAttachedTo() && (startZone == currentZone))) {
-        if (!occupied) {
-            dragItemList.append(this);
-        }
-
+        dragItemList.append(this);
         for (int i = 0; i < childDrags.size(); i++) {
             CardDragItem *c = static_cast<CardDragItem *>(childDrags[i]);
-            if (!occupied && !(static_cast<CardItem *>(c->item)->getAttachedTo() && (startZone == currentZone)) &&
-                !c->occupied) {
+            if (!(static_cast<CardItem *>(c->item)->getAttachedTo() && (startZone == currentZone)) && !c->occupied)
                 dragItemList.append(c);
-            }
             sc->removeItem(c);
         }
     }
 
-    if (currentZone) {
+    if (currentZone)
         currentZone->handleDropEvent(dragItemList, startZone, (sp - currentZone->scenePos()).toPoint());
-    }
 
     event->accept();
 }

cockatrice/src/carddragitem.h

@@ -1,7 +1,7 @@
 #ifndef CARDDRAGITEM_H
 #define CARDDRAGITEM_H
 
-#include "abstract_card_drag_item.h"
+#include "abstractcarddragitem.h"
 
 class CardItem;
 
@@ -28,11 +28,11 @@ public:
     {
         return faceDown;
     }
-    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
-    void updatePosition(const QPointF &cursorScenePos) override;
+    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
+    void updatePosition(const QPointF &cursorScenePos);
 
 protected:
-    void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override;
+    void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
 };
 
 #endif

cockatrice/src/cardfilter.cpp

@@ -1,4 +1,4 @@
-#include "filter_card.h"
+#include "cardfilter.h"
 
 const QString CardFilter::typeName(Type t)
 {