Changeset 11617 for code/branches

Timestamp:

Dec 3, 2017, 6:02:22 PM (7 years ago)

Author:

vyang

Message:

spawnEnemy und Templates für die 3 Grössen der Asteroiden geschrieben.

Location:

code/branches/Asteroid_HS17

Files:

• data/levels/Asteroids2D.oxw (modified) (1 diff)
• data/levels/templates/asteroidsAsteroids2D.oxt (modified) (1 diff)
• src/modules/asteroids2D/Asteroids2D.cc (modified) (6 diffs)
• src/modules/asteroids2D/Asteroids2D.h (modified) (2 diffs)
• src/modules/asteroids2D/Asteroids2DShip.cc (modified) (3 diffs)
• src/modules/asteroids2D/Asteroids2DShip.h (modified) (1 diff)

code/branches/Asteroid_HS17/data/levels/Asteroids2D.oxw

@@ -17 +17 @@
   include("templates/enemyInvader.oxt")
   include("overlays/Asteroids2DHUD.oxo")
+  include("templates/asteroidsAsteroids2D.oxt)
 ?>
 

code/branches/Asteroid_HS17/data/levels/templates/asteroidsAsteroids2D.oxt

@@ +1 @@
+<Template name = stone1>
+  <Asteroids2DStone
+    collisionType = dynamic
+    linearDamping = 0.8
+    angularDamping = 1
+    scale= 10
+    enablecollisiondamage = true
+
+    health            = 10
+    maxhealth         = 10
+    initialhealth     = 10
+  >
+    <attached>
+      <Model mass= 4000 mesh="ast1.mesh" />
+    </attached>
+    <collisionShapes>
+      <SphereCollisionShape radius="10" />
+    </collisionShapes>
+  </Asteroids2DStone>
+</Template>
+
+<Template name = stone2>
+  <Asteroids2DStone
+    collisionType = dynamic
+    linearDamping = 0.8
+    angularDamping = 1
+    scale= 20
+    enablecollisiondamage = true
+
+    health            = 10
+    maxhealth         = 10
+    initialhealth     = 10
+  >
+    <attached>
+      <Model mass= 8000 mesh="ast2.mesh" />
+    </attached>
+    <collisionShapes>
+      <SphereCollisionShape radius="20" />
+    </collisionShapes>
+  </Asteroids2DStone>
+</Template>
+
+<Template name = stone3>
+  <Asteroids2DStone
+    collisionType = dynamic
+    linearDamping = 0.8
+    angularDamping = 1
+    scale= 30
+    enablecollisiondamage = true
+
+    health            = 10
+    maxhealth         = 10
+    initialhealth     = 10
+  >
+    <attached>
+      <Model mass= 16000 mesh="ast3.mesh" />
+    </attached>
+    <collisionShapes>
+      <SphereCollisionShape radius="30" />
+    </collisionShapes>
+  </Asteroids2DStone>
+</Template>

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

@@ -26 +26 @@
  *
  */
+
+/*TODO: Punktesystem aufbauen -> in HUD anzeigen
+        Schwierigkeitsgrad mit jedem levelup erhöhen -> mehr Steine spawnen?
+        spawnStone Methode schreiben
+        templates für die drei Grössen von Asteroiden erstellen
 
 /**
@@ -57 +62 @@
         this->center_ = nullptr;
         this->setHUDTemplate("Asteroids2DHUD");
+        levelupTimer.setTimer(100.0f, true, createExecutor(createFunctor(&Asteroids2D::levelUp, this)));
     }
 
@@ -82 +88 @@
         toggleShowLevel();
         showLevelTimer.setTimer(1.0f, false, createExecutor(createFunctor(&Asteroids2D::toggleShowLevel, this)));
+        //Nach jedem Level Up werden mehr Steine gespawnt -> abhängig vom Schwierigkeitsgrad
+        for(int i = 0; i < level*2; i++){
+            spawnStone();
+        }
+
     }
 
     void Asteroids2D::tick(float dt)
     {
-        //Do this only for the first tick, generate stones
+        //Do this only for the first tick, generate 5 stones for the beginning
         if(this->firstTick_)
         {
@@ -105 +116 @@
         Asteroids2DStone* newStone = new Asteroids2DStone(this->center_->getContext());
         newStone->setAsteroids2DPlayer(player);
-        //addtemplate
+
+        switch(newStone->getSize()){
+            case 1:
+                newStone->addTemplate("stone1");
+                break;
+            case 2: 
+                newStone->addTemplate("stone2");
+                break;
+            case 3:
+                newStone->addTemplate("stone3");
+                break;
+            default:
+                orxout(internal_error) << "Asteroids2DStone has invalid size and cannot be created" << endl;
+                break;
+
+        }
+
 
     }
@@ -123 +150 @@
     void Asteroids2D::costLife()
     {
-        //endGameTimer.setTimer(8.0f, false, createExecutor(createFunctor(&Asteroids2D::end, this)));
-        lives = 0;
+        --lives;
+        if(live <= 0){
+            endGameTimer.setTimer(8.0f, false, createExecutor(createFunctor(&Asteroids2D::end, this)));            
+        }
     };
+    
 
     void Asteroids2D::start()
@@ -152 +182 @@
     }
 
+    //wird gerufen, falls man einen Asteroiden trifft->Aufruf durch Schiffklasse
     void Asteroids2D::addPoints(int numPoints)
     {

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

@@ -26 +26 @@
  *
  */
+
+
 
 /**
@@ -109 +111 @@
             bool b_combo, firstTick_;
 
-            Timer enemySpawnTimer;
             Timer comboTimer;
             Timer showLevelTimer;
+            Timer levelupTimer;
+            Timer endGameTimer;
 
-
-         /*
-
-            //void spawnEnemy();
-
-
-
-
-
-
-
-
-
-
-
-
-        private:
-
-
-
-
-            //Context* context;
-            */
     };
 }

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

@@ -27 +27 @@
  */
 
+/*TODO: orientation/direction of the ship must be defined
+        implement shoot function ->or switch it on?
+        switch off boosting particles in the back of the ship
+
 /**
     @file Asteroids2DShip.cc
@@ -49 +53 @@
         this->height = 646;
 
-        // not sure if has to be zero?
-        lastTimeFront = 0;
-        lastTimeLeft = 0;
-        lastTime = 0;
         timer.setTimer(3.5f, true, createExecutor(createFunctor(&Asteroids2DShip::showposition, this)));
     }
@@ -85 +85 @@
     void Asteroids2DShip::updateLevel()
     {
-        lastTime = 0;
         if (getGame())
             getGame()->levelUp();

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

@@ -87 +87 @@
             WeakPtr<Asteroids2D> game;
             WeakPtr<WorldEntity> lastEntity;
-            float lastTimeFront, lastTimeLeft, lastTime;
             struct Velocity
             {