Changeset 9854 for code/branches/invaders

Timestamp:

Dec 2, 2013, 3:53:08 PM (11 years ago)

Author:

zifloria

Message:

yeaHHH

Location:

code/branches/invaders

Files:

• data/levels/templates/enemyInvader.oxt (modified) (2 diffs)
• data/overlays/InvaderHUD.oxo (modified) (1 diff)
• src/modules/invader/Invader.cc (modified) (1 diff)
• src/modules/invader/Invader.h (modified) (1 diff)
• src/modules/invader/InvaderEnemy.cc (modified) (2 diffs)
• src/modules/invader/InvaderEnemy.h (modified) (1 diff)
• src/modules/invader/InvaderHUDinfo.cc (modified) (3 diffs)
• src/modules/invader/InvaderHUDinfo.h (modified) (2 diffs)

code/branches/invaders/data/levels/templates/enemyInvader.oxt

@@ -7 +7 @@
    explosionchunks        = 4
 
-   health            = 1
-   maxhealth         = 1
-   initialhealth     = 1
+   health            = 100
+   maxhealth         = 100
+   initialhealth     = 100
 
    shieldhealth        = 35
@@ -46 +46 @@
     </engines>
     <attached>
-      <Model position="0,0,0" yaw=90 pitch=0 roll=0 scale=8 mesh="escortShip.mesh" />
-      <Model position="0,0,0" yaw=180 pitch=90 roll=0 scale=8 mesh="escortWeapon.mesh" />
+      <Model position="0,0,0" yaw=180 pitch=270 roll=0 scale=2 mesh="swallow_mat.mesh" />
+      <Model position="0,0,0" yaw=180 pitch=270 roll=0 scale=2 mesh="escortWeapon.mesh" />
 <!--Model mesh="cube.mesh" mass=10 position="0,0,3" scale3D="10,4,8" />
+
+swallow_mat.mesh
+"ghost.mesh"
+
 <Model mesh="cube.mesh" mass=10 position="12.6,-2,3" scale3D="2.8,2.8,11" />
 <Model mesh="cube.mesh" mass=10 position="-12.6,-2,3" scale3D="2.8,2.8,11" />

code/branches/invaders/data/overlays/InvaderHUD.oxo

@@ -68 +68 @@
      showpoints     = true
     />
+
+
+    <OverlayText
+     position  = "0.4, 0.1"
+     pickpoint = "0.0, 0.0"
+     font      = "ShareTechMono"
+     textsize  = 0.04
+     colour    = "1.0, 1.0, 1.0, 1.0"
+     align     = "left"
+     caption   = "X"
+    />
+    <InvaderHUDinfo
+     position  = "0.42, 0.1"
+     pickpoint = "0.0, 0.0"
+     font      = "ShareTechMono"
+     textsize  = 0.04
+     colour    = "1.0, 1.0, 1.0, 1.0"
+     align     = "left"
+
+     showMultiplier = true
+    />
   </OverlayGroup>
 </Template>

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

@@ -87 +87 @@
             return;
 
-        for (int i = 0; i < level; i++)
+        srand(player->getPosition().x + player->getPosition().y);
+        for (int i = 0; i < level * 2; i++)
         {
-            SmartPtr<InvaderEnemy> newPawn = new InvaderEnemy(this->center_->getContext());
+            WeakPtr<InvaderEnemy> newPawn = new InvaderEnemy(this->center_->getContext());
             newPawn->addTemplate("enemyinvader");
-            newPawn->setPosition(player->getPosition() + Vector3(500 + 100 * i, 0, 0));
+            newPawn->setPlayer(player);
+            newPawn->level = level;
+            newPawn->setPosition(player->getPosition() + Vector3(500 + 100 * i, 0, float(rand())/RAND_MAX * 400 - 200));
         }
     }

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

@@ -66 +66 @@
             int getLevel(){return this->level;}
             int getPoints(){return this->point;}
+            int getMultiplier(){return this->multiplier;}
 
             void costLife(){lives--; if (lives <= 0) end();};

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

@@ -44 +44 @@
         RegisterObject(InvaderEnemy);
         enableCollisionCallback();
+        lifetime = 0;
     }
 
     void InvaderEnemy::tick(float dt)
     {
-        setVelocity(Vector3(500 ,0, 0));
+        lifetime += dt;
+        if (lifetime > 5000)
+        {
+            removeHealth(2000);
+        }
+        if (player != NULL)
+        {
+            float newZ = 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));
+        }
         SUPER(InvaderEnemy, tick, dt);
     }
@@ -54 +68 @@
     inline bool InvaderEnemy::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)
     {
-        setVelocity(Vector3(900,0,0));
+        setVelocity(Vector3(1000,0,0));
         removeHealth(2000);
         return false;

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

@@ -50 +50 @@
             virtual bool collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint);
             virtual void damage(float damage, float healthdamage, float shielddamage, Pawn* originator);
+            virtual void setPlayer(WeakPtr<InvaderShip> player){this->player = player;}
 
+            int level;
         private:
             WeakPtr<Invader> getGame();
             WeakPtr<Invader> game;
+            WeakPtr<InvaderShip> player;
             Camera* camera;
             bool isFireing;
             float speed, damping;
             float lastTimeFront, lastTimeLeft;
+            float lifetime;
             struct Velocity
             {

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

@@ -44 +44 @@
         this->bShowLevel_ = false;
         this->bShowPoints_ = false;
+        this->bShowMultiplier_ = false;
     }
 
@@ -57 +58 @@
         XMLPortParam(InvaderHUDinfo, "showPoints",     setShowPoints,     getShowPoints,     xmlelement, mode).defaultValues(false);
         XMLPortParam(InvaderHUDinfo, "showLevel",     setShowLevel,     getShowLevel,     xmlelement, mode).defaultValues(false);
+        XMLPortParam(InvaderHUDinfo, "showMultiplier",     setShowMultiplier,     getShowMultiplier,     xmlelement, mode).defaultValues(false);
     }
 
@@ -80 +82 @@
                 this->setCaption(points);
             }
+            else if(this->bShowMultiplier_)
+            {
+                const std::string& Multiplier = multi_cast<std::string>(this->InvaderGame->getMultiplier());
+                this->setCaption(Multiplier);
+            }
         }
     }

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

@@ -60 +60 @@
                 { return this->bShowPoints_; }
 
+            inline void setShowMultiplier(bool value)
+                { this->bShowMultiplier_ = value; }
+            inline bool getShowMultiplier() const
+                { return this->bShowMultiplier_; }
+
+
         private:
             Invader* InvaderGame;
@@ -65 +71 @@
             bool bShowLevel_;
             bool bShowPoints_;
+            bool bShowMultiplier_;
     };
 }