Merge branch 'Card-Forge:master' into YONE4
@@ -1 +1,2 @@
|
||||
--settings ./.mvn/local-settings.xml
|
||||
--settings
|
||||
./.mvn/local-settings.xml
|
||||
|
||||
@@ -41,7 +41,7 @@ public class EffectData implements Serializable {
|
||||
}
|
||||
|
||||
public Array<IPaperCard> startBattleWithCards() {
|
||||
Array<IPaperCard> startCards=new Array<>();
|
||||
Array<IPaperCard> startCards=new Array<>(IPaperCard.class);
|
||||
if(startBattleWithCard != null) {
|
||||
for (String name:startBattleWithCard) {
|
||||
PaperCard C = FModel.getMagicDb().getCommonCards().getCard(name);
|
||||
|
||||
|
Before Width: | Height: | Size: 32 KiB After Width: | Height: | Size: 17 KiB |
|
Before Width: | Height: | Size: 8.5 KiB After Width: | Height: | Size: 8.0 KiB |
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 3.5 KiB |
|
Before Width: | Height: | Size: 59 KiB After Width: | Height: | Size: 40 KiB |
|
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 6.6 KiB |
|
Before Width: | Height: | Size: 32 KiB After Width: | Height: | Size: 14 KiB |
|
Before Width: | Height: | Size: 36 KiB After Width: | Height: | Size: 20 KiB |