Changeset 10688 for code/branches/fabienHS15/src/modules/weapons
- Timestamp:
- Oct 24, 2015, 10:51:18 PM (9 years ago)
- Location:
- code/branches/fabienHS15/src/modules/weapons
- Files:
-
- 2 added
- 2 deleted
- 20 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/fabienHS15/src/modules/weapons/munitions/CMakeLists.txt
r10629 r10688 1 1 ADD_SOURCE_FILES(WEAPONS_SRC_FILES 2 ReplenishingMunition.cc3 2 LaserMunition.cc 3 LightningMunition.cc 4 4 FusionMunition.cc 5 5 RocketMunition.cc -
code/branches/fabienHS15/src/modules/weapons/munitions/FusionMunition.cc
r9667 r10688 28 28 29 29 /** 30 @file FusionMunition. h30 @file FusionMunition.cc 31 31 @brief Implementation of the FusionMunition class. 32 32 */ … … 47 47 this->magazines_ = 10; 48 48 49 this-> bUseSeparateMagazines_ = true;50 this->bStackMunition_ = false; 49 this->deployment_ = DEPLOYMENT_SEPARATE; 50 51 51 this->reloadTime_ = 1.0f; 52 52 53 53 this->bAllowMunitionRefilling_ = true; 54 54 this->bAllowMultiMunitionRemovementUnderflow_ = true; 55 56 this->reloadTime_ = 0.5f; 55 57 } 56 58 } -
code/branches/fabienHS15/src/modules/weapons/munitions/GravityBombMunition.cc
r10622 r10688 19 19 this->magazines_ = 15; 20 20 21 this->bUseSeparateMagazines_ = false; 22 this->bStackMunition_ = true; 21 this->deployment_ = DEPLOYMENT_STACK; 23 22 24 23 this->bAllowMunitionRefilling_ = true; 25 24 this->bAllowMultiMunitionRemovementUnderflow_ = false; 25 26 this->reloadTime_ = 0.0f; 26 27 } 27 28 -
code/branches/fabienHS15/src/modules/weapons/munitions/IceMunition.cc
r10629 r10688 28 28 29 29 /** 30 @file IceMunition. h30 @file IceMunition.cc 31 31 @brief Implementation of the IceMunition class. 32 32 */ … … 47 47 this->magazines_ = 25; 48 48 49 this->bUseSeparateMagazines_ = false; 50 this->bStackMunition_ = true; 49 this->deployment_ = DEPLOYMENT_STACK; 51 50 52 51 this->bAllowMunitionRefilling_ = false; 53 52 this->bAllowMultiMunitionRemovementUnderflow_ = false; 53 54 this->reloadTime_ = 0.5f; 54 55 } 55 56 } -
code/branches/fabienHS15/src/modules/weapons/munitions/LaserMunition.cc
r9667 r10688 28 28 29 29 /** 30 @file LaserMunition. h30 @file LaserMunition.cc 31 31 @brief Implementation of the LaserMunition class. 32 32 */ … … 43 43 RegisterObject(LaserMunition); 44 44 45 this->maxMunitionPerMagazine_ = 20;46 this->maxMagazines_ = 1 ;47 this->magazines_ = 1 ;45 this->maxMunitionPerMagazine_ = 10; 46 this->maxMagazines_ = 10; 47 this->magazines_ = 10; 48 48 49 this->bUseSeparateMagazines_ = false; 50 this->bStackMunition_ = true; 49 this->deployment_ = DEPLOYMENT_SEPARATE; 51 50 52 51 this->bAllowMunitionRefilling_ = true; … … 55 54 this->replenishInterval_ = 0.5f; 56 55 this->replenishMunitionAmount_ = 1; 56 57 this->reloadTime_ = 0.8f; 57 58 } 58 59 } -
code/branches/fabienHS15/src/modules/weapons/munitions/LaserMunition.h
r9667 r10688 36 36 37 37 #include "weapons/WeaponsPrereqs.h" 38 #include " ReplenishingMunition.h"38 #include "weaponsystem/ReplenishingMunition.h" 39 39 40 40 namespace orxonox -
code/branches/fabienHS15/src/modules/weapons/munitions/RocketMunition.cc
r9667 r10688 28 28 29 29 /** 30 @file RocketMunition. h30 @file RocketMunition.cc 31 31 @brief Implementation of the RocketMunition class. 32 32 */ … … 47 47 this->magazines_ = 10; 48 48 49 this->bUseSeparateMagazines_ = false; 50 this->bStackMunition_ = true; 49 this->deployment_ = DEPLOYMENT_STACK; 51 50 52 51 this->bAllowMunitionRefilling_ = false; 53 52 this->bAllowMultiMunitionRemovementUnderflow_ = false; 53 54 this->reloadTime_ = 0.5f; 54 55 } 55 56 } -
code/branches/fabienHS15/src/modules/weapons/munitions/SplitMunition.cc
r10629 r10688 28 28 29 29 /** 30 @file SplitMunition. h30 @file SplitMunition.cc 31 31 @brief Implementation of the SplitMunition class. 32 32 */ … … 47 47 this->magazines_ = 25; 48 48 49 this->bUseSeparateMagazines_ = false; 50 this->bStackMunition_ = true; 49 this->deployment_ = DEPLOYMENT_STACK; 51 50 52 51 this->bAllowMunitionRefilling_ = true; 53 52 this->bAllowMultiMunitionRemovementUnderflow_ = false; 53 54 this->reloadTime_ = 0.5f; 54 55 } 55 56 } -
code/branches/fabienHS15/src/modules/weapons/projectiles/GravityBombField.cc
r10622 r10688 164 164 if (lifetime_ <= -4) 165 165 { 166 orxout(debug_output) << "Timeout. Destroying field." << endl;167 166 this->destroy(); 168 167 } -
code/branches/fabienHS15/src/modules/weapons/weaponmodes/EnergyDrink.cc
r10622 r10688 63 63 this->delayTimer_.setTimer(1.0f, false, createExecutor(createFunctor(&EnergyDrink::shot, this))); 64 64 this->delayTimer_.stopTimer(); 65 66 hudImageString_ = "Orxonox/WSHUD_WM_EnergyDrink"; 65 67 } 66 68 -
code/branches/fabienHS15/src/modules/weapons/weaponmodes/FusionFire.cc
r10622 r10688 58 58 59 59 this->setMunitionName("FusionMunition"); 60 61 hudImageString_ = "Orxonox/WSHUD_WM_FusionFire"; 60 62 } 61 63 -
code/branches/fabienHS15/src/modules/weapons/weaponmodes/GravityBombFire.cc
r10622 r10688 31 31 this->setMunitionName("GravityBombMunition"); 32 32 this->setDefaultSoundWithVolume("sounds/Rocket_launch.ogg",0.8); ///< sets sound of the bomb as it is fired. 33 34 hudImageString_ = "Orxonox/WSHUD_WM_GravityBombFire"; 33 35 } 34 36 -
code/branches/fabienHS15/src/modules/weapons/weaponmodes/HsW01.cc
r10296 r10688 69 69 70 70 this->setDefaultSound(this->sound_); 71 72 hudImageString_ = "Orxonox/WSHUD_WM_HsW01"; 71 73 } 72 74 -
code/branches/fabienHS15/src/modules/weapons/weaponmodes/IceGun.cc
r10629 r10688 59 59 this->setFreezeFactor(0.5); 60 60 61 this->setMunitionName(" LaserMunition");61 this->setMunitionName("IceMunition"); 62 62 this->setDefaultSound("sounds/Weapon_LightningGun.ogg"); 63 64 hudImageString_ = "Orxonox/WSHUD_WM_IceGun"; 63 65 } 64 66 -
code/branches/fabienHS15/src/modules/weapons/weaponmodes/LaserFire.cc
r10622 r10688 56 56 57 57 this->setMunitionName("LaserMunition"); 58 59 hudImageString_ = "Orxonox/WSHUD_WM_LaserFire"; 58 60 } 59 61 -
code/branches/fabienHS15/src/modules/weapons/weaponmodes/LightningGun.cc
r10296 r10688 54 54 this->speed_ = 750.0f; 55 55 56 this->setMunitionName("L aserMunition");56 this->setMunitionName("LightningMunition"); 57 57 this->setDefaultSound("sounds/Weapon_LightningGun.ogg"); 58 59 hudImageString_ = "Orxonox/WSHUD_WM_LightningGun"; 58 60 } 59 61 -
code/branches/fabienHS15/src/modules/weapons/weaponmodes/RocketFire.cc
r10296 r10688 59 59 this->setMunitionName("RocketMunition"); 60 60 // The firing sound of the Rocket is played in Rocket.cc (because of OpenAl sound positioning) 61 62 hudImageString_ = "Orxonox/WSHUD_WM_RocketFire"; 61 63 } 62 64 -
code/branches/fabienHS15/src/modules/weapons/weaponmodes/RocketFireOld.cc
r10622 r10688 59 59 this->setMunitionName("RocketMunition"); 60 60 // The firing sound of the Rocket is played in Rocket.cc (because of OpenAl sound positioning) 61 62 hudImageString_ = "Orxonox/WSHUD_WM_SimpleRocketFire"; 61 63 } 62 64 -
code/branches/fabienHS15/src/modules/weapons/weaponmodes/SimpleRocketFire.cc
r9667 r10688 64 64 this->setDefaultSoundWithVolume("sounds/Rocket_launch.ogg",0.4f); 65 65 // The firing sound of the Rocket is played in Rocket.cc (because of OpenAl sound positioning) 66 67 hudImageString_ = "Orxonox/WSHUD_WM_SimpleRocketFire"; 66 68 } 67 69 … … 89 91 90 92 WorldEntity* pawn = static_cast<ControllableEntity*>(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn())->getTarget(); 91 if (pawn) controller->setTarget(pawn); 93 if (pawn) 94 controller->setTarget(pawn); 92 95 } 93 96 } -
code/branches/fabienHS15/src/modules/weapons/weaponmodes/SplitGun.cc
r10629 r10688 62 62 this->setMunitionName("SplitMunition"); 63 63 this->setDefaultSound("sounds/Weapon_LightningGun.ogg"); 64 65 hudImageString_ = "Orxonox/WSHUD_WM_SplitGun"; 64 66 } 65 67
Note: See TracChangeset
for help on using the changeset viewer.