From d6467f3ad45b7a57cba7cd6ab91b0cbc7fbe8622 Mon Sep 17 00:00:00 2001
From: ehofman <ehofman>
Date: Fri, 11 Jun 2004 17:19:59 +0000
Subject: [PATCH] Okay, maybe it was a good idea to assume that not all targets
 are target[0].

---
 Aircraft/Instruments/radar.xml | 72 ++++++++++++----------------------
 1 file changed, 24 insertions(+), 48 deletions(-)

diff --git a/Aircraft/Instruments/radar.xml b/Aircraft/Instruments/radar.xml
index 3bdc5fc43..98dada63c 100644
--- a/Aircraft/Instruments/radar.xml
+++ b/Aircraft/Instruments/radar.xml
@@ -23,18 +23,14 @@
    <h>17</h>
    <condition>
     <and>
-     <less-than>
-      <property>ai/models/aircraft[0]/radar/range-nm</property>
-      <value>43</value>
-     </less-than>
+     <equals>
+      <property>ai/models/aircraft[0]/radar/in-range</property>
+      <value>true</value>
+     </equals>
      <equals>
       <property>/instrumentation/radar/range</property>
       <value>40</value>
      </equals>
-     <not-equals>
-      <property>ai/models/aircraft[0]/radar/range-nm</property>
-      <value>0</value>
-     </not-equals>
     </and>
    </condition>
    <texture>
@@ -68,18 +64,14 @@
    <h>17</h>
    <condition>
     <and>
-     <less-than>
-      <property>ai/models/aircraft[0]/radar/range-nm</property>
-      <value>22</value>
-     </less-than>
+     <equals>
+      <property>ai/models/aircraft[0]/radar/in-range</property>
+      <value>true</value>
+     </equals>
      <equals>
       <property>/instrumentation/radar/range</property>
       <value>20</value>
      </equals>
-     <not-equals>
-      <property>ai/models/aircraft[0]/radar/range-nm</property>
-      <value>0</value>
-     </not-equals>
     </and>
    </condition>
    <texture>
@@ -113,18 +105,14 @@
    <h>17</h>
    <condition>
     <and>
-     <less-than>
-      <property>ai/models/aircraft[1]/radar/range-nm</property>
-      <value>43</value>
-     </less-than>
+     <equals>
+      <property>ai/models/aircraft[1]/radar/in-range</property>
+      <value>true</value>
+     </equals>
      <equals>
       <property>/instrumentation/radar/range</property>
       <value>40</value>
      </equals>
-     <not-equals>
-      <property>ai/models/aircraft[1]/radar/range-nm</property>
-      <value>0</value>
-     </not-equals>
     </and>
    </condition>
    <texture>
@@ -158,18 +146,14 @@
    <h>17</h>
    <condition>
     <and>
-     <less-than>
-      <property>ai/models/aircraft[1]/radar/range-nm</property>
-      <value>22</value>
-     </less-than>
+     <equals>
+      <property>ai/models/aircraft[1]/radar/in-range</property>
+      <value>true</value>
+     </equals>
      <equals>
       <property>/instrumentation/radar/range</property>
       <value>20</value>
      </equals>
-     <not-equals>
-      <property>ai/models/aircraft[1]/radar/range-nm</property>
-      <value>0</value>
-     </not-equals>
     </and>
    </condition>
    <texture>
@@ -203,18 +187,14 @@
    <h>17</h>
    <condition>
     <and>
-     <less-than>
-      <property>ai/models/aircraft[2]/radar/range-nm</property>
-      <value>43</value>
-     </less-than>
+     <equals>
+      <property>ai/models/aircraft[2]/radar/in-range</property>
+      <value>true</value>
+     </equals>
      <equals>
       <property>/instrumentation/radar/range</property>
       <value>40</value>
      </equals>
-     <not-equals>
-      <property>ai/models/aircraft[2]/radar/range-nm</property>
-      <value>0</value>
-     </not-equals>
     </and>
    </condition>
    <texture>
@@ -248,18 +228,14 @@
    <h>17</h>
    <condition>
     <and>
-     <less-than>
-      <property>ai/models/aircraft[2]/radar/range-nm</property>
-      <value>22</value>
-     </less-than>
+     <equals>
+      <property>ai/models/aircraft[2]/radar/in-range</property>
+      <value>true</value>
+     </equals>
      <equals>
       <property>/instrumentation/radar/range</property>
       <value>20</value>
      </equals>
-     <not-equals>
-      <property>ai/models/aircraft[2]/radar/range-nm</property>
-      <value>0</value>
-     </not-equals>
     </and>
    </condition>
    <texture>