Changeset 6065 for code/branches/particles2/src/modules/weapons/weaponmodes

Timestamp:

Nov 15, 2009, 1:15:42 PM (15 years ago)

Author:

scheusso

Message:

cleaned up Rocket mess a bit
there is yet a bug if RocketFire is in weaponslot3

Location:

code/branches/particles2/src/modules/weapons/weaponmodes

Files:

• CMakeLists.txt (modified) (1 diff)
• RocketFire.cc (copied) (copied from code/branches/particles2/src/modules/weapons/weaponmodes/FusionFire.cc) (2 diffs)
• RocketFire.h (copied) (copied from code/branches/particles2/src/modules/weapons/weaponmodes/FusionFire.h) (3 diffs)

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

@@ -5 +5 @@
   HsW01.cc
   LightningGun.cc
+  RocketFire.cc
 )

code/branches/particles2/src/modules/weapons/weaponmodes/RocketFire.cc

@@ -27 +27 @@
  */
 
-#include "FusionFire.h"
+#include "RocketFire.h"
 
 #include "util/Math.h"
 #include "core/CoreIncludes.h"
-#include "weapons/projectiles/BillboardProjectile.h"
+#include "weapons/projectiles/Rocket.h"
 
 #include "weaponsystem/Weapon.h"
@@ -39 +39 @@
 namespace orxonox
 {
-    CreateFactory(FusionFire);
+    CreateFactory(RocketFire);
 
-    FusionFire::FusionFire(BaseObject* creator) : WeaponMode(creator)
+    RocketFire::RocketFire(BaseObject* creator) : WeaponMode(creator)
     {
-        RegisterObject(FusionFire);
+        RegisterObject(RocketFire);
 
-        this->reloadTime_ = 1.0;
+        this->reloadTime_ = 0.20;
         this->bParallelReload_ = false;
-        this->damage_ = 40;
-        this->speed_ = 1250;
+        this->damage_ = 100;
+        this->speed_ = 500;
 
-        this->setMunitionName("FusionMunition");
+        this->setMunitionName("RocketMunition");
     }
 
-    void FusionFire::fire()
+    void RocketFire::fire()
     {
-        BillboardProjectile* projectile = new BillboardProjectile(this);
+        Rocket* rocket = new Rocket(this);
 
-        projectile->setOrientation(this->getMuzzleOrientation());
-        projectile->setPosition(this->getMuzzlePosition());
-        projectile->setVelocity(this->getMuzzleDirection() * this->speed_);
-        projectile->scale(5);
+        rocket->setOrientation(this->getMuzzleOrientation());
+        rocket->setPosition(this->getMuzzlePosition());
+        rocket->setVelocity(this->getMuzzleDirection() * this->speed_);
+        rocket->scale(2);
 
-        projectile->setOwner(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn());
-        projectile->setDamage(this->getDamage());
-        projectile->setColour(ColourValue(1.0f, 0.7f, 0.3f, 1.0f));
+        rocket->setOwner(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn());
+        rocket->setDamage(this->getDamage());
     }
 }

code/branches/particles2/src/modules/weapons/weaponmodes/RocketFire.h

@@ -27 +27 @@
  */
 
-#ifndef _FusionFire_H__
-#define _FusionFire_H__
+#ifndef _RocketFire_H__
+#define _RocketFire_H__
 
 #include "weapons/WeaponsPrereqs.h"
@@ -35 +35 @@
 namespace orxonox
 {
-    class _WeaponsExport FusionFire : public WeaponMode
+    class _WeaponsExport RocketFire : public WeaponMode
     {
         public:
-            FusionFire(BaseObject* creator);
-            virtual ~FusionFire() {}
+            RocketFire(BaseObject* creator);
+            virtual ~RocketFire() {}
 
             virtual void fire();
@@ -48 +48 @@
 }
 
-#endif /* _FusionFire_H__ */
+#endif /* _RocketFire_H__ */