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

Merge branch 'patch' into 'master'

Browse Source 
More cards

Closes #1473

See merge request core-developers/forge!2912
This commit is contained in:
swordshine
2020-06-26 12:57:39 +00:00
parent e3863b0712 01183c454b
commit bb4f4272ca
9 changed files with 103 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-game/src/main/java/forge/game/ability/AbilityUtils.java
View File

@@ -286,6 +286,8 @@ public class AbilityUtils {
list = sa.getRootAbility().getPaidList("ExiledCards");
} else if (defined.startsWith("Exiled")) {
list = sa.getRootAbility().getPaidList("Exiled");
} else if (defined.startsWith("Milled")) {
list = sa.getRootAbility().getPaidList("Milled");
} else if (defined.startsWith("TappedCards")) {
list = sa.getRootAbility().getPaidList("TappedCards");
} else if (defined.startsWith("Tapped")) {

20
forge-game/src/main/java/forge/game/ability/effects/ManaEffect.java
View File

@@ -195,6 +195,26 @@ public class ManaEffect extends SpellAbilityEffect {
}
if (colors == 0) return;
abMana.setExpressChoice(ColorSet.fromMask(colors));
} else if (type.startsWith("EachColoredManaSymbol")) {
final String res = type.split("_")[1];
final CardCollection list = AbilityUtils.getDefinedCards(card, res, sa);
StringBuilder sb = new StringBuilder();
for (Card c : list) {
String mana = c.getManaCost().toString();
for (int i = 0; i < mana.length(); i++) {
char symbol = mana.charAt(i);
switch (symbol) {
case 'W':
case 'U':
case 'B':
case 'R':
case 'G':
sb.append(symbol).append(' ');
break;
}
}
}
abMana.setExpressChoice(sb.toString().trim());
}
if (abMana.getExpressChoice().isEmpty()) {

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

@@ -3019,6 +3019,11 @@ public class Card extends GameEntity implements Comparable<Card> {
// Play the Equip sound
getGame().fireEvent(new GameEventCardAttachment(this, oldTarget, entity));
// Run replacement effects
final Map<AbilityKey, Object> repParams = AbilityKey.mapFromAffected(this);
repParams.put(AbilityKey.AttachTarget, entity);
getGame().getReplacementHandler().run(ReplacementType.Attached, repParams);
// run trigger
final Map<AbilityKey, Object> runParams = AbilityKey.newMap();
runParams.put(AbilityKey.AttachSource, this);

29
forge-game/src/main/java/forge/game/player/Player.java
View File

@@ -1670,21 +1670,22 @@ public class Player extends GameEntity implements Comparable<Player> {
// Replacement effects
final Map<AbilityKey, Object> repRunParams = AbilityKey.mapFromAffected(this);
repRunParams.put(AbilityKey.Number, n);
repRunParams.put(AbilityKey.Destination, destination);
switch (getGame().getReplacementHandler().run(ReplacementType.Mill, repRunParams)) {
case NotReplaced:
break;
case Updated:
// check if this is still the affected player
if (this.equals(repRunParams.get(AbilityKey.Affected))) {
n = (int) repRunParams.get(AbilityKey.Number);
} else {
return milled;
if (destination == ZoneType.Graveyard && !bottom) {
switch (getGame().getReplacementHandler().run(ReplacementType.Mill, repRunParams)) {
case NotReplaced:
break;
case Updated:
// check if this is still the affected player
if (this.equals(repRunParams.get(AbilityKey.Affected))) {
n = (int) repRunParams.get(AbilityKey.Number);
} else {
return milled;
}
break;
default:
return milled;
}
break;
default:
return milled;
}
final int max = Math.min(n, lib.size());

51
forge-game/src/main/java/forge/game/replacement/ReplaceAttached.java Normal file
View File

@@ -0,0 +1,51 @@
package forge.game.replacement;
import forge.game.ability.AbilityKey;
import forge.game.card.Card;
import forge.game.spellability.SpellAbility;
import java.util.Map;
/**
* TODO: Write javadoc for this type.
*
*/
public class ReplaceAttached extends ReplacementEffect {
/**
*
* TODO: Write javadoc for Constructor.
* @param mapParams &emsp; HashMap<String, String>
* @param host &emsp; Card
*/
public ReplaceAttached(final Map<String, String> mapParams, final Card host, final boolean intrinsic) {
super(mapParams, host, intrinsic);
}
/* (non-Javadoc)
* @see forge.card.replacement.ReplacementEffect#canReplace(java.util.HashMap)
*/
@Override
public boolean canReplace(Map<AbilityKey, Object> runParams) {
if (hasParam("ValidCard")) {
if (!matchesValid(runParams.get(AbilityKey.Affected), getParam("ValidCard").split(","), this.getHostCard())) {
return false;
}
}
if (hasParam("ValidTarget")) {
if (!matchesValid(runParams.get(AbilityKey.AttachTarget), getParam("ValidTarget").split(","), this.getHostCard())) {
return false;
}
}
return true;
}
/* (non-Javadoc)
* @see forge.card.replacement.ReplacementEffect#setReplacingObjects(java.util.HashMap, forge.card.spellability.SpellAbility)
*/
@Override
public void setReplacingObjects(Map<AbilityKey, Object> runParams, SpellAbility sa) {
sa.setReplacingObject(AbilityKey.Card, runParams.get(AbilityKey.Affected));
}
}

5
forge-game/src/main/java/forge/game/replacement/ReplaceMill.java
View File

@@ -20,8 +20,6 @@ package forge.game.replacement;
import forge.game.ability.AbilityKey;
import forge.game.card.Card;
import forge.game.spellability.SpellAbility;
import forge.game.zone.ZoneType;
import java.util.Map;
/**
@@ -46,9 +44,6 @@ public class ReplaceMill extends ReplacementEffect {
@Override
public boolean canReplace(Map<AbilityKey, Object> runParams) {
if (ZoneType.Graveyard != ((ZoneType) runParams.get(AbilityKey.Destination))) {
return false;
}
if (hasParam("ValidPlayer")) {
if (!matchesValid(runParams.get(AbilityKey.Affected), getParam("ValidPlayer").split(","), getHostCard())) {
return false;

1
forge-game/src/main/java/forge/game/replacement/ReplacementType.java
View File

@@ -12,6 +12,7 @@ import java.util.Map;
*/
public enum ReplacementType {
AddCounter(ReplaceAddCounter.class),
Attached(ReplaceAttached.class),
Counter(ReplaceCounter.class),
CreateToken(ReplaceToken.class),
DamageDone(ReplaceDamage.class),

11
forge-gui/res/cardsfolder/c/charmed_pendant.txt
View File

@@ -1,14 +1,5 @@
Name:Charmed Pendant
ManaCost:4
Types:Artifact
A:AB$ Mana | Cost$ T Mill<1> | Produced$ W | Amount$ ManaW | References$ ManaW | InstantSpeed$ True | SubAbility$ DBManaU | SpellDescription$ For each colored mana symbol in the milled card's mana cost, add one mana of that color. Activate this ability only any time you could cast an instant.
SVar:DBManaU:DB$ Mana | Produced$ U | Amount$ ManaU | References$ ManaU | SubAbility$ DBManaB
SVar:DBManaB:DB$ Mana | Produced$ B | Amount$ ManaB | References$ ManaB | SubAbility$ DBManaR
SVar:DBManaR:DB$ Mana | Produced$ R | Amount$ ManaR | References$ ManaR | SubAbility$ DBManaG
SVar:DBManaG:DB$ Mana | Produced$ G | Amount$ ManaG | References$ ManaG
SVar:ManaW:Milled$ChromaSource.W
SVar:ManaU:Milled$ChromaSource.U
SVar:ManaB:Milled$ChromaSource.B
SVar:ManaR:Milled$ChromaSource.R
SVar:ManaG:Milled$ChromaSource.G
A:AB$ Mana | Cost$ T Mill<1> | Produced$ Special EachColoredManaSymbol_Milled | InstantSpeed$ True | SpellDescription$ For each colored mana symbol in the milled card's mana cost, add one mana of that color. Activate this ability only any time you could cast an instant.
Oracle:{T}, Mill a card: For each colored mana symbol in the milled card's mana cost, add one mana of that color. Activate this ability only any time you could cast an instant.

8
forge-gui/res/cardsfolder/s/sanctuary_blade.txt Normal file
View File

@@ -0,0 +1,8 @@
Name:Sanctuary Blade
ManaCost:2
Types:Artifact Equipment
R:Event$ Attached | ValidCard$ Card.Self | ValidTarget$ Creature | ReplaceWith$ ChooseColor | ActiveZones$ Battlefield | Description$ As CARDNAME becomes attached to a creature, choose a color.
SVar:ChooseColor:DB$ ChooseColor | Defined$ You
S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 2 | AddKeyword$ Protection:Card.ChosenColor:Protection from ChosenColor | Description$ Equipped creature gets +2/+0 and has protection from the last chosen color.
K:Equip:3
Oracle:As Sanctuary Blade becomes attached to a creature, choose a color.\nEquipped creature gets +2/+0 and has protection from the last chosen color.\nEquip {3}