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

Merge branch 'add_remaining_commander_cards' into 'master'

Browse Source 
Add remaining missing cards in Commander sets

See merge request core-developers/forge!4907
This commit is contained in:
Michael Kamensky
2021-06-20 10:56:44 +00:00
parent fcdc8d691d 6daf4ac78d
commit a5c30cadb4
3 changed files with 30 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
forge-gui/res/cardsfolder/i/impact_resonance.txt Normal file
View File

@@ -0,0 +1,13 @@
Name:Impact Resonance
ManaCost:1 R
Types:Instant
T:Mode$ TurnBegin | Execute$ ResetDamage | Static$ True
SVar:ResetDamage:DB$ StoreSVar | SVar$ X | Type$ Number | Expression$ 0
T:Mode$ DamageDone | ValidTarget$ Player,Permanent | Execute$ StoreDamage | Static$ True
SVar:StoreDamage:DB$ StoreSVar | SVar$ X | Type$ Calculate | Expression$ Y | ConditionCheckSVar$ Y | ConditionSVarCompare$ GTX
A:SP$ DealDamage | Cost$ 1 R | ValidTgts$ Creature | TargetMin$ MinTgts | TargetMax$ MaxTgts | NumDmg$ X | DividedAsYouChoose$ X | SpellDescription$ CARDNAME deals X damage divided as you choose among any number of target creatures, where X is the greatest amount of damage dealt by a source to a permanent or player this turn.
SVar:X:Number$0
SVar:Y:TriggerCount$DamageAmount
SVar:MinTgts:SVar$X/LimitMax.1
SVar:MaxTgts:Count$Valid Creature
Oracle:Impact Resonance deals X damage divided as you choose among any number of target creatures, where X is the greatest amount of damage dealt by a source to a permanent or player this turn.

13
forge-gui/res/cardsfolder/s/sudden_substitution.txt Normal file
View File

@@ -0,0 +1,13 @@
Name:Sudden Substitution
ManaCost:2 U U
Types:Instant
K:Split second
A:SP$ Pump | TargetType$ Spell | ValidTgts$ Card.nonCreature | TgtZone$ Stack | ImprintCards$ TargetedSource | SubAbility$ DBRemember | StackDescription$ SpellDescription | SpellDescription$ Exchange control of target noncreature spell and target creature. Then the spell's controller may choose new targets for it.
SVar:DBRemember:DB$ Pump | ValidTgts$ Creature | RememberObjects$ ThisTargetedCard | SubAbility$ DBRememberPlayer
SVar:DBRememberPlayer:DB$ Pump | RememberObjects$ RememberedController | ConditionDefined$ Remembered | ConditionPresent$ Card | SubAbility$ DBGainControl
SVar:DBGainControl:DB$ GainControl | Defined$ Remembered.Creature | NewController$ ImprintedController | ConditionDefined$ Imprinted | ConditionPresent$ Card | StackDescription$ None | SubAbility$ DBControlSpell
SVar:DBControlSpell:DB$ ControlSpell | Defined$ Targeted | NewController$ Player.IsRemembered | Mode$ Gain | ConditionDefined$ Remembered | ConditionPresent$ Card | StackDescription$ None | SubAbility$ DBChooseTargets
SVar:DBChooseTargets:DB$ ChangeTargets | Defined$ Targeted | Chooser$ ImprintedController | Optional$ True | ConditionDefined$ Imprinted | ConditionPresent$ Card | StackDescription$ None | SubAbility$ DBCleanup
SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | ClearImprinted$ True
AI:RemoveDeck:All
Oracle:Split second (As long as this spell is on the stack, players can't cast spells or activate abilities that aren't mana abilities.)\nExchange control of target noncreature spell and target creature. Then the spell's controller may choose new targets for it.

11
forge-gui/src/main/java/forge/gamemodes/match/input/InputSelectTargets.java
View File

@@ -128,10 +128,10 @@ public final class InputSelectTargets extends InputSyncronizedBase {
"(Targeting ERROR)", "");
showMessage(message, sa.getView());
if (divisionValues != null && sa.getMinTargets() == 0 && sa.getTargets().size() == 0) {
if ((divisionValues != null && !divisionValues.isEmpty()) && sa.getMinTargets() == 0 && sa.getTargets().size() == 0) {
// extra logic for Divided with min targets = 0, should only work if num targets are 0 too
getController().getGui().updateButtons(getOwner(), true, true, false);
} else if (!sa.isMinTargetChosen() || divisionValues != null) {
} else if (!sa.isMinTargetChosen() || (divisionValues != null && !divisionValues.isEmpty())){
// If reached Minimum targets, enable OK button
if (mandatory && tgt.hasCandidates(sa, true)) {
// Player has to click on a target
@@ -279,7 +279,7 @@ public final class InputSelectTargets extends InputSyncronizedBase {
return false;
}
if (divisionValues != null) {
if ((divisionValues != null && !divisionValues.isEmpty())) {
Boolean val = onDividedAsYouChoose(card);
if (val != null) {
return val;
@@ -321,7 +321,7 @@ public final class InputSelectTargets extends InputSyncronizedBase {
return;
}
if (divisionValues != null) {
if ((divisionValues != null && !divisionValues.isEmpty())) {
Boolean val = onDividedAsYouChoose(player);
if (val != null) {
return;
@@ -331,9 +331,6 @@ public final class InputSelectTargets extends InputSyncronizedBase {
}
protected Boolean onDividedAsYouChoose(GameObject go) {
if (divisionValues.isEmpty()) {
return false;
}
String apiBasedMessage = "Distribute how much to ";
if (sa.getApi() == ApiType.DealDamage) {
apiBasedMessage = "Select how much damage to deal to ";