Changeset 245 for trunk

Timestamp:

Sep 22, 2018, 1:07:53 PM (6 years ago)

Author:

chronos

Message:

• Added: Limit minimum and maximum map zoom.

Location:

trunk

Files:

• Forms/UFormClient.lfm (modified) (4 diffs)
• Forms/UFormClient.pas (modified) (3 diffs)
• Forms/UFormHelp.pas (modified) (1 diff)
• Languages/xtactics.cs.po (modified) (5 diffs)
• Languages/xtactics.po (modified) (1 diff)

trunk/Forms/UFormClient.lfm

@@ -7 +7 @@
   ClientHeight = 621
   ClientWidth = 775
-  DesignTimePPI = 120
+  DesignTimePPI = 144
   OnClose = FormClose
   OnCreate = FormCreate
@@ -17 +17 @@
   object StatusBar1: TStatusBar
     Left = 0
-    Height = 28
-    Top = 593
+    Height = 30
+    Top = 591
     Width = 775
     Panels = <    
@@ -34 +34 @@
   object ToolBar1: TToolBar
     Left = 0
-    Height = 593
+    Height = 591
     Top = 0
     Width = 32
@@ -80 +80 @@
   object PaintBox1: TPaintBox
     Left = 32
-    Height = 593
+    Height = 591
     Top = 0
     Width = 743

trunk/Forms/UFormClient.pas

@@ -12 +12 @@
 const
   ZoomFactor = 1.5;
+  MinZoom = 0.05;
+  MaxZoom = 10;
   MouseMinDiff = 0.1;
 
@@ -447 +449 @@
 begin
   with Client do begin
-    View.Zoom := View.Zoom * ZoomFactor;
+    if View.Zoom * ZoomFactor < MaxZoom then
+      View.Zoom := View.Zoom * ZoomFactor;
   end;
   Redraw;
@@ -453 +456 @@
 
 procedure TFormClient.AZoomOutExecute(Sender: TObject);
-//var
-//  D: TPoint;
 begin
   with Client do begin
-    //D := Point(Trunc(MousePos.X - View.Left / ViewZoom),
-    //  Trunc(MousePos.Y - View.Top / ViewZoom));
-    View.Zoom := View.Zoom / ZoomFactor;
-    //View := Bounds(Trunc((D.X - MousePos.X) * ViewZoom),
-    //  Trunc((D.Y - MousePos.Y) * ViewZoom),
-    //  View.Right - View.Left,
-    //  View.Bottom - View.Top);
+    if View.Zoom / ZoomFactor > MinZoom then
+      View.Zoom := View.Zoom / ZoomFactor;
   end;
   Redraw;

trunk/Forms/UFormHelp.pas

@@ -52 +52 @@
     'In case of tie, defender wins. Loser lose its unit and another pair of dices is evaluated. ' +
     'This process is calculated automatically and for each planned attack win ' +
-    'probability is displayed.';
+    'probability is displayed.' +
+    LineEnding + LineEnding +
+    'Units can be moved by clicking on owned cell and then by clicking on target neutral ' +
+    'or enemy cell. Moves can be set to be repeated every turn with defined number of units. ' +
+    'Repeated unit moves can be set in Unit move dialog or simply by holding Control key while selecting target cell. ' +
+    'If there are multiple unit moves from one cell to more other cells and ' +
+    'you want to move all available cells to target cell, then you can do so by holding Shift key while selecting target cell.';
 
 {$R *.lfm}

trunk/Languages/xtactics.cs.po

@@ -9 +9 @@
 "MIME-Version: 1.0\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.8\n"
+"X-Generator: Poedit 2.0.6\n"
 "Language: cs\n"
 
@@ -350 +350 @@
 
 #: tformnew.aplayermodify.caption
-#, fuzzy
-#| msgid "Modify player"
 msgctxt "tformnew.aplayermodify.caption"
 msgid "Modify"
-msgstr "Upravit hráče"
+msgstr "Upravit"
 
 #: tformnew.aplayerremove.caption
@@ -860 +858 @@
 "\n"
 "Resolution of attack of units is determined by rule similar to one which is used in Risk game. Battle consist of several fights. Each fight attacker can use up to 3 units and defender up to 2 units. Number of units for each side determine number of dices. Both sides roll their dices and order them in descending order. Each side takes one dice with highest value. One who has dice with higher value wins. In case of tie, defender wins. Loser lose its unit and another pair of dices is evaluated. This process is calculated automatically and for each planned attack win probability is displayed.\n"
+"\n"
+"Units can be moved by clicking on owned cell and then by clicking on target neutral or enemy cell. Moves can be set to be repeated every turn with defined number of units. Repeated unit moves can be set in Unit move dialog or simply by holding Control key while selecting target cell. If there are multiple unit moves from one cell to more other cells and you want to move all available cells to target cell, then you can do so by holding Shift key while selecting target cell.\n"
 msgstr ""
 "xTactics je strategická hra založena na hře Risk. Hlavní zaměření hry je nabídnout hráči různé možnosti k nastavení podmínek hry. Mapa hry je generována náhodně pro každou hru. Hra je pro více hráčů takže jeden hráč může hrát s dalšími lidskými protivníky nebo s mnoha počítačovými protivníky.\n"
@@ -867 +867 @@
 "\n"
 "Vyhodnocení útoku jednotek je určen pravidlem podobným tomu, které je použito u hry Risk. Bitva se skládá z několika bojů. Každá boj útočník může použít do 3 jednotek a obránce do 2 jednotek. Počet jednotek pro každou stranu určuje počet kostek. Obě strany házejí jejich kostkami a seřadí je v sestupném pořadí. Každá strana bere jednu kostku s nejvyšší hodnotou. Ten, který má kostku s vyšší hodnotou vyhrává. V případě remízy, vyhrává obránce. Prohrávající ztrácí své jednotky a další pár kostek je vyhodnocen. Tento proces je vypočítáván automaticky a pro každý plánovaný útok je zobrazena odhadovaná pravděpodobnost.\n"
+"\n"
+"Jednotky lze přesouvat kliknutím na vlastněnou buňku a pak kliknutím na cílovou neutrální nebo nepřátelskou buňku. Přesuny lze nastavit jako opakující se každá tak s určeným počtem jednotek. Opakující se přesuny jednotek lze nastavit v okně Přesun jednotek nebo jednoduše pomocí držení klávesy Control při výběru cílové buňky. Pokud je více přesunů z jedené buňky do více jiných a chcete přesunout všechny dostupné do cílové buňky, tak to můžete provést pomocí držení klávesy Shift a výběru cílové buňky.\n"
 
 #: uformkeyshortcuts.sglobal
@@ -1054 +1056 @@
 msgid "64-bit UInt read overflow."
 msgstr "Přetečení při čtení 64-bit UInt"
-

trunk/Languages/xtactics.po

@@ -843 +843 @@
 "\n"
 "Resolution of attack of units is determined by rule similar to one which is used in Risk game. Battle consist of several fights. Each fight attacker can use up to 3 units and defender up to 2 units. Number of units for each side determine number of dices. Both sides roll their dices and order them in descending order. Each side takes one dice with highest value. One who has dice with higher value wins. In case of tie, defender wins. Loser lose its unit and another pair of dices is evaluated. This process is calculated automatically and for each planned attack win probability is displayed.\n"
+"\n"
+"Units can be moved by clicking on owned cell and then by clicking on target neutral or enemy cell. Moves can be set to be repeated every turn with defined number of units. Repeated unit moves can be set in Unit move dialog or simply by holding Control key while selecting target cell. If there are multiple unit moves from one cell to more other cells and you want to move all available cells to target cell, then you can do so by holding Shift key while selecting target cell.\n"
 msgstr ""