Changeset 12394 for code/branches/OrxoBlox_FS19/src/modules/weapons

Timestamp:

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

Author:

pomselj

Message:

almost done

Location:

code/branches/OrxoBlox_FS19/src/modules/weapons

Files:

• projectiles/BallProjectile.cc (modified) (2 diffs)
• weaponmodes/BallGun.cc (modified) (1 diff)

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;