external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 19:58:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Mobile] Add Landwalk and Commander Icons

Browse Source
This commit is contained in:
Anthony Calosa
2020-12-06 16:39:51 +08:00
parent 311be33896
commit 3ba79ea606
8 changed files with 31 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
forge-gui/src/main/java/forge/assets/FSkinProp.java
View File

@@ -391,7 +391,9 @@ public enum FSkinProp {
IMG_FAVNONE (new int[] {500, 0, 100, 100}, PropType.FAVICON),
IMG_QUEST_DRAFT_DECK (new int[] {0, 0, 680, 475}, PropType.IMAGE),
//COMMANDER
IMG_ABILITY_COMMANDER (new int[] {330, 576, 80, 80}, PropType.ABILITY),
//Ability Icons
IMG_ABILITY_DEATHTOUCH (new int[] {2, 2, 80, 80}, PropType.ABILITY),
IMG_ABILITY_DEFENDER (new int[] {84, 2, 80, 80}, PropType.ABILITY),
IMG_ABILITY_DOUBLE_STRIKE (new int[] {166, 2, 80, 80}, PropType.ABILITY),
@@ -404,6 +406,7 @@ public enum FSkinProp {
IMG_ABILITY_HORSEMANSHIP (new int[] {2, 576, 80, 80}, PropType.ABILITY),
IMG_ABILITY_INDESTRUCTIBLE (new int[] {2, 84, 80, 80}, PropType.ABILITY),
IMG_ABILITY_INTIMIDATE (new int[] {166, 412, 80, 80}, PropType.ABILITY),
IMG_ABILITY_LANDWALK (new int[] {248, 576, 80, 80}, PropType.ABILITY),
IMG_ABILITY_LIFELINK (new int[] {84, 84, 80, 80}, PropType.ABILITY),
IMG_ABILITY_MENACE (new int[] {166, 84, 80, 80}, PropType.ABILITY),
IMG_ABILITY_REACH (new int[] {248, 330, 80, 80}, PropType.ABILITY),

9
forge-gui/src/main/java/forge/quest/QuestWinLoseController.java
View File

@@ -58,8 +58,13 @@ public class QuestWinLoseController {
// After the first game, reset the card shop pool to be able to buy back anted cards
if (lastGame.getNumPlayedGamesInMatch() == 0) {
qc.getCards().clearShopList();
qc.getCards().getShopList();
try {
qc.getCards().clearShopList();
qc.getCards().getShopList();
} catch (Exception e) {
//investigate this..
System.err.println(e.getMessage());
}
}
final LobbyPlayer questLobbyPlayer = GamePlayerUtil.getQuestPlayer();