Skip to content

Commit

Permalink
Improved card icons (fix ambiguous interpretation of vigilance, first…
Browse files Browse the repository at this point in the history
… and double strikes, #7471);
  • Loading branch information
JayDi85 committed Feb 7, 2021
1 parent cf216c6 commit b2b88bf
Show file tree
Hide file tree
Showing 6 changed files with 49 additions and 4 deletions.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 22 additions & 0 deletions Mage.Client/src/main/resources/card/icons/prepared/eye.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions Mage.Client/src/main/resources/card/icons/prepared/swords-two.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 2 additions & 1 deletion Mage.Client/src/main/resources/card/icons/readme-icons.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,5 @@ Folder structure:

Icons sources:
* bootstrap icons: https://github.com/twbs/icons
* font awesome: https://github.com/FortAwesome/Font-Awesome
* font awesome: https://github.com/FortAwesome/Font-Awesome
* pixabay: https://pixabay.com/
6 changes: 3 additions & 3 deletions Mage/src/main/java/mage/abilities/icon/CardIconType.java
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@ public enum CardIconType {
ABILITY_DEFENDER("prepared/chess-rook.svg", CardIconCategory.ABILITY, 100),
ABILITY_DEATHTOUCH("prepared/skull-crossbones.svg", CardIconCategory.ABILITY, 100),
ABILITY_LIFELINK("prepared/link.svg", CardIconCategory.ABILITY, 100),
ABILITY_DOUBLE_STRIKE("prepared/mars-double.svg", CardIconCategory.ABILITY, 100),
ABILITY_FIRST_STRIKE("prepared/mars.svg", CardIconCategory.ABILITY, 100),
ABILITY_DOUBLE_STRIKE("prepared/swords-two.svg", CardIconCategory.ABILITY, 100),
ABILITY_FIRST_STRIKE("prepared/swords-one.svg", CardIconCategory.ABILITY, 100),
ABILITY_CREW("prepared/truck-monster.svg", CardIconCategory.ABILITY, 100),
ABILITY_TRAMPLE("prepared/grimace.svg", CardIconCategory.ABILITY, 100),
ABILITY_HEXPROOF("prepared/expand-arrows-alt.svg", CardIconCategory.ABILITY, 100),
ABILITY_INFECT("prepared/flask.svg", CardIconCategory.ABILITY, 100),
ABILITY_INDESTRUCTIBLE("prepared/ankh.svg", CardIconCategory.ABILITY, 100),
ABILITY_VIGILANCE("prepared/khanda.svg", CardIconCategory.ABILITY, 100),
ABILITY_VIGILANCE("prepared/eye.svg", CardIconCategory.ABILITY, 100),
//
SYSTEM_COMBINED("prepared/square-fill.svg", CardIconCategory.SYSTEM, 1000), // inner usage, must use last order
SYSTEM_DEBUG("prepared/link.svg", CardIconCategory.SYSTEM, 1000); // used for test render dialog
Expand Down

0 comments on commit b2b88bf

Please sign in to comment.