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

Merge pull request #282 from Northmoc/nccBribeTaker

Browse Source 
NCC: Bribe Taker and support
This commit is contained in:
Anthony Calosa
2022-05-08 05:52:33 +08:00
committed by GitHub
parent 8828003333 ab2ea6554f
commit dce75c9578
2 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
forge-game/src/main/java/forge/game/ability/effects/CountersPutEffect.java
View File

@@ -340,6 +340,10 @@ public class CountersPutEffect extends SpellAbilityEffect {
} }
} }
for (CounterType ct : counterTypes) { for (CounterType ct : counterTypes) {
if (sa.hasParam("AltChoiceForEach")) {
String typeChoices = sa.getParam("AltChoiceForEach") + "," + ct.toString();
ct = chooseTypeFromList(sa, typeChoices, obj, pc);
}
resolvePerType(sa, placer, ct, counterAmount, table, false); resolvePerType(sa, placer, ct, counterAmount, table, false);
} }
} else { } else {
@@ -659,7 +663,10 @@ public class CountersPutEffect extends SpellAbilityEffect {
List<CounterType> choices = Lists.newArrayList(); List<CounterType> choices = Lists.newArrayList();
for (String s : list.split(",")) { for (String s : list.split(",")) {
if (!s.equals("") && (!sa.hasParam("UniqueType") || obj.getCounters(CounterType.getType(s)) == 0)) { if (!s.equals("") && (!sa.hasParam("UniqueType") || obj.getCounters(CounterType.getType(s)) == 0)) {
choices.add(CounterType.getType(s)); CounterType type = CounterType.getType(s);
if (!choices.contains(type)) {
choices.add(type);
}
} }
} }
if (sa.hasParam("RandomType")) { if (sa.hasParam("RandomType")) {

10
forge-gui/res/cardsfolder/upcoming/bribe_taker.txt Normal file
View File

@@ -0,0 +1,10 @@
Name:Bribe Taker
ManaCost:5 G
Types:Creature Rhino Warrior
PT:6/6
K:Trample
T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPutCounter | TriggerDescription$ When CARDNAME enters the battlefield, for each kind of counter on permanents you control, you may put your choice of a +1/+1 counter or a counter of that kind on CARDNAME.
SVar:TrigPutCounter:DB$ PutCounter | CounterTypes$ EachType_Permanent.YouCtrl | AltChoiceForEach$ P1P1
DeckNeeds:Ability$Counters
DeckHas:Ability$Counters
Oracle:Trample\nWhen Bribe Taker enters the battlefield, for each kind of counter on permanents you control, you may put your choice of a +1/+1 counter or a counter of that kind on Bribe Taker.