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

Merge branch 'DifferentCardNames' into 'master'

Browse Source 
Fix DifferentCardNames counting

See merge request core-developers/forge!4245
This commit is contained in:
Michael Kamensky
2021-03-22 19:04:32 +00:00
parent d7a3357bbf 4c57436e9f
commit e74eab8d50
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
View File

@@ -786,8 +786,10 @@ public class CardFactoryUtil {
final String[] rest = restriction.split(",");
CardCollection list = CardLists.getValidCards(cc.getGame().getCardsInGame(), rest, cc, c, null);
for (final Card card : list) {
if (!crdname.contains(card.getName())) {
crdname.add(card.getName());
String name = card.getName();
// CR 201.2b Those objects have different names only if each of them has at least one name and no two objects in that group have a name in common
if (!crdname.contains(name) && !name.isEmpty()) {
crdname.add(name);
}
}
return doXMath(crdname.size(), m, c);

4
forge-gui/res/cardsfolder/l/lilianas_contract.txt
View File

@@ -1,9 +1,9 @@
Name:Liliana's Contract
ManaCost:3 B B
Types:Enchantment
T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ DBWin | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of your upkeep, if you control four or more Demons with different names, you win the game.
T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ DBWin | TriggerZones$ Battlefield | CheckSVar$ Contractors | SVarCompare$ GE4 | TriggerDescription$ At the beginning of your upkeep, if you control four or more Demons with different names, you win the game.
SVar:DBWin:DB$ WinsGame | Defined$ You | ConditionCheckSVar$ Contractors | ConditionSVarCompare$ GE4
SVar:Contractors:Count$DifferentCardNames_Demon.YouCtrl+inZoneBattlefield
SVar:Contractors:Count$DifferentCardNames_Demon.YouCtrl+inRealZoneBattlefield
T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters the battlefield, you draw four cards and you lose 4 life.
SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ 4 | SubAbility$ DBLoseLife
SVar:DBLoseLife:DB$ LoseLife | LifeAmount$ 4