[Orxonox-commit 6287] r10944 - in code/branches/particleEffectsHS15: data/particle src/modules/weapons/projectiles src/modules/weapons/weaponmodes
holzerj at orxonox.net
holzerj at orxonox.net
Mon Dec 7 16:01:06 CET 2015
Author: holzerj
Date: 2015-12-07 16:01:06 +0100 (Mon, 07 Dec 2015)
New Revision: 10944
Modified:
code/branches/particleEffectsHS15/data/particle/MineExpl.particle
code/branches/particleEffectsHS15/data/particle/MineExpl1.particle
code/branches/particleEffectsHS15/data/particle/MineExpl2.particle
code/branches/particleEffectsHS15/src/modules/weapons/projectiles/MineProjectile.cc
code/branches/particleEffectsHS15/src/modules/weapons/weaponmodes/MineGun.h
Log:
Polished Mine
Modified: code/branches/particleEffectsHS15/data/particle/MineExpl.particle
===================================================================
--- code/branches/particleEffectsHS15/data/particle/MineExpl.particle 2015-12-07 14:49:51 UTC (rev 10943)
+++ code/branches/particleEffectsHS15/data/particle/MineExpl.particle 2015-12-07 15:01:06 UTC (rev 10944)
@@ -41,8 +41,8 @@
emission_rate 200
velocity_min 300
velocity_max 300
- time_to_live_min 1
- time_to_live_max 2
+ time_to_live_min 2
+ time_to_live_max 2.5
duration_min 0.1
duration_max 0.1
repeat_delay_min 10
@@ -59,8 +59,8 @@
emission_rate 1250
velocity_min 300
velocity_max 300
- time_to_live_min 1
- time_to_live_max 2
+ time_to_live_min 2
+ time_to_live_max 2.5
duration_min 0.1
duration_max 0.1
repeat_delay_min 10
@@ -77,8 +77,8 @@
emission_rate 1250
velocity_min 300
velocity_max 300
- time_to_live_min 1
- time_to_live_max 2
+ time_to_live_min 2
+ time_to_live_max 2.5
duration_min 0.1
duration_max 0.1
repeat_delay_min 10
@@ -87,19 +87,7 @@
colour_range_end 0 0.333333 1 1
}
- affector DeflectorPlane
- {
- plane_point 0 -2 0
- plane_normal 0 1 0
- bounce 1
- }
-
- affector DeflectorPlane
- {
- plane_point 0 2 0
- plane_normal 0 -1 0
- bounce 1
- }
+
affector Scaler
{
rate -2
Modified: code/branches/particleEffectsHS15/data/particle/MineExpl1.particle
===================================================================
--- code/branches/particleEffectsHS15/data/particle/MineExpl1.particle 2015-12-07 14:49:51 UTC (rev 10943)
+++ code/branches/particleEffectsHS15/data/particle/MineExpl1.particle 2015-12-07 15:01:06 UTC (rev 10944)
@@ -23,12 +23,13 @@
emission_rate 2000
velocity_min 300
velocity_max 300
- time_to_live_min 1
- time_to_live_max 2
- duration_min 0.5
- duration_max 1.5
- repeat_delay_min 0.0
- repeat_delay_max 0.0
+ time_to_live_min 3
+ time_to_live_max 4
+ duration_min 2.0
+ duration_max 2.5
+ repeat_delay 10
+ repeat_delay_min 10
+ repeat_delay_max 10
colour_range_start 0 0.333333 1 1
colour_range_end 0 0.333333 1 1
}
Modified: code/branches/particleEffectsHS15/data/particle/MineExpl2.particle
===================================================================
--- code/branches/particleEffectsHS15/data/particle/MineExpl2.particle 2015-12-07 14:49:51 UTC (rev 10943)
+++ code/branches/particleEffectsHS15/data/particle/MineExpl2.particle 2015-12-07 15:01:06 UTC (rev 10944)
@@ -23,12 +23,13 @@
emission_rate 2000
velocity_min 300
velocity_max 300
- time_to_live_min 1
- time_to_live_max 2
+ time_to_live_min 2
+ time_to_live_max 2.5
duration_min 0.5
duration_max 1.5
- repeat_delay_min 0.0
- repeat_delay_max 0.0
+ repeat_delay 10
+ repeat_delay_min 10
+ repeat_delay_max 10
colour_range_start 0 0.333333 1 1
colour_range_end 0 0.333333 1 1
}
Modified: code/branches/particleEffectsHS15/src/modules/weapons/projectiles/MineProjectile.cc
===================================================================
--- code/branches/particleEffectsHS15/src/modules/weapons/projectiles/MineProjectile.cc 2015-12-07 14:49:51 UTC (rev 10943)
+++ code/branches/particleEffectsHS15/src/modules/weapons/projectiles/MineProjectile.cc 2015-12-07 15:01:06 UTC (rev 10944)
@@ -163,7 +163,7 @@
/**
@brief
- TODO
+ XMLPort for MineProjectile.
*/
void MineProjectile::XMLEventPort(Element& xmlelement, XMLPort::Mode mode)
{
@@ -173,7 +173,7 @@
/**
@brief
- TODO
+ Max Time; after this time runs out,the Mine explodes.
*/
void MineProjectile::setMaxTimeUntilExplosion(float maxTimeUntilExplosion)
{
@@ -193,7 +193,7 @@
/**
@brief
- TODO
+ The mine can only explode when the activation time has run out.
*/
void MineProjectile::setTimeUntilActivation(float timeUntilActivation)
{
@@ -207,7 +207,7 @@
/**
@brief
- TODO
+ Mine explodes, deals damage to pawn within range and destroys itself.
*/
void MineProjectile::explode()
{
@@ -233,7 +233,7 @@
/**
@brief
- TODO
+ Mine is ready to explode.
*/
void MineProjectile::allowExplosion()
{
@@ -246,10 +246,6 @@
emitter_->setSource("Orxonox/mineparticle");
}
- /**
- @brief
- TODO
- */
void MineProjectile::destructionEffect()
{
ParticleSpawner *effect1, *effect2, *effect3;
@@ -278,8 +274,8 @@
// Explosion sound effect.
WeakPtr<WorldSound> explosionSound_ = new WorldSound(getContext());
- explosionSound_->setSource("sounds/GravityFieldExplosion.ogg");
- explosionSound_->setVolume(1.0);
+ explosionSound_->setSource("sounds/minesound.ogg");
+ explosionSound_->setVolume(0.8);
explosionSound_->play();
}
}
Modified: code/branches/particleEffectsHS15/src/modules/weapons/weaponmodes/MineGun.h
===================================================================
--- code/branches/particleEffectsHS15/src/modules/weapons/weaponmodes/MineGun.h 2015-12-07 14:49:51 UTC (rev 10943)
+++ code/branches/particleEffectsHS15/src/modules/weapons/weaponmodes/MineGun.h 2015-12-07 15:01:06 UTC (rev 10944)
@@ -21,6 +21,7 @@
*
* Author:
* Fabien Vultier
+ * Jannis Holzer
* Co-authors:
* ...
*
@@ -28,7 +29,13 @@
/**
@file MineGun.h
- @brief Definition of the MineGun class.
+ @brief
+
+ Mine is a weapon that explodes if a spaceship goes bellow the mines trigger radius. The mine deals damage too all
+ spaceships within the damageradius.
+
+ The activation time regulates when the mine is live and ready to explode.
+ The mine destroys itself after it exceeds a certain life time.
*/
#ifndef _MineGun_H__
More information about the Orxonox-commit
mailing list