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

Card cached keywords move to CardState, tests still run

Browse Source
This commit is contained in:
Hanmac
2018-01-20 18:52:34 +01:00
parent e66194fb9d
commit c294e1f6df
2 changed files with 14 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
forge-game/src/main/java/forge/game/card/Card.java
View File

@@ -124,8 +124,6 @@ public class Card extends GameEntity implements Comparable<Card> {
private final CardChangedWords changedTextTypes = new CardChangedWords();
/** List of the keywords that have been added by text changes. */
private final List<KeywordInterface> keywordsGrantedByTextChanges = Lists.newArrayList();
private final Map<CardStateName, List<KeywordInterface>> cachedKeywords = Maps.newEnumMap(CardStateName.class);
/** Original values of SVars changed by text changes. */
private Map<String, String> originalSVars = Maps.newHashMap();
@@ -3365,41 +3363,10 @@ public class Card extends GameEntity implements Comparable<Card> {
return getUnhiddenKeywords(currentState);
}
public final Collection<KeywordInterface> getUnhiddenKeywords(CardState state) {
CardStateName name = null;
for (Entry<CardStateName, CardState> entry : states.entrySet()) {
if (entry.getValue().equals(state)) {
name = entry.getKey();
break;
}
}
if (name == null) {
return Lists.newArrayList();
}
if (!cachedKeywords.containsKey(name)) {
updateKeywordsCache(state);
}
return cachedKeywords.get(name);
return state.getCachedKeywords();
}
public final void updateKeywordsCache(final CardState state) {
CardStateName name = null;
for (Entry<CardStateName, CardState> entry : states.entrySet()) {
if (entry.getValue().equals(state)) {
name = entry.getKey();
break;
}
}
if (name == null) {
return;
}
if (cachedKeywords.containsKey(name)) {
cachedKeywords.get(name).clear();
} else {
cachedKeywords.put(name, Lists.newArrayList());
}
KeywordCollection keywords = new KeywordCollection();
//final List<KeywordInterface> keywords = Lists.newArrayList();
@@ -3422,7 +3389,8 @@ public class Card extends GameEntity implements Comparable<Card> {
keywords.insertAll(ck.getKeywords());
}
}
cachedKeywords.get(name).addAll(keywords.getValues());
state.setCachedKeywords(keywords.getValues());
}
private void visitUnhiddenKeywords(CardState state, Visitor<KeywordInterface> visitor) {
if (changedCardKeywords.isEmpty()) {

11
forge-game/src/main/java/forge/game/card/CardState.java
View File

@@ -58,6 +58,8 @@ public class CardState extends GameObject {
private String imageKey = "";
private Map<String, String> sVars = Maps.newTreeMap();
private List<KeywordInterface> cachedKeywords = Lists.newArrayList();
private CardRarity rarity = CardRarity.Unknown;
private String setCode = CardEdition.UNKNOWN.getCode();
@@ -150,6 +152,15 @@ public class CardState extends GameObject {
view.updateToughness(this);
}
public final Collection<KeywordInterface> getCachedKeywords() {
return cachedKeywords;
}
public final void setCachedKeywords(final Collection<KeywordInterface> col) {
cachedKeywords.clear();
cachedKeywords.addAll(col);
}
public final Collection<KeywordInterface> getIntrinsicKeywords() {
return intrinsicKeywords.getValues();
}