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

- Added Demon/Angel Partners

Browse Source
This commit is contained in:
swordshine
2018-05-28 22:40:34 +08:00
parent 52d3318a9c
commit 1b7bdd2e57
5 changed files with 39 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -439,6 +439,10 @@ public class AbilityUtils {
players.addAll(game.getPlayers());
val = CardFactoryUtil.playerXCount(players, calcX[1], card);
}
else if (hType.equals("YourTeam")) {
players.addAll(player.getYourTeam());
val = CardFactoryUtil.playerXCount(players, calcX[1], card);
}
else if (hType.equals("Opponents")) {
players.addAll(player.getOpponents());
val = CardFactoryUtil.playerXCount(players, calcX[1], card);

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

@@ -309,6 +309,14 @@ public class Player extends GameEntity implements Comparable<Player> {
return getAllOtherPlayers().filter(Predicates.not(PlayerPredicates.isOpponentOf(this)));
}
/**
* returns allied players.
* Should keep player relations somewhere in the match structure
*/
public final PlayerCollection getYourTeam() {
return game.getPlayers().filter(Predicates.not(PlayerPredicates.isOpponentOf(this)));
}
/**
* returns all other players.
* Should keep player relations somewhere in the match structure

4
forge-game/src/main/java/forge/game/player/PlayerProperty.java
View File

@@ -38,6 +38,10 @@ public class PlayerProperty {
return false;
}
}
} else if (property.equals("YourTeam")) {
if (player.isOpponentOf(sourceController)) {
return false;
}
} else if (property.equals("Allies")) {
if (player.equals(sourceController) || player.isOpponentOf(sourceController)) {
return false;

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

@@ -0,0 +1,12 @@
Name:Krav, the Unredeemed
ManaCost:4 B
Types:Legendary Creature Demon
PT:3/3
K:Partner:Regna, the Redeemer:Regna
K:Flying
A:AB$ Draw | Cost$ B Sac<X/Creature> | ValidTgts$ Player | TgtPrompt$ Choose a player | NumCards$ ChosenX | References$ X | SubAbility$ DBGainLife | SpellDescription$ Target player draws X cards and gains X life. Put X +1/+1 counters on CARDNAME.
SVar:DBGainLife:DB$ GainLife | Defined$ Targeted | LifeAmount$ ChosenX | References$ X | SubAbility$ DBPutCounter
SVar:DBPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ ChosenX | References$ X
SVar:X:XChoice
DeckHints:Name$Regna, the Redeemer
Oracle:Partner with Regna, the Redeemer (When this creature enters the battlefield, target player may put Regna into their hand from their library, then shuffle.)\n{B}, Sacrifice X creatures: Target player draws X cards and gains X life. Put X +1/+1 counters on Krav, the Unredeemed.

11
forge-gui/res/cardsfolder/upcoming/regna_the_redeemer.txt Normal file
View File

@@ -0,0 +1,11 @@
Name:Regna, the Redeemer
ManaCost:5 W
Types:Legendary Creature Angel
PT:4/4
K:Partner:Krav, the Unredeemed:Krav
K:Flying
T:Mode$ Phase | Phase$ End of Turn | TriggerZones$ Battlefield | CheckSVar$ X | SVarCompare$ GE1 | Execute$ TrigToken | TriggerDescription$ At the beginning of each end step, if your team gained life this turn, create two 1/1 white Warrior creature tokens.
SVar:TrigToken:DB$ Token | TokenAmount$ 2 | TokenName$ Warrior | TokenTypes$ Creature,Warrior | TokenOwner$ You | TokenColors$ White | TokenPower$ 1 | TokenToughness$ 1 | TokenImage$ w 1 1 Warrior
SVar:X:PlayerCountYourTeam$HighestLifeGainedThisTurn
DeckHints:Name$Krav, the Unredeemed
Oracle:Partner with Krav, the Unredeemed (When this creature enters the battlefield, target player may put Krav into their hand from their library, then shuffle.)\nFlying\nAt the beginning of each end step, if your team gained life this turn, create two 1/1 white Warrior creature tokens.