Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed #193 faulty/incomplete command keys on T-screen UI #3160

Merged
merged 1 commit into from
Jun 27, 2024

Conversation

ohlidalp
Copy link
Member

@ohlidalp ohlidalp commented Jun 21, 2024

Fixes #193

Test mod: Hughes 500D helicopter

The result - the controls are actually this weird by design, see my analysis below:
obrazek

My analysis of the rig-def file:

~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
<---------------------- TRUCK DEF ----------------------------->  //// F keys (/84) --- Description, if any        <=== comparation with UI
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

commands
set_beam_defaults 12500000, 750, 18000000, 35000000
;fuel consumption engine kill
  54,  46, 5.00, 1.000, 1.400, 39, 29, i                           //// 39 = ALT+F3 | 29 = SHIFT+F5                 <=== not shown, the closest is nonexistent "Alt+F3/Alt+F4"
  56,  48, 5.00, 1.000, 1.400, 39, 29, i                           //// 39 = ALT+F3 | 29 = SHIFT+F5                 <=== ditto
                                                                   
set_beam_defaults 2500000, 250, 18000000, 35000000                 
;dashboard trim guages                                             
 145, 148, 0.009, 0.800, 1.200, 7, 8, i                            //// F7|F8                                       <=== OK
 145, 149, 0.009, 0.800, 1.200, 3, 4, i, TRIM_Cruise_Forth/Back    //// F3|F4 --- TRIM_Cruise_Forth/Back            <=== OK
 145, 150, 0.0035, 0.800, 1.200, 6, 5, i, TRIM_Strafe_Left/Right   //// F5|F6 --- !! conflict with 'TRIM_Pivot_Left/Right' *reversed* <=== OK
                                                                   
set_beam_defaults 17500000, 750, 18000000, 35000000                
;rotorhead trims                                                   
 164, 165, 0.0026, 0.952, 1.048, 3, 4, i                           //// F3|F4 --- TRIM_Cruise_Forth/Back            <=== OK
 164, 166, 0.0026, 0.952, 1.048, 4, 3, i                           //// F4|F3 --- TRIM_Cruise_Forth/Back *reversed* <=== OK, maps to the reversed
 164, 167, 0.0026, 0.952, 1.048, 8, 7, i                           //// F8|F7                                       <=== OK, maps to the reversed           
 164, 168, 0.0026, 0.952, 1.048, 7, 8, i                           //// F7|F8                                       <=== OK
                                                                   
;rotorblade animation                                              
set_beam_defaults 15000000, 250, 18000000, 35000000                
  60,  63, 0.003, 0.982,  1.011,  1,  2, i, TRIM_Lift_Up/Down      //// F1|F2 --- TRIM_Lift_Up/Down                 <=== OK              
  60,  64, 0.003, 0.982,  1.011,  1,  2, i                         //// F1|F2 --- TRIM_Lift_Up/Down                 <=== OK
  60,  65, 0.003, 0.982,  1.011,  1,  2, i                         //// F1|F2 --- TRIM_Lift_Up/Down                 <=== OK
  60,  66, 0.003, 0.982,  1.011,  1,  2, i                         //// F1|F2 --- TRIM_Lift_Up/Down                 <=== OK
;collective stick + gauge animation                                
set_beam_defaults 2000000, 250, 18000000, 35000000                 
  19, 159, 0.00370, 0.950,  1.075,  2,  1, i                       //// F2|F1 --- TRIM_Lift_Up/Down *reversed*      <=== OK, maps to the reversed  
 145, 160, 0.00296, 0.880,  1.200,  2,  1, i                       //// F2|F1 --- TRIM_Lift_Up/Down *reversed*      <=== OK, maps to the reversed  
                                                                   
set_beam_defaults 7500000, 250, 18000000, 35000000                 
  94,  93, 0.001, 0.900,  1.100,  5,  6, i, TRIM_Pivot_Left/Right  //// F6|F5 --- !! conflict with 'TRIM_Strafe_Left/Right' *reversed* <=== OK, shown as 'TRIM_Strafe_Left/Right'
                                                                   
set_inertia_defaults 0.55, 0.55, linear linear                     
  61, 128, 0.075, 1.000, 45.000,  9, 10, r, Hook_Up/Down           //// F9|F10 --- Hook_Up/Down                     <=== OK
 128, 129, 0.075, 1.000, 45.000,  9, 10, r                         //// F9|F10 --- Hook_Up/Down                     <=== OK
 129, 130, 0.075, 1.000, 45.000,  9, 10, r                         //// F9|F10 --- Hook_Up/Down                     <=== OK
 130, 131, 0.075, 1.000, 45.000,  9, 10, r                         //// F9|F10 --- Hook_Up/Down                     <=== OK
set_inertia_defaults -1                                            
                                                                   
set_beam_defaults 3000000, 250, 18000000, 35000000                 
commands2                                                          
set_inertia_defaults 1.0, 1.0, linear linear                       
;fast rotor texture swap                                           
  41, 110, 15.000, 15.000, 0.150, 1.000, 32, 33, ip                           //// SHIFT+F8|SHIFT+F9                      <=== not shown, instead there's 2 nonexistent entries, "Shift+F7/Shift+F8" and "Shift+F9/Shift+F10"
  42, 111, 15.000, 15.000, 0.150, 1.000, 32, 33, ip                           //// SHIFT+F8|SHIFT+F9                      <=== ditto
  43, 112, 15.000, 15.000, 0.150, 1.000, 32, 33, ip                           //// SHIFT+F8|SHIFT+F9                      <=== ditto
  44, 113, 15.000, 15.000, 0.150, 1.000, 32, 33, ip                           //// SHIFT+F8|SHIFT+F9                      <=== ditto
 114,  40, 15.000, 15.000, 0.025, 1.000, 32, 33, ip                           //// SHIFT+F8|SHIFT+F9                      <=== ditto
 115,  40, 15.000, 15.000, 0.025, 1.000, 32, 33, ip                           //// SHIFT+F8|SHIFT+F9                      <=== ditto
 116,  40, 15.000, 15.000, 0.025, 1.000, 32, 33, ip                           //// SHIFT+F8|SHIFT+F9                      <=== ditto
 117,  40, 15.000, 15.000, 0.025, 1.000, 32, 33, ip                           //// SHIFT+F8|SHIFT+F9                      <=== ditto
;hook fixation                                                                
 133,  40,  0.050,  0.050, 0.900, 1.000, 10,  9, ip                           //// F10|F9 --- Hook_Up/Down *reversed*     <=== OK, maps to the reversed
                                                                              
;fast tail rotor texture swap                                                 
 118,  78,  2.500,  2.500, 0.050, 1.000, 32, 33, ip                           //// SHIFT+F8|SHIFT+F9                      <=== ditto
 119,  78,  2.500,  2.500, 0.050, 1.000, 32, 33, ip                           //// SHIFT+F8|SHIFT+F9                      <=== ditto
 126,  78,  2.500,  2.500, 0.050, 1.000, 32, 33, ip                           //// SHIFT+F8|SHIFT+F9                      <=== ditto
 127,  78,  2.500,  2.500, 0.050, 1.000, 32, 33, ip                           //// SHIFT+F8|SHIFT+F9                      <=== ditto
 120, 122,  2.500,  2.500, 0.200, 1.000, 32, 33, ip                           //// SHIFT+F8|SHIFT+F9                      <=== ditto
 121, 123,  2.500,  2.500, 0.200, 1.000, 32, 33, ip                           //// SHIFT+F8|SHIFT+F9                      <=== ditto
  80, 124,  2.500,  2.500, 0.200, 1.000, 32, 33, ip                           //// SHIFT+F8|SHIFT+F9                      <=== ditto
  81, 125,  2.500,  2.500, 0.200, 1.000, 32, 33, ip                           //// SHIFT+F8|SHIFT+F9                      <=== ditto
set_inertia_defaults -1                                                       
set_beam_defaults 7500000, 250, 18000000, 35000000                            
;startup tail rotor trim                                                      
  94,  78,  0.100,  0.100, 0.989, 1.000, 30, 31, ci                           //// SHIFT+F6|SHIFT+F7                      <=== NOT SHOWN, instead there's nonexistent "Shift+F5/Shift+F6" and  "Shift+F7/Shift+F8"                     

set_beam_defaults 1500000, 250, 18000000, 35000000
set_inertia_defaults 0.01, 0.01, smooth smooth
;screen tilt + slide
 134, 138, 0.025, 0.025, 0.500,  1.000, 11, 12, ip, Camera-Screen_IN/OUT      //// F11|F12 --- Camera-Screen_IN/OUT       <=== OK
 135, 139, 0.025, 0.025, 0.500,  1.000, 11, 12, ip                            //// F11|F12 --- Camera-Screen_IN/OUT       <=== ditto
 136, 140, 0.025, 0.025, 0.500,  1.000, 11, 12, ip                            //// F11|F12 --- Camera-Screen_IN/OUT       <=== ditto
set_inertia_defaults 1.00, 1.00, smooth smooth                                                                            
 136, 137, 0.100, 0.200, 0.450,  1.000, 36, 37, i                             //// SHIFT+F12|ALT+F1                       <=== NOT SHOWN, the closest is nonexistent "Alt+F1/Alt+F2"
set_inertia_defaults -1

set_beam_defaults 1000000, 750, 18000000, 35000000
;fuel consumption
;speed2:  0.00025 = 40 mins burntime 
   2, 161, 0.050, 0.00025, 0.010, 400.0, 25, 26, i, Emergency_Refuel          //// SHIFT+F1|SHIFT+F2 --- Emergency_Refuel <=== OK
 161, 162, 0.050, 0.00025, 0.010, 400.0, 25, 27, i                            //// SHIFT+F1|SHIFT+F3                      <=== NOT shown, closest is nonexistent "Shift+F3/Shift+F4"
 162, 163, 0.050, 0.00025, 0.010, 400.0, 25, 28, i                            //// SHIFT+F1|SHIFT+F4                      <=== NOT shown, closest is nonexistent "Shift+F3/Shift+F4"

;fuel warn
 173,  16, 0.100, 0.100, 0.825, 1.00, 24, 25, i                               //// CTRL+F12|SHIFT+F1                      <=== Not shown, closest is nonexistent "Ctrl+F11/Ctrl+F12"
 174,  16, 0.100, 0.100, 0.825, 1.00, 23, 25, i                               //// CTRL+F11|SHIFT+F1

;overload warn
 175,  16, 0.500, 0.500, 0.700, 1.00, 22, 21, ip                              //// CTRL+F10|CTRL+F9                       <=== Shown reversed

;overspeed warn
 176,  16, 0.500, 0.500, 0.700, 1.00, 20, 19, ip                              //// CTRL+F8|CTRL+F7                        <=== Shown reversed

Copy link
Collaborator

@CuriousMike56 CuriousMike56 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Railroad switches finally display the correct keys 👍
RoR_2024-06-25_02-52-52

@ohlidalp ohlidalp merged commit 39c1549 into RigsOfRods:master Jun 27, 2024
2 checks passed
@ohlidalp ohlidalp deleted the 193_Tscreen_commandlist branch June 27, 2024 22:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Incorrect command button assignments in "T"-screen
2 participants