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
e955732b
Commit
e955732b
authored
Jul 01, 2014
by
Gavin Bisesi
Browse files
Merge pull request #163 from arxanas/vanguard-card-names
Fix #155: Vanguard card names no longer conflict with regular card names.
parents
4d6f46b0
f730dca1
Changes
1
Show whitespace changes
Inline
Side-by-side
oracle/src/oracleimporter.cpp
View file @
e955732b
...
...
@@ -197,6 +197,11 @@ int OracleImporter::importTextSpoiler(CardSet *set, const QVariant &data)
cardText
=
map
.
contains
(
"text"
)
?
map
.
value
(
"text"
).
toString
()
:
QString
(
""
);
cardId
=
map
.
contains
(
"multiverseid"
)
?
map
.
value
(
"multiverseid"
).
toInt
()
:
0
;
cardLoyalty
=
map
.
contains
(
"loyalty"
)
?
map
.
value
(
"loyalty"
).
toInt
()
:
0
;
// Distinguish Vanguard cards from regular cards of the same name.
if
(
map
.
value
(
"layout"
)
==
"vanguard"
)
{
cardName
+=
" Avatar"
;
}
}
CardInfo
*
card
=
addCard
(
set
->
getShortName
(),
cardName
,
false
,
cardId
,
cardCost
,
cardType
,
cardPT
,
cardLoyalty
,
cardText
.
split
(
"
\n
"
));
...
...
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