Changeset 9998 in orxonox.OLD for branches/playability/src/world_entities/weapons

Timestamp:

Dec 3, 2006, 7:40:07 PM (17 years ago)

Author:

marcscha

Message:

multiple weapons, crosshair visibility → changelog

Location:

branches/playability/src/world_entities/weapons

Files:

• heavy_blaster.cc (modified) (2 diffs)
• heavy_blaster.h (modified) (1 diff)
• light_blaster.cc (modified) (1 diff)
• medium_blaster.cc (modified) (2 diffs)
• medium_blaster.h (modified) (1 diff)
• weapon.cc (modified) (1 diff)
• weapon_manager.cc (modified) (4 diffs)
• weapon_manager.h (modified) (1 diff)

branches/playability/src/world_entities/weapons/heavy_blaster.cc

@@ -51 +51 @@
   
 
-  this->setStateDuration(WS_SHOOTING, 0.5);
+  this->setStateDuration(WS_SHOOTING, 0.5);   // 2 Schuss pro Sekunde
   this->setStateDuration(WS_RELOADING, 0);
   this->setStateDuration(WS_ACTIVATING, .5);
   this->setStateDuration(WS_DEACTIVATING, 1);
 
-  this->setEnergyMax(5000);
-  this->increaseEnergy(5000);
+  this->setEnergyMax(500);
+  this->increaseEnergy(500);
   //this->minCharge = 2;
 
@@ -66 +66 @@
   this->setCapability(WTYPE_ALLDIRS | WTYPE_DIRECTIONAL | WTYPE_LIGHT);
   this->setProjectileTypeC("HBolt");   // FIXME temp project type until the blaste class exist
-  this->prepareProjectiles(100);
+  this->prepareProjectiles(5);
 
   Animation3D* animation2 = this->getAnimation(WS_ACTIVATING, this);

branches/playability/src/world_entities/weapons/heavy_blaster.h

@@ -8 +8 @@
  *      @author Marc Schaerer <marcscha@ee.ethz.ch>
  *  
- *  Light Blaster class
+ *  Heavy Blaster class
  */
 class HeavyBlaster : public Weapon

branches/playability/src/world_entities/weapons/light_blaster.cc

@@ -44 +44 @@
 void LightBlaster::init()
 {
-  //this->registerObject(this, LightBlaster::_objectList);
-
-//  this->model = (Model*)ResourceManager::getInstance()->load("models/guns/test_gun.obj", OBJ, RP_CAMPAIGN);
 
   this->loadModel("models/guns/plasmadriver_#.obj", 1.0);
   
 
-  this->setStateDuration(WS_SHOOTING, 0.05);
+  this->setStateDuration(WS_SHOOTING, 0.05);  // 20 Schuss pro Sekunde
   this->setStateDuration(WS_RELOADING, 0);
   this->setStateDuration(WS_ACTIVATING, .5);
   this->setStateDuration(WS_DEACTIVATING, 1);
 
-  this->setEnergyMax(5000);
-  this->increaseEnergy(5000);
+  this->setEnergyMax(500);
+  this->increaseEnergy(500);
   //this->minCharge = 2;
 

branches/playability/src/world_entities/weapons/medium_blaster.cc

@@ -51 +51 @@
   
 
-  this->setStateDuration(WS_SHOOTING, 0.2);
+  this->setStateDuration(WS_SHOOTING, 0.1);   // 10 Schuss pro Sekunde
+
   this->setStateDuration(WS_RELOADING, 0);
   this->setStateDuration(WS_ACTIVATING, .5);
   this->setStateDuration(WS_DEACTIVATING, 1);
 
-  this->setEnergyMax(5000);
-  this->increaseEnergy(5000);
+  this->setEnergyMax(500);
+  this->increaseEnergy(500);
   //this->minCharge = 2;
 
@@ -65 +66 @@
 
   this->setCapability(WTYPE_ALLDIRS | WTYPE_DIRECTIONAL | WTYPE_LIGHT);
-  this->setProjectileTypeC("RailProjectile");   // FIXME temp project type until the blaste class exist
-  this->prepareProjectiles(100);
+  this->setProjectileTypeC("MBolt");   // FIXME temp project type until the blaste class exist
+  this->prepareProjectiles(20);
 
   Animation3D* animation2 = this->getAnimation(WS_ACTIVATING, this);

branches/playability/src/world_entities/weapons/medium_blaster.h

@@ -8 +8 @@
  *      @author Marc Schaerer <marcscha@ee.ethz.ch>
  *  
- *  Light Blaster class
+ *  Medium Blaster class
  */
 class MediumBlaster : public Weapon

branches/playability/src/world_entities/weapons/weapon.cc

@@ -541 +541 @@
       unlikely(this->energy + this->ammoContainer->getStoredEnergy() < this->minCharge))
   {
-    this->requestAction(WA_DEACTIVATE);
+    //this->requestAction(WA_DEACTIVATE);
     this->execute();
     return false;

branches/playability/src/world_entities/weapons/weapon_manager.cc

@@ -103 +103 @@
 
   this->currentConfigID = 0;
-  this->slotCount = 6;
+  this->slotCount = WM_MAX_SLOTS;
   //this->weaponChange;
 
@@ -114 +114 @@
   this->crossHairSizeAnim->addKeyFrame(100, .05, ANIM_LINEAR);
   this->crossHairSizeAnim->addKeyFrame(50, .01, ANIM_LINEAR);
+
+  this->hideCrosshair();
+}
+
+void WeaponManager::showCrosshair()
+{
+  this->crosshair->setVisibility( true);
+}
+
+void WeaponManager::hideCrosshair()
+{
+  this->crosshair->setVisibility( false);
 }
 
@@ -300 +312 @@
     if (this->parentEntity->isA(Playable::staticClassID()))
       dynamic_cast<Playable*>(this->parentEntity)->weaponConfigChanged();
+    
     weapon->setDefaultTarget(this->crosshair);
   }
@@ -416 +429 @@
           if( firingWeapon != NULL) firingWeapon->requestAction(WA_SHOOT);
   }
-  this->crosshair->setRotationSpeed(500);
-  this->crossHairSizeAnim->replay();
+
+  /*
+  if( this->crosshair != NULL)
+  {
+        this->crosshair->setRotationSpeed(500);
+        this->crossHairSizeAnim->replay();
+  } */
 }
 

branches/playability/src/world_entities/weapons/weapon_manager.h

@@ -59 +59 @@
     virtual void loadParams(const TiXmlElement* root);
     void loadWeapons(const TiXmlElement* root);
+
+    void showCrosshair();
+    void hideCrosshair();
 
     void setSlotCount(unsigned int slotCount);