Changeset 9868 for code/branches/invaders/src/modules/invader

Timestamp:

Dec 3, 2013, 8:18:15 PM (11 years ago)

Author:

zifloria

Message:

End game screen. Eye candy. Gameplay tweaks

Location:

code/branches/invaders/src/modules/invader

Files:

• Invader.cc (modified) (6 diffs)
• Invader.h (modified) (4 diffs)
• InvaderCenterPoint.cc (modified) (3 diffs)
• InvaderCenterPoint.h (modified) (1 diff)
• InvaderEnemy.cc (modified) (3 diffs)
• InvaderEnemy.h (modified) (1 diff)
• InvaderHUDinfo.cc (modified) (3 diffs)
• InvaderHUDinfo.h (modified) (1 diff)
• InvaderPrereqs.h (modified) (1 diff)
• InvaderShip.cc (modified) (6 diffs)
• InvaderShip.h (modified) (1 diff)
• InvaderWeapon.cc (modified) (2 diffs)
• InvaderWeapon.h (modified) (1 diff)

code/branches/invaders/src/modules/invader/Invader.cc

@@ -59 +59 @@
         RegisterObject(Invader);
         this->center_ = 0;
+        init();
+        this->setHUDTemplate("InvaderHUD");
+    }
 
-        this->console_addEnemy = createConsoleCommand( "spawnEnemy", createExecutor( createFunctor(&Invader::spawnEnemy, this) ) );
-        //this->context = context;
-        this->setHUDTemplate("InvaderHUD");
-
+    void Invader::init()
+    {
+        bEndGame = false;
         lives = 3;
+        // TODO:
         level = 1;
         point = 0;
         multiplier = 1;
         b_combo = false;
+        // spawn enemy every 2 seconds
         enemySpawnTimer.setTimer(2.0f, true, createExecutor(createFunctor(&Invader::spawnEnemy, this)));
         comboTimer.setTimer(2.5f, true, createExecutor(createFunctor(&Invader::comboControll, this)));
-    }
-
-    Invader::~Invader()
-    {
     }
 
@@ -94 +94 @@
             newPawn->setPlayer(player);
             newPawn->level = level;
+            // spawn enemy at random points in front of player.
             newPawn->setPosition(player->getPosition() + Vector3(500 + 100 * i, 0, float(rand())/RAND_MAX * 400 - 200));
         }
@@ -101 +102 @@
     {
         lives--;
-        multiplier = 0;
-        if (lives <= 0) end();
+        multiplier = 1;
+        // end the game in 30 seconds.
+        if (lives <= 0)
+            enemySpawnTimer.setTimer(30.0f, false, createExecutor(createFunctor(&Invader::end, this)));
     };
 
@@ -109 +112 @@
         if (b_combo)
             multiplier++;
+        // if no combo was performed before, reset multiplier
         else
             multiplier = 1;
@@ -114 +118 @@
     }
 
-    // inject custom player controller
- /**   void Invader::spawnPlayer(PlayerInfo* player)
-    {
-        assert(player);
-
-        //player->startControl(new InvaderShip(this->center_->getContext() ) );
-    }*/
-
     void Invader::start()
     {
+        init();
         // Set variable to temporarily force the player to spawn.
         this->bForceSpawn_ = true;
@@ -137 +134 @@
     }
 
+
     void Invader::end()
     {
-        orxout() << "STOP THE GAME, CHEATER!!!" << endl;
-        // Call end for the parent class.
-        // Deathmatch::end();
+        // DON'T CALL THIS!
+        //      Deathmatch::end();
+        // It will misteriously crash the game!
+        // Instead startMainMenu, this won't crash.
+        GSLevel::startMainMenu();
     }
 }

code/branches/invaders/src/modules/invader/Invader.h

@@ -29 +29 @@
 /**
     @file Invader.h
-    @brief Declaration of the Invader class.
+    @brief Gametype.
     @ingroup Invader
 */
@@ -50 +50 @@
     {
         public:
-            Invader(Context* context); //!< Constructor. Registers and initializes the object.
-            virtual ~Invader(); //!< Destructor. Cleans up, if initialized.
+            Invader(Context* context);
 
-            virtual void start(); //!< Starts the Invader minigame.
-            virtual void end(); ///!< Ends the Invader minigame.
-
-            //virtual void spawnPlayer(PlayerInfo* player); //!< Spawns the input player.
+            virtual void start();
+            virtual void end();
 
             void spawnEnemy();
@@ -71 +68 @@
             void levelUp(){level++;}
             void addPoints(int numPoints){point += numPoints * multiplier; b_combo = true;}
+            // checks if multiplier should be reset.
             void comboControll();
+            void init();
             int lives;
+            int multiplier;
+            bool bEndGame;
         private:
             WeakPtr<InvaderCenterPoint> center_;
             WeakPtr<InvaderShip> player;
 
-            ConsoleCommand* console_addEnemy;
             Timer enemySpawnTimer;
             Timer comboTimer;
@@ -84 +84 @@
             int point;
             bool b_combo;
-            int multiplier;
     };
 }

code/branches/invaders/src/modules/invader/InvaderCenterPoint.cc

@@ -42 +42 @@
     RegisterClass(InvaderCenterPoint);
 
-    /**
-    @brief
-        Constructor. Registers and initializes the object and checks whether the gametype is actually Invader.
-    */
     InvaderCenterPoint::InvaderCenterPoint(Context* context) : StaticEntity(context)
     {
@@ -53 +49 @@
     }
 
-    /**
-    @brief
-        Method to create a InvaderCenterPoint through XML.
-    */
     void InvaderCenterPoint::XMLPort(Element& xmlelement, XMLPort::Mode mode)
     {
         SUPER(InvaderCenterPoint, XMLPort, xmlelement, mode);
-
-//        XMLPortParam(InvaderCenterPoint, "dimension", setFieldDimension, getFieldDimension, xmlelement, mode);
-
     }
 
-    /**
-    @brief
-        Is called when the gametype has changed.
-    */
     void InvaderCenterPoint::changedGametype()
     {
@@ -77 +62 @@
     }
 
-    /**
-    @brief
-        Checks whether the gametype is Invader and if it is, sets its centerpoint.
-    */
     void InvaderCenterPoint::checkGametype()
     {

code/branches/invaders/src/modules/invader/InvaderCenterPoint.h

@@ -45 +45 @@
     {
         public:
-            InvaderCenterPoint(Context* context); //!< Constructor. Registers and initializes the object and checks whether the gametype is actually Invader.
-            virtual ~InvaderCenterPoint() {}
+            InvaderCenterPoint(Context* context); //checks whether the gametype is actually Invader.
 
-
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method to create a PongCenterpoint through XML.
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
 
             virtual void changedGametype(); //!< Is called when the gametype has changed.
         private:
-            void checkGametype(); //!< Checks whether the gametype is Pong and if it is, sets its centerpoint.
+            void checkGametype();
 
     };

code/branches/invaders/src/modules/invader/InvaderEnemy.cc

@@ -50 +50 @@
     {
         lifetime += dt;
+        // die after 5 seconds.
         if (lifetime > 5000)
-        {
             removeHealth(2000);
-        }
+
         if (player != NULL)
         {
             float newZ = 2/(pow(abs(getPosition().x - player->getPosition().x) * 0.01, 2) + 1) * (player->getPosition().z - getPosition().z);
-            // if (newZ < 0)
-            //     newZ = (-100 < newZ)?-100:newZ;
-            // else
-            //     newZ = (100 > newZ)?100:newZ;
             setVelocity(Vector3(1000 - level * 100 , 0, newZ));
         }
@@ -68 +64 @@
     inline bool InvaderEnemy::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)
     {
-        // setVelocity(Vector3(1500,0,0));
-        removeHealth(2000);
+        if(orxonox_cast<Pawn*>(otherObject))
+            removeHealth(2000);
         return false;
     }
@@ -87 +83 @@
         if (getGame())
             getGame()->addPoints(42);
-        // SUPER(InvaderEnemy, damage, damage, healthdamage, shielddamage, originator);
+        Pawn::damage(damage, healthdamage, shielddamage, originator);
     }
 }

code/branches/invaders/src/modules/invader/InvaderEnemy.h

@@ -45 +45 @@
         public:
             InvaderEnemy(Context* context);
-            // virtual ~InvaderEnemy() {}
 
             virtual void tick(float dt);

code/branches/invaders/src/modules/invader/InvaderHUDinfo.cc

@@ -47 +47 @@
     }
 
-    InvaderHUDinfo::~InvaderHUDinfo()
-    {
-    }
-
     void InvaderHUDinfo::XMLPort(Element& xmlelement, XMLPort::Mode mode)
     {
@@ -75 +71 @@
             {
                 const std::string& Level = multi_cast<std::string>(this->InvaderGame->getLevel());
-                this->setCaption(Level);
+                if (this->InvaderGame->lives <= 0)
+                {
+                    setPosition(Vector2(0.1, 0.65));
+                    this->setCaption("Game ends in 30 seconds.\nPress (e)xit / (q)uit to go to the main menu.\nTo restart press space.");
+                    setTextSize(0.05);
+                    this->InvaderGame->bEndGame = true;
+                }
+                else
+                {
+                    setTextSize(0.04);
+                    setPosition(Vector2(0.14, 0.055));
+                    this->setCaption(Level);
+                }
             }
             else if(this->bShowPoints_)
@@ -82 +90 @@
                 if (this->InvaderGame->lives <= 0)
                 {
-                    setTextSize(0.1);
-                    setPosition(Vector2(0.2, 0.5));
+                    setTextSize(0.2);
+                    setPosition(Vector2(0.1, 0.25));
+                    this->setCaption("Final score:\n" + points);
+                    this->setColour(ColourValue(1, 0, 0, 1));
                 }
-                this->setCaption(points);
+                else
+                {
+                    setTextSize(0.04);
+                    setPosition(Vector2(0.14, 0.1));
+                    this->setColour(ColourValue(1, 1, 1, 1));
+                    this->setCaption(points);
+                }
             }
             else if(this->bShowMultiplier_)
             {
-                const std::string& Multiplier = multi_cast<std::string>(this->InvaderGame->getMultiplier());
+                int mult = this->InvaderGame->getMultiplier();
+                const std::string& Multiplier = "X " + multi_cast<std::string>(mult);
                 this->setCaption(Multiplier);
+                this->setColour(ColourValue(1, 0, 0, clamp(float(mult * 0.1), 0.0f, 1.0f)));
+                this->setTextSize(clamp(float(mult * 0.1), 0.0f, 1.0f) * 0.01 + 0.04);
             }
         }

code/branches/invaders/src/modules/invader/InvaderHUDinfo.h

@@ -39 +39 @@
         public:
             InvaderHUDinfo(Context* context);
-            virtual ~InvaderHUDinfo();
 
             virtual void tick(float dt);

code/branches/invaders/src/modules/invader/InvaderPrereqs.h

@@ -21 +21 @@
  *
  *   Author:
- *      Reto Grieder
+ *      Florian Zinggeler
  *   Co-authors:
  *      ...

code/branches/invaders/src/modules/invader/InvaderShip.cc

@@ -42 +42 @@
     RegisterClass(InvaderShip);
 
-    /**
-    @brief
-        Constructor. Registers and initializes the object.
-    */
     InvaderShip::InvaderShip(Context* context) : SpaceShip(context)
     {
@@ -78 +74 @@
             if (pos.z + dist_x > 42*2.5 || pos.z + dist_x < -42*3)
                 velocity.x = 0;
-            // this->setVelocity(Vector3(1000 + velocity.y, 0, velocity.x));
             pos += Vector3(1000 + velocity.y, 0, velocity.x) * dt;
         }
 
+        // shoot!
         if (isFireing)
             ControllableEntity::fire(0);
@@ -91 +87 @@
             camera->setPosition(Vector3(-pos.z, -posforeward, 0));
             camera->setOrientation(Vector3::UNIT_Z, Degree(90));
-            // orxout() << "asbhajskjasjahg" << pos << endl;
         }
 
@@ -97 +92 @@
 
         // bring back on track!
-        // if (pos.z > 42*2.5)
-        //     pos.z = 42*2.5;
-        // else if (pos.z < -42*3)
-        //     pos.z = -42*3;
         if(pos.y != 0)
             pos.y = 0;
-            
 
         setPosition(pos);
@@ -122 +112 @@
         lastTime = 0;
         if (getGame())
-        {
             getGame()->levelUp();
-            // SmartPtr<Invader> game = orxonox_cast<Invader>(getGametype());
-            
-        }
-        //level++
     }
 
@@ -144 +129 @@
     {
         isFireing = bBoost;
+        // restart if game ended
+        if (getGame())
+            if (getGame()->bEndGame)
+                getGame()->start();
     }
     inline bool InvaderShip::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)
     {
         // orxout() << "touch!!! " << endl; //<< otherObject << " at " << contactPoint;
-
         WeakPtr<InvaderEnemy> enemy = orxonox_cast<InvaderEnemy*>(otherObject);
+        // ensure that this gets only called once per enemy.
         if (enemy != NULL && lastEnemy != enemy)
         {
             lastEnemy = enemy;
-            orxout() << "Enemy!!!! " << endl;
+
             removeHealth(20);
-            if (getHealth() <= 0)
+            if (getGame())
             {
-                orxout() << "DIED!!!! " << endl;
-                if (getGame())
-                {
-                    getGame()->costLife();
-                    // SmartPtr<Invader> game = orxonox_cast<Invader>(getGametype());
-                    
-                }
+                getGame()->multiplier = 1;
+                if (getHealth() <= 0)
+                    getGame()->costLife();                    
             }
             return false;

code/branches/invaders/src/modules/invader/InvaderShip.h

@@ -45 +45 @@
     {
         public:
-            InvaderShip(Context* context); //!< Constructor. Registers and initializes the object.
-            virtual ~InvaderShip() {}
+            InvaderShip(Context* context);
 
             virtual void tick(float dt);
 
+            // overwrite for 2d movement
             virtual void moveFrontBack(const Vector2& value);
             virtual void moveRightLeft(const Vector2& value);
 
-            virtual void boost(bool bBoost); // Starts or stops fireing
+            // Starts or stops fireing
+            virtual void boost(bool bBoost);
 
             //no rotation!
             virtual void rotateYaw(const Vector2& value){}; 
             virtual void rotatePitch(const Vector2& value){};
-            virtual void rotateRoll(const Vector2& value){};
+            //return to main menu if game has ended.
+            virtual void rotateRoll(const Vector2& value){if (getGame()) if (getGame()->bEndGame) getGame()->end();};
 
             virtual void updateLevel();
 
-            // *InvaderShip getShip(){return this;}
             virtual inline bool collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint);
         private:
-
             WeakPtr<Invader> getGame();
             WeakPtr<Invader> game;

code/branches/invaders/src/modules/invader/InvaderWeapon.cc

@@ -61 +61 @@
     void InvaderWeapon::shot()
     {
-        // orxout(internal_error) << "shotttttt" << endl;
-
         assert( this->getWeapon() && this->getWeapon()->getWeaponPack() && this->getWeapon()->getWeaponPack()->getWeaponSystem() && this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn() );
 
@@ -74 +72 @@
 
         this->computeMuzzleParameters(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getAimPosition());
-        projectile->setOrientation(Quaternion(sqrt(0.5),0,sqrt(0.5),0)); //this->getMuzzleOrientation()   Quaternion::IDENTITY
+        // only shoot in foreward direction
+        projectile->setOrientation(Quaternion(sqrt(0.5),0,sqrt(0.5),0));
         projectile->setPosition(this->getMuzzlePosition());
-        projectile->setVelocity(Vector3(1, 0, 0) * 2000); //this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getVelocity() + this->getMuzzleDirection() * this->speed_
+        // only shoot in foreward direction
+        projectile->setVelocity(Vector3(1, 0, 0) * 2000);
 
         projectile->setShooter(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn());

code/branches/invaders/src/modules/invader/InvaderWeapon.h

@@ -42 +42 @@
 namespace orxonox
 {
-
-    /**
-    @brief
-        Shoots laser beams.
-    @author
-        Hagen Seifert
-    @ingroup WeaponsHsW01s
-    */
     class _InvaderExport InvaderWeapon : public HsW01
     {