Changeset 11666 for code

Timestamp:

Dec 12, 2017, 5:43:22 PM (7 years ago)

Author:

vyang

Message:

damage Funktion der Steine ueberschrieben → Sie koennen sich teilen

Location:

code/branches/Asteroid_HS17/src/modules/asteroids2D

Files:

• Asteroids2DShip.cc (modified) (1 diff)
• Asteroids2DStone.cc (modified) (2 diffs)
• Asteroids2DStone.h (modified) (1 diff)

code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2DShip.cc

@@ -85 +85 @@
 
 
-
-        //shoot?
+        //if you hit an asteroid, the ship will turn -> you need to reorientate the ship 
+        Quaternion ort = this->getOrientation();
+        ort.x = 0;
+        ort.z = 0;
+        this->setOrientation(ort);
     }
 

code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2DStone.cc

@@ -120 +120 @@
     }
 
+    void Asteroids2DStone::damage(float damage, float healthdamage, float shielddamage, Pawn* originator, const btCollisionShape* cs)
+    {
+        split();
+        //Pawn::damage(damage, healthdamage, shielddamage, originator, cs);
+        if (getGame() && orxonox_cast<Asteroids2DShip*>(originator) != nullptr && getHealth() <= 0)
+            getGame()->addPoints(3*42);
+    }
+
+    Asteroids2D* Asteroids2DStone::getGame()
+    {
+        if (game == nullptr)
+        {
+            for (Asteroids2D* asteroids : ObjectList<Asteroids2D>())
+                game = asteroids;
+        }
+        return game;
+    }
+
     void Asteroids2DStone::split()
     {
         orxout() << "split" << endl;
-        if(size == 1)
+        if(size == 3)
         {
-            this->death();
+            Asteroids2DStone* newStone1 = new Asteroids2DStone(this->getContext(), 2, this->getPosition());
+            newStone1->addTemplate("stone2");
+            Asteroids2DStone* newStone2 = new Asteroids2DStone(this->getContext(), 2, this->getPosition());
+            newStone2->addTemplate("stone2");
 
         }else if(size == 2){
@@ -135 +156 @@
             Asteroids2DStone* newStone2 = new Asteroids2DStone(this->getContext(), 1, this->getPosition());
             newStone2->addTemplate("stone1");
-            
-        }else{
-            Asteroids2DStone* newStone1 = new Asteroids2DStone(this->getContext(), 2, this->getPosition());
-            newStone1->addTemplate("stone1");
-            Asteroids2DStone* newStone2 = new Asteroids2DStone(this->getContext(), 2, this->getPosition());
-            newStone2->addTemplate("stone1");
-        }
+        }   
+        this->death();
     }
 

code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2DStone.h

@@ -57 +57 @@
             virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint) override;
             virtual void split();
+            virtual void damage(float damage, float healthdamage, float shielddamage, Pawn* originator, const btCollisionShape* cs) override;
 
        private:
+          Asteroids2D* getGame();
+          WeakPtr<Asteroids2D> game;
           WeakPtr<Asteroids2DShip> player;          
                 int size;                               // three sizes, 3-> two 2s, 2-> two 1s, 1-> die