Changeset 12394

Timestamp:

May 16, 2019, 6:27:53 PM (5 years ago)

Author:

pomselj

Message:

almost done

Location:

code/branches/OrxoBlox_FS19

Files:

• data/levels/includes/OrxoBloxWeapon.oxi (modified) (1 diff)
• data/levels/orxoblox.oxw (modified) (1 diff)
• data/levels/templates/spaceshipOrxoBlox.oxt (modified) (1 diff)
• src/modules/OrxoBlox/OrxoBlox.cc (modified) (4 diffs)
• src/modules/OrxoBlox/OrxoBlox.h (modified) (2 diffs)
• src/modules/OrxoBlox/OrxoBloxStones.cc (modified) (2 diffs)
• src/modules/OrxoBlox/OrxoBloxStones.h (modified) (1 diff)
• src/modules/weapons/projectiles/BallProjectile.cc (modified) (2 diffs)
• src/modules/weapons/weaponmodes/BallGun.cc (modified) (1 diff)

code/branches/OrxoBlox_FS19/data/levels/includes/OrxoBloxWeapon.oxi

@@ -1 +1 @@
     <weaponslots>
-      <WeaponSlot position="0,0,0" />/>
+      <WeaponSlot position="0,-5,0" />/>
     </weaponslots>
     <weaponsets>

code/branches/OrxoBlox_FS19/data/levels/orxoblox.oxw

@@ -91 +91 @@
     <!-- <Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0"/> -->
     <Light type=directional position="-100, 10000, -700" direction="0.2, -1, 0" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0" />
-    <SpawnPoint team=0 position="0,-4.5,49" lookat="0,0,0" spawnclass= SpaceShip pawndesign=spaceshipOrxoBlox/>
+    <SpawnPoint team=0 position="0,-4.5,49" lookat="-10000,0,0" spawnclass= SpaceShip pawndesign=spaceshipOrxoBlox/>
 
     <!--SpawnPoint team=0 position="0,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipescort /--->

code/branches/OrxoBlox_FS19/data/levels/templates/spaceshipOrxoBlox.oxt

@@ -103 +103 @@
     </attached>
     <collisionShapes> 
-          <BoxCollisionShape position="0,0,0" halfExtents="2,2,2" /> 
+          <BoxCollisionShape position="0,0,0" halfExtents="4,4,4" /> 
     </collisionShapes> 
   </OrxoBloxStones>

code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.cc

@@ -71 +71 @@
         this->player_ = nullptr;
         level_ = 0;
+        this->counter = 0;
 
         this->setHUDTemplate("OrxoBloxHUD");
@@ -144 +145 @@
         {
 
-            level_=1;
+            level_= 1;
 
         }
@@ -213 +214 @@
 
         orxout() << "level up called" << endl;
-        this->playerScored(this->player_);// add points
+        //this->playerScored(this->player_);// add points
 
         this->createWall();
         this->activeWalls_.push_back(this->futureWall_);
-        for (int i = 0; i < this->futureWall_->getNumberOfStones(); i++) {
-            if (this->futureWall_->getStone(i) == nullptr) {
-                orxout() << "Added nullptr to std::list stones_" << endl;
-            }
-
+/*        for (int i = 0; i < this->futureWall_->getNumberOfStones(); i++) {
             this->stones_.push_back(this->futureWall_->getStone(i));
-        }
+        }*/
 
         for(OrxoBloxWall* wall : this->activeWalls_) {
+            if(wall == nullptr) {
+                continue;
+            }
             if(wall->isEmpty()) {
                 wall->destroy();
@@ -340 +340 @@
     }
   */  
+    void OrxoBlox::count() {
+        if(this->counter >= this->max_counter) {
+            this->LevelUp();
+            counter = 0;
+            return;
+        }
+        else {
+            this->counter++;
+        }
+    }
+
+
 }

code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.h

@@ -91 +91 @@
             //OrxoBloxStones* CheckForCollision(OrxoBloxBall* Ball);
             virtual void addBots(unsigned int amount) override{} //<! overwrite function in order to bypass the addbots command
+            void count();
         protected:
         private:
@@ -108 +109 @@
             WeakPtr<OrxoBloxWall> futureWall_;
             std::vector<OrxoBloxWall*> activeWalls_;
-            std::list<StrongPtr<OrxoBloxStones>> stones_; //!< A list of all stones in play.
+            std::vector<OrxoBloxStones*> stones_; //!< A list of all stones in play.
+            int counter;
+            const int max_counter = 10;
 
     };

code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxStones.cc

@@ -18 +18 @@
 
         this->size_ = 9.0f;
-        this->health_ = 1 + static_cast<unsigned int>(rnd(6.0f)); //<! random number between 0 and 7;
+        this->health_ = 1;
         this->delay_ = false;
     }
@@ -33 +33 @@
         return this->size_;
     }
+
+    bool OrxoBloxStones::collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint)
+    {
+        orxout() << "a stone should die" << endl;
+        this->destroy();
+        return true;
+    }
 }

code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxStones.h

@@ -70 +70 @@
 
             float getSize();
+            virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint) override;
                 
         private:

code/branches/OrxoBlox_FS19/src/modules/weapons/projectiles/BallProjectile.cc

@@ -60 +60 @@
         this->orxoblox_ = this->getOrxoBlox();
         this->setCollisionShapeRadius(2.5);
+        this->setDamage(1000);
 
         //setEffect("Orxonox/sparks2");
@@ -186 +187 @@
                 position.z = this-> fieldHeight_;
                 
-                orxoblox_->LevelUp();
+                //orxoblox_->LevelUp();
+                orxoblox_->count();
                 suicidal = true;
                 

code/branches/OrxoBlox_FS19/src/modules/weapons/weaponmodes/BallGun.cc

@@ -59 +59 @@
 
         this->reloadTime_ = 0.25f;
-        this->damage_ = 0.0f; //default 15
+        this->damage_ = 10000; //default 15
         this->speed_ = 100;
         this->delay_ = 100;