Game: Tweak fire pain

[d2df-sdl.git] / src / game / g_player.pas

diff --git a/src/game/g_player.pas b/src/game/g_player.pas
index 19350e5bde31694604f2d10ee462d1cca59eb3fa..81825dfe7bce4b108fbf20570dcdf17a0f8200f4 100644 (file)
--- a/src/game/g_player.pas
+++ b/src/game/g_player.pas
@@ -95,12 +95,14 @@ const
   PLAYER_AP_SOFT  = 100;
   PLAYER_AP_LIMIT = 200;
   SUICIDE_DAMAGE  = 112;
   PLAYER_AP_SOFT  = 100;
   PLAYER_AP_LIMIT = 200;
   SUICIDE_DAMAGE  = 112;

+  WEAPON_DELAY    = 5;

 
   PLAYER1_DEF_COLOR: TRGB = (R:64; G:175; B:48);
   PLAYER2_DEF_COLOR: TRGB = (R:96; G:96; B:96);
 
 type
   TPlayerStat = record
 
   PLAYER1_DEF_COLOR: TRGB = (R:64; G:175; B:48);
   PLAYER2_DEF_COLOR: TRGB = (R:96; G:96; B:96);
 
 type
   TPlayerStat = record

+    Num: Integer;

     Ping: Word;
     Loss: Byte;
     Name: String;
     Ping: Word;
     Loss: Byte;
     Name: String;


@@ -163,7 +165,7 @@ type
     FSecrets:   Integer;
     FCurrWeap:  Byte;
     FNextWeap:  WORD;
     FSecrets:   Integer;
     FCurrWeap:  Byte;
     FNextWeap:  WORD;

-    FNextWeapDelay: Byte; // frames (unused)
+    FNextWeapDelay: Byte; // frames

     FBFGFireCounter: SmallInt;
     FLastSpawnerUID: Word;
     FLastHit:   Byte;
     FBFGFireCounter: SmallInt;
     FLastSpawnerUID: Word;
     FLastHit:   Byte;


@@ -190,6 +192,9 @@ type
     FSawSoundIdle:   TPlayableSound;
     FSawSoundHit:    TPlayableSound;
     FSawSoundSelect: TPlayableSound;
     FSawSoundIdle:   TPlayableSound;
     FSawSoundHit:    TPlayableSound;
     FSawSoundSelect: TPlayableSound;

+    FFlameSoundOn:   TPlayableSound;
+    FFlameSoundOff:  TPlayableSound;
+    FFlameSoundWork: TPlayableSound;

     FJetSoundOn:     TPlayableSound;
     FJetSoundOff:    TPlayableSound;
     FJetSoundFly:    TPlayableSound;
     FJetSoundOn:     TPlayableSound;
     FJetSoundOff:    TPlayableSound;
     FJetSoundFly:    TPlayableSound;


@@ -200,9 +205,6 @@ type
     FNetTime: LongWord;
     mEDamageType: Integer;
 
     FNetTime: LongWord;
     mEDamageType: Integer;
 

-    // client-side only
-    weaponSwitchKeyReleased: array[0..16] of Byte; // bit 0: was released on prev frame; bit 1: new status
-

 
     function CollideLevel(XInc, YInc: Integer): Boolean;
     function StayOnStep(XInc, YInc: Integer): Boolean;
 
     function CollideLevel(XInc, YInc: Integer): Boolean;
     function StayOnStep(XInc, YInc: Integer): Boolean;


@@ -255,13 +257,16 @@ type
     FWantsInGame: Boolean;
     FGhost:     Boolean;
     FPhysics:   Boolean;
     FWantsInGame: Boolean;
     FGhost:     Boolean;
     FPhysics:   Boolean;

+    FFlaming:   Boolean;

     FJetpack:   Boolean;
     FActualModelName: string;
     FClientID:  SmallInt;
     FPing:      Word;
     FLoss:      Byte;
     FJetpack:   Boolean;
     FActualModelName: string;
     FClientID:  SmallInt;
     FPing:      Word;
     FLoss:      Byte;

+    FReady:     Boolean;

     FDummy:     Boolean;
     FFireTime:  Integer;
     FDummy:     Boolean;
     FFireTime:  Integer;

+    FHandicap:  Integer;

 
     // debug: viewport offset
     viewPortX, viewPortY, viewPortW, viewPortH: Integer;
 
     // debug: viewport offset
     viewPortX, viewPortY, viewPortW, viewPortH: Integer;


@@ -294,7 +299,7 @@ type
     procedure   BFGHit();
     function    GetFlag(Flag: Byte): Boolean;
     procedure   SetFlag(Flag: Byte);
     procedure   BFGHit();
     function    GetFlag(Flag: Byte): Boolean;
     procedure   SetFlag(Flag: Byte);

-    function    DropFlag(): Boolean;
+    function    DropFlag(Silent: Boolean = True): Boolean;

     procedure   AllRulez(Health: Boolean);
     procedure   RestoreHealthArmor();
     procedure   FragCombo();
     procedure   AllRulez(Health: Boolean);
     procedure   RestoreHealthArmor();
     procedure   FragCombo();


@@ -327,6 +332,8 @@ type
     procedure   SetLerp(XTo, YTo: Integer);
     procedure   QueueWeaponSwitch(Weapon: Byte);
     procedure   RealizeCurrentWeapon();
     procedure   SetLerp(XTo, YTo: Integer);
     procedure   QueueWeaponSwitch(Weapon: Byte);
     procedure   RealizeCurrentWeapon();

+    procedure   FlamerOn;
+    procedure   FlamerOff;

     procedure   JetpackOn;
     procedure   JetpackOff;
     procedure   CatchFire(Attacker: Word);
     procedure   JetpackOn;
     procedure   JetpackOff;
     procedure   CatchFire(Attacker: Word);


@@ -337,11 +344,6 @@ type
     procedure getMapBox (out x, y, w, h: Integer); inline;
     procedure moveBy (dx, dy: Integer); inline;
 
     procedure getMapBox (out x, y, w, h: Integer); inline;
     procedure moveBy (dx, dy: Integer); inline;
 

-    procedure releaseAllWeaponSwitchKeys ();
-    procedure weaponSwitchKeysStateChange (index: Integer; pressed: Boolean);
-    function isWeaponSwitchKeyReleased (index: Integer): Boolean;
-    procedure weaponSwitchKeysShiftNewStates ();
-

   public
     property    Vel: TPoint2i read FObj.Vel;
     property    Obj: TObj read FObj;
   public
     property    Vel: TPoint2i read FObj.Vel;
     property    Obj: TObj read FObj;


@@ -593,8 +595,9 @@ procedure g_Player_DrawShells();
 procedure g_Player_RemoveAllCorpses();
 procedure g_Player_Corpses_SaveState (st: TStream);
 procedure g_Player_Corpses_LoadState (st: TStream);
 procedure g_Player_RemoveAllCorpses();
 procedure g_Player_Corpses_SaveState (st: TStream);
 procedure g_Player_Corpses_LoadState (st: TStream);

-procedure g_Bot_Add(Team, Difficult: Byte);
-procedure g_Bot_AddList(Team: Byte; lname: ShortString; num: Integer = -1);
+procedure g_Player_ResetReady();
+procedure g_Bot_Add(Team, Difficult: Byte; Handicap: Integer = 100);
+procedure g_Bot_AddList(Team: Byte; lname: ShortString; num: Integer = -1; Handicap: Integer = 100);

 procedure g_Bot_MixNames();
 procedure g_Bot_RemoveAll();
 
 procedure g_Bot_MixNames();
 procedure g_Bot_RemoveAll();
 


@@ -883,6 +886,8 @@ begin
   if b = 1 then gPlayers[a].FDirection := TDirection.D_LEFT else gPlayers[a].FDirection := TDirection.D_RIGHT; // b = 2
   // Çäîðîâüå
   gPlayers[a].FHealth := utils.readLongInt(st);
   if b = 1 then gPlayers[a].FDirection := TDirection.D_LEFT else gPlayers[a].FDirection := TDirection.D_RIGHT; // b = 2
   // Çäîðîâüå
   gPlayers[a].FHealth := utils.readLongInt(st);

+  // Ôîðà
+  gPlayers[a].FHandicap := utils.readLongInt(st);

   // Æèçíè
   gPlayers[a].FLives := utils.readByte(st);
   // Áðîíÿ
   // Æèçíè
   gPlayers[a].FLives := utils.readByte(st);
   // Áðîíÿ


@@ -1004,7 +1009,7 @@ begin
       end;
 end;
 
       end;
 end;
 

-procedure g_Bot_Add(Team, Difficult: Byte);
+procedure g_Bot_Add(Team, Difficult: Byte; Handicap: Integer = 100);

 var
   m: SSArray;
   _name, _model: String;
 var
   m: SSArray;
   _name, _model: String;


@@ -1093,6 +1098,8 @@ begin
       //FDifficult.SafeWeaponPrior[a] := WEAPON_PRIOR3[a];
     end;
 
       //FDifficult.SafeWeaponPrior[a] := WEAPON_PRIOR3[a];
     end;
 

+    FHandicap := Handicap;
+

     g_Console_Add(Format(_lc[I_PLAYER_JOIN], [Name]), True);
 
     if g_Game_IsNet then MH_SEND_PlayerCreate(UID);
     g_Console_Add(Format(_lc[I_PLAYER_JOIN], [Name]), True);
 
     if g_Game_IsNet then MH_SEND_PlayerCreate(UID);


@@ -1101,7 +1108,7 @@ begin
   end;
 end;
 
   end;
 end;
 

-procedure g_Bot_AddList(Team: Byte; lName: ShortString; num: Integer = -1);
+procedure g_Bot_AddList(Team: Byte; lName: ShortString; num: Integer = -1; Handicap: Integer = 100);

 var
   m: SSArray;
   _name, _model: String;
 var
   m: SSArray;
   _name, _model: String;


@@ -1164,6 +1171,8 @@ begin
     FDifficult.Cover := BotList[num].cover;
     FDifficult.CloseJump := BotList[num].close_jump;
 
     FDifficult.Cover := BotList[num].cover;
     FDifficult.CloseJump := BotList[num].close_jump;
 

+    FHandicap := Handicap;
+

     for a := WP_FIRST to WP_LAST do
     begin
       FDifficult.WeaponPrior[a] := BotList[num].w_prior1[a];
     for a := WP_FIRST to WP_LAST do
     begin
       FDifficult.WeaponPrior[a] := BotList[num].w_prior1[a];


@@ -1472,6 +1481,7 @@ begin
       SetLength(Result, Length(Result)+1);
       with Result[High(Result)] do
       begin
       SetLength(Result, Length(Result)+1);
       with Result[High(Result)] do
       begin

+        Num := a;

         Ping := gPlayers[a].FPing;
         Loss := gPlayers[a].FLoss;
         Name := gPlayers[a].FName;
         Ping := gPlayers[a].FPing;
         Loss := gPlayers[a].FLoss;
         Name := gPlayers[a].FName;


@@ -1486,6 +1496,22 @@ begin
     end;
 end;
 
     end;
 end;
 

+procedure g_Player_ResetReady();
+var
+  a: Integer;
+begin
+  if not g_Game_IsServer then Exit;
+  if gPlayers = nil then Exit;
+
+  for a := 0 to High(gPlayers) do
+    if gPlayers[a] <> nil then
+    begin
+      gPlayers[a].FReady := False;
+      if g_Game_IsNet then
+        MH_SEND_GameEvent(NET_EV_INTER_READY, gPlayers[a].UID, 'N');
+    end;
+end;
+

 procedure g_Player_RememberAll;
 var
   i: Integer;
 procedure g_Player_RememberAll;
 var
   i: Integer;


@@ -2106,6 +2132,9 @@ begin
   FSawSoundIdle := TPlayableSound.Create();
   FSawSoundHit := TPlayableSound.Create();
   FSawSoundSelect := TPlayableSound.Create();
   FSawSoundIdle := TPlayableSound.Create();
   FSawSoundHit := TPlayableSound.Create();
   FSawSoundSelect := TPlayableSound.Create();

+  FFlameSoundOn := TPlayableSound.Create();
+  FFlameSoundOff := TPlayableSound.Create();
+  FFlameSoundWork := TPlayableSound.Create();

   FJetSoundFly := TPlayableSound.Create();
   FJetSoundOn := TPlayableSound.Create();
   FJetSoundOff := TPlayableSound.Create();
   FJetSoundFly := TPlayableSound.Create();
   FJetSoundOn := TPlayableSound.Create();
   FJetSoundOff := TPlayableSound.Create();


@@ -2114,6 +2143,9 @@ begin
   FSawSoundIdle.SetByName('SOUND_WEAPON_IDLESAW');
   FSawSoundHit.SetByName('SOUND_WEAPON_HITSAW');
   FSawSoundSelect.SetByName('SOUND_WEAPON_SELECTSAW');
   FSawSoundIdle.SetByName('SOUND_WEAPON_IDLESAW');
   FSawSoundHit.SetByName('SOUND_WEAPON_HITSAW');
   FSawSoundSelect.SetByName('SOUND_WEAPON_SELECTSAW');

+  FFlameSoundOn.SetByName('SOUND_WEAPON_FLAMEON');
+  FFlameSoundOff.SetByName('SOUND_WEAPON_FLAMEOFF');
+  FFlameSoundWork.SetByName('SOUND_WEAPON_FLAMEWORK');

   FJetSoundFly.SetByName('SOUND_PLAYER_JETFLY');
   FJetSoundOn.SetByName('SOUND_PLAYER_JETON');
   FJetSoundOff.SetByName('SOUND_PLAYER_JETOFF');
   FJetSoundFly.SetByName('SOUND_PLAYER_JETFLY');
   FJetSoundOn.SetByName('SOUND_PLAYER_JETON');
   FJetSoundOff.SetByName('SOUND_PLAYER_JETOFF');


@@ -2127,6 +2159,7 @@ begin
   FFireTime := 0;
   FFirePainTime := 0;
   FFireAttacker := 0;
   FFireTime := 0;
   FFirePainTime := 0;
   FFireAttacker := 0;

+  FHandicap := 100;

 
   FActualModelName := 'doomer';
 
 
   FActualModelName := 'doomer';
 


@@ -2138,52 +2171,8 @@ begin
   FNetTime := 0;
 
   resetWeaponQueue();
   FNetTime := 0;
 
   resetWeaponQueue();

-  releaseAllWeaponSwitchKeys();
-end;
-
-
-procedure TPlayer.releaseAllWeaponSwitchKeys ();
-var
-  f: Integer;
-begin
-  for f := 0 to High(weaponSwitchKeyReleased) do weaponSwitchKeyReleased[f] := $03;
-end;
-
-procedure TPlayer.weaponSwitchKeysStateChange (index: Integer; pressed: Boolean);
-begin
-  Inc(index, 2); // -2: prev; -1: next
-  if (index < 0) or (index > High(weaponSwitchKeyReleased)) then exit;
-  weaponSwitchKeyReleased[index] := weaponSwitchKeyReleased[index] or $02;
-  if (pressed) then weaponSwitchKeyReleased[index] := weaponSwitchKeyReleased[index] xor $02;
-end;
-
-function TPlayer.isWeaponSwitchKeyReleased (index: Integer): Boolean;
-begin
-  Inc(index, 2); // -2: prev; -1: next
-  if (index < 0) or (index > High(weaponSwitchKeyReleased)) then
-  begin
-    result := true;
-  end
-  else
-  begin
-    result := (weaponSwitchKeyReleased[index] and $01) <> 0;
-  end;

 end;
 
 end;
 

-procedure TPlayer.weaponSwitchKeysShiftNewStates ();
-var
-  f: Integer;
-begin
-  // copy bit 1 to bit 0
-  for f := 0 to High(weaponSwitchKeyReleased) do
-  begin
-    weaponSwitchKeyReleased[f] :=
-      (weaponSwitchKeyReleased[f] and $02) or
-      ((weaponSwitchKeyReleased[f] shr 1) and $01);
-  end;
-end;
-
-

 procedure TPlayer.positionChanged (); inline;
 begin
 end;
 procedure TPlayer.positionChanged (); inline;
 begin
 end;


@@ -2317,6 +2306,10 @@ begin
   FSawSound.Free();
   FSawSoundIdle.Free();
   FSawSoundHit.Free();
   FSawSound.Free();
   FSawSoundIdle.Free();
   FSawSoundHit.Free();

+  FSawSoundSelect.Free();
+  FFlameSoundOn.Free();
+  FFlameSoundOff.Free();
+  FFlameSoundWork.Free();

   FJetSoundFly.Free();
   FJetSoundOn.Free();
   FJetSoundOff.Free();
   FJetSoundFly.Free();
   FJetSoundOn.Free();
   FJetSoundOff.Free();


@@ -2336,11 +2329,11 @@ begin
   if FAlive then
     begin
       indX := FObj.X+FObj.Rect.X;
   if FAlive then
     begin
       indX := FObj.X+FObj.Rect.X;

-      indY := FObj.Y - 12;
+      indY := FObj.Y;

       if g_Texture_Get('TEXTURE_PLAYER_INDICATOR', ID) then
         begin
           e_GetTextureSize(ID, @indW, @indH);
       if g_Texture_Get('TEXTURE_PLAYER_INDICATOR', ID) then
         begin
           e_GetTextureSize(ID, @indW, @indH);

-          e_Draw(ID, indX + indW div 2, indY, 0, True, False);
+          e_Draw(ID, indX + indW div 2, indY - indH, 0, True, False);

         end;
     end;
   //e_TextureFontPrint(indX, indY, FName, gStdFont); // Shows player name overhead
         end;
     end;
   //e_TextureFontPrint(indX, indY, FName, gStdFont); // Shows player name overhead


@@ -2495,7 +2488,9 @@ begin
   end;
 
   if (gChatBubble > 0) and (FKeys[KEY_CHAT].Pressed) and not FGhost then
   end;
 
   if (gChatBubble > 0) and (FKeys[KEY_CHAT].Pressed) and not FGhost then

-    DrawBubble();
+    if (FMegaRulez[MR_INVIS] <= gTime) or ((gPlayerDrawn <> nil) and ((Self = gPlayerDrawn) or
+       ((FTeam = gPlayerDrawn.Team) and (gGameSettings.GameMode <> GM_DM)))) then
+      DrawBubble();

  // e_DrawPoint(5, 335, 288, 255, 0, 0); // DL, UR, DL, UR
   if gAimLine and alive and
   ((Self = gPlayer1) or (Self = gPlayer2)) then
  // e_DrawPoint(5, 335, 288, 255, 0, 0); // DL, UR, DL, UR
   if gAimLine and alive and
   ((Self = gPlayer1) or (Self = gPlayer2)) then


@@ -3094,11 +3089,17 @@ begin
       if FAmmo[A_FUEL] > 0 then
       begin
         g_Weapon_flame(wx, wy, xd, yd, FUID);
       if FAmmo[A_FUEL] > 0 then
       begin
         g_Weapon_flame(wx, wy, xd, yd, FUID);

+        FlamerOn;

         FReloading[FCurrWeap] := WEAPON_RELOAD[FCurrWeap];
         Dec(FAmmo[A_FUEL]);
         FFireAngle := FAngle;
         f := True;
         DidFire := True;
         FReloading[FCurrWeap] := WEAPON_RELOAD[FCurrWeap];
         Dec(FAmmo[A_FUEL]);
         FFireAngle := FAngle;
         f := True;
         DidFire := True;

+      end
+      else
+      begin
+        FlamerOff;
+        if g_Game_IsNet and g_Game_IsServer then MH_SEND_PlayerStats(FUID);

       end;
   end;
 
       end;
   end;
 


@@ -3142,6 +3143,35 @@ begin
                                PANEL_WATER or PANEL_ACID1 or PANEL_ACID2, True);
 end;
 
                                PANEL_WATER or PANEL_ACID1 or PANEL_ACID2, True);
 end;
 

+procedure TPlayer.FlamerOn;
+begin
+  FFlameSoundOff.Stop();
+  FFlameSoundOff.SetPosition(0);
+  if FFlaming then
+  begin
+    if (not FFlameSoundOn.IsPlaying()) and (not FFlameSoundWork.IsPlaying()) then
+      FFlameSoundWork.PlayAt(FObj.X, FObj.Y);
+  end
+  else
+  begin
+    FFlameSoundOn.PlayAt(FObj.X, FObj.Y);
+    FFlaming := True;
+  end;
+end;
+
+procedure TPlayer.FlamerOff;
+begin
+  if FFlaming then
+  begin
+    FFlameSoundOn.Stop();
+    FFlameSoundOn.SetPosition(0);
+    FFlameSoundWork.Stop();
+    FFlameSoundWork.SetPosition(0);
+    FFlameSoundOff.PlayAt(FObj.X, FObj.Y);
+    FFlaming := False;
+  end;
+end;
+

 procedure TPlayer.JetpackOn;
 begin
   FJetSoundFly.Stop;
 procedure TPlayer.JetpackOn;
 begin
   FJetSoundFly.Stop;


@@ -3161,6 +3191,10 @@ end;
 
 procedure TPlayer.CatchFire(Attacker: Word);
 begin
 
 procedure TPlayer.CatchFire(Attacker: Word);
 begin

+  if (FMegaRulez[MR_SUIT] > gTime) or (FMegaRulez[MR_INVUL] > gTime) then
+    exit; // Íå çàãîðàåìñÿ êîãäà åñòü çàùèòà
+  if FFireTime <= 0 then
+    g_Sound_PlayExAt('SOUND_IGNITE', FObj.X, FObj.Y);

   FFireTime := 100;
   FFireAttacker := Attacker;
   if g_Game_IsNet and g_Game_IsServer then
   FFireTime := 100;
   FFireAttacker := Attacker;
   if g_Game_IsNet and g_Game_IsServer then


@@ -3452,7 +3486,7 @@ begin
     end;
 
 // Âûáðîñ ôëàãà:
     end;
 
 // Âûáðîñ ôëàãà:

-    DropFlag();
+    DropFlag(KillType = K_FALLKILL);

   end;
 
   g_Player_CreateCorpse(Self);
   end;
 
   g_Player_CreateCorpse(Self);


@@ -3626,8 +3660,8 @@ begin
   result := false;
   case weapon of
     WEAPON_KASTET, WEAPON_SAW: result := true;
   result := false;
   case weapon of
     WEAPON_KASTET, WEAPON_SAW: result := true;

-    WEAPON_SHOTGUN1, WEAPON_SHOTGUN2, WEAPON_SUPERPULEMET: result := (FAmmo[A_SHELLS] > 0);
-    WEAPON_PISTOL, WEAPON_CHAINGUN: result := (FAmmo[A_BULLETS] > 0);
+    WEAPON_SHOTGUN1, WEAPON_SHOTGUN2: result := (FAmmo[A_SHELLS] > 0);
+    WEAPON_PISTOL, WEAPON_CHAINGUN, WEAPON_SUPERPULEMET: result := (FAmmo[A_BULLETS] > 0);

     WEAPON_ROCKETLAUNCHER: result := (FAmmo[A_ROCKETS] > 0);
     WEAPON_PLASMA, WEAPON_BFG: result := (FAmmo[A_CELLS] > 0);
     WEAPON_FLAMETHROWER: result := (FAmmo[A_FUEL] > 0);
     WEAPON_ROCKETLAUNCHER: result := (FAmmo[A_ROCKETS] > 0);
     WEAPON_PLASMA, WEAPON_BFG: result := (FAmmo[A_CELLS] > 0);
     WEAPON_FLAMETHROWER: result := (FAmmo[A_FUEL] > 0);


@@ -3640,167 +3674,83 @@ function TPlayer.getNextWeaponIndex (): Byte;
 var
   i: Word;
   wantThisWeapon: array[0..64] of Boolean;
 var
   i: Word;
   wantThisWeapon: array[0..64] of Boolean;

-  weaponOrder: array[0..16] of Integer; // value: index in `FWeapon`
-  wwc: Integer;
-  f, dir, cwi, rwidx, curlidx: Integer;
-
-  function real2log (ridx: Integer): Integer;
-  var
-    f: Integer;
-  begin
-    if (ridx >= 0) then
-    begin
-      for f := 0 to High(weaponOrder) do if (weaponOrder[f] = ridx) then begin result := f; exit; end;
-    end;
-    result := -1;
-  end;
-
+  wwc: Integer = 0; //HACK!
+  dir, cwi: Integer;

 begin
   result := 255; // default result: "no switch"
 begin
   result := 255; // default result: "no switch"

-

   // had weapon cycling on previous frame? remove that flag
   if (FNextWeap and $2000) <> 0 then
   begin
     FNextWeap := FNextWeap and $1FFF;
     FNextWeapDelay := 0;
   end;
   // had weapon cycling on previous frame? remove that flag
   if (FNextWeap and $2000) <> 0 then
   begin
     FNextWeap := FNextWeap and $1FFF;
     FNextWeapDelay := 0;
   end;

-
-  for f := 0 to High(weaponOrder) do weaponOrder[f] := -1;
-
-  // build weapon order (k8: i know, i know, learn how to do constants and such... gtfo, please!)
-  // two knuckles are for "normal" and "berserk" (see `if` below -- it removes the one that is not needed)
-  // priorities:
-  //   bfg, launcher, plasma, flamethrower, ssg, minigun, sg, pistol, berserk, chainsaw, fist
-  weaponOrder[0] := WEAPON_SUPERPULEMET;
-  weaponOrder[1] := WEAPON_BFG;
-  weaponOrder[2] := WEAPON_ROCKETLAUNCHER;
-  weaponOrder[3] := WEAPON_PLASMA;
-  weaponOrder[4] := WEAPON_FLAMETHROWER;
-  weaponOrder[5] := WEAPON_SHOTGUN2;
-  weaponOrder[6] := WEAPON_CHAINGUN;
-  weaponOrder[7] := WEAPON_SHOTGUN1;
-  weaponOrder[8] := WEAPON_PISTOL;
-  weaponOrder[9] := WEAPON_KASTET+666; // berserk fist
-  weaponOrder[10] := WEAPON_SAW;
-  weaponOrder[11] := WEAPON_KASTET; // normal fist
-
-  for f := 0 to High(weaponOrder) do
-  begin
-    if (weaponOrder[f] = WEAPON_KASTET) then
-    begin
-      // normal fist: remove if we have a berserk pack
-      if (R_BERSERK in FRulez) then weaponOrder[f] := -1;
-    end
-    else
-    if (weaponOrder[f] = WEAPON_KASTET+666) then
-    begin
-      // berserk fist: remove if we don't have a berserk pack
-      if (R_BERSERK in FRulez) then weaponOrder[f] := WEAPON_KASTET else weaponOrder[f] := -1;
-    end;
-  end;
-
-  (*
-  WEAPON_KASTET         = 0;
-  WEAPON_SAW            = 1;
-  WEAPON_PISTOL         = 2;
-  WEAPON_SHOTGUN1       = 3;
-  WEAPON_SHOTGUN2       = 4;
-  WEAPON_CHAINGUN       = 5;
-  WEAPON_ROCKETLAUNCHER = 6;
-  WEAPON_PLASMA         = 7;
-  WEAPON_BFG            = 8;
-  WEAPON_SUPERPULEMET   = 9;
-  WEAPON_FLAMETHROWER   = 10;
-  *)
-

   // cycling has priority
   if (FNextWeap and $C000) <> 0 then
   begin
   // cycling has priority
   if (FNextWeap and $C000) <> 0 then
   begin

-    if (FNextWeap and $8000) <> 0 then dir := 1 else dir := -1; // should be reversed if we want "priority-driven cycling"
+    if (FNextWeap and $8000) <> 0 then
+      dir := 1
+    else
+      dir := -1;

     FNextWeap := FNextWeap or $2000; // we need this
     FNextWeap := FNextWeap or $2000; // we need this

-    if FNextWeapDelay > 0 then exit; // cooldown time
-    //cwi := real2log(FCurrWeap);
-    //if (cwi < 0) then cwi := 0;
+    if FNextWeapDelay > 0 then
+      exit; // cooldown time

     cwi := FCurrWeap;
     for i := 0 to High(FWeapon) do
     begin
       cwi := (cwi+length(FWeapon)+dir) mod length(FWeapon);
     cwi := FCurrWeap;
     for i := 0 to High(FWeapon) do
     begin
       cwi := (cwi+length(FWeapon)+dir) mod length(FWeapon);

-      //rwidx := weaponOrder[cwi];
-      rwidx := cwi; // sorry
-      if (rwidx < 0) then continue;
-      if FWeapon[rwidx] then
-      begin
-        //e_WriteLog(Format(' SWITCH: cur=%d; new=%d (dir=%d; log=%d)', [FCurrWeap, rwidx, dir, cwi]), TMsgType.Warning);
-        result := Byte(rwidx);
-        //FNextWeapDelay := 10; //k8: not needed anymore
+      if FWeapon[cwi] then
+      begin
+        //e_WriteLog(Format(' SWITCH: cur=%d; new=%d', [FCurrWeap, cwi]), MSG_WARNING);
+        result := Byte(cwi);
+        FNextWeapDelay := WEAPON_DELAY;

         exit;
       end;
     end;
     resetWeaponQueue();
     exit;
   end;
         exit;
       end;
     end;
     resetWeaponQueue();
     exit;
   end;

-

   // no cycling
   // no cycling

-  for i := 0 to High(wantThisWeapon) do wantThisWeapon[i] := false;
-  wwc := 0;
+  for i := 0 to High(wantThisWeapon) do
+    wantThisWeapon[i] := false;

   for i := 0 to High(FWeapon) do
   for i := 0 to High(FWeapon) do

-  begin

     if (FNextWeap and (1 shl i)) <> 0 then
     begin
     if (FNextWeap and (1 shl i)) <> 0 then
     begin

-      cwi := real2log(i);
-      if (cwi >= 0) then wantThisWeapon[cwi] := true;
+      wantThisWeapon[i] := true;

       Inc(wwc);
     end;
       Inc(wwc);
     end;

-  end;
-
+  // exclude currently selected weapon from the set
+  wantThisWeapon[FCurrWeap] := false;

   // slow down alterations a little
   // slow down alterations a little

-  if (wwc > 1) then
+  if wwc > 1 then

   begin
   begin

-    // more than one weapon requested, assume "alteration", and check alteration delay
+    //e_WriteLog(Format(' FNextWeap=%x; delay=%d', [FNextWeap, FNextWeapDelay]), MSG_WARNING);
+    // more than one weapon requested, assume "alteration" and check alteration delay

     if FNextWeapDelay > 0 then
     begin
     if FNextWeapDelay > 0 then
     begin

-      //e_WriteLog(Format(' FNextWeap=%x; delay=%d', [FNextWeap, FNextWeapDelay]), TMsgType.Warning);

       FNextWeap := 0;
       exit;
     end; // yeah
   end;
       FNextWeap := 0;
       exit;
     end; // yeah
   end;

-

   // do not reset weapon queue, it will be done in `RealizeCurrentWeapon()`
   // but clear all counters if no weapon should be switched
   // do not reset weapon queue, it will be done in `RealizeCurrentWeapon()`
   // but clear all counters if no weapon should be switched

-  if (wwc < 1) then
+  if wwc < 1 then

   begin
     resetWeaponQueue();
     exit;
   end;
   begin
     resetWeaponQueue();
     exit;
   end;

-
-  // exclude currently selected weapon from the set
-  curlidx := real2log(FCurrWeap);
-  //e_WriteLog(Format('*** wwc=%d; currweap=%d; logweap=%d', [wwc, FCurrWeap, curlidx]), TMsgType.Warning);
-  //e_WriteLog(Format('FCurrWeap=%d; curlidx=%d', [FCurrWeap, curlidx]), TMsgType.Warning);
-  //if (curlidx >= 0) then wantThisWeapon[curlidx] := false;
-  //if (wwc = 2) then begin Dec(wwc); end; // easy case: switch between two weapons
-
-  // find next weapon to switch onto
-  cwi := curlidx;
-  for i := 0 to High(weaponOrder) do
-  begin
-    cwi := (cwi+length(weaponOrder)+1) mod length(weaponOrder);
-    if (cwi = curlidx) then continue; // skip current weapon
-    if not wantThisWeapon[cwi] then continue;
-    rwidx := weaponOrder[cwi];
-    if (rwidx < 0) then continue;
-    //e_WriteLog(Format('  trying logical %d (real %d); has=%d, hasammo=%d', [cwi, rwidx, Integer(FWeapon[rwidx]), Integer(hasAmmoForWeapon(rwidx))]), TMsgType.Warning);
-    if FWeapon[rwidx] and ((wwc = 1) or hasAmmoForWeapon(rwidx)) then
+  //e_WriteLog(Format('wwc=%d', [wwc]), MSG_WARNING);
+  // try weapons in descending order
+  for i := High(FWeapon) downto 0 do
+  begin
+    if wantThisWeapon[i] and FWeapon[i] and ((wwc = 1) or hasAmmoForWeapon(i)) then

     begin
     begin

-      //e_WriteLog('    I FOUND HER!', TMsgType.Warning);

       // i found her!
       // i found her!

-      result := Byte(rwidx);
+      result := Byte(i);

       resetWeaponQueue();
       resetWeaponQueue();

-      //FNextWeapDelay := 10; // anyway, 'cause why not; k8: not needed anymore
+      FNextWeapDelay := WEAPON_DELAY * 2; // anyway, 'cause why not

       exit;
     end;
   end;
       exit;
     end;
   end;

-

   // no suitable weapon found, so reset the queue, to avoid accidental "queuing" of weapon w/o ammo
   resetWeaponQueue();
 end;
   // no suitable weapon found, so reset the queue, to avoid accidental "queuing" of weapon w/o ammo
   resetWeaponQueue();
 end;


@@ -3826,9 +3776,7 @@ var
 begin
   //e_WriteLog(Format('***RealizeCurrentWeapon: FNextWeap=%x; FNextWeapDelay=%d', [FNextWeap, FNextWeapDelay]), MSG_WARNING);
   //FNextWeap := FNextWeap and $1FFF;
 begin
   //e_WriteLog(Format('***RealizeCurrentWeapon: FNextWeap=%x; FNextWeapDelay=%d', [FNextWeap, FNextWeapDelay]), MSG_WARNING);
   //FNextWeap := FNextWeap and $1FFF;

-  //HACK: alteration delay will be reset when player released any weapon switch key
-  FNextWeapDelay := 0; //k8: just in case
-  //if FNextWeapDelay > 0 then Dec(FNextWeapDelay); // "alteration delay"
+  if FNextWeapDelay > 0 then Dec(FNextWeapDelay); // "alteration delay"

 
   if not switchAllowed then
   begin
 
   if not switchAllowed then
   begin


@@ -3842,7 +3790,7 @@ begin
   if nw > High(FWeapon) then
   begin
     // don't forget to reset queue here!
   if nw > High(FWeapon) then
   begin
     // don't forget to reset queue here!

-    //e_WriteLog(Format(' RealizeCurrentWeapon: WUTAFUUUU?! (%d)', [nw]), TMsgType.Warning);
+    //e_WriteLog(' RealizeCurrentWeapon: WUTAFUUUU', MSG_WARNING);

     resetWeaponQueue();
     exit;
   end;
     resetWeaponQueue();
     exit;
   end;


@@ -4348,6 +4296,7 @@ begin
   FMonsterKills := 0;
   FDeath := 0;
   FSecrets := 0;
   FMonsterKills := 0;
   FDeath := 0;
   FSecrets := 0;

+  FReady := False;

   if FNoRespawn then
   begin
     FSpectator := False;
   if FNoRespawn then
   begin
     FSpectator := False;


@@ -4587,7 +4536,7 @@ begin
 // Âîñêðåøåíèå áåç îðóæèÿ:
   if not FAlive then
   begin
 // Âîñêðåøåíèå áåç îðóæèÿ:
   if not FAlive then
   begin

-    FHealth := PLAYER_HP_SOFT;
+    FHealth := Round(PLAYER_HP_SOFT * (FHandicap / 100));

     FArmor := 0;
     FAlive := True;
     FAir := AIR_DEF;
     FArmor := 0;
     FAlive := True;
     FAir := AIR_DEF;


@@ -4656,6 +4605,7 @@ begin
   FDamageBuffer := 0;
   FJetpack := False;
   FCanJetpack := False;
   FDamageBuffer := 0;
   FJetpack := False;
   FCanJetpack := False;

+  FFlaming := False;

   FFireTime := 0;
   FFirePainTime := 0;
   FFireAttacker := 0;
   FFireTime := 0;
   FFirePainTime := 0;
   FFireAttacker := 0;


@@ -5057,7 +5007,15 @@ begin
     if FKeys[KEY_RIGHT].Pressed then Run(TDirection.D_RIGHT);
     //if FKeys[KEY_NEXTWEAPON].Pressed and AnyServer then NextWeapon();
     //if FKeys[KEY_PREVWEAPON].Pressed and AnyServer then PrevWeapon();
     if FKeys[KEY_RIGHT].Pressed then Run(TDirection.D_RIGHT);
     //if FKeys[KEY_NEXTWEAPON].Pressed and AnyServer then NextWeapon();
     //if FKeys[KEY_PREVWEAPON].Pressed and AnyServer then PrevWeapon();

-    if FKeys[KEY_FIRE].Pressed and AnyServer then Fire();
+    if FKeys[KEY_FIRE].Pressed and AnyServer then Fire()
+    else
+    begin
+      if AnyServer then
+      begin
+        FlamerOff;
+        if NetServer then MH_SEND_PlayerStats(FUID);
+      end;
+    end;

     if FKeys[KEY_OPEN].Pressed and AnyServer then Use();
     if FKeys[KEY_JUMP].Pressed then Jump()
     else
     if FKeys[KEY_OPEN].Pressed and AnyServer then Use();
     if FKeys[KEY_JUMP].Pressed then Jump()
     else


@@ -5318,11 +5276,13 @@ begin
         if FFirePainTime <= 0 then
         begin
           if g_Game_IsServer then
         if FFirePainTime <= 0 then
         begin
           if g_Game_IsServer then

-            Damage(5, FFireAttacker, 0, 0, HIT_FLAME);
+            Damage(6, FFireAttacker, 0, 0, HIT_FLAME);

           FFirePainTime := 18;
         end;
         FFirePainTime := FFirePainTime - 1;
         FFireTime := FFireTime - 1;
           FFirePainTime := 18;
         end;
         FFirePainTime := FFirePainTime - 1;
         FFireTime := FFireTime - 1;

+        if ((FFireTime mod 33) = 0) and (FMegaRulez[MR_INVUL] < gTime) then
+          FModel.PlaySound(MODELSOUND_PAIN, 1, FObj.X, FObj.Y);

         if (FFireTime = 0) and g_Game_IsNet and g_Game_IsServer then
           MH_SEND_PlayerStats(FUID);
       end;
         if (FFireTime = 0) and g_Game_IsNet and g_Game_IsServer then
           MH_SEND_PlayerStats(FUID);
       end;


@@ -5354,7 +5314,7 @@ begin
             else if FHealth > -50 then Kill(K_HARDKILL, FLastSpawnerUID, FLastHit)
               else Kill(K_EXTRAHARDKILL, FLastSpawnerUID, FLastHit);
 
             else if FHealth > -50 then Kill(K_HARDKILL, FLastSpawnerUID, FLastHit)
               else Kill(K_EXTRAHARDKILL, FLastSpawnerUID, FLastHit);
 

-      if FAlive then
+      if FAlive and ((FLastHit <> HIT_FLAME) or (FFireTime <= 0)) then

       begin
         if FDamageBuffer <= 20 then FModel.PlaySound(MODELSOUND_PAIN, 1, FObj.X, FObj.Y)
           else if FDamageBuffer <= 55 then FModel.PlaySound(MODELSOUND_PAIN, 2, FObj.X, FObj.Y)
       begin
         if FDamageBuffer <= 20 then FModel.PlaySound(MODELSOUND_PAIN, 1, FObj.X, FObj.Y)
           else if FDamageBuffer <= 55 then FModel.PlaySound(MODELSOUND_PAIN, 2, FObj.X, FObj.Y)


@@ -5625,6 +5585,7 @@ begin
     WEAPON_FLAMETHROWER:
     begin
       g_Weapon_flame(wx, wy, xd, yd, FUID, WID);
     WEAPON_FLAMETHROWER:
     begin
       g_Weapon_flame(wx, wy, xd, yd, FUID, WID);

+      FlamerOn;

       FFireAngle := FAngle;
       f := True;
     end;
       FFireAngle := FAngle;
       f := True;
     end;


@@ -5681,7 +5642,7 @@ end;
 function TPlayer.GetFlag(Flag: Byte): Boolean;
 var
   s, ts: String;
 function TPlayer.GetFlag(Flag: Byte): Boolean;
 var
   s, ts: String;

-  evtype: Byte;
+  evtype, a: Byte;

 begin
   Result := False;
 
 begin
   Result := False;
 


@@ -5709,6 +5670,16 @@ begin
     g_Map_ResetFlag(FFlag);
     g_Game_Message(Format(_lc[I_MESSAGE_FLAG_CAPTURE], [AnsiUpperCase(s)]), 144);
 
     g_Map_ResetFlag(FFlag);
     g_Game_Message(Format(_lc[I_MESSAGE_FLAG_CAPTURE], [AnsiUpperCase(s)]), 144);
 

+    if ((Self = gPlayer1) or (Self = gPlayer2)
+    or ((gPlayer1 <> nil) and (gPlayer1.Team = FTeam))
+    or ((gPlayer2 <> nil) and (gPlayer2.Team = FTeam))) then
+      a := 0
+    else
+      a := 1;
+
+    if not sound_cap_flag[a].IsPlaying() then
+      sound_cap_flag[a].Play();
+

     gTeamStat[FTeam].Goals := gTeamStat[FTeam].Goals + 1;
 
     Result := True;
     gTeamStat[FTeam].Goals := gTeamStat[FTeam].Goals + 1;
 
     Result := True;


@@ -5740,6 +5711,16 @@ begin
     g_Map_ResetFlag(Flag);
     g_Game_Message(Format(_lc[I_MESSAGE_FLAG_RETURN], [AnsiUpperCase(s)]), 144);
 
     g_Map_ResetFlag(Flag);
     g_Game_Message(Format(_lc[I_MESSAGE_FLAG_RETURN], [AnsiUpperCase(s)]), 144);
 

+    if ((Self = gPlayer1) or (Self = gPlayer2)
+    or ((gPlayer1 <> nil) and (gPlayer1.Team = FTeam))
+    or ((gPlayer2 <> nil) and (gPlayer2.Team = FTeam))) then
+      a := 0
+    else
+      a := 1;
+
+    if not sound_ret_flag[a].IsPlaying() then
+      sound_ret_flag[a].Play();
+

     Result := True;
     if g_Game_IsNet then
     begin
     Result := True;
     if g_Game_IsNet then
     begin


@@ -5767,6 +5748,16 @@ begin
 
     gFlags[Flag].State := FLAG_STATE_CAPTURED;
 
 
     gFlags[Flag].State := FLAG_STATE_CAPTURED;
 

+    if ((Self = gPlayer1) or (Self = gPlayer2)
+    or ((gPlayer1 <> nil) and (gPlayer1.Team = FTeam))
+    or ((gPlayer2 <> nil) and (gPlayer2.Team = FTeam))) then
+      a := 0
+    else
+      a := 1;
+
+    if not sound_get_flag[a].IsPlaying() then
+      sound_get_flag[a].Play();
+

     Result := True;
     if g_Game_IsNet then
     begin
     Result := True;
     if g_Game_IsNet then
     begin


@@ -5783,9 +5774,10 @@ begin
     FModel.SetFlag(FFlag);
 end;
 
     FModel.SetFlag(FFlag);
 end;
 

-function TPlayer.DropFlag(): Boolean;
+function TPlayer.DropFlag(Silent: Boolean = True): Boolean;

 var
   s: String;
 var
   s: String;

+  a: Byte;

 begin
   Result := False;
   if (not g_Game_IsServer) or (FFlag = FLAG_NONE) then
 begin
   Result := False;
   if (not g_Game_IsServer) or (FFlag = FLAG_NONE) then


@@ -5810,6 +5802,16 @@ begin
     g_Console_Add(Format(_lc[I_PLAYER_FLAG_DROP], [FName, s]), True);
     g_Game_Message(Format(_lc[I_MESSAGE_FLAG_DROP], [AnsiUpperCase(s)]), 144);
 
     g_Console_Add(Format(_lc[I_PLAYER_FLAG_DROP], [FName, s]), True);
     g_Game_Message(Format(_lc[I_MESSAGE_FLAG_DROP], [AnsiUpperCase(s)]), 144);
 

+    if ((Self = gPlayer1) or (Self = gPlayer2)
+    or ((gPlayer1 <> nil) and (gPlayer1.Team = FTeam))
+    or ((gPlayer2 <> nil) and (gPlayer2.Team = FTeam))) then
+      a := 0
+    else
+      a := 1;
+
+    if (not Silent) and (not sound_lost_flag[a].IsPlaying()) then
+      sound_lost_flag[a].Play();
+

     if g_Game_IsNet then
       MH_SEND_FlagEvent(FLAG_STATE_DROPPED, Flag, FUID, False);
   end;
     if g_Game_IsNet then
       MH_SEND_FlagEvent(FLAG_STATE_DROPPED, Flag, FUID, False);
   end;


@@ -5819,6 +5821,11 @@ end;
 
 procedure TPlayer.GetSecret();
 begin
 
 procedure TPlayer.GetSecret();
 begin

+  if (self = gPlayer1) or (self = gPlayer2) then
+  begin
+    g_Console_Add(Format(_lc[I_PLAYER_SECRET], [FName]), True);
+    g_Sound_PlayEx('SOUND_GAME_SECRET');
+  end;

   Inc(FSecrets);
 end;
 
   Inc(FSecrets);
 end;
 


@@ -5929,6 +5936,8 @@ begin
   utils.writeInt(st, Byte(b));
   // Çäîðîâüå
   utils.writeInt(st, LongInt(FHealth));
   utils.writeInt(st, Byte(b));
   // Çäîðîâüå
   utils.writeInt(st, LongInt(FHealth));

+  // Êîýôôèöèåíò èíâàëèäíîñòè
+  utils.writeInt(st, LongInt(FHandicap));

   // Æèçíè
   utils.writeInt(st, Byte(FLives));
   // Áðîíÿ
   // Æèçíè
   utils.writeInt(st, Byte(FLives));
   // Áðîíÿ


@@ -6031,6 +6040,8 @@ begin
   if b = 1 then FDirection := TDirection.D_LEFT else FDirection := TDirection.D_RIGHT; // b = 2
   // Çäîðîâüå
   FHealth := utils.readLongInt(st);
   if b = 1 then FDirection := TDirection.D_LEFT else FDirection := TDirection.D_RIGHT; // b = 2
   // Çäîðîâüå
   FHealth := utils.readLongInt(st);

+  // Êîýôôèöèåíò èíâàëèäíîñòè
+  FHandicap := utils.readLongInt(st);

   // Æèçíè
   FLives := utils.readByte(st);
   // Áðîíÿ
   // Æèçíè
   FLives := utils.readByte(st);
   // Áðîíÿ


@@ -6354,6 +6365,12 @@ begin
   FSawSoundIdle.Pause(Enable);
   FSawSoundHit.Pause(Enable);
   FSawSoundSelect.Pause(Enable);
   FSawSoundIdle.Pause(Enable);
   FSawSoundHit.Pause(Enable);
   FSawSoundSelect.Pause(Enable);

+  FFlameSoundOn.Pause(Enable);
+  FFlameSoundOff.Pause(Enable);
+  FFlameSoundWork.Pause(Enable);
+  FJetSoundFly.Pause(Enable);
+  FJetSoundOn.Pause(Enable);
+  FJetSoundOff.Pause(Enable);

 end;
 
 { T C o r p s e : }
 end;
 
 { T C o r p s e : }