build 104

MaxiDonkey · Oct 17, 2020 · efa02eb · efa02eb
1 parent 8838486
commit efa02eb
Show file tree

Hide file tree

Showing 6 changed files with 99 additions and 36 deletions.
diff --git a/TaupeEye.dproj b/TaupeEye.dproj
@@ -118,8 +118,8 @@
         <VerInfo_AutoIncVersion>true</VerInfo_AutoIncVersion>
         <VerInfo_MajorVer>0</VerInfo_MajorVer>
         <VerInfo_MinorVer>9</VerInfo_MinorVer>
-        <VerInfo_Build>102</VerInfo_Build>
-        <VerInfo_Keys>CompanyName=Galactic 911;FileVersion=0.9.0.102;InternalName=TaupeEye;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=0.9.0.0;Comments=Elite Dangerous Tool;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName)</VerInfo_Keys>
+        <VerInfo_Build>104</VerInfo_Build>
+        <VerInfo_Keys>CompanyName=Galactic 911;FileVersion=0.9.0.104;InternalName=TaupeEye;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=0.9.0.0;Comments=Elite Dangerous Tool;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName)</VerInfo_Keys>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_2)'!=''">
         <DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
@@ -207,7 +207,7 @@
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
-                <DeployFile LocalName="ModelSupport_TaupeEye\uEyeXThread\default.txvpck" Configuration="Debug" Class="ProjectFile">
+                <DeployFile LocalName="ModelSupport_TaupeEye\default.txvpck" Configuration="Debug" Class="ProjectFile">
                     <Platform Name="Win64">
                         <RemoteDir>.\</RemoteDir>
                         <Overwrite>true</Overwrite>
@@ -225,7 +225,7 @@
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
-                <DeployFile LocalName="ModelSupport_TaupeEye\default.txvpck" Configuration="Debug" Class="ProjectFile">
+                <DeployFile LocalName="ModelSupport_TaupeEye\uEyeXThread\default.txvpck" Configuration="Debug" Class="ProjectFile">
                     <Platform Name="Win64">
                         <RemoteDir>.\</RemoteDir>
                         <Overwrite>true</Overwrite>

diff --git a/TaupeEye.dproj.local b/TaupeEye.dproj.local
@@ -2,34 +2,34 @@
 <BorlandProject>
 	<Transactions>
     <Transaction>2020/09/08 17:23:59.000.846,=D:\EyeX\Activatable buttons\Unit1.pas</Transaction>
-    <Transaction>2020/09/08 17:24:33.000.630,D:\EyeX\Activatable buttons\uEyeXThread.pas=D:\EyeX\Activatable buttons\Unit1.pas</Transaction>
+    <Transaction>2020/09/08 17:24:33.000.630,D:\EyeX\Activatable buttons\Unit1.pas=D:\EyeX\Activatable buttons\uEyeXThread.pas</Transaction>
     <Transaction>2020/09/11 10:59:48.000.801,=D:\EyeX\Activatable buttons\Unit1.pas</Transaction>
-    <Transaction>2020/09/11 11:00:40.000.236,D:\EyeX\Activatable buttons\Unit1.pas=D:\EyeX\Activatable buttons\uAreaTobii.pas</Transaction>
+    <Transaction>2020/09/11 11:00:40.000.236,D:\EyeX\Activatable buttons\uAreaTobii.pas=D:\EyeX\Activatable buttons\Unit1.pas</Transaction>
     <Transaction>2020/09/13 20:55:30.000.212,=D:\EyeX\Activatable buttons\ModelSupport_ActivatableButtons\default.txaPackage</Transaction>
     <Transaction>2020/09/13 20:55:34.000.508,=D:\EyeX\Activatable buttons\ModelSupport_ActivatableButtons\default.txvpck</Transaction>
     <Transaction>2020/09/13 20:55:35.000.949,=D:\EyeX\Activatable buttons\ModelSupport_ActivatableButtons\ActivatableButtons\default.txvpck</Transaction>
-    <Transaction>2020/09/20 08:16:11.000.107,=D:\2020-developpement\TaupeEye\ModelSupport_TaupeEye\ActivatableButtons\default.txvpck</Transaction>
     <Transaction>2020/09/20 08:16:11.000.647,=D:\2020-developpement\TaupeEye\ModelSupport_TaupeEye\TaupeEye\default.txvpck</Transaction>
-    <Transaction>2020/09/20 08:16:11.000.076,d:\2020-developpement\taupeeye\modelsupport_activatablebuttons\default.txvpck=</Transaction>
     <Transaction>2020/09/20 08:16:11.000.088,d:\2020-developpement\taupeeye\modelsupport_activatablebuttons\activatablebuttons\default.txvpck=</Transaction>
+    <Transaction>2020/09/20 08:16:11.000.076,d:\2020-developpement\taupeeye\modelsupport_activatablebuttons\default.txvpck=</Transaction>
+    <Transaction>2020/09/20 08:16:11.000.018,D:\2020-developpement\TaupeEye\ActivatableButtons.dproj=D:\2020-developpement\TaupeEye\TaupeEye.dproj</Transaction>
     <Transaction>2020/09/20 08:16:11.000.717,=D:\2020-developpement\TaupeEye\ModelSupport_TaupeEye\uAreaTobii\default.txvpck</Transaction>
-    <Transaction>2020/09/20 08:16:11.000.018,D:\2020-developpement\TaupeEye\TaupeEye.dproj=D:\2020-developpement\TaupeEye\ActivatableButtons.dproj</Transaction>
+    <Transaction>2020/09/20 08:16:11.000.071,=D:\2020-developpement\TaupeEye\ModelSupport_TaupeEye\default.txaPackage</Transaction>
+    <Transaction>2020/09/20 08:16:11.000.087,=D:\2020-developpement\TaupeEye\ModelSupport_TaupeEye\default.txvpck</Transaction>
     <Transaction>2020/09/20 08:16:11.000.059,d:\2020-developpement\taupeeye\modelsupport_activatablebuttons\default.txapackage=</Transaction>
     <Transaction>2020/09/20 08:16:11.000.280,=D:\2020-developpement\TaupeEye\ModelSupport_TaupeEye\uEyeXThread\default.txvpck</Transaction>
-    <Transaction>2020/09/20 08:16:11.000.087,=D:\2020-developpement\TaupeEye\ModelSupport_TaupeEye\default.txvpck</Transaction>
-    <Transaction>2020/09/20 08:16:11.000.071,=D:\2020-developpement\TaupeEye\ModelSupport_TaupeEye\default.txaPackage</Transaction>
+    <Transaction>2020/09/20 08:16:11.000.107,=D:\2020-developpement\TaupeEye\ModelSupport_TaupeEye\ActivatableButtons\default.txvpck</Transaction>
     <Transaction>2020/09/20 08:16:12.000.928,=D:\2020-developpement\TaupeEye\ModelSupport_TaupeEye\EyeXHost\default.txvpck</Transaction>
     <Transaction>2020/09/20 08:16:12.000.823,=D:\2020-developpement\TaupeEye\ModelSupport_TaupeEye\ActivatableButtonsMain\default.txvpck</Transaction>
     <Transaction>2020/09/20 08:16:13.000.043,=D:\2020-developpement\TaupeEye\ModelSupport_TaupeEye\TaupeEye\default.txaPackage</Transaction>
     <Transaction>2020/09/20 08:19:13.000.270,=D:\2020-developpement\TaupeEye\Unit1.pas</Transaction>
-    <Transaction>2020/09/20 08:20:04.000.890,D:\2020-developpement\TaupeEye\Main.dfm=D:\2020-developpement\TaupeEye\ActivatableButtonsMain.dfm</Transaction>
-    <Transaction>2020/09/20 08:20:04.000.890,D:\2020-developpement\TaupeEye\Main.pas=D:\2020-developpement\TaupeEye\ActivatableButtonsMain.pas</Transaction>
+    <Transaction>2020/09/20 08:20:04.000.890,D:\2020-developpement\TaupeEye\ActivatableButtonsMain.pas=D:\2020-developpement\TaupeEye\Main.pas</Transaction>
+    <Transaction>2020/09/20 08:20:04.000.890,D:\2020-developpement\TaupeEye\ActivatableButtonsMain.dfm=D:\2020-developpement\TaupeEye\Main.dfm</Transaction>
     <Transaction>2020/09/20 10:56:15.000.654,=D:\2020-developpement\TaupeEye\Unit1.pas</Transaction>
-    <Transaction>2020/09/20 10:57:20.000.926,D:\2020-developpement\TaupeEye\Unit1.pas=D:\2020-developpement\TaupeEye\uJSonDico.pas</Transaction>
+    <Transaction>2020/09/20 10:57:20.000.926,D:\2020-developpement\TaupeEye\uJSonDico.pas=D:\2020-developpement\TaupeEye\Unit1.pas</Transaction>
     <Transaction>2020/09/20 17:04:20.000.090,D:\2020-developpement\TaupeEye\uJSonDico.pas=</Transaction>
     <Transaction>2020/09/20 17:07:34.000.611,=D:\2020-developpement\TaupeEye\Unit1.pas</Transaction>
-    <Transaction>2020/09/20 17:08:24.000.365,D:\2020-developpement\TaupeEye\Unit1.pas=D:\2020-developpement\TaupeEye\uXMLDico.pas</Transaction>
-    <Transaction>2020/09/20 17:08:24.000.365,D:\2020-developpement\TaupeEye\Unit1.dfm=D:\2020-developpement\TaupeEye\uXMLDico.dfm</Transaction>
+    <Transaction>2020/09/20 17:08:24.000.365,D:\2020-developpement\TaupeEye\uXMLDico.pas=D:\2020-developpement\TaupeEye\Unit1.pas</Transaction>
+    <Transaction>2020/09/20 17:08:24.000.365,D:\2020-developpement\TaupeEye\uXMLDico.dfm=D:\2020-developpement\TaupeEye\Unit1.dfm</Transaction>
     <Transaction>2020/09/26 03:20:39.000.979,=D:\2020-developpement\TaupeEye\TaupeEye.ico</Transaction>
     <Transaction>2020/09/26 04:18:23.000.367,=D:\2020-developpement\TaupeEye\TaupeEye_Icon.ico</Transaction>
     <Transaction>2020/10/14 21:32:40.000.689,=D:\2020-developpement\TaupeEye\uEliteManager.pas</Transaction>

diff --git a/TaupeEye.res b/TaupeEye.res
diff --git a/Win64/Debug/TaupeEye.exe b/Win64/Debug/TaupeEye.exe
diff --git a/Win64/Debug/TaupeEye.rsm b/Win64/Debug/TaupeEye.rsm
diff --git a/uAreaTobii.pas b/uAreaTobii.pas
@@ -215,6 +215,8 @@   TEliteContext = class
     procedure SetIndexVRSMode(const Value: Integer);
     function  GetSubVRSIndex: Integer;
     procedure SetSubVRSIndex(const Value: Integer);
+    function  GetIsFSSOpened: Boolean;
+    procedure SetIsFSSOpened(const Value: Boolean);
   public
     { --- Lauch and retieve Elite state }
     procedure TryLaunchOnMenuDisplay;
@@ -227,7 +229,7 @@   TEliteContext = class
     procedure Func_display;
     procedure GalaxyMap_display;
     procedure SystemMap_display;
-    procedure ACS_display;
+    procedure ACS_display(forced: Boolean);
     procedure DSD_display(forced: Boolean);
     procedure DoMenuEchap;
     procedure DoMenuEnter;
@@ -277,6 +279,10 @@   TEliteContext = class
       Index: Integer); overload;
     procedure NavLauncherEx(const MethA: TContextNotify; const MethB: TIntegerNotify;
       Index: Integer);
+    procedure NavLauncherVRS(const MethA: TContextNotify; const MethB: TIntANotify;
+      Index: Integer); overload;
+    procedure NavLauncherVRS(const MethA: TContextNotify; const MethB: TIntegerNotify;
+      Index: Integer); overload;
     procedure DoNavModeChange;
     procedure DoNavSlide;
     procedure DoNavNord;
@@ -430,6 +436,8 @@   TEliteContext = class
     property PanelCalled: TKindPanels read GetPanelCalled write SetPanelCalled;
     { --- Indic Opened DSD }
     property IsDSDOpened: Boolean read GetIsDSDOpened write SetIsDSDOpened;
+    { --- Indic Opened FSS }
+    property IsFSSOpened: Boolean read GetIsFSSOpened write SetIsFSSOpened;
     { --- Hud selected }
     property CurrentHud: TKindHud read GetCurrentHud write SetCurrentHud;
     { --- Indic for Process Thread to update menu SWITH area }
@@ -1886,10 +1894,18 @@ procedure TKeyboardContext.SetSpecialIndex(const Value: Integer);
 
 { TEliteContext }
 
-procedure TEliteContext.ACS_display;
+procedure TEliteContext.ACS_display(forced: Boolean);
+
+  procedure Process; begin
+    IsFSSOpened    := True;
+    CurrentDisplay := kd_fss;
+    FOwner.UpdateZone( Context_ACS )
+  end;
+
 begin
-  CurrentDisplay := kd_fss;
-  FOwner.UpdateZone( Context_ACS )
+  if forced then Process
+    else
+  if not IsFSSOpened then Process
 end;
 
 procedure TEliteContext.AssignFunc(const Index: Integer);
@@ -2852,6 +2868,7 @@ constructor TEliteContext.Create(const AOwner: TAreaTobii);
   ComPanelOpened        := False;
   PanelCalled           := kp_none;
   IsDSDOpened           := False;
+  IsFSSOpened           := False;
   FSwitchUpdate         := False;
 end;
 
@@ -2862,6 +2879,7 @@ procedure TEliteContext.DoACSAnalyse;
 
 procedure TEliteContext.DoACSBack;
 begin
+  IsFSSOpened := False;
   with FOwner, FEliteManager do ACSClose;
   Drive_display
 end;
@@ -2926,15 +2944,16 @@ procedure TEliteContext.DoACSShow(DisplayPanel: boolean);
    if SuperCruise then begin
      if DisplayPanel then ModeACS;
      { --- WARNING ExplorationFSS must be opened }
-     ACS_display;
+     ACS_display(IsFSSOpened);
      FunctionSound
   end
 end;
 
 procedure TEliteContext.DoACSSlide;
 begin
   IndexACSMode := 0;
-  ACS_display
+  ACS_display(IsFSSOpened);
+  FOwner.FContext.FunctionSound;
 end;
 
 procedure TEliteContext.DoACSSteps;
@@ -2946,7 +2965,7 @@ procedure TEliteContext.DoACSSteps;
     SubACSIndex := IndexACSMode;
   end;
   FOwner.FContext.FunctionSound;
-  ACS_display
+  ACS_display(IsFSSOpened)
 end;
 
 procedure TEliteContext.DoACSYawDec;
@@ -3040,7 +3059,8 @@ procedure TEliteContext.DoComPanelShow(DisplayPanel: boolean);
 
 procedure TEliteContext.DoVRSDriveAssist;
 begin
-  with FOwner, FEliteManager, FEliteStatus do if InSrv then DriveAssist
+  with FOwner, FEliteManager do
+    if FEliteStatus.InSrv then DriveAssist
 end;
 
 procedure TEliteContext.DoDriveLandingBackThrust(NotLanding: Boolean);
@@ -3707,7 +3727,7 @@ procedure TEliteContext.DoUnicStep(Value: Integer);
 procedure TEliteContext.DoVRSDownView;
 begin
   with FOwner, FEliteManager, FEliteStatus do
-    if SrvTurretView then NavLauncher(Sud, Sud, IndexVRSMode)
+    if SrvTurretView then NavLauncherVRS(Sud, Sud, IndexVRSMode)
       else Deceleration
 end;
 
@@ -3718,12 +3738,12 @@ procedure TEliteContext.DoVRSReversePropulsion;
 
 procedure TEliteContext.DoVRSShoot1;
 begin
-  with FOwner, FEliteManager, FEliteStatus do if InSrv then VRSPrimaryFire(1000)
+  with FOwner, FEliteManager, FEliteStatus do if InSrv then VRSPrimaryFire(1200)
 end;
 
 procedure TEliteContext.DoVRSShoot2;
 begin
-  with FOwner, FEliteManager, FEliteStatus do if InSrv then VRSSecondaryFire(5000)
+  with FOwner, FEliteManager, FEliteStatus do if InSrv then VRSSecondaryFire(5500)
 end;
 
 procedure TEliteContext.DoVRSSlide;
@@ -3748,14 +3768,14 @@ procedure TEliteContext.DoVRSStep;
 procedure TEliteContext.DoVRSTurnLeft;
 begin
   with FOwner, FEliteManager, FEliteStatus do
-    if SrvTurretView then NavLauncher(TurnLeft, TurnLeft, IndexVRSMode)
+    if SrvTurretView then NavLauncherVRS(TurnLeft, TurnLeft, IndexVRSMode)
       else NavLauncher(Ouest, Ouest, IndexVRSMode)
 end;
 
 procedure TEliteContext.DoVRSTurnRight;
 begin
   with FOwner, FEliteManager, FEliteStatus do
-    if SrvTurretView then NavLauncher(TurnRight, TurnRight, IndexVRSMode)
+    if SrvTurretView then NavLauncherVRS(TurnRight, TurnRight, IndexVRSMode)
       else NavLauncher(Est, Est, IndexVRSMode)
 end;
 
@@ -3767,15 +3787,14 @@ procedure TEliteContext.DoVRSTurret;
 procedure TEliteContext.DoVRSUpView;
 begin
   with FOwner, FEliteManager, FEliteStatus do
-    if SrvTurretView then NavLauncher(Nord, Nord, IndexVRSMode)
+    if SrvTurretView then NavLauncherVRS(Nord, Nord, IndexVRSMode)
       else Acceleration
 end;
 
 procedure TEliteContext.DoVRSVerticalThrust;
 begin
   with FOwner, FEliteManager, FEliteStatus do
     if InSrv then VerticalThruster(1500)
-
 end;
 
 procedure TEliteContext.Drive_display;
@@ -4001,7 +4020,7 @@ procedure TEliteContext.EliteNotify(const ATag: Integer);
       91462 : DoClic(DoSMSlide);                  //Slide
 
       { --- Exploration FSS }
-      91470 : ACS_display;
+      91470 : ACS_display( IsFSSOpened );
       91471 : DoClic(DoACSSlide);
       91472 : DoClic(DoACSSteps);
       91473 : DoClic(DoACSZoomIn);
@@ -4180,6 +4199,11 @@ function TEliteContext.GetIsDSDOpened: Boolean;
   Result := KeyReadBoolean(ParamKey, 'IsDSDOpened')
 end;
 
+function TEliteContext.GetIsFSSOpened: Boolean;
+begin
+  Result := KeyReadBoolean(ParamKey, 'IsFSSOpened')
+end;
+
 function TEliteContext.GetMapCalled: TKindMapCall;
 begin
   Result := TKindMapCall( KeyReadInt(ParamKey, 'MapCalled') )
@@ -4330,6 +4354,30 @@ procedure TEliteContext.NavLauncherThrust(const MethA: TContextNotify;
     end
 end;
 
+procedure TEliteContext.NavLauncherVRS(const MethA: TContextNotify;
+  const MethB: TIntegerNotify; Index: Integer);
+begin
+  with FOwner, FEliteManager do
+    case Index of
+      0 : NavClic(MethA, MethB);
+      1 : MethB(1, 60);
+      2 : MethB(1, 120);
+      3 : MethB(1, 180);
+    end
+end;
+
+procedure TEliteContext.NavLauncherVRS(const MethA: TContextNotify;
+  const MethB: TIntANotify; Index: Integer);
+begin
+  with FOwner, FEliteManager do
+    case Index of
+      0 : NavClic(MethA, MethB);
+      1 : MethB(60);
+      2 : MethB(120);
+      3 : MethB(180);
+    end
+end;
+
 procedure TEliteContext.NavLauncher(const MethA: TContextNotify;
   const MethB: TIntegerNotify; Index: Integer);
 begin
@@ -4369,7 +4417,7 @@ procedure TEliteContext.PauseBack;
     kd_mainmenu  : MainMenu_display;
     kd_menu      : Menu_display;
     kd_drive     : DriveCase;
-    kd_fss       : ACS_display;
+    kd_fss       : ACS_display( IsFSSOpened );
     kd_saa       : DSD_display( IsDSDOpened );
     kd_galaxymap : GalaxyMap_display;
     kd_systemmap : SystemMap_display;
@@ -4473,6 +4521,11 @@ procedure TEliteContext.SetIsDSDOpened(const Value: Boolean);
   KeyWrite(ParamKey, 'IsDSDOpened', Value)
 end;
 
+procedure TEliteContext.SetIsFSSOpened(const Value: Boolean);
+begin
+  KeyWrite(ParamKey, 'IsFSSOpened', Value)
+end;
+
 procedure TEliteContext.SetMapCalled(const Value: TKindMapCall);
 begin
   KeyWrite(ParamKey, 'MapCalled', Integer(Value) )
@@ -4642,6 +4695,14 @@ procedure TContextObserver.Process;
         if IsDSDOpened then DoDSDBack
   end;
 
+  procedure UpdateFSSView; begin
+    with ThAreaTobii, FEliteStatus, FElite do
+      if GuiValue = gt_fssmode then begin
+        if not IsFSSOpened then ACS_display( False )
+      end else
+        if IsFSSOpened then DoACSBack
+  end;
+
   procedure UpdatePanelsView; begin
     with ThAreaTobii, FEliteStatus, FElite do
       case GuiValue of
@@ -4703,9 +4764,6 @@ procedure TContextObserver.Process;
   end;
 
 begin
-  { --- Update DSD view }
-  UpdateDSDView;
-  { --- Update Panels view if app. restart }
   UpdatePanelsView;
   { --- Update menu when undock aftter ENTER clic }
   UpdateWhenUndock;
@@ -4719,6 +4777,11 @@ procedure TContextObserver.Process;
           and Hardpoint not deployed }
     UpdateDriveDisplayWhenLanding
   end;
+  { --- Update DSD view }
+  UpdateDSDView;
+  { --- Update FSS view }
+  UpdateFSSView;
+  { --- Update Panels view if app. restart }
   { --- Save current values for next iteration process }
   SaveOnIteration
 end; {Process}