Changeset 270 for trunk

Timestamp:

Jan 28, 2019, 10:38:17 PM (6 years ago)

Author:

chronos

Message:

• Modified: Keep randseed for randomly generated map preview inside New game form.
• Modified: Resize map preview with form resize.

Location:

trunk

Files:

• Forms/UFormNew.lfm (modified) (2 diffs)
• Forms/UFormNew.pas (modified) (9 diffs)
• Languages/xtactics.cs.po (modified) (2 diffs)
• Languages/xtactics.po (modified) (2 diffs)
• UClientGUI.pas (modified) (1 diff)
• UGame.pas (modified) (10 diffs)

trunk/Forms/UFormNew.lfm

@@ -518 +518 @@
           Top = 272
           Width = 359
+          Anchors = [akTop, akLeft, akRight]
+          OnResize = Image1Resize
         end
         object Label15: TLabel
@@ -523 +525 @@
           Height = 26
           Top = 240
-          Width = 147
-          Caption = 'Random preview:'
-          ParentColor = False
+          Width = 71
+          Caption = 'Preview:'
+          ParentColor = False
+        end
+        object ButtonRandomize: TButton
+          Left = 10
+          Height = 38
+          Top = 540
+          Width = 153
+          Caption = 'Randomize'
+          OnClick = ButtonRandomizeClick
+          TabOrder = 17
         end
       end

trunk/Forms/UFormNew.pas

@@ -25 +25 @@
     Button2: TButton;
     Button3: TButton;
+    ButtonRandomize: TButton;
     ButtonCancel: TButton;
     ButtonImageBrowse: TButton;
@@ -115 +116 @@
     procedure AServerRemoveExecute(Sender: TObject);
     procedure ButtonImageBrowseClick(Sender: TObject);
+    procedure ButtonRandomizeClick(Sender: TObject);
     procedure CheckBoxBridgesChange(Sender: TObject);
     procedure CheckBoxCityChange(Sender: TObject);
@@ -128 +130 @@
     procedure FormDestroy(Sender: TObject);
     procedure FormShow(Sender: TObject);
+    procedure Image1Resize(Sender: TObject);
     procedure ListViewPlayersCustomDrawSubItem(Sender: TCustomListView;
       Item: TListItem; SubItem: Integer; State: TCustomDrawState;
@@ -159 +162 @@
     GamePreview: TGame;
     MapPreviewRedrawPending: Boolean;
+    NewRandSeed: Cardinal;
     procedure LoadGame(Game: TGame);
     procedure SaveGame(Game: TGame);
@@ -363 +367 @@
   Game.Players.Assign(Players);
   with Game do begin
+    StoredRandSeed := NewRandSeed;
     SymetricMap := CheckBoxSymetricMap.Checked;
     CyclicMap := CheckBoxCyclicMap.Checked;
@@ -397 +402 @@
   Bitmap: TBitmap;
 begin
+  Image1.Height := Round(Image1.Width * SpinEditMapSizeY.Value / SpinEditMapSizeX.Value);
   GamePreview.GameSystem := Core.GameSystems.First;
   SaveGame(GamePreview);
@@ -508 +514 @@
 procedure TFormNew.FormShow(Sender: TObject);
 begin
+  Randomize;
+  NewRandSeed := RandSeed;
   Core.PersistentForm.Load(Self);
   Core.ThemeManager1.UseTheme(Self);
@@ -517 +525 @@
   TabSheetMode.Enabled := False;
   {$ENDIF}
+end;
+
+procedure TFormNew.Image1Resize(Sender: TObject);
+begin
+  MapPreviewRedraw;
 end;
 
@@ -667 +680 @@
     EditImageFile.Text := OpenPictureDialog1.FileName;
   end;
+end;
+
+procedure TFormNew.ButtonRandomizeClick(Sender: TObject);
+begin
+  Randomize;
+  NewRandSeed := RandSeed;
+  MapPreviewRedraw;
 end;
 

trunk/Languages/xtactics.cs.po

@@ -397 +397 @@
 msgstr "Ok"
 
+#: tformnew.buttonrandomize.caption
+msgid "Randomize"
+msgstr "Náhodně"
+
 #: tformnew.caption
 msgctxt "tformnew.caption"
@@ -459 +463 @@
 
 #: tformnew.label15.caption
-msgid "Random preview:"
-msgstr "Náhodný náhled:"
+msgid "Preview:"
+msgstr "Náhled:"
 
 #: tformnew.label2.caption

trunk/Languages/xtactics.po

@@ -384 +384 @@
 msgstr ""
 
+#: tformnew.buttonrandomize.caption
+msgid "Randomize"
+msgstr ""
+
 #: tformnew.caption
 msgctxt "tformnew.caption"
@@ -445 +449 @@
 
 #: tformnew.label15.caption
-msgid "Random preview:"
+msgid "Preview:"
 msgstr ""
 

trunk/UClientGUI.pas

@@ -169 +169 @@
       Pen.Color := clBlack;
       Pen.Style := psSolid;
-      Pen.Width := 3;
+      Pen.Width := Trunc(5 * View.Zoom);
     end else begin
       // Cannot set clear border as it will display shifted on gtk2

trunk/UGame.pas

@@ -53 +53 @@
     procedure SetRunning(AValue: Boolean);
     procedure BuildTerrain;
+    procedure PlaceCities;
     procedure SelectPlayerStartCell(Player: TPlayer);
     procedure CalculatePlayersDistance;
@@ -82 +83 @@
     BridgeEnabled: Boolean;
     MaxPower: Integer;
+    StoredRandSeed: Cardinal;
     procedure PostConfig;
     procedure Assign(Source: TGame);
@@ -291 +293 @@
     if (VoidEnabled and (Random < VoidPercentage / 100)) or
     (Map.IsOutsideShape(PosPx)) then Terrain := ttVoid
-      else begin
-        if CityEnabled and (Random < CityPercentage / 100) then Terrain := ttCity
-          else Terrain := ttNormal;
-      end;
+      else Terrain := ttNormal;
     if not Assigned(OneUnit) then
       OneUnit := Units.AddNew(GameSystem.UnitKinds[0], Random(MaxNeutralUnits + 1));
     Player := nil;
+  end;
+end;
+
+procedure TGame.PlaceCities;
+var
+  Cell: TCell;
+begin
+  for Cell in Map.Cells do
+  with Cell do begin
+    if (Terrain = ttNormal) and CityEnabled and (Random < CityPercentage / 100) then
+      Terrain := ttCity;
   end;
 end;
@@ -418 +428 @@
 procedure TGame.Assign(Source: TGame);
 begin
+  StoredRandSeed := Source.StoredRandSeed;
   DevelMode := Source.DevelMode;
   Players.Assign(Source.Players);
@@ -446 +457 @@
 begin
   with Config do begin
+    SetValue(DOMString(Path + '/RandSeed'), Integer(StoredRandSeed));
     SetValue(DOMString(Path + '/GridType'), Integer(MapType));
     SetValue(DOMString(Path + '/MapImage'), DOMString(MapImageFileName));
@@ -473 +485 @@
 begin
   with Config do begin
+    StoredRandSeed := GetValue(DOMString(Path + '/RandSeed'), 0);
     MapType := TMapType(GetValue(DOMString(Path + '/GridType'), Integer(mtHexagon)));
     Map.Size := TPoint.Create(GetValue(DOMString(Path + '/MapSizeX'), 10),
@@ -518 +531 @@
     RootNode := Doc.DocumentElement;
     with RootNode do begin
+      StoredRandSeed := ReadInteger(RootNode, 'RandSeed', 0);
       MapType := TMapType(ReadInteger(RootNode, 'MapType', Integer(mtNone)));
       SymetricMap := ReadBoolean(RootNode, 'SymetricMap', False);
@@ -580 +594 @@
     AppendChild(RootNode);
     with RootNode do begin
+      WriteInteger(RootNode, 'RandSeed', Integer(StoredRandSeed));
       WriteInteger(RootNode, 'MapType', Integer(MapType));
       WriteBoolean(RootNode, 'SymetricMap', SymetricMap);
@@ -825 +840 @@
 begin
   Clear;
+  RandSeed := StoredRandSeed;
   FileName := SNewGameFile;
   TurnCounter := 1;
@@ -832 +848 @@
   Map.MaxPower := MaxPower;
   BuildTerrain;
+  PlaceCities;
   WinObjectiveMapPrepare;