jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-30 10:33:54 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix prepare cards (#6792)
Some checks are pending
Build Desktop / Configure (push) Waiting to run
Details
Build Desktop / Debian 11 (push) Blocked by required conditions
Details
Build Desktop / Debian 13 (push) Blocked by required conditions
Details
Build Desktop / Debian 12 (push) Blocked by required conditions
Details
Build Desktop / Fedora 43 (push) Blocked by required conditions
Details
Build Desktop / Fedora 42 (push) Blocked by required conditions
Details
Build Desktop / Servatrice_Debian 11 (push) Blocked by required conditions
Details
Build Desktop / Ubuntu 24.04 (push) Blocked by required conditions
Details
Build Desktop / Ubuntu 26.04 (push) Blocked by required conditions
Details
Build Desktop / Ubuntu 22.04 (push) Blocked by required conditions
Details
Build Desktop / Arch (push) Blocked by required conditions
Details
Build Desktop / macOS 14 (push) Blocked by required conditions
Details
Build Desktop / macOS 15 (push) Blocked by required conditions
Details
Build Desktop / macOS 13 Intel (push) Blocked by required conditions
Details
Build Desktop / macOS 15 Debug (push) Blocked by required conditions
Details
Build Desktop / Windows 10 (push) Blocked by required conditions
Details
Build Docker Image / amd64 & arm64 (push) Waiting to run
Details

Browse source
This commit is contained in:
ebbit1q 2026-04-10 13:42:05 +02:00 • committed by GitHub
parent 9aa5702e14
commit d2732ac742
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
oracle/src/oracleimporter.cpp
View file

@ -360,13 +360,13 @@ int OracleImporter::importCardsFromSet(const CardSetPtr &currentSet, const QList
} }
// split cards are considered a single card, enqueue for later merging // split cards are considered a single card, enqueue for later merging
if (layout == "split" || layout == "aftermath" || layout == "adventure") { if (layout == "split" || layout == "aftermath" || layout == "adventure" || layout == "prepare") {
auto _faceName = getStringPropertyFromMap(card, "faceName"); auto _faceName = getStringPropertyFromMap(card, "faceName");
SplitCardPart split(_faceName, text, properties, printingInfo); SplitCardPart split(_faceName, text, properties, printingInfo);
auto found_iter = splitCards.find(name + numProperty); auto found_iter = splitCards.find(name + numProperty);
if (found_iter == splitCards.end()) { if (found_iter == splitCards.end()) {
splitCards.insert(name + numProperty, {{split}, name}); splitCards.insert(name + numProperty, {{split}, name});
} else if (layout == "adventure") { } else if (layout == "adventure" || layout == "prepare") {
found_iter->first.insert(0, split); found_iter->first.insert(0, split);
} else { } else {
found_iter->first.append(split); found_iter->first.append(split);