]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
much less damage when in lava, actually have a chance of getting out of there :o
authorFruitieX <fruitiex@gmail.com>
Sat, 27 Nov 2010 00:35:53 +0000 (02:35 +0200)
committerFruitieX <fruitiex@gmail.com>
Sat, 27 Nov 2010 00:35:53 +0000 (02:35 +0200)
qcsrc/server/sv_main.qc

index 8a73e6799afb6436a3fa23ca9b73995908ae8092..ceffc32beb16a7858ab3ddd1f0765497340cd934 100644 (file)
@@ -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)
                                        {