Skip to content

Commit

Permalink
build 173
Browse files Browse the repository at this point in the history
  • Loading branch information
@MaxiDonkey
MaxiDonkey committed Jul 15, 2021
1 parent 20f79bc commit c9878a1
Show file tree
Hide file tree
Showing 15 changed files with 1,947 additions and 121 deletions.
62 changes: 50 additions & 12 deletions RaoulInterface/EliteBindingsTools.pas
View file
Original file line number Diff line number Diff line change
Expand Up @@ -691,25 +691,45 @@ function IsCamFree(const Value: string):Boolean;
bct_conduitemode, bct_chasseurorder, bct_explorationfss,
bct_surfacedetaillee, bct_manuallanding, bct_multicrew,
bct_galaxymap, bct_camsystem, bct_galnetreader,
bct_camfree, bct_humanoid, bct_humanoidMode );
bct_camfree, bct_humanoid, bct_humanoidMode,
bct_headlock );
TBindCategoriesArea = 0..Integer(high(TBindCategoriesType));
TArrayOfBindCategories = array[TBindCategoriesArea] of string;

var
MCR : TArrayOfBindCategories =
( 'Vol rotation', 'Vol poussée', 'Vol propulsion',
'Vol divers', 'Visée', 'Armes',
'Refroisissement', 'Divers', 'Changement de mode',
'Tableau de bord', 'Conduite', 'Conduite visée',
'Conduite tourelle', 'Conduite propulsion', 'Conduite divers',
'Conduite modes', 'Ordres au chasseur', 'ACS',
'Détecteur de surface', 'Atterrissage manuel', 'Equipage multiple',
'Carte de la galaxie', 'Système de caméras', 'Liste de lecture',
'Camera libre', 'Au sol', 'Au sol - modes'
);
( 'Vol rotation', 'Vol poussée', 'Vol propulsion',
'Vol divers', 'Visée', 'Armes',
'Refroisissement', 'Divers', 'Changement de mode',
'Tableau de bord', 'Conduite', 'Conduite visée',
'Conduite tourelle', 'Conduite propulsion', 'Conduite divers',
'Conduite modes', 'Ordres au chasseur', 'ACS',
'Détecteur de surface', 'Atterrissage manuel', 'Equipage multiple',
'Carte de la galaxie', 'Système de caméras', 'Liste de lecture',
'Camera libre', 'Au sol', 'Au sol - modes',
'Vue subjective'
);

function GetBindCategories(const Value: string): TBindCategoriesType;
function IsBindCategories(const Value: string):Boolean;
function IsBindCategories(const Value: string): Boolean;

{*** HeadLook system simplified }
type
THeadLookType =
( hlt_reset, hlt_pitchup, hlt_pitchdown,
hlt_yawleft, hlt_yawright
);
THeadLookArea = 0..Integer(high(THeadLookType));
TArrayHeadLook = array[THeadLookArea] of string;

var
HeadLook : TArrayHeadLook =
( 'HeadLookReset', 'HeadLookPitchUp', 'HeadLookPitchDown',
'HeadLookYawLeft', 'HeadLookYawRight'
);

function GetHeadLook(const Value: string): THeadLookType;
function IsHeadLook(const Value: string): Boolean;

{+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Expand Down Expand Up @@ -985,6 +1005,7 @@ TBindsArrayTools = class
FCamFree : TArrayCamFree;
FHumanoid : TArrayOfHumanoidSol;
FHumanoidMode : TArrayOfHumanoidSolMode;
FHeadLock : TArrayHeadLook;
function ToStringEx(const AValues: array of string): string;
function GetBindsXMLtext: string;
function ExtractXMLByBind(const BindValue: string):string;
Expand Down Expand Up @@ -1608,6 +1629,15 @@ function GetBindCategories(const Value: string): TBindCategoriesType;
end
end;

function GetHeadLook(const Value: string): THeadLookType;
begin
try
Result := THeadLookType( IndexStr(Value, HeadLook) )
except
raise
end
end;

function GetBindHumanoidSol(const Value: string): THumanoidSolType;
begin
try
Expand All @@ -1631,6 +1661,11 @@ function IsBindCategories(const Value: string):Boolean;
Result := IndexStr(Value, MCR) > -1
end;

function IsHeadLook(const Value: string):Boolean;
begin
Result := IndexStr(Value, HeadLook) > -1
end;

function IsBindHumanoidSol(const Value: string):Boolean;
begin
Result := IndexStr(Value, HOSOL) > -1
Expand Down Expand Up @@ -2368,6 +2403,7 @@ function TBindsArrayTools.BindsByCategory_(
bct_camfree : Add( ToStringEx( FCamFree ) );
bct_humanoid : Add( ToStringEx( FHumanoid ) );
bct_humanoidMode : Add( ToStringEx( FHumanoidMode ) );
bct_headlock : Add( ToStringEx( FHeadLock ) );
end;
Result := Trim( Text );
finally
Expand Down Expand Up @@ -2415,6 +2451,7 @@ constructor TBindsArrayTools.Create;
FCamFree := CamFree;
FHumanoid := HOSOL;
FHumanoidMode := HOSOLMODE;
FHeadLock := HeadLook;
end;

class function TBindsArrayTools.Extract(const ASource,
Expand Down Expand Up @@ -2468,6 +2505,7 @@ function TBindsArrayTools.GetBindsXMLtext: string;
Add( ToStringEx( FCamFree ) );
Add( ToStringEx( FHumanoid ) );
Add( ToStringEx( FHumanoidMode ) );
Add( ToStringEx( FHeadLock ) );
Result := Trim( Text )
finally
Free
Expand Down
7 changes: 3 additions & 4 deletions RaoulInterface/RaoulFumier.bdsproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@
<VersionInfo Name="MajorVer">0</VersionInfo>
<VersionInfo Name="MinorVer">9</VersionInfo>
<VersionInfo Name="Release">1</VersionInfo>
<VersionInfo Name="Build">171</VersionInfo>
<VersionInfo Name="Build">173</VersionInfo>
<VersionInfo Name="Debug">False</VersionInfo>
<VersionInfo Name="PreRelease">False</VersionInfo>
<VersionInfo Name="Special">False</VersionInfo>
Expand All @@ -158,7 +158,7 @@
<VersionInfo Name="CodePage">1252</VersionInfo>
</VersionInfo>
<VersionInfoKeys>
<VersionInfoKeys Name="FileVersion">0.9.1.171</VersionInfoKeys>
<VersionInfoKeys Name="FileVersion">0.9.1.173</VersionInfoKeys>
<VersionInfoKeys Name="ProductVersion">0.9</VersionInfoKeys>
<VersionInfoKeys Name="CompanyName">MaxiDonkey</VersionInfoKeys>
<VersionInfoKeys Name="FileDescription">Assistance vocale</VersionInfoKeys>
Expand All @@ -167,8 +167,7 @@
<VersionInfoKeys Name="LegalTrademarks">MaxiDonkey</VersionInfoKeys>
<VersionInfoKeys Name="OriginalFilename">Persephone</VersionInfoKeys>
<VersionInfoKeys Name="ProductName">Raoul Fumieer</VersionInfoKeys>
</VersionInfoKeys>
<Excluded_Packages>
</VersionInfoKeys> <Excluded_Packages>
<Excluded_Packages Name="C:\Users\JANKOWSKI\Documents\Projets Borland Studio\Bpl\SynEdit_D2005.bpl">SynEdit component suite</Excluded_Packages>
</Excluded_Packages>
</Delphi.Personality>
Expand Down
Binary file modified RaoulInterface/RaoulFumier.identcache
View file
Binary file not shown.
Binary file modified RaoulInterface/RaoulFumier.res
View file
Binary file not shown.
Binary file modified RaoulInterface/dcu/EliteBindingsTools.dcu
View file
Binary file not shown.
Binary file modified RaoulInterface/dcu/uEliteManager.dcu
View file
Binary file not shown.
Binary file modified RaoulInterface/dcu/uNewRecorder.dcu
View file
Binary file not shown.
Binary file modified RaoulInterface/dcu/uRaoulDisplay.dcu
View file
Binary file not shown.
1 change: 0 additions & 1 deletion RaoulInterface/main.dfm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ object MainForm: TMainForm
object DistantData: TDistantData
Server = '94.76.216.225\SQLSAPI'
Catalog = 'RaoulFumier'
Password = '2y5iGNcC'
OnPrepare = DistantDataPrepare
Left = 24
Top = 88
Expand Down
124 changes: 116 additions & 8 deletions RaoulInterface/uEliteManager.pas
View file
Original file line number Diff line number Diff line change
Expand Up @@ -412,6 +412,16 @@ TCustomEliteManager = class
procedure TobiiLessPrecision;
procedure TobiiSaveDiver1;
procedure TobiiSaveDiver2;
{*** Vue subjective}
procedure HeadLockReset;
procedure HeadLockUp;
procedure HeadLockDown;
procedure HeadLockLeft;
procedure HeadLockRight;
procedure HeadLockTools;
procedure HeadLockExit;
procedure HeadLockTarget;
procedure HeadLockShield;
public
procedure TobiiConfig; //Switch 1100
procedure TobiiHideConfig; //Switch 1101
Expand All @@ -423,6 +433,8 @@ TCustomEliteManager = class
procedure OdysseyInteractionValidate;
procedure HumInteractMenuItem(const Value: Integer);
procedure StopMovAndTobii;
private
procedure UIRetour;
public
procedure SetTags(const Value: string);
procedure SetKeyInventory(const Value: TKeyInventory);
Expand Down Expand Up @@ -537,12 +549,16 @@ procedure TCustomEliteManager.CallCommande(const Ast: string; Again: Boolean);
10872 : Pere (1, 400);
10873 : Pere (1, 600);
10874 : Pere (1, 150); //rev-2 06/2021
10875 : Pere (1, 800);
10876 : Pere (1, 1000);
88 : Fils; // without_keyup
10880 : Fils (1, 90);
10881 : Fils (1, 250);
10882 : Fils (1, 400);
10883 : Fils (1, 600);
10884 : Fils (1, 150); //rev-2 06/2021
10885 : Fils (1, 800);
10886 : Fils (1, 1000);
89 : Nord; // without_keyup
10890 : Nord (1, 90);
10891 : Nord (1, 250);
Expand Down Expand Up @@ -664,7 +680,7 @@ procedure TCustomEliteManager.CallCommande(const Ast: string; Again: Boolean);
32 : Right(1);
33 : UISelect;
{ --- Retour : if grid opened do back on grid else uiback }
34 : with Recorder do if IsGridOpened then RetourActivate else UIBack;
34 : UIRetour;
10341 : CloseCarte;
35 : NextSheet(1);
10352 : NextSheet(2);
Expand Down Expand Up @@ -1083,7 +1099,17 @@ procedure TCustomEliteManager.CallCommande(const Ast: string; Again: Boolean);
415 : TobiiStop;
416 : TobiiMenuMode;
// 417 : TobiiConfig; //Switch 1100
// 418 : TobiiHideConfig; //Switch 1101
// 418 : TobiiHideConfig; //Switch 1101
{*** Vue subjective}
500 : HeadLockReset;
501 : HeadLockUp;
502 : HeadLockDown;
503 : HeadLockLeft;
504 : HeadLockRight;
505 : HeadLockTools; //vue sur les instruments
506 : HeadLockExit;
507 : HeadLockTarget;
508 : HeadLockShield;
end;
if not Again and not IsAgainCommand(indexCmd) then LastCmd := indexCmd
end; {CallCommande}
Expand Down Expand Up @@ -1854,39 +1880,50 @@ procedure TCustomEliteManager.NightVision;

procedure TCustomEliteManager.LeftPanel;
begin
TobiiPause;
FKeyInventory.KeyTrigger_( 'FocusLeftPanel', WITH_KEYUP)
end;

procedure TCustomEliteManager.CommsPanel;
begin
if EliteStatus.IsOnOdyssey then HumFocusCommsPanel
else FKeyInventory.KeyTrigger_( 'FocusCommsPanel', WITH_KEYUP)
else begin
TobiiPause;
FKeyInventory.KeyTrigger_( 'FocusCommsPanel', WITH_KEYUP)
end;
end;

procedure TCustomEliteManager.QuickCommsPanel;
begin
if EliteStatus.IsOnOdyssey then HumQuickCommsPanel
else FKeyInventory.KeyTrigger_( 'QuickCommsPanel', WITH_KEYUP)
else begin
TobiiPause;
FKeyInventory.KeyTrigger_( 'QuickCommsPanel', WITH_KEYUP)
end
end;

procedure TCustomEliteManager.RadarPanel;
begin
TobiiPause;
FKeyInventory.KeyTrigger_( 'FocusRadarPanel', WITH_KEYUP)
end;

procedure TCustomEliteManager.RightPanel;
begin
TobiiPause;
FKeyInventory.KeyTrigger_( 'FocusRightPanel', WITH_KEYUP)
end;

procedure TCustomEliteManager.MapGalaxy;
begin
TobiiPause;
if EliteStatus.IsOnOdyssey then HumGalaxyMapOpen
else FKeyInventory.KeyTrigger_( 'GalaxyMapOpen', WITH_KEYUP)
end;

procedure TCustomEliteManager.MapSystem;
begin
TobiiPause;
if EliteStatus.IsOnOdyssey then HumSystemMapOpen
else FKeyInventory.KeyTrigger_( 'SystemMapOpen', WITH_KEYUP)
end;
Expand Down Expand Up @@ -3122,7 +3159,8 @@ procedure TCustomEliteManager.Est;
else ASt := 'YawRightButton'
end;
//Ne relache pas la combinaison de touches
FKeyInventory.KeyTrigger_(ASt, WITHOUT_KEYUP)
FKeyInventory.KeyTrigger_(ASt, WITHOUT_KEYUP);
FOdysseyPressedKey.FClockMov := GetTickCount;
end;

procedure TCustomEliteManager.Ouest;
Expand All @@ -3137,7 +3175,8 @@ procedure TCustomEliteManager.Ouest;
else ASt := 'YawLeftButton'
end;
//Ne relache pas la combinaison de touches
FKeyInventory.KeyTrigger_(ASt, WITHOUT_KEYUP)
FKeyInventory.KeyTrigger_(ASt, WITHOUT_KEYUP);
FOdysseyPressedKey.FClockMov := GetTickCount;
end;

procedure TCustomEliteManager.Pere;
Expand All @@ -3152,7 +3191,8 @@ procedure TCustomEliteManager.Pere;
else ASt := 'RollLeftButton'
end;
//Ne relache pas la combinaison de touches
FKeyInventory.KeyTrigger_(ASt, WITHOUT_KEYUP)
FKeyInventory.KeyTrigger_(ASt, WITHOUT_KEYUP);
FOdysseyPressedKey.FClockMov := GetTickCount;
end;

procedure TCustomEliteManager.Fils;
Expand All @@ -3167,7 +3207,8 @@ procedure TCustomEliteManager.Fils;
else ASt := 'RollRightButton'
end;
//Ne relache pas la combinaison de touches
FKeyInventory.KeyTrigger_(ASt , WITHOUT_KEYUP)
FKeyInventory.KeyTrigger_(ASt , WITHOUT_KEYUP);
FOdysseyPressedKey.FClockMov := GetTickCount;
end;

procedure TCustomEliteManager.HumPrimaryFire;
Expand Down Expand Up @@ -3520,6 +3561,71 @@ procedure TCustomEliteManager.StopMovAndFire;
with FOdysseyPressedKey do Clear;
end;

procedure TCustomEliteManager.HeadLockReset;
begin
FKeyInventory.KeyTrigger_( 'HeadLookReset', WITH_KEYUP)
end;

procedure TCustomEliteManager.HeadLockUp;
begin
FKeyInventory.KeyTrigger_( 'HeadLookPitchUp', WITH_KEYUP)
end;

procedure TCustomEliteManager.HeadLockDown;
begin
FKeyInventory.KeyTrigger_( 'HeadLookPitchDown', WITH_KEYUP)
end;

procedure TCustomEliteManager.HeadLockLeft;
begin
FKeyInventory.KeyTrigger_( 'HeadLookYawLeft', WITH_KEYUP)
end;

procedure TCustomEliteManager.HeadLockRight;
begin
FKeyInventory.KeyTrigger_( 'HeadLookYawRight', WITH_KEYUP)
end;

procedure TCustomEliteManager.HeadLockTools;
begin
if not EliteStatus.IsOnElite then Exit;
TobiiPause;
// Delay(150);
HeadLockReset;
Delay(150);
HeadLockDown;
HeadLockDown;
end;

procedure TCustomEliteManager.HeadLockExit;
begin
UIRetour;
HeadLockReset;
Delay(150);
TobiiStart;
end;

procedure TCustomEliteManager.HeadLockTarget;
begin
if EliteStatus.IsOnElite then begin
HeadLockTools;
HeadLockLeft;
end;
end;

procedure TCustomEliteManager.HeadLockShield;
begin
if EliteStatus.IsOnElite then begin
HeadLockTools;
HeadLockRight;
end;
end;

procedure TCustomEliteManager.UIRetour;
begin
with Recorder do if IsGridOpened then RetourActivate else UIBack;
end;

{ TEliteManager }

class procedure TEliteManager.Finalize;
Expand Down Expand Up @@ -3676,6 +3782,8 @@ procedure TOdysseyPressedKey.StopMov;
SubCase(opkforward);
SubCase(opkbackward);
KeyWrite(AppKey, 'OdysseyMvt', 'none');
{*** pour les mvts du vaisseau "va père ...."}
KeyMessageSender.DoKeyUp(True);
end;
end;

Expand Down
Binary file modified bin/Grammar/Elite.cfg
View file
Binary file not shown.
Binary file modified bin/RaoulFumier.exe
View file
Binary file not shown.
Loading

0 comments on commit c9878a1

Please sign in to comment.