Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Donald Haase
Cockatrice
Commits
acb9bc20
"git@gitlab.completext.com:quzar/Cockatrice.git" did not exist on "9a34d7b929da4fd4456fcf944c0b08c2a7a1ff62"
Commit
acb9bc20
authored
Jan 29, 2015
by
Gavin Bises
Browse files
Fix #640 - don't add muid-0 cards to splitCards map
parent
6fa34c6c
Changes
1
Hide whitespace changes
Inline
Side-by-side
oracle/src/oracleimporter.cpp
View file @
acb9bc20
...
@@ -187,6 +187,7 @@ int OracleImporter::importTextSpoiler(CardSet *set, const QVariant &data)
...
@@ -187,6 +187,7 @@ int OracleImporter::importTextSpoiler(CardSet *set, const QVariant &data)
// add first card's data
// add first card's data
cardName
=
card1
->
contains
(
"name"
)
?
card1
->
value
(
"name"
).
toString
()
:
QString
(
""
);
cardName
=
card1
->
contains
(
"name"
)
?
card1
->
value
(
"name"
).
toString
()
:
QString
(
""
);
cardCost
=
card1
->
contains
(
"manaCost"
)
?
card1
->
value
(
"manaCost"
).
toString
()
:
QString
(
""
);
cardCost
=
card1
->
contains
(
"manaCost"
)
?
card1
->
value
(
"manaCost"
).
toString
()
:
QString
(
""
);
cmc
=
card1
->
contains
(
"cmc"
)
?
card1
->
value
(
"cmc"
).
toString
()
:
QString
(
""
);
cardType
=
card1
->
contains
(
"type"
)
?
card1
->
value
(
"type"
).
toString
()
:
QString
(
""
);
cardType
=
card1
->
contains
(
"type"
)
?
card1
->
value
(
"type"
).
toString
()
:
QString
(
""
);
cardPT
=
card1
->
contains
(
"power"
)
||
card1
->
contains
(
"toughness"
)
?
card1
->
value
(
"power"
).
toString
()
+
QString
(
'/'
)
+
card1
->
value
(
"toughness"
).
toString
()
:
QString
(
""
);
cardPT
=
card1
->
contains
(
"power"
)
||
card1
->
contains
(
"toughness"
)
?
card1
->
value
(
"power"
).
toString
()
+
QString
(
'/'
)
+
card1
->
value
(
"toughness"
).
toString
()
:
QString
(
""
);
cardText
=
card1
->
contains
(
"text"
)
?
card1
->
value
(
"text"
).
toString
()
:
QString
(
""
);
cardText
=
card1
->
contains
(
"text"
)
?
card1
->
value
(
"text"
).
toString
()
:
QString
(
""
);
...
@@ -199,8 +200,10 @@ int OracleImporter::importTextSpoiler(CardSet *set, const QVariant &data)
...
@@ -199,8 +200,10 @@ int OracleImporter::importTextSpoiler(CardSet *set, const QVariant &data)
cardPT
+=
card2
->
contains
(
"power"
)
||
card2
->
contains
(
"toughness"
)
?
QString
(
" // "
)
+
card2
->
value
(
"power"
).
toString
()
+
QString
(
'/'
)
+
card2
->
value
(
"toughness"
).
toString
()
:
QString
(
""
);
cardPT
+=
card2
->
contains
(
"power"
)
||
card2
->
contains
(
"toughness"
)
?
QString
(
" // "
)
+
card2
->
value
(
"power"
).
toString
()
+
QString
(
'/'
)
+
card2
->
value
(
"toughness"
).
toString
()
:
QString
(
""
);
cardText
+=
card2
->
contains
(
"text"
)
?
QString
(
"
\n\n
---
\n\n
"
)
+
card2
->
value
(
"text"
).
toString
()
:
QString
(
""
);
cardText
+=
card2
->
contains
(
"text"
)
?
QString
(
"
\n\n
---
\n\n
"
)
+
card2
->
value
(
"text"
).
toString
()
:
QString
(
""
);
}
else
{
}
else
{
// first card od a pair; enqueue for later merging
// first card of a pair; enqueue for later merging
splitCards
.
insert
(
cardId
,
map
);
// Conditional on cardId because promo prints have no muid - see #640
if
(
cardId
)
splitCards
.
insert
(
cardId
,
map
);
continue
;
continue
;
}
}
}
else
{
}
else
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment