Menu
▾
▴
[Flightgear-fgaddon-commitlogs] r12071 - trunk/Aircraft/MirageIII: Dassault Mirage III : Ad ded AI version.
|
From: <fli...@li...> - 2025-05-05 17:33:32
|
Revision: 12071
http://sourceforge.net/p/flightgear/fgaddon/12071
Author: helijah
Date: 2025-05-05 17:33:14 +0000 (Mon, 05 May 2025)
Log Message:
-----------
Dassault Mirage III : Added AI version. Bombable V5.0 compatibility.
Modified Paths:
--------------
trunk/Aircraft/MirageIII/Dialogs/mirageIII-menu.xml
trunk/Aircraft/MirageIII/Models/Effects/Weapons/guns/12mm/apibullet-tracer.xml
trunk/Aircraft/MirageIII/Models/Effects/Weapons/release.xml
trunk/Aircraft/MirageIII/Models/Liveries/France01.xml
trunk/Aircraft/MirageIII/Models/Liveries/France02.xml
trunk/Aircraft/MirageIII/Models/Liveries/France05.xml
trunk/Aircraft/MirageIII/Models/Liveries/France06.xml
trunk/Aircraft/MirageIII/Models/Liveries/army.xml
trunk/Aircraft/MirageIII/Models/Liveries/default.xml
trunk/Aircraft/MirageIII/Models/mirageIII.xml
trunk/Aircraft/MirageIII/Nasal/mass.nas
trunk/Aircraft/MirageIII/Read-Me.txt
trunk/Aircraft/MirageIII/Sounds/BaBoOn-mirageIV-Sonic-Boom.wav
trunk/Aircraft/MirageIII/Sounds/BaBoOn-mirageIV-Tire-Squeal.wav
trunk/Aircraft/MirageIII/Sounds/BaBoOn-mirageIV-Turbine2.wav
trunk/Aircraft/MirageIII/Sounds/BaBoOn-mirageIV-Wind.wav
trunk/Aircraft/MirageIII/Sounds/DoorClosed.wav
trunk/Aircraft/MirageIII/Sounds/DoorOpen.wav
trunk/Aircraft/MirageIII/Sounds/Mirage2000_Starting_Engine_OutsideV3.wav
trunk/Aircraft/MirageIII/Sounds/afterburner.wav
trunk/Aircraft/MirageIII/Sounds/gunfire.wav
trunk/Aircraft/MirageIII/Sounds/rain_canopy.wav
trunk/Aircraft/MirageIII/Sounds/shutdown.wav
trunk/Aircraft/MirageIII/Sounds/sidewinder.wav
trunk/Aircraft/MirageIII/Sounds/turbine1.wav
trunk/Aircraft/MirageIII/Systems/consumables.xml
trunk/Aircraft/MirageIII/Systems/help.xml
trunk/Aircraft/MirageIII/Systems/mirageIII-base.xml
trunk/Aircraft/MirageIII/Systems/mirageIII-keyboard.xml
trunk/Aircraft/MirageIII/Systems/views.xml
trunk/Aircraft/MirageIII/mirageIII-set.xml
trunk/Aircraft/MirageIII/mirageIIIE-set.xml
trunk/Aircraft/MirageIII/mirageIIING-set.xml
Modified: trunk/Aircraft/MirageIII/Dialogs/mirageIII-menu.xml
===================================================================
--- trunk/Aircraft/MirageIII/Dialogs/mirageIII-menu.xml 2025-05-05 06:30:37 UTC (rev 12070)
+++ trunk/Aircraft/MirageIII/Dialogs/mirageIII-menu.xml 2025-05-05 17:33:14 UTC (rev 12071)
@@ -81,8 +81,9 @@
<property>sim/multiplay/generic/bool[9]</property>
</or>
</condition>
- <command>property-toggle</command>
+ <command>property-assign</command>
<property>consumables/fuel/tank[2]/selected</property>
+ <value>true</value>
</binding>
<binding>
<condition>
@@ -96,8 +97,9 @@
<property>sim/multiplay/generic/bool[9]</property>
</or>
</condition>
- <command>property-toggle</command>
+ <command>property-assign</command>
<property>consumables/fuel/tank[3]/selected</property>
+ <value>true</value>
</binding>
<!-- Magnetos OFF -->
<binding>
Modified: trunk/Aircraft/MirageIII/Models/Effects/Weapons/guns/12mm/apibullet-tracer.xml
===================================================================
--- trunk/Aircraft/MirageIII/Models/Effects/Weapons/guns/12mm/apibullet-tracer.xml 2025-05-05 06:30:37 UTC (rev 12070)
+++ trunk/Aircraft/MirageIII/Models/Effects/Weapons/guns/12mm/apibullet-tracer.xml 2025-05-05 17:33:14 UTC (rev 12071)
@@ -11,11 +11,6 @@
<model>
<name>smoke</name>
<path>apibullet-smoke.xml</path>
- <offsets>
- <x-m> 10.00000 </x-m>
- <y-m> 0.00000 </y-m>
- <z-m> -1.43238 </z-m>
- </offsets>
</model>
<animation>
Modified: trunk/Aircraft/MirageIII/Models/Effects/Weapons/release.xml
===================================================================
--- trunk/Aircraft/MirageIII/Models/Effects/Weapons/release.xml 2025-05-05 06:30:37 UTC (rev 12070)
+++ trunk/Aircraft/MirageIII/Models/Effects/Weapons/release.xml 2025-05-05 17:33:14 UTC (rev 12071)
@@ -9,25 +9,20 @@
<speed>2755.9</speed>
<cd>0.193</cd>
<eda>0.00338158219</eda>
- <fuse-range>0</fuse-range>
<weight>0.286600941</weight>
<life>40</life>
<repeat>true</repeat>
<delay>0.41</delay>
- <!-- <count>33</count> -->
- <count>-1</count>
+ <count>-1</count> <!-- -1 = infini -->
<wind>false</wind>
- <expiry>true</expiry>
<collision>true</collision>
<impact>true</impact>
- <collision-report>sim/ai/aircraft/collision/gun</collision-report>
- <impact-report>sim/ai/aircraft/impact/cannon</impact-report>
+ <collision-report>sim/ai/aircraft/collision/cannon</collision-report>
+ <impact-reports>ai/models/model-impact</impact-reports>
<submodel-path>Aircraft/MirageIII/Models/Effects/Weapons/guns/12mm/submodel.xml</submodel-path>
- <yaw-offset>0</yaw-offset>
- <pitch-offset>0.1</pitch-offset>
</cannon>
- <sidewinder>
+ <rocket>
<model>Aircraft/MirageIII/Models/Effects/Weapons/3d/wp.xml</model>
<count>1</count>
<speed>2000</speed>
@@ -34,7 +29,7 @@
<repeat>false</repeat>
<delay>0.1</delay>
<yaw-offset>0</yaw-offset>
- <pitch-offset>2.65</pitch-offset>
+ <pitch-offset>0</pitch-offset>
<life>120</life>
<wind>false</wind>
<weight>11</weight>
@@ -44,39 +39,28 @@
<collision>true</collision>
<collision-report>sim/ai/aircraft/collision/gun</collision-report>
<impact>true</impact>
- <impact-report>/sim/ai/aircraft/impact/rocket</impact-report>
+ <impact-reports>ai/models/model-impact</impact-reports>
<submodel-path>Aircraft/MirageIII/Models/Effects/Weapons/sidewinder/sidewinder-impact.xml</submodel-path>
- <animation>
- <enable-hot type="bool">false</enable-hot>
- <attach>world</attach>
- <placer>
- <type>point</type>
- </placer>
- </animation>
- </sidewinder>
+ </rocket>
<submodel>
- <name>left-gun</name>
+ <name>cannon left</name>
<model alias="../../cannon/model"/>
<trigger alias="../../cannon/trigger"/>
<speed alias="../../cannon/speed"/>
+ <cd alias="../../cannon/cd"/>
+ <eda alias="../../cannon/eda"/>
+ <weight alias="../../cannon/weight"/>
+ <life alias="../../cannon/life"/>
<repeat alias="../../cannon/repeat"/>
<delay alias="../../cannon/delay"/>
<count alias="../../cannon/count"/>
- <life alias="../../cannon/life"/>
<wind alias="../../cannon/wind"/>
- <weight alias="../../cannon/weight"/>
- <cd alias="../../cannon/cd"/>
- <eda alias="../../cannon/eda"/>
- <fuse-range alias="../../cannon/fuse-range"/>
<collision alias="../../cannon/collision"/>
+ <impact alias="../../cannon/impact"/>
<collision-report alias="../../cannon/collision-report"/>
- <expiry alias="../../cannon/expiry"/>
- <impact alias="../../cannon/impact"/>
- <impact-report alias="../../cannon/impact-report"/>
+ <impact-reports alias="../../cannon/impact-reports"/>
<submodel-path alias="../../cannon/submodel-path"/>
- <yaw-offset alias="../../cannon/yaw-offset"/>
- <pitch-offset alias="../../cannon/pitch-offset"/>
<offsets>
<x-m> -1.19941 </x-m>
<y-m> -0.55729 </y-m>
@@ -85,27 +69,23 @@
</submodel>
<submodel>
- <name>right-gun</name>
+ <name>cannon right</name>
<model alias="../../cannon/model"/>
<trigger alias="../../cannon/trigger"/>
<speed alias="../../cannon/speed"/>
+ <cd alias="../../cannon/cd"/>
+ <eda alias="../../cannon/eda"/>
+ <weight alias="../../cannon/weight"/>
+ <life alias="../../cannon/life"/>
<repeat alias="../../cannon/repeat"/>
<delay alias="../../cannon/delay"/>
<count alias="../../cannon/count"/>
- <life alias="../../cannon/life"/>
<wind alias="../../cannon/wind"/>
- <weight alias="../../cannon/weight"/>
- <cd alias="../../cannon/cd"/>
- <eda alias="../../cannon/eda"/>
- <fuse-range alias="../../cannon/fuse-range"/>
<collision alias="../../cannon/collision"/>
+ <impact alias="../../cannon/impact"/>
<collision-report alias="../../cannon/collision-report"/>
- <expiry alias="../../cannon/expiry"/>
- <impact alias="../../cannon/impact"/>
- <impact-report alias="../../cannon/impact-report"/>
+ <impact-reports alias="../../cannon/impact-reports"/>
<submodel-path alias="../../cannon/submodel-path"/>
- <yaw-offset alias="../../cannon/yaw-offset"/>
- <pitch-offset alias="../../cannon/pitch-offset"/>
<offsets>
<x-m> -1.19941 </x-m>
<y-m> 0.55729 </y-m>
@@ -115,27 +95,27 @@
<!-- Sidewinder -->
<submodel>
- <name>left Sidewinder</name>
- <model alias="../../sidewinder/model"/>
- <count alias="../../sidewinder/count"/>
+ <name>rocket left</name>
+ <model alias="../../rocket/model"/>
<!-- <trigger>controls/armament/trigger1</trigger> -->
<trigger>sim/multiplay/generic/int[11]</trigger>
- <speed alias="../../sidewinder/speed"/>
- <repeat alias="../../sidewinder/repeat"/>
- <delay alias="../../sidewinder/delay"/>
- <yaw-offset alias="../../sidewinder/yaw-offset"/>
- <pitch-offset alias="../../sidewinder/pitch-offset"/>
- <life alias="../../sidewinder/life"/>
- <wind alias="../../sidewinder/wind"/>
- <weight alias="../../sidewinder/weight"/>
- <cd alias="../../sidewinder/cd"/>
- <eda alias="../../sidewinder/eda"/>
- <no-roll alias="../../sidewinder/no-roll"/>
- <collision alias="../../sidewinder/collision"/>
- <collision-report alias="../../sidewinder/collision-report"/>
- <impact alias="../../sidewinder/impact"/>
- <impact-report alias="../../sidewinder/impact-report"/>
- <submodel-path alias="../../sidewinder/submodel-path"/>
+ <count alias="../../rocket/count"/>
+ <speed alias="../../rocket/speed"/>
+ <repeat alias="../../rocket/repeat"/>
+ <delay alias="../../rocket/delay"/>
+ <yaw-offset alias="../../rocket/yaw-offset"/>
+ <pitch-offset alias="../../rocket/pitch-offset"/>
+ <no-roll alias="../../rocket/no-roll"/>
+ <life alias="../../rocket/life"/>
+ <wind alias="../../rocket/wind"/>
+ <weight alias="../../rocket/weight"/>
+ <cd alias="../../rocket/cd"/>
+ <eda alias="../../rocket/eda"/>
+ <collision alias="../../rocket/collision"/>
+ <collision-report alias="../../rocket/collision-report"/>
+ <impact alias="../../rocket/impact"/>
+ <impact-reports alias="../../rocket/impact-reports"/>
+ <submodel-path alias="../../rocket/submodel-path"/>
<offsets>
<x-m> 3.58821 </x-m>
<y-m> -3.04074 </y-m>
@@ -144,27 +124,27 @@
</submodel>
<submodel>
- <name>right Sidewinder</name>
- <model alias="../../sidewinder/model"/>
- <count alias="../../sidewinder/count"/>
+ <name>rocket right</name>
+ <model alias="../../rocket/model"/>
<!-- <trigger>controls/armament/trigger2</trigger> -->
<trigger>sim/multiplay/generic/int[12]</trigger>
- <speed alias="../../sidewinder/speed"/>
- <repeat alias="../../sidewinder/repeat"/>
- <delay alias="../../sidewinder/delay"/>
- <yaw-offset alias="../../sidewinder/yaw-offset"/>
- <pitch-offset alias="../../sidewinder/pitch-offset"/>
- <life alias="../../sidewinder/life"/>
- <wind alias="../../sidewinder/wind"/>
- <weight alias="../../sidewinder/weight"/>
- <cd alias="../../sidewinder/cd"/>
- <eda alias="../../sidewinder/eda"/>
- <no-roll alias="../../sidewinder/no-roll"/>
- <collision alias="../../sidewinder/collision"/>
- <collision-report alias="../../sidewinder/collision-report"/>
- <impact alias="../../sidewinder/impact"/>
- <impact-report alias="../../sidewinder/impact-report"/>
- <submodel-path alias="../../sidewinder/submodel-path"/>
+ <count alias="../../rocket/count"/>
+ <speed alias="../../rocket/speed"/>
+ <repeat alias="../../rocket/repeat"/>
+ <delay alias="../../rocket/delay"/>
+ <yaw-offset alias="../../rocket/yaw-offset"/>
+ <pitch-offset alias="../../rocket/pitch-offset"/>
+ <no-roll alias="../../rocket/no-roll"/>
+ <life alias="../../rocket/life"/>
+ <wind alias="../../rocket/wind"/>
+ <weight alias="../../rocket/weight"/>
+ <cd alias="../../rocket/cd"/>
+ <eda alias="../../rocket/eda"/>
+ <collision alias="../../rocket/collision"/>
+ <collision-report alias="../../rocket/collision-report"/>
+ <impact alias="../../rocket/impact"/>
+ <impact-reports alias="../../rocket/impact-reports"/>
+ <submodel-path alias="../../rocket/submodel-path"/>
<offsets>
<x-m> 3.58821 </x-m>
<y-m> 3.04074 </y-m>
Modified: trunk/Aircraft/MirageIII/Models/Liveries/France01.xml
===================================================================
--- trunk/Aircraft/MirageIII/Models/Liveries/France01.xml 2025-05-05 06:30:37 UTC (rev 12070)
+++ trunk/Aircraft/MirageIII/Models/Liveries/France01.xml 2025-05-05 17:33:14 UTC (rev 12071)
@@ -6,12 +6,12 @@
<model>
<livery>
- <name type="string">(E) France, EC 2/13 "Alpes", Colmar-Meyenheim (1965)</name>
- <texture>Liveries/2048x2048/France01.png</texture>
+ <name type="string">(E) France, EC 2/13 "Alpes", Colmar-Meyenheim (1965)</name>
+ <texture type="string">Liveries/2048x2048/France01.png</texture>
<specular>
- <red> 0.8 </red>
- <green> 0.8 </green>
- <blue> 0.8 </blue>
+ <red type="float"> 0.02 </red>
+ <green type="float"> 0.02 </green>
+ <blue type="float"> 0.02 </blue>
</specular>
</livery>
</model>
Modified: trunk/Aircraft/MirageIII/Models/Liveries/France02.xml
===================================================================
--- trunk/Aircraft/MirageIII/Models/Liveries/France02.xml 2025-05-05 06:30:37 UTC (rev 12070)
+++ trunk/Aircraft/MirageIII/Models/Liveries/France02.xml 2025-05-05 17:33:14 UTC (rev 12071)
@@ -6,12 +6,12 @@
<model>
<livery>
- <name type="string">(E) France, EC 2/4 La Fayette, Luxeuil-Saint Sauveur (1979)</name>
- <texture>Liveries/2048x2048/France02.png</texture>
+ <name type="string">(E) France, EC 2/4 La Fayette, Luxeuil-Saint Sauveur (1979)</name>
+ <texture type="string">Liveries/2048x2048/France02.png</texture>
<specular>
- <red> 0.1 </red>
- <green> 0.1 </green>
- <blue> 0.1 </blue>
+ <red type="float"> 0.02 </red>
+ <green type="float"> 0.02 </green>
+ <blue type="float"> 0.02 </blue>
</specular>
</livery>
</model>
Modified: trunk/Aircraft/MirageIII/Models/Liveries/France05.xml
===================================================================
--- trunk/Aircraft/MirageIII/Models/Liveries/France05.xml 2025-05-05 06:30:37 UTC (rev 12070)
+++ trunk/Aircraft/MirageIII/Models/Liveries/France05.xml 2025-05-05 17:33:14 UTC (rev 12071)
@@ -6,12 +6,12 @@
<model>
<livery>
- <name type="string">(IIING 01) Blue. France. Istres (1982)</name>
- <texture>Liveries/2048x2048/France05.png</texture>
+ <name type="string">(IIING 01) Blue. France. Istres (1982)</name>
+ <texture type="string">Liveries/2048x2048/France05.png</texture>
<specular>
- <red> 0.6 </red>
- <green> 0.6 </green>
- <blue> 0.6 </blue>
+ <red type="float"> 0.02 </red>
+ <green type="float"> 0.02 </green>
+ <blue type="float"> 0.02 </blue>
</specular>
</livery>
</model>
Modified: trunk/Aircraft/MirageIII/Models/Liveries/France06.xml
===================================================================
--- trunk/Aircraft/MirageIII/Models/Liveries/France06.xml 2025-05-05 06:30:37 UTC (rev 12070)
+++ trunk/Aircraft/MirageIII/Models/Liveries/France06.xml 2025-05-05 17:33:14 UTC (rev 12071)
@@ -6,12 +6,12 @@
<model>
<livery>
- <name type="string">(IIING 02) Desert. France. Istres (1982)</name>
- <texture>Liveries/2048x2048/France06.png</texture>
+ <name type="string">(IIING 02) Desert. France. Istres (1982)</name>
+ <texture type="string">Liveries/2048x2048/France06.png</texture>
<specular>
- <red> 0.01 </red>
- <green> 0.01 </green>
- <blue> 0.01 </blue>
+ <red type="float"> 0.02 </red>
+ <green type="float"> 0.02 </green>
+ <blue type="float"> 0.02 </blue>
</specular>
</livery>
</model>
Modified: trunk/Aircraft/MirageIII/Models/Liveries/army.xml
===================================================================
--- trunk/Aircraft/MirageIII/Models/Liveries/army.xml 2025-05-05 06:30:37 UTC (rev 12070)
+++ trunk/Aircraft/MirageIII/Models/Liveries/army.xml 2025-05-05 17:33:14 UTC (rev 12071)
@@ -6,12 +6,12 @@
<model>
<livery>
- <name type="string">Army</name>
- <texture>Liveries/2048x2048/army.png</texture>
+ <name type="string">Army</name>
+ <texture type="string">Liveries/2048x2048/army.png</texture>
<specular>
- <red> 0.3 </red>
- <green> 0.3 </green>
- <blue> 0.3 </blue>
+ <red type="float"> 0.02 </red>
+ <green type="float"> 0.02 </green>
+ <blue type="float"> 0.02 </blue>
</specular>
</livery>
</model>
Modified: trunk/Aircraft/MirageIII/Models/Liveries/default.xml
===================================================================
--- trunk/Aircraft/MirageIII/Models/Liveries/default.xml 2025-05-05 06:30:37 UTC (rev 12070)
+++ trunk/Aircraft/MirageIII/Models/Liveries/default.xml 2025-05-05 17:33:14 UTC (rev 12071)
@@ -6,12 +6,12 @@
<model>
<livery>
- <name type="string">Default</name>
- <texture>texture.png</texture>
+ <name type="string">Default</name>
+ <texture type="string">texture.png</texture>
<specular>
- <red> 0.3 </red>
- <green> 0.3 </green>
- <blue> 0.3 </blue>
+ <red type="float"> 0.02 </red>
+ <green type="float"> 0.02 </green>
+ <blue type="float"> 0.02 </blue>
</specular>
</livery>
</model>
Modified: trunk/Aircraft/MirageIII/Models/mirageIII.xml
===================================================================
--- trunk/Aircraft/MirageIII/Models/mirageIII.xml 2025-05-05 06:30:37 UTC (rev 12070)
+++ trunk/Aircraft/MirageIII/Models/mirageIII.xml 2025-05-05 17:33:14 UTC (rev 12071)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<PropertyList>
+<PropertyList include="MirageIII-bombableinclude.xml">
<path>mirageIII.ac</path>
@@ -684,7 +684,8 @@
<animation>
<type>rotate</type>
<object-name>SuspensionAvant</object-name>
- <property>gear/gear[0]/compression-norm</property>
+ <!-- <property>gear/gear[0]/compression-norm</property> -->
+ <property>sim/multiplay/generic/float[12]</property>
<interpolation>
<entry><ind> 0 </ind><dep> 0 </dep></entry>
<entry><ind> 1 </ind><dep> -15 </dep></entry>
@@ -710,7 +711,8 @@
<animation>
<type>translate</type>
<object-name>SuspensionGauche</object-name>
- <property>gear/gear[1]/compression-norm</property>
+ <!-- <property>gear/gear[1]/compression-norm</property> -->
+ <property>sim/multiplay/generic/float[13]</property>
<interpolation>
<entry><ind> 0.00 </ind><dep> 0.00 </dep></entry>
<entry><ind> 0.18 </ind><dep> 0.08 </dep></entry>
@@ -732,7 +734,8 @@
<animation>
<type>translate</type>
<object-name>SuspensionDroite</object-name>
- <property>gear/gear[2]/compression-norm</property>
+ <!-- <property>gear/gear[2]/compression-norm</property> -->
+ <property>sim/multiplay/generic/float[14]</property>
<interpolation>
<entry><ind> 0.00 </ind><dep> 0.00 </dep></entry>
<entry><ind> 0.18 </ind><dep> 0.08 </dep></entry>
@@ -934,7 +937,8 @@
<object-name>TrainAvant</object-name>
<object-name>TaxiLightL</object-name>
<object-name>TaxiLightR</object-name>
- <property>gear/gear[0]/caster-angle-deg</property>
+ <!-- <property>gear/gear[0]/caster-angle-deg</property> -->
+ <property>sim/multiplay/generic/float[15]</property>
<factor> -1.2 </factor>
<center>
<x-m> -2.565 </x-m>
Modified: trunk/Aircraft/MirageIII/Nasal/mass.nas
===================================================================
--- trunk/Aircraft/MirageIII/Nasal/mass.nas 2025-05-05 06:30:37 UTC (rev 12070)
+++ trunk/Aircraft/MirageIII/Nasal/mass.nas 2025-05-05 17:33:14 UTC (rev 12071)
@@ -22,12 +22,10 @@
if (show2 != 0 ) {
setprop("/sim/weight[1]/weight-lb",getprop("/sim/weight[1]/opt[1]/lbs"));
setprop("/sim/weight[1]/selected",getprop("/sim/weight[1]/opt[1]/name"));
- setprop("consumables/fuel/tank[2]/selected",0);
setprop("consumables/fuel/tank[2]/level-lbs",getprop("/sim/weight[1]/opt[1]/lbs"));
setprop("/sim/weight[3]/weight-lb",getprop("/sim/weight[3]/opt[1]/lbs"));
setprop("/sim/weight[3]/selected",getprop("/sim/weight[3]/opt[1]/name"));
- setprop("consumables/fuel/tank[3]/selected",0);
setprop("consumables/fuel/tank[3]/level-lbs",getprop("/sim/weight[3]/opt[1]/lbs"));
}
@@ -34,12 +32,10 @@
if (show3 != 0 ) {
setprop("/sim/weight[1]/weight-lb",getprop("/sim/weight[1]/opt[2]/lbs"));
setprop("/sim/weight[1]/selected",getprop("/sim/weight[1]/opt[2]/name"));
- setprop("consumables/fuel/tank[2]/selected",0);
setprop("consumables/fuel/tank[2]/level-lbs",getprop("/sim/weight[1]/opt[2]/lbs"));
setprop("/sim/weight[3]/weight-lb",getprop("/sim/weight[3]/opt[2]/lbs"));
setprop("/sim/weight[3]/selected",getprop("/sim/weight[3]/opt[2]/name"));
- setprop("consumables/fuel/tank[3]/selected",0);
setprop("consumables/fuel/tank[3]/level-lbs",getprop("/sim/weight[3]/opt[2]/lbs"));
}
@@ -46,12 +42,10 @@
if (show4 != 0 ) {
setprop("/sim/weight[1]/weight-lb",getprop("/sim/weight[1]/opt[3]/lbs"));
setprop("/sim/weight[1]/selected",getprop("/sim/weight[1]/opt[3]/name"));
- setprop("consumables/fuel/tank[2]/selected",0);
setprop("consumables/fuel/tank[2]/level-lbs",getprop("/sim/weight[1]/opt[3]/lbs"));
setprop("/sim/weight[3]/weight-lb",getprop("/sim/weight[3]/opt[3]/lbs"));
setprop("/sim/weight[3]/selected",getprop("/sim/weight[3]/opt[3]/name"));
- setprop("consumables/fuel/tank[3]/selected",0);
setprop("consumables/fuel/tank[3]/level-lbs",getprop("/sim/weight[3]/opt[3]/lbs"));
}
if (show5 != 0 ) {
Modified: trunk/Aircraft/MirageIII/Read-Me.txt
===================================================================
--- trunk/Aircraft/MirageIII/Read-Me.txt 2025-05-05 06:30:37 UTC (rev 12070)
+++ trunk/Aircraft/MirageIII/Read-Me.txt 2025-05-05 17:33:14 UTC (rev 12071)
@@ -38,6 +38,7 @@
February, 12, 2024
March, 04, 2024
February, 11, 2025
+May, 05, 2025
http://helijah.free.fr/flightgear/hangar.htm
http://embaranger.free.fr
@@ -83,6 +84,7 @@
12 Février 2024
04 Mars 2024
11 Février 2025
+05 Mai 2025
http://helijah.free.fr/flightgear/hangar.htm
http://embaranger.free.fr
Modified: trunk/Aircraft/MirageIII/Sounds/BaBoOn-mirageIV-Sonic-Boom.wav
===================================================================
(Binary files differ)
Modified: trunk/Aircraft/MirageIII/Sounds/BaBoOn-mirageIV-Tire-Squeal.wav
===================================================================
(Binary files differ)
Modified: trunk/Aircraft/MirageIII/Sounds/BaBoOn-mirageIV-Turbine2.wav
===================================================================
(Binary files differ)
Modified: trunk/Aircraft/MirageIII/Sounds/BaBoOn-mirageIV-Wind.wav
===================================================================
(Binary files differ)
Modified: trunk/Aircraft/MirageIII/Sounds/DoorClosed.wav
===================================================================
(Binary files differ)
Modified: trunk/Aircraft/MirageIII/Sounds/DoorOpen.wav
===================================================================
(Binary files differ)
Modified: trunk/Aircraft/MirageIII/Sounds/Mirage2000_Starting_Engine_OutsideV3.wav
===================================================================
(Binary files differ)
Modified: trunk/Aircraft/MirageIII/Sounds/afterburner.wav
===================================================================
(Binary files differ)
Modified: trunk/Aircraft/MirageIII/Sounds/gunfire.wav
===================================================================
(Binary files differ)
Modified: trunk/Aircraft/MirageIII/Sounds/rain_canopy.wav
===================================================================
(Binary files differ)
Modified: trunk/Aircraft/MirageIII/Sounds/shutdown.wav
===================================================================
(Binary files differ)
Modified: trunk/Aircraft/MirageIII/Sounds/sidewinder.wav
===================================================================
(Binary files differ)
Modified: trunk/Aircraft/MirageIII/Sounds/turbine1.wav
===================================================================
(Binary files differ)
Modified: trunk/Aircraft/MirageIII/Systems/consumables.xml
===================================================================
--- trunk/Aircraft/MirageIII/Systems/consumables.xml 2025-05-05 06:30:37 UTC (rev 12070)
+++ trunk/Aircraft/MirageIII/Systems/consumables.xml 2025-05-05 17:33:14 UTC (rev 12071)
@@ -20,7 +20,7 @@
<name type="string">Left-Tank</name>
<level-lbs type="double"></level-lbs>
<level-gal_us type="double"></level-gal_us>
- <selected type="bool"></selected>
+ <selected type="bool">false</selected>
</tank>
<tank n="3">
<tank-num type="int">3</tank-num>
@@ -27,7 +27,7 @@
<name type="string">Right-Tank</name>
<level-lbs type="double"></level-lbs>
<level-gal_us type="double"></level-gal_us>
- <selected type="bool"></selected>
+ <selected type="bool">false</selected>
</tank>
</fuel>
Modified: trunk/Aircraft/MirageIII/Systems/help.xml
===================================================================
--- trunk/Aircraft/MirageIII/Systems/help.xml 2025-05-05 06:30:37 UTC (rev 12070)
+++ trunk/Aircraft/MirageIII/Systems/help.xml 2025-05-05 17:33:14 UTC (rev 12071)
@@ -13,8 +13,8 @@
<desc>Open/Close canopy</desc>
</key>
<key>
- <name>f</name>
- <desc>Sidewinder fire</desc>
+ <name>r</name>
+ <desc>Masterarm ON/OFF</desc>
</key>
<key>
<name>e</name>
@@ -21,6 +21,10 @@
<desc>Guns fire</desc>
</key>
<key>
+ <name>f</name>
+ <desc>Sidewinder fire</desc>
+ </key>
+ <key>
<name>shift+e (E)</name>
<desc>Open/Close parachut</desc>
</key>
Modified: trunk/Aircraft/MirageIII/Systems/mirageIII-base.xml
===================================================================
--- trunk/Aircraft/MirageIII/Systems/mirageIII-base.xml 2025-05-05 06:30:37 UTC (rev 12070)
+++ trunk/Aircraft/MirageIII/Systems/mirageIII-base.xml 2025-05-05 17:33:14 UTC (rev 12071)
@@ -15,9 +15,9 @@
<livery>
<file type="string"/>
<specular>
- <red type="float">0.03</red>
- <green type="float">0.03</green>
- <blue type="float">0.03</blue>
+ <red type="float"> 0.02 </red>
+ <green type="float"> 0.02 </green>
+ <blue type="float"> 0.02 </blue>
</specular>
</livery>
<show-bombe type="bool"/>
@@ -62,7 +62,6 @@
<bool n="8" alias="/sim/model/show-reservoir1300"/>
<bool n="9" alias="/sim/model/show-reservoir1700"/>
<bool n="10" alias="/sim/model/show-rsidewinter"/>
-
<!-- Lights -->
<bool n="11" alias="/controls/lighting/beacon"/>
<bool n="12" alias="/sim/model/lights/beacon/state"/>
@@ -70,6 +69,8 @@
<bool n="14" alias="/sim/model/lights/sbc1/state"/>
<bool n="15" alias="/controls/lighting/nav-lights"/>
<bool n="16" alias="/controls/lighting/landing-lights"/>
+ <!-- -->
+ <bool n="17" alias="/controls/armament/master-arm"/>
<!-- Doors -->
<float n="0" alias="/sim/model/door-positions/crew/position-norm"/>
<!-- -->
@@ -88,6 +89,12 @@
<float n="10" alias="/gear/gear[2]/rollspeed-ms"/>
<!-- -->
<float n="11" alias="/sim/model/door-positions/parachute/position-norm"/>
+ <!-- -->
+ <float n="12" alias="/gear/gear[0]/compression-norms"/>
+ <float n="13" alias="/gear/gear[1]/compression-norm"/>
+ <float n="14" alias="/gear/gear[2]/compression-norm"/>
+ <!-- -->
+ <float n="15" alias="/gear/gear[0]/caster-angle-deg"/>
<!-- Mode -->
<string n="0" alias="/sim/model/mode"/>
<!-- For Bombable -->
@@ -213,6 +220,10 @@
<aircraft-data include="aircraft-data.xml"/>
+ <hud>
+ <path n="1">Aircraft/MirageIII/Systems/hud.xml</path>
+ </hud>
+
</sim>
<input include="mirageIII-keyboard.xml"/>
@@ -246,6 +257,7 @@
<file>Aircraft/MirageIII/Nasal/convert.nas</file>
<file>Aircraft/MirageIII/Nasal/Electrical.nas</file>
<file>Aircraft/MirageIII/Nasal/millibar.nas</file>
+ <file>Aircraft/MirageIII/Nasal/hud.nas</file>
<file>Aircraft/MirageIII/Nasal/dialog.nas</file>
<file>Aircraft/MirageIII/Nasal/mass.nas</file>
</mirageIII>
@@ -261,10 +273,10 @@
<file>Aircraft/MirageIII/Nasal/weapons.nas</file>
</weapons>
<aar>
- <file>Aircraft/Generic/aar.nas</file>
+ <file>Aircraft/MirageIII/Nasal/aar.nas</file>
</aar>
<engines>
- <file>Aircraft/Generic/Engines/generic-yasim-engine.nas</file>
+ <file>Aircraft/MirageIII/Nasal/generic-yasim-engine.nas</file>
<file>Aircraft/MirageIII/Nasal/engines-yasim.nas</file>
</engines>
Modified: trunk/Aircraft/MirageIII/Systems/mirageIII-keyboard.xml
===================================================================
--- trunk/Aircraft/MirageIII/Systems/mirageIII-keyboard.xml 2025-05-05 06:30:37 UTC (rev 12070)
+++ trunk/Aircraft/MirageIII/Systems/mirageIII-keyboard.xml 2025-05-05 17:33:14 UTC (rev 12071)
@@ -24,11 +24,29 @@
</binding>
</key>
+ <key n="114">
+ <name>r</name>
+ <desc>Masterarm</desc>
+ <binding>
+ <command>property-toggle</command>
+ <!-- <property>controls/armament/master-arm</property> -->
+ <property>sim/multiplay/generic/bool[17]</property>
+ </binding>
+ <binding>
+ <command>nasal</command>
+ <script>
+ screen.log.write("Master-arm "~(getprop("sim/multiplay/generic/bool[0]")==0?"OFF":"ON"), 0.5, 0.5, 1);
+ </script>
+ </binding>
+ </key>
+
<key n="101">
<name>e</name>
<desc>Guns</desc>
<binding>
<condition>
+ <!-- <property>controls/armament/master-arm</property> -->
+ <property>sim/multiplay/generic/bool[17]</property>
<property>ai/submodels/submodel[0]/count</property>
<property>ai/submodels/submodel[1]/count</property>
</condition>
@@ -52,6 +70,8 @@
<desc>Sidewinders</desc>
<binding>
<condition>
+ <!-- <property>controls/armament/master-arm</property> -->
+ <property>sim/multiplay/generic/bool[17]</property>
<!-- <property>sim/model/show-sidewinder</property> -->
<property>sim/multiplay/generic/bool[10]</property>
<equals>
@@ -67,6 +87,8 @@
</binding>
<binding>
<condition>
+ <!-- <property>controls/armament/master-arm</property> -->
+ <property>sim/multiplay/generic/bool[17]</property>
<!-- <property>sim/model/show-sidewinder</property> -->
<property>sim/multiplay/generic/bool[10]</property>
<equals>
@@ -97,6 +119,8 @@
<!-- -->
<binding>
<condition>
+ <!-- <property>controls/armament/master-arm</property> -->
+ <property>sim/multiplay/generic/bool[17]</property>
<!-- <property>sim/model/show-sidewinder</property> -->
<property>sim/multiplay/generic/bool[10]</property>
</condition>
@@ -110,7 +134,7 @@
</key>
<key n="69">
- <name>E</name>
+ <name>shift+e (E)</name>
<desc>Parachute</desc>
<binding>
<command>nasal</command>
@@ -123,12 +147,13 @@
<desc>Landing light</desc>
<binding>
<command>property-toggle</command>
- <property>controls/lighting/landing-lights</property>
+ <!-- <property>controls/lighting/landing-lights</property> -->
+ <property>sim/multiplay/generic/bool[16]</property>
</binding>
</key>
<key n="81">
- <name>Q</name>
+ <name>shift+q (Q)</name>
<desc>Reset view</desc>
<binding>
<command>nasal</command>
@@ -143,7 +168,7 @@
<key n="125">
<name>}</name>
- <desc>Autostart</desc>
+ <desc>AutoStart/AutoStop</desc>
<binding>
<command>property-toggle</command>
<property>controls/electric/battery-switch</property>
@@ -217,8 +242,9 @@
<property>sim/multiplay/generic/bool[9]</property>
</or>
</condition>
- <command>property-toggle</command>
+ <command>property-assign</command>
<property>consumables/fuel/tank[2]/selected</property>
+ <value>true</value>
</binding>
<binding>
<condition>
@@ -232,8 +258,9 @@
<property>sim/multiplay/generic/bool[9]</property>
</or>
</condition>
- <command>property-toggle</command>
+ <command>property-assign</command>
<property>consumables/fuel/tank[3]/selected</property>
+ <value>true</value>
</binding>
<!-- Magnetos OFF -->
<binding>
@@ -276,6 +303,7 @@
<property>consumables/fuel/tank[3]/selected</property>
<value>false</value>
</binding>
+ <!-- ***************************************** -->
<binding>
<command>nasal</command>
<script>engines.autostart();</script>
Modified: trunk/Aircraft/MirageIII/Systems/views.xml
===================================================================
--- trunk/Aircraft/MirageIII/Systems/views.xml 2025-05-05 06:30:37 UTC (rev 12070)
+++ trunk/Aircraft/MirageIII/Systems/views.xml 2025-05-05 17:33:14 UTC (rev 12071)
@@ -27,8 +27,8 @@
<x-offset-m archive="y"> 0.000 </x-offset-m> <!-- Right -->
<y-offset-m archive="y"> 0.259 </y-offset-m> <!-- Up -->
<z-offset-m archive="y"> -2.700 </z-offset-m> <!-- Back -->
- <pitch-offset-deg type="double">-10</pitch-offset-deg>
- <default-field-of-view-deg type="double">97</default-field-of-view-deg>
+ <pitch-offset-deg type="double">-5</pitch-offset-deg>
+ <default-field-of-view-deg type="double">110</default-field-of-view-deg>
</config>
</view>
Modified: trunk/Aircraft/MirageIII/mirageIII-set.xml
===================================================================
--- trunk/Aircraft/MirageIII/mirageIII-set.xml 2025-05-05 06:30:37 UTC (rev 12070)
+++ trunk/Aircraft/MirageIII/mirageIII-set.xml 2025-05-05 17:33:14 UTC (rev 12071)
@@ -14,7 +14,7 @@
</author>
</authors>
- <aircraft-version>1.1</aircraft-version>
+ <aircraft-version>1.2</aircraft-version>
<status>Alpha</status>
<minimum-fg-version>2018.2.0</minimum-fg-version>
Modified: trunk/Aircraft/MirageIII/mirageIIIE-set.xml
===================================================================
--- trunk/Aircraft/MirageIII/mirageIIIE-set.xml 2025-05-05 06:30:37 UTC (rev 12070)
+++ trunk/Aircraft/MirageIII/mirageIIIE-set.xml 2025-05-05 17:33:14 UTC (rev 12071)
@@ -14,7 +14,7 @@
</author>
</authors>
- <aircraft-version>1.1</aircraft-version>
+ <aircraft-version>1.2</aircraft-version>
<status>Alpha</status>
<minimum-fg-version>2018.2.0</minimum-fg-version>
Modified: trunk/Aircraft/MirageIII/mirageIIING-set.xml
===================================================================
--- trunk/Aircraft/MirageIII/mirageIIING-set.xml 2025-05-05 06:30:37 UTC (rev 12070)
+++ trunk/Aircraft/MirageIII/mirageIIING-set.xml 2025-05-05 17:33:14 UTC (rev 12071)
@@ -14,7 +14,7 @@
</author>
</authors>
- <aircraft-version>1.1</aircraft-version>
+ <aircraft-version>1.2</aircraft-version>
<status>Alpha</status>
<minimum-fg-version>2018.2.0</minimum-fg-version>
|
