Changeset 197 for trunk

Timestamp:

May 16, 2018, 11:03:48 AM (7 years ago)

Author:

chronos

Message:

• Added: Evaluate win objection to stay alive for defined number of turns. Multiple players can win.

Location:

trunk

Files:

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

trunk/Forms/UFormNew.lfm

@@ -1 +1 @@
 object FormNew: TFormNew
   Left = 387
-  Height = 843
+  Height = 748
   Top = 102
-  Width = 1069
+  Width = 795
   Caption = 'New game'
-  ClientHeight = 843
-  ClientWidth = 1069
+  ClientHeight = 748
+  ClientWidth = 795
   Constraints.MinHeight = 501
   Constraints.MinWidth = 667
@@ -18 +18 @@
   object PageControl1: TPageControl
     Left = 4
-    Height = 556
+    Height = 461
     Top = 4
-    Width = 1061
-    ActivePage = TabSheetMode
+    Width = 787
+    ActivePage = TabSheet3
     Align = alClient
     BorderSpacing.Around = 4
-    TabIndex = 0
+    TabIndex = 3
     TabOrder = 0
     object TabSheetMode: TTabSheet
       Caption = 'Mode'
-      ClientHeight = 523
-      ClientWidth = 1053
+      ClientHeight = 362
+      ClientWidth = 694
       object RadioButtonModeLocal: TRadioButton
         Left = 10
@@ -90 +90 @@
       object ListViewServers: TListView
         Left = 26
-        Height = 291
+        Height = 130
         Top = 181
         Width = 334
@@ -118 +118 @@
         Left = 27
         Height = 31
-        Top = 484
+        Top = 323
         Width = 94
         Action = AServerAdd
@@ -127 +127 @@
         Left = 240
         Height = 31
-        Top = 484
+        Top = 323
         Width = 94
         Action = AServerRemove
@@ -136 +136 @@
         Left = 136
         Height = 30
-        Top = 484
+        Top = 323
         Width = 94
         Action = AServerModify
@@ -145 +145 @@
     object TabSheet1: TTabSheet
       Caption = 'Players'
-      ClientHeight = 297
-      ClientWidth = 759
+      ClientHeight = 428
+      ClientWidth = 779
       object ListViewPlayers: TListView
         Left = 4
-        Height = 247
+        Height = 378
         Top = 4
-        Width = 751
+        Width = 771
         Align = alTop
         Anchors = [akTop, akLeft, akRight, akBottom]
@@ -188 +188 @@
         Left = 224
         Height = 25
-        Top = 259
+        Top = 390
         Width = 83
         Action = APlayerRemove
@@ -197 +197 @@
         Left = 16
         Height = 25
-        Top = 259
+        Top = 390
         Width = 83
         Action = APlayerAdd
@@ -206 +206 @@
         Left = 120
         Height = 25
-        Top = 259
+        Top = 390
         Width = 83
         Action = APlayerModify
@@ -216 +216 @@
     object TabSheet2: TTabSheet
       Caption = 'Map'
-      ClientHeight = 523
-      ClientWidth = 1053
+      ClientHeight = 428
+      ClientWidth = 779
       object Label1: TLabel
         Left = 8
@@ -258 +258 @@
         Height = 47
         Top = 8
-        Width = 802
+        Width = 528
         Max = 100
         Min = 2
@@ -271 +271 @@
         Height = 47
         Top = 49
-        Width = 802
+        Width = 528
         Max = 100
         Min = 2
@@ -329 +329 @@
         Height = 27
         Top = 110
-        Width = 565
+        Width = 291
         Anchors = [akTop, akLeft, akRight]
         AutoSize = False
@@ -408 +408 @@
         Height = 28
         Top = 184
-        Width = 786
+        Width = 512
         Anchors = [akTop, akLeft, akRight]
         TabOrder = 12
       end
       object ButtonImageBrowse: TButton
-        Left = 938
+        Left = 664
         Height = 25
         Top = 192
@@ -460 +460 @@
     object TabSheet3: TTabSheet
       Caption = 'Rules'
-      ClientHeight = 297
-      ClientWidth = 759
+      ClientHeight = 428
+      ClientWidth = 779
       object RadioGroupGrowCells: TRadioGroup
         Left = 15
@@ -534 +534 @@
         Height = 27
         Top = 24
-        Width = 599
+        Width = 619
         Anchors = [akTop, akLeft, akRight]
         AutoSize = False
@@ -540 +540 @@
         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
+        TabOrder = 4
+        Value = 1
+      end
     end
   end
@@ -545 +563 @@
     Left = 0
     Height = 45
-    Top = 798
-    Width = 1069
+    Top = 703
+    Width = 795
     Align = alBottom
     BevelOuter = bvNone
     ClientHeight = 45
-    ClientWidth = 1069
+    ClientWidth = 795
     TabOrder = 1
     object ButtonOk: TButton
-      Left = 881
+      Left = 607
       Height = 25
       Top = 6
@@ -563 +581 @@
     end
     object ButtonCancel: TButton
-      Left = 985
+      Left = 711
       Height = 25
       Top = 6
@@ -576 +594 @@
     Left = 0
     Height = 228
-    Top = 570
-    Width = 1069
+    Top = 475
+    Width = 795
     Align = alBottom
     BevelOuter = bvNone
@@ -586 +604 @@
     Left = 0
     Height = 6
-    Top = 564
-    Width = 1069
+    Top = 469
+    Width = 795
     Align = alBottom
     ResizeAnchor = akBottom

trunk/Forms/UFormNew.pas

@@ -45 +45 @@
     Label11: TLabel;
     Label12: TLabel;
+    Label13: TLabel;
     Label2: TLabel;
     Label3: TLabel;
@@ -72 +73 @@
     RadioGroupGrowAmount: TRadioGroup;
     RadioGroupGrowCells: TRadioGroup;
+    SpinEditTurns: TSpinEdit;
     SpinEditMaxPower: TSpinEdit;
     SpinEditServerPort: TSpinEdit;
@@ -501 +503 @@
     SpinEditServerPort.Value := LocalNetworkPort;
     SpinEditMaxPower.Value := Game.MaxPower;
+    SpinEditTurns.Value := Game.StayAliveForDefinedTurns;
   end;
 end;
@@ -536 +539 @@
     Game.BridgeEnabled := CheckBoxBridges.Checked;
     Game.MaxPower := SpinEditMaxPower.Value;
+    Game.StayAliveForDefinedTurns := SpinEditTurns.Value;
   end;
 end;

trunk/Languages/xtactics.cs.po

@@ -399 +399 @@
 msgstr "Adresa:"
 
+#: tformnew.label13.caption
+msgid "Number of turns:"
+msgstr "Počet tahů:"
+
 #: tformnew.label2.caption
 #| msgid "x"
@@ -710 +714 @@
 msgid "Not all players were initialized with start cell. Needed %d, initialized %d. Change map parameters to have more terrain cells."
 msgstr "Ne všichni hráči byli vytvoření. Potřeba %d, vytvořeno %d. Změňte parametry mapy abyste měli více políček země."
+
+#: ucore.splayerswins
+msgid "Players %s win"
+msgstr "Hráči %s vyhráli"
 
 #: ucore.splayerwins
@@ -939 +947 @@
 #: uvarblockserializer.serrorgetvarsize
 msgid "Error reading variable block size"
-msgstr ""
+msgstr "Chyba čtení velikosti délkou proměnného bloku"
 
 #: uvarblockserializer.smaskedvaluereaderror
 msgid "Error reading masked variable length block."
-msgstr ""
+msgstr "Chyba čtení maskovaného délkou proměnného bloku"
 
 #: uvarblockserializer.sreaderror
 msgid "Stream read error. Expected length %d, read %d. Source stream size %d."
-msgstr ""
+msgstr "Chyba čtení proudu: Očekávaná délka %d, přečteno %d. Zdrojový proud %d."
 
 #: uvarblockserializer.suint64overflow
 msgid "64-bit UInt read overflow."
-msgstr ""
+msgstr "Přetečení při čtení 64-bit UInt"

trunk/Languages/xtactics.po

@@ -385 +385 @@
 msgstr ""
 
+#: tformnew.label13.caption
+msgid "Number of turns:"
+msgstr ""
+
 #: tformnew.label2.caption
 msgid "Map height:"
@@ -694 +698 @@
 #: ucore.splayersnotinitialized
 msgid "Not all players were initialized with start cell. Needed %d, initialized %d. Change map parameters to have more terrain cells."
+msgstr ""
+
+#: ucore.splayerswins
+msgid "Players %s win"
 msgstr ""
 

trunk/UCore.lfm

@@ -10 +10 @@
   object ActionList1: TActionList
     Images = ImageListSmall
-    left = 113
+    left = 114
     top = 50
     object AExit: TAction

trunk/UCore.pas

@@ -116 +116 @@
 resourcestring
   SPlayerWins = 'Player %s wins';
+  SPlayersWins = 'Players %s win';
   SEndGame = 'End game?';
   SEndGameQuestion = 'Do you want to end current game?';
@@ -127 +128 @@
 
 procedure TCore.DoOnWin(Player: TPlayer);
+var
+  PlayerNames: string;
+  AlivePlayers: TPlayerArray;
+  I: Integer;
 begin
   RedrawClients;
-  ShowMessage(Format(SPlayerWins, [Player.Name]));
+  if Assigned(Player) then
+    ShowMessage(Format(SPlayerWins, [Player.Name]))
+  else begin
+    AlivePlayers := Game.Players.GetAlivePlayers;
+    PlayerNames := '';
+    for I := 0 to Length(AlivePlayers) - 1 do begin
+      if I > 0 then PlayerNames := PlayerNames + ', ';
+      PlayerNames := PlayerNames + AlivePlayers[I].Name;
+    end;
+    ShowMessage(Format(SPlayersWins, [PlayerNames]))
+  end;
 end;
 
@@ -407 +422 @@
   FreeAndNil(StoredDimension);
   FreeAndNil(Server);
+  FreeAndNil(Clients);
   FreeAndNil(Game);
-  FreeAndNil(Clients);
 end;
 

trunk/UGame.pas

@@ -3206 +3206 @@
     SetValue(DOMString(Path + '/GrowCells'), Integer(GrowCells));
     SetValue(DOMString(Path + '/WinObjective'), Integer(WinObjective));
+    SetValue(DOMString(Path + '/StayAliveForDefinedTurns'), StayAliveForDefinedTurns);
     PlayersSetting.SaveConfig(Config, Path + '/Players');
   end;
@@ -3238 +3239 @@
     if (Value >= Integer(Low(TWinObjective))) and (Value <= Integer(High(TWinObjective))) then
       WinObjective := TWinObjective(Value) else WinObjective := Low(TWinObjective);
+    StayAliveForDefinedTurns := GetValue(DOMString(Path + '/StayAliveForDefinedTurns'), 20);
     PlayersSetting.LoadConfig(Config, Path + '/Players');
   end;
@@ -3431 +3433 @@
   end else
   if WinObjective = woStayAliveForDefinedTurns then begin
-    // TODO: Not only one can win but multiple human players can survive.
     if TurnCounter > StayAliveForDefinedTurns then
       EndGame(nil);
@@ -3522 +3523 @@
 begin
   Running := False;
-  if Assigned(OnWin) and Assigned(Winner) then OnWin(Winner);
+  if Assigned(OnWin) then OnWin(Winner);
 end;