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
c6078c38
Commit
c6078c38
authored
Jun 21, 2014
by
Fabio Bas
Browse files
Strip { } around mana cost
parent
075c743a
Changes
2
Hide whitespace changes
Inline
Side-by-side
oracle/src/oracleimporter.cpp
View file @
c6078c38
...
...
@@ -53,7 +53,7 @@ CardInfo *OracleImporter::addCard(const QString &setName,
QString
cardName
,
bool
isToken
,
int
cardId
,
const
QString
&
cardCost
,
QString
&
cardCost
,
const
QString
&
cardType
,
const
QString
&
cardPT
,
int
cardLoyalty
,
...
...
@@ -69,7 +69,11 @@ CardInfo *OracleImporter::addCard(const QString &setName,
if
(
cardName
.
contains
(
"XX"
))
cardName
.
remove
(
"XX"
);
cardName
=
cardName
.
replace
(
"Æ"
,
"AE"
);
cardName
=
cardName
.
replace
(
"’"
,
"'"
);
cardName
=
cardName
.
replace
(
"’"
,
"'"
);
// Remove {} around mana costs
cardCost
.
remove
(
QChar
(
'{'
));
cardCost
.
remove
(
QChar
(
'}'
));
CardInfo
*
card
;
if
(
cardHash
.
contains
(
cardName
))
{
...
...
oracle/src/oracleimporter.h
View file @
c6078c38
...
...
@@ -28,7 +28,7 @@ private:
QVariantMap
setsMap
;
QString
dataDir
;
CardInfo
*
addCard
(
const
QString
&
setName
,
QString
cardName
,
bool
isToken
,
int
cardId
,
const
QString
&
cardCost
,
const
QString
&
cardType
,
const
QString
&
cardPT
,
int
cardLoyalty
,
const
QStringList
&
cardText
);
CardInfo
*
addCard
(
const
QString
&
setName
,
QString
cardName
,
bool
isToken
,
int
cardId
,
QString
&
cardCost
,
const
QString
&
cardType
,
const
QString
&
cardPT
,
int
cardLoyalty
,
const
QStringList
&
cardText
);
signals:
void
setIndexChanged
(
int
cardsImported
,
int
setIndex
,
const
QString
&
setName
);
void
dataReadProgress
(
int
bytesRead
,
int
totalBytes
);
...
...
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