Changeset 11177 for code/branches/tgidronFS16/src/modules

Timestamp:

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

Author:

tgidron

Message:

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

Location:

code/branches/tgidronFS16/src/modules/hover

Files:

• CMakeLists.txt (modified) (1 diff)
• FlagsAndLivesHUD.cc (deleted)
• FlagsAndLivesHUD.h (deleted)
• Hover.cc (modified) (6 diffs)
• Hover.h (modified) (2 diffs)
• HoverOrigin.cc (modified) (2 diffs)
• HoverOrigin.h (modified) (3 diffs)
• TFlagsLivesLevelHUD.cc (added)
• TFlagsLivesLevelHUD.h (added)

code/branches/tgidronFS16/src/modules/hover/CMakeLists.txt

@@ -8 +8 @@
   FlagHUD.cc
   MazeGenerator.cc
-  FlagsAndLivesHUD.cc
+  TFlagsLivesLevelHUD.cc
 )
 

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();
 
     }

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

@@ -58 +58 @@
 
             void start();
-            void startLevel();
+            void newLevel();
             void levelUp();
             void endLevel();
@@ -73 +73 @@
             inline int getLives() const
                 { return this->lives; }
+
+            inline int getLevel() const
+                { return this->level; }
 
         private:

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

@@ -48 +48 @@
         pickupTemplate_ = "";
         pickupRepresentationTemplate_ = "";
+
+        pickupTemplateDam_ = "";
+        pickupRepresentationTemplateDam_ = "";
     }
 
@@ -59 +62 @@
         XMLPortParam(HoverOrigin, "pickuptemplate", setPickupTemplate, getPickupTemplate, xmlelement, mode);
         XMLPortParam(HoverOrigin, "pickuprepresentationtemplate", setPickupRepresentationTemplate, getPickupRepresentationTemplate, xmlelement, mode);
+        XMLPortParam(HoverOrigin, "pickuptemplatedam", setPickupTemplateDam, getPickupTemplateDam, xmlelement, mode);
+        XMLPortParam(HoverOrigin, "pickuprepresentationtemplatedam", setPickupRepresentationTemplateDam, getPickupRepresentationTemplateDam, xmlelement, mode);
+        XMLPortParam(HoverOrigin, "obstacletemplate", setObstacleTemplate, getObstacleTemplate, xmlelement, mode);
     }
+
 
     void HoverOrigin::checkGametype()

code/branches/tgidronFS16/src/modules/hover/HoverOrigin.h

@@ -66 +66 @@
                 { return this->cellHeight_; }
 
+            //pickup template set and get for destroy hover pickup
+
             inline void setPickupTemplate(std::string pickupTemplate)
                 { this->pickupTemplate_ = pickupTemplate; }
@@ -76 +78 @@
                 { return this->pickupRepresentationTemplate_; }
 
+            //pickup template get and set for damage hover pickup
+
+            inline void setPickupTemplateDam(std::string pickupTemplateDam)
+                { this->pickupTemplateDam_ = pickupTemplateDam; }
+            inline std::string getPickupTemplateDam() const
+                { return this->pickupTemplateDam_; }
+
+            inline void setPickupRepresentationTemplateDam(std::string pickupRepresenationaTemplateDam)
+                { this->pickupRepresentationTemplateDam_ = pickupRepresenationaTemplateDam; }
+            inline std::string getPickupRepresentationTemplateDam() const
+                { return this->pickupRepresentationTemplateDam_; }
+
+            //get and set for obstacle template
+
+            inline void setObstacleTemplate(std::string obstacleTemplate)
+                { this->obstacleTemplate_ = obstacleTemplate; }
+            inline std::string getObstacleTemplate() const
+                { return this->obstacleTemplate_; }        
+
         private:
             void checkGametype();
+
        
             int numCells_;
@@ -86 +108 @@
             std::string pickupTemplate_;
             std::string pickupRepresentationTemplate_;
+
+            // Tempaltes for the damage hover pickup
+            std::string pickupTemplateDam_;
+            std::string pickupRepresentationTemplateDam_;
+
+            //Template for crate obstacle
+            std::string obstacleTemplate_;
     };
 }