Changeset 62 for trunk


Ignore:
Timestamp:
Sep 26, 2014, 1:58:41 PM (10 years ago)
Author:
chronos
Message:
  • Modified: Show one bigger arrow between two cells on unit move.
  • Added: New move clear existing counter move.
  • Modified: Move toolbar to left to have more space on top.
Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/Forms/UFormMain.lfm

    r58 r62  
    1616  WindowState = wsMaximized
    1717  object PaintBox1: TPaintBox
    18     Left = 0
    19     Height = 547
    20     Top = 32
    21     Width = 775
     18    Left = 40
     19    Height = 579
     20    Top = 0
     21    Width = 735
    2222    Align = alClient
    2323    OnMouseDown = PaintBox1MouseDown
    … …  
    4949  object ToolBar1: TToolBar
    5050    Left = 0
     51    Height = 579
    5152    Top = 0
    52     Width = 775
     53    Width = 40
     54    Align = alLeft
    5355    ButtonHeight = 32
    5456    ButtonWidth = 32
    … …  
    6466    end
    6567    object ToolButton2: TToolButton
    66       Left = 33
    67       Top = 2
     68      Left = 1
     69      Top = 34
    6870      Action = Core.AGameEndTurn
    6971    end
    7072    object ToolButton3: TToolButton
    71       Left = 65
    72       Top = 2
     73      Left = 1
     74      Top = 66
    7375      Action = Core.AGameEnd
    7476    end
    7577    object ToolButton4: TToolButton
    76       Left = 97
    77       Top = 2
     78      Left = 1
     79      Top = 98
    7880      Action = Core.AGameRestart
    7981    end
    8082    object ToolButton5: TToolButton
    81       Left = 129
    82       Top = 2
     83      Left = 1
     84      Top = 130
    8385      Action = Core.ASettings
    8486    end
    8587    object ToolButton6: TToolButton
    86       Left = 171
    87       Top = 2
     88      Left = 1
     89      Top = 194
    8890      Action = AZoomIn
    8991    end
    9092    object ToolButton7: TToolButton
    91       Left = 203
    92       Top = 2
     93      Left = 1
     94      Top = 226
    9395      Action = AZoomOut
    9496    end
    9597    object ToolButton8: TToolButton
    96       Left = 235
    97       Top = 2
     98      Left = 1
     99      Top = 258
    98100      Action = AZoomAll
    99101    end
    100102    object ToolButton9: TToolButton
    101       Left = 161
    102       Top = 2
    103       Width = 10
     103      Left = 1
     104      Top = 162
     105      Width = 32
    104106      Caption = 'ToolButton9'
    105107      Style = tbsSeparator

  • trunk/Forms/UFormMain.pas

    r58 r62  
    180180    ToolBar1.ButtonHeight := 32 + 6;
    181181    ToolBar1.Height := 32 + 10;
     182    ToolBar1.Width := 32 + 10;
    182183  end else begin
    183184    ToolBar1.ButtonWidth := 16 + 7;
    184185    ToolBar1.ButtonHeight := 16 + 6;
    185186    ToolBar1.Height := 16 + 10;
     187    ToolBar1.Width := 16 + 10;
    186188    ToolBar1.Images := Core.ImageListSmall;
    187189  end;

  • trunk/UCore.lfm

    r58 r62  
    17141714    VersionSuffix = 'alfa'
    17151715    CompanyName = 'Chronosoft'
    1716     CompanyHomePage = 'http://chronosoft.zdechov.net/xtactics/'
    1717     HomePage = 'http://chronosoft.zdechov.net'
     1716    CompanyHomePage = 'http://svn.zdechov.net/trac/xtactics'
     1717    HomePage = 'http://svn.zdechov.net/trac/xtactics'
    17181718    AuthorsName = 'Chronos'
    17191719    AppName = 'xTactics'
    1720     ReleaseDate = 41716
     1720    ReleaseDate = 41908
    17211721    RegistryKey = '\Software\xTactics'
    17221722    RegistryRoot = rrKeyCurrentUser

  • trunk/UGame.pas

    r60 r62  
    237237    procedure SetRunning(AValue: Boolean);
    238238    procedure UpdateRepeatMoves(Player: TPlayer);
     239    procedure CheckCounterMove(Move: TUnitMove);
    239240  public
    240241    Players: TPlayers;
    … …  
    524525  SetLength(Points, 8);
    525526  SetLength(FPoints, 8);
    526   ArrowSize := Point(Trunc(DefaultCellSize.X / 4 * View.Zoom),
    527     Trunc(DefaultCellSize.Y / 4* View.Zoom));
     527  ArrowSize := Point(Trunc(DefaultCellSize.X / 3 * View.Zoom),
     528    Trunc(DefaultCellSize.Y / 3 * View.Zoom));
    528529  FPoints[0] := FloatPoint(+0.5 * ArrowSize.X, +0 * ArrowSize.Y);
    529530  FPoints[1] := FloatPoint(+0 * ArrowSize.X, +0.5 * ArrowSize.Y);
    … …  
    546547    Brush.Style := bsClear;
    547548    Font.Color := clBlack;
    548     Font.Size := Trunc(16 * View.Zoom);
     549    Font.Size := Trunc(26 * View.Zoom);
    549550    TextOut(Pos.X - TextWidth(Text) div 2,
    550551      Pos.Y - TextHeight(Text) div 2, Text);
    … …  
    12881289  end;
    12891290  if Confirm then begin
    1290   if Assigned(OldMove) then begin
    1291     // Already have such move
    1292     if (CountOnce = 0) and (CountRepeat = 0) then Moves.Delete(I)
    1293       else begin
    1294         TUnitMove(Moves[I]).CountOnce := CountOnce;
    1295         TUnitMove(Moves[I]).CountRepeat := CountRepeat;
     1291    if Assigned(OldMove) then begin
     1292      // Already have such move
     1293      if (CountOnce = 0) and (CountRepeat = 0) then Moves.Delete(I)
     1294        else begin
     1295          OldMove.CountOnce := CountOnce;
     1296          OldMove.CountRepeat := CountRepeat;
     1297          CheckCounterMove(OldMove);
     1298        end;
     1299    end else begin
     1300      // Add new move
     1301      if (CountOnce > 0) or (CountRepeat > 0) then begin
     1302        NewMove := TUnitMove(Moves[Moves.Add(TUnitMove.Create)]);
     1303        NewMove.List := Moves;
     1304        NewMove.CellFrom := CellFrom;
     1305        NewMove.CellTo := CellTo;
     1306        NewMove.CountOnce := CountOnce;
     1307        NewMove.CountRepeat := CountRepeat;
     1308        CheckCounterMove(NewMove);
    12961309      end;
    1297   end else begin
    1298     // Add new move
    1299     if (CountOnce > 0) or (CountRepeat > 0) then begin
    1300       NewMove := TUnitMove(Moves[Moves.Add(TUnitMove.Create)]);
    1301       NewMove.List := Moves;
    1302       NewMove.CellFrom := CellFrom;
    1303       NewMove.CellTo := CellTo;
    1304       NewMove.CountOnce := CountOnce;
    1305       NewMove.CountRepeat := CountRepeat;
    1306     end;
    1307   end;
     1310    end;
     1311
    13081312  end;
    13091313end;
    … …  
    13361340        CountOnce := CountRepeat
    13371341        else CountOnce := CellFrom.GetAvialPower;
     1342  end;
     1343end;
     1344
     1345procedure TGame.CheckCounterMove(Move: TUnitMove);
     1346var
     1347  I: Integer;
     1348  CounterMove: TUnitMove;
     1349begin
     1350  I := 0;
     1351  while (I < Moves.Count) and ((TUnitMove(Moves[I]).CellTo <> Move.CellFrom) and
     1352    (TUnitMove(Moves[I]).CellFrom <> Move.CellTo)) do Inc(I);
     1353  if I < Moves.Count then CounterMove := TUnitMove(Moves[I])
     1354    else CounterMove := nil;
     1355  if Assigned(CounterMove) then begin
     1356    // For now, just remove counter move
     1357    Moves.Remove(CounterMove);
    13381358  end;
    13391359end;
    … …  
    16441664  Angle: Double;
    16451665  ArrowCenter: TPoint;
     1666  Move: TUnitMove;
    16461667begin
    16471668  with Canvas, View do
    … …  
    16581679        Pen.Color := clBlack;
    16591680        PaintCell(Canvas, Cell.PosPx, IntToStr(Cell.GetAvialPower), View, Cell);
    1660 
    1661         // Draw arrows
    1662         Pen.Color := clCream;
    1663         for I := 0 to Cell.MovesFrom.Count - 1 do begin
    1664           PosFrom := CellToPos(Cell);
    1665           PosTo := CellToPos(TUnitMove(Cell.MovesFrom[I]).CellTo);
    1666           if TUnitMove(Cell.MovesFrom[I]).CountRepeat > 0 then Pen.Width := 2
    1667             else Pen.Width := 1;
    1668           Angle := ArcTan((PosTo.Y - PosFrom.Y) / (PosTo.X - PosFrom.X));
    1669           if Sign(PosTo.X - PosFrom.X) = -1 then Angle := Angle + Pi;
    1670           ArrowCenter := View.CellToCanvasPos(Point(Trunc(PosFrom.X + (PosTo.X - PosFrom.X) / 3),
    1671             Trunc(PosFrom.Y + (PosTo.Y - PosFrom.Y) / 3)));
    1672           DrawArrow(Canvas, View, ArrowCenter,
    1673             Angle, IntToStr(TUnitMove(Cell.MovesFrom[I]).CountOnce));
    1674         end;
    16751681      end;
     1682
     1683    end;
     1684
     1685    // Draw arrows
     1686    Pen.Color := clCream;
     1687    for I := 0 to Game.Moves.Count - 1 do begin
     1688      Move := TUnitMove(Game.Moves[I]);
     1689      PosFrom := CellToPos(Move.CellFrom);
     1690      PosTo := CellToPos(Move.CellTo);
     1691      if Move.CountRepeat > 0 then Pen.Width := 2
     1692        else Pen.Width := 1;
     1693      Angle := ArcTan((PosTo.Y - PosFrom.Y) / (PosTo.X - PosFrom.X));
     1694      if Sign(PosTo.X - PosFrom.X) = -1 then Angle := Angle + Pi;
     1695      ArrowCenter := View.CellToCanvasPos(Point(Trunc(PosFrom.X + (PosTo.X - PosFrom.X) / 2),
     1696        Trunc(PosFrom.Y + (PosTo.Y - PosFrom.Y) / 2)));
     1697      DrawArrow(Canvas, View, ArrowCenter,
     1698        Angle, IntToStr(Move.CountOnce));
    16761699    end;
    16771700  finally

  • trunk/xtactics.lpi

    r59 r62  
    2424          <Version Value="11"/>
    2525          <Target>
    26             <Filename Value="xtactics"/>
     26            <Filename Value="lib/$(TargetCPU)-$(TargetOS)/xtactics"/>
    2727          </Target>
    2828          <SearchPaths>
    2929            <IncludeFiles Value="$(ProjOutDir)"/>
     30            <OtherUnitFiles Value="Forms"/>
    3031            <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
    3132          </SearchPaths>
    … …  
    161162    <Version Value="11"/>
    162163    <Target>
    163       <Filename Value="xtactics"/>
     164      <Filename Value="lib/$(TargetCPU)-$(TargetOS)/xtactics"/>
    164165    </Target>
    165166    <SearchPaths>
Note: See TracChangeset for help on using the changeset viewer.