Changeset 10592 for code/branches/towerdefenseFabien/src

Timestamp:

Sep 24, 2015, 1:23:47 PM (9 years ago)

Author:

fvultier

Message:

New Weapon for the towerDefense minigame: The SplitGun, a weapon that shoots one projectile that splits up into multiple projectiles after a specified time, these new projectiles may split up again… The weapon may be used by any Oxonox Spaceship.

Location:

code/branches/towerdefenseFabien/src/modules

Files:

• towerdefense/TowerDefense.cc (modified) (4 diffs)
• weapons/WeaponsPrereqs.h (modified) (2 diffs)
• weapons/projectiles/BillboardProjectile.cc (modified) (1 diff)
• weapons/projectiles/BillboardProjectile.h (modified) (1 diff)
• weapons/projectiles/CMakeLists.txt (modified) (1 diff)
• weapons/projectiles/SplitGunProjectile.cc (added)
• weapons/projectiles/SplitGunProjectile.h (added)
• weapons/weaponmodes/CMakeLists.txt (modified) (1 diff)
• weapons/weaponmodes/SplitGun.cc (added)
• weapons/weaponmodes/SplitGun.h (added)

code/branches/towerdefenseFabien/src/modules/towerdefense/TowerDefense.cc

@@ -81 +81 @@
 #include "chat/ChatManager.h"
 #include "core/CoreIncludes.h"
-/* Part of a temporary hack to allow the player to add towers */
-#include "core/command/ConsoleCommand.h"
-
 
 namespace orxonox
@@ -103 +100 @@
         this->waveSize_ = 0;
         offset_ = Vector3(0,0,10);
-
-        //this->stats_ = new TowerDefensePlayerStats();
     }
 
@@ -178 +173 @@
 
         en1->setTeam(2);
-
-        //orxonox::WeakPtr<WaypointController> controller = new WaypointController(this->center_->getContext());
-        //controller->setControllableEntity(en1);
-        //en1->setController(controller);
 
         WaypointController* controller = (WaypointController*)(en1->getXMLController());
@@ -340 +331 @@
             timeSinceLastSpawn_ = 0.0;
 
-            timeUntilNextWave_ = waveNumber_+10;
+            timeUntilNextWave_ = waveNumber_+20;
             waveSize_ = waveNumber_+5;
         }

code/branches/towerdefenseFabien/src/modules/weapons/WeaponsPrereqs.h

@@ -79 +79 @@
     class BillboardProjectile;
     class LightningGunProjectile;
+    class SplitGunProjectile;
     class ParticleProjectile;
     class Projectile;
@@ -90 +91 @@
     class LaserFire;
     class LightningGun;
+    class SplitGun;
     class RocketFire;
     class SimpleRocketFire;

code/branches/towerdefenseFabien/src/modules/weapons/projectiles/BillboardProjectile.cc

@@ -88 +88 @@
     /**
     @brief
+        Get the material of the BillboardProjectile.
+    @return
+        The material name.
+    */
+    const std::string& BillboardProjectile::getMaterial()
+    {
+        return this->billboard_.getMaterial();
+    }
+
+    /**
+    @brief
         Is called when the visibility of the BillboardProjectile has changed.
     */

code/branches/towerdefenseFabien/src/modules/weapons/projectiles/BillboardProjectile.h

@@ -60 +60 @@
             virtual void setColour(const ColourValue& colour);
             virtual void setMaterial(const std::string& material);
+            virtual const std::string& getMaterial();
             virtual void changedVisibility();
 

code/branches/towerdefenseFabien/src/modules/weapons/projectiles/CMakeLists.txt

@@ -5 +5 @@
   Projectile.cc
   LightningGunProjectile.cc
+  SplitGunProjectile.cc
   Rocket.cc
   SimpleRocket.cc
+  SplitGunProjectile.cc
 )

code/branches/towerdefenseFabien/src/modules/weapons/weaponmodes/CMakeLists.txt

@@ -5 +5 @@
   HsW01.cc
   LightningGun.cc
+  SplitGun.cc
   RocketFire.cc
   SimpleRocketFire.cc