From 83713b3b6d3bb9a949cb2cce464d3a97351f3a2b Mon Sep 17 00:00:00 2001
From: Tleety <dahltobbe@hotmail.com>
Date: Wed, 3 Feb 2016 13:27:46 +0100
Subject: [PATCH] Renamde ShieldComponent since Component should not be in the
 name. Added Shielded component that will be put on objects that should be
 hidden behind shields.

---
 resources/Schema/Components.xsd                            | 3 ++-
 resources/Schema/Components/Shield.xml                     | 3 +++
 .../Schema/Components/{ShieldComponent.xsd => Shield.xsd}  | 2 +-
 resources/Schema/Components/ShieldComponent.xml            | 3 ---
 resources/Schema/Components/Shielded.xml                   | 3 +++
 resources/Schema/Components/Shielded.xsd                   | 7 +++++++
 resources/Schema/Entities/QualityAssurance.xml             | 2 +-
 7 files changed, 17 insertions(+), 6 deletions(-)
 create mode 100644 resources/Schema/Components/Shield.xml
 rename resources/Schema/Components/{ShieldComponent.xsd => Shield.xsd} (83%)
 delete mode 100644 resources/Schema/Components/ShieldComponent.xml
 create mode 100644 resources/Schema/Components/Shielded.xml
 create mode 100644 resources/Schema/Components/Shielded.xsd

diff --git a/resources/Schema/Components.xsd b/resources/Schema/Components.xsd
index 24af1f47..368de22c 100644
--- a/resources/Schema/Components.xsd
+++ b/resources/Schema/Components.xsd
@@ -30,5 +30,6 @@
 	<xs:include schemaLocation="Components/Fill.xsd"/>
 	<xs:include schemaLocation="Components/Lifetime.xsd"/>
 	<xs:include schemaLocation="Components/HiddenForLocalPlayer.xsd"/>
-	<xs:include schemaLocation="Components/ShieldComponent.xsd"/>
+	<xs:include schemaLocation="Components/Shield.xsd"/>
+	<xs:include schemaLocation="Components/Shielded.xsd"/>
 </xs:schema>
\ No newline at end of file
diff --git a/resources/Schema/Components/Shield.xml b/resources/Schema/Components/Shield.xml
new file mode 100644
index 00000000..161f09bc
--- /dev/null
+++ b/resources/Schema/Components/Shield.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Shield xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="Shield.xsd">
+</Shield>
\ No newline at end of file
diff --git a/resources/Schema/Components/ShieldComponent.xsd b/resources/Schema/Components/Shield.xsd
similarity index 83%
rename from resources/Schema/Components/ShieldComponent.xsd
rename to resources/Schema/Components/Shield.xsd
index 0076477d..9831cbfc 100644
--- a/resources/Schema/Components/ShieldComponent.xsd
+++ b/resources/Schema/Components/Shield.xsd
@@ -2,6 +2,6 @@
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:t="types">
 	<xs:import schemaLocation="../Types.xsd" namespace="types"/>
 
-	<xs:element name="ShieldComponent">
+	<xs:element name="Shield">
 	</xs:element>
 </xs:schema>
\ No newline at end of file
diff --git a/resources/Schema/Components/ShieldComponent.xml b/resources/Schema/Components/ShieldComponent.xml
deleted file mode 100644
index 855ead48..00000000
--- a/resources/Schema/Components/ShieldComponent.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<ShieldComponent xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="ShieldComponent.xsd">
-</ShieldComponent>
\ No newline at end of file
diff --git a/resources/Schema/Components/Shielded.xml b/resources/Schema/Components/Shielded.xml
new file mode 100644
index 00000000..0d95fb0a
--- /dev/null
+++ b/resources/Schema/Components/Shielded.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Shielded xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="Shielded.xsd">
+</Shielded>
\ No newline at end of file
diff --git a/resources/Schema/Components/Shielded.xsd b/resources/Schema/Components/Shielded.xsd
new file mode 100644
index 00000000..b2348cf5
--- /dev/null
+++ b/resources/Schema/Components/Shielded.xsd
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:t="types">
+	<xs:import schemaLocation="../Types.xsd" namespace="types"/>
+
+	<xs:element name="Shielded">
+	</xs:element>
+</xs:schema>
\ No newline at end of file
diff --git a/resources/Schema/Entities/QualityAssurance.xml b/resources/Schema/Entities/QualityAssurance.xml
index 90c52820..b15e9309 100644
--- a/resources/Schema/Entities/QualityAssurance.xml
+++ b/resources/Schema/Entities/QualityAssurance.xml
@@ -1568,7 +1568,7 @@
             <c:Model>
               <Resource>Models/Core/UnitHexagon.mesh</Resource>
             </c:Model>
-            <c:ShieldComponent/>
+            <c:Shield/>
             <c:Transform>
               <Position X="0" Y="1.47765553" Z="0"/>
               <Orientation X="0" Y="2.15300012" Z="0"/>