Changeset 387 for trunk

Timestamp:

Apr 27, 2021, 9:37:48 PM (4 years ago)

Author:

chronos

Message:

• Added: New action keys for quick switching between units. "Next Unit" Insert key and "Previous Unit" Delete key.

Location:

trunk

Files:

• Language.txt (modified) (1 diff)
• LocalPlayer/Term.lfm (modified) (2 diffs)
• LocalPlayer/Term.pas (modified) (20 diffs)
• LocalPlayer/UKeyBindings.pas (modified) (2 diffs)
• Localization/cs/Language.txt (modified) (1 diff)
• Localization/de/Language.txt (modified) (1 diff)
• Localization/it/Language.txt (modified) (1 diff)
• Localization/ru/Language.txt (modified) (1 diff)
• Localization/zh-Hans/language.txt (modified) (1 diff)
• Localization/zh-Hant/language.txt (modified) (1 diff)

trunk/Language.txt

@@ -548 +548 @@
 Medium
 Big
+Previous Unit
+Next Unit
 
 #ADVANCES

trunk/LocalPlayer/Term.lfm

@@ -1 +1 @@
 object MainScreen: TMainScreen
-  Left = 169
+  Left = 516
   Height = 480
-  Top = 596
+  Top = 834
   Width = 800
   HorzScrollBar.Visible = False
@@ -667 +667 @@
       OnClick = MenuClick
     end
+    object N13: TMenuItem
+      Caption = '-'
+    end
+    object mPrevUnit: TMenuItem
+      Tag = 100
+      ShortCut = 46
+      OnClick = MenuClick
+    end
+    object mNextUnit: TMenuItem
+      Tag = 101
+      ShortCut = 45
+      OnClick = MenuClick
+    end
   end
   object StatPopup: TPopupMenu

trunk/LocalPlayer/Term.pas

@@ -29 +29 @@
   TMainScreen = class(TDrawDlg)
     mBigTiles: TMenuItem;
+    mNextUnit: TMenuItem;
+    N13: TMenuItem;
+    mPrevUnit: TMenuItem;
     Timer1: TTimer;
     GamePopup: TPopupMenu;
@@ -286 +289 @@
     procedure CopyMiniToPanel;
     procedure PanelPaint;
-    procedure NextUnit(NearLoc: integer; AutoTurn: boolean);
+    procedure FocusNextUnit(Dir: Integer = 1);
+    procedure NextUnit(NearLoc: Integer; AutoTurn: Boolean);
     procedure Scroll(dx, dy: integer);
     procedure SetMapPos(Loc: integer; MapPos: TPoint);
@@ -2427 +2431 @@
   begin
     SetTroopLoc(-1);
-    PaintAll
+    PaintAll;
   end { supervisor }
   { else if (ClientMode=cTurn) and (MyRO.Turn=0) then
@@ -2449 +2453 @@
           FocusOnLoc(G.lx * G.ly div 2);
       SetTroopLoc(-1);
-      PanelPaint
+      PanelPaint;
     end;
     if ShowCityList then
@@ -4896 +4900 @@
 end;
 
+procedure TMainScreen.FocusNextUnit(Dir: Integer);
+var
+  i, uix, NewFocus: Integer;
+begin
+  if ClientMode >= scContact then
+    Exit;
+  DestinationMarkON := False;
+  PaintDestination;
+  NewFocus := -1;
+  for i := 1 to MyRO.nUn do begin
+    uix := (UnFocus + i * Dir + MyRO.nUn) mod MyRO.nUn;
+    if (MyUn[uix].Loc >= 0) and (MyUn[uix].Status and usStay = 0) then begin
+      NewFocus := uix;
+      Break;
+    end;
+  end;
+  if NewFocus >= 0 then begin
+    SetUnFocus(NewFocus);
+    SetTroopLoc(MyUn[NewFocus].Loc);
+    FocusOnLoc(TroopLoc, flRepaintPanel);
+  end;
+end;
+
 procedure TMainScreen.FocusOnLoc(Loc: integer; Options: integer = 0);
 var
@@ -4922 +4949 @@
 end;
 
-procedure TMainScreen.NextUnit(NearLoc: integer; AutoTurn: boolean);
+procedure TMainScreen.NextUnit(NearLoc: Integer; AutoTurn: Boolean);
 var
-  Dist, TestDist: single;
-  i, uix, NewFocus: integer;
-  GotoOnly: boolean;
+  Dist, TestDist: Single;
+  i, uix, NewFocus: Integer;
+  GotoOnly: Boolean;
 begin
   Dist := 0;
   if ClientMode >= scContact then
-    exit;
-  DestinationMarkON := false;
+    Exit;
+  DestinationMarkON := False;
   PaintDestination;
-  for GotoOnly := GoOnPhase downto false do
-  begin
+  for GotoOnly := GoOnPhase downto False do begin
     NewFocus := -1;
-    for i := 1 to MyRO.nUn do
-    begin
+    for i := 1 to MyRO.nUn do begin
       uix := (UnFocus + i) mod MyRO.nUn;
       if (MyUn[uix].Loc >= 0) and (MyUn[uix].Job = jNone) and
         (MyUn[uix].Status and (usStay or usRecover or usWaiting) = usWaiting)
         and (not GotoOnly or (MyUn[uix].Status and usGoto <> 0)) then
-        if NearLoc < 0 then
-        begin
+        if NearLoc < 0 then begin
           NewFocus := uix;
           Break;
-        end
-        else
-        begin
+        end else begin
           TestDist := Distance(NearLoc, MyUn[uix].Loc);
-          if (NewFocus < 0) or (TestDist < Dist) then
-          begin
+          if (NewFocus < 0) or (TestDist < Dist) then begin
             NewFocus := uix;
             Dist := TestDist;
@@ -4958 +4979 @@
     end;
     if GotoOnly then
-      if NewFocus < 0 then
-        GoOnPhase := false
-      else
-        Break;
-  end;
-  if NewFocus >= 0 then
-  begin
+      if NewFocus < 0 then GoOnPhase := False
+        else Break;
+  end;
+  if NewFocus >= 0 then begin
     SetUnFocus(NewFocus);
     SetTroopLoc(MyUn[NewFocus].Loc);
-    FocusOnLoc(TroopLoc, flRepaintPanel)
-  end
-  else if AutoTurn and not mWaitTurn.Checked then
-  begin
-    TurnComplete := true;
+    FocusOnLoc(TroopLoc, flRepaintPanel);
+  end else
+  if AutoTurn and not mWaitTurn.Checked then begin
+    TurnComplete := True;
     SetUnFocus(-1);
     SetTroopLoc(-1);
-    PostMessage(Handle, WM_EOT, 0, 0)
-  end
-  else
-  begin
+    PostMessage(Handle, WM_EOT, 0, 0);
+  end else begin
     if { (UnFocus>=0) and } not TurnComplete and EOT.Visible then
       Play('TURNEND');
-    TurnComplete := true;
+    TurnComplete := True;
     SetUnFocus(-1);
     SetTroopLoc(-1);
@@ -5954 +5969 @@
         end
         else
-          NextUnit(UnStartLoc, true)
+          NextUnit(UnStartLoc, true);
     end
     else if (UnFocus < 0) and (Options and muAutoNext <> 0) then
@@ -6159 +6174 @@
         begin
           MyUn[uix].Status := MyUn[uix].Status and not usWaiting;
-          NextUnit(UnStartLoc, true)
+          NextUnit(UnStartLoc, true);
         end;
       end;
@@ -6320 +6335 @@
               trixFocus := TrCnt;
             inc(TrCnt);
-          end
+          end;
     end
     else // count enemy units here
@@ -6435 +6450 @@
   mStay.ShortCut := BStay.ShortCut;
   mNoOrders.ShortCut := BNoOrders.ShortCut;
+  mPrevUnit.ShortCut := BPrevUnit.ShortCut;
+  mNextUnit.ShortCut := BNextUnit.ShortCut;
   mCancel.ShortCut := BCancel.ShortCut;
   mPillage.ShortCut := BPillage.ShortCut;
@@ -6628 +6645 @@
     else if BStay.Test(ShortCut) then MenuClick(mStay)
     else if BNoOrders.Test(ShortCut) then MenuClick(mNoOrders)
+    else if BPrevUnit.Test(ShortCut) then MenuClick(mPrevUnit)
+    else if BNextUnit.Test(ShortCut) then MenuClick(mNextUnit)
     else if BCancel.Test(ShortCut) then MenuClick_Check(UnitPopup, mCancel)
     else if BPillage.Test(ShortCut) then MenuClick_Check(UnitPopup, mPillage)
@@ -6710 +6729 @@
           end
           else
-            PanelPaint
+            PanelPaint;
         end
         else
           NextUnit(UnStartLoc, true);
-      end
+      end;
     end;
     case result of
@@ -6727 +6746 @@
       if result < rExecuted then
         Play('INVALID')
-    end
+    end;
   end;
 
@@ -6906 +6925 @@
   end
   else if UnFocus >= 0 then
-    with MyUn[UnFocus] do
+    with TUn(MyUn[UnFocus]) do
       if Sender = mGoOn then
       begin
@@ -6937 +6956 @@
       begin
         Centre(Loc);
-        PaintAllMaps
+        PaintAllMaps;
       end
       else if Sender = mCity then
@@ -6949 +6968 @@
             PaintAll;
             ZoomToCity(Loc0, true, chFounded);
-          end
+          end;
         end
         else
@@ -7010 +7029 @@
         if Job > jNone then
           Server(sStartJob + jNone shl 4, me, UnFocus, nil^);
-        NextUnit(UnStartLoc, true)
+        NextUnit(UnStartLoc, true);
       end
       else if Sender = mRecover then
@@ -7019 +7038 @@
         if Job > jNone then
           Server(sStartJob + jNone shl 4, me, UnFocus, nil^);
-        NextUnit(UnStartLoc, true)
+        NextUnit(UnStartLoc, true);
       end
       else if Sender = mNoOrders then
       begin
         Status := Status and not usWaiting;
-        NextUnit(UnStartLoc, true)
+        NextUnit(UnStartLoc, true);
+      end
+      else if Sender = mPrevUnit then
+      begin
+        Status := Status and not usWaiting;
+        FocusNextUnit(-1);
+      end
+      else if Sender = mNextUnit then
+      begin
+        Status := Status and not usWaiting;
+        FocusNextUnit(1);
       end
       else if Sender = mCancel then
@@ -7105 +7134 @@
               NextUnit(Loc, true)
             else
-              PanelPaint
+              PanelPaint;
           end
           else if i = eNoTime_Load then

trunk/LocalPlayer/UKeyBindings.pas

@@ -61 +61 @@
   BStay: TKeyBinding;
   BNoOrders: TKeyBinding;
+  BPrevUnit: TKeyBinding;
+  BNextUnit: TKeyBinding;
   BCancel: TKeyBinding;
   BPillage: TKeyBinding;
@@ -308 +310 @@
   BStay := AddItem('Stay', 'Stay', 'S');
   BNoOrders := AddItem('NoOrders', 'No orders', 'Space');
+  BPrevUnit := AddItem('PrevUnit', 'Previous unit', 'Del');
+  BNextUnit := AddItem('NextUnit', 'Next unit', 'Ins');
   BCancel := AddItem('Cancel', 'Cancel', 'Ctrl+C');
   BPillage := AddItem('Pillage', 'Pillage', 'Ctrl+P');

trunk/Localization/cs/Language.txt

@@ -548 +548 @@
 Střední
 Velká
+Předchozí jednotka
+Další jednotka
 
 #ADVANCES

trunk/Localization/de/Language.txt

@@ -557 +557 @@
 Medium
 Big
+Previous Unit
+Next Unit
 
 #ADVANCES

trunk/Localization/it/Language.txt

@@ -538 +538 @@
 Medium
 Big
+Previous Unit
+Next Unit
 
 #ADVANCES

trunk/Localization/ru/Language.txt

@@ -564 +564 @@
 Medium
 Big
+Previous Unit
+Next Unit
 
 #ADVANCES

trunk/Localization/zh-Hans/language.txt

@@ -556 +556 @@
 Medium
 Big
+Previous Unit
+Next Unit
 
 #ADVANCES

trunk/Localization/zh-Hant/language.txt

@@ -556 +556 @@
 Medium
 Big
+Previous Unit
+Next Unit
 
 #ADVANCES