Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add in-play golden frames #134

Merged
merged 2 commits into from
Sep 18, 2016
Merged

Add in-play golden frames #134

merged 2 commits into from
Sep 18, 2016

Conversation

andburn
Copy link
Member

@andburn andburn commented Sep 13, 2016

  • Adds images for golden in-play minions
  • Adds class colours to golden cards (uses css filters so the colours aren't 100% correct, but better than 30 extra images).

@beheh
Copy link
Collaborator

beheh commented Sep 14, 2016

Thanks, looking very good. Will fully review and land later this week.

Copy link
Collaborator

@beheh beheh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Have you checked the colors? I'm getting very weird ones, e.g. bright purple for mage.

@@ -20,10 +20,15 @@ class InPlayCardArt extends React.Component<EntityProps, {}> {
var images = [];
var entity = this.props.entity;
var controller = this.props.controller;
var postfix = "";
Copy link
Collaborator

@beheh beheh Sep 15, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

let instead of var.

if (entity.isPremium()) {
images.push({
image: premiumOverlay,
classes: ["inhand-base", premiumOverlayClass]
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add trailing comma, please.

@@ -18,6 +18,9 @@ class InHandCardArt extends React.Component<InHandCardArtProps, {}> {
var entity = this.props.entity;
var portraitClass = null;
var frame = null;
var premiumOverlay = null;
var premiumOverlayClass = null;
var cardClass = this.cardClassToString();
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use let instead of var for all.

}

.shaman-color {
filter: hue-rotate(250deg) saturate(75%) brightness(80%);
Copy link
Collaborator

@beheh beheh Sep 15, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Color looks wrong, looks right for me with about filter: hue-rotate(220deg) saturate(50%) brightness(100%);

}

.mage-color {
filter: hue-rotate(303deg) saturate(88%) brightness(94%);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks really wrong:

Wrong mage color

@andburn
Copy link
Member Author

andburn commented Sep 15, 2016

Updated. Did my best with improving the colours, paladin is completely wrong though - I just can't seem to get anything close to the colour. They look like this now:

display

@beheh beheh force-pushed the master branch 2 times, most recently from 22af358 to 8fe2b38 Compare September 17, 2016 12:24
@beheh
Copy link
Collaborator

beheh commented Sep 18, 2016

👍 Nice work. Landing this and revisiting the paladin color in #139.

Uses an image for each card type and applies css filters
to approximate the class color.
@beheh
Copy link
Collaborator

beheh commented Sep 18, 2016

Mage is also really broken, following up in #139.

@beheh beheh merged commit deb9aa2 into HearthSim:master Sep 18, 2016
beheh added a commit that referenced this pull request Sep 18, 2016
@andburn andburn deleted the gold_inplay branch September 21, 2016 10:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

2 participants