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.

Sign up for GitHub

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

Simple damage system #328

Merged
merged 17 commits into from
Dec 5, 2020
Merged

Simple damage system #328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
25e71c5
Simple damage system
hbeni Jun 2, 2020
fc2de6b
Damage is now saved and restored between sessions (depending on selec…
hbeni Jun 2, 2020
d0feaa1
Wing damage affect fcs
hbeni Jun 2, 2020
f5d318f
Collapsing contact points at wingtips/gear (no model adjustments so far)
hbeni Jun 2, 2020
6712be4
Nose gear breakage kills engine (halt prop immediately) and prevents …
hbeni Jun 2, 2020
df8c8f5
Adjusted repair-routine: preventing from crashing the ears again when…
hbeni Jun 2, 2020
ae375cc
Adjusted gear contact points z-value, now it looks better. Needs fine…
hbeni Jun 2, 2020
82e980e
Merge branch 'master' of https://github.com/HHS81/c182 into damage
HHS81 Jun 5, 2020
fc0cea7
Adding damage animation: bent gears, bent prop
HHS81 Jun 5, 2020
37575aa
Increased damage-repair time to make sure, the plane does not recrash
hbeni Jun 8, 2020
ad26861
Including damage by forest
HHS81 Jun 10, 2020
6450b84
Merge branch 'master' into damage
hbeni Oct 30, 2020
171cfb5
Ported damage to C182T
hbeni Nov 4, 2020
f925694
Added consequences to wing breakage (fuel loss, if severe damage: fue…
hbeni Nov 9, 2020
1a32fe1
Light wing damage does not leak fuel
hbeni Nov 12, 2020
605ef70
Merge branch 'master' into damage
hbeni Nov 21, 2020
5a59ed5
Merge branch 'master' into damage
HHS81 Dec 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
224,020 changes: 112,726 additions & 111,294 deletions Models/c182s.ac
View file
Open in desktop

Large diffs are not rendered by default.

142 changes: 139 additions & 3 deletions Models/c182s.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,15 +350,37 @@
<object-name>Blade3</object-name>
</animation>

<animation>
<animation>
<type>select</type>
<object-name>Prop</object-name>
<condition>
<less-than>
<less-than>
<property>engines/engine[0]/rpm</property>
<value>651</value>
</less-than>
</condition>
</condition>
</animation>

<animation>
<type>select</type>
<object-name>Prop</object-name>
<condition>
<not>
<property>engines/engine/crashed</property>
<value>true</value>
</not>
</condition>
</animation>

<animation>
<type>select</type>
<object-name>Blade1.001</object-name>
<object-name>Blade2.001</object-name>
<object-name>Blade3.001</object-name>
<condition>
<property>engines/engine/crashed</property>
<value>true</value>
</condition>
</animation>

<animation>
Expand Down Expand Up @@ -692,6 +714,64 @@
</axis>
</animation>

<animation><!-- damage animation-->
<type>rotate</type>
<object-name>WheelFairingNose</object-name>
<object-name>FrontWheel</object-name>
<object-name>NoseWheelFork</object-name>
<object-name>Damp</object-name>
<object-name>TrenDEL_05_TrenDEL_05</object-name>
<object-name>TrenDEL_01_TrenDEL_01</object-name>
<object-name>TrenDEL_04_TrenDEL_04</object-name>
<property>fdm/jsbsim/gear/unit[0]/z-position</property>
<interpolation>
<entry>
<ind>-47.09</ind>
<dep>0</dep>
</entry>
<entry>
<ind>-22.8</ind>
<dep>-72</dep>
</entry>
</interpolation>
<center>
<x-m>-0.11244</x-m>
<y-m>0.000524</y-m>
<z-m>-0.482892</z-m>
</center>
<axis>
<x>0</x>
<y>-0.058975</y>
<z>0</z>
</axis>
</animation>

<animation><!-- damage animation-->
<type>rotate</type>
<object-name>WheelFairingNose</object-name>
<property>fdm/jsbsim/gear/unit[0]/z-position</property>
<interpolation>
<entry>
<ind>-47.09</ind>
<dep>0</dep>
</entry>
<entry>
<ind>-21.8</ind>
<dep>-72</dep>
</entry>
</interpolation>
<center>
<x-m>-0.11244</x-m>
<y-m>0.000524</y-m>
<z-m>-0.482892</z-m>
</center>
<axis>
<x>0</x>
<y>-0.058975</y>
<z>0</z>
</axis>
</animation>

<!--gear scissors tracking animation
<animation>
<type>locked-track</type>
Expand Down Expand Up @@ -780,6 +860,34 @@
<z>-0.002205</z>
</axis>
</animation>

<animation>
<type>rotate</type>
<object-name>WheelFairing.L</object-name>
<object-name>MainWheel.L</object-name>
<object-name>MainStrut.L</object-name>
<property>fdm/jsbsim/gear/unit[1]/z-position</property>
<interpolation>
<entry>
<ind>-43.67</ind>
<dep>0</dep>
</entry>
<entry>
<ind>-19.5</ind>
<dep>40</dep>
</entry>
</interpolation>
<center>
<x-m>1.493636</x-m>
<y-m>-0.570105</y-m>
<z-m>-0.469631</z-m>
</center>
<axis>
<x>-0.230576</x>
<y>0</y>
<z>0</z>
</axis>
</animation>

<animation>
<type>rotate</type>
Expand Down Expand Up @@ -833,6 +941,34 @@
</axis>
</animation>

<animation>
<type>rotate</type>
<object-name>WheelFairing.R</object-name>
<object-name>MainWheel.R</object-name>
<object-name>MainStrut.R</object-name>
<property>fdm/jsbsim/gear/unit[2]/z-position</property>
<interpolation>
<entry>
<ind>-43.67</ind>
<dep>0</dep>
</entry>
<entry>
<ind>-19.5</ind>
<dep>90</dep>
</entry>
</interpolation>
<center>
<x-m>1.493636</x-m>
<y-m>0.456261</y-m>
<z-m>-0.464098</z-m>
</center>
<axis>
<x>0.003171</x>
<y>-0.115688</y>
<z>-0.049128</z>
</axis>
</animation>

<!-- Doors-->
<animation>
<type>pick</type>
Expand Down
158 changes: 147 additions & 11 deletions Models/c182t.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,6 +369,28 @@
</condition>
</animation>

<animation>
<type>select</type>
<object-name>Prop</object-name>
<condition>
<not>
<property>engines/engine/crashed</property>
<value>true</value>
</not>
</condition>
</animation>

<animation>
<type>select</type>
<object-name>Blade1.001</object-name>
<object-name>Blade2.001</object-name>
<object-name>Blade3.001</object-name>
<condition>
<property>engines/engine/crashed</property>
<value>true</value>
</condition>
</animation>

<animation>
<type>select</type>
<object-name>SlowProp</object-name>
Expand Down Expand Up @@ -700,6 +722,64 @@
</axis>
</animation>

<animation><!-- damage animation-->
<type>rotate</type>
<object-name>WheelFairingNose</object-name>
<object-name>FrontWheel</object-name>
<object-name>NoseWheelFork</object-name>
<object-name>Damp</object-name>
<object-name>TrenDEL_05_TrenDEL_05</object-name>
<object-name>TrenDEL_01_TrenDEL_01</object-name>
<object-name>TrenDEL_04_TrenDEL_04</object-name>
<property>fdm/jsbsim/gear/unit[0]/z-position</property>
<interpolation>
<entry>
<ind>-47.09</ind>
<dep>0</dep>
</entry>
<entry>
<ind>-22.8</ind>
<dep>-72</dep>
</entry>
</interpolation>
<center>
<x-m>-0.11244</x-m>
<y-m>0.000524</y-m>
<z-m>-0.482892</z-m>
</center>
<axis>
<x>0</x>
<y>-0.058975</y>
<z>0</z>
</axis>
</animation>

<animation><!-- damage animation-->
<type>rotate</type>
<object-name>WheelFairingNose</object-name>
<property>fdm/jsbsim/gear/unit[0]/z-position</property>
<interpolation>
<entry>
<ind>-47.09</ind>
<dep>0</dep>
</entry>
<entry>
<ind>-21.8</ind>
<dep>-72</dep>
</entry>
</interpolation>
<center>
<x-m>-0.11244</x-m>
<y-m>0.000524</y-m>
<z-m>-0.482892</z-m>
</center>
<axis>
<x>0</x>
<y>-0.058975</y>
<z>0</z>
</axis>
</animation>

<!--gear scissors tracking animation
<animation>
<type>locked-track</type>
Expand Down Expand Up @@ -777,17 +857,45 @@
</entry>

</interpolation>
<center>
<x-m>1.489661</x-m>
<y-m>-0.55715</y-m>
<z-m>-0.465515</z-m>
</center>
<axis>
<x>-0.206429</x>
<y>-0.000807</y>
<z>-0.002205</z>
</axis>
</animation>
<center>
<x-m>1.489661</x-m>
<y-m>-0.55715</y-m>
<z-m>-0.465515</z-m>
</center>
<axis>
<x>-0.206429</x>
<y>-0.000807</y>
<z>-0.002205</z>
</axis>
</animation>

<animation>
<type>rotate</type>
<object-name>WheelFairing.L</object-name>
<object-name>MainWheel.L</object-name>
<object-name>MainStrut.L</object-name>
<property>fdm/jsbsim/gear/unit[1]/z-position</property>
<interpolation>
<entry>
<ind>-43.67</ind>
<dep>0</dep>
</entry>
<entry>
<ind>-19.5</ind>
<dep>40</dep>
</entry>
</interpolation>
<center>
<x-m>1.493636</x-m>
<y-m>-0.570105</y-m>
<z-m>-0.469631</z-m>
</center>
<axis>
<x>-0.230576</x>
<y>0</y>
<z>0</z>
</axis>
</animation>

<animation>
<type>rotate</type>
Expand Down Expand Up @@ -841,6 +949,34 @@
</axis>
</animation>

<animation>
<type>rotate</type>
<object-name>WheelFairing.R</object-name>
<object-name>MainWheel.R</object-name>
<object-name>MainStrut.R</object-name>
<property>fdm/jsbsim/gear/unit[2]/z-position</property>
<interpolation>
<entry>
<ind>-43.67</ind>
<dep>0</dep>
</entry>
<entry>
<ind>-19.5</ind>
<dep>90</dep>
</entry>
</interpolation>
<center>
<x-m>1.493636</x-m>
<y-m>0.456261</y-m>
<z-m>-0.464098</z-m>
</center>
<axis>
<x>0.003171</x>
<y>-0.115688</y>
<z>-0.049128</z>
</axis>
</animation>

<!-- Doors-->
<animation>
<type>pick</type>
Expand Down
Loading