CHANGES MP! Парашют: исправлена анимация люка.

parent 73a2f31a
......@@ -1386,7 +1386,7 @@
<object-name>Chute3</object-name>
<condition>
<greater-than-equals><property>surface-positions/speedbrake-pos-norm</property><value>0.4</value></greater-than-equals>
<less-than-equals><property>surface-positions/speedbrake-pos-norm</property><value>1.0</value></less-than-equals>
<not><property>sim/multiplay/generic/bool[15]</property></not>
<or>
<greater-than-equals>
<property>engines/engine[9]/rpm</property>
......
......@@ -6,7 +6,7 @@
<!-- Block 0: 0..30. Animations. -->
<logic>
<!-- FGBUG bool[0] not sync over MP, should be fixed by 2018.2.
<!-- TODO bool[0] was not sync over MP, fixed by 2018.2.
<output type="bool">
<property>/sim/multiplay/generic/bool[0]</property>
</output>
......@@ -145,6 +145,15 @@
</input>
</logic>
<logic>
<output type="bool">
<property>/sim/multiplay/generic/bool[15]</property>
</output>
<input>
<property>/fdm/jsbsim/fcs/chute/dropped</property>
</input>
</logic>
<!-- Block 1: 31..60, 91. Unused. -->
......
......@@ -61,6 +61,9 @@
<property>propulsion/inlet[3]/spill/pos-norm</property>
<property>fcs/chute/dropped</property>
<function name="aero/elevator-deg">
<description>Halved elevon sum</description>
<avg>
......@@ -615,6 +618,7 @@
<function name="aero/coefficient/CDsb-chute">
<description>Drag due to parachute</description>
<product>
<not><p>fcs/chute/dropped</p></not>
<table>
<independentVar lookup="row">fcs/speedbrake-pos-norm</independentVar>
<tableData>
......@@ -626,8 +630,6 @@
0.70 2.05
0.89 2.05 <!-- 3 parachutes -->
0.90 3.05
1.00 3.05
1.01 0.05 <!-- parachutes dropped -->
</tableData>
</table>
<v>0.75</v><!-- [Chute] -->
......
......@@ -1714,7 +1714,8 @@
<switch name="fcs/chute/deployed">
<default value="fcs/chute/deployed"/>
<test value="0">
<test logic="OR" value="0">
fcs/chute/dropped NE 0
simulation/refill NE 0
</test>
<test logic="AND" value="fcs/chute/deployed">
......@@ -1726,19 +1727,21 @@
gear/unit[19]/WOW EQ 0
</test>
<test logic="AND" value="1">
fcs/status/standby NE 0
fcs/panel/button/chute-deploy NE 0
fcs/status/standby NE 0
fcs/chute/dropped EQ 0
</test>
</switch>
<switch name="fcs/chute/dropped">
<default value="fcs/chute/dropped"/>
<test value="0">
fcs/chute/deployed EQ 0
<test logic="OR" value="0">
simulation/refill NE 0
</test>
<test logic="AND" value="1">
fcs/panel/button/chute-drop NE 0
fcs/status/standby NE 0
fcs/chute/deployed NE 0
</test>
<!-- Overspeed break-off. -->
<test logic="AND" value="1">
......@@ -1747,7 +1750,8 @@
</test>
</switch>
<kinematic name="fcs/chute/hatch-pos-norm">
<kinematic name="fcs/chute/pos-norm">
<output>fcs/speedbrake-pos-norm</output>
<input>fcs/chute/deployed</input>
<traverse>
<setting><position>0.0</position><time>0.0</time></setting>
......@@ -1755,24 +1759,16 @@
</traverse>
</kinematic>
<switch name="fcs/chute/pos-norm">
<output>fcs/speedbrake-pos-norm</output>
<default value="fcs/chute/hatch-pos-norm"/>
<!-- Hide when repacking. -->
<test logic="AND" value="2.0">
fcs/chute/hatch-pos-norm GT 0.4
simulation/refill NE 0
</test>
<test value="2.0">
fcs/chute/dropped NE 0
</test>
</switch>
<fcs_function name="fcs/chute/nitrogen-pressure-kgf_cm2">
<output>systems/hydr/nitrogen/chute-pressure-kgf_cm2</output>
<function>
<product>
<not><p>fcs/chute/deployed</p></not>
<not>
<or>
<p>fcs/chute/deployed</p>
<p>fcs/chute/dropped</p>
</or>
</not>
<v>150</v>
</product>
</function>
......
......@@ -479,6 +479,7 @@
<!-- Required new features:
2016.2 JSBSim execrate
2017.2.1 New MP protocol
2018.2 MP protocol bugfixes
-->
<minimum-fg-version type="string">2016.2</minimum-fg-version>
<fg-ver_min type="string">2017.2.1</fg-ver_min>
......@@ -1195,11 +1196,11 @@
<multiplay>
<!-- XXX The rest of multiplay is in PRules. -->
<generic>
<!-- BEGIN FGBUG At least one of bools in 31-bit groups must be true to be transmitted. Should be fixed in 2018.2. -->
<!-- TODO At least one of bools in 31-bit groups had to be true for the group to be transmitted. Fixed in 2018.2. -->
<bool n="30" type="bool">true</bool>
<bool n="60" type="bool">true</bool>
<bool n="90" type="bool">true</bool>
<!-- END FGBUG -->
<!-- END TODO -->
<!-- TODO Enable when we have radar.
<string n="14" alias="/mpclash/output/catches-str"/>
<string n="15" alias="/mpclash/output/obj0-str"/>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment