From b13362360a928d7d18e9e03ce61748a4b51e298a Mon Sep 17 00:00:00 2001
From: verysecrethero <hnorthh@gmail.com>
Date: Wed, 17 Feb 2016 11:22:42 +0100
Subject: [PATCH 1/2] Fixed RespawnModel of Pickups

---
 resources/Schema/Entities/AmmoPickup.xml   |  3 ++-
 resources/Schema/Entities/HealthPickup.xml |  3 ++-
 resources/Schema/Entities/NewMap.xml       | 20 ++++++++++----------
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/resources/Schema/Entities/AmmoPickup.xml b/resources/Schema/Entities/AmmoPickup.xml
index 534b76e2..d0bcfff6 100644
--- a/resources/Schema/Entities/AmmoPickup.xml
+++ b/resources/Schema/Entities/AmmoPickup.xml
@@ -5,10 +5,11 @@
     <c:AABB/>
     <c:AmmoPickup/>
     <c:Model>
-      <Resource>Models/Core/UnitSphere.mesh</Resource>
+      <Resource>Models/Props/PickUps/AmmoPickUp.mesh</Resource>
     </c:Model>
     <c:Transform>
       <Position X="0" Y="1" Z="0"/>
+      <Scale X="0.3" Y="0.3" Z="0.3"/>
     </c:Transform>
     <c:Trigger/>
   </Components>
diff --git a/resources/Schema/Entities/HealthPickup.xml b/resources/Schema/Entities/HealthPickup.xml
index dfc6f938..868ca233 100644
--- a/resources/Schema/Entities/HealthPickup.xml
+++ b/resources/Schema/Entities/HealthPickup.xml
@@ -5,10 +5,11 @@
     <c:AABB/>
     <c:HealthPickup/>
     <c:Model>
-      <Resource>Models/Core/UnitSphere.mesh</Resource>
+      <Resource>Models/Props/PickUps/HealthPickUp.mesh</Resource>
     </c:Model>
     <c:Transform>
       <Position X="0" Y="1" Z="0"/>
+      <Scale X="0.3" Y="0.3" Z="0.3"/>
     </c:Transform>
     <c:Trigger/>
   </Components>
diff --git a/resources/Schema/Entities/NewMap.xml b/resources/Schema/Entities/NewMap.xml
index dcdb7bec..b564efd7 100644
--- a/resources/Schema/Entities/NewMap.xml
+++ b/resources/Schema/Entities/NewMap.xml
@@ -5019,7 +5019,7 @@
           </Team>
         </c:Team>
         <c:Transform>
-          <Position X="-60.3695679" Y="2.14482641" Z="-79.3789597"/>
+          <Position X="-60.3695679" Y="5.34500027" Z="-79.3789597"/>
         </c:Transform>
       </Components>
       <Children>
@@ -5089,7 +5089,7 @@
           </Team>
         </c:Team>
         <c:Transform>
-          <Position X="60.0169258" Y="2.37972379" Z="76.2893906"/>
+          <Position X="60.0169258" Y="6.18000031" Z="76.2893906"/>
         </c:Transform>
       </Components>
       <Children>
@@ -5165,7 +5165,7 @@
             <c:Transform>
               <Position X="48.9189453" Y="7.06223536" Z="-78.9347992"/>
               <Scale X="0.300000012" Y="0.300000012" Z="0.300000012"/>
-              <Orientation X="0" Y="71.4059677" Z="0"/>
+              <Orientation X="0" Y="74.9703598" Z="0"/>
             </c:Transform>
             <c:Trigger/>
           </Components>
@@ -5184,7 +5184,7 @@
             <c:Transform>
               <Position X="-59.3499641" Y="7.46932745" Z="-20.6276321"/>
               <Scale X="0.300000012" Y="0.300000012" Z="0.300000012"/>
-              <Orientation X="0" Y="68.0603104" Z="0"/>
+              <Orientation X="0" Y="71.6247025" Z="0"/>
             </c:Transform>
             <c:Trigger/>
           </Components>
@@ -5203,7 +5203,7 @@
             <c:Transform>
               <Position X="-1.13644195" Y="1.38919806" Z="38.9768829"/>
               <Scale X="0.300000012" Y="0.300000012" Z="0.300000012"/>
-              <Orientation X="0" Y="65.6683426" Z="0"/>
+              <Orientation X="0" Y="69.2327347" Z="0"/>
             </c:Transform>
             <c:Trigger/>
           </Components>
@@ -5222,7 +5222,7 @@
             <c:Transform>
               <Position X="54.7225227" Y="6.51863909" Z="29.0052128"/>
               <Scale X="0.300000012" Y="0.300000012" Z="0.300000012"/>
-              <Orientation X="0" Y="65.9822693" Z="0"/>
+              <Orientation X="0" Y="69.5466614" Z="0"/>
             </c:Transform>
             <c:Trigger/>
           </Components>
@@ -5241,7 +5241,7 @@
             <c:Transform>
               <Position X="-51.6792374" Y="8.44526482" Z="32.5153465"/>
               <Scale X="0.300000012" Y="0.300000012" Z="0.300000012"/>
-              <Orientation X="0" Y="65.4309921" Z="0"/>
+              <Orientation X="0" Y="68.9953842" Z="0"/>
             </c:Transform>
             <c:Trigger/>
           </Components>
@@ -5260,7 +5260,7 @@
             <c:Transform>
               <Position X="-42.3974304" Y="7.28327894" Z="81.9305344"/>
               <Scale X="0.300000012" Y="0.300000012" Z="0.300000012"/>
-              <Orientation X="0" Y="63.560215" Z="0"/>
+              <Orientation X="0" Y="67.1246109" Z="0"/>
             </c:Transform>
             <c:Trigger/>
           </Components>
@@ -5279,7 +5279,7 @@
             <c:Transform>
               <Position X="-9.85184956" Y="8.25567532" Z="39.6119232"/>
               <Scale X="0.300000012" Y="0.300000012" Z="0.300000012"/>
-              <Orientation X="0" Y="62.6090584" Z="0"/>
+              <Orientation X="0" Y="66.1734619" Z="0"/>
             </c:Transform>
             <c:Trigger/>
           </Components>
@@ -5298,7 +5298,7 @@
             <c:Transform>
               <Position X="49.2257118" Y="7.39368248" Z="-31.1810112"/>
               <Scale X="0.300000012" Y="0.300000012" Z="0.300000012"/>
-              <Orientation X="0" Y="59.8201942" Z="0"/>
+              <Orientation X="0" Y="63.3846054" Z="0"/>
             </c:Transform>
             <c:Trigger/>
           </Components>

From b8222c7b2ea3753be3c06703da9ca88b204e9c79 Mon Sep 17 00:00:00 2001
From: verysecrethero <hnorthh@gmail.com>
Date: Wed, 17 Feb 2016 14:54:42 +0100
Subject: [PATCH 2/2] The rotation of the Pickups are now also included in the
 AmmoPickup.xml, HealthPickup.xml

---
 resources/Schema/Entities/AmmoPickup.xml   | 4 ++++
 resources/Schema/Entities/HealthPickup.xml | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/resources/Schema/Entities/AmmoPickup.xml b/resources/Schema/Entities/AmmoPickup.xml
index d0bcfff6..1d1435f7 100644
--- a/resources/Schema/Entities/AmmoPickup.xml
+++ b/resources/Schema/Entities/AmmoPickup.xml
@@ -7,6 +7,10 @@
     <c:Model>
       <Resource>Models/Props/PickUps/AmmoPickUp.mesh</Resource>
     </c:Model>
+    <c:RaptorCopter>
+      <Speed>0.1</Speed>
+      <Axis X="0" Y="1" Z="0"/>
+    </c:RaptorCopter>
     <c:Transform>
       <Position X="0" Y="1" Z="0"/>
       <Scale X="0.3" Y="0.3" Z="0.3"/>
diff --git a/resources/Schema/Entities/HealthPickup.xml b/resources/Schema/Entities/HealthPickup.xml
index 868ca233..c6fbc4f4 100644
--- a/resources/Schema/Entities/HealthPickup.xml
+++ b/resources/Schema/Entities/HealthPickup.xml
@@ -7,6 +7,10 @@
     <c:Model>
       <Resource>Models/Props/PickUps/HealthPickUp.mesh</Resource>
     </c:Model>
+    <c:RaptorCopter>
+      <Speed>0.1</Speed>
+      <Axis X="0" Y="1" Z="0"/>
+    </c:RaptorCopter>
     <c:Transform>
       <Position X="0" Y="1" Z="0"/>
       <Scale X="0.3" Y="0.3" Z="0.3"/>