CVS: data/Aircraft/B-1B/Dialogs weapons.xml, 1.2, 1.3 distance_to_tanker.xml, 1.1, NONE failures.xml, 1.2, NONE

Martin Spott <[email protected]>
Newsgroups gmane.games.flightgear.cvc
Message-ID <[email protected]>
Update of /var/cvs/FlightGear-0.9/data/Aircraft/B-1B/Dialogs
In directory baron.flightgear.org:/tmp/cvs-serv7610/Dialogs

Modified Files:
	weapons.xml 
Removed Files:
	distance_to_tanker.xml failures.xml 
Log Message:

Markus Zojer - B-1B easter update:

- terrain following script rewritten
- guided ordonance system rewritten
- exterior model texture improvenments
- new instruments(IKB + MFD) for WSO position
- cdu-900 prototype for nav/com input/display
- radar now sorts for distance, displays closest


Index: weapons.xml
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/B-1B/Dialogs/weapons.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- weapons.xml	23 Jan 2010 09:47:54 -0000	1.2
+++ weapons.xml	30 Mar 2010 21:44:32 -0000	1.3
@@ -5,38 +5,35 @@
  <layout>vbox</layout>
  
  <text>
-    <label>Weapon Management</label>
+    <label>Fuel Management</label>
  </text>
-
- <hrule/>
- 
-  <!--<nasal>
-    <open>
-	#nasal
-    </open>
-  </nasal>-->
-
   <text>
     <label></label>
   </text>
-  <text>
-    <label>Load Weapons</label>
-  </text>
-  
   <group>
    <layout>vbox</layout>
-
    <text>
-    <label>Intmd bay is loaded with 8 guidable GBU-31 2000lb bombs</label>
-    <halign>left</halign>
+    <label>Fuel loading only possible on the ground!</label>
    </text>
   <button>
-	<legend>Load Guided Ordonance</legend>
+	<legend>Load 120000lbs fuel(60%)</legend>
+	<default>true</default>
+	<pref-width>180</pref-width>
+	<binding>
+		<command>nasal</command>
+		<script>weapons.fuelload(65)</script>
+	</binding>
+	<binding>
+		<command>dialog-apply</command>
+	</binding>
+    </button>
+    <button>
+	<legend>Load 190000lbs fuel(95%)</legend>
 	<default>true</default>
 	<pref-width>180</pref-width>
 	<binding>
 		<command>nasal</command>
-		<script>weapons.intmd_load()</script>
+		<script>weapons.fuelload(100)</script>
 	</binding>
 	<binding>
 		<command>dialog-apply</command>
@@ -44,214 +41,68 @@
   </button>
 
   </group>
-
   <hrule/>
 
   <text>
-    <label></label>
-  </text>
-  <text>
-    <label>Target Coordinates</label>
-  </text>
-  <text>
-    <label></label>
-  </text>
-  <text>
-    <label>(Either type in Lat/Long eg.: KTNX is 37.7836/-116.7726 or</label>
-  </text>
-  <text>
-    <label>via Sniperpod: mouseclick + pressing t button (r next target))</label>
-  </text>
-  <text>
-    <label></label>
+    <label>Weapon Management</label>
   </text>
 	  
-  <group>
-    <layout>hbox</layout>
+ <hrule/>
+ 
+  <!--<nasal>
+    <open>
+	#nasal
+    </open>
+  </nasal>-->
+
 
     <text>
-    <label>Target Nr:</label>
-    <row>0</row><col>0</col>
-   </text>
-   <text>
-    <label>Latitude</label>
-    <row>0</row><col>1</col>
-   </text>
-   <text>
-    <label>Longitude</label>
-    <row>0</row><col>2</col>
+    <label>Load Weapons</label>
    </text>
     <text>
-    <label>Distance</label>
-    <row>0</row><col>3</col>
+    <label></label>
    </text>
-    
-  </group>
-  
   <group>
-    <layout>hbox</layout>
+   <layout>vbox</layout>
     
     <text>
-    <label>Target 1:</label>
+    <label>Intmd bay is loaded with 8 guidable GBU-31 2000lb bombs</label>
     <halign>left</halign>
-    <row>1</row><col>0</col>
    </text>
-    
-    <input>
-          <row>1</row><col>1</col>
-          <property>ai/guided/bomb[0]/target-latitude-deg</property>
-          <live>true</live>
-          <binding>
-            <command>dialog-apply</command>
-          </binding>
-    </input>
-    
-    <input>
-          <row>1</row><col>2</col>
-          <property>ai/guided/bomb[0]/target-longitude-deg</property>
-	  <live>true</live>
+  <button>
+	<legend>Load Guided Ordonance</legend>
+	<default>true</default>
+	<pref-width>180</pref-width>
 	  <binding>
 		<command>nasal</command>
-		<script>weapons.target_input(0)</script>
+		<script>weapons.wpn_load(1)</script>
 	  </binding>
           <binding>
             <command>dialog-apply</command>
           </binding>
-    </input>
-    
-    <text>
-     <row>1</row><col>3</col>
-     <label>-99.999</label> <!-- placeholder for width -->
-     <format>%-0.2f km</format>
-     <property>ai/guided/bomb[0]/target-distance</property>
-     <live>true</live>
-    </text>
+  </button>
     
   </group>
   
-  <group>
-    <layout>hbox</layout>
-    
-    <text>
-    <label>Target 2:</label>
-    <halign>left</halign>
-    <row>2</row><col>1</col>
-   </text>
-    
-    <input>
-          <row>2</row><col>2</col>
-          <property>ai/guided/bomb[1]/target-latitude-deg</property>
-          <live>true</live>
-          <binding>
-            <command>dialog-apply</command>
-          </binding>
-    </input>
+  <hrule/>
     
-    <input>
-          <row>2</row><col>3</col>
-          <property>ai/guided/bomb[1]/target-longitude-deg</property>
-          <live>true</live>
-	  <binding>
-		<command>nasal</command>
-		<script>weapons.target_input(1)</script>
-	  </binding>
-          <binding>
-            <command>dialog-apply</command>
-          </binding>
-    </input>
     
     <text>
-     <row>2</row><col>4</col>
-     <label>-99.999</label>
-     <format>%-0.2f km</format>
-     <property>ai/guided/bomb[1]/target-distance</property>
-     <live>true</live>
+    <label>Target Coordinates</label>
     </text>
-    
-  </group>
-  
-  <group>
-    <layout>hbox</layout>
-    
     <text>
-    <label>Target 3:</label>
-    <halign>left</halign>
-    <row>3</row><col>1</col>
+    <label></label>
    </text>
-    
-    <input>
-          <row>3</row><col>2</col>
-          <property>ai/guided/bomb[2]/target-latitude-deg</property>
-          <live>true</live>
-          <binding>
-            <command>dialog-apply</command>
-          </binding>
-    </input>
-    
-    <input>
-          <row>3</row><col>3</col>
-          <property>ai/guided/bomb[2]/target-longitude-deg</property>
-          <live>true</live>
-	  <binding>
-		<command>nasal</command>
-		<script>weapons.target_input(2)</script>
-	  </binding>
-          <binding>
-            <command>dialog-apply</command>
-          </binding>
-    </input>
-    
     <text>
-     <row>3</row><col>4</col>
-     <label>-99.999</label>
-     <format>%-0.2f km</format>
-     <property>ai/guided/bomb[2]/target-distance</property>
-     <live>true</live>
+    <label>Type in Lat/Lon at OSO position/view via IKB and OSO MFD or</label>
     </text>
-    
-  </group>
-  
-  <group>
-    <layout>hbox</layout>
-    
     <text>
-    <label>Target 4:</label>
-    <halign>left</halign>
-    <row>4</row><col>1</col>
+    <label>via Sniperpod: mouseclick + pressing t button (r next target))</label>
    </text>
-    
-    <input>
-          <row>4</row><col>2</col>
-          <property>ai/guided/bomb[3]/target-latitude-deg</property>
-          <live>true</live>
-          <binding>
-            <command>dialog-apply</command>
-          </binding>
-    </input>
-    
-    <input>
-          <row>4</row><col>3</col>
-          <property>ai/guided/bomb[3]/target-longitude-deg</property>
-          <live>true</live>
-	  <binding>
-		<command>nasal</command>
-		<script>weapons.target_input(3)</script>
-	  </binding>
-          <binding>
-            <command>dialog-apply</command>
-          </binding>
-    </input>
-    
     <text>
-     <row>4</row><col>4</col>
-     <label>-99.999</label>
-     <format>%-0.2f km</format>
-     <property>ai/guided/bomb[3]/target-distance</property>
-     <live>true</live>
+    <label></label>
     </text>
     
-  </group>
-  
   <hrule/>
   
   <button>

--- "distance_to_tanker.xml" DELETED ---

--- "failures.xml" DELETED ---


------------------------------------------------------------------------------
Download Intel&#174; Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.