Changeset 198 for trunk

Timestamp:

May 16, 2018, 1:38:11 PM (7 years ago)

Author:

chronos

Message:

• Added: Capture all special cells objective is now functional. Number of such cells can be specified. They are randomly spread across map and such cells are marked with "!" symbol after its number of units.

Location:

trunk

Files:

• Forms/UFormNew.lfm (modified) (2 diffs)
• Forms/UFormNew.pas (modified) (10 diffs)
• Languages/xtactics.cs.po (modified) (3 diffs)
• Languages/xtactics.po (modified) (2 diffs)
• UGame.pas (modified) (17 diffs)
• xtactics.lpi (modified) (2 diffs)
• xtactics.lpr (modified) (1 diff)

trunk/Forms/UFormNew.lfm

@@ -505 +505 @@
           'Stay alive for number of turns'
         )
+        OnChange = ComboBoxWinObjectiveChange
         Style = csDropDownList
         TabOrder = 1
@@ -540 +541 @@
         TabOrder = 3
       end
-      object Label13: TLabel
-        Left = 8
-        Height = 20
-        Top = 280
-        Width = 111
-        Caption = 'Number of turns:'
-        ParentColor = False
-      end
-      object SpinEditTurns: TSpinEdit
-        Left = 236
-        Height = 28
-        Top = 278
-        Width = 159
-        MaxValue = 1000
-        MinValue = 1
+      object PageControl2: TPageControl
+        Left = 12
+        Height = 78
+        Top = 274
+        Width = 756
+        ActivePage = TabSheetCaptureCities
+        Anchors = [akTop, akLeft, akRight]
+        ShowTabs = False
+        TabIndex = 1
         TabOrder = 4
-        Value = 1
+        object TabSheetDefeatEnemies: TTabSheet
+        end
+        object TabSheetCaptureCities: TTabSheet
+        end
+        object TabSheetCaptureCells: TTabSheet
+          ClientHeight = 70
+          ClientWidth = 748
+          object Label14: TLabel
+            Left = 8
+            Height = 20
+            Top = 16
+            Width = 125
+            Caption = 'Special cells count:'
+            ParentColor = False
+          end
+          object SpinEditSpecialCells: TSpinEdit
+            Left = 236
+            Height = 28
+            Top = 8
+            Width = 159
+            MaxValue = 1000
+            MinValue = 1
+            TabOrder = 0
+            Value = 1
+          end
+        end
+        object TabSheetStayAliveTurns: TTabSheet
+          ClientHeight = 70
+          ClientWidth = 748
+          object Label13: TLabel
+            Left = 8
+            Height = 20
+            Top = 16
+            Width = 111
+            Caption = 'Number of turns:'
+            ParentColor = False
+          end
+          object SpinEditTurns: TSpinEdit
+            Left = 236
+            Height = 28
+            Top = 8
+            Width = 159
+            MaxValue = 1000
+            MinValue = 1
+            TabOrder = 0
+            Value = 1
+          end
+        end
       end
     end

trunk/Forms/UFormNew.pas

@@ -46 +46 @@
     Label12: TLabel;
     Label13: TLabel;
+    Label14: TLabel;
     Label2: TLabel;
     Label3: TLabel;
@@ -64 +65 @@
     OpenPictureDialog1: TOpenPictureDialog;
     PageControl1: TPageControl;
+    PageControl2: TPageControl;
     PanelButtons: TPanel;
     PanelChat: TPanel;
@@ -73 +75 @@
     RadioGroupGrowAmount: TRadioGroup;
     RadioGroupGrowCells: TRadioGroup;
-    SpinEditTurns: TSpinEdit;
     SpinEditMaxPower: TSpinEdit;
     SpinEditServerPort: TSpinEdit;
@@ -80 +81 @@
     SpinEditMapSizeY: TSpinEdit;
     SpinEditNeutralUnits: TSpinEdit;
+    SpinEditSpecialCells: TSpinEdit;
+    SpinEditTurns: TSpinEdit;
     SpinEditVoidPercent: TSpinEdit;
     Splitter1: TSplitter;
@@ -85 +88 @@
     TabSheet2: TTabSheet;
     TabSheet3: TTabSheet;
+    TabSheetStayAliveTurns: TTabSheet;
+    TabSheetCaptureCells: TTabSheet;
+    TabSheetDefeatEnemies: TTabSheet;
+    TabSheetCaptureCities: TTabSheet;
     TabSheetMode: TTabSheet;
     TrackBarSizeX: TTrackBar;
@@ -98 +105 @@
     procedure CheckBoxVoidChange(Sender: TObject);
     procedure ComboBoxMapShapeChange(Sender: TObject);
+    procedure ComboBoxWinObjectiveChange(Sender: TObject);
     procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
     procedure FormCreate(Sender: TObject);
@@ -151 +159 @@
   SWinObjectiveDefeatAllOponents = 'Defeat all oponents';
   SWinObjectiveDefeatAllCities = 'Defeat all oponents cities';
-  SWinObjectiveCapturePosition = 'Capture position';
+  SWinObjectiveCapturePosition = 'Capture all special cells';
   SWinObjectiveStayAliveForTurns = 'Stay alive for number of turns';
   SGrowNone = 'None';
@@ -371 +379 @@
 begin
   ReloadView;
+end;
+
+procedure TFormNew.ComboBoxWinObjectiveChange(Sender: TObject);
+begin
+  PageControl2.TabIndex := ComboBoxWinObjective.ItemIndex;
 end;
 
@@ -504 +517 @@
     SpinEditMaxPower.Value := Game.MaxPower;
     SpinEditTurns.Value := Game.StayAliveForDefinedTurns;
+    SpinEditSpecialCells.Value := Game.SpecialCaptureCellCount;
   end;
 end;
@@ -540 +554 @@
     Game.MaxPower := SpinEditMaxPower.Value;
     Game.StayAliveForDefinedTurns := SpinEditTurns.Value;
+    Game.SpecialCaptureCellCount := SpinEditSpecialCells.Value;
   end;
 end;

trunk/Languages/xtactics.cs.po

@@ -402 +402 @@
 msgid "Number of turns:"
 msgstr "Počet tahů:"
+
+#: tformnew.label14.caption
+msgid "Special cells count:"
+msgstr "Počet speciálních buněk:"
 
 #: tformnew.label2.caption
@@ -848 +852 @@
 
 #: uformnew.swinobjectivecaptureposition
-msgid "Capture position"
-msgstr "Dobít pozici"
+msgid "Capture all special cells"
+msgstr "Dobít všechny speciální buňky"
 
 #: uformnew.swinobjectivedefeatallcities
@@ -960 +964 @@
 msgid "64-bit UInt read overflow."
 msgstr "Přetečení při čtení 64-bit UInt"
+

trunk/Languages/xtactics.po

@@ -387 +387 @@
 #: tformnew.label13.caption
 msgid "Number of turns:"
+msgstr ""
+
+#: tformnew.label14.caption
+msgid "Special cells count:"
 msgstr ""
 
@@ -827 +831 @@
 
 #: uformnew.swinobjectivecaptureposition
-msgid "Capture position"
+msgid "Capture all special cells"
 msgstr ""
 

trunk/UGame.pas

@@ -30 +30 @@
 
   TTerrainType = (ttVoid, ttNormal, ttCity);
+  TExtraType = (etNone, etObjectiveTarget, etAttack, etDefense, etLookout,
+    etGrowLow, etGrowMedium, etGrowHigh);
 
   { TCell }
@@ -55 +57 @@
     Angle: Double; // Temporary value
     Links: TCellLinks;
+    Extra: TExtraType;
     procedure ConnectTo(Cell: TCell);
     procedure DisconnectFrom(Cell: TCell);
@@ -85 +88 @@
     function FindById(Id: Integer): TCell;
     procedure GetCellsWithWeight(List: TCells; Low, High: Integer);
+    procedure GetCellsWithExtra(List: TCells; Extra: TExtraType);
     procedure LoadFromNode(Node: TDOMNode);
     procedure SaveToNode(Node: TDOMNode);
@@ -439 +443 @@
     procedure PropagatePlayerDistance(List: TCells);
     procedure InitDefaultPlayersSetting;
+    procedure WinObjectiveMapPrepare;
   public
     DevelMode: Boolean;
@@ -455 +460 @@
     TurnCounter: Integer;
     WinObjective: TWinObjective;
-    SpecialCaptureCell: TCell;
+    SpecialCaptureCellCount: Integer;
     StayAliveForDefinedTurns: Integer;
     MaxNeutralUnits: Integer;
@@ -1020 +1025 @@
     if (Cell.Terrain <> ttVoid) and (Cell.Weight >= Low) and
       (Cell.Weight <= High) then List.Add(Cell);
+end;
+
+procedure TCells.GetCellsWithExtra(List: TCells; Extra: TExtraType);
+var
+  Cell: TCell;
+begin
+  List.Clear;
+  for Cell in Self do
+    if Cell.Extra = Extra then List.Add(Cell);
 end;
 
@@ -1496 +1510 @@
   TextSize: TSize;
 begin
+  if Cell.Extra = etObjectiveTarget then begin
+    Text := Text + '!';
+  end;
   with Canvas do begin
     if Assigned(View.FocusedCell) and (View.FocusedCell = Cell) then begin
@@ -1526 +1543 @@
 
     // Show cell text
-    if Text <> '0' then begin
+    if Cell.GetAvialPower <> 0 then begin
       Pen.Style := psSolid;
       Font.Color := clWhite;
@@ -1890 +1907 @@
   Power := ReadInteger(Node, 'Power', 0);
   Terrain := TTerrainType(ReadInteger(Node, 'Terrain', Integer(ttVoid)));
+  Extra := TExtraType(ReadInteger(Node, 'Extra', Integer(etNone)));
   PosPx.X := ReadInteger(Node, 'PosX', 0);
   PosPx.Y := ReadInteger(Node, 'PosY', 0);
@@ -1925 +1943 @@
   WriteInteger(Node, 'Power', Power);
   WriteInteger(Node, 'Terrain', Integer(Terrain));
+  WriteInteger(Node, 'Extra', Integer(Extra));
   WriteInteger(Node, 'PosX', PosPx.X);
   WriteInteger(Node, 'PosY', PosPx.Y);
@@ -2966 +2985 @@
         PaintCell(Canvas, Cell.PosPx, IntToStr(Cell.GetAvialPower), View, Cell);
       end;
-
     end;
 
@@ -3188 +3206 @@
 end;
 
+procedure TGame.WinObjectiveMapPrepare;
+var
+  Cell: TCell;
+  Cells: TCells;
+  I: Integer;
+begin
+  if WinObjective = woSpecialCaptureCell then begin
+    Cells := TCells.Create(False);
+    for I := 0 to Map.Cells.Count - 1 do
+    if (Map.Cells[I].Terrain <> ttVoid) and (Map.Cells[I].Extra <> etObjectiveTarget) then
+      Cells.Add(Map.Cells[I]);
+
+    for I := 0 to SpecialCaptureCellCount - 1 do begin
+      if Cells.Count = 0 then Break;
+      Cell := Cells[Random(Cells.Count)];
+      Cell.Extra := etObjectiveTarget;
+      Cells.Remove(Cell);
+    end;
+    Cells.Free;
+  end;
+end;
+
 procedure TGame.SaveConfig(Config: TXmlConfig; Path: string);
 begin
@@ -3207 +3247 @@
     SetValue(DOMString(Path + '/WinObjective'), Integer(WinObjective));
     SetValue(DOMString(Path + '/StayAliveForDefinedTurns'), StayAliveForDefinedTurns);
+    SetValue(DOMString(Path + '/SpecialCaptureCellCount'), SpecialCaptureCellCount);
     PlayersSetting.SaveConfig(Config, Path + '/Players');
   end;
@@ -3240 +3281 @@
       WinObjective := TWinObjective(Value) else WinObjective := Low(TWinObjective);
     StayAliveForDefinedTurns := GetValue(DOMString(Path + '/StayAliveForDefinedTurns'), 20);
+    SpecialCaptureCellCount := GetValue(DOMString(Path + '/SpecialCaptureCellCount'), 1);
     PlayersSetting.LoadConfig(Config, Path + '/Players');
   end;
@@ -3412 +3454 @@
   AlivePlayers: TPlayerArray;
   Winner: TPlayer;
+  Cells: TCells;
+  Player: TPlayer;
+  R: Boolean;
+  I: Integer;
 begin
   Winner := nil;
@@ -3429 +3475 @@
   end else
   if WinObjective = woSpecialCaptureCell then begin
-    if Assigned(SpecialCaptureCell) and Assigned(SpecialCaptureCell.Player) then
-      EndGame(SpecialCaptureCell.Player);
+    Cells := TCells.Create(False);
+    Map.Cells.GetCellsWithExtra(Cells, etObjectiveTarget);
+    R := True;
+    for I := 0 to Cells.Count - 1 do begin
+      if I = 0 then Player := Cells[I].Player;
+      if not Assigned(Cells[I].Player) or (Cells[I].Player <> Player) then begin
+        R := False;
+        Break;
+      end;
+    end;
+    if R then EndGame(Player);
+    Cells.Free;
   end else
   if WinObjective = woStayAliveForDefinedTurns then begin
@@ -3485 +3541 @@
   Map.MaxPower := MaxPower;
   BuildTerrain;
+  WinObjectiveMapPrepare;
 
   // Build bridges

trunk/xtactics.lpi

@@ -244 +244 @@
         <IsPartOfProject Value="True"/>
         <ComponentName Value="FormServer"/>
+        <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
       </Unit24>
@@ -278 +279 @@
     <Linking>
       <Debugging>
-        <UseHeaptrc Value="True"/>
         <UseExternalDbgSyms Value="True"/>
       </Debugging>

trunk/xtactics.lpr

@@ -25 +25 @@
   // Heap trace
   DeleteFile(ExtractFilePath(ParamStr(0)) + HeapTraceLog);
-  SetHeapTraceOutput(ExtractFilePath(ParamStr(0)) + HeapTraceLog);
+  //SetHeapTraceOutput(ExtractFilePath(ParamStr(0)) + HeapTraceLog);
   {$ENDIF}