Changeset 10649 in orxonox.OLD
- Timestamp:
- May 8, 2007, 10:50:21 PM (17 years ago)
- Location:
- branches/vs-enhencements/src/world_entities
- Files:
-
- 2 added
- 16 edited
-
WorldEntities.am (modified) (2 diffs)
-
projectiles/acid_splash.cc (modified) (1 diff)
-
projectiles/hbolt.cc (modified) (2 diffs)
-
projectiles/laser.cc (modified) (1 diff)
-
projectiles/lbolt.cc (modified) (1 diff)
-
projectiles/mbolt.cc (modified) (1 diff)
-
projectiles/nadion_blast.cc (added)
-
projectiles/nadion_blast.h (added)
-
projectiles/plasma_pulse.cc (modified) (2 diffs)
-
projectiles/rail_projectile.cc (modified) (1 diff)
-
projectiles/spike.cc (modified) (1 diff)
-
projectiles/spike_ball.cc (modified) (1 diff)
-
projectiles/swarm_projectile.cc (modified) (1 diff)
-
weapons/disruptor.cc (modified) (1 diff)
-
weapons/light_blaster.cc (modified) (1 diff)
-
weapons/medium_blaster.cc (modified) (1 diff)
-
weapons/nadion_laser.cc (modified) (2 diffs)
-
weapons/rf_cannon.cc (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
branches/vs-enhencements/src/world_entities/WorldEntities.am
r10648 r10649 52 52 world_entities/projectiles/acid_splash.cc \ 53 53 world_entities/projectiles/plasma_pulse.cc \ 54 world_entities/projectiles/nadion_blast.cc \ 54 55 \ 55 56 world_entities/projectiles/projectile_weapon.cc \ … … 208 209 projectiles/acid_splash.h \ 209 210 projectiles/plasma_pulse.h \ 211 projectiles/nadion_blast.h \ 210 212 \ 211 213 projectiles/projectile_weapon.h \ -
branches/vs-enhencements/src/world_entities/projectiles/acid_splash.cc
r10511 r10649 116 116 this->toList(OM_NULL); 117 117 //this->toList(OM_DEAD); 118 this->removeNode();119 118 // this->removeNode(); 119 120 120 AcidSplash::fastFactory->kill(this); 121 121 } -
branches/vs-enhencements/src/world_entities/projectiles/hbolt.cc
r10645 r10649 46 46 this->setMinEnergy(10); 47 47 this->setHealthMax(0); 48 this->lifeSpan = 2.0;48 this->lifeSpan = 3.0; 49 49 50 50 this->angle = 0; … … 116 116 117 117 this->toList(OM_DEAD); 118 this->removeNode();118 // this->removeNode(); 119 119 HBolt::fastFactory->kill(this); 120 120 -
branches/vs-enhencements/src/world_entities/projectiles/laser.cc
r10114 r10649 100 100 101 101 this->toList(OM_NULL); 102 this->removeNode();102 // this->removeNode(); 103 103 Laser::fastFactory->kill(this); 104 104 } -
branches/vs-enhencements/src/world_entities/projectiles/lbolt.cc
r10645 r10649 121 121 122 122 this->toList(OM_DEAD); 123 this->removeNode();123 // this->removeNode(); 124 124 LBolt::fastFactory->kill(this); 125 125 } -
branches/vs-enhencements/src/world_entities/projectiles/mbolt.cc
r10635 r10649 145 145 this->toList(OM_NULL); 146 146 //this->toList(OM_DEAD); 147 this->removeNode();147 // this->removeNode(); 148 148 MBolt::fastFactory->kill(this); 149 149 } -
branches/vs-enhencements/src/world_entities/projectiles/plasma_pulse.cc
r10648 r10649 39 39 this->setMinEnergy(1); 40 40 this->setHealthMax(0); 41 this->lifeSpan = 3.0;41 this->lifeSpan = 2.0; 42 42 43 43 this->grid = new Billboard(); … … 83 83 this->lifeCycle = 0.0; 84 84 this->toList(OM_NULL); 85 this->removeNode();85 // this->removeNode(); 86 86 87 87 PlasmaPulse::fastFactory->kill(this); -
branches/vs-enhencements/src/world_entities/projectiles/rail_projectile.cc
r10114 r10649 99 99 100 100 this->toList(OM_NULL); 101 this->removeNode();101 // this->removeNode(); 102 102 RailProjectile::fastFactory->kill(this); 103 103 } -
branches/vs-enhencements/src/world_entities/projectiles/spike.cc
r10368 r10649 111 111 112 112 this->toList(OM_NULL); 113 this->removeNode();113 // this->removeNode(); 114 114 Spike::fastFactory->kill(this); 115 115 } -
branches/vs-enhencements/src/world_entities/projectiles/spike_ball.cc
r10511 r10649 149 149 150 150 this->toList(OM_NULL); 151 this->removeNode();151 // this->removeNode(); 152 152 SpikeBall::fastFactory->kill(this); 153 153 } -
branches/vs-enhencements/src/world_entities/projectiles/swarm_projectile.cc
r10618 r10649 134 134 135 135 this->toList(OM_DEAD); 136 this->removeNode();136 // this->removeNode(); 137 137 SwarmProjectile::fastFactory->kill(this); 138 138 } -
branches/vs-enhencements/src/world_entities/weapons/disruptor.cc
r10648 r10649 113 113 this->setCapability(WTYPE_ALLDIRS | WTYPE_DIRECTIONAL | WTYPE_LIGHT); 114 114 this->setProjectileTypeC("HBolt"); 115 this->prepareProjectiles( 5);115 this->prepareProjectiles(10); 116 116 117 117 this->setBarrels(1); -
branches/vs-enhencements/src/world_entities/weapons/light_blaster.cc
r10648 r10649 90 90 this->setCapability(WTYPE_ALLDIRS | WTYPE_DIRECTIONAL | WTYPE_LIGHT); 91 91 this->setProjectileTypeC("LBolt"); 92 this->prepareProjectiles( 100);92 this->prepareProjectiles(25); 93 93 94 94 this->setBarrels(3); -
branches/vs-enhencements/src/world_entities/weapons/medium_blaster.cc
r10648 r10649 89 89 this->setCapability(WTYPE_ALLDIRS | WTYPE_DIRECTIONAL | WTYPE_LIGHT); 90 90 this->setProjectileTypeC("MBolt"); 91 this->prepareProjectiles(10 0);91 this->prepareProjectiles(10); 92 92 93 93 -
branches/vs-enhencements/src/world_entities/weapons/nadion_laser.cc
r10648 r10649 76 76 77 77 this->setStateDuration(WS_RELOADING, 0); 78 this->setStateDuration(WS_ACTIVATING, .5); //.5);79 this->setStateDuration(WS_DEACTIVATING, 1); // 1);78 this->setStateDuration(WS_ACTIVATING, .5); 79 this->setStateDuration(WS_DEACTIVATING, 1); 80 80 81 81 this->setEnergyMax(500); … … 88 88 89 89 this->setCapability(WTYPE_ALLDIRS | WTYPE_DIRECTIONAL | WTYPE_LIGHT); 90 this->setProjectileTypeC(" MBolt"); // FIXME temp projectile, until nadion_laser_bolt exists.91 this->prepareProjectiles( 100);90 this->setProjectileTypeC("NadionBlast"); // FIXME temp projectile, until nadion_laser_bolt exists. 91 this->prepareProjectiles(20); 92 92 93 93 -
branches/vs-enhencements/src/world_entities/weapons/rf_cannon.cc
r10648 r10649 85 85 this->setCapability(WTYPE_ALLDIRS | WTYPE_DIRECTIONAL | WTYPE_LIGHT); 86 86 this->setProjectileTypeC("PlasmaPulse"); 87 this->prepareProjectiles( 100);87 this->prepareProjectiles(25); 88 88 89 89 this->setBarrels(4);
Note: See TracChangeset
for help on using the changeset viewer.
