Changeset 265 for trunk/Forms/UFormNew.pas

Timestamp:

Jan 15, 2019, 1:03:40 AM (6 years ago)

Author:

chronos

Message:

• Modified: Cell power is now internally represented as unit power (TUnit class).
• Modified: Allow to have only one player in the game.
• Added: New win objective None to just play freely without any win objective.
• Added: New win objective to capture entire map.
• Added: TGameSystem class to represent various game play systems of other existing games.
• Fixed: Clear correctly defender player from unit moves if his cell is captured.
• Fixed: Do not allow to remove too many players to have at least minimum players.

File:

• trunk/Forms/UFormNew.pas (modified) (7 diffs)

trunk/Forms/UFormNew.pas

@@ -163 +163 @@
   SGridTypeRandom = 'Random';
   SGridTypeIsometric = 'Isometric';
+  SWinObjectiveNone = 'None';
   SWinObjectiveDefeatAllOponents = 'Defeat all oponents';
   SWinObjectiveDefeatAllCities = 'Defeat all oponents cities';
   SWinObjectiveCapturePosition = 'Capture all special cells';
   SWinObjectiveStayAliveForTurns = 'Stay alive for number of turns';
+  SWinObjectiveCaptureEntireMap = 'Capture entire map';
   SGrowNone = 'None';
   SGrowPlayerCities = 'Player cities';
@@ -283 +285 @@
     LastIndex := ItemIndex;
     Clear;
+    Items.Add(SWinObjectiveNone);
     Items.Add(SWinObjectiveDefeatAllOponents);
     Items.Add(SWinObjectiveDefeatAllCities);
     Items.Add(SWinObjectiveCapturePosition);
     Items.Add(SWinObjectiveStayAliveForTurns);
+    Items.Add(SWinObjectiveCaptureEntireMap);
     ItemIndex := LastIndex;
   end;
@@ -327 +331 @@
 procedure TFormNew.UpdateInterface;
 begin
-  APlayerRemove.Enabled := Assigned(ListViewPlayers.Selected) and (Players.Count > 2);
+  APlayerRemove.Enabled := Assigned(ListViewPlayers.Selected) and (Players.Count > MinPlayerCount);
   APlayerAdd.Enabled := Players.Count < MaxPlayerCount;
   APlayerModify.Enabled := Assigned(ListViewPlayers.Selected);
@@ -427 +431 @@
   if ListViewPlayers.Items[I].Selected then begin
     Players.Remove(ListViewPlayers.Items[I].Data);
+    if Players.Count <= MinPlayerCount then Break;
   end;
   ReloadView;
@@ -487 +492 @@
   if Players.Count <= (MaxPlayerCount - 1) then begin
     NewPlayer := TPlayer.Create;
-    NewPlayer.Id := Players.GetNewPlayerId;
+    NewPlayer.Id := Players.GetNewId;
     NewPlayer.Name := SPlayer + ' ' + IntToStr(NewPlayer.Id);
     NewPlayer.Color := PlayerColors[Players.Count];
@@ -539 +544 @@
     SpinEditTurns.Value := StayAliveForDefinedTurns;
     SpinEditSpecialCells.Value := SpecialCaptureCellCount;
-    CheckBoxEmptyCellsNeutral.Checked := EmptyCellsNeutral;
+    CheckBoxEmptyCellsNeutral.Checked := GameSystem.EmptyCellsNeutral;
   end;
 end;
@@ -582 +587 @@
     StayAliveForDefinedTurns := SpinEditTurns.Value;
     SpecialCaptureCellCount := SpinEditSpecialCells.Value;
-    EmptyCellsNeutral := CheckBoxEmptyCellsNeutral.Checked;
+    GameSystem.EmptyCellsNeutral := CheckBoxEmptyCellsNeutral.Checked;
   end;
 end;