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

Merge branch 'start_replacement_run_keys_refactor' into 'master'

Browse Source 
Start replacement run keys refactor

See merge request core-developers/forge!2175
This commit is contained in:
swordshine
2019-10-06 06:22:54 +00:00
parent d294e02b44 33ccc5c21f
commit eb82d454b8
45 changed files with 382 additions and 370 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
forge-gui/release-files/CONTRIBUTORS.txt
View File

@@ -19,6 +19,7 @@ Myrd
nefigah
OgreBattlecruiser
pfps
Ryan1729
Seravy
Sirspud
Sloth

17
forge-gui/src/main/java/forge/match/input/InputPayMana.java
View File

@@ -1,13 +1,10 @@
package forge.match.input;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Queue;
import java.util.*;
import forge.GuiBase;
import forge.game.GameActionUtil;
import forge.game.ability.AbilityKey;
import forge.game.spellability.SpellAbilityView;
import forge.util.TextUtil;
import org.apache.commons.lang3.StringUtils;
@@ -363,11 +360,11 @@ public abstract class InputPayMana extends InputSyncronizedBase {
final Card source = am.getHostCard();
final Player activator = am.getActivatingPlayer();
final Game g = source.getGame();
final HashMap<String, Object> repParams = new HashMap<>();
repParams.put("Mana", m.getOrigProduced());
repParams.put("Affected", source);
repParams.put("Player", activator);
repParams.put("AbilityMana", am);
final Map<AbilityKey, Object> repParams = AbilityKey.newMap();
repParams.put(AbilityKey.Mana, m.getOrigProduced());
repParams.put(AbilityKey.Affected, source);
repParams.put(AbilityKey.Player, activator);
repParams.put(AbilityKey.AbilityMana, am);
for (final Player p : g.getPlayers()) {
for (final Card crd : p.getAllCards()) {

2
forge-gui/src/main/java/forge/player/PlayerControllerHuman.java
View File

@@ -1587,7 +1587,7 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont
@Override
public ReplacementEffect chooseSingleReplacementEffect(final String prompt,
final List<ReplacementEffect> possibleReplacers, final Map<String, Object> runParams) {
final List<ReplacementEffect> possibleReplacers) {
final ReplacementEffect first = possibleReplacers.get(0);
if (possibleReplacers.size() == 1) {
return first;