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

Cleanup Leech Bonder

Browse Source
This commit is contained in:
tool4EvEr
2022-04-26 09:20:45 +02:00
parent 9d23620486
commit c449d55327
5 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-ai/src/main/java/forge/ai/ability/CountersMoveAi.java
View File

@@ -214,7 +214,7 @@ public class CountersMoveAi extends SpellAbilityAi {
private static int calcAmount(final SpellAbility sa, final CounterType cType) { private static int calcAmount(final SpellAbility sa, final CounterType cType) {
final Card host = sa.getHostCard(); final Card host = sa.getHostCard();
final String amountStr = sa.getParam("CounterNum"); final String amountStr = sa.getParamOrDefault("CounterNum", "1");
// TODO handle proper calculation of X values based on Cost // TODO handle proper calculation of X values based on Cost
int amount = 0; int amount = 0;

2
forge-ai/src/main/java/forge/ai/ability/CountersRemoveAi.java
View File

@@ -102,7 +102,7 @@ public class CountersRemoveAi extends SpellAbilityAi {
final Game game = ai.getGame(); final Game game = ai.getGame();
final String type = sa.getParam("CounterType"); final String type = sa.getParam("CounterType");
final String amountStr = sa.getParam("CounterNum"); final String amountStr = sa.getParamOrDefault("CounterNum", "1");
// remove counter with Time might use Exile Zone too // remove counter with Time might use Exile Zone too
final TargetRestrictions tgt = sa.getTargetRestrictions(); final TargetRestrictions tgt = sa.getTargetRestrictions();

7
forge-game/src/main/java/forge/game/ability/effects/CountersMoveEffect.java
View File

@@ -45,10 +45,10 @@ public class CountersMoveEffect extends SpellAbilityEffect {
} }
} }
final String countername = sa.getParam("CounterType"); final String countername = sa.getParam("CounterType");
final String counterAmount = sa.getParam("CounterNum"); final String counterAmount = sa.getParamOrDefault("CounterNum", "1");
int amount = 0; int amount = 0;
if (!"Any".equals(counterAmount) && !"All".equals(counterAmount)) { if (!"Any".equals(counterAmount) && !"All".equals(counterAmount)) {
amount = AbilityUtils.calculateAmount(sa.getHostCard(), sa.getParam("CounterNum"), sa); amount = AbilityUtils.calculateAmount(sa.getHostCard(), counterAmount, sa);
} }
sb.append("Move "); sb.append("Move ");
@@ -81,7 +81,7 @@ public class CountersMoveEffect extends SpellAbilityEffect {
public void resolve(SpellAbility sa) { public void resolve(SpellAbility sa) {
final Card host = sa.getHostCard(); final Card host = sa.getHostCard();
final String counterName = sa.getParam("CounterType"); final String counterName = sa.getParam("CounterType");
final String counterNum = sa.getParam("CounterNum"); final String counterNum = sa.getParamOrDefault("CounterNum", "1");
final Player player = sa.getActivatingPlayer(); final Player player = sa.getActivatingPlayer();
final PlayerController pc = player.getController(); final PlayerController pc = player.getController();
final Game game = host.getGame(); final Game game = host.getGame();
@@ -320,7 +320,6 @@ public class CountersMoveEffect extends SpellAbilityEffect {
protected void removeCounter(SpellAbility sa, final Card src, final Card dest, CounterType cType, String counterNum, Map<CounterType, Integer> countersToAdd) { protected void removeCounter(SpellAbility sa, final Card src, final Card dest, CounterType cType, String counterNum, Map<CounterType, Integer> countersToAdd) {
final Card host = sa.getHostCard(); final Card host = sa.getHostCard();
//final String counterNum = sa.getParam("CounterNum");
final Player player = sa.getActivatingPlayer(); final Player player = sa.getActivatingPlayer();
final PlayerController pc = player.getController(); final PlayerController pc = player.getController();
final Game game = host.getGame(); final Game game = host.getGame();

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

@@ -29,7 +29,7 @@ public class CountersRemoveEffect extends SpellAbilityEffect {
final StringBuilder sb = new StringBuilder(); final StringBuilder sb = new StringBuilder();
final String counterName = sa.getParam("CounterType"); final String counterName = sa.getParam("CounterType");
final String num = sa.getParam("CounterNum"); final String num = sa.getParamOrDefault("CounterNum", "1");
int amount = 0; int amount = 0;
if (!num.equals("All") && !num.equals("Any")) { if (!num.equals("All") && !num.equals("Any")) {
@@ -77,7 +77,7 @@ public class CountersRemoveEffect extends SpellAbilityEffect {
PlayerController pc = player.getController(); PlayerController pc = player.getController();
final String type = sa.getParam("CounterType"); final String type = sa.getParam("CounterType");
final String num = sa.getParam("CounterNum"); final String num = sa.getParamOrDefault("CounterNum", "1");
int cntToRemove = 0; int cntToRemove = 0;
if (!num.equals("All") && !num.equals("Any")) { if (!num.equals("All") && !num.equals("Any")) {

3
forge-gui/res/cardsfolder/l/leech_bonder.txt
View File

@@ -3,7 +3,6 @@ ManaCost:2 U
Types:Creature Merfolk Soldier Types:Creature Merfolk Soldier
PT:3/3 PT:3/3
K:etbCounter:M1M1:2 K:etbCounter:M1M1:2
A:AB$ Pump | Cost$ U Q | ValidTgts$ Creature | TgtPrompt$ Select target creature to remove counters | SubAbility$ DBMove | StackDescription$ None | SpellDescription$ Move a counter from target creature onto a second target creature. A:AB$ MoveCounter | Cost$ U Q | ValidTgts$ Creature | TgtPrompt$ Select target creature to remove counters | ValidTgts$ Creature | TargetMin$ 2 | TargetMax$ 2 | CounterType$ Any | SpellDescription$ Move a counter from target creature onto a second target creature.
SVar:DBMove:DB$ MoveCounter | Source$ ParentTarget | ValidTgts$ Creature | TgtPrompt$ Select target creature to add counters | TargetUnique$ True | CounterType$ Any | CounterNum$ 1
AI:RemoveDeck:All AI:RemoveDeck:All
Oracle:Leech Bonder enters the battlefield with two -1/-1 counters on it.\n{U}, {Q}: Move a counter from target creature onto a second target creature. ({Q} is the untap symbol.) Oracle:Leech Bonder enters the battlefield with two -1/-1 counters on it.\n{U}, {Q}: Move a counter from target creature onto a second target creature. ({Q} is the untap symbol.)