From: FruitieX <fruitiex@gmail.com>
Date: Sat, 27 Nov 2010 00:35:53 +0000 (+0200)
Subject: much less damage when in lava, actually have a chance of getting out of there :o
X-Git-Tag: xonotic-v0.1.0preview~99^2~3
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=d1b302dbccf2091af84df08d311d41374af3df5d;hp=76965bf99714a4030c90dcea369840af425cc156

much less damage when in lava, actually have a chance of getting out of there :o
---

diff --git a/qcsrc/server/sv_main.qc b/qcsrc/server/sv_main.qc
index 8a73e6799a..ceffc32beb 100644
--- a/qcsrc/server/sv_main.qc
+++ b/qcsrc/server/sv_main.qc
@@ -34,7 +34,7 @@ void CreatureFrame (void)
 				}
 				if (self.dmgtime < time)
 				{
-					self.dmgtime = time + 0.1;
+					self.dmgtime = time + 0.2;
 					if (self.watertype == CONTENT_LAVA)
 					{
 						if (self.watersound_finished < time)
@@ -42,7 +42,7 @@ void CreatureFrame (void)
 							self.watersound_finished = time + 0.5;
 							sound (self, CHAN_PLAYER, "player/lava.wav", VOL_BASE, ATTN_NORM);
 						}
-						Damage (self, world, world, 6 * self.waterlevel, DEATH_LAVA, self.origin, '0 0 0');
+						Damage (self, world, world, 4 * self.waterlevel, DEATH_LAVA, self.origin, '0 0 0');
 					}
 					else if (self.watertype == CONTENT_SLIME)
 					{