DEADSOFTWARE

Slowly decrease fire pain frequency
authorJoseph Stalin <granminigun@pm.me>
Tue, 6 Aug 2019 17:06:12 +0000 (22:06 +0500)
committerJoseph Stalin <granminigun@pm.me>
Thu, 8 Aug 2019 20:36:58 +0000 (01:36 +0500)
Also increased fire time a little bit to better match 3secs;
Made a little "fix" for fuel in Backpack.

src/game/g_player.pas

index 7e12a91818a8afc1f609e5ab46f4d7375c1a61bf..b9a9d38c23bad348ce87ed0dd3441e44335d3a65 100644 (file)
@@ -3195,7 +3195,7 @@ begin
     exit; // Íå çàãîðàåìñÿ êîãäà åñòü çàùèòà
   if FFireTime <= 0 then
     g_Sound_PlayExAt('SOUND_IGNITE', FObj.X, FObj.Y);
-  FFireTime := 100;
+  FFireTime := 110;
   FFireAttacker := Attacker;
   if g_Game_IsNet and g_Game_IsServer then
     MH_SEND_PlayerStats(FUID);
@@ -4104,7 +4104,7 @@ begin
             (FAmmo[A_SHELLS] < FMaxAmmo[A_SHELLS]) or
             (FAmmo[A_ROCKETS] < FMaxAmmo[A_ROCKETS]) or
             (FAmmo[A_CELLS] < FMaxAmmo[A_CELLS]) or
-            (FMaxAmmo[A_FUEL] < AmmoLimits[1, A_FUEL]) then
+            (FAmmo[A_FUEL] < FMaxAmmo[A_FUEL]) then
       begin
         FMaxAmmo[A_BULLETS] := AmmoLimits[1, A_BULLETS];
         FMaxAmmo[A_SHELLS] := AmmoLimits[1, A_SHELLS];
@@ -5279,7 +5279,7 @@ begin
         begin
           if g_Game_IsServer then
             Damage(2, FFireAttacker, 0, 0, HIT_FLAME);
-          FFirePainTime := 3;
+          FFirePainTime := 12 - FFireTime div 12;
         end;
         FFirePainTime := FFirePainTime - 1;
         FFireTime := FFireTime - 1;