From 561409f0d9d3215a1d8e6b31a7b0d848343bd8e8 Mon Sep 17 00:00:00 2001 From: Bennet Gerlach Date: Wed, 1 Jun 2011 01:16:42 +0200 Subject: Abstract turn control has player, doesn't need hand git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@372 72836036-5685-4462-b002-a69064685172 --- src/jrummikub/control/turn/BaseAIControl.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/jrummikub/control/turn/BaseAIControl.java') diff --git a/src/jrummikub/control/turn/BaseAIControl.java b/src/jrummikub/control/turn/BaseAIControl.java index 3c48341..cd68c37 100644 --- a/src/jrummikub/control/turn/BaseAIControl.java +++ b/src/jrummikub/control/turn/BaseAIControl.java @@ -77,14 +77,14 @@ public class BaseAIControl extends AbstractTurnControl { } private Stone findMatchingStone(Stone target) { - for (Pair entry : hand) { + for (Pair entry : player.getHand()) { Stone stone = entry.getFirst(); if (stone.getValue() == target.getValue() && stone.getColor() == target.getColor()) { return stone; } } - for (Pair entry : hand) { + for (Pair entry : player.getHand()) { Stone stone = entry.getFirst(); if (stone.isJoker()) { return stone; @@ -95,14 +95,14 @@ public class BaseAIControl extends AbstractTurnControl { private Stone pickUpMatchingStone(Stone target) { Stone match = findMatchingStone(target); - hand.pickUp(match); + player.getHand().pickUp(match); return match; } private void turn() { List stones = new ArrayList(); - for (Pair entry : hand) { + for (Pair entry : player.getHand()) { stones.add(entry.getFirst()); } @@ -147,8 +147,8 @@ public class BaseAIControl extends AbstractTurnControl { private void emitEndOfTurn() { long timeElapsed = System.currentTimeMillis() - startTime; - long timeNeeded = Math.min((long) (1000 + Math.random() * hand.getSize() - * 100), 50000); + long timeNeeded = Math.min((long) (1000 + Math.random() + * player.getHand().getSize() * 100), 50000); long waitTime = timeNeeded - timeElapsed; if (waitTime > 0) { -- cgit v1.2.3