mirror of
https://github.com/Card-Forge/forge.git
synced 2025-11-19 04:08:01 +00:00
Adventure - Named cards in card union rewards
This commit is contained in:
@@ -144,7 +144,12 @@ public class RewardData implements Serializable {
|
|||||||
case "Union":
|
case "Union":
|
||||||
HashSet<PaperCard> pool = new HashSet<>();
|
HashSet<PaperCard> pool = new HashSet<>();
|
||||||
for (RewardData r : cardUnion) {
|
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<PaperCard> finalPool = new ArrayList(pool);
|
ArrayList<PaperCard> finalPool = new ArrayList(pool);
|
||||||
|
|
||||||
|
|||||||
Binary file not shown.
|
After Width: | Height: | Size: 16 KiB |
@@ -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
|
||||||
Binary file not shown.
|
After Width: | Height: | Size: 16 KiB |
Reference in New Issue
Block a user