Back to the Vavoom Forum Archives
Firebrand
Index: progs/common/linespec/Actor.Misc.vc
===================================================================
--- progs/common/linespec/Actor.Misc.vc (revision 4193)
+++ progs/common/linespec/Actor.Misc.vc (working copy)
@@ -211,7 +211,7 @@
{
Actor A = Spawn(FireDroplet, Origin + vector(0.0, 0.0, 24.0));
A.Velocity.z = -35.0;
- RadiusAttack(Target, 64, 64.0, false, 'Fire');
+ RadiusAttack(self, 64, 64.0, false, 'Fire');
}
//==========================================================================
Index: progs/common/linespec/EntityEx.Damage.vc
===================================================================
--- progs/common/linespec/EntityEx.Damage.vc (revision 4193)
+++ progs/common/linespec/EntityEx.Damage.vc (working copy)
@@ -267,13 +267,13 @@
// Try to use some inventory health
AutoUseHealth(damage - Health + 1);
}
- if (Health < 50 || damage >= Health)
+
+ Player.Health -= damage; // mirror mobj health here for Dave
+ if (Player.Health < 50 && !Level.Game.deathmatch)
{
// Try to use some inventory health
AutoUseStrifeHealth(damage - Health + 1);
}
-
- Player.Health -= damage; // mirror mobj health here for Dave
if (Player.Health < 0)
{
Player.Health = 0;
Index: progs/common/linespec/Pusher.vc
===================================================================
--- progs/common/linespec/Pusher.vc (revision 4193)
+++ progs/common/linespec/Pusher.vc (working copy)
@@ -326,5 +326,5 @@
defaultproperties
{
- PUSH_FACTOR = 128.0;
+ PUSH_FACTOR = 9.0; //128.0;
}
Janis Legzdinsh