Changeset 9

Timestamp:

Feb 12, 2014, 10:58:00 PM (11 years ago)

Author:

chronos

Message:

• Added: Neighbors of selected cell can be selected as attack target.
• Added: End of turn cause player switch.

Location:

trunk

Files:

• UFormMain.lfm (modified) (3 diffs)
• UFormMain.pas (modified) (4 diffs)
• UGame.pas (modified) (11 diffs)

trunk/UFormMain.lfm

@@ -1 +1 @@
 object FormMain: TFormMain
-  Left = 526
+  Left = 503
   Height = 621
-  Top = 270
+  Top = 263
   Width = 775
   Caption = 'xTactics'
@@ -12 +12 @@
   OnShow = FormShow
   LCLVersion = '1.3'
+  WindowState = wsMaximized
   object PaintBox1: TPaintBox
     Left = 0
@@ -52 +53 @@
   end
   object ActionList1: TActionList
-    left = 223
+    left = 224
     top = 49
     object AGameNew: TAction
       Caption = 'New'
       OnExecute = AGameNewExecute
+      ShortCut = 16462
     end
     object AExit: TAction
       Caption = 'Exit'
       OnExecute = AExitExecute
+      ShortCut = 32883
     end
     object AGameEnd: TAction
       Caption = 'End'
+      ShortCut = 16454
     end
     object AGameEndTurn: TAction
       Caption = 'End turn'
+      OnExecute = AGameEndTurnExecute
+      ShortCut = 16468
     end
     object AGameRestart: TAction
       Caption = 'Restart'
+      ShortCut = 16466
     end
   end

trunk/UFormMain.pas

@@ -34 +34 @@
     Timer1: TTimer;
     procedure AExitExecute(Sender: TObject);
+    procedure AGameEndTurnExecute(Sender: TObject);
     procedure AGameNewExecute(Sender: TObject);
     procedure FormCreate(Sender: TObject);
@@ -92 +93 @@
     RedrawPending := False;
     PaintBox1.Repaint;
+    Caption := Game.CurrentPlayer.Name + ' - xTactics';
   end;
 end;
@@ -108 +110 @@
 begin
   Application.Terminate;
+end;
+
+procedure TFormMain.AGameEndTurnExecute(Sender: TObject);
+begin
+  Game.NextTurn;
+  Redraw;
 end;
 
@@ -128 +136 @@
 begin
   Game.New;
+  Redraw;
 end;
 

trunk/UGame.pas

@@ -34 +34 @@
   private
   public
+    MaxPower: Integer;
     DefaultCellSize: TPoint;
     Cells: array of array of TCell;
@@ -43 +44 @@
     destructor Destroy; override;
     procedure Init(Size: TPoint);
+    procedure Grow(APlayer: TPlayer);
   end;
 
@@ -65 +67 @@
     Map: TMap;
     VoidEnabled: Boolean;
+    CurrentPlayer: TPlayer;
+    procedure NextTurn;
     constructor Create;
     destructor Destroy; override;
@@ -99 +103 @@
 end;
 
+function IsCellsNeighbor(Cell1, Cell2: TPoint): Boolean;
+var
+  DX: Integer;
+  DY: Integer;
+  MinY: Integer;
+begin
+  if Cell1.Y < Cell2.Y then MinY:= Cell1.Y
+    else MinY := Cell2.Y;
+  DX := Cell2.X - Cell1.X;
+  DY := Cell2.Y - Cell1.Y;
+  Result := (Abs(DX) <= 1) and (Abs(DY) <= 1) and
+  ((((MinY mod 2) = 1) and
+    not ((DX = 1) and (DY = -1)) and
+    not ((DX = -1) and (DY = 1))) or
+    (((MinY mod 2) = 0) and
+    not ((DX = -1) and (DY = -1)) and
+    not ((DX = 1) and (DY = 1))));
+end;
+
 { TCell }
 
@@ -114 +137 @@
 begin
   NewSelectedCell := Game.Map.PosToCell(Pos, View, ViewZoom);
-  if (NewSelectedCell.X = SelectedCell.X) and (NewSelectedCell.Y = SelectedCell.Y) then
-    SelectedCell := Point(-1, -1)
-    else SelectedCell := NewSelectedCell;
+  if (NewSelectedCell.X >= 0) and (NewSelectedCell.X < Length(Game.Map.Cells[0])) and
+    (NewSelectedCell.Y >= 0) and (NewSelectedCell.Y < Length(Game.Map.Cells)) then begin
+    if IsCellsNeighbor(NewSelectedCell, SelectedCell) then begin
+      // Attack
+      TCell(Game.Map.Cells[NewSelectedCell.Y, NewSelectedCell.X]).Player := Self;
+      TCell(Game.Map.Cells[NewSelectedCell.Y, NewSelectedCell.X]).Power :=
+        TCell(Game.Map.Cells[NewSelectedCell.Y, NewSelectedCell.X]).Power +
+        TCell(Game.Map.Cells[SelectedCell.Y, SelectedCell.X]).Power;
+      TCell(Game.Map.Cells[SelectedCell.Y, SelectedCell.X]).Power := 0;
+      SelectedCell := Point(-1, -1);
+    end else
+    if (NewSelectedCell.X <> SelectedCell.X) and (NewSelectedCell.Y <> SelectedCell.Y) and
+      (TCell(Game.Map.Cells[NewSelectedCell.Y, NewSelectedCell.X]).Player = Self) then
+      SelectedCell := NewSelectedCell
+    else
+    if (NewSelectedCell.X = SelectedCell.X) and (NewSelectedCell.Y = SelectedCell.Y) and
+      (TCell(Game.Map.Cells[NewSelectedCell.Y, NewSelectedCell.X]).Player = Self) then
+        SelectedCell := Point(-1, -1);
+  end;
 end;
 
@@ -127 +166 @@
 begin
   ViewZoom := 1;
+  SelectedCell := Point(-1, -1);
 end;
 
 { TGame }
+
+procedure TGame.NextTurn;
+begin
+  Map.Grow(CurrentPlayer);
+  CurrentPlayer := TPlayer(Players[(Players.IndexOf(CurrentPlayer) + 1) mod Players.Count]);
+end;
 
 constructor TGame.Create;
@@ -137 +183 @@
   Players := TObjectList.Create;
   Player := TPlayer.Create;
+  Player.Name := 'Player 1';
   Player.Game := Self;
   Player.Color := clBlue;
   Players.Add(Player);
   Player := TPlayer.Create;
+  Player.Name := 'Player 2';
   Player.Game := Self;
   Player.Color := clRed;
   Players.Add(Player);
+
+  //VoidEnabled := True;
 
   Map := TMap.Create;
@@ -176 +226 @@
     StartCell.Player := TPlayer(Players[I]);
   end;
+  CurrentPlayer := TPlayer(Players[0]);
 end;
 
@@ -261 +312 @@
       if Cells[CY, CX].Terrain = ttNormal then begin
         if (SelectedCell.X = CX) and (SelectedCell.Y = CY) then Brush.Color := clGreen
+          else if IsCellsNeighbor(SelectedCell, Point(CX, CY)) then Brush.Color := clPurple
           else Brush.Color := Cells[CY, CX].GetColor;
         PaintHexagon(X * CellSize.X - Frac(Rect.Left / CellSize.X) * CellSize.X,
@@ -274 +326 @@
 begin
   DefaultCellSize := Point(62, 62);
+  MaxPower := 99;
 end;
 
@@ -302 +355 @@
 end;
 
+procedure TMap.Grow(APlayer: TPlayer);
+var
+  X, Y: Integer;
+begin
+  for Y := 0 to Length(Cells) - 1 do
+  for X := 0 to Length(Cells[0]) - 1 do
+  with TCell(Cells[Y, X]) do begin
+    if Player = APlayer then begin
+      Power := Power + 1;
+      if Power > MaxPower then Power := MaxPower;
+    end;
+  end;
+end;
+
 end.