Changeset 9874

Timestamp:

Dec 6, 2013, 3:09:30 PM (10 years ago)

Author:

zifloria

Message:

best game eva

Location:

code/branches/invaders

Files:

• data/levels/Invaders.oxw (modified) (2 diffs)
• data/levels/includes/invaderWeaponEnemy.oxi (added)
• data/levels/templates/enemyInvaderShooter.oxt (added)
• src/modules/invader/CMakeLists.txt (modified) (1 diff)
• src/modules/invader/Invader.cc (modified) (4 diffs)
• src/modules/invader/Invader.h (modified) (3 diffs)
• src/modules/invader/InvaderEnemy.cc (modified) (3 diffs)
• src/modules/invader/InvaderEnemy.h (modified) (1 diff)
• src/modules/invader/InvaderEnemyShooter.cc (added)
• src/modules/invader/InvaderEnemyShooter.h (added)
• src/modules/invader/InvaderHUDinfo.cc (modified) (1 diff)
• src/modules/invader/InvaderPrereqs.h (modified) (1 diff)
• src/modules/invader/InvaderShip.cc (modified) (3 diffs)
• src/modules/invader/InvaderShip.h (modified) (3 diffs)
• src/modules/invader/InvaderWeapon.cc (modified) (1 diff)
• src/modules/invader/InvaderWeapon.h (modified) (1 diff)
• src/modules/invader/InvaderWeaponEnemy.cc (added)
• src/modules/invader/InvaderWeaponEnemy.h (added)

code/branches/invaders/data/levels/Invaders.oxw

@@ -1 +1 @@
 <LevelInfo
  name = "Orxonox Arcade"
- description = "Arcade shooter. Maximise your points!!!"
+ description = "2D Arcade shooter. Maximise your points!!!\nTip: try to keep the multiplier high by avoiding shots and enemies."
  tags = "minigame"
  screenshot = "emptylevel.png"
 />
-<!-- include("HUDTemplates3.oxo") -->
 <?lua
   include("stats.oxo")
@@ -16 +15 @@
   include("templates/spaceshipInvader.oxt")
   include("templates/enemyInvader.oxt")
+  include("templates/enemyInvaderShooter.oxt")
   include("overlays/InvaderHUD.oxo")
 ?>

code/branches/invaders/src/modules/invader/CMakeLists.txt

@@ -5 +5 @@
   InvaderShip.cc
   InvaderEnemy.cc
+  InvaderEnemyShooter.cc
   InvaderWeapon.cc
+  InvaderWeaponEnemy.cc
   InvaderHUDinfo.cc
 END_BUILD_UNIT

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

@@ -48 +48 @@
 #include "InvaderShip.h"
 #include "InvaderEnemy.h"
+#include "InvaderEnemyShooter.h"
 
 #include "core/command/ConsoleCommand.h"
+#include "worldentities/BigExplosion.h"
 
 namespace orxonox
@@ -70 +72 @@
         level = 1;
         point = 0;
+        bShowLevel = false;
         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)));
+        // spawn enemy every 3.5 seconds
+        enemySpawnTimer.setTimer(3.5f, true, createExecutor(createFunctor(&Invader::spawnEnemy, this)));
+        comboTimer.setTimer(3.0f, true, createExecutor(createFunctor(&Invader::comboControll, this)));
     }
 
-    void Invader::spawnEnemy()
+    void Invader::levelUp()
+    {
+        level++;
+        if (getPlayer() != NULL)
+        {   
+            for (int i = 0; i < 7; i++)
+            {
+                WeakPtr<BigExplosion> chunk = new BigExplosion(this->center_->getContext());
+                chunk->setPosition(Vector3(600, 0, 100 * i - 300));
+                chunk->setVelocity(Vector3(1000, 0, 0));  //player->getVelocity()
+                chunk->setScale(20);
+            }
+        }
+        addPoints(multiplier * 42);
+        multiplier *= 2;
+        toggleShowLevel();
+        showLevelTimer.setTimer(1.0f, false, createExecutor(createFunctor(&Invader::toggleShowLevel, this)));
+    }
+
+    WeakPtr<InvaderShip> Invader::getPlayer()
     {
         if (player == NULL)
@@ -84 +106 @@
                 player = *it;
         }
-        if (player == NULL)
+        return player;
+    }
+
+    void Invader::spawnEnemy()
+    {
+        if (getPlayer() == NULL)
             return;
-
         srand(player->getPosition().x + player->getPosition().y);
-        for (int i = 0; i < level * 2; i++)
+        for (int i = 0; i < (3*log(level) + 1); i++)
         {
-            WeakPtr<InvaderEnemy> newPawn = new InvaderEnemy(this->center_->getContext());
-            newPawn->addTemplate("enemyinvader");
+            WeakPtr<InvaderEnemy> newPawn;
+            if (rand() % 42/(1 + level*level) == 0)
+            {
+                newPawn = new InvaderEnemyShooter(this->center_->getContext());
+                newPawn->addTemplate("enemyinvadershooter");
+            }
+            else
+            {
+                newPawn = new InvaderEnemy(this->center_->getContext());
+                newPawn->addTemplate("enemyinvader");
+            }
             newPawn->setPlayer(player);
             newPawn->level = level;
@@ -133 +168 @@
         Deathmatch::start();
     }
-
+    void Invader::addPoints(int numPoints)
+    {
+        if (!bEndGame)
+        {
+            point += numPoints * multiplier;
+            b_combo = true;
+        }
+    }
 
     void Invader::end()

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

@@ -66 +66 @@
 
             void costLife();
-            void levelUp(){level++;}
-            void addPoints(int numPoints){point += numPoints * multiplier; b_combo = true;}
+            void levelUp();
+            void addPoints(int numPoints);
             // checks if multiplier should be reset.
             void comboControll();
@@ -74 +74 @@
             int multiplier;
             bool bEndGame;
+            bool bShowLevel;
         private:
+            void toggleShowLevel(){bShowLevel = !bShowLevel;}
+            WeakPtr<InvaderShip> getPlayer();
             WeakPtr<InvaderCenterPoint> center_;
             WeakPtr<InvaderShip> player;
@@ -80 +83 @@
             Timer enemySpawnTimer;
             Timer comboTimer;
+            Timer showLevelTimer;
             //Context* context;
             int level;

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

@@ -34 +34 @@
 #include "invader/InvaderPrereqs.h"
 #include "InvaderEnemy.h"
-// #include "worldentities/pawns/SpaceShip.h"
+#include "InvaderShip.h"
 
 namespace orxonox
@@ -64 +64 @@
     inline bool InvaderEnemy::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)
     {
-        if(orxonox_cast<Pawn*>(otherObject))
+        if(orxonox_cast<InvaderShip*>(otherObject))
             removeHealth(2000);
         return false;
@@ -81 +81 @@
     void InvaderEnemy::damage(float damage, float healthdamage, float shielddamage, Pawn* originator)
     {
-        if (getGame())
+        Pawn::damage(damage, healthdamage, shielddamage, originator);
+        if (getGame() && orxonox_cast<InvaderShip*>(originator) != NULL && getHealth() <= 0)
             getGame()->addPoints(42);
-        Pawn::damage(damage, healthdamage, shielddamage, originator);
     }
 }

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

@@ -52 +52 @@
 
             int level;
-        private:
+        protected:
             WeakPtr<Invader> getGame();
             WeakPtr<Invader> game;

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

@@ -78 +78 @@
                     this->InvaderGame->bEndGame = true;
                 }
+                else if (this->InvaderGame->bShowLevel)
+                {
+                    setTextSize(0.1);
+                    setPosition(Vector2(0.3, 0.55));
+                    std::stringstream sstm;
+                    sstm << "Level " << Level;
+                    this->setCaption(sstm.str()); // + level
+                }
                 else
                 {

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

@@ -72 +72 @@
     class InvaderShip;
     class InvaderEnemy;
+    class InvaderEnemyShooter;
     class InvaderWeapon;
+    class InvaderWeaponEnemy;
     class InvaderHUDinfo;
 }

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

@@ -138 +138 @@
         // orxout() << "touch!!! " << endl; //<< otherObject << " at " << contactPoint;
         WeakPtr<InvaderEnemy> enemy = orxonox_cast<InvaderEnemy*>(otherObject);
+        WeakPtr<Projectile> shot = orxonox_cast<Projectile*>(otherObject);
         // ensure that this gets only called once per enemy.
         if (enemy != NULL && lastEnemy != enemy)
@@ -146 +147 @@
             if (getGame())
             {
-                getGame()->multiplier = 1;
-                if (getHealth() <= 0)
-                    getGame()->costLife();                    
+                getGame()->multiplier = 1;                   
             }
-            return false;
+        }
+        // was shot, decrease multiplier
+        else if (shot != NULL  && lastShot != shot)
+        {
+            if (getGame() && orxonox_cast<InvaderEnemy*>(shot->getShooter()) != NULL)
+            {
+                if (getGame()->multiplier > 1)
+                {
+                    lastShot = shot;
+                    getGame()->multiplier -= 1;     
+                }
+            }
         }
         return false;
@@ -165 +175 @@
         return game;
     }
+
+    void InvaderShip::death()
+    {
+        getGame()->costLife();
+        SpaceShip::death();
+    }
 }

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

@@ -39 +39 @@
 #include "worldentities/pawns/SpaceShip.h"
 #include "graphics/Camera.h"
+#include "weapons/projectiles/Projectile.h"
 
 namespace orxonox
@@ -65 +66 @@
 
             virtual inline bool collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint);
+
+        protected:
+            virtual void death();
         private:
             WeakPtr<Invader> getGame();
@@ -79 +83 @@
 
             WeakPtr<InvaderEnemy> lastEnemy;
+            WeakPtr<Projectile> lastShot;
 
     };

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

@@ -63 +63 @@
         assert( this->getWeapon() && this->getWeapon()->getWeaponPack() && this->getWeapon()->getWeaponPack()->getWeaponSystem() && this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn() );
 
-        // Create the projectile.
-        Projectile* projectile = new Projectile(this->getContext());
-        Model* model = new Model(projectile->getContext());
+        // Create the projectile.projectile
+        projectile = new Projectile(this->getContext());
+        WeakPtr<Model> model = new Model(projectile->getContext());
         model->setMeshSource(mesh_);
         model->setCastShadows(false);

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

@@ -49 +49 @@
         protected:
             virtual void shot();
+            WeakPtr<Projectile> projectile;
     };
 }