From 2f640d224ced2eb89b32762a1351e964ea938a0b Mon Sep 17 00:00:00 2001
From: antc13 <exlerth@hotmail.com>
Date: Thu, 11 Feb 2016 12:23:20 +0100
Subject: [PATCH 1/2] New Map with Meshes WIP

---
 resources/Schema/Entities/NewMap.xml | 65 ++++++++++++++--------------
 1 file changed, 33 insertions(+), 32 deletions(-)

diff --git a/resources/Schema/Entities/NewMap.xml b/resources/Schema/Entities/NewMap.xml
index 8a5227aa..7a1d620b 100644
--- a/resources/Schema/Entities/NewMap.xml
+++ b/resources/Schema/Entities/NewMap.xml
@@ -338,7 +338,7 @@
                   <Resource>Models/Props/Walls/BigWall.mesh</Resource>
                 </c:Model>
                 <c:Transform>
-                  <Position X="30.0050449" Y="0.413646251" Z="73.2238235"/>
+                  <Position X="30.0050449" Y="0.0844396874" Z="73.2238235"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -349,6 +349,7 @@
                       <Resource>Models/Props/Walls/BigWall.mesh</Resource>
                     </c:Model>
                     <c:Transform>
+                      <Position X="0" Y="-0.173209071" Z="0"/>
                       <Orientation X="0" Y="1.52700007" Z="0"/>
                     </c:Transform>
                   </Components>
@@ -363,7 +364,7 @@
                   <Resource>Models/Props/Walls/BigWall.mesh</Resource>
                 </c:Model>
                 <c:Transform>
-                  <Position X="48.9353065" Y="0" Z="58.4628487"/>
+                  <Position X="48.9353065" Y="-0.458255291" Z="58.4628487"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -440,7 +441,7 @@
                   <Resource>Models/Props/Walls/BigWall.mesh</Resource>
                 </c:Model>
                 <c:Transform>
-                  <Position X="-19.5711384" Y="0.172045946" Z="-34.5879555"/>
+                  <Position X="-19.5711384" Y="-0.178739399" Z="-34.5879555"/>
                   <Orientation X="0" Y="0.567000031" Z="0"/>
                 </c:Transform>
               </Components>
@@ -452,7 +453,7 @@
                       <Resource>Models/Props/Walls/BigWall.mesh</Resource>
                     </c:Model>
                     <c:Transform>
-                      <Position X="3.03286791" Y="0" Z="-0.541965723"/>
+                      <Position X="2.77035999" Y="0" Z="-0.474606007"/>
                       <Scale X="1" Y="0.800000012" Z="1"/>
                       <Orientation X="0" Y="0.408000022" Z="0"/>
                     </c:Transform>
@@ -466,7 +467,7 @@
                       <Resource>Models/Props/Walls/BigWall.mesh</Resource>
                     </c:Model>
                     <c:Transform>
-                      <Position X="-3.13224602" Y="-0.258339167" Z="-0.183639094"/>
+                      <Position X="-2.8605547" Y="-0.258339167" Z="-0.140743136"/>
                       <Scale X="1" Y="0.800000012" Z="1"/>
                       <Orientation X="0" Y="2.98500013" Z="0"/>
                     </c:Transform>
@@ -482,7 +483,7 @@
                   <Resource>Models/Props/Walls/BigWall.mesh</Resource>
                 </c:Model>
                 <c:Transform>
-                  <Position X="19.8690948" Y="0" Z="38.6984329"/>
+                  <Position X="19.8690948" Y="-0.393896669" Z="38.6984329"/>
                   <Orientation X="0" Y="0.567000031" Z="0"/>
                 </c:Transform>
               </Components>
@@ -494,7 +495,7 @@
                       <Resource>Models/Props/Walls/BigWall.mesh</Resource>
                     </c:Model>
                     <c:Transform>
-                      <Position X="-3.12396646" Y="0" Z="0.0110195652"/>
+                      <Position X="-2.87285304" Y="0" Z="0.0110195652"/>
                       <Scale X="1" Y="0.800000012" Z="1"/>
                     </c:Transform>
                   </Components>
@@ -507,7 +508,7 @@
                       <Resource>Models/Props/Walls/BigWall.mesh</Resource>
                     </c:Model>
                     <c:Transform>
-                      <Position X="3.17812371" Y="0" Z="-0.00627081469"/>
+                      <Position X="2.9002583" Y="0" Z="-0.00627081469"/>
                       <Scale X="1" Y="0.800000012" Z="1"/>
                     </c:Transform>
                   </Components>
@@ -753,7 +754,7 @@
                   <Resource>Models/Props/Walls/BigWall.mesh</Resource>
                 </c:Model>
                 <c:Transform>
-                  <Position X="57.6501961" Y="-0.0872376561" Z="-53.4101181"/>
+                  <Position X="57.6499786" Y="-0.0872376561" Z="-53.4101181"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -764,7 +765,7 @@
                       <Resource>Models/Props/Walls/BigWall.mesh</Resource>
                     </c:Model>
                     <c:Transform>
-                      <Position X="3.20713973" Y="0" Z="0"/>
+                      <Position X="2.88718605" Y="0" Z="0"/>
                     </c:Transform>
                   </Components>
                   <Children/>
@@ -776,7 +777,7 @@
                       <Resource>Models/Props/Walls/BigWall.mesh</Resource>
                     </c:Model>
                     <c:Transform>
-                      <Position X="-3.19435072" Y="0" Z="0"/>
+                      <Position X="-2.91727138" Y="0" Z="0"/>
                     </c:Transform>
                   </Components>
                   <Children>
@@ -803,7 +804,7 @@
                   <Resource>Models/Props/Walls/BigWall.mesh</Resource>
                 </c:Model>
                 <c:Transform>
-                  <Position X="-34.824955" Y="1.30152178" Z="-7.16943455"/>
+                  <Position X="-34.824955" Y="0.944195449" Z="-7.16943455"/>
                   <Scale X="0.899999976" Y="0.899999976" Z="0.899999976"/>
                   <Orientation X="0" Y="0.289000005" Z="0"/>
                 </c:Transform>
@@ -830,7 +831,7 @@
                   <Resource>Models/Props/Walls/BigWall.mesh</Resource>
                 </c:Model>
                 <c:Transform>
-                  <Position X="-54.7825966" Y="-0.208565801" Z="57.3844719"/>
+                  <Position X="-54.7825966" Y="-0.593182802" Z="57.3844719"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -841,7 +842,7 @@
                       <Resource>Models/Props/Walls/BigWall.mesh</Resource>
                     </c:Model>
                     <c:Transform>
-                      <Position X="-6.47755241" Y="0" Z="0"/>
+                      <Position X="-5.79986715" Y="0" Z="0"/>
                     </c:Transform>
                   </Components>
                   <Children/>
@@ -853,7 +854,7 @@
                       <Resource>Models/Props/Walls/BigWall.mesh</Resource>
                     </c:Model>
                     <c:Transform>
-                      <Position X="-3.24101067" Y="0" Z="0"/>
+                      <Position X="-2.88392401" Y="7.18422234e-06" Z="0"/>
                     </c:Transform>
                   </Components>
                   <Children/>
@@ -879,7 +880,7 @@
                   <Resource>Models/Props/Walls/BigWall.mesh</Resource>
                 </c:Model>
                 <c:Transform>
-                  <Position X="35.7009506" Y="1.27909958" Z="2.89333916"/>
+                  <Position X="35.7009506" Y="0.947129667" Z="2.89333916"/>
                 </c:Transform>
               </Components>
               <Children/>
@@ -1030,7 +1031,7 @@
                       <Resource>Models/Props/Walls/BigWall.mesh</Resource>
                     </c:Model>
                     <c:Transform>
-                      <Position X="-2.52126598" Y="0" Z="0"/>
+                      <Position X="-2.52126598" Y="-0.192428172" Z="0"/>
                     </c:Transform>
                   </Components>
                   <Children>
@@ -1057,7 +1058,7 @@
                   <Resource>Models/Props/Walls/BigWall.mesh</Resource>
                 </c:Model>
                 <c:Transform>
-                  <Position X="57.0550842" Y="0" Z="46.2187195"/>
+                  <Position X="57.7683411" Y="-0.436794043" Z="46.2187195"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -1068,7 +1069,7 @@
                       <Resource>Models/Props/Walls/BigWall.mesh</Resource>
                     </c:Model>
                     <c:Transform>
-                      <Position X="3.22342443" Y="0" Z="0"/>
+                      <Position X="2.86278796" Y="0" Z="0"/>
                     </c:Transform>
                   </Components>
                   <Children/>
@@ -1080,7 +1081,7 @@
                       <Resource>Models/Props/Walls/BigWall.mesh</Resource>
                     </c:Model>
                     <c:Transform>
-                      <Position X="6.44013262" Y="0" Z="0"/>
+                      <Position X="5.67178059" Y="0" Z="0"/>
                     </c:Transform>
                   </Components>
                   <Children/>
@@ -1092,7 +1093,7 @@
                       <Resource>Models/Props/Walls/BigWall.mesh</Resource>
                     </c:Model>
                     <c:Transform>
-                      <Position X="9.5294733" Y="0" Z="0"/>
+                      <Position X="8.55263519" Y="0" Z="0"/>
                     </c:Transform>
                   </Components>
                   <Children/>
@@ -1106,7 +1107,7 @@
                   <Resource>Models/Props/Walls/BigWall.mesh</Resource>
                 </c:Model>
                 <c:Transform>
-                  <Position X="32.4981003" Y="-0.217237592" Z="46.666378"/>
+                  <Position X="32.7753677" Y="-0.522610307" Z="46.3780251"/>
                   <Orientation X="0" Y="0.805000067" Z="0"/>
                 </c:Transform>
               </Components>
@@ -1118,7 +1119,7 @@
                       <Resource>Models/Props/Walls/BigWall.mesh</Resource>
                     </c:Model>
                     <c:Transform>
-                      <Position X="3.11960316" Y="0" Z="0.532527149"/>
+                      <Position X="2.84155083" Y="0" Z="0.455994934"/>
                       <Orientation X="0" Y="2.87300014" Z="0"/>
                     </c:Transform>
                   </Components>
@@ -1183,7 +1184,7 @@
                   <Resource>Models/Props/Walls/BigWall.mesh</Resource>
                 </c:Model>
                 <c:Transform>
-                  <Position X="-36.1230774" Y="0.0437826738" Z="-42.9341316"/>
+                  <Position X="-36.1230774" Y="-0.434375852" Z="-42.9341316"/>
                   <Orientation X="0" Y="0.407000005" Z="0"/>
                 </c:Transform>
               </Components>
@@ -1195,7 +1196,7 @@
                       <Resource>Models/Props/Walls/BigWall.mesh</Resource>
                     </c:Model>
                     <c:Transform>
-                      <Position X="3.13264108" Y="0" Z="0"/>
+                      <Position X="2.86241889" Y="0" Z="0"/>
                     </c:Transform>
                   </Components>
                   <Children/>
@@ -1449,7 +1450,7 @@
                   <Resource>Models/Props/Bridges/SciFiBridge.mesh</Resource>
                 </c:Model>
                 <c:Transform>
-                  <Position X="-40.4783669" Y="6.4836359" Z="73.4907455"/>
+                  <Position X="-41.0066338" Y="6.08244133" Z="75.8575821"/>
                   <Scale X="0.899999976" Y="0.899999976" Z="0.899999976"/>
                   <Orientation X="0" Y="2.92200017" Z="0"/>
                 </c:Transform>
@@ -1462,7 +1463,7 @@
                       <Resource>Models/Props/Bridges/SciFiBridgeDefense.mesh</Resource>
                     </c:Model>
                     <c:Transform>
-                      <Position X="2.02681065" Y="-0.209855437" Z="2.92769241"/>
+                      <Position X="2.02681065" Y="-1.01835084" Z="2.92769241"/>
                       <Orientation X="0" Y="4.5880003" Z="0"/>
                     </c:Transform>
                   </Components>
@@ -1515,7 +1516,7 @@
                       <Resource>Models/Props/Bridges/SciFiBridgeDefense.mesh</Resource>
                     </c:Model>
                     <c:Transform>
-                      <Position X="-2.05343437" Y="0" Z="2.89228034"/>
+                      <Position X="-2.05343437" Y="-0.817824244" Z="2.89228034"/>
                       <Orientation X="0" Y="1.52900004" Z="0"/>
                     </c:Transform>
                   </Components>
@@ -1604,7 +1605,7 @@
                   <Resource>Models/Props/Pillars/SciFiBridgePillar1.mesh</Resource>
                 </c:Model>
                 <c:Transform>
-                  <Position X="-41.889534" Y="-0.22502327" Z="78.9695282"/>
+                  <Position X="-42.2934418" Y="-0.22502327" Z="81.7284927"/>
                   <Scale X="1.10000002" Y="1.10000002" Z="1.10000002"/>
                   <Orientation X="0" Y="1.35300004" Z="0"/>
                 </c:Transform>
@@ -2886,9 +2887,9 @@
                   <Resource>Models/Props/PickUps/PickUpHolder.mesh</Resource>
                 </c:Model>
                 <c:Transform>
-                  <Position X="-42.0772552" Y="6.29388857" Z="79.0305328"/>
+                  <Position X="-42.4500389" Y="6.29388857" Z="81.8648911"/>
                   <Scale X="2" Y="2" Z="2"/>
-                  <Orientation X="0" Y="1.89300013" Z="0"/>
+                  <Orientation X="0" Y="1.78300011" Z="0"/>
                 </c:Transform>
               </Components>
               <Children/>
@@ -3117,7 +3118,7 @@
                   <Resource>Models/Props/SciFiHolder1.mesh</Resource>
                 </c:Model>
                 <c:Transform>
-                  <Position X="-39.0847282" Y="5.59481907" Z="66.1773682"/>
+                  <Position X="-39.5264549" Y="5.4061079" Z="68.3770294"/>
                   <Orientation X="0" Y="6.08500051" Z="0"/>
                 </c:Transform>
               </Components>

From 1d14094e903ca7baa09263fcea33a52cb298232e Mon Sep 17 00:00:00 2001
From: antc13 <exlerth@hotmail.com>
Date: Thu, 11 Feb 2016 16:52:10 +0100
Subject: [PATCH 2/2] NewMap Updated. Still WIP

---
 assets                               |   2 +-
 resources/Schema/Entities/NewMap.xml | 422 ++++++++++++++++++++++-----
 2 files changed, 353 insertions(+), 71 deletions(-)

diff --git a/assets b/assets
index c56f6380..66e2a73b 160000
--- a/assets
+++ b/assets
@@ -1 +1 @@
-Subproject commit c56f6380ab05c23419beafe14190013d1432e32c
+Subproject commit 66e2a73bdb2c385cac37476980809cc587e2e612
diff --git a/resources/Schema/Entities/NewMap.xml b/resources/Schema/Entities/NewMap.xml
index 7a1d620b..f4c768f0 100644
--- a/resources/Schema/Entities/NewMap.xml
+++ b/resources/Schema/Entities/NewMap.xml
@@ -104,6 +104,100 @@
               </Components>
               <Children/>
             </Entity>
+            <Entity name="GridWalls">
+              <Components>
+                <c:Model>
+                  <Resource>Models/Props/Walls/SciFiWallTop.mesh</Resource>
+                </c:Model>
+                <c:Transform/>
+              </Components>
+              <Children>
+                <Entity>
+                  <Components>
+                    <c:Collidable/>
+                    <c:Model>
+                      <Resource>Models/Props/Walls/SciFiWallBig.mesh</Resource>
+                    </c:Model>
+                    <c:Transform/>
+                  </Components>
+                  <Children/>
+                </Entity>
+                <Entity>
+                  <Components>
+                    <c:Collidable/>
+                    <c:Model>
+                      <Resource>Models/Props/Walls/SciFiWallMedium.mesh</Resource>
+                    </c:Model>
+                    <c:Transform/>
+                  </Components>
+                  <Children/>
+                </Entity>
+                <Entity>
+                  <Components>
+                    <c:Collidable/>
+                    <c:Model>
+                      <Resource>Models/Props/Walls/SciFiWallSmall1.mesh</Resource>
+                    </c:Model>
+                    <c:Transform/>
+                  </Components>
+                  <Children/>
+                </Entity>
+                <Entity>
+                  <Components>
+                    <c:Collidable/>
+                    <c:Model>
+                      <Resource>Models/Props/Walls/SciFiWallSmall2.mesh</Resource>
+                    </c:Model>
+                    <c:Transform/>
+                  </Components>
+                  <Children/>
+                </Entity>
+                <Entity>
+                  <Components>
+                    <c:Collidable/>
+                    <c:Model>
+                      <Resource>Models/Props/Walls/SciFiWallBig.mesh</Resource>
+                    </c:Model>
+                    <c:Transform>
+                      <Scale X="-1" Y="1" Z="-1"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+                <Entity>
+                  <Components>
+                    <c:Collidable/>
+                    <c:Model>
+                      <Resource>Models/Props/Walls/SciFiWallMedium.mesh</Resource>
+                    </c:Model>
+                    <c:Transform>
+                      <Scale X="-1" Y="1" Z="-1"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+                <Entity>
+                  <Components>
+                    <c:Collidable/>
+                    <c:Model>
+                      <Resource>Models/Props/Walls/SciFiWallSmall3.mesh</Resource>
+                    </c:Model>
+                    <c:Transform/>
+                  </Components>
+                  <Children/>
+                </Entity>
+                <Entity>
+                  <Components>
+                    <c:Collidable/>
+                    <c:Model>
+                      <Resource>Models/Props/Walls/SciFiWallSmall4.mesh</Resource>
+                    </c:Model>
+                    <c:Transform/>
+                  </Components>
+                  <Children/>
+                </Entity>
+              </Children>
+            </Entity>
           </Children>
         </Entity>
         <Entity name="Pillars">
@@ -1436,12 +1530,117 @@
                   <Resource>Models/Props/Bridges/SciFiBridge.mesh</Resource>
                 </c:Model>
                 <c:Transform>
-                  <Position X="42.9323235" Y="6.46230173" Z="-69.7840118"/>
+                  <Position X="45.3988762" Y="6.10456753" Z="-73.9011993"/>
                   <Scale X="0.899999976" Y="0.899999976" Z="0.899999976"/>
-                  <Orientation X="0" Y="2.67000008" Z="0"/>
+                  <Orientation X="0" Y="2.54200006" Z="0"/>
                 </c:Transform>
               </Components>
-              <Children/>
+              <Children>
+                <Entity>
+                  <Components>
+                    <c:Collidable/>
+                    <c:Model>
+                      <Resource>Models/Props/Bridges/SciFiBridgeDefense.mesh</Resource>
+                    </c:Model>
+                    <c:Transform>
+                      <Position X="-2.12194037" Y="-0.910161376" Z="-2.91662836"/>
+                      <Orientation X="0" Y="1.51400006" Z="0"/>
+                    </c:Transform>
+                  </Components>
+                  <Children>
+                    <Entity>
+                      <Components>
+                        <c:Collidable/>
+                        <c:Model>
+                          <Resource>Models/Props/Bridges/SciFiBridgeDefense.mesh</Resource>
+                        </c:Model>
+                        <c:Transform>
+                          <Position X="-1.90262771" Y="0" Z="0.157715589"/>
+                        </c:Transform>
+                      </Components>
+                      <Children>
+                        <Entity>
+                          <Components>
+                            <c:Collidable/>
+                            <c:Model>
+                              <Resource>Models/Props/Bridges/SciFiBridgeDefense.mesh</Resource>
+                            </c:Model>
+                            <c:Transform>
+                              <Position X="-2.00626397" Y="0" Z="0.0953077674"/>
+                            </c:Transform>
+                          </Components>
+                          <Children>
+                            <Entity>
+                              <Components>
+                                <c:Collidable/>
+                                <c:Model>
+                                  <Resource>Models/Props/Bridges/SciFiBridgeDefense.mesh</Resource>
+                                </c:Model>
+                                <c:Transform>
+                                  <Position X="-1.84841895" Y="0" Z="0.120156199"/>
+                                </c:Transform>
+                              </Components>
+                              <Children/>
+                            </Entity>
+                          </Children>
+                        </Entity>
+                      </Children>
+                    </Entity>
+                  </Children>
+                </Entity>
+                <Entity>
+                  <Components>
+                    <c:Collidable/>
+                    <c:Model>
+                      <Resource>Models/Props/Bridges/SciFiBridgeDefense.mesh</Resource>
+                    </c:Model>
+                    <c:Transform>
+                      <Position X="2.06068087" Y="-0.704975307" Z="-2.7707541"/>
+                      <Orientation X="0" Y="4.65500021" Z="0"/>
+                    </c:Transform>
+                  </Components>
+                  <Children>
+                    <Entity>
+                      <Components>
+                        <c:Collidable/>
+                        <c:Model>
+                          <Resource>Models/Props/Bridges/SciFiBridgeDefense.mesh</Resource>
+                        </c:Model>
+                        <c:Transform>
+                          <Position X="1.80583596" Y="0" Z="-0.0662016794"/>
+                        </c:Transform>
+                      </Components>
+                      <Children>
+                        <Entity>
+                          <Components>
+                            <c:Collidable/>
+                            <c:Model>
+                              <Resource>Models/Props/Bridges/SciFiBridgeDefense.mesh</Resource>
+                            </c:Model>
+                            <c:Transform>
+                              <Position X="1.92975175" Y="0" Z="-0.246409908"/>
+                            </c:Transform>
+                          </Components>
+                          <Children>
+                            <Entity>
+                              <Components>
+                                <c:Collidable/>
+                                <c:Model>
+                                  <Resource>Models/Props/Bridges/SciFiBridgeDefense.mesh</Resource>
+                                </c:Model>
+                                <c:Transform>
+                                  <Position X="1.90471327" Y="0" Z="-0.0366260633"/>
+                                </c:Transform>
+                              </Components>
+                              <Children/>
+                            </Entity>
+                          </Children>
+                        </Entity>
+                      </Children>
+                    </Entity>
+                  </Children>
+                </Entity>
+              </Children>
             </Entity>
             <Entity>
               <Components>
@@ -1591,9 +1790,9 @@
                   <Resource>Models/Props/Pillars/SciFiBridgePillar1.mesh</Resource>
                 </c:Model>
                 <c:Transform>
-                  <Position X="45.7417641" Y="0.242569372" Z="-75.0444489"/>
+                  <Position X="48.9192352" Y="-0.184005469" Z="-78.8985367"/>
                   <Scale X="1.10000002" Y="1.10000002" Z="1.10000002"/>
-                  <Orientation X="0" Y="1.10000002" Z="0"/>
+                  <Orientation X="0" Y="0.942000031" Z="0"/>
                 </c:Transform>
               </Components>
               <Children/>
@@ -2901,9 +3100,9 @@
                   <Resource>Models/Props/PickUps/PickUpHolder.mesh</Resource>
                 </c:Model>
                 <c:Transform>
-                  <Position X="45.6545868" Y="6.77304316" Z="-75.3564148"/>
+                  <Position X="48.8548851" Y="6.34798431" Z="-79.2365799"/>
                   <Scale X="2" Y="2" Z="2"/>
-                  <Orientation X="0" Y="0.604000032" Z="0"/>
+                  <Orientation X="0" Y="0.371000022" Z="0"/>
                 </c:Transform>
               </Components>
               <Children/>
@@ -3124,6 +3323,19 @@
               </Components>
               <Children/>
             </Entity>
+            <Entity>
+              <Components>
+                <c:Collidable/>
+                <c:Model>
+                  <Resource>Models/Props/SciFiHolder1.mesh</Resource>
+                </c:Model>
+                <c:Transform>
+                  <Position X="41.1066666" Y="5.20121813" Z="-67.5628738"/>
+                  <Orientation X="0" Y="2.54200006" Z="0"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
           </Children>
         </Entity>
       </Children>
@@ -3135,106 +3347,176 @@
       <Children>
         <Entity>
           <Components>
-            <c:CapturePoint>
-              <HomePointForTeam>
-                <Blue/>
-              </HomePointForTeam>
-            </c:CapturePoint>
+            <c:Collidable/>
             <c:Model>
-              <Resource>Models/Props/CapturePoint.mesh</Resource>
-              <Color A="0.300000012" B="1" G="0.200000003" R="0"/>
-              <Transparent>true</Transparent>
+              <Resource>Models/Props/CapturePoint/CapturePointBlue.mesh</Resource>
             </c:Model>
-            <c:Team>
-              <Team>
-                <Blue/>
-              </Team>
-            </c:Team>
             <c:Transform>
-              <Position X="38.0929985" Y="0.25" Z="62.2374954"/>
+              <Position X="38.0929985" Y="0.25" Z="62.2369995"/>
             </c:Transform>
-            <c:Trigger/>
           </Components>
-          <Children/>
+          <Children>
+            <Entity>
+              <Components>
+                <c:CapturePoint>
+                  <HomePointForTeam>
+                    <Blue/>
+                  </HomePointForTeam>
+                </c:CapturePoint>
+                <c:Model>
+                  <Resource>Models/Core/UnitCylinder.mesh</Resource>
+                  <Color A="0.300000012" B="1" G="0.200000003" R="0"/>
+                  <Transparent>true</Transparent>
+                </c:Model>
+                <c:Team>
+                  <Team>
+                    <Blue/>
+                  </Team>
+                </c:Team>
+                <c:Transform>
+                  <Position X="0" Y="30.5569248" Z="0"/>
+                  <Scale X="8.5" Y="62.2000046" Z="8.5"/>
+                </c:Transform>
+                <c:Trigger/>
+              </Components>
+              <Children/>
+            </Entity>
+          </Children>
         </Entity>
         <Entity>
           <Components>
-            <c:CapturePoint>
-              <CapturePointNumber>1</CapturePointNumber>
-            </c:CapturePoint>
+            <c:Collidable/>
             <c:Model>
-              <Resource>Models/Props/CapturePoint.mesh</Resource>
-              <Color A="0.300000012" B="1" G="1" R="0"/>
-              <Transparent>true</Transparent>
+              <Resource>Models/Props/CapturePoint/CapturePointNeutral.mesh</Resource>
             </c:Model>
-            <c:Team/>
             <c:Transform>
-              <Position X="-36.8407059" Y="6.93645144" Z="56.9600563"/>
+              <Position X="-36.8409996" Y="6.93599987" Z="56"/>
             </c:Transform>
-            <c:Trigger/>
           </Components>
-          <Children/>
+          <Children>
+            <Entity>
+              <Components>
+                <c:CapturePoint>
+                  <CapturePointNumber>1</CapturePointNumber>
+                </c:CapturePoint>
+                <c:Model>
+                  <Resource>Models/Core/UnitCylinder.mesh</Resource>
+                  <Color A="0.300000012" B="1" G="1" R="0"/>
+                  <Transparent>true</Transparent>
+                </c:Model>
+                <c:Team/>
+                <c:Transform>
+                  <Position X="0" Y="11.7901649" Z="0"/>
+                  <Scale X="8.5" Y="40" Z="8.5"/>
+                </c:Transform>
+                <c:Trigger/>
+              </Components>
+              <Children/>
+            </Entity>
+          </Children>
         </Entity>
         <Entity>
           <Components>
-            <c:CapturePoint>
-              <CapturePointNumber>2</CapturePointNumber>
-            </c:CapturePoint>
+            <c:Collidable/>
             <c:Model>
-              <Resource>Models/Props/CapturePoint.mesh</Resource>
-              <Color A="0.300000012" B="1" G="1" R="1"/>
-              <Transparent>true</Transparent>
+              <Resource>Models/Props/CapturePoint/CapturePointNeutral.mesh</Resource>
             </c:Model>
-            <c:Team/>
             <c:Transform>
-              <Position X="0" Y="1.81564617" Z="-2.44221854"/>
+              <Position X="0" Y="1.81599998" Z="-2.44199991"/>
             </c:Transform>
-            <c:Trigger/>
           </Components>
-          <Children/>
+          <Children>
+            <Entity>
+              <Components>
+                <c:CapturePoint>
+                  <CapturePointNumber>2</CapturePointNumber>
+                </c:CapturePoint>
+                <c:Model>
+                  <Resource>Models/Core/UnitCylinder.mesh</Resource>
+                  <Color A="0.300000012" B="1" G="1" R="1"/>
+                  <Transparent>true</Transparent>
+                </c:Model>
+                <c:Team/>
+                <c:Transform>
+                  <Position X="0" Y="20.0245457" Z="0"/>
+                  <Scale X="9" Y="40" Z="9"/>
+                </c:Transform>
+                <c:Trigger/>
+              </Components>
+              <Children/>
+            </Entity>
+          </Children>
         </Entity>
         <Entity>
           <Components>
-            <c:CapturePoint>
-              <CapturePointNumber>3</CapturePointNumber>
-            </c:CapturePoint>
+            <c:Collidable/>
             <c:Model>
-              <Resource>Models/Props/CapturePoint.mesh</Resource>
-              <Color A="0.300000012" B="0" G="1" R="1"/>
-              <Transparent>true</Transparent>
+              <Resource>Models/Props/CapturePoint/CapturePointNeutral.mesh</Resource>
             </c:Model>
-            <c:Team/>
             <c:Transform>
-              <Position X="38.0138741" Y="7.01765108" Z="-56.1907501"/>
+              <Position X="36.7999992" Y="6.9000001" Z="-56"/>
             </c:Transform>
-            <c:Trigger/>
           </Components>
-          <Children/>
+          <Children>
+            <Entity>
+              <Components>
+                <c:CapturePoint>
+                  <CapturePointNumber>3</CapturePointNumber>
+                </c:CapturePoint>
+                <c:Model>
+                  <Resource>Models/Core/UnitCylinder.mesh</Resource>
+                  <Color A="0.300000012" B="0" G="1" R="1"/>
+                  <Transparent>true</Transparent>
+                </c:Model>
+                <c:Team/>
+                <c:Transform>
+                  <Position X="0" Y="18.8953438" Z="0"/>
+                  <Scale X="8.5" Y="40" Z="8.5"/>
+                </c:Transform>
+                <c:Trigger/>
+              </Components>
+              <Children/>
+            </Entity>
+          </Children>
         </Entity>
         <Entity>
           <Components>
-            <c:CapturePoint>
-              <HomePointForTeam>
-                <Red/>
-              </HomePointForTeam>
-              <CapturePointNumber>4</CapturePointNumber>
-            </c:CapturePoint>
+            <c:Collidable/>
             <c:Model>
-              <Resource>Models/Props/CapturePoint.mesh</Resource>
-              <Color A="0.300000012" B="0" G="0.200000003" R="1"/>
-              <Transparent>true</Transparent>
+              <Resource>Models/Props/CapturePoint/CapturePointNeutral.mesh</Resource>
             </c:Model>
-            <c:Team>
-              <Team>
-                <Red/>
-              </Team>
-            </c:Team>
             <c:Transform>
-              <Position X="-38.0929985" Y="0.25" Z="-62.2369995"/>
+              <Position X="-38.0929985" Y="0.25156638" Z="-62.2369995"/>
             </c:Transform>
-            <c:Trigger/>
           </Components>
-          <Children/>
+          <Children>
+            <Entity>
+              <Components>
+                <c:CapturePoint>
+                  <HomePointForTeam>
+                    <Red/>
+                  </HomePointForTeam>
+                  <CapturePointNumber>4</CapturePointNumber>
+                </c:CapturePoint>
+                <c:Model>
+                  <Resource>Models/Core/UnitCylinder.mesh</Resource>
+                  <Color A="0.300000012" B="0" G="0.200000003" R="1"/>
+                  <Transparent>true</Transparent>
+                </c:Model>
+                <c:Team>
+                  <Team>
+                    <Red/>
+                  </Team>
+                </c:Team>
+                <c:Transform>
+                  <Position X="0" Y="18.1249008" Z="0"/>
+                  <Scale X="8.5" Y="40" Z="8.5"/>
+                </c:Transform>
+                <c:Trigger/>
+              </Components>
+              <Children/>
+            </Entity>
+          </Children>
         </Entity>
       </Children>
     </Entity>