Changeset 151

Timestamp:

Nov 14, 2017, 11:11:57 PM (7 years ago)

Author:

chronos

Message:

• Added: Map can have rounded shape.

Location:

trunk

Files:

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

trunk/Forms/UFormNew.lfm

@@ -13 +13 @@
   OnShow = FormShow
   Position = poMainFormCenter
-  LCLVersion = '1.6.4.0'
+  LCLVersion = '1.8.0.4'
   object ButtonCancel: TButton
     Left = 454
@@ -39 +39 @@
     Top = 4
     Width = 669
-    ActivePage = TabSheet1
+    ActivePage = TabSheet2
     Align = alTop
     Anchors = [akTop, akLeft, akRight, akBottom]
     BorderSpacing.Around = 4
-    TabIndex = 0
+    TabIndex = 1
     TabOrder = 2
     object TabSheet1: TTabSheet
       Caption = 'Players'
-      ClientHeight = 397
+      ClientHeight = 395
       ClientWidth = 663
       object ListView1: TListView
         Left = 4
-        Height = 347
+        Height = 345
         Top = 4
         Width = 655
@@ -90 +90 @@
         Left = 224
         Height = 25
-        Top = 359
+        Top = 357
         Width = 83
         Action = APlayerRemove
@@ -99 +99 @@
         Left = 16
         Height = 25
-        Top = 359
+        Top = 357
         Width = 83
         Action = APlayerAdd
@@ -108 +108 @@
         Left = 120
         Height = 25
-        Top = 359
+        Top = 357
         Width = 83
         Action = APlayerModify
@@ -118 +118 @@
     object TabSheet2: TTabSheet
       Caption = 'Map'
-      ClientHeight = 397
+      ClientHeight = 395
       ClientWidth = 663
       object Label1: TLabel
         Left = 8
-        Height = 24
+        Height = 26
         Top = 9
         Width = 95
@@ -130 +130 @@
       object Label2: TLabel
         Left = 8
-        Height = 24
+        Height = 26
         Top = 57
         Width = 102
@@ -138 +138 @@
       object SpinEditMapSizeX: TSpinEdit
         Left = 128
-        Height = 34
+        Height = 36
         Top = 4
         Width = 98
@@ -148 +148 @@
       object SpinEditMapSizeY: TSpinEdit
         Left = 128
-        Height = 34
+        Height = 36
         Top = 55
         Width = 98
@@ -158 +158 @@
       object TrackBarSizeX: TTrackBar
         Left = 240
-        Height = 46
+        Height = 47
         Top = 8
         Width = 412
@@ -171 +171 @@
       object TrackBarSizeY: TTrackBar
         Left = 240
-        Height = 46
+        Height = 47
         Top = 49
         Width = 412
@@ -184 +184 @@
       object Label5: TLabel
         Left = 8
-        Height = 24
+        Height = 26
         Top = 104
         Width = 83
@@ -192 +192 @@
       object ComboBoxGridType: TComboBox
         Left = 146
-        Height = 38
+        Height = 36
         Top = 104
         Width = 208
@@ -206 +206 @@
       object ComboBoxMapShape: TComboBox
         Left = 146
-        Height = 38
+        Height = 36
         Top = 144
         Width = 208
@@ -221 +221 @@
       object Label8: TLabel
         Left = 8
-        Height = 24
+        Height = 26
         Top = 144
         Width = 98
@@ -239 +239 @@
       object SpinEditVoidPercent: TSpinEdit
         Left = 216
-        Height = 34
+        Height = 36
         Top = 224
         Width = 106
@@ -248 +248 @@
       object CheckBoxVoid: TCheckBox
         Left = 8
-        Height = 28
+        Height = 30
         Top = 232
         Width = 187
@@ -257 +257 @@
       object CheckBoxCity: TCheckBox
         Left = 8
-        Height = 28
+        Height = 30
         Top = 272
         Width = 71
@@ -266 +266 @@
       object SpinEditCityPercent: TSpinEdit
         Left = 216
-        Height = 34
+        Height = 36
         Top = 272
         Width = 106
@@ -275 +275 @@
       object Label4: TLabel
         Left = 331
-        Height = 24
+        Height = 26
         Top = 272
         Width = 15
@@ -283 +283 @@
       object Label3: TLabel
         Left = 331
-        Height = 24
+        Height = 26
         Top = 232
         Width = 15
@@ -291 +291 @@
       object SpinEditNeutralUnits: TSpinEdit
         Left = 408
-        Height = 34
+        Height = 36
         Top = 352
         Width = 98
@@ -301 +301 @@
       object Label7: TLabel
         Left = 8
-        Height = 24
+        Height = 26
         Top = 352
         Width = 227
@@ -309 +309 @@
       object EditImageFile: TEdit
         Left = 144
-        Height = 34
+        Height = 36
         Top = 184
         Width = 396
@@ -327 +327 @@
       object Label9: TLabel
         Left = 8
-        Height = 24
+        Height = 26
         Top = 184
         Width = 90
@@ -335 +335 @@
       object CheckBoxBridges: TCheckBox
         Left = 8
-        Height = 28
+        Height = 30
         Top = 310
         Width = 210
@@ -344 +344 @@
     object TabSheet3: TTabSheet
       Caption = 'Rules'
-      ClientHeight = 397
+      ClientHeight = 395
       ClientWidth = 663
       object RadioGroupGrowCells: TRadioGroup
@@ -360 +360 @@
         ChildSizing.Layout = cclLeftToRightThenTopToBottom
         ChildSizing.ControlsPerLine = 1
-        ClientHeight = 79
+        ClientHeight = 77
         ClientWidth = 308
         Items.Strings = (
@@ -406 +406 @@
         ChildSizing.Layout = cclLeftToRightThenTopToBottom
         ChildSizing.ControlsPerLine = 1
-        ClientHeight = 50
+        ClientHeight = 48
         ClientWidth = 301
         Items.Strings = (

trunk/Forms/UFormNew.pas

@@ -120 +120 @@
   SGrowAmountBySquareRoot = 'By square root';
   SRectangular = 'Rectangular';
+  SRounded = 'Rounded';
   SFromImageFile = 'From image file';
 
@@ -207 +208 @@
     Items.Add(SRectangular);
     Items.Add(SFromImageFile);
+    Items.Add(SRounded);
     ItemIndex := LastIndex;
   end;

trunk/Languages/xtactics.cs.po

@@ -9 +9 @@
 "MIME-Version: 1.0\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.0.2\n"
+"X-Generator: Poedit 2.0.4\n"
 "Language: cs\n"
 
@@ -86 +86 @@
 
 #: tcore.ashowcharts.caption
-#, fuzzy
-#| msgid "Show charts"
 msgctxt "tcore.ashowcharts.caption"
 msgid "Charts"
-msgstr "Ukázat grafy"
+msgstr "Grafy vývoje"
 
 #: tcore.ashowunitmoves.caption
 msgctxt "tcore.ashowunitmoves.caption"
 msgid "Unit moves"
-msgstr ""
+msgstr "Pohyby jednotek"
 
 #: tformabout.buttonclose.caption
@@ -334 +332 @@
 #: tformnew.label8.caption
 msgid "Map shape:"
-msgstr "Tvar mapy"
+msgstr "Tvar mapy:"
 
 #: tformnew.label9.caption
@@ -362 +360 @@
 #: tformnew.radiogroupgrowcells.caption
 msgid "Growing cells"
-msgstr "Rostoucí buňky:"
+msgstr "Rostoucí buňky"
 
 #: tformnew.tabsheet1.caption
@@ -440 +438 @@
 
 #: tformsettings.checkboxautosaveturn.caption
-#, fuzzy
 msgctxt "tformsettings.checkboxautosaveturn.caption"
 msgid "Autosave game on each turn"
@@ -481 +478 @@
 msgctxt "tformunitmoves.caption"
 msgid "Unit moves"
-msgstr ""
+msgstr "Pohyby jednotek"
 
 #: tformunitmoves.listview1.columns[0].caption
 msgid "From cell"
-msgstr ""
+msgstr "Z buňky"
 
 #: tformunitmoves.listview1.columns[1].caption
 msgid "To cell"
-msgstr ""
+msgstr "Do buňky"
 
 #: tformunitmoves.listview1.columns[2].caption
 msgid "Once count"
-msgstr ""
+msgstr "Počet jednorázově"
 
 #: tformunitmoves.listview1.columns[3].caption
 msgid "Repeat count"
-msgstr ""
+msgstr "Počet opakovaně"
 
 #: ucore.sendgame
@@ -613 +610 @@
 msgstr "Obdelníkový"
 
+#: uformnew.srounded
+msgid "Rounded"
+msgstr "Zakulacený"
+
 #: uformnew.swinobjectivecaptureposition
 msgid "Capture position"
@@ -685 +686 @@
 msgid "Zero zoom not allowed"
 msgstr "Nulové přiblížení není povoleno"
-

trunk/Languages/xtactics.po

@@ -589 +589 @@
 msgstr ""
 
+#: uformnew.srounded
+msgid "Rounded"
+msgstr ""
+
 #: uformnew.swinobjectivecaptureposition
 msgid "Capture position"

trunk/UGame.pas

@@ -150 +150 @@
   end;
 
-  TMapShape = (msRectangle, msImage);
+  TMapShape = (msRectangle, msImage, msRounded);
 
   { TMapArea }
@@ -1269 +1269 @@
   Color: TColor;
   Pos: TPoint;
+  Center: TPoint;
 begin
   case Shape of
@@ -1281 +1282 @@
       Result := Color <> clWhite;
     end;
+    msRounded: begin
+      Rect := GetPixelRect;
+      Center := Point(Rect.Left + Rect.Width div 2, Rect.Top + Rect.Height div 2);
+      Result := Sqr(Coord.X - Center.X) / Sqr(Rect.Width div 2) +
+        Sqr(Coord.Y - Center.Y) / Sqr(Rect.Height div 2) > 1;
+    end
     else Result := False;
   end;

trunk/xtactics.lpi

@@ -253 +253 @@
         <IsPartOfProject Value="True"/>
         <ComponentName Value="FormUnitMoves"/>
+        <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
       </Unit12>