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

Fix Mindslaver so you can actually take actions for your opponent

Browse Source
This commit is contained in:
drdev
2014-10-15 15:33:47 +00:00
parent 4f3bf5d6fa
commit ab7fb0788e
6 changed files with 52 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
forge-ai/src/main/java/forge/ai/LobbyPlayerAi.java
View File

@@ -4,6 +4,7 @@ import forge.LobbyPlayer;
import forge.game.Game;
import forge.game.player.IGameEntitiesFactory;
import forge.game.player.Player;
import forge.game.player.PlayerController;
public class LobbyPlayerAi extends LobbyPlayer implements IGameEntitiesFactory {
public LobbyPlayerAi(String name) {
@@ -35,13 +36,17 @@ public class LobbyPlayerAi extends LobbyPlayer implements IGameEntitiesFactory {
this.rotateProfileEachGame = rotateProfileEachGame;
}
@Override
public PlayerControllerAi createControllerFor(Player ai) {
private PlayerControllerAi createControllerFor(Player ai) {
PlayerControllerAi result = new PlayerControllerAi(ai.getGame(), ai, this);
result.allowCheatShuffle(allowCheatShuffle);
return result;
}
@Override
public PlayerController createMindSlaveController(Player master, Player slave) {
return createControllerFor(slave);
}
@Override
public Player createIngamePlayer(Game game, final int id) {
Player ai = new Player(getName(), game, id);

5
forge-game/src/main/java/forge/game/player/IGameEntitiesFactory.java
View File

@@ -2,8 +2,7 @@ package forge.game.player;
import forge.game.Game;
public interface IGameEntitiesFactory
{
PlayerController createControllerFor(Player p);
public interface IGameEntitiesFactory {
PlayerController createMindSlaveController(Player master, Player slave);
Player createIngamePlayer(Game game, int id);
}

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

@@ -2085,7 +2085,7 @@ public class Player extends GameEntity implements Comparable<Player> {
if (mindSlaveMaster != null) {
LobbyPlayer oldLobbyPlayer = getLobbyPlayer();
IGameEntitiesFactory master = (IGameEntitiesFactory)mindSlaveMaster.getLobbyPlayer();
controller = master.createControllerFor(this);
controller = master.createMindSlaveController(mindSlaveMaster, this);
game.fireEvent(new GameEventPlayerControl(this, oldLobbyPlayer, getLobbyPlayer()));
}
else {

67
forge-gui-desktop/src/test/java/forge/gamesimulationtests/util/LobbyPlayerForTests.java
View File

@@ -17,42 +17,45 @@ import java.util.Map;
* Test-specific behaviour can easily be added by mocking (parts of) this class.
*/
public class LobbyPlayerForTests extends LobbyPlayer implements IGameEntitiesFactory {
private final Map<Player, PlayerControllerForTests> playerControllers;
private final PlayerActions playerActions;
private final Map<Player, PlayerControllerForTests> playerControllers;
private final PlayerActions playerActions;
public LobbyPlayerForTests( String name, PlayerActions playerActions ) {
super( name );
playerControllers = new HashMap<Player, PlayerControllerForTests>();
this.playerActions = playerActions;
}
public LobbyPlayerForTests(String name, PlayerActions playerActions) {
super(name);
playerControllers = new HashMap<Player, PlayerControllerForTests>();
this.playerActions = playerActions;
}
private PlayerController createControllerFor(Player player) {
if (!playerControllers.containsKey(player)) {
PlayerControllerForTests dummyPlayerControllerForTests = new PlayerControllerForTests(player.getGame(), player, this);
dummyPlayerControllerForTests.setPlayerActions(playerActions);
playerControllers.put(player, dummyPlayerControllerForTests);
}
return playerControllers.get(player);
}
@Override
public Player createIngamePlayer(Game gameState, final int id) {
Player dummyPlayer = new Player(getName(), gameState, id);
dummyPlayer.setFirstController( createControllerFor( dummyPlayer ) );
return dummyPlayer;
}
@Override
public Player createIngamePlayer(Game gameState, final int id) {
Player dummyPlayer = new Player(getName(), gameState, id);
dummyPlayer.setFirstController(createControllerFor(dummyPlayer));
return dummyPlayer;
}
@Override
public PlayerController createControllerFor( Player player ) {
if( !playerControllers.containsKey( player ) ) {
PlayerControllerForTests dummyPlayerControllerForTests = new PlayerControllerForTests( player.getGame(), player, this );
dummyPlayerControllerForTests.setPlayerActions( playerActions );
playerControllers.put( player, dummyPlayerControllerForTests );
}
return playerControllers.get( player );
}
@Override
public PlayerController createMindSlaveController(Player master, Player slave) {
return createControllerFor(slave);
}
@Override
public void hear( LobbyPlayer player, String message ) {
//Do nothing
}
@Override
public void hear(LobbyPlayer player, String message) {
//Do nothing
}
public PlayerControllerForTests getPlayerController() {
if( playerControllers.size() == 1 ) {
return playerControllers.values().iterator().next();
}
throw new IllegalStateException( "Can't determine correct controller " + StringUtils.join( playerControllers.entrySet(), ", " ) );
}
public PlayerControllerForTests getPlayerController() {
if (playerControllers.size() == 1) {
return playerControllers.values().iterator().next();
}
throw new IllegalStateException("Can't determine correct controller " + StringUtils.join(playerControllers.entrySet(), ", "));
}
}

4
forge-gui/src/main/java/forge/player/LobbyPlayerHuman.java
View File

@@ -14,8 +14,8 @@ public class LobbyPlayerHuman extends LobbyPlayer implements IGameEntitiesFactor
}
@Override
public PlayerController createControllerFor(Player human) {
return new PlayerControllerHuman(human.getGame(), human, this);
public PlayerController createMindSlaveController(Player master, Player slave) {
return new PlayerControllerHuman(slave, this, (PlayerControllerHuman)master.getController());
}
@Override

2
forge-net/src/main/java/forge/net/LobbyPlayerRemote.java
View File

@@ -35,7 +35,7 @@ public class LobbyPlayerRemote extends LobbyPlayer implements IGameEntitiesFacto
* @see forge.game.player.LobbyPlayer#createControllerFor(forge.game.player.Player)
*/
@Override
public PlayerController createControllerFor(Player p) {
public PlayerController createMindSlaveController(Player master, Player slave) {
// Cannot create remote players yet
throw new UnsupportedOperationException("method is not implemented");
}