Changeset 30 for trunk

Timestamp:

Mar 4, 2014, 12:18:22 AM (11 years ago)

Author:

chronos

Message:

• Modified: Player FocusedCell and SelectedCell moved to TView instance from TPlayer.

Location:

trunk

Files:

• Languages/xtactics.cs.po (modified) (2 diffs)
• UCore.lfm (modified) (1 diff)
• UCore.pas (modified) (3 diffs)
• UFormMain.lfm (modified) (1 diff)
• UFormMain.pas (modified) (4 diffs)
• UFormNew.pas (modified) (1 diff)
• UGame.pas (modified) (21 diffs)

trunk/Languages/xtactics.cs.po

@@ -55 +55 @@
 msgctxt "tformmove.buttoncancel.caption"
 msgid "Cancel"
-msgstr ""
+msgstr "Zrušit"
 
 #: tformmove.buttonok.caption
 msgctxt "tformmove.buttonok.caption"
 msgid "Ok"
-msgstr ""
+msgstr "Ok"
 
 #: tformmove.caption
 msgid "Move"
-msgstr ""
+msgstr "Přesun"
 
 #: tformmove.label1.caption
 msgid "Once:"
-msgstr ""
+msgstr "Jednou:"
 
 #: tformmove.label2.caption
 msgid "Every turn:"
-msgstr ""
+msgstr "Každý tah:"
 
 #: tformnew.buttoncancel.caption
 msgctxt "tformnew.buttoncancel.caption"
 msgid "Cancel"
-msgstr ""
+msgstr "Zrušit"
 
 #: tformnew.buttonok.caption
 msgctxt "tformnew.buttonok.caption"
 msgid "Ok"
-msgstr ""
+msgstr "Ok"
 
 #: tformnew.buttonplayeradd.caption
 msgid "Add"
-msgstr ""
+msgstr "Přidat"
 
 #: tformnew.buttonplayermodify.caption
 msgid "Modify"
-msgstr ""
+msgstr "Upravit"
 
 #: tformnew.buttonplayerremove.caption
 msgid "Remove"
-msgstr ""
+msgstr "Odebrat"
 
 #: tformnew.caption
 msgid "New game"
-msgstr ""
+msgstr "Nová hra"
 
 #: tformnew.checkboxvoid.caption
 msgid "Inaccessible places"
-msgstr ""
+msgstr "Nepřístupná políčka"
 
 #: tformnew.label1.caption
 msgid "Map size:"
-msgstr ""
+msgstr "Velikost mapy:"
 
 #: tformnew.label2.caption
 msgid "x"
-msgstr ""
+msgstr "x"
 
 #: tformnew.listview1.columns[0].caption
 msgid "Name"
-msgstr ""
+msgstr "Jméno"
 
 #: tformnew.listview1.columns[1].caption
 msgid "Type"
-msgstr ""
+msgstr "Typ"
 
 #: tformnew.listview1.columns[2].caption
 msgid "Color"
-msgstr ""
+msgstr "Barva"
 
 #: tformnew.listview1.columns[3].caption
 msgid "Start units"
-msgstr ""
+msgstr "Počátečních jednotek"
 
 #: tformplayer.buttoncancel.caption
 msgctxt "tformplayer.buttoncancel.caption"
 msgid "Cancel"
-msgstr ""
+msgstr "Zrušit"
 
 #: tformplayer.buttonok.caption
 msgctxt "tformplayer.buttonok.caption"
 msgid "Ok"
-msgstr ""
+msgstr "Ok"
 
 #: tformplayer.caption
 msgid "Player"
-msgstr ""
+msgstr "Hráč"
 
 #: tformplayer.combobox1.text
 msgid "Human"
-msgstr ""
+msgstr "Člověk"
 
 #: tformplayer.label1.caption
 msgid "Name:"
-msgstr ""
+msgstr "Jméno:"
 
 #: tformplayer.label2.caption
 msgid "Mode:"
-msgstr ""
+msgstr "Režim:"
 
 #: tformplayer.label3.caption
 msgid "Color:"
-msgstr ""
+msgstr "Barva:"
 
 #: ucore.splayerwins
@@ -165 +165 @@
 #: uformmain.sturn
 msgid "turn"
-msgstr ""
+msgstr "tah"
 
 #: ugame.sminimumplayers
 msgid "You need at least two players"
 msgstr "Potřebujete alespoň dva hráče"
-

trunk/UCore.lfm

@@ -4 +4 @@
   OldCreateOrder = False
   Height = 542
-  HorizontalOffset = 485
-  VerticalOffset = 284
+  HorizontalOffset = 738
+  VerticalOffset = 183
   Width = 752
   object ActionList1: TActionList

trunk/UCore.pas

@@ -34 +34 @@
   public
     Game: TGame;
+    UseSingleView: Boolean;
+    View: TView;
     procedure Init;
     property Initialized: Boolean read FInitialized;
@@ -80 +82 @@
 procedure TCore.AExitExecute(Sender: TObject);
 begin
+  Game.Running := False;
   Application.Terminate;
 end;
@@ -99 +102 @@
     FormMain.Redraw;
     Application.ProcessMessages;
+    Sleep(1);
   end;
 end;

trunk/UFormMain.lfm

@@ -9 +9 @@
   Menu = MainMenu1
   OnActivate = FormActivate
+  OnClose = FormClose
   OnCreate = FormCreate
   OnDestroy = FormDestroy

trunk/UFormMain.pas

@@ -34 +34 @@
     ToolButton4: TToolButton;
     procedure FormActivate(Sender: TObject);
+    procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
     procedure FormCreate(Sender: TObject);
     procedure FormDestroy(Sender: TObject);
@@ -132 +133 @@
 end;
 
+procedure TFormMain.FormClose(Sender: TObject; var CloseAction: TCloseAction);
+begin
+  Core.Game.Running := False;
+end;
+
 procedure TFormMain.FormDestroy(Sender: TObject);
 begin
@@ -176 +182 @@
     end;
     Cell := nil;
-    OldCell := Core.Game.CurrentPlayer.FocusedCell;
+    OldCell := Core.Game.CurrentPlayer.View.FocusedCell;
     with Core.Game do
       Cell := Map.PosToCell(CurrentPlayer.View.CanvasToCellPos(Point(X, Y)), CurrentPlayer.View );
     if Assigned(Cell) then begin
-      Core.Game.CurrentPlayer.FocusedCell := Cell;
+      Core.Game.CurrentPlayer.View.FocusedCell := Cell;
       StatusBar1.Panels[0].Text := '[' + IntToStr(Cell.Pos.X) + ', ' + IntToStr(Cell.Pos.Y) + ']';
     end else begin
-      Core.Game.CurrentPlayer.FocusedCell := nil;
+      Core.Game.CurrentPlayer.View.FocusedCell := nil;
       StatusBar1.Panels[0].Text := '';
     end;
@@ -195 +201 @@
   if (Abs(StartMousePoint.X - X) < 5) and (Abs(StartMousePoint.Y - Y) < 5) then begin
     if Core.Game.Running and (Core.Game.CurrentPlayer.Mode = pmHuman) then begin
-      Core.Game.CurrentPlayer.SelectCell(Point(X, Y));
+      Core.Game.CurrentPlayer.View.SelectCell(Point(X, Y), Core.Game.CurrentPlayer);
       Redraw;
     end;

trunk/UFormNew.pas

@@ -106 +106 @@
   NewPlayer.Name := 'Player ' + IntToStr(Players.Count + 1);
   NewPlayer.Color := PlayerColors[Players.Count];
+  NewPlayer.Mode := pmComputer;
   Players.Add(NewPlayer);
   ReloadView;

trunk/UGame.pas

@@ -58 +58 @@
     procedure SetZoom(AValue: Double);
   public
+    Game: TGame;
     SourceRect: TRect;
+    FocusedCell: TCell;
+    SelectedCell: TCell;
+    procedure Clear;
     constructor Create;
     destructor Destroy; override;
+    procedure SelectCell(Pos: TPoint; Player: TPlayer);
     function CanvasToCellPos(Pos: TPoint): TPoint;
     function CellToCanvasPos(Pos: TPoint): TPoint;
@@ -86 +91 @@
     function CellToPos(Cell: TCell; View: TView): TPoint;
     function GetHexagonPolygon(Pos: TPoint; HexSize: TPoint): TPointArray;
-    procedure Paint(Canvas: TCanvas; View: TView; SelectedCell: TCell; FocusedCell: TCell);
+    procedure Paint(Canvas: TCanvas; View: TView);
     constructor Create;
     destructor Destroy; override;
@@ -102 +107 @@
 
   TPlayer = class
-    Game: TGame;
+  private
+    FGame: TGame;
+    procedure SetGame(AValue: TGame);
+  public
     Name: string;
     Color: TColor;
     View: TView;
-    SelectedCell: TCell;
-    FocusedCell: TCell;
     Mode: TPlayerMode;
     TotalUnits: Integer;
@@ -113 +119 @@
     StartUnits: Integer;
     procedure ComputerTurn;
-    procedure SelectCell(Pos: TPoint);
     procedure Paint(PaintBox: TPaintBox);
     constructor Create;
     destructor Destroy; override;
     procedure Assign(Source: TPlayer);
+    property Game: TGame read FGame write SetGame;
   end;
 
@@ -243 +249 @@
 end;
 
+procedure TView.Clear;
+begin
+  FocusedCell := nil;
+  SelectedCell := nil;
+end;
+
 procedure TView.SetDestRect(AValue: TRect);
 begin
@@ -254 +266 @@
 constructor TView.Create;
 begin
-  Zoom := 1;
+  Zoom := 1.5;
+  Clear;
 end;
 
@@ -326 +339 @@
   DestRect := Source.DestRect;
   Zoom := Source.Zoom;
+  SelectedCell := Source.SelectedCell;
+  FocusedCell := Source.FocusedCell;
+end;
+
+procedure TPlayer.SetGame(AValue: TGame);
+begin
+  if FGame = AValue then Exit;
+  FGame := AValue;
+  View.Game := Game;
 end;
 
@@ -336 +358 @@
   TotalAttackPower: Integer;
   I: Integer;
+  CanAttack: Integer;
 begin
   for Y := 0 to Game.Map.Size.Y - 1 do
@@ -341 +364 @@
   with TCell(Game.Map.Cells[Y, X]) do begin
     if (Terrain <> ttVoid) and (Player <> Self) then begin
+      // Attack to not owned cell yet
       // Count own possible power
       Cells := Game.Map.GetCellNeighbours(Game.Map.Cells[Y, X]);
@@ -361 +385 @@
         end;
       end;
-    end;
-  end;
-end;
-
-procedure TPlayer.SelectCell(Pos: TPoint);
+    end else
+    if (Terrain <> ttVoid) and (Player = Self) then begin
+      // Inner moves
+      // We need to move available power to borders to be available for attacks
+      // or defense
+      Cells := Game.Map.GetCellNeighbours(Game.Map.Cells[Y, X]);
+      CanAttack := 0;
+      for I := 0 to Length(Cells) - 1 do
+      if (Cells[I].Player <> Self) then begin
+        Inc(CanAttack);
+      end;
+      if CanAttack = 0 then begin
+        // We cannot attack and should do move
+        // For simplicty just try to balance inner area cells power
+        for I := 0 to Length(Cells) - 1 do
+        if (Cells[I].Player = Self) and (Cells[I].Power < Game.Map.Cells[Y, X].GetAvialPower) then begin
+          Game.SetMove(Game.Map.Cells[Y, X], Cells[I], (Game.Map.Cells[Y, X].GetAvialPower - Cells[I].Power) div 2);
+        end;
+      end;
+    end;
+  end;
+end;
+
+procedure TView.SelectCell(Pos: TPoint; Player: TPlayer);
 var
   NewSelectedCell: TCell;
@@ -371 +414 @@
   BottomRight: TPoint;
 begin
-  NewSelectedCell := Game.Map.PosToCell(View.CanvasToCellPos(Pos), View);
+  NewSelectedCell := Game.Map.PosToCell(CanvasToCellPos(Pos), Self);
   if Assigned(NewSelectedCell) then begin
     if Assigned(SelectedCell) and IsCellsNeighbor(NewSelectedCell, SelectedCell) then begin
@@ -377 +420 @@
       SelectedCell := nil;
     end else
-    if (NewSelectedCell <> SelectedCell) and (NewSelectedCell.Player = Self) then
+    if (NewSelectedCell <> SelectedCell) and (NewSelectedCell.Player = Player) then
       SelectedCell := NewSelectedCell
     else
-    if (NewSelectedCell = SelectedCell) and (NewSelectedCell.Player = Self) then
+    if (NewSelectedCell = SelectedCell) and (NewSelectedCell.Player = Player) then
       SelectedCell := nil;
   end;
@@ -387 +430 @@
 procedure TPlayer.Paint(PaintBox: TPaintBox);
 begin
-  Game.Map.Paint(PaintBox.Canvas, View, SelectedCell, FocusedCell);
+  Game.Map.Paint(PaintBox.Canvas, View);
 end;
 
@@ -393 +436 @@
 begin
   View := TView.Create;
-  SelectedCell := nil;
-  FocusedCell := nil;
   StartUnits := DefaultPlayerStartUnits;
 end;
@@ -413 +454 @@
   TotalUnits := Source.TotalUnits;
   StartUnits := Source.StartUnits;
-  SelectedCell := Source.SelectedCell;
-  FocusedCell := Source.FocusedCell;
   View.Assign(Source.View);
 end;
@@ -432 +471 @@
       end else begin
         // Fight
+        //NewPower := CellTo.Power - Trunc(CountOnce / CellTo.Power);
         if CellTo.Power > CountOnce then begin
           // Defender wins
@@ -519 +559 @@
     for I := 0 to Players.Count - 1 do
     with TPlayer(Players[I]) do begin
-      SelectedCell := nil;
-      FocusedCell := nil;
+      View.Clear;
     end;
   end;
@@ -582 +621 @@
   end;
   UpdateRepeatMoves(CurrentPlayer);
+  // For computers take view from previous human
+  if CurrentPlayer.Mode = pmComputer then CurrentPlayer.View.Assign(PrevPlayer.View);
 end;
 
@@ -639 +680 @@
   for I := 0 to Players.Count - 1 do
   with TPlayer(Players[I]) do begin
-    SelectedCell := nil;
+    View.Clear;
     if (Map.Size.X > 0) and (Map.Size.Y > 0) then begin
       StartCell := Map.Cells[Random(Map.Size.Y), Random(Map.Size.X)];
@@ -771 +812 @@
 end;
 
-procedure THexMap.Paint(Canvas: TCanvas; View: TView; SelectedCell: TCell; FocusedCell: TCell);
+procedure THexMap.Paint(Canvas: TCanvas; View: TView);
 var
   CX, CY: Integer;
@@ -788 +829 @@
 begin
   with Canvas do begin
-    if Assigned(FocusedCell) and (FocusedCell = TCell(Cells[CY, CX])) then begin
+    if Assigned(View.FocusedCell) and (View.FocusedCell = TCell(Cells[CY, CX])) then begin
       Pen.Color := clYellow;
       Pen.Style := psSolid;