diff --git a/forge-gui-mobile/src/forge/adventure/data/RewardData.java b/forge-gui-mobile/src/forge/adventure/data/RewardData.java index 495a78948ce..0d98180b282 100644 --- a/forge-gui-mobile/src/forge/adventure/data/RewardData.java +++ b/forge-gui-mobile/src/forge/adventure/data/RewardData.java @@ -144,7 +144,12 @@ public class RewardData implements Serializable { case "Union": HashSet pool = new HashSet<>(); for (RewardData r : cardUnion) { - pool.addAll(CardUtil.getPredicateResult(allCards, r)); + if( r.cardName != null && !r.cardName.isEmpty() ) { + pool.add(StaticData.instance().getCommonCards().getCard(r.cardName)); + } + else { + pool.addAll(CardUtil.getPredicateResult(allCards, r)); + } } ArrayList finalPool = new ArrayList(pool); diff --git a/forge-gui/res/adventure/common/sprites/enemy/humanoid/human/rogue/pirate2.png b/forge-gui/res/adventure/common/sprites/enemy/humanoid/human/rogue/pirate2.png new file mode 100644 index 00000000000..83f4c3a5754 Binary files /dev/null and b/forge-gui/res/adventure/common/sprites/enemy/humanoid/human/rogue/pirate2.png differ diff --git a/forge-gui/res/adventure/common/sprites/enemy/humanoid/human/rogue/pirate3.atlas b/forge-gui/res/adventure/common/sprites/enemy/humanoid/human/rogue/pirate3.atlas new file mode 100644 index 00000000000..98f112d2fac --- /dev/null +++ b/forge-gui/res/adventure/common/sprites/enemy/humanoid/human/rogue/pirate3.atlas @@ -0,0 +1,68 @@ +pirate3.png +size: 64,96 +format: RGBA8888 +filter: Nearest,Nearest +repeat: none +Avatar + xy: 0, 0 + size: 16, 16 +Idle + xy: 0, 16 + size: 16, 16 +Idle + xy: 16, 16 + size: 16, 16 +Idle + xy: 32, 16 + size: 16, 16 +Idle + xy: 48, 16 + size: 16, 16 +Walk + xy: 0, 32 + size: 16, 16 +Walk + xy: 16, 32 + size: 16, 16 +Walk + xy: 32, 32 + size: 16, 16 +Walk + xy: 48, 32 + size: 16, 16 +Attack + xy: 0, 48 + size: 16, 16 +Attack + xy: 16, 48 + size: 16, 16 +Attack + xy: 32, 48 + size: 16, 16 +Attack + xy: 48, 48 + size: 16, 16 +Hit + xy: 0, 64 + size: 16, 16 +Hit + xy: 16, 64 + size: 16, 16 +Hit + xy: 32, 64 + size: 16, 16 +Hit + xy: 48, 64 + size: 16, 16 +Death + xy: 0, 80 + size: 16, 16 +Death + xy: 16, 80 + size: 16, 16 +Death + xy: 32, 80 + size: 16, 16 +Death + xy: 48, 80 + size: 16, 16 diff --git a/forge-gui/res/adventure/common/sprites/enemy/humanoid/human/rogue/pirate3.png b/forge-gui/res/adventure/common/sprites/enemy/humanoid/human/rogue/pirate3.png new file mode 100644 index 00000000000..292bcb28174 Binary files /dev/null and b/forge-gui/res/adventure/common/sprites/enemy/humanoid/human/rogue/pirate3.png differ