Changeset 166 for trunk

Timestamp:

Nov 23, 2017, 12:14:15 AM (7 years ago)

Author:

chronos

Message:

• Modified: Voronoi map option enabled for normal user. Map generation is still not perfect but playable.

Location:

trunk

Files:

• Forms/UFormNew.pas (modified) (1 diff)
• Languages/xtactics.cs.po (modified) (1 diff)
• Languages/xtactics.po (modified) (1 diff)
• Packages/Common/UGeometry.pas (modified) (1 diff)
• UCore.pas (modified) (1 diff)
• UGame.pas (modified) (4 diffs)
• UMap.pas (modified) (3 diffs)

trunk/Forms/UFormNew.pas

@@ -190 +190 @@
     Items.Add(SGridTypeSquare);
     Items.Add(SGridTypeTriangle);
-    if Core.DevelMode then
-      Items.Add(SGridTypeVoronoi);
+    Items.Add(SGridTypeVoronoi);
     ItemIndex := LastIndex;
   end;

trunk/Languages/xtactics.cs.po

@@ -87 +87 @@
 #: tcore.ashowcharts.caption
 #, fuzzy
-#| msgid "Charts"
+#| msgid "Show charts"
 msgctxt "tcore.ashowcharts.caption"
-msgid "Show charts"
+msgid "Charts"
 msgstr "Grafy vývoje"
+
+#: tcore.ashowunitmoves.caption
+#, fuzzy
+msgctxt "tcore.ashowunitmoves.caption"
+msgid "Unit moves"
+msgstr "Pohyby jednotek"
 
 #: tformabout.buttonclose.caption

trunk/Languages/xtactics.po

@@ -77 +77 @@
 #: tcore.ashowcharts.caption
 msgctxt "tcore.ashowcharts.caption"
-msgid "Show charts"
+msgid "Charts"
+msgstr ""
+
+#: tcore.ashowunitmoves.caption
+msgctxt "tcore.ashowunitmoves.caption"
+msgid "Unit moves"
 msgstr ""
 

trunk/Packages/Common/UGeometry.pas

@@ -161 +161 @@
   LDetDivInv := 1 / D;
 
-  Intersection.X := Trunc(((LDetLineA * LDiffLB.X) - (LDiffLA.X * LDetLineB)) * LDetDivInv);
-  Intersection.Y := Trunc(((LDetLineA * LDiffLB.Y) - (LDiffLA.Y * LDetLineB)) * LDetDivInv);
+  Intersection.X := Round(((LDetLineA * LDiffLB.X) - (LDiffLA.X * LDetLineB)) * LDetDivInv);
+  Intersection.Y := Round(((LDetLineA * LDiffLB.Y) - (LDiffLA.Y * LDetLineB)) * LDetDivInv);
   Result := True;
 end;

trunk/UCore.pas

@@ -429 +429 @@
 begin
   Game.New;
+  Game.DevelMode := DevelMode;
   SelectClient;
   if Game.Players.GetAliveCount = Game.Players.Count then Game.Running := True

trunk/UGame.pas

@@ -475 +475 @@
     procedure InitDefaultPlayersSetting;
   public
+    DevelMode: Boolean;
     Players: TPlayers;
     PlayersSetting: TPlayers;
@@ -1049 +1050 @@
     end;
 
-{    // Draw links to neighbors
+    // Draw links to neighbors
+    if Player.Game.DevelMode then
     for Cell in Cells do begin
       for NeighCell in Cell.MapCell.Neighbors do begin
@@ -1062 +1064 @@
         View.CellToCanvasPos(Cell.MapCell.PosPx).Y, IntToStr(Cell.MapCell.Id));
     end;
- }
+
     // Draw arrows
     Pen.Color := clCream;
@@ -1109 +1111 @@
   //Changing;
   //RequiredState([csHandleValid, csBrushValid, csPenValid]);
+  //Canvas.Brush.Style := bsClear;
   LCLIntf.Polygon(Canvas.Handle, @Points[0], Length(Points), Winding);
+//  SetLength(Points, Length(Points) + 1);
+//  Points[Length(Points) - 1] = Points[0];
+//  LCLIntf.Polyline(Canvas.Handle, @Points[0], Length(Points));
   //Changed;
 end;

trunk/UMap.pas

@@ -298 +298 @@
   LeftText: string;
   RightText: string;
+  NeighborCell: TCell;
 begin
   Clear;
@@ -374 +375 @@
       LeftCell := Cell.Neighbors[I];
       RightCell := Cell.Neighbors[(I + 1) mod Cell.Neighbors.Count];
-      LeftText := LeftCell.Neighbors.ToString;
-      RightText := RightCell.Neighbors.ToString;
+      //LeftText := LeftCell.Neighbors.ToString;
+      //RightText := RightCell.Neighbors.ToString;
       LeftIndex := LeftCell.Neighbors.IndexOf(Cell);
       RightIndex := RightCell.Neighbors.IndexOf(Cell);
@@ -424 +425 @@
       Polygon := TPolygon.Create(Rect(0, 0,
         Size.X * DefaultCellSize.X, Size.Y * DefaultCellSize.Y));
-      for I := 0 to Cell.Neighbors.Count - 1 do begin
-        LinkLine := TLine.Create(Cell.PosPx,
-          Cell.Neighbors[I].PosPx);
+      for NeighborCell in Cell.Neighbors do begin
+        LinkLine := TLine.Create(Cell.PosPx, NeighborCell.PosPx);
         LinkLine.Distance := LinkLine.Distance - 4;
         MP := LinkLine.GetMiddle;