External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-20 02:30:08 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge fix

Browse source
This commit is contained in:
Oleg Agafonov 2023-12-03 00:31:57 +04:00
parent 1641698584
commit 57a556105c
2 changed files with 21 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Mage.Client/src/main/resources/card/icons/prepared/exclamation-triangle-fill.svg Normal file
View file

@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 22.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Слой_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 16 16" style="enable-background:new 0 0 16 16;" xml:space="preserve">
<style type="text/css">
.st0{fill:#FFFFFF;}
</style>
<g id="XMLID_1_">
<g>
<path class="st0" d="M8.8,6.1L8.5,9.4c0,0.3-0.2,0.5-0.5,0.5c-0.3,0-0.5-0.2-0.6-0.5L7.2,6.1c0,0,0-0.1,0-0.1
c0-0.5,0.4-0.9,0.9-0.9c0,0,0.1,0,0.1,0C8.6,5.2,8.9,5.6,8.8,6.1z"/>
<circle class="st0" cx="8" cy="11.8" r="0.9"/>
<path d="M8,12.7c0.5,0,0.9-0.4,0.9-0.9c0-0.5-0.4-0.9-0.9-0.9c-0.5,0-0.9,0.4-0.9,0.9C7.1,12.3,7.5,12.7,8,12.7z M8.8,6.1
c0.1-0.5-0.3-0.9-0.8-0.9c0,0-0.1,0-0.1,0C7.5,5.2,7.1,5.5,7.1,6c0,0,0,0.1,0,0.1l0.3,3.3c0,0.3,0.3,0.5,0.6,0.5
c0.3,0,0.5-0.2,0.5-0.5L8.8,6.1z M8.9,1.9L15.4,13c0.4,0.7-0.1,1.7-0.9,1.7h-13c-0.8,0-1.4-0.9-0.9-1.7L7.1,1.9
c0.1-0.2,0.2-0.3,0.4-0.4C8,1.2,8.6,1.4,8.9,1.9z"/>
</g>
<g>
</g>
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 1.1 KiB

3
Mage.Common/src/main/java/mage/view/CardView.java
View file

@ -516,9 +516,6 @@ public class CardView extends SimpleCardView {
}
this.cardIcons.add(CardIconImpl.variableCost(costX));
}
// restrictions
//card.getRules()
}
this.power = Integer.toString(card.getPower().getValue());