[colobot] 165/390: Fixed amount of fireball damage done to allies, close issue #356

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch upstream/latest
in repository colobot.

commit 3ffc08a7f947d4ac36c054527f1d73e6226b2538
Author: MrSimbax <simbaxlp at gmail.com>
Date:   Sun Nov 2 12:42:57 2014 +0100

    Fixed amount of fireball damage done to allies, close issue #356
    
    In the original game the whole series did damage 0.02 (0.10 * 0.2) to human. In Gold, one particle do such damage, so 51 particles do 51 * 0.02 = 1.02 damage to human! I changed the multiplier for allies from 0.2 to 0.004 (approx. 0.2 / 51), but this problem probably occured somewhere else during rewriting the engine from DirectX to OpenGL and SDL.
---
 src/graphics/engine/particle.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/graphics/engine/particle.cpp b/src/graphics/engine/particle.cpp
index d038322..f5a16e9 100644
--- a/src/graphics/engine/particle.cpp
+++ b/src/graphics/engine/particle.cpp
@@ -116,7 +116,7 @@ bool IsAlien(ObjectType type)
 //! Returns the damping factor for friendly fire
 float GetDecay(ObjectType type)
 {
-    if (IsSoft(type))  return 0.2f;
+    if (IsSoft(type))  return 0.004f;
     return 1.0f;
 }
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.git