Changeset 9584 for code/branches/formationupdate

Timestamp:

Mar 26, 2013, 4:02:36 PM (12 years ago)

Author:

maxima

Message:

Second Formation in Maxim-Level

Location:

code/branches/formationupdate

Files:

• data/levels/maxim.oxw (modified) (1 diff)
• src/orxonox/worldentities/pawns/Pawn.cc (modified) (1 diff)

code/branches/formationupdate/data/levels/maxim.oxw

@@ -73 +73 @@
                 </templates>
                 <controller>
+                    <AIController team=0/>
+                </controller>
+            </SpaceShip>
+        <?lua end ?>
+        
+        
+        <!-- ADDING ENEMY FORMATION: 5 Swallows -->
+        <!--
+        <?lua for i=0,4,1 do
+        ?>
+            <SpaceShip position="<?lua print(5000+i*200) ?>,-200,1000" lookat="-1300,-600,900" visible="true">
+                <templates>
+                    <Template link=spaceshipswallow /> 
+                </templates>
+                <controller>
                     <AIController team=1/>
                 </controller>
             </SpaceShip>
         <?lua end ?>
-
-
+        -->
   </Scene>
 </Level>

code/branches/formationupdate/src/orxonox/worldentities/pawns/Pawn.cc

@@ -311 +311 @@
     {
         /* TEST TEST This is used to find out if the current pawn is also 
-         * the master of the formulation.
+         * the master of the formation.
          *
          * NOTE: This does not yet check if the current pawn is actually