Changeset 29 for trunk

Timestamp:

Mar 3, 2014, 11:17:23 PM (11 years ago)

Author:

chronos

Message:

• Added: Player customize dialog window.
• Fixed: Rearm once set move count from predefined repeat move count.

Location:

trunk

Files:

• Forms (added)
• Forms/UFormPlayer.lfm (added)
• Forms/UFormPlayer.lrt (added)
• Forms/UFormPlayer.pas (added)
• Languages/xtactics.cs.po (modified) (2 diffs)
• Languages/xtactics.po (modified) (2 diffs)
• UCore.pas (modified) (1 diff)
• UFormNew.lfm (modified) (1 diff)
• UFormNew.lrt (modified) (1 diff)
• UFormNew.pas (modified) (5 diffs)
• UGame.pas (modified) (14 diffs)
• xtactics.lpi (modified) (3 diffs)
• xtactics.lpr (modified) (2 diffs)

trunk/Languages/xtactics.cs.po

@@ -88 +88 @@
 msgstr ""
 
+#: tformnew.buttonplayermodify.caption
+msgid "Modify"
+msgstr ""
+
 #: tformnew.buttonplayerremove.caption
 msgid "Remove"
@@ -124 +128 @@
 msgstr ""
 
+#: tformplayer.buttoncancel.caption
+msgctxt "tformplayer.buttoncancel.caption"
+msgid "Cancel"
+msgstr ""
+
+#: tformplayer.buttonok.caption
+msgctxt "tformplayer.buttonok.caption"
+msgid "Ok"
+msgstr ""
+
+#: tformplayer.caption
+msgid "Player"
+msgstr ""
+
+#: tformplayer.combobox1.text
+msgid "Human"
+msgstr ""
+
+#: tformplayer.label1.caption
+msgid "Name:"
+msgstr ""
+
+#: tformplayer.label2.caption
+msgid "Mode:"
+msgstr ""
+
+#: tformplayer.label3.caption
+msgid "Color:"
+msgstr ""
+
 #: ucore.splayerwins
 msgctxt "ucore.splayerwins"

trunk/Languages/xtactics.po

@@ -79 +79 @@
 msgstr ""
 
+#: tformnew.buttonplayermodify.caption
+msgid "Modify"
+msgstr ""
+
 #: tformnew.buttonplayerremove.caption
 msgid "Remove"
@@ -115 +119 @@
 msgstr ""
 
+#: tformplayer.buttoncancel.caption
+msgctxt "TFORMPLAYER.BUTTONCANCEL.CAPTION"
+msgid "Cancel"
+msgstr ""
+
+#: tformplayer.buttonok.caption
+msgctxt "TFORMPLAYER.BUTTONOK.CAPTION"
+msgid "Ok"
+msgstr ""
+
+#: tformplayer.caption
+msgid "Player"
+msgstr ""
+
+#: tformplayer.combobox1.text
+msgid "Human"
+msgstr ""
+
+#: tformplayer.label1.caption
+msgid "Name:"
+msgstr ""
+
+#: tformplayer.label2.caption
+msgid "Mode:"
+msgstr ""
+
+#: tformplayer.label3.caption
+msgid "Color:"
+msgstr ""
+
 #: ucore.splayerwins
 msgctxt "ucore.splayerwins"

trunk/UCore.pas

@@ -98 +98 @@
     Game.NextTurn;
     FormMain.Redraw;
+    Application.ProcessMessages;
   end;
 end;

trunk/UFormNew.lfm

@@ -119 +119 @@
     ParentColor = False
   end
+  object ButtonPlayerModify: TButton
+    Left = 616
+    Height = 25
+    Top = 72
+    Width = 83
+    Caption = 'Modify'
+    OnChangeBounds = ButtonPlayerModifyChangeBounds
+    OnClick = ButtonPlayerModifyClick
+    TabOrder = 8
+  end
 end

trunk/UFormNew.lrt

@@ -11 +11 @@
 TFORMNEW.LABEL1.CAPTION=Map size:
 TFORMNEW.LABEL2.CAPTION=x
+TFORMNEW.BUTTONPLAYERMODIFY.CAPTION=Modify

trunk/UFormNew.pas

@@ -18 +18 @@
     ButtonOk: TButton;
     ButtonPlayerRemove: TButton;
+    ButtonPlayerModify: TButton;
     CheckBoxVoid: TCheckBox;
     Label1: TLabel;
@@ -25 +26 @@
     SpinEditMapSizeY: TSpinEdit;
     procedure ButtonPlayerAddClick(Sender: TObject);
+    procedure ButtonPlayerModifyChangeBounds(Sender: TObject);
+    procedure ButtonPlayerModifyClick(Sender: TObject);
     procedure ButtonPlayerRemoveClick(Sender: TObject);
     procedure FormCreate(Sender: TObject);
@@ -46 +49 @@
 
 {$R *.lfm}
+
+uses
+  UFormPlayer;
 
 { TFormNew }
@@ -73 +79 @@
   ButtonPlayerRemove.Enabled := Assigned(ListView1.Selected);
   ButtonPlayerAdd.Enabled := Players.Count < MaxPlayerCount;
+  ButtonPlayerModify.Enabled := Assigned(ListView1.Selected);
 end;
 
@@ -101 +108 @@
   Players.Add(NewPlayer);
   ReloadView;
+end;
+
+procedure TFormNew.ButtonPlayerModifyChangeBounds(Sender: TObject);
+begin
+
+end;
+
+procedure TFormNew.ButtonPlayerModifyClick(Sender: TObject);
+begin
+  FormPlayer.Load(TPlayer(ListView1.Selected.Data));
+  if FormPlayer.ShowModal = mrOk then
+    FormPlayer.Save(TPlayer(ListView1.Selected.Data));
 end;
 

trunk/UGame.pas

@@ -120 +120 @@
   end;
 
+  TPlayerArray = array of TPlayer;
+
   TPlayers = class(TObjectList)
 
@@ -143 +145 @@
     FRunning: Boolean;
     procedure MoveAll(Player: TPlayer);
+    procedure ClearMovesFromCell(Cell: TCell);
     procedure SetMove(CellFrom, CellTo: TCell; Power: Integer);
     procedure SetRunning(AValue: Boolean);
+    procedure UpdateRepeatMoves(Player: TPlayer);
   public
     Players: TPlayers;
@@ -154 +158 @@
 
     procedure ComputePlayerStats;
+    function GetAlivePlayers: TPlayerArray;
     procedure NextTurn;
     constructor Create;
@@ -333 +338 @@
 begin
   for Y := 0 to Game.Map.Size.Y - 1 do
-  for X := 0 to Game.Map.Size.Y - 1 do
+  for X := 0 to Game.Map.Size.X - 1 do
   with TCell(Game.Map.Cells[Y, X]) do begin
     if (Terrain <> ttVoid) and (Player <> Self) then begin
@@ -344 +349 @@
       end;
       // Attack if target is weaker
-      if TotalPower > Power then begin
+      if TotalPower >= Power then begin
         TotalAttackPower := 0;
         for I := 0 to Length(Cells) - 1 do
@@ -434 +439 @@
           CellTo.Power := CountOnce - CellTo.Power;
           CellTo.Player := Player;
+          ClearMovesFromCell(CellTo);
         end;
       end;
@@ -448 +454 @@
     Moves.Delete(I);
   end;
+end;
+
+procedure TGame.ClearMovesFromCell(Cell: TCell);
+var
+  I: Integer;
+begin
+  for I := Moves.Count - 1 to 0 do
+  if TMove(Moves[I]).CellFrom = Cell then
+    Moves.Delete(I);
 end;
 
@@ -510 +525 @@
 end;
 
+procedure TGame.UpdateRepeatMoves(Player: TPlayer);
+var
+  I: Integer;
+begin
+  for I := 0 to Moves.Count - 1 do
+  with TMove(Moves[I]) do begin
+    if CellFrom.Player = Player then
+      if CountRepeat <= CellFrom.GetAvialPower then
+        CountOnce := CountRepeat
+        else CountOnce := CellFrom.GetAvialPower;
+  end;
+end;
+
 procedure TGame.ComputePlayerStats;
 var
@@ -522 +550 @@
 end;
 
+function TGame.GetAlivePlayers: TPlayerArray;
+var
+  I: Integer;
+begin
+  SetLength(Result, 0);
+  for I := 0 to Players.Count - 1 do
+    if TPlayer(Players[I]).TotalCells > 0 then begin
+      SetLength(Result, Length(Result) + 1);
+      Result[Length(Result) - 1] := TPlayer(Players[I]);
+    end;
+end;
+
 procedure TGame.NextTurn;
 var
-  AlivePlayers: TObjectList;
-  I: Integer;
   PrevPlayer: TPlayer;
+  AlivePlayers: TPlayerArray;
 begin
   MoveAll(CurrentPlayer);
@@ -537 +576 @@
   until CurrentPlayer.TotalCells > 0;
   if Players.IndexOf(CurrentPlayer) < Players.IndexOf(PrevPlayer) then Inc(TurnCounter);
-  try
-    AlivePlayers := TObjectList.Create;
-    AlivePlayers.OwnsObjects := False;
-    for I := 0 to Players.Count - 1 do
-      if TPlayer(Players[I]).TotalCells > 0 then AlivePlayers.Add(TPlayer(Players[I]));
-    if AlivePlayers.Count <= 1 then begin
-      Running := False;
-      if (AlivePlayers.Count = 1) and Assigned(OnWin) then OnWin(TPlayer(AlivePlayers.First));
-    end;
-  finally
-    AlivePlayers.Free;
-  end;
+  AlivePlayers := GetAlivePlayers;
+  if (Length(AlivePlayers) <= 1) then begin
+    Running := False;
+    if Assigned(OnWin) and (Length(AlivePlayers) > 0) then OnWin(TPlayer(AlivePlayers[0]));
+  end;
+  UpdateRepeatMoves(CurrentPlayer);
 end;
 
@@ -574 +607 @@
   Map := THexMap.Create;
   Map.Game := Self;
-  Map.Size := Point(20, 20);
+  Map.Size := Point(20, 16);
   Moves := TObjectList.Create;
 end;
@@ -758 +791 @@
       Pen.Color := clYellow;
       Pen.Style := psSolid;
+      Pen.Width := 1;
     end else begin
       Pen.Color := clBlack;
@@ -764 +798 @@
       Pen.Color := Brush.Color;
       Pen.Style := psSolid;
+      Pen.Width := 0;
     end;
     Points := GetHexagonPolygon(Point(Trunc(Pos.X), Trunc(Pos.Y)), Point(Trunc(HexSize.X), Trunc(HexSize.Y)));
@@ -812 +847 @@
             PosFrom := CellToPos(Cell, View);
             PosTo := CellToPos(TMove(Cell.MovesFrom[I]).CellTo, View);
+            if TMove(Cell.MovesFrom[I]).CountRepeat > 0 then Pen.Width := 2
+              else Pen.Width := 1;
             Line(View.CellToCanvasPos(Point(Trunc(PosFrom.X + (PosTo.X - PosFrom.X) / 4),
               Trunc(PosFrom.Y + (PosTo.Y - PosFrom.Y) / 4))),
               View.CellToCanvasPos(Point(Trunc(PosFrom.X + (PosTo.X - PosFrom.X) / 2),
               Trunc(PosFrom.Y + (PosTo.Y - PosFrom.Y) / 2))));
+            Pen.Width := 1;
           end;
         end;

trunk/xtactics.lpi

@@ -77 +77 @@
       </Item1>
     </RequiredPackages>
-    <Units Count="6">
+    <Units Count="7">
       <Unit0>
         <Filename Value="xtactics.lpr"/>
@@ -120 +120 @@
         <UnitName Value="UCore"/>
       </Unit5>
+      <Unit6>
+        <Filename Value="Forms/UFormPlayer.pas"/>
+        <IsPartOfProject Value="True"/>
+        <ComponentName Value="FormPlayer"/>
+        <ResourceBaseClass Value="Form"/>
+        <UnitName Value="UFormPlayer"/>
+      </Unit6>
     </Units>
   </ProjectOptions>
@@ -129 +136 @@
     <SearchPaths>
       <IncludeFiles Value="$(ProjOutDir)"/>
+      <OtherUnitFiles Value="Forms"/>
       <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>

trunk/xtactics.lpr

@@ -8 +8 @@
   {$ENDIF}{$ENDIF}
   Interfaces, // this includes the LCL widgetset
-  Forms, UFormMain, UGame, UFormNew, UFormMove, UCore
+  Forms, UFormMain, UGame, UFormNew, UFormMove, UCore, UFormPlayer
   { you can add units after this };
 
@@ -20 +20 @@
   Application.CreateForm(TFormNew, FormNew);
   Application.CreateForm(TFormMove, FormMove);
+  Application.CreateForm(TFormPlayer, FormPlayer);
   Application.Run;
 end.