[Orxonox-commit 5634] r10294 - in code/trunk/src: modules/overlays/hud modules/weapons/weaponmodes orxonox/controllers

[landauf at orxonox.net]

Author: landauf
Date: 2015-03-01 21:59:28 +0100 (Sun, 01 Mar 2015)
New Revision: 10294

Modified:
   code/trunk/src/modules/overlays/hud/HUDNavigation.cc
   code/trunk/src/modules/weapons/weaponmodes/EnergyDrink.cc
   code/trunk/src/modules/weapons/weaponmodes/FusionFire.cc
   code/trunk/src/modules/weapons/weaponmodes/HsW01.cc
   code/trunk/src/modules/weapons/weaponmodes/LaserFire.cc
   code/trunk/src/modules/weapons/weaponmodes/LightningGun.cc
   code/trunk/src/orxonox/controllers/ArtificialController.cc
Log:
made projectiles slower (and all have the same speed now). makes it possible to dodge a projectile

Modified: code/trunk/src/modules/overlays/hud/HUDNavigation.cc
===================================================================
--- code/trunk/src/modules/overlays/hud/HUDNavigation.cc	2015-03-01 19:59:15 UTC (rev 10293)
+++ code/trunk/src/modules/overlays/hud/HUDNavigation.cc	2015-03-01 20:59:28 UTC (rev 10294)
@@ -85,7 +85,7 @@
         this->setHealthLevelMarkerSize(0.06f);
 
         this->setDetectionLimit(10000.0f);
-        this->currentMunitionSpeed_ = 2500.0f;
+        this->currentMunitionSpeed_ = 750.0f;
 
         this->closestTarget_ = true;
         this->nextTarget_ = false;

Modified: code/trunk/src/modules/weapons/weaponmodes/EnergyDrink.cc
===================================================================
--- code/trunk/src/modules/weapons/weaponmodes/EnergyDrink.cc	2015-03-01 19:59:15 UTC (rev 10293)
+++ code/trunk/src/modules/weapons/weaponmodes/EnergyDrink.cc	2015-03-01 20:59:28 UTC (rev 10294)
@@ -56,7 +56,7 @@
 
         this->reloadTime_ = 0.25f;
         this->damage_ = 0.0f;
-        this->speed_ = 2500.0f;
+        this->speed_ = 750.0f;
         this->delay_ = 0.0f;
         this->setMunitionName("FusionMunition");
 

Modified: code/trunk/src/modules/weapons/weaponmodes/FusionFire.cc
===================================================================
--- code/trunk/src/modules/weapons/weaponmodes/FusionFire.cc	2015-03-01 19:59:15 UTC (rev 10293)
+++ code/trunk/src/modules/weapons/weaponmodes/FusionFire.cc	2015-03-01 20:59:28 UTC (rev 10294)
@@ -54,7 +54,7 @@
         this->reloadTime_ = 1.0f;
         this->bParallelReload_ = false;
         this->damage_ = 0.0f;
-        this->speed_ = 1250.0f;
+        this->speed_ = 750.0f;
 
         this->setMunitionName("FusionMunition");
     }

Modified: code/trunk/src/modules/weapons/weaponmodes/HsW01.cc
===================================================================
--- code/trunk/src/modules/weapons/weaponmodes/HsW01.cc	2015-03-01 19:59:15 UTC (rev 10293)
+++ code/trunk/src/modules/weapons/weaponmodes/HsW01.cc	2015-03-01 20:59:28 UTC (rev 10294)
@@ -57,7 +57,7 @@
 
         this->reloadTime_ = 0.25f;
         this->damage_ = 0.0f; //default 15
-        this->speed_ = 2500.0f;
+        this->speed_ = 750.0f;
         this->delay_ = 0.0f;
         this->setMunitionName("LaserMunition");
         this->mesh_ = "laserbeam.mesh";

Modified: code/trunk/src/modules/weapons/weaponmodes/LaserFire.cc
===================================================================
--- code/trunk/src/modules/weapons/weaponmodes/LaserFire.cc	2015-03-01 19:59:15 UTC (rev 10293)
+++ code/trunk/src/modules/weapons/weaponmodes/LaserFire.cc	2015-03-01 20:59:28 UTC (rev 10294)
@@ -52,7 +52,7 @@
 
         this->reloadTime_ = 0.25f;
         this->damage_ = 0.0f;
-        this->speed_ = 1250.0f;
+        this->speed_ = 750.0f;
 
         this->setMunitionName("LaserMunition");
     }

Modified: code/trunk/src/modules/weapons/weaponmodes/LightningGun.cc
===================================================================
--- code/trunk/src/modules/weapons/weaponmodes/LightningGun.cc	2015-03-01 19:59:15 UTC (rev 10293)
+++ code/trunk/src/modules/weapons/weaponmodes/LightningGun.cc	2015-03-01 20:59:28 UTC (rev 10294)
@@ -51,7 +51,7 @@
 
         this->reloadTime_ = 1.0f;
         this->damage_ = 0.0f;
-        this->speed_ = 700.0f;
+        this->speed_ = 750.0f;
 
         this->setMunitionName("LaserMunition");
         this->setDefaultSound("sounds/Weapon_LightningGun.ogg");

Modified: code/trunk/src/orxonox/controllers/ArtificialController.cc
===================================================================
--- code/trunk/src/orxonox/controllers/ArtificialController.cc	2015-03-01 19:59:15 UTC (rev 10293)
+++ code/trunk/src/orxonox/controllers/ArtificialController.cc	2015-03-01 20:59:28 UTC (rev 10294)
@@ -91,7 +91,7 @@
         if (!this->target_ || !this->getControllableEntity())
             return;
 
-        static const float hardcoded_projectile_speed = 2500;
+        static const float hardcoded_projectile_speed = 750;
 
         this->targetPosition_ = getPredictedPosition(this->getControllableEntity()->getWorldPosition(), hardcoded_projectile_speed, this->target_->getWorldPosition(), this->target_->getVelocity());
         this->bHasTargetPosition_ = (this->targetPosition_ != Vector3::ZERO);