Changeset 11151 for code/branches/tgidronFS16

Timestamp:

Mar 24, 2016, 3:53:28 PM (9 years ago)

Author:

tgidron

Message:

New Level Up

Location:

code/branches/tgidronFS16

Files:

• data/levels/templates/spaceshipHover.oxt (modified) (4 diffs)
• data/overlays/HoverHUD.oxo (modified) (1 diff)
• src/modules/hover/FlagHUD.cc (modified) (1 diff)
• src/modules/hover/Hover.cc (modified) (6 diffs)
• src/modules/hover/Hover.h (modified) (2 diffs)
• src/modules/hover/HoverShip.cc (modified) (2 diffs)

code/branches/tgidronFS16/data/levels/templates/spaceshipHover.oxt

@@ -18 +18 @@
    reloadwaittime      = 0.5
 
-   primaryThrust     = 200
-   auxilaryThrust    = 30
-   rotationThrust    = 25
+   primaryThrust     = 100
+   auxilaryThrust    = 1
+   rotationThrust    = 30
 
    jumpBoost = 90
@@ -33 +33 @@
 
    collisionType     = "dynamic"
-   mass              = 100
+   mass              = 1000
    linearDamping     = 0.2
    angularDamping    = 0.9999999
@@ -79 +79 @@
    boostfactor    = 2
 
-   speedfront     = 90
+   speedfront     = 120
    speedback      =  40
    speedleftright =  40
@@ -86 +86 @@
    accelerationfront     = 500
    accelerationbrake     = 500
-   accelerationback      =  125
+   accelerationback      =  250
    accelerationleftright =  125
    accelerationupdown    =  125

code/branches/tgidronFS16/data/overlays/HoverHUD.oxo

@@ -39 +39 @@
      iconmaterial      = "Orxonox/BarIconHealth"
     >
+
       <BarColour position = 0.0 colour = "0.7,0.2,0.2" />
       <BarColour position = 0.5 colour = "0.7,0.7,0.2" />
       <BarColour position = 1.0 colour = "0.2,0.7,0.2" />
     </HUDHealthBar>
+
+
+    <HUDNavigation
+     name          = "Navigation"
+     correctaspect = true
+     font          = "Monofur"
+     textsize      = 0.02
+     navMarkerSize = 0.03
+     aimMarkerSize = 0.02
+    />
+
  </OverlayGroup>
 </Template>

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

@@ -54 +54 @@
         this->overlay_->add2D(this->panel_);
 
-        this->flagCount_ = 5;
-        setFlagCount(5);
+        this->flagCount_ = 1;
+        setFlagCount(1);
     }
 

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

@@ -33 +33 @@
 
 #include "Hover.h"
-
+#include "chat/ChatManager.h"
 #include "HoverOrigin.h"
 #include "HoverWall.h"
@@ -39 +39 @@
 #include "MazeGenerator.h"
 #include "core/CoreIncludes.h"
+#include "gamestates/GSLevel.h"
 
 namespace orxonox
@@ -51 +52 @@
         this->numberOfFlags_ = 1;
         this->firstTick_ = true;
+        level = 1; //start at level 1
+        flagsTaken = 0;// took 0 flags in the beginning
+
+        numCells = 0;
+        cellSize = 0;
+        cellHeight = 0;
 
         this->setHUDTemplate("HoverHUD");
+
+        
     }
 
-    void Hover::tick(float dt)
+    void Hover::start()
     {
-        SUPER(Hover, tick, dt);
-
+        Gametype::start();
         if(this->firstTick_ && this->origin_)
         {
             this->firstTick_ = false;
 
-            int numCells = this->origin_->getNumCells();
-            int cellSize = this->origin_->getCellSize();
-            int cellHeight = this->origin_->getCellHeight();
+            numCells = this->origin_->getNumCells();
+            cellSize = this->origin_->getCellSize();
+            cellHeight = this->origin_->getCellHeight();
 
             MazeGenerator generator(numCells);
@@ -94 +102 @@
             }
 
-            //Generate 5 flags randomly
-            for ( int i = 0; i < 5; i++ )
+            //Generate 5 flags randomly (test only 1 flag)
+            for ( int i = 0; i < 1; i++ )
             {
                 HoverFlag* flag = new HoverFlag(origin_->getContext());
@@ -102 +110 @@
             }
 
-        }//firsttick end
+        } 
+    }
+
+
+
+    void Hover::startLevel(){
+        //Generate 5 flags randomly (test only 1 flag)
+            for ( int i = 0; i < 1; i++ )
+            {
+                HoverFlag* flag = new HoverFlag(origin_->getContext());
+                flag->init(rand()%numCells, rand()%numCells, cellSize);
+                flags_.push_back(flag);
+            }
+
+    }
+
+    void Hover::tick(float dt)
+    {
+        SUPER(Hover, tick, dt);
+
 
         // Check if ship collided with one of the flags
@@ -109 +136 @@
                 flags_[i]->destroyLater();
                 flags_.erase (flags_.begin()+i);
+                if(flags_.size()<=0){
+                    ChatManager::message("Level Up!");
+                    
+                    levelUp();
+                    //GSLevel::startMainMenu();
+                }
             }
+
         }
         numberOfFlags_ = flags_.size();
     }
+
+    void Hover::levelUp()
+    {
+        level++;
+        startLevel();
+
+    }
 }

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

@@ -55 +55 @@
                 { this->origin_ = origin; }
 
+            void start();
+            void startLevel();
+            void levelUp();
+            void endLevel();
+
+
             inline int getNumberOfFlags() const
                 { return this->numberOfFlags_; }
@@ -63 +69 @@
             int numberOfFlags_;
             bool firstTick_;
+            int level;
+            int lives;
+            int flagsTaken;
+
+            int cellSize;
+            int cellHeight;
+            int numCells;
     };
 }

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

@@ -33 +33 @@
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
+//#include "NewHumanController.h"
 
 #include <BulletCollision/NarrowPhaseCollision/btManifoldPoint.h>
@@ -112 +113 @@
         if (bBoost && this->isFloor_)
         {
+
             this->setVelocity(
                 this->getVelocity().x,