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

Merge branch 'master' into 'master'

Browse Source 
Leonin Vanguard fix + Medomai

See merge request core-developers/forge!4372
This commit is contained in:
swordshine
2021-04-04 15:33:30 +00:00
parent 05884bba0d b37d695c8b
commit b9dc9e6eb0
4 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
forge-game/src/main/java/forge/game/combat/CombatUtil.java
View File

@@ -257,11 +257,6 @@ public class CombatUtil {
return false;
}
break;
case "CARDNAME can't attack during extra turns.":
if (game.getPhaseHandler().getPlayerTurn().isExtraTurn()) {
return false;
}
break;
}
}

4
forge-game/src/main/java/forge/game/staticability/StaticAbility.java
View File

@@ -539,6 +539,10 @@ public class StaticAbility extends CardTraitBase implements IIdentifiable, Clone
if (ph.isPlayerTurn(controller)) {
return false;
}
} else if (condition.equals("ExtraTurn")) {
if (!game.getPhaseHandler().getPlayerTurn().isExtraTurn()) {
return false;
}
} else if (condition.equals("PermanentOfEachColor")) {
if ((controller.getColoredCardsInPlay(MagicColor.Constant.BLACK).isEmpty()
|| controller.getColoredCardsInPlay(MagicColor.Constant.BLUE).isEmpty()

8
forge-gui/res/cardsfolder/l/leonin_vanguard.txt
View File

@@ -1,9 +1,9 @@
Name:Leonin Vanguard
ManaCost:W
Types:Creature Cat Soldier
T:Mode$ Phase | TriggerZones$ Battlefield | Phase$ BeginCombat | ValidPlayer$ You | Execute$ TrigPump | TriggerDescription$ At the beginning of combat on your turn, if you control three or more creatures, Leonin Vanguard gets +1/+1 until end of turn and you gain 1 life.
SVar:TrigPump:DB$ Pump | ConditionPresent$ Creature.YouCtrl | ConditionCompare$ GE3 | ValidCard$ Card.Self | NumAtt$ 1 | NumDef$ 1 | SubAbility$ DBGainLife
SVar:DBGainLife:DB$ GainLife | Defined$ You | ConditionPresent$ Creature.YouCtrl | ConditionCompare$ GE3 | LifeAmount$ 1
PT:1/1
T:Mode$ Phase | TriggerZones$ Battlefield | Phase$ BeginCombat | ValidPlayer$ You | Execute$ TrigPump | IsPresent$ Creature.YouCtrl | PresentCompare$ GE3 | TriggerDescription$ At the beginning of combat on your turn, if you control three or more creatures, Leonin Vanguard gets +1/+1 until end of turn and you gain 1 life.
SVar:TrigPump:DB$ Pump | NumAtt$ 1 | NumDef$ 1 | SubAbility$ DBGainLife
SVar:DBGainLife:DB$ GainLife | LifeAmount$ 1
DeckHas:Ability$LifeGain
Oracle:At the beginning of combat on your turn, if you control three or more creatures, Leonin Vanguard gets +1/+1 until end of turn and you gain 1 life.
PT:1/1

3
forge-gui/res/cardsfolder/m/medomai_the_ageless.txt
View File

@@ -3,9 +3,8 @@ ManaCost:4 W U
Types:Legendary Creature Sphinx
PT:4/4
K:Flying
K:CARDNAME can't attack during extra turns.
S:Mode$ CantAttack | ValidCard$ Card.Self | Condition$ ExtraTurn | Description$ CARDNAME can't attack during extra turns.
T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigAddTurn | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, take an extra turn after this one.
SVar:TrigAddTurn:DB$ AddTurn | NumTurns$ 1
SVar:MustBeBlocked:True
SVar:Picture:http://www.wizards.com/global/images/magic/general/medomai_the_ageless.jpg
Oracle:Flying\nWhenever Medomai the Ageless deals combat damage to a player, take an extra turn after this one.\nMedomai the Ageless can't attack during extra turns.