diff --git a/assets/RP411/GAUGE/L4GAUGE.CFG b/assets/RP411/GAUGE/L4GAUGE.CFG index 17d44fc..221431e 100644 --- a/assets/RP411/GAUGE/L4GAUGE.CFG +++ b/assets/RP411/GAUGE/L4GAUGE.CFG @@ -96,6 +96,7 @@ quarkInit dragonInit { uncommon_setup; + twoBoosterInit; rivet1AInit; rivet2BInit; slaver3BInit; @@ -125,6 +126,7 @@ darkInit demopack2BInit; pa; } + ################################## # discus ################################## @@ -348,9 +350,9 @@ tarntulaInit } ################################## -# black +# blktrn ################################## -blackInit +blktrnInit { common_setup; fourBoosterInit; @@ -411,6 +413,117 @@ roadblkInit demopack1CInit; ba; } + +################################## +# Neutrino +################################## +neutInit +{ + common_setup; + fourBoosterInit; + offsetChuteInit; + lu; +} + + +################################## +################################## +##### Blacker VTV Inits +################################## +################################## + +################################## +# Blacker Puck +################################## +blkrpuckInit +{ + common_setup; + oneBoosterInit; + laserFunkyInit; + pa; +} + +################################## +# Blacker Black Speck +################################## +blkrspkInit +{ + common_setup; + threeBoosterInit; + oneChuteInit; + su; +} + +################################## +# Blacker Quark +################################## +blkrquarkInit +{ + common_setup; + twoBoosterInit; + lu; +} + +################################## +# Blacker Broccoli +################################## +blkrbrocInit +{ + common_setup; + threeBoosterInit; + oneChuteInit; + mu; +} + +################################## +# Blacker Black Tarantula +################################## +blkrtranInit +{ + common_setup; + fourBoosterInit; + offsetChuteInit; + bu; +} + +################################## +# Blacker Lepton +################################## +blkrleptonInit +{ + common_setup; + twoBoosterInit; + oneChuteInit; + lu; +} + +################################### +# Blacker Dragon +################################### +blkrdragonInit +{ + common_setup; + twoBoosterInit; + rivet1AInit; + rivet2BInit; + slaver3BInit; + po; +} + +################################## +# wasp +################################## +blkrwaspInit +{ + common_setup; + twoBoosterInit; + oneChuteInit; + stinger1AInit; +## stinger2BInit; + sa; +} + + #################################################################### # PO (dragon,armored)-based VTV's #################################################################### diff --git a/assets/RP411/RPL4.RES b/assets/RP411/RPL4.RES index c3ce2c1..a1c8136 100644 Binary files a/assets/RP411/RPL4.RES and b/assets/RP411/RPL4.RES differ diff --git a/docs/CONTROL-PRESETS.md b/docs/CONTROL-PRESETS.md index 7a57343..b926c18 100644 --- a/docs/CONTROL-PRESETS.md +++ b/docs/CONTROL-PRESETS.md @@ -213,9 +213,10 @@ resource by name: `"L4"` for the pod RIO, `"Thrustmaster"` for the stick (`MUNGA/CONTROLS.h:783`) carrying its own mode mask, so a single button can appear six times with six different targets. -**All 26 VTVs in `assets/RP411/RPL4.RES` ship a full six-preset table, for -both the RIO and the Thrustmaster.** Decoded, the *lepton* (two boosters, -one chute, unarmed) reads: +**Every VTV in `assets/RP411/RPL4.RES` ships a full six-preset table, for +both the RIO and the Thrustmaster** — 34 of them as of the resource file +promoted from the airlock archive (see §8). Decoded, the *lepton* (two +boosters, one chute, unarmed) reads: | | trigger | thumb high | thumb low | pinky | |---|---|---|---|---| @@ -330,3 +331,45 @@ Still open, by design rather than by accident: `PresetEnable` early-outs on no-op. Correct for switching, but it also means a preset can never be used as a "reset to authored bindings" after the player has edited it in configuration mode. + +## 8. The promoted resource file, and the vehicles that came back + +`assets/RP411/RPL4.RES` is no longer the file RP412 inherited. It is the +1.25 MB resource from `assets/airlock_RP411/`, a 2014 community build, which +verification showed to be a strict superset of ours: + +* nothing is lost — the only resources ours has and it does not are two + unnamed "Not Used" placeholders; +* same format version (`v1.3.0.2`); +* all 26 base vehicles' `L4` and `Thrustmaster` mapping streams are + **byte-identical** to the ones we shipped; +* `vole` matches resource-for-resource, id for id and size for size; +* it boots and runs against our own `GAUGE`/`VIDEO`/`AUDIO`, with a log + identical to the baseline. + +Its `GAUGE/L4GAUGE.CFG` was promoted with it. That file is ours plus the new +vehicles' blocks, plus one fix: `dragonInit` gains `twoBoosterInit`, so the +dragon's two boosters finally have gauges — it always had them in its +subsystem list and the panel never drew them. + +**What the roster gained.** The three vehicles cut after 4.10 are back — +`dark` (*Blacker Puck*), `blkspk` (*Black Speck*) and `blktrn` (*Black +Tarantula*) — with the same tables they shipped with: `blkspk`'s preset 4 +still puts its third booster on the thumb-high, `dark`'s preset 5 still +spends the HORN slot on its second demo pack. Beyond them the archive adds +`neut` (*Neutrino*, four boosters and an `Eject` subsystem) and eight +community "Blacker" variants, plus seven maps. + +**The `black` mystery was a renaming bug.** RP411's gauge config carried a +`blackInit` block that nothing could ever select, because `GetGameModel()` +returns a model name and the lookup is `Init`. The airlock config +calls the same block — byte-identical body — `blktrnInit`, which is the +model's real name. There was never a vehicle called "black"; the block had +simply been renamed out of reach. `disk` remains the one genuine orphan: a +panel layout with no vehicle behind it in any resource file, and no entry in +the console's own config either. + +Four of the eight community variants have a `ControlsMappings List` but no +mapping streams of their own; they reference another vehicle's by resource +id, so they carry no preset table of their own and are absent from the +roster page. diff --git a/docs/vtv-presets.html b/docs/vtv-presets.html index 0f5b5d5..8af7608 100644 --- a/docs/vtv-presets.html +++ b/docs/vtv-presets.html @@ -244,7 +244,7 @@ td.fn { - 26 / 26 VTV + 34 / 34 VTV @@ -256,9 +256,27 @@ td.fn {
+
+
+
Hull PO · shared with dragon
+

BLKRDRAGON

+

2× BOOSTCHUTERIVET 1RIVET 2SLAVER

+

6 subsystems38 mappings

+
+
Preset assignments
PresetTRIGGERTHUMB HIGHTHUMB LOWPINKY
1SLAVERBOOST 1CHUTE—
2SLAVERBOOST 1CHUTELIFT CUT
3SLAVERBOOST 1LIFT CUT—
4SLAVERBOOST 1LIFT CUT—
5SLAVERBOOST 1HORNLIFT CUT
6LIFT CUTBOOST 1—SLAVER
+
+
+
+
Hull PA · shared with blkrpuck, puck
+

DARK

+

1× BOOSTLASER 2DEMO PACKDEMOPACKDROPPER2

+

4 subsystems26 mappings

+
+
Preset assignments
PresetTRIGGERTHUMB HIGHTHUMB LOWPINKY
1LASER 2BOOST 1HORN—
2LASER 2BOOST 1HORNLIFT CUT
3LASER 2BOOST 1LIFT CUT—
4LASER 2BOOST 1LIFT CUTHORN
5LASER 2BOOST 1DEMOPACKDROPPER2LIFT CUT
6LIFT CUTBOOST 1—LASER 2
+
-
Hull PO
+
Hull PO · shared with blkrdragon

DRAGON

2× BOOSTCHUTERIVET 1RIVET 2SLAVER

6 subsystems38 mappings

@@ -303,7 +321,7 @@ td.fn {
-
Hull SA · shared with chigger, flea, skeeter, wasp
+
Hull SA · shared with blkrwasp, chigger, flea, skeeter, wasp

ROACH

2× BOOSTCHUTERIVET 1RIVET 2

5 subsystems32 mappings

@@ -319,9 +337,27 @@ td.fn {
Preset assignments
PresetTRIGGERTHUMB HIGHTHUMB LOWPINKY
1RIVET 2BOOST 1CHUTE—
2RIVET 2BOOST 1CHUTELIFT CUT
3RIVET 2BOOST 1LIFT CUT—
4RIVET 2BOOST 1LIFT CUT—
5RIVET 2BOOST 1HORNLIFT CUT
6LIFT CUTBOOST 1—RIVET 2
+
+
+
Hull PA · shared with dark, puck
+

BLKRPUCK

+

1× BOOSTLASER 2

+

2 subsystems16 mappings

+
+
Preset assignments
PresetTRIGGERTHUMB HIGHTHUMB LOWPINKY
1LASER 2BOOST 1HORN—
2LASER 2BOOST 1HORNLIFT CUT
3LASER 2BOOST 1LIFT CUT—
4LASER 2BOOST 1LIFT CUTHORN
5LASER 2BOOST 1HORNLIFT CUT
6LIFT CUTBOOST 1—LASER 2
+
+
+
+
Hull SA · shared with chigger, flea, roach, skeeter, wasp
+

BLKRWASP

+

2× BOOSTCHUTEDEMO PACK

+

4 subsystems26 mappings

+
+
Preset assignments
PresetTRIGGERTHUMB HIGHTHUMB LOWPINKY
1DEMO PACKBOOST 1CHUTE—
2DEMO PACKBOOST 1CHUTELIFT CUT
3DEMO PACKBOOST 1LIFT CUT—
4DEMO PACKBOOST 1LIFT CUTCHUTE
5DEMO PACKBOOST 1HORNLIFT CUT
6LIFT CUTBOOST 1BOOST 2DEMO PACK
+
-
Hull SA · shared with flea, roach, skeeter, wasp
+
Hull SA · shared with blkrwasp, flea, roach, skeeter, wasp

CHIGGER

2× BOOSTCHUTERIVET

4 subsystems27 mappings

@@ -330,7 +366,7 @@ td.fn {
-
Hull SA · shared with chigger, roach, skeeter, wasp
+
Hull SA · shared with blkrwasp, chigger, roach, skeeter, wasp

FLEA

2× BOOSTCHUTEDEMO PACK

4 subsystems26 mappings

@@ -346,6 +382,15 @@ td.fn {
Preset assignments
PresetTRIGGERTHUMB HIGHTHUMB LOWPINKY
1RIVETBOOST 1CHUTE—
2RIVETBOOST 1CHUTELIFT CUT
3RIVETBOOST 1LIFT CUT—
4RIVETBOOST 1LIFT CUTCHUTE
5RIVETBOOST 1HORNLIFT CUT
6LIFT CUTBOOST 1BOOST 2RIVET
+
+
+
Hull LU · shared with blkrlepton, lepton, quark
+

NEUT

+

4× BOOSTCHUTEEJECT

+

6 subsystems34 mappings

+
+
Preset assignments
PresetTRIGGERTHUMB HIGHTHUMB LOWPINKY
1BOOST 2—CHUTE—
2BOOST 2—CHUTELIFT CUT
3BOOST 2—LIFT CUT—
4BOOST 2BOOST 4LIFT CUTCHUTE
5BOOST 2—HORNLIFT CUT
6LIFT CUTBOOST 1BOOST 2CHUTE
+
Hull LA
@@ -357,7 +402,7 @@ td.fn {
-
Hull PA
+
Hull PA · shared with blkrpuck, dark

PUCK

1× BOOSTLASER 2

2 subsystems16 mappings

@@ -375,7 +420,7 @@ td.fn {
-
Hull SA · shared with chigger, flea, roach, wasp
+
Hull SA · shared with blkrwasp, chigger, flea, roach, wasp

SKEETER

2× BOOSTCHUTELASER 2

4 subsystems26 mappings

@@ -393,7 +438,7 @@ td.fn {
-
Hull SA · shared with chigger, flea, roach, skeeter
+
Hull SA · shared with blkrwasp, chigger, flea, roach, skeeter

WASP

2× BOOSTCHUTEDEMO PACK

4 subsystems26 mappings

@@ -409,6 +454,33 @@ td.fn {
Preset assignments
PresetTRIGGERTHUMB HIGHTHUMB LOWPINKY
1BOOST 1BOOST 2CHUTE—
2BOOST 1BOOST 2CHUTELIFT CUT
3BOOST 1BOOST 2LIFT CUT—
4BOOST 1BOOST 2LIFT CUTCHUTE
5BOOST 1BOOST 2HORNLIFT CUT
6LIFT CUTBOOST 1BOOST 2CHUTE
+
+
+
Hull LU · shared with lepton, neut, quark
+

BLKRLEPTON

+

2× BOOSTCHUTEUNARMED

+

3 subsystems23 mappings

+
+
Preset assignments
PresetTRIGGERTHUMB HIGHTHUMB LOWPINKY
1BOOST 1BOOST 2CHUTE—
2BOOST 1BOOST 2CHUTELIFT CUT
3BOOST 1BOOST 2LIFT CUT—
4BOOST 1BOOST 2LIFT CUTCHUTE
5BOOST 1BOOST 2HORNLIFT CUT
6LIFT CUTBOOST 1BOOST 2CHUTE
+
+
+
+
Hull SU · shared with bug, speck
+

BLKSPK

+

3× BOOSTCHUTEUNARMED

+

4 subsystems28 mappings

+
+
Preset assignments
PresetTRIGGERTHUMB HIGHTHUMB LOWPINKY
1BOOST 1BOOST 2CHUTE—
2BOOST 1BOOST 2CHUTELIFT CUT
3BOOST 1BOOST 2LIFT CUT—
4BOOST 1BOOST 3LIFT CUTCHUTE
5BOOST 1BOOST 2HORNLIFT CUT
6LIFT CUTBOOST 1BOOST 2CHUTE
+
+
+
+
Hull BU · shared with bull, tarntula
+

BLKTRN

+

4× BOOSTCHUTEUNARMED

+

5 subsystems33 mappings

+
+
Preset assignments
PresetTRIGGERTHUMB HIGHTHUMB LOWPINKY
1BOOST 2—CHUTE—
2BOOST 2—CHUTELIFT CUT
3BOOST 2—LIFT CUT—
4BOOST 2BOOST 4LIFT CUTCHUTE
5BOOST 2—HORNLIFT CUT
6LIFT CUTBOOST 1BOOST 2CHUTE
+
Hull MU · shared with barge, burro, mule
@@ -420,7 +492,7 @@ td.fn {
-
Hull SU · shared with speck
+
Hull SU · shared with blkspk, speck

BUG

2× BOOSTCHUTEUNARMED

3 subsystems23 mappings

@@ -429,7 +501,7 @@ td.fn {
-
Hull BU · shared with tarntula
+
Hull BU · shared with blktrn, tarntula

BULL

2× BOOSTCHUTEUNARMED

3 subsystems23 mappings

@@ -447,7 +519,7 @@ td.fn {
-
Hull LU · shared with quark
+
Hull LU · shared with blkrlepton, neut, quark

LEPTON

2× BOOSTCHUTEUNARMED

3 subsystems23 mappings

@@ -465,7 +537,7 @@ td.fn {
-
Hull LU · shared with lepton
+
Hull LU · shared with blkrlepton, lepton, neut

QUARK

2× BOOSTUNARMED

2 subsystems17 mappings

@@ -474,7 +546,7 @@ td.fn {
-
Hull SU · shared with bug
+
Hull SU · shared with blkspk, bug

SPECK

2× BOOSTCHUTEUNARMED

3 subsystems23 mappings

@@ -483,7 +555,7 @@ td.fn {
-
Hull BU · shared with bull
+
Hull BU · shared with blktrn, bull

TARNTULA

3× BOOSTCHUTEUNARMED

4 subsystems28 mappings

@@ -492,7 +564,7 @@ td.fn {
-

26 VTVs carry a preset table; 16 are armed. Decoded from the pod +

34 VTVs carry a preset table; 21 are armed. Decoded from the pod RIO ControlMappings stream in assets/RP411/RPL4.RES — subsystem names from each vehicle's own subsystem list, functions from ModePreset1..6 mask bits. Boosters, chute and weapons are the vehicle's