External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-20 02:30:08 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

AI: refactor PassAbility usage, added additional runtime checks

Browse source
This commit is contained in:
Oleg Agafonov 2023-10-14 15:57:19 +04:00
parent d57a3c100d
commit 06138ab3d3
6 changed files with 31 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/ComputerPlayer6.java
View file

@ -24,10 +24,7 @@ import mage.game.permanent.Permanent;
import mage.game.stack.StackAbility;
import mage.game.stack.StackObject;
import mage.player.ai.ma.optimizers.TreeOptimizer;
import mage.player.ai.ma.optimizers.impl.DiscardCardOptimizer;
import mage.player.ai.ma.optimizers.impl.EquipOptimizer;
import mage.player.ai.ma.optimizers.impl.LevelUpOptimizer;
import mage.player.ai.ma.optimizers.impl.OutcomeOptimizer;
import mage.player.ai.ma.optimizers.impl.*;
import mage.player.ai.util.CombatInfo;
import mage.player.ai.util.CombatUtil;
import mage.players.Player;
@ -72,6 +69,7 @@ public class ComputerPlayer6 extends ComputerPlayer /*implements Player*/ {
protected static final String BLANKS = "...............................................";
static {
optimizers.add(new WrongCodeUsageOptimizer());
optimizers.add(new LevelUpOptimizer());
optimizers.add(new EquipOptimizer());
optimizers.add(new DiscardCardOptimizer());

4
Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/SimulatedPlayer2.java
View file

@ -34,7 +34,6 @@ import java.util.concurrent.ConcurrentLinkedQueue;
public class SimulatedPlayer2 extends ComputerPlayer {
private static final Logger logger = Logger.getLogger(SimulatedPlayer2.class);
private static final PassAbility pass = new PassAbility();
private final boolean isSimulatedPlayer;
private final List<String> suggested;
@ -45,7 +44,6 @@ public class SimulatedPlayer2 extends ComputerPlayer {
public SimulatedPlayer2(Player originalPlayer, boolean isSimulatedPlayer, List<String> suggested) {
super(originalPlayer.getId());
this.originalPlayer = originalPlayer.copy();
pass.setControllerId(playerId);
this.isSimulatedPlayer = isSimulatedPlayer;
this.suggested = suggested;
this.userData = UserData.getDefaultUserDataView();
@ -76,7 +74,7 @@ public class SimulatedPlayer2 extends ComputerPlayer {
Collections.reverse(list);
if (!forced) {
list.add(pass);
list.add(new PassAbility());
}
if (logger.isTraceEnabled()) {

23
Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/ma/optimizers/impl/WrongCodeUsageOptimizer.java Normal file
View file

@ -0,0 +1,23 @@
package mage.player.ai.ma.optimizers.impl;
import mage.abilities.Ability;
import mage.abilities.common.PassAbility;
import mage.game.Game;
import java.util.List;
/**
* AI: runtime checks for possible errors or use case, must be added first in optimizers list
*
* @author JayDi85
*/
public class WrongCodeUsageOptimizer extends BaseTreeOptimizer {
@Override
public void filter(Game game, List<Ability> actions, List<Ability> actionsToRemove) {
// runtime check: pass ability must be all the time
if (actions.stream().filter(a -> a instanceof PassAbility).count() != 1) {
throw new IllegalArgumentException("Wrong code usage. AI's actions list must contains only 1 instance of PassAbility");
}
}
}

8
Mage.Server.Plugins/Mage.Player.AIMCTS/src/mage/player/ai/MCTSPlayer.java
View file

@ -20,9 +20,7 @@ import java.util.UUID;
*/
public class MCTSPlayer extends ComputerPlayer {
private static final Logger logger = Logger.getLogger(MCTSPlayer.class);
protected PassAbility pass = new PassAbility();
private static final Logger logger = Logger.getLogger(MCTSPlayer.class);
private NextAction nextAction;
@ -32,12 +30,10 @@ public class MCTSPlayer extends ComputerPlayer {
public MCTSPlayer(UUID id) {
super(id);
this.pass.setControllerId(id);
}
public MCTSPlayer(final MCTSPlayer player) {
super(player);
this.pass = player.pass.copy();
this.nextAction = player.nextAction;
}
@ -48,7 +44,7 @@ public class MCTSPlayer extends ComputerPlayer {
protected List<ActivatedAbility> getPlayableAbilities(Game game) {
List<ActivatedAbility> playables = getPlayable(game, true);
playables.add(pass);
playables.add(new PassAbility());
return playables;
}

2
Mage/src/main/java/mage/abilities/common/PassAbility.java
View file

@ -9,7 +9,7 @@ import mage.game.Game;
import java.util.UUID;
/**
* AI only: fake ability for game simulations
* AI: fake ability to pass priority in game simulations
*
* @author BetaSteward_at_googlemail.com
*/

4
Mage/src/main/java/mage/abilities/effects/common/PassEffect.java
View file

@ -1,5 +1,3 @@
package mage.abilities.effects.common;
import mage.constants.Outcome;
@ -9,6 +7,8 @@ import mage.game.Game;
import mage.players.Player;
/**
* AI: fake effect to pass priority in game simulations
*
* @author BetaSteward_at_googlemail.com
*/
public class PassEffect extends OneShotEffect {