Merge branch 'Card-Forge:master' into YONE4

This commit is contained in:
Simisays
2023-03-02 10:43:33 +01:00
committed by GitHub
9 changed files with 3 additions and 2 deletions

View File

@@ -1 +1,2 @@
--settings ./.mvn/local-settings.xml --settings
./.mvn/local-settings.xml

View File

@@ -41,7 +41,7 @@ public class EffectData implements Serializable {
} }
public Array<IPaperCard> startBattleWithCards() { public Array<IPaperCard> startBattleWithCards() {
Array<IPaperCard> startCards=new Array<>(); Array<IPaperCard> startCards=new Array<>(IPaperCard.class);
if(startBattleWithCard != null) { if(startBattleWithCard != null) {
for (String name:startBattleWithCard) { for (String name:startBattleWithCard) {
PaperCard C = FModel.getMagicDb().getCommonCards().getCard(name); PaperCard C = FModel.getMagicDb().getCommonCards().getCard(name);

Binary file not shown.

Before

Width:  |  Height:  |  Size: 32 KiB

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.5 KiB

After

Width:  |  Height:  |  Size: 8.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 3.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 59 KiB

After

Width:  |  Height:  |  Size: 40 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 6.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 32 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 36 KiB

After

Width:  |  Height:  |  Size: 20 KiB