Changeset 3 for trunk

Timestamp:

Feb 8, 2014, 11:28:47 PM (11 years ago)

Author:

chronos

Message:

• Added: Support for multiple players.
• Added: Each cell have power state.

Location:

trunk

Files:

• UFormMain.lfm (modified) (1 diff)
• UFormMain.pas (modified) (4 diffs)
• UGame.pas (modified) (11 diffs)
• xtactics.lpi (modified) (1 diff)

trunk/UFormMain.lfm

@@ -9 +9 @@
   OnCreate = FormCreate
   OnDestroy = FormDestroy
+  OnShow = FormShow
   LCLVersion = '1.3'
   object PaintBox1: TPaintBox

trunk/UFormMain.pas

@@ -17 +17 @@
     procedure FormCreate(Sender: TObject);
     procedure FormDestroy(Sender: TObject);
+    procedure FormShow(Sender: TObject);
     procedure PaintBox1MouseDown(Sender: TObject; Button: TMouseButton;
       Shift: TShiftState; X, Y: Integer);
@@ -45 +46 @@
 procedure TFormMain.PaintBox1Paint(Sender: TObject);
 begin
-  Game.Player.Paint(PaintBox1);
+  TPlayer(Game.Players[0]).Paint(PaintBox1);
 end;
 
@@ -62 +63 @@
 end;
 
+procedure TFormMain.FormShow(Sender: TObject);
+begin
+  Game.New;
+end;
+
 procedure TFormMain.PaintBox1MouseDown(Sender: TObject; Button: TMouseButton;
   Shift: TShiftState; X, Y: Integer);
 begin
   StartMousePoint := Point(X, Y);
-  StartViewPoint := Point(Game.Player.View.Left, Game.Player.View.Top);
+  StartViewPoint := Point(TPlayer(Game.Players[0]).View.Left, TPlayer(Game.Players[0]).View.Top);
   MoveActive := True;
 end;
@@ -79 +85 @@
 begin
   if MoveActive then begin
-    Game.Player.View := Bounds(StartViewPoint.X + StartMousePoint.X - X,
+    TPlayer(Game.Players[0]).View := Bounds(StartViewPoint.X + StartMousePoint.X - X,
       StartViewPoint.Y + StartMousePoint.Y - Y,
-      Game.Player.View.Right - Game.Player.View.Left,
-      Game.Player.View.Bottom - Game.Player.View.Top);
+      TPlayer(Game.Players[0]).View.Right - TPlayer(Game.Players[0]).View.Left,
+      TPlayer(Game.Players[0]).View.Bottom - TPlayer(Game.Players[0]).View.Top);
     PaintBox1.Repaint;
   end;
-  Caption := IntToStr(Game.Player.View.Right - Game.Player.View.Left);
+  Caption := IntToStr(TPlayer(Game.Players[0]).View.Right - TPlayer(Game.Players[0]).View.Left);
 end;
 

trunk/UGame.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, ExtCtrls, Graphics;
+  Classes, SysUtils, ExtCtrls, Graphics, Contnrs;
 
 type
   TGame = class;
+  TPlayer = class;
 
   TFloatPoint = record
@@ -15 +16 @@
   end;
 
+  TTerrainType = (ttVoid, ttNormal);
+
+  { TCell }
+
   TCell = class
-    Visible: Boolean;
-    BackgroundColor: TColor;
-    Name: string;
+    Terrain: TTerrainType;
+    Power: Integer;
+    Player: TPlayer;
+    function GetColor: TColor;
   end;
 
@@ -28 +34 @@
     procedure Paint(Canvas: TCanvas; Rect: TRect);
     constructor Create;
+    procedure Init(Size: TPoint);
   end;
 
@@ -36 +43 @@
     Name: string;
     View: TRect;
+    Color: TColor;
     procedure Paint(PaintBox: TPaintBox);
   end;
@@ -42 +50 @@
 
   TGame = class
-    Player: TPlayer;
+    Players: TObjectList;
     Map: TMap;
     constructor Create;
     destructor Destroy; override;
+    procedure New;
   end;
 
@@ -55 +64 @@
   Result.X := AX;
   Result.Y := AY;
+end;
+
+{ TCell }
+
+function TCell.GetColor: TColor;
+begin
+  if Assigned(Player) then Result := Player.Color
+    else Result := clGray;
 end;
 
@@ -70 +87 @@
 constructor TGame.Create;
 var
+  Player: TPlayer;
+begin
+  Players := TObjectList.Create;
+  Player := TPlayer.Create;
+  Player.Game := Self;
+  Player.Color := clBlue;
+  Players.Add(Player);
+  Player := TPlayer.Create;
+  Player.Game := Self;
+  Player.Color := clRed;
+  Players.Add(Player);
+
+  Map := TMap.Create;
+end;
+
+destructor TGame.Destroy;
+begin
+  FreeAndNil(Players);
+  FreeAndNil(Map);
+  inherited Destroy;
+end;
+
+procedure TGame.New;
+var
   X, Y: Integer;
   NewCell: TCell;
-  C: Integer;
-begin
-  Player := TPlayer.Create;
-  Player.Game := Self;
-  Map := TMap.Create;
-  SetLength(Map.Cells, 100, 100);
-  C := 0;
+  I: Integer;
+  StartCell: TCell;
+begin
+  Map.Init(Point(20, 20));
   for Y := 0 to Length(Map.Cells) - 1 do
-  for X := 0 to Length(Map.Cells[0]) - 1 do begin
-    NewCell := TCell.Create;
-    NewCell.Visible := Boolean(Random(2));
-    NewCell.Name := IntToStr(C);
-    Map.Cells[Y, X] := NewCell;
-    //Map.Cells[Y, X].Color := Boolean(Random(2));
-    Inc(C);
-  end;
-end;
-
-destructor TGame.Destroy;
-begin
-  FreeAndNil(Player);
-  FreeAndNil(Map);
-  inherited Destroy;
+  for X := 0 to Length(Map.Cells[0]) - 1 do
+  with Map.Cells[Y, X] do begin
+    if Random(2) = 0 then Terrain := ttVoid
+      else Terrain := ttNormal;
+    Power := Random(4);
+  end;
+  for I := 0 to Players.Count - 1 do
+  with TPlayer(Players[I]) do begin
+    StartCell := Map.Cells[Random(Length(Map.Cells)), Random(Length(Map.Cells[0]))];
+    StartCell.Terrain := ttNormal;
+    StartCell.Player := TPlayer(Players[I]);
+  end;
 end;
 
@@ -129 +164 @@
     LineTo(Round(X + 0 * HexSize.X), Round(Y - 0.5 * HexSize.Y));
   *)
+    Font.Color := clWhite;
     TextOut(Round(X) - TextWidth(Text) div 2, Round(Y) - TextHeight(Text) div 2, Text);
   end;
@@ -139 +175 @@
   with Canvas do try
     Lock;
-    for CY := Trunc(Rect.Top / CellSize.Y) to Trunc(Rect.Bottom / CellSize.Y) do
-    for CX := Trunc(Rect.Left / CellSize.X) to Trunc(Rect.Right / CellSize.X) do begin
+    for CY := Trunc(Rect.Top / CellSize.Y) to Trunc(Rect.Bottom / CellSize.Y) + 1 do
+    for CX := Trunc(Rect.Left / CellSize.X) to Trunc(Rect.Right / CellSize.X) + 1 do begin
       X := CX - Trunc(Rect.Left / CellSize.X);
       Y := CY - Trunc(Rect.Top / CellSize.Y);
@@ -148 +184 @@
       end;
       if (CX >= 0) and (CY >= 0) and (CY < Length(Cells)) and (CX < Length(Cells[0])) then
-      if Cells[CY, CX].Visible then
-      PaintHexagon(X * CellSize.X - Frac(Rect.Left / CellSize.X) * CellSize.X,
-        Y * CellSize.Y - Frac(Rect.Top / CellSize.Y) * CellSize.Y, Cells[CY, CX].Name);
-      //Break;
+      if Cells[CY, CX].Terrain = ttNormal then begin
+        Brush.Color := Cells[CY, CX].GetColor;
+        PaintHexagon(X * CellSize.X - Frac(Rect.Left / CellSize.X) * CellSize.X,
+          Y * CellSize.Y - Frac(Rect.Top / CellSize.Y) * CellSize.Y, IntToStr(Cells[CY, CX].Power));
+      end;
     end;
   finally
@@ -163 +200 @@
 end;
 
+procedure TMap.Init(Size: TPoint);
+var
+  X, Y: Integer;
+  NewCell: TCell;
+  C: Integer;
+begin
+  // Free previous
+  for Y := 0 to Length(Cells) - 1 do
+  for X := 0 to Length(Cells[0]) - 1 do begin
+    Cells[Y, X].Destroy;
+  end;
+  // Allocate and init new
+  SetLength(Cells, Size.X, Size.Y);
+  for Y := 0 to Length(Cells) - 1 do
+  for X := 0 to Length(Cells[0]) - 1 do begin
+    NewCell := TCell.Create;
+    Cells[Y, X] := NewCell;
+  end;
+end;
+
 end.
 

trunk/xtactics.lpi

@@ -43 +43 @@
         <IsPartOfProject Value="True"/>
         <ComponentName Value="FormMain"/>
+        <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="UFormMain"/>