Changeset 3 for trunk

Timestamp:

Dec 12, 2020, 11:09:33 PM (4 years ago)

Author:

chronos

Message:

• Modified: Try to use token with most steps (first token) if possible.
• Modified: Move own token from start position if possible.
• Fixed: Player who finished game should not have three dice throws.

File:

• trunk/Games/UClovece.pas (modified) (13 diffs)

trunk/Games/UClovece.pas

@@ -14 +14 @@
 
   TTileKind = (tkNone, tkHome, tkYard);
+  TTileKindSet = set of TTileKind;
 
   { TToken }
@@ -22 +23 @@
     procedure SetTile(AValue: TTile);
   public
+    MoveCount: Integer;
     Player: TPlayer;
     property Tile: TTile read FTile write SetTile;
@@ -30 +32 @@
   TTokens = class(TFPGObjectList<TToken>)
     function AddNew(Player: TPlayer): TToken;
-    function GetCountByTileKind(Kind: TTileKind): Integer;
-    function GetSingleByTileKind(Kind: TTileKind): TToken;
+    function GetCountByTileKind(Kind: TTileKindSet): Integer;
+    function GetSingleByTileKind(Kind: TTileKindSet): TToken;
+    procedure GetByTileKind(Kind: TTileKindSet; const Tiles: TTokens);
   end;
 
@@ -137 +140 @@
   UGeometric;
 
-const
-  Directions: array[0..3] of TPoint = ((X: 1; Y: 1), (X: -1; Y: 1),
-    (X: -1; Y: -1), (X: 1; Y: -1));
-  Directions2: array[0..3] of TPoint = ((X: 1; Y: 0), (X: 0; Y: 1),
-    (X: -1; Y: 0), (X: 0; Y: -1));
-  Directions3: array[0..3] of TPoint = ((X: 0; Y: 1), (X: 1; Y: 0),
-    (X: 0; Y: -1), (X: 1; Y: 0));
-
 { TToken }
 
@@ -278 +273 @@
 end;
 
-function TTokens.GetCountByTileKind(Kind: TTileKind): Integer;
+function TTokens.GetCountByTileKind(Kind: TTileKindSet): Integer;
 var
   I: Integer;
@@ -284 +279 @@
   Result := 0;
   for I := 0 to Count - 1 do
-    if Items[I].Tile.Kind = Kind then Inc(Result);
-end;
-
-function TTokens.GetSingleByTileKind(Kind: TTileKind): TToken;
+    if Items[I].Tile.Kind in Kind then Inc(Result);
+end;
+
+function TTokens.GetSingleByTileKind(Kind: TTileKindSet): TToken;
 var
   I: Integer;
 begin
   I := 0;
-  while (I < Count) and (Items[I].Tile.Kind <> Kind) do Inc(I);
+  while (I < Count) and (not (Items[I].Tile.Kind in Kind)) do Inc(I);
   if I < Count then Result := Items[I]
     else Result := nil;
+end;
+
+procedure TTokens.GetByTileKind(Kind: TTileKindSet; const Tiles: TTokens);
+var
+  I: Integer;
+begin
+  Tiles.Clear;
+  for I := 0 to Count - 1 do
+    if Items[I].Tile.Kind in Kind then Tiles.Add(Items[I]);
 end;
 
@@ -320 +324 @@
 function TPlayer.CanPlay: Boolean;
 begin
-  Result := (Tokens.GetCountByTileKind(tkYard) > 0) or
-    (Tokens.GetCountByTileKind(tkNone) > 0);
+  Result := Tokens.GetCountByTileKind([tkYard, tkNone]) > 0;
 end;
 
@@ -359 +362 @@
   P: TPoint;
   P1, P2: TPoint;
-  Tile: TTile;
   R: Integer;
   Between: Boolean;
@@ -434 +436 @@
       P := Point(Trunc(Center.X + R + TokenCount * TileDistance * 1.35), Center.Y);
       P := RotatePoint(Center, P, Angle);
-      Tile := Tiles.AddNew(RotatePoint(P, Point(P.X + Trunc(0.7 * TileDistance), P.Y), I / TokenCount * 2 * Pi + Pi / 4), tkYard, Players[J]);
+      Tiles.AddNew(RotatePoint(P, Point(P.X + Trunc(0.7 * TileDistance), P.Y), I / TokenCount * 2 * Pi + Pi / 4), tkYard, Players[J]);
     end;
   end;
@@ -474 +476 @@
 begin
   Steps := TTiles.Create(False);
-  Token.Tile.GetNextSteps(DiceValue, CurrentPlayer, Steps);
-  Token.Tile := nil;
-  for I := 0 to Steps.Count - 1 do begin
-    Steps[I].AnimateToken := Token;
-    Repaint;
-    Application.ProcessMessages;
-    Sleep(200);
-    Steps[I].AnimateToken := nil;
-  end;
-  Steps.Free;
+  try
+    Token.Tile.GetNextSteps(DiceValue, CurrentPlayer, Steps);
+    Token.Tile := nil;
+    for I := 0 to Steps.Count - 1 do begin
+      Steps[I].AnimateToken := Token;
+      Repaint;
+      Application.ProcessMessages;
+      Sleep(200);
+      Steps[I].AnimateToken := nil;
+    end;
+  finally
+    Steps.Free;
+  end;
   Token.Tile := NewTile;
+  Token.MoveCount := Token.MoveCount + DiceValue;
+end;
+
+function CompareTokenMoveCount(const Item1, Item2: TToken): Integer;
+begin
+  if Item1.MoveCount < Item2.MoveCount then Result := 1
+  else if Item1.MoveCount > Item2.MoveCount then Result := -1
+  else Result := 0;
 end;
 
@@ -493 +506 @@
   TurnDone: Boolean;
   I: Integer;
+  SortedTokens: TTokens;
 begin
   TurnDone := False;
@@ -498 +512 @@
   LastDiceValue := DiceValue;
   if DiceValue = 6 then begin
-    if CurrentPlayer.Tokens.GetCountByTileKind(tkYard) > 0 then begin
+    if CurrentPlayer.Tokens.GetCountByTileKind([tkYard]) > 0 then begin
       if (not Assigned(CurrentPlayer.StartTile.Token)) or (
       Assigned(CurrentPlayer.StartTile.Token) and (CurrentPlayer.StartTile.Token.Player <> CurrentPlayer)) then begin
@@ -506 +520 @@
         end;
         // Move one token from yard to start
-        CurrentPlayer.StartTile.Token := CurrentPlayer.Tokens.GetSingleByTileKind(tkYard);
+        Token := CurrentPlayer.Tokens.GetSingleByTileKind([tkYard]);
+        Token.MoveCount := 0;
+        CurrentPlayer.StartTile.Token := Token;
         TurnDone := True;
       end;
     end;
   end;
-  if not TurnDone and (CurrentPlayer.Tokens.GetCountByTileKind(tkNone) > 0) then begin
-    for I := 0 to CurrentPlayer.Tokens.Count - 1 do
-    if CurrentPlayer.Tokens[I].Tile.Kind in [tkHome, tkNone] then begin
-      Token := CurrentPlayer.Tokens[I];
+  if not TurnDone and (CurrentPlayer.Tokens.GetCountByTileKind([tkNone, tkHome]) > 0) then begin
+    if Assigned(CurrentPlayer.StartTile.Token) and (CurrentPlayer.StartTile.Token.Player = CurrentPlayer) then begin
+      // Own token is on start position, move it away
+      Token := CurrentPlayer.StartTile.Token;
       NewTile := Token.Tile.GetNext(DiceValue, CurrentPlayer);
-      if not Assigned(NewTile) then Continue;
-      if Assigned(NewTile.Token) then begin
-        if NewTile.Token.Player = Token.Player then begin
-          // Another own token is blocking way, use another one if possible
-          Continue;
-        end else begin
-          // Move opponents token back to its yard
-          NewTile.Token.Tile := NewTile.Token.Player.YardTiles.GetTileWithoutToken;
-          AnimateTokenMovement(Token, NewTile);
-          TurnDone := True;
-          Break;
-        end;
-      end else begin
-        // Normal token move
+      if not Assigned(NewTile.Token) or (NewTile.Token.Player <> CurrentPlayer) then begin
         AnimateTokenMovement(Token, NewTile);
         TurnDone := True;
-        Break;
       end;
     end;
+    if not TurnDone then begin
+      SortedTokens := TTokens.Create(False);
+      try
+        CurrentPlayer.Tokens.GetByTileKind([tkNone, tkHome], SortedTokens);
+        SortedTokens.Sort(CompareTokenMoveCount);
+        for I := 0 to SortedTokens.Count - 1 do begin
+          Token := SortedTokens[I];
+          NewTile := Token.Tile.GetNext(DiceValue, CurrentPlayer);
+          if not Assigned(NewTile) then Continue;
+          if Assigned(NewTile.Token) then begin
+            if NewTile.Token.Player = Token.Player then begin
+              // Another own token is blocking way, use another one if possible
+              Continue;
+            end else begin
+              // Move opponents token back to its yard
+              NewTile.Token.Tile := NewTile.Token.Player.YardTiles.GetTileWithoutToken;
+              AnimateTokenMovement(Token, NewTile);
+              TurnDone := True;
+              Break;
+            end;
+          end else begin
+            // Normal token move
+            AnimateTokenMovement(Token, NewTile);
+            TurnDone := True;
+            Break;
+          end;
+        end;
+      finally
+        SortedTokens.Free;
+      end;
+    end;
   end;
   Inc(DiceThrow);
-  if ((CurrentPlayer.Tokens.GetCountByTileKind(tkNone) = 0) and (DiceThrow >= 3)) or
-    ((CurrentPlayer.Tokens.GetCountByTileKind(tkNone) > 0) and (DiceValue <> 6)) then begin
+  if ((CurrentPlayer.Tokens.GetCountByTileKind([tkNone]) = 0) and (DiceThrow >= 3)) or
+    ((CurrentPlayer.Tokens.GetCountByTileKind([tkNone]) > 0) and (DiceValue <> 6)) or
+    (CurrentPlayer.Tokens.GetCountByTileKind([tkHome]) = TokenCount) then begin
     repeat
       CurrentPlayer := Players[(Players.IndexOf(CurrentPlayer) + 1) mod Players.Count];