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

Merge branch 'velus' into 'master'

Browse Source 
MH2: Mount Velus Manticore and support

See merge request core-developers/forge!4809
This commit is contained in:
Michael Kamensky
2021-06-03 05:15:59 +00:00
parent 7a3c9c5b49 5ac9d3fdff
commit 2144de87d4
2 changed files with 27 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1966,6 +1966,15 @@ public class AbilityUtils {
if (sq[0].contains("CardSumPT")) { if (sq[0].contains("CardSumPT")) {
return doXMath((c.getNetPower() + c.getNetToughness()), expr, c, ctb); return doXMath((c.getNetPower() + c.getNetToughness()), expr, c, ctb);
} }
if (sq[0].contains("CardNumTypes")) {
Card ce;
if (sq[0].contains("Remembered")) {
ce = (Card) c.getFirstRemembered();
} else {
ce = c;
}
return doXMath(getNumberOfTypes(ce), expr, c, ctb);
}
if (sq[0].contains("CardNumColors")) { if (sq[0].contains("CardNumColors")) {
return doXMath(CardUtil.getColors(c).countColors(), expr, c, ctb); return doXMath(CardUtil.getColors(c).countColors(), expr, c, ctb);
@@ -3647,6 +3656,12 @@ public class AbilityUtils {
return someCards; return someCards;
} }
public static int getNumberOfTypes(final Card card) {
EnumSet<CardType.CoreType> types = EnumSet.noneOf(CardType.CoreType.class);
Iterables.addAll(types, card.getType().getCoreTypes());
return types.size();
}
public static int getCardTypesFromList(final CardCollectionView list) { public static int getCardTypesFromList(final CardCollectionView list) {
EnumSet<CardType.CoreType> types = EnumSet.noneOf(CardType.CoreType.class); EnumSet<CardType.CoreType> types = EnumSet.noneOf(CardType.CoreType.class);
for (Card c1 : list) { for (Card c1 : list) {

12
forge-gui/res/cardsfolder/upcoming/mount_velus_manticore.txt Normal file
View File

@@ -0,0 +1,12 @@
Name:Mount Velus Manticore
ManaCost:2 R R
Types:Enchantment Creature Manticore
PT:3/4
T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | Execute$ TrigDiscard | TriggerZones$ Battlefield | OptionalDecider$ You | TriggerDescription$ At the beginning of combat on your turn, you may discard a card. When you do, CARDNAME deals X damage to any target, where X is the number of card types the discarded card has.
SVar:TrigDiscard:DB$ Discard | Defined$ You | NumCards$ 1 | Mode$ TgtChoose | RememberDiscarded$ True | SubAbility$ DBImmediateTrigger
SVar:DBImmediateTrigger:DB$ ImmediateTrigger | ConditionDefined$ Remembered | ConditionPresent$ Card | ConditionCompare$ GE1 | Execute$ TrigDamage | RememberObjects$ RememberedCard | SubAbility$ DBCleanup | TriggerDescription$ When you do, CARDNAME deals X damage to any target, where X is the number of card types the discarded card has.
SVar:TrigDamage:DB$ DealDamage | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ X
SVar:X:Count$RememberedCardNumTypes
SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
AI:RemoveDeck:Random
Oracle:At the beginning of combat on your turn, you may discard a card. When you do, Mount Velus Manticore deals X damage to any target, where X is the number of card types the discarded card has.