Rebalance flammenwerfer; add Fuel to Backpack

diff --git a/src/game/g_player.pas b/src/game/g_player.pas
index 71a202301fbc3b20aeeea1df5496eae2a60c4b9c..7e12a91818a8afc1f609e5ab46f4d7375c1a61bf 100644 (file)
--- a/src/game/g_player.pas
+++ b/src/game/g_player.pas
@@ -4120,6 +4120,8 @@ begin
           IncMax(FAmmo[A_ROCKETS], 1, FMaxAmmo[A_ROCKETS]);
         if FAmmo[A_CELLS] < FMaxAmmo[A_CELLS] then
           IncMax(FAmmo[A_CELLS], 40, FMaxAmmo[A_CELLS]);
+        if FAmmo[A_FUEL] < FMaxAmmo[A_FUEL] then
+          IncMax(FAmmo[A_FUEL], 50, FMaxAmmo[A_FUEL]);
 
         FRulez := FRulez + [R_ITEM_BACKPACK];
         Result := True;
@@ -5276,8 +5278,8 @@ begin
         if FFirePainTime <= 0 then
         begin
           if g_Game_IsServer then
-            Damage(6, FFireAttacker, 0, 0, HIT_FLAME);
-          FFirePainTime := 18;
+            Damage(2, FFireAttacker, 0, 0, HIT_FLAME);
+          FFirePainTime := 3;
         end;
         FFirePainTime := FFirePainTime - 1;
         FFireTime := FFireTime - 1;

diff --git a/src/game/g_weapons.pas b/src/game/g_weapons.pas
index 8a5e652d01bef9f729d7a78e50dabc837fcc5e4c..daae198e0bd470f5a2c45b72dbbdc0301a5f4d3a 100644 (file)
--- a/src/game/g_weapons.pas
+++ b/src/game/g_weapons.pas
@@ -2346,7 +2346,7 @@ begin
                 Stopped := MOVE_HITCEIL;
             end;
 
-            a := IfThen(Stopped = 0, 6, 1);
+            a := IfThen(Stopped = 0, 10, 1);
           // Åñëè â êîãî-òî ïîïàëè
             if g_Weapon_Hit(@Obj, a, SpawnerUID, HIT_FLAME, False) <> 0 then
             begin