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

- Allowing Charms to have subAbilities be chosen more than once (AI support needs improving to actually filter through all the permutations)

Browse Source
This commit is contained in:
Sol
2015-11-10 03:10:53 +00:00
parent 27a80bbae9
commit 022041a2f6
6 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
forge-ai/src/main/java/forge/ai/PlayerControllerAi.java
View File

@@ -501,8 +501,8 @@ public class PlayerControllerAi extends PlayerController {
* @see forge.game.player.PlayerController#chooseModeForAbility(forge.card.spellability.SpellAbility, java.util.List, int, int)
*/
@Override
public List<AbilitySub> chooseModeForAbility(SpellAbility sa, int min, int num) {
return CharmAi.chooseOptionsAi(sa, player, sa.isTrigger(), num, min, !player.equals(sa.getActivatingPlayer()));
public List<AbilitySub> chooseModeForAbility(SpellAbility sa, int min, int num, boolean allowRepeat) {
return CharmAi.chooseOptionsAi(sa, player, sa.isTrigger(), num, min, allowRepeat, !player.equals(sa.getActivatingPlayer()));
}
@Override

4
forge-ai/src/main/java/forge/ai/ability/CharmAi.java
View File

@@ -26,7 +26,7 @@ public class CharmAi extends SpellAbilityAi {
// reset the chosen list. Otherwise it will be locked in forever
sa.setChosenList(null);
List<AbilitySub> chosenList = min > 1 ? chooseMultipleOptionsAi(sa, ai, min) : chooseOptionsAi(sa, ai, timingRight, num, min, false);
List<AbilitySub> chosenList = min > 1 ? chooseMultipleOptionsAi(sa, ai, min) : chooseOptionsAi(sa, ai, timingRight, num, min, sa.hasParam("CanRepeatModes"), false);
if (chosenList.isEmpty()) {
return false;
@@ -38,7 +38,7 @@ public class CharmAi extends SpellAbilityAi {
return r.nextFloat() <= Math.pow(.6667, sa.getActivationsThisTurn());
}
public static List<AbilitySub> chooseOptionsAi(SpellAbility sa, final Player ai, boolean playNow, int num, int min, boolean opponentChoser) {
public static List<AbilitySub> chooseOptionsAi(SpellAbility sa, final Player ai, boolean playNow, int num, int min, boolean allowRepeat, boolean opponentChoser) {
if (sa.getChosenList() != null) {
return sa.getChosenList();
}

15
forge-game/src/main/java/forge/game/ability/effects/CharmEffect.java
View File

@@ -52,9 +52,9 @@ public class CharmEffect extends SpellAbilityEffect {
// so nothing to do in this resolve
}
@Override
protected String getStackDescription(SpellAbility sa) {
// TODO Build StackDescription based on Chosen SubAbilities
return "";
}
@@ -79,7 +79,7 @@ public class CharmEffect extends SpellAbilityEffect {
source.setChosenPlayer(chooser);
}
List<AbilitySub> chosen = chooser.getController().chooseModeForAbility(sa, min, num);
List<AbilitySub> chosen = chooser.getController().chooseModeForAbility(sa, min, num, sa.hasParam(("CanRepeatModes")));
chainAbilities(sa, chosen);
}
@@ -98,12 +98,15 @@ public class CharmEffect extends SpellAbilityEffect {
});
for (AbilitySub sub : chosen) {
saDeepest.setSubAbility(sub);
sub.setActivatingPlayer(saDeepest.getActivatingPlayer());
sub.setParent(saDeepest);
// Clone the chosen, just in case the some subAb gets chosen multiple times
AbilitySub clone = (AbilitySub)sub.getCopy();
saDeepest.setSubAbility(clone);
clone.setActivatingPlayer(saDeepest.getActivatingPlayer());
clone.setParent(saDeepest);
// to chain the next one (but make sure it goes all the way at the end of the SA chain)
saDeepest = sub;
saDeepest = clone;
while (saDeepest.getSubAbility() != null) {
saDeepest = saDeepest.getSubAbility();
}

2
forge-game/src/main/java/forge/game/player/PlayerController.java
View File

@@ -184,7 +184,7 @@ public abstract class PlayerController {
public abstract boolean chooseFlipResult(SpellAbility sa, Player flipper, boolean[] results, boolean call);
public abstract Card chooseProtectionShield(GameEntity entityBeingDamaged, List<String> options, Map<String, Card> choiceMap);
public abstract List<AbilitySub> chooseModeForAbility(SpellAbility sa, int min, int num);
public abstract List<AbilitySub> chooseModeForAbility(SpellAbility sa, int min, int num, boolean allowRepeat);
public abstract byte chooseColor(String message, SpellAbility sa, ColorSet colors);
public abstract byte chooseColorAllowColorless(String message, Card c, ColorSet colors);

2
forge-gui-desktop/src/test/java/forge/gamesimulationtests/util/PlayerControllerForTests.java
View File

@@ -444,7 +444,7 @@ public class PlayerControllerForTests extends PlayerController {
}
@Override
public List<AbilitySub> chooseModeForAbility(SpellAbility sa, int min, int num) {
public List<AbilitySub> chooseModeForAbility(SpellAbility sa, int min, int num, boolean allowRepeat) {
throw new IllegalStateException("Erring on the side of caution here...");
}

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

@@ -1082,7 +1082,7 @@ public class PlayerControllerHuman
* @see forge.game.player.PlayerController#chooseModeForAbility(forge.card.spellability.SpellAbility, java.util.List, int, int)
*/
@Override
public List<AbilitySub> chooseModeForAbility(final SpellAbility sa, final int min, final int num) {
public List<AbilitySub> chooseModeForAbility(final SpellAbility sa, final int min, final int num, boolean allowRepeat) {
final List<AbilitySub> choices = CharmEffect.makePossibleOptions(sa);
final String modeTitle = String.format("%s activated %s - Choose a mode", sa.getActivatingPlayer(), sa.getHostCard());
final List<AbilitySub> chosen = Lists.newArrayListWithCapacity(num);
@@ -1098,7 +1098,9 @@ public class PlayerControllerHuman
break;
}
choices.remove(a);
if (!allowRepeat) {
choices.remove(a);
}
chosen.add(a);
}
return chosen;