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

Revert "Merge branch 'master' into 'master'"

Browse Source 
This reverts merge request !2334
This commit is contained in:
Myrd
2019-12-20 15:48:04 +00:00
parent b7c4720030
commit 5cb8502566
8 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-ai/src/main/java/forge/ai/ComputerUtilCard.java
View File

@@ -643,7 +643,7 @@ public class ComputerUtilCard {
return getMostProminentType(list, CardType.getAllCreatureTypes()); return getMostProminentType(list, CardType.getAllCreatureTypes());
} }
public static String getMostProminentType(final CardCollectionView list, final Collection<String> valid) { public static String getMostProminentType(final CardCollectionView list, final List<String> valid) {
if (list.size() == 0) { if (list.size() == 0) {
return ""; return "";
} }

9
forge-ai/src/main/java/forge/ai/PlayerControllerAi.java
View File

@@ -502,11 +502,12 @@ public class PlayerControllerAi extends PlayerController {
} }
@Override @Override
public String chooseSomeType(String kindOfType, SpellAbility sa, Collection<String> validTypes, List<String> invalidTypes, boolean isOptional) { public String chooseSomeType(String kindOfType, SpellAbility sa, List<String> validTypes, List<String> invalidTypes, boolean isOptional) {
String chosen = ComputerUtil.chooseSomeType(player, kindOfType, sa.getParam("AILogic"), invalidTypes); String chosen = ComputerUtil.chooseSomeType(player, kindOfType, sa.getParam("AILogic"), invalidTypes);
if (StringUtils.isBlank(chosen) && !validTypes.isEmpty()) { if (StringUtils.isBlank(chosen) && !validTypes.isEmpty())
chosen = validTypes.iterator().next(); {
System.err.println("AI has no idea how to choose " + kindOfType +", defaulting to arbitrary element: chosen"); chosen = validTypes.get(0);
System.err.println("AI has no idea how to choose " + kindOfType +", defaulting to 1st element: chosen");
} }
game.getAction().nofityOfValue(sa, player, chosen, player); game.getAction().nofityOfValue(sa, player, chosen, player);
return chosen; return chosen;

22
forge-core/src/main/java/forge/card/CardType.java
View File

@@ -606,13 +606,13 @@ public final class CardType implements Comparable<CardType>, CardTypeView {
public static class Constant { public static class Constant {
public static final Settable LOADED = new Settable(); public static final Settable LOADED = new Settable();
public static final Set<String> BASIC_TYPES = Sets.newHashSet(); public static final List<String> BASIC_TYPES = Lists.newArrayList();
public static final Set<String> LAND_TYPES = Sets.newHashSet(); public static final List<String> LAND_TYPES = Lists.newArrayList();
public static final Set<String> CREATURE_TYPES = Sets.newHashSet(); public static final List<String> CREATURE_TYPES = Lists.newArrayList();
public static final Set<String> SPELL_TYPES = Sets.newHashSet(); public static final List<String> SPELL_TYPES = Lists.newArrayList();
public static final Set<String> ENCHANTMENT_TYPES = Sets.newHashSet(); public static final List<String> ENCHANTMENT_TYPES = Lists.newArrayList();
public static final Set<String> ARTIFACT_TYPES = Sets.newHashSet(); public static final List<String> ARTIFACT_TYPES = Lists.newArrayList();
public static final Set<String> WALKER_TYPES = Sets.newHashSet(); public static final List<String> WALKER_TYPES = Lists.newArrayList();
// singular -> plural // singular -> plural
public static final BiMap<String,String> pluralTypes = HashBiMap.create(); public static final BiMap<String,String> pluralTypes = HashBiMap.create();
@@ -699,12 +699,12 @@ public final class CardType implements Comparable<CardType>, CardTypeView {
return sortedSubTypes; return sortedSubTypes;
} }
public static Collection<String> getBasicTypes() { public static List<String> getBasicTypes() {
return Collections.unmodifiableCollection(Constant.BASIC_TYPES); return Collections.unmodifiableList(Constant.BASIC_TYPES);
} }
public static Collection<String> getAllCreatureTypes() { public static List<String> getAllCreatureTypes() {
return Collections.unmodifiableCollection(Constant.CREATURE_TYPES); return Collections.unmodifiableList(Constant.CREATURE_TYPES);
} }
public static List<String> getAllLandTypes() { public static List<String> getAllLandTypes() {
return ImmutableList.<String>builder() return ImmutableList.<String>builder()

2
forge-game/src/main/java/forge/game/CardTraitBase.java
View File

@@ -73,7 +73,7 @@ public abstract class CardTraitBase extends GameObject implements IHasCardView {
} }
public final String getParamOrDefault(String key, String defaultValue) { public final String getParamOrDefault(String key, String defaultValue) {
return mapParams.getOrDefault(key, defaultValue); return hasParam(key) ? getParam(key) : defaultValue;
} }
public String getParam(String key) { public String getParam(String key) {

4
forge-game/src/main/java/forge/game/player/PlayerController.java
View File

@@ -161,8 +161,8 @@ public abstract class PlayerController {
public abstract List<SpellAbility> chooseSaToActivateFromOpeningHand(List<SpellAbility> usableFromOpeningHand); public abstract List<SpellAbility> chooseSaToActivateFromOpeningHand(List<SpellAbility> usableFromOpeningHand);
public abstract Mana chooseManaFromPool(List<Mana> manaChoices); public abstract Mana chooseManaFromPool(List<Mana> manaChoices);
public abstract String chooseSomeType(String kindOfType, SpellAbility sa, Collection<String> validTypes, List<String> invalidTypes, boolean isOptional); public abstract String chooseSomeType(String kindOfType, SpellAbility sa, List<String> validTypes, List<String> invalidTypes, boolean isOptional);
public final String chooseSomeType(String kindOfType, SpellAbility sa, Collection<String> validTypes, List<String> invalidTypes) { public final String chooseSomeType(String kindOfType, SpellAbility sa, List<String> validTypes, List<String> invalidTypes) {
return chooseSomeType(kindOfType, sa, validTypes, invalidTypes, false); return chooseSomeType(kindOfType, sa, validTypes, invalidTypes, false);
} }

2
forge-gui-desktop/src/test/java/forge/gamesimulationtests/util/PlayerControllerForTests.java
View File

@@ -481,7 +481,7 @@ public class PlayerControllerForTests extends PlayerController {
} }
@Override @Override
public String chooseSomeType(String kindOfType, SpellAbility sa, Collection<String> validTypes, List<String> invalidTypes, boolean isOptional) { public String chooseSomeType(String kindOfType, SpellAbility sa, List<String> validTypes, List<String> invalidTypes, boolean isOptional) {
return chooseItem(validTypes); return chooseItem(validTypes);
} }

23
forge-gui/src/main/java/forge/model/FModel.java
View File

@@ -57,7 +57,6 @@ import forge.util.storage.StorageBase;
import java.io.File; import java.io.File;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set;
/** /**
* The default Model implementation for Forge. * The default Model implementation for Forge.
@@ -260,31 +259,31 @@ public final class FModel {
if (!CardType.Constant.LOADED.isSet()) { if (!CardType.Constant.LOADED.isSet()) {
final List<String> typeListFile = FileUtil.readFile(ForgeConstants.TYPE_LIST_FILE); final List<String> typeListFile = FileUtil.readFile(ForgeConstants.TYPE_LIST_FILE);
Set<String> addTo = null; List<String> tList = null;
for (final String s : typeListFile) { for (final String s : typeListFile) {
if (s.equals("[BasicTypes]")) { if (s.equals("[BasicTypes]")) {
addTo = CardType.Constant.BASIC_TYPES; tList = CardType.Constant.BASIC_TYPES;
} else if (s.equals("[LandTypes]")) { } else if (s.equals("[LandTypes]")) {
addTo = CardType.Constant.LAND_TYPES; tList = CardType.Constant.LAND_TYPES;
} else if (s.equals("[CreatureTypes]")) { } else if (s.equals("[CreatureTypes]")) {
addTo = CardType.Constant.CREATURE_TYPES; tList = CardType.Constant.CREATURE_TYPES;
} else if (s.equals("[SpellTypes]")) { } else if (s.equals("[SpellTypes]")) {
addTo = CardType.Constant.SPELL_TYPES; tList = CardType.Constant.SPELL_TYPES;
} else if (s.equals("[EnchantmentTypes]")) { } else if (s.equals("[EnchantmentTypes]")) {
addTo = CardType.Constant.ENCHANTMENT_TYPES; tList = CardType.Constant.ENCHANTMENT_TYPES;
} else if (s.equals("[ArtifactTypes]")) { } else if (s.equals("[ArtifactTypes]")) {
addTo = CardType.Constant.ARTIFACT_TYPES; tList = CardType.Constant.ARTIFACT_TYPES;
} else if (s.equals("[WalkerTypes]")) { } else if (s.equals("[WalkerTypes]")) {
addTo = CardType.Constant.WALKER_TYPES; tList = CardType.Constant.WALKER_TYPES;
} else if (s.length() > 1) { } else if (s.length() > 1) {
if (addTo != null) { if (tList != null) {
if (s.contains(":")) { if (s.contains(":")) {
String[] k = s.split(":"); String[] k = s.split(":");
addTo.add(k[0]); tList.add(k[0]);
CardType.Constant.pluralTypes.put(k[0], k[1]); CardType.Constant.pluralTypes.put(k[0], k[1]);
} else { } else {
addTo.add(s); tList.add(s);
} }
} }
} }

2
forge-gui/src/main/java/forge/player/PlayerControllerHuman.java
View File

@@ -1034,7 +1034,7 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont
* java.lang.String, java.util.List, java.util.List, java.lang.String) * java.lang.String, java.util.List, java.util.List, java.lang.String)
*/ */
@Override @Override
public String chooseSomeType(final String kindOfType, final SpellAbility sa, final Collection<String> validTypes, public String chooseSomeType(final String kindOfType, final SpellAbility sa, final List<String> validTypes,
final List<String> invalidTypes, final boolean isOptional) { final List<String> invalidTypes, final boolean isOptional) {
final List<String> types = Lists.newArrayList(validTypes); final List<String> types = Lists.newArrayList(validTypes);
if (invalidTypes != null && !invalidTypes.isEmpty()) { if (invalidTypes != null && !invalidTypes.isEmpty()) {