Changeset 11177 for code/branches/tgidronFS16/src/modules/hover/Hover.cc

Timestamp:

Apr 28, 2016, 4:04:42 PM (9 years ago)

Author:

tgidron

Message:

New Pickups (speed); Level Counter and Crate spawn (not working)

File:

• code/branches/tgidronFS16/src/modules/hover/Hover.cc (modified) (6 diffs)

code/branches/tgidronFS16/src/modules/hover/Hover.cc

@@ -121 +121 @@
             
 
-            //Generate 5 PickupSpawners randomly
+            //Generate 5 PickupSpawners randomly (destroy hover pickup)
             for (int i = 0; i<5; i++)
             {
@@ -134 +134 @@
                 pickupSpawners_.push_back(pickupSpawner);
             }
-             //If no lives are left, end game
-            if(lives <= 0){
-                GSLevel::startMainMenu();
-            }
-
-            orxout() << this->origin_->getPickupTemplate() << endl;
-            orxout() << this->origin_->getPickupRepresentationTemplate() << endl;
-        } 
-    }
-
-
-    // Rename/delete this function.
-    void Hover::startLevel()
-    {
-        //Generate 5 flags randomly (test only 1 flag)
-            for ( int i = 0; i < 5; i++ )
-            {
-                HoverFlag* flag = new HoverFlag(origin_->getContext());
-                flag->init(rand()%numCells, rand()%numCells, cellSize);
-                flags_.push_back(flag);
-            }
-
-        //Generate 5 PickupSpawners randomly
+            
+            //Generate 5 PickupSpawners randomly (damage pickup)
             for (int i = 0; i<5; i++)
             {
@@ -162 +141 @@
 
                 pickupSpawner->setPosition(get3dCoordinates(rand()%numCells, rand()%numCells, 10.0f));
-                pickupSpawner->setPickupTemplateName(origin_->getPickupTemplate());
+                pickupSpawner->setPickupTemplateName(origin_->getPickupTemplateDam());
                 pickupSpawner->setMaxSpawnedItems(5);
                 pickupSpawner->setRespawnTime(30);
@@ -170 +149 @@
             }
 
+            //*****************************************************************************
+
+            Pawn* crate = new Pawn(origin_->getContext());
+
+            crate->setPosition(get3dCoordinates(rand()%numCells, rand()%numCells, 10.0f));
+            crate->addTemplate(origin_->getObstacleTemplate());
+
+
+
+
+             //If no lives are left, end game
+            if(lives <= 0){
+                GSLevel::startMainMenu();
+            }
+
+            orxout() << this->origin_->getPickupTemplate() << endl;
+            orxout() << this->origin_->getPickupRepresentationTemplate() << endl;
+
+            orxout() << this->origin_->getPickupTemplateDam() << endl;
+            orxout() << this->origin_->getPickupRepresentationTemplateDam() << endl;
+        } 
+    }
+
+
+    // Start new level
+    void Hover::newLevel()
+    {
+        //Generate 5 flags randomly (test only 1 flag)
+            for ( int i = 0; i < 5; i++ )
+            {
+                HoverFlag* flag = new HoverFlag(origin_->getContext());
+                flag->init(rand()%numCells, rand()%numCells, cellSize);
+                flags_.push_back(flag);
+            }
             
     }
@@ -187 +200 @@
                 totFlags++;
                 if(flags_.size()<=0){
-                    ChatManager::message("Level Up!");
+                    //ChatManager::message("Level Up!");
                     
                     levelUp();
@@ -205 +218 @@
     {
         level++;
-        startLevel();
+        //increment lives after every 4 levels
+        if(level%4 == 0)
+        {
+            lives++;
+        }
+        newLevel();
 
     }