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

Big map update 8.5

Browse Source 
Adjusted startBattleWithCards() effect lookups.
This commit is contained in:
Magpie
2022-04-15 11:48:24 +02:00
parent 26cafedba1
commit 1ddc8785bd
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
forge-gui-mobile/src/forge/adventure/data/EffectData.java
View File

@@ -2,6 +2,8 @@ package forge.adventure.data;
import com.badlogic.gdx.utils.Array; import com.badlogic.gdx.utils.Array;
import forge.item.IPaperCard; import forge.item.IPaperCard;
import forge.item.PaperCard;
import forge.item.PaperToken;
import forge.model.FModel; import forge.model.FModel;
public class EffectData { public class EffectData {
@@ -18,12 +20,13 @@ public class EffectData {
Array<IPaperCard> startCards=new Array<>(); Array<IPaperCard> startCards=new Array<>();
if(startBattleWithCard != null) { if(startBattleWithCard != null) {
for (String name:startBattleWithCard) { for (String name:startBattleWithCard) {
if(FModel.getMagicDb().getCommonCards().contains(name)) PaperCard C = FModel.getMagicDb().getCommonCards().getCard(name);
startCards.add(FModel.getMagicDb().getCommonCards().getCard(name)); if(C != null)
else if (FModel.getMagicDb().getAllTokens().containsRule(name)) startCards.add(C);
startCards.add(FModel.getMagicDb().getAllTokens().getToken(name));
else { else {
System.err.print("Can not find card "+name+"\n"); PaperToken T = FModel.getMagicDb().getAllTokens().getToken(name);
if (T != null) startCards.add(T);
else System.err.print("Can not find card \"" + name + "\"\n");
} }
} }
} }