- Timestamp:
- Apr 20, 2012, 4:06:09 PM (13 years ago)
- Location:
- code/branches/pickup2012
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/pickup2012/data/levels/templates/pickupRepresentationTemplates.oxt
r8706 r9099 214 214 </spawner-representation> 215 215 </PickupRepresentation> 216 </Template> 217 218 <!-- DamageBoost pickups --> 219 220 <Template name=normaldamageboostpickupRepresentation> 221 <PickupRepresentation> 222 <spawner-representation> 223 <StaticEntity> 224 <attached> 225 <Billboard position="0,0,0" colour="0.99,0.96,0.52" material="Sphere2" scale=0.5> 226 <attached> 227 <Billboard position="0,0,0" colour="0.98,0.94,0.22" material="asterisk" scale=0.5 /> 228 </attached> 229 </Billboard> 230 </attached> 231 </StaticEntity> 232 </spawner-representation> 233 </PickupRepresentation> 234 </Template> 235 236 <Template name=smallspeedpickup> 237 <SpeedPickup 238 duration = 10.0 239 damageBoost = damageBoost*2 240 activationType = "immediate" 241 durationType = "continuous" 242 /> 216 243 </Template> 217 244 -
code/branches/pickup2012/src/modules/pickup/PickupPrereqs.h
r8706 r9099 86 86 class ShieldPickup; 87 87 class ShrinkPickup; 88 88 class DamageBoostPickup; 89 89 } 90 90 -
code/branches/pickup2012/src/modules/pickup/items/CMakeLists.txt
r8706 r9099 7 7 ShieldPickup.cc 8 8 ShrinkPickup.cc 9 DamageBoostPickup.cc 9 10 ) -
code/branches/pickup2012/src/orxonox/worldentities/pawns/Pawn.cc
r9016 r9099 75 75 this->lastHitOriginator_ = 0; 76 76 77 // set damage multiplier to default value 1, meaning nominal damage 78 this->damageMultiplier_ = 1; 79 77 80 this->spawnparticleduration_ = 3.0f; 78 81 … … 228 231 void Pawn::damage(float damage, float healthdamage, float shielddamage, Pawn* originator) 229 232 { 230 if (this->getGametype() && this->getGametype()->allowPawnDamage(this, originator)) 233 // apply multiplier 234 damage *= originator->getDamageMultiplier(); 235 236 if (this->getGametype() && this->getGametype()->allowPawnDamage(this, originator)) 231 237 { 232 238 if (shielddamage >= this->getShieldHealth()) -
code/branches/pickup2012/src/orxonox/worldentities/pawns/Pawn.h
r9016 r9099 162 162 { return this->numexplosionchunks_; } 163 163 164 // not that beautiful yet 165 inline void setDamageMultiplier(float multiplier) 166 { this->damageMultiplier_ = multiplier; } 167 inline float getDamageMultiplier() 168 { return this->damageMultiplier_; } 169 170 164 171 virtual void startLocalHumanControl(); 165 172 … … 208 215 float reloadWaitCountdown_; 209 216 217 // modifiers 218 float damageMultiplier_; 219 210 220 WeakPtr<Pawn> lastHitOriginator_; 211 221
Note: See TracChangeset
for help on using the changeset viewer.