From 469c6968c46c7f335cb960a56bb9c2fa46f2819e Mon Sep 17 00:00:00 2001
From: "dereeves@nps.edu" <dereeves@nps.edu>
Date: Thu, 18 Mar 2021 14:33:43 -0700
Subject: [PATCH] * fixed manifests * fixed python errors
---
CMIS-IADS.cxxi | 2 +-
CMIS-IADS_Demo.cxxi | 2 +-
CMIS-IADS_Working.cxxi | 2 +-
CMIS-IADS_withCMs.cxxi | 2 +-
CMIS-IADS_withCMs_David.cxxi | 2 +-
CMIS-IADS_withCMs_David_1.cxxi | 2 +-
CMIS-IADS_withCMs_David_2.cxxi | 2 +-
CMIS-IADS_withCMs_David_3.cxxi | 2 +-
CMIS-IADS_withCMs_David_4.bbp2 | 2 +-
CMIS-IADS_withCMs_David_4.cxxi | 2 +-
CMIS-IADS_withCMs_David_4.xml | 446 ++++++++++++-------------
scripts/HTN/Trees/Red/EntityLogger.xml | 1 +
scripts/HTNBehaviors.py | 6 +-
13 files changed, 239 insertions(+), 234 deletions(-)
diff --git a/CMIS-IADS.cxxi b/CMIS-IADS.cxxi
index 31e1e75..991ba3b 100644
--- a/CMIS-IADS.cxxi
+++ b/CMIS-IADS.cxxi
@@ -3,7 +3,7 @@ COMMS_DATABASE=%INSTALL%/res/databases/commsdata_demo.odb
JCOMBIC_DATABASE=%INSTALL%/res/databases/jcombic.odb
PLANNING_DATABASE=%INSTALL%/res/databases/sample_maneuver_db.odb
STD_MOB_DATABASE=%INSTALL%/examples/databases/StandardMobility
-PYTHON_SCRIPTS_PATH=%INSTALL%/examples/scripts;D:/code_base/scenario_sandbox/TerrainReasoning/NewTests/BoundingOverwatch2/scripts
+PYTHON_SCRIPTS_PATH=%INSTALL%/examples/scripts;scripts
MAPS_PATH=%INSTALL%/examples/maps
ENVIRONMENT_PATH=%INSTALL%/examples/terrains
ICON_PATH=%INSTALL%/res/icons
diff --git a/CMIS-IADS_Demo.cxxi b/CMIS-IADS_Demo.cxxi
index bad5e6c..688a399 100644
--- a/CMIS-IADS_Demo.cxxi
+++ b/CMIS-IADS_Demo.cxxi
@@ -3,7 +3,7 @@ COMMS_DATABASE=%INSTALL%/res/databases/commsdata_demo.odb
JCOMBIC_DATABASE=%INSTALL%/res/databases/jcombic.odb
PLANNING_DATABASE=%INSTALL%/res/databases/sample_maneuver_db.odb
STD_MOB_DATABASE=%INSTALL%/examples/databases/StandardMobility
-PYTHON_SCRIPTS_PATH=%INSTALL%/examples/scripts;D:/code_base/scenario_sandbox/TerrainReasoning/NewTests/IADS/scripts
+PYTHON_SCRIPTS_PATH=%INSTALL%/examples/scripts;scripts
MAPS_PATH=%INSTALL%/examples/maps
ENVIRONMENT_PATH=%INSTALL%/examples/terrains
ICON_PATH=%INSTALL%/res/icons
diff --git a/CMIS-IADS_Working.cxxi b/CMIS-IADS_Working.cxxi
index 8438dc8..3db62c5 100644
--- a/CMIS-IADS_Working.cxxi
+++ b/CMIS-IADS_Working.cxxi
@@ -3,7 +3,7 @@ COMMS_DATABASE=%INSTALL%/res/databases/commsdata_demo.odb
JCOMBIC_DATABASE=%INSTALL%/res/databases/jcombic.odb
PLANNING_DATABASE=%INSTALL%/res/databases/sample_maneuver_db.odb
STD_MOB_DATABASE=%INSTALL%/examples/databases/StandardMobility
-PYTHON_SCRIPTS_PATH=%INSTALL%/examples/scripts;D:/code_base/scenario_sandbox/TerrainReasoning/NewTests/IADS/scripts
+PYTHON_SCRIPTS_PATH=%INSTALL%/examples/scripts;scripts
MAPS_PATH=%INSTALL%/examples/maps
ENVIRONMENT_PATH=%INSTALL%/examples/terrains
ICON_PATH=%INSTALL%/res/icons
diff --git a/CMIS-IADS_withCMs.cxxi b/CMIS-IADS_withCMs.cxxi
index 0979618..398d9f8 100644
--- a/CMIS-IADS_withCMs.cxxi
+++ b/CMIS-IADS_withCMs.cxxi
@@ -3,7 +3,7 @@ COMMS_DATABASE=%INSTALL%/res/databases/commsdata_demo.odb
JCOMBIC_DATABASE=%INSTALL%/res/databases/jcombic.odb
PLANNING_DATABASE=%INSTALL%/res/databases/sample_maneuver_db.odb
STD_MOB_DATABASE=%INSTALL%/examples/databases/StandardMobility
-PYTHON_SCRIPTS_PATH=%INSTALL%/examples/scripts;D:/code_base/scenario_sandbox/TerrainReasoning/NewTests/IADS/scripts
+PYTHON_SCRIPTS_PATH=%INSTALL%/examples/scripts;scripts
MAPS_PATH=%INSTALL%/examples/maps
ENVIRONMENT_PATH=%INSTALL%/examples/terrains
ICON_PATH=%INSTALL%/res/icons
diff --git a/CMIS-IADS_withCMs_David.cxxi b/CMIS-IADS_withCMs_David.cxxi
index a917176..2a82770 100644
--- a/CMIS-IADS_withCMs_David.cxxi
+++ b/CMIS-IADS_withCMs_David.cxxi
@@ -3,7 +3,7 @@ COMMS_DATABASE=%INSTALL%/res/databases/commsdata_demo.odb
JCOMBIC_DATABASE=%INSTALL%/res/databases/jcombic.odb
PLANNING_DATABASE=%INSTALL%/res/databases/sample_maneuver_db.odb
STD_MOB_DATABASE=%INSTALL%/examples/databases/StandardMobility
-PYTHON_SCRIPTS_PATH=%INSTALL%/examples/scripts;D:/code_base/scenario_sandbox/TerrainReasoning/NewTests/IADS/scripts
+PYTHON_SCRIPTS_PATH=%INSTALL%/examples/scripts;scripts
MAPS_PATH=%INSTALL%/examples/maps
ENVIRONMENT_PATH=%INSTALL%/examples/terrains
ICON_PATH=%INSTALL%/res/icons
diff --git a/CMIS-IADS_withCMs_David_1.cxxi b/CMIS-IADS_withCMs_David_1.cxxi
index 5d6ecbb..14dd307 100644
--- a/CMIS-IADS_withCMs_David_1.cxxi
+++ b/CMIS-IADS_withCMs_David_1.cxxi
@@ -3,7 +3,7 @@ COMMS_DATABASE=%INSTALL%/res/databases/commsdata_demo.odb
JCOMBIC_DATABASE=%INSTALL%/res/databases/jcombic.odb
PLANNING_DATABASE=%INSTALL%/res/databases/sample_maneuver_db.odb
STD_MOB_DATABASE=%INSTALL%/examples/databases/StandardMobility
-PYTHON_SCRIPTS_PATH=%INSTALL%/examples/scripts;D:/code_base/scenario_sandbox/TerrainReasoning/NewTests/IADS/scripts
+PYTHON_SCRIPTS_PATH=%INSTALL%/examples/scripts;scripts
MAPS_PATH=%INSTALL%/examples/maps
ENVIRONMENT_PATH=%INSTALL%/examples/terrains
ICON_PATH=%INSTALL%/res/icons
diff --git a/CMIS-IADS_withCMs_David_2.cxxi b/CMIS-IADS_withCMs_David_2.cxxi
index 85a1873..ae6cd01 100644
--- a/CMIS-IADS_withCMs_David_2.cxxi
+++ b/CMIS-IADS_withCMs_David_2.cxxi
@@ -3,7 +3,7 @@ COMMS_DATABASE=%INSTALL%/res/databases/commsdata_demo.odb
JCOMBIC_DATABASE=%INSTALL%/res/databases/jcombic.odb
PLANNING_DATABASE=%INSTALL%/res/databases/sample_maneuver_db.odb
STD_MOB_DATABASE=%INSTALL%/examples/databases/StandardMobility
-PYTHON_SCRIPTS_PATH=%INSTALL%/examples/scripts;D:/code_base/scenario_sandbox/TerrainReasoning/NewTests/IADS/scripts
+PYTHON_SCRIPTS_PATH=%INSTALL%/examples/scripts;scripts
MAPS_PATH=%INSTALL%/examples/maps
ENVIRONMENT_PATH=%INSTALL%/examples/terrains
ICON_PATH=%INSTALL%/res/icons
diff --git a/CMIS-IADS_withCMs_David_3.cxxi b/CMIS-IADS_withCMs_David_3.cxxi
index bececef..f83d7aa 100644
--- a/CMIS-IADS_withCMs_David_3.cxxi
+++ b/CMIS-IADS_withCMs_David_3.cxxi
@@ -3,7 +3,7 @@ COMMS_DATABASE=%INSTALL%/res/databases/commsdata_demo.odb
JCOMBIC_DATABASE=%INSTALL%/res/databases/jcombic.odb
PLANNING_DATABASE=%INSTALL%/res/databases/sample_maneuver_db.odb
STD_MOB_DATABASE=%INSTALL%/examples/databases/StandardMobility
-PYTHON_SCRIPTS_PATH=%INSTALL%/examples/scripts;D:/code_base/scenario_sandbox/TerrainReasoning/NewTests/IADS/scripts
+PYTHON_SCRIPTS_PATH=%INSTALL%/examples/scripts;scripts
MAPS_PATH=%INSTALL%/examples/maps
ENVIRONMENT_PATH=%INSTALL%/examples/terrains
ICON_PATH=%INSTALL%/res/icons
diff --git a/CMIS-IADS_withCMs_David_4.bbp2 b/CMIS-IADS_withCMs_David_4.bbp2
index 43fd11c..8fa409a 100644
--- a/CMIS-IADS_withCMs_David_4.bbp2
+++ b/CMIS-IADS_withCMs_David_4.bbp2
@@ -1,2 +1,2 @@
-<BBP2_v0.1 SITS_XML_VERSION="1.06" SITS_XML_CREATION_DATE="17/09/2020">
+<BBP2_v0.1 SITS_XML_VERSION="1.06" SITS_XML_CREATION_DATE="18/03/2021">
</BBP2_v0.1>
diff --git a/CMIS-IADS_withCMs_David_4.cxxi b/CMIS-IADS_withCMs_David_4.cxxi
index 38a18b0..12286d0 100644
--- a/CMIS-IADS_withCMs_David_4.cxxi
+++ b/CMIS-IADS_withCMs_David_4.cxxi
@@ -3,7 +3,7 @@ COMMS_DATABASE=%INSTALL%/res/databases/commsdata_demo.odb
JCOMBIC_DATABASE=%INSTALL%/res/databases/jcombic.odb
PLANNING_DATABASE=%INSTALL%/res/databases/sample_maneuver_db.odb
STD_MOB_DATABASE=%INSTALL%/examples/databases/StandardMobility
-PYTHON_SCRIPTS_PATH=%INSTALL%/examples/scripts;D:/code_base/scenario_sandbox/TerrainReasoning/NewTests/IADS/scripts
+PYTHON_SCRIPTS_PATH=%INSTALL%/examples/scripts;scripts
MAPS_PATH=%INSTALL%/examples/maps
ENVIRONMENT_PATH=%INSTALL%/examples/terrains
ICON_PATH=%INSTALL%/res/icons
diff --git a/CMIS-IADS_withCMs_David_4.xml b/CMIS-IADS_withCMs_David_4.xml
index a6d663d..7e3cb68 100644
--- a/CMIS-IADS_withCMs_David_4.xml
+++ b/CMIS-IADS_withCMs_David_4.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<Scenario SITS_XML_VERSION="1.16" SITS_XML_CREATION_DATE="09/17/2020">
+<Scenario SITS_XML_VERSION="1.16" SITS_XML_CREATION_DATE="03/18/2021">
<Metadata>
<MetaInfo>
<ScenarioData class="SCENARIO">
@@ -7642,7 +7642,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -7676,7 +7676,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -7710,7 +7710,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -9648,7 +9648,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -9699,7 +9699,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -9750,7 +9750,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -9801,7 +9801,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -9852,7 +9852,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -9903,7 +9903,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -9954,7 +9954,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -10005,7 +10005,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -10056,7 +10056,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -10107,7 +10107,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -10158,7 +10158,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -10209,7 +10209,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -10260,7 +10260,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -10311,7 +10311,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -10362,7 +10362,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -10413,7 +10413,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -10464,7 +10464,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -10515,7 +10515,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -10566,7 +10566,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -10617,7 +10617,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -10668,7 +10668,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -10719,7 +10719,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -10770,7 +10770,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -10821,7 +10821,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -10872,7 +10872,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -10923,7 +10923,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -10974,7 +10974,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -11025,7 +11025,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -11076,7 +11076,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -11127,7 +11127,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -11178,7 +11178,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -11229,7 +11229,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -11280,7 +11280,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -11331,7 +11331,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -11382,7 +11382,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -11433,7 +11433,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -11484,7 +11484,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -11535,7 +11535,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -11586,7 +11586,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -11637,7 +11637,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -11688,7 +11688,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -11739,7 +11739,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -11790,7 +11790,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -11841,7 +11841,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -11892,7 +11892,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -11943,7 +11943,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -11994,7 +11994,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -12045,7 +12045,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -12096,7 +12096,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -12147,7 +12147,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -12198,7 +12198,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -12249,7 +12249,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -12300,7 +12300,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -12351,7 +12351,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -12402,7 +12402,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -12453,7 +12453,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -12504,7 +12504,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -12555,7 +12555,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -12606,7 +12606,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -12657,7 +12657,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -12708,7 +12708,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -12759,7 +12759,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -12810,7 +12810,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -12861,7 +12861,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -12912,7 +12912,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -12963,7 +12963,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -13014,7 +13014,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -13065,7 +13065,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -13116,7 +13116,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -13167,7 +13167,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -13218,7 +13218,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -13269,7 +13269,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -13320,7 +13320,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -13371,7 +13371,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -13422,7 +13422,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -13473,7 +13473,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -13524,7 +13524,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -13575,7 +13575,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -13626,7 +13626,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -13677,7 +13677,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -13728,7 +13728,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -13779,7 +13779,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -13830,7 +13830,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -13881,7 +13881,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -13932,7 +13932,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -13983,7 +13983,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -14034,7 +14034,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -14085,7 +14085,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -14136,7 +14136,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -14187,7 +14187,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -14238,7 +14238,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -14289,7 +14289,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -14340,7 +14340,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -14391,7 +14391,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -14442,7 +14442,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -14493,7 +14493,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -14544,7 +14544,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -14595,7 +14595,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -14646,7 +14646,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -14697,7 +14697,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -14748,7 +14748,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -14799,7 +14799,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -14850,7 +14850,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -14901,7 +14901,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -14952,7 +14952,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -15003,7 +15003,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -15054,7 +15054,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -15105,7 +15105,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -15156,7 +15156,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -15207,7 +15207,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -15258,7 +15258,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -15309,7 +15309,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -15360,7 +15360,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -15411,7 +15411,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -15462,7 +15462,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -15513,7 +15513,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -15564,7 +15564,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -15615,7 +15615,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -15666,7 +15666,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -15717,7 +15717,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -15768,7 +15768,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -15819,7 +15819,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -15870,7 +15870,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -15921,7 +15921,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -15972,7 +15972,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -16023,7 +16023,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -16074,7 +16074,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -16125,7 +16125,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -16176,7 +16176,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -16227,7 +16227,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -16278,7 +16278,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -16329,7 +16329,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -16380,7 +16380,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -16431,7 +16431,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -16482,7 +16482,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -16533,7 +16533,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -16584,7 +16584,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -16635,7 +16635,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -16686,7 +16686,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -16737,7 +16737,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -16788,7 +16788,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -16839,7 +16839,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -16890,7 +16890,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -16941,7 +16941,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -18675,7 +18675,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -18726,7 +18726,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -18777,7 +18777,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -18828,7 +18828,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -18879,7 +18879,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -18930,7 +18930,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -18981,7 +18981,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -19032,7 +19032,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -19083,7 +19083,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -19134,7 +19134,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -19185,7 +19185,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -19236,7 +19236,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -19287,7 +19287,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -19338,7 +19338,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -19389,7 +19389,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -19440,7 +19440,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -19695,7 +19695,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -19746,7 +19746,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -19797,7 +19797,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -19848,7 +19848,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -19899,7 +19899,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -19950,7 +19950,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -20001,7 +20001,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -20052,7 +20052,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -20103,7 +20103,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -20154,7 +20154,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -20205,7 +20205,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -20256,7 +20256,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -20307,7 +20307,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -20358,7 +20358,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -20409,7 +20409,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -20460,7 +20460,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -20715,7 +20715,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -20766,7 +20766,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -20817,7 +20817,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -20868,7 +20868,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -20919,7 +20919,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -20970,7 +20970,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -21021,7 +21021,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -21072,7 +21072,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -21123,7 +21123,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -21174,7 +21174,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -21225,7 +21225,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -21276,7 +21276,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -21327,7 +21327,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -21378,7 +21378,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -21429,7 +21429,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -21480,7 +21480,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -21735,7 +21735,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -21786,7 +21786,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -21837,7 +21837,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -21888,7 +21888,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -21939,7 +21939,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -21990,7 +21990,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -22041,7 +22041,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -22092,7 +22092,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -22143,7 +22143,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -22194,7 +22194,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -22245,7 +22245,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -22296,7 +22296,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -22347,7 +22347,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -22398,7 +22398,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -22449,7 +22449,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -22500,7 +22500,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -22857,7 +22857,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -22908,7 +22908,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -22959,7 +22959,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -23010,7 +23010,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -23061,7 +23061,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -23112,7 +23112,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -23163,7 +23163,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -23214,7 +23214,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -23265,7 +23265,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -23316,7 +23316,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
@@ -23367,7 +23367,7 @@
<Entry name="SITS_ICON">
<Map>
<Entry name="Icon Type">
- <Elem>SOLDIER</Elem>
+ <Elem>SERVICE_MEMBER</Elem>
</Entry>
</Map>
</Entry>
diff --git a/scripts/HTN/Trees/Red/EntityLogger.xml b/scripts/HTN/Trees/Red/EntityLogger.xml
index 8de59af..47de586 100644
--- a/scripts/HTN/Trees/Red/EntityLogger.xml
+++ b/scripts/HTN/Trees/Red/EntityLogger.xml
@@ -59,6 +59,7 @@ goalContainer.getCurrentExecutingStack().addReplanTrigger("GoalTracker_LogInfo")
<Parent>isGoalTracker_LogInfo</Parent>
<Code IsFile="false">import mtry.cxxi.model.MtryLog.LogGenericMsg as LogGenericMsg
from HTNBehaviors import SendEntityEventDelay
+from HTNBehaviors import IsTransmitting
currentActivity = "PARKED_AT_BASE"
if state.getCurrentUnitName() in borg.redUnitActivity:
diff --git a/scripts/HTNBehaviors.py b/scripts/HTNBehaviors.py
index f5bd2c5..92d9207 100644
--- a/scripts/HTNBehaviors.py
+++ b/scripts/HTNBehaviors.py
@@ -19,6 +19,10 @@ borg = None
def IsTransmitting(unitName, isCommander):
_InitBorgInternal()
+ # they can't transmit if they aren't doing anything yet
+ if not unitName in borg.redUnitActivity:
+ return False
+
# is transmitting
activityName = borg.redUnitActivity[unitName]
activityTime = int(borg.redUnitActivityTime[unitName])
@@ -28,7 +32,7 @@ def IsTransmitting(unitName, isCommander):
return True
elif activityName == "OPERATE_AT_SITE" and isCommander (elapsedTime >= 3600 and elapsedTime <= 3610):
return True
- else
+ else:
return False
def SetRedUnitActivity(unitName, activityName):
--
GitLab