Changeset 153 for trunk

Timestamp:

Nov 15, 2017, 10:20:16 PM (7 years ago)

Author:

chronos

Message:

• Fixed: Show other players cells with normal power and cells of current player with power lowered by unit moves.
• Modified: Translate also exception messages.

Location:

trunk

Files:

• Languages/xtactics.cs.po (modified) (4 diffs)
• Languages/xtactics.po (modified) (4 diffs)
• UGame.pas (modified) (10 diffs)

trunk/Languages/xtactics.cs.po

@@ -652 +652 @@
 msgstr "Člověk"
 
+#: ugame.sattackerpowerpositive
+msgctxt "ugame.sattackerpowerpositive"
+msgid "Attacker power have to be higher then 0."
+msgstr "Síla útočníka musí být větší než 0."
+
+#: ugame.scellremoveneighborerror
+msgid "Can't remove cell from neighbour cell"
+msgstr "Nelze odstranit buňku ze sousední buňky"
+
 #: ugame.scomputer
 msgctxt "ugame.scomputer"
@@ -657 +666 @@
 msgstr "Počítač"
 
+#: ugame.sdefenderpowerpositive
+msgid "Defender power have to be higher then or equal to 0."
+msgstr "Síla obránce musí být vyšší než nebo rovna nule."
+
 #: ugame.shuman
 msgctxt "ugame.shuman"
@@ -666 +679 @@
 msgstr "Potřebujete alespoň dva hráče"
 
+#: ugame.snegativecellpowernotallowed
+msgid "Not allowed to substract power under zero to negative value"
+msgstr "Není povoleno odečíst sílu pod nulu do záporné hodnoty"
+
 #: ugame.snewgamefile
 msgid "New game.xtg"
@@ -679 +696 @@
 msgstr "Neukončená bitva"
 
+#: ugame.sunitpowermismatch
+msgid "Unit move power mismatch. Cell power is %d but %d moved away."
+msgstr "Chyba síly přesunu jednotek. Síla buňky je %d, ale %d přesunuto pryč."
+
 #: ugame.swrongfileformat
 msgid "Wrong file format"

trunk/Languages/xtactics.po

@@ -631 +631 @@
 msgstr ""
 
+#: ugame.sattackerpowerpositive
+msgctxt "ugame.sattackerpowerpositive"
+msgid "Attacker power have to be higher then 0."
+msgstr ""
+
+#: ugame.scellremoveneighborerror
+msgid "Can't remove cell from neighbour cell"
+msgstr ""
+
 #: ugame.scomputer
 msgctxt "ugame.scomputer"
@@ -636 +645 @@
 msgstr ""
 
+#: ugame.sdefenderpowerpositive
+msgid "Defender power have to be higher then or equal to 0."
+msgstr ""
+
 #: ugame.shuman
 msgctxt "ugame.shuman"
@@ -645 +658 @@
 msgstr ""
 
+#: ugame.snegativecellpowernotallowed
+msgid "Not allowed to substract power under zero to negative value"
+msgstr ""
+
 #: ugame.snewgamefile
 msgid "New game.xtg"
@@ -658 +675 @@
 msgstr ""
 
+#: ugame.sunitpowermismatch
+msgid "Unit move power mismatch. Cell power is %d but %d moved away."
+msgstr ""
+
 #: ugame.swrongfileformat
 msgid "Wrong file format"

trunk/UGame.pas

@@ -61 +61 @@
     Weight: Integer; // Temporary value
     Links: TCellLinks;
+    procedure Check;
     function NeighboringToVoid: Boolean;
     procedure AreaExtend;
@@ -514 +515 @@
   SNewGameFile = 'New game.xtg';
   SZeroZoomNotAlowed = 'Zero zoom not allowed';
+  SCellRemoveNeighborError = 'Can''t remove cell from neighbour cell';
+  SNegativeCellPowerNotAllowed = 'Not allowed to substract power under zero to negative value';
+  SAttackerPowerPositive = 'Attacker power have to be higher then 0.';
+  SDefenderPowerPositive = 'Defender power have to be higher then or equal to 0.';
+  SUnitPowerMismatch = 'Unit move power mismatch. Cell power is %d but %d moved away.';
 
 procedure InitStrings;
@@ -726 +732 @@
   for I := 0 to Cells.Count - 1 do begin
     if TCell(Cells[I]).Neighbors.Remove(TCell(Cells[1 - I])) = -1 then
-      raise Exception.Create('Can''t remove cell from neighbour cell');
+      raise Exception.Create(SCellRemoveNeighborError);
     if TCell(Cells[I]).Links.Remove(Self) = -1 then
-      raise Exception.Create('Can''t remove cell from neighbour cell');
+      raise Exception.Create(SCellRemoveNeighborError);
   end;
   FreeAndNil(Cells);
@@ -978 +984 @@
       Cell := TPlayerCell(Cells[C]);
       if (Cell.MapCell.Terrain <> ttVoid) and Cell.MapCell.IsVisible(View) then begin
-        CellText := IntToStr(Cell.MapCell.GetAvialPower);
+        if Cell.MapCell.Player = Player then
+          CellText := IntToStr(Cell.MapCell.GetAvialPower)
+          else CellText := IntToStr(Cell.MapCell.Power);
         if Assigned(SelectedCell) and (SelectedCell = Cell.MapCell) then
             Brush.Color := clGreen
@@ -1750 +1758 @@
   if FPower = AValue then Exit;
   if AValue < 0 then
-    raise Exception.Create('Not allowed to substract power under zero do negative value');
+    raise Exception.Create(SNegativeCellPowerNotAllowed);
   FPower := AValue;
+end;
+
+procedure TCell.Check;
+var
+  AvailPower: Integer;
+begin
+  AvailPower := GetAvialPower;
+  if AvailPower < 0 then
+    raise Exception.Create(Format(SUnitPowerMismatch, [Power, -(AvailPower - Power)]));
 end;
 
@@ -1897 +1914 @@
   for UnitMove in MovesFrom do
     Result := Result - UnitMove.CountOnce;
-  if Result < 0 then raise Exception.Create('Unit move power mismatch. Cell power is ' +
-    IntToStr(Power) + ' but ' + IntToStr(- (Result - Power)) + ' moved away.');
 end;
 
@@ -1943 +1958 @@
   for I := Neighbors.Count - 1 downto 0 do
     if TCell(Neighbors[I]).Neighbors.Remove(Self) = -1 then
-      raise Exception.Create('Can''t remove cell from neighbour cell');
+      raise Exception.Create(SCellRemoveNeighborError);
   FreeAndNil(Neighbors);
   inherited Destroy;
@@ -2522 +2537 @@
   DefendRolls := TFPGList<Integer>.Create;
   if AttackPower < 1 then
-    raise Exception.Create('Attacker power have to be higher then 0.');
+    raise Exception.Create(SAttackerPowerPositive);
   if DefendPower < 0 then
-    raise Exception.Create('Defender power have to be higher then or equal to 0.');
+    raise Exception.Create(SDefenderPowerPositive);
   while (AttackPower > 0) and (DefendPower > 0) do begin
     // Risk game rules:
@@ -2654 +2669 @@
     end;
   end;
+
   // Remove empty moves
   for I := Moves.Count - 1 downto 0 do
@@ -2734 +2750 @@
       end;
     end;
+    CellFrom.Check;
     if Assigned(Game.FOnMoveUpdated) then Game.FOnMoveUpdated(Result);
   end;