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

- C14: Added Assault Suit

Browse Source
This commit is contained in:
swordshine
2014-12-02 04:55:45 +00:00
parent c541972527
commit 296eccdce3
11 changed files with 30 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored
View File

@@ -1999,6 +1999,7 @@ forge-gui/res/cardsfolder/a/assassins_strike.txt -text
forge-gui/res/cardsfolder/a/assault_battery.txt -text
forge-gui/res/cardsfolder/a/assault_griffin.txt svneol=native#text/plain
forge-gui/res/cardsfolder/a/assault_strobe.txt svneol=native#text/plain
forge-gui/res/cardsfolder/a/assault_suit.txt -text
forge-gui/res/cardsfolder/a/assault_zeppelid.txt svneol=native#text/plain
forge-gui/res/cardsfolder/a/assemble_the_legion.txt -text
forge-gui/res/cardsfolder/a/assembly_hall.txt -text

1
forge-game/src/main/java/forge/game/ability/effects/BalanceEffect.java
View File

@@ -53,6 +53,7 @@ public class BalanceEffect extends SpellAbilityEffect {
p.discard(card, sa);
}
} else { // Battlefield
// TODO: "can'e be sacrificed"
for(Card card : p.getController().choosePermanentsToSacrifice(sa, numToBalance, numToBalance, validCards.get(i), valid)) {
if ( null == card ) continue;
game.getAction().sacrifice(card, sa);

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

@@ -151,7 +151,7 @@ public class ManaEffect extends SpellAbilityEffect {
// Only clear express choice after mana has been produced
abMana.clearExpressChoice();
// convert these to SubAbilities when appropriate
// TODO: convert these to SubAbilities when appropriate
if (sa.hasParam("Stuck")) {
sa.setUndoable(false);
card.addHiddenExtrinsicKeyword("This card doesn't untap during your next untap step.");

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

@@ -6,6 +6,7 @@ import forge.game.ability.SpellAbilityEffect;
import forge.game.card.Card;
import forge.game.card.CardCollectionView;
import forge.game.card.CardLists;
import forge.game.card.CardPredicates;
import forge.game.card.CardUtil;
import forge.game.player.Player;
import forge.game.spellability.SpellAbility;
@@ -54,6 +55,7 @@ public class SacrificeAllEffect extends SpellAbilityEffect {
if (sa.hasParam("Controller")) {
list = CardLists.filterControlledBy(list, AbilityUtils.getDefinedPlayers(sa.getHostCard(), sa.getParam("Controller"), sa));
}
list = CardLists.filter(list, CardPredicates.canBeSacrificedBy(sa));
final boolean remSacrificed = sa.hasParam("RememberSacrificed");
if (remSacrificed) {

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

@@ -5850,6 +5850,10 @@ public class Card extends GameEntity implements Comparable<Card>, IIdentifiable
return isInPlay() && (!hasKeyword("Indestructible") || (isCreature() && getNetToughness() <= 0));
}
public final boolean canBeSacrificed() {
return isInPlay() && !this.isPhasedOut() && !hasKeyword("CARDNAME can't be sacrificed.");
}
@Override
public final boolean canBeTargetedBy(final SpellAbility sa) {
if (sa == null) {
@@ -6170,7 +6174,7 @@ public class Card extends GameEntity implements Comparable<Card>, IIdentifiable
System.out.println("Trying to sacrifice immutables: " + this);
return false;
}
if (isPhasedOut()) {
if (!canBeSacrificed()) {
return false;
}
if (source != null && getController().isOpponentOf(source.getActivatingPlayer())

4
forge-game/src/main/java/forge/game/cost/CostSacrifice.java
View File

@@ -20,6 +20,7 @@ package forge.game.cost;
import forge.game.card.Card;
import forge.game.card.CardCollectionView;
import forge.game.card.CardLists;
import forge.game.card.CardPredicates;
import forge.game.player.Player;
import forge.game.spellability.SpellAbility;
import forge.game.zone.ZoneType;
@@ -92,6 +93,7 @@ public class CostSacrifice extends CostPartWithList {
if (activator.hasKeyword("You can't sacrifice creatures to cast spells or activate abilities.")) {
typeList = CardLists.getNotType(typeList, "Creature");
}
typeList = CardLists.filter(typeList, CardPredicates.canBeSacrificedBy(ability));
if (!needsAnnoucement && (amount != null) && (typeList.size() < amount)) {
return false;
@@ -102,7 +104,7 @@ public class CostSacrifice extends CostPartWithList {
// choice, it can be Paid even if it's 0
}
else {
if (!source.isInPlay()) {
if (!source.canBeSacrificed()) {
return false;
}
else if (source.isCreature() && activator.hasKeyword("You can't sacrifice creatures to cast spells or activate abilities.")) {

2
forge-game/src/main/java/forge/game/mana/ManaCostAdjustment.java
View File

@@ -174,7 +174,7 @@ public class ManaCostAdjustment {
Card toSac = null;
CardCollectionView canOffer = CardLists.filter(sa.getActivatingPlayer().getCardsIn(ZoneType.Battlefield),
CardPredicates.isType(offeringType));
CardPredicates.isType(offeringType), CardPredicates.canBeSacrificedBy(sa));
final CardCollectionView toSacList = sa.getHostCard().getController().getController().choosePermanentsToSacrifice(sa, 0, 1, canOffer, offeringType);

2
forge-game/src/main/java/forge/game/phase/Upkeep.java
View File

@@ -154,7 +154,7 @@ public class Upkeep extends Phase {
runParams.put("PayingMana", StringUtils.join(this.getPayingMana(), ""));
game.getTriggerHandler().runTrigger(TriggerType.PayCumulativeUpkeep, runParams, false);
if (!isPaid) {
game.getAction().sacrifice(c, null);
game.getAction().sacrifice(c, this);
}
}
};

13
forge-gui/res/cardsfolder/a/assault_suit.txt Normal file
View File

@@ -0,0 +1,13 @@
Name:Assault Suit
ManaCost:4
Types:Artifact Equipment
K:Equip 3
S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddKeyword$ Haste | AddHiddenKeyword$ CARDNAME can't be sacrificed. | AddPower$ 2 | AddToughness$ 2 | Description$ Equipped creature gets +2/+2, has haste, can't attack you or a planeswalker you control, and can't be sacrificed.
S:Mode$ CantAttack | ValidCard$ Creature.EquippedBy | Target$ You,Planeswalker.YouCtrl
T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Opponent | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigGainControl | TriggerDescription$ At the beginning of each opponent's upkeep, you may have that player gain control of equipped creature until end of turn. If you do, untap it.
SVar:TrigGainControl:AB$ GainControl | Cost$ 0 | Defined$ Equipped | NewController$ TriggeredPlayer | LoseControl$ EOT | RememberControlled$ True | SubAbility$ DBUntap
SVar:DBUntap:DB$ Untap | Defined$ Equipped | ConditionDefined$ Rememebered | ConditionPresent$ Creature | ConditionCompare$ GE1 | SubAbility$ DBCleanup
SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
SVar:RemAIDeck:True
SVar:Picture:http://www.wizards.com/global/images/magic/general/assault_suit.jpg
Oracle:Equipped creature gets +2/+2, has haste, can't attack you or a planeswalker you control, and can't be sacrificed.\nAt the beginning of each opponent's upkeep, you may have that player gain control of equipped creature until end of turn. If you do, untap it.\nEquip {3}

2
forge-gui/res/cardsfolder/t/twisted_justice.txt
View File

@@ -2,7 +2,7 @@ Name:Twisted Justice
ManaCost:4 U B
Types:Sorcery
A:SP$ Sacrifice | Cost$ 4 U B | ValidTgts$ Player | SacValid$ Creature | SacMessage$ Creature | RememberSacrificed$ True | SubAbility$ DBDraw | SpellDescription$ Target player sacrifices a creature. You draw cards equal to that creature's power.
SVar:DBDraw:DB$ Draw | NumCards$ X
SVar:DBDraw:DB$ Draw | NumCards$ X | References$ X
SVar:X:RememberedLKI$CardPower
SVar:Picture:http://www.wizards.com/global/images/magic/general/twisted_justice.jpg
Oracle:Target player sacrifices a creature. You draw cards equal to that creature's power.

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

@@ -963,7 +963,7 @@ public class HumanCostDecision extends CostDecisionMakerBase {
final String amount = cost.getAmount();
final String type = cost.getType();
CardCollectionView list = player.getCardsIn(ZoneType.Battlefield);
CardCollectionView list = CardLists.filter(player.getCardsIn(ZoneType.Battlefield), CardPredicates.canBeSacrificedBy(ability));
list = CardLists.getValidCards(list, type.split(";"), player, source);
if (player.hasKeyword("You can't sacrifice creatures to cast spells or activate abilities.")) {
list = CardLists.getNotType(list, "Creature");