diff --git a/src/game/g_player.pas b/src/game/g_player.pas
index 8f4331079506d89ee91e6c0b00d13701ad8c5153..19d6be55027fbad4ea488a2915b2d034f5a464e0 100644 (file)
--- a/src/game/g_player.pas
+++ b/src/game/g_player.pas
function getNextWeaponIndex (): Byte; // return 255 for "no switch"
procedure resetWeaponQueue ();
function hasAmmoForWeapon (weapon: Byte): Boolean;
+ function hasAmmoForShooting (weapon: Byte): Boolean;
function shouldSwitch (weapon: Byte; hadWeapon: Boolean) : Boolean;
procedure doDamage (v: Integer);
procedure g_Bot_AddList(Team: Byte; lname: ShortString; num: Integer = -1; Handicap: Integer = 100);
procedure g_Bot_MixNames();
procedure g_Bot_RemoveAll();
+function g_Bot_GetCount(): Integer;
implementation
begin
if not g_Game_IsServer then Exit;
+// Íå äîáàâëÿåì áîòîâ åñëè ëèìèò óæå äîñòèãíóò
+ if (g_Bot_GetCount() >= gMaxBots) then Exit;
+
// Ñïèñîê íàçâàíèé ìîäåëåé:
m := g_PlayerModel_GetNames();
if m = nil then
begin
if not g_Game_IsServer then Exit;
+// Íå äîáàâëÿåì áîòîâ åñëè ëèìèò óæå äîñòèãíóò
+ if (g_Bot_GetCount() >= gMaxBots) then Exit;
+
// Ñïèñîê íàçâàíèé ìîäåëåé:
m := g_PlayerModel_GetNames();
if m = nil then
Result := Result + 1;
end;
+function g_Bot_GetCount(): Integer;
+var
+ a: Integer;
+begin
+ Result := 0;
+
+ if gPlayers = nil then
+ Exit;
+
+ for a := 0 to High(gPlayers) do
+ if (gPlayers[a] <> nil) and (gPlayers[a] is TBot) then
+ Result := Result + 1;
+end;
+
function g_Player_GetStats(): TPlayerStatArray;
var
a: Integer;
end;
procedure TPlayer.SetWeaponPrefs(Prefs: Array of Byte);
-var i: Integer;
+var
+ i: Integer;
begin
for i := WP_FIRST to WP_LAST + 1 do
begin
- if (Prefs[i] < 0) or (Prefs[i] > WP_LAST + 1) then
+ if (Prefs[i] > WP_LAST + 1) then
FWeapPreferences[i] := 0
- else FWeapPreferences[i] := Prefs[i];
+ else
+ FWeapPreferences[i] := Prefs[i];
end;
end;
procedure TPlayer.SetWeaponPref(Weapon, Pref: Byte);
begin
- if (Weapon < 0) or (Weapon > WP_LAST + 1) then
+ if (Weapon > WP_LAST + 1) then
exit
- else if (Pref >= 0) and (Pref <= WP_LAST + 1) and (Weapon >= 0) and (Weapon <= WP_LAST + 1) then
+ else if (Pref <= WP_LAST + 1) and (Weapon <= WP_LAST + 1) then
FWeapPreferences[Weapon] := Pref
- else if (Weapon >= 0) and (Weapon <= WP_LAST + 1) and ((Pref < 0) or (Pref > WP_LAST + 1)) then
+ else if (Weapon <= WP_LAST + 1) and (Pref > WP_LAST + 1) then
FWeapPreferences[Weapon] := 0;
end;
function TPlayer.GetWeaponPref(Weapon: Byte) : Byte;
begin
- if (Weapon < 0) or (Weapon > WP_LAST + 1) then
+ if (Weapon > WP_LAST + 1) then
result := 0
- else if (FWeapPreferences[Weapon] < 0) or (FWeapPreferences[Weapon] > WP_LAST + 1) then
+ else if (FWeapPreferences[Weapon] > WP_LAST + 1) then
result := 0
else
result := FWeapPreferences[Weapon];
end;
function TPlayer.GetMorePrefered() : Byte;
-var testedWeap, i: Byte;
+var
+ testedWeap, i: Byte;
begin
testedWeap := FCurrWeap;
for i := WP_FIRST to WP_LAST do
- if FWeapon[i] and (FWeapPreferences[i] > FWeapPreferences[testedWeap]) then
+ if FWeapon[i] and maySwitch(i) and (FWeapPreferences[i] > FWeapPreferences[testedWeap]) then
testedWeap := i;
if (R_BERSERK in FRulez) and (FWeapPreferences[WP_LAST + 1] > FWeapPreferences[testedWeap]) then
testedWeap := WEAPON_KASTET;
begin
result := true;
if (Weapon = WEAPON_KASTET) and (FSkipFist <> 0) then
+ begin
if (FSkipFist = 1) and (not (R_BERSERK in FRulez)) then
- result := false
- else if (FSwitchToEmpty = 0) and not hasAmmoForWeapon(Weapon) then
- result := false
+ result := false;
+ end
+ else if (FSwitchToEmpty = 0) and (not hasAmmoForShooting(Weapon)) then
+ result := false;
end;
procedure TPlayer.SwitchTeam;
end;
end;
+function TPlayer.hasAmmoForShooting (weapon: Byte): Boolean;
+begin
+ result := false;
+ case weapon of
+ WEAPON_KASTET, WEAPON_SAW: result := true;
+ WEAPON_SHOTGUN1, WEAPON_SUPERPULEMET: result := (FAmmo[A_SHELLS] > 0);
+ WEAPON_SHOTGUN2: result := (FAmmo[A_SHELLS] > 1);
+ WEAPON_PISTOL, WEAPON_CHAINGUN: result := (FAmmo[A_BULLETS] > 0);
+ WEAPON_ROCKETLAUNCHER: result := (FAmmo[A_ROCKETS] > 0);
+ WEAPON_PLASMA: result := (FAmmo[A_CELLS] > 0);
+ WEAPON_BFG: result := (FAmmo[A_CELLS] >= 40);
+ WEAPON_FLAMETHROWER: result := (FAmmo[A_FUEL] > 0);
+ else result := (weapon < length(FWeapon));
+ end;
+end;
+
function TPlayer.shouldSwitch (weapon: Byte; hadWeapon: Boolean): Boolean;
begin
result := false;
- if (weapon < 0) or (weapon > WP_LAST + 1) then
+ if (weapon > WP_LAST + 1) then
begin
result := false;
exit;
end;
function TPlayer.PickItem(ItemType: Byte; arespawn: Boolean; var remove: Boolean): Boolean;
-
- function allowBerserkSwitching (): Boolean;
- begin
- if (FBFGFireCounter <> -1) then begin result := false; exit; end;
- result := true;
- if gBerserkAutoswitch then exit;
- if not conIsCheatsEnabled then exit;
- result := false;
- end;
-
var
a: Boolean;
- switchWeapon: Byte = -1;
+ switchWeapon: Byte = 255;
hadWeapon: Boolean = False;
begin
Result := False;
if not (R_BERSERK in FRulez) then
begin
Include(FRulez, R_BERSERK);
- if (shouldSwitch(WP_LAST + 1, false)) then
- QueueWeaponSwitch(WEAPON_KASTET);
+ if (FBFGFireCounter = -1) then
+ begin
+ FCurrWeap := WEAPON_KASTET;
+ resetWeaponQueue();
+ FModel.SetWeapon(WEAPON_KASTET);
+ end;
if gFlash <> 0 then
begin
Inc(FPain, 100);
begin
- conRegVar('cheat_berserk_autoswitch', @gBerserkAutoswitch, 'autoswitch to fist when berserk pack taken', '', true, true);
conRegVar('player_indicator', @gPlayerIndicator, 'Draw indicator only for current player, also for teammates, or not at all', 'Draw indicator only for current player, also for teammates, or not at all');
conRegVar('player_indicator_style', @gPlayerIndicatorStyle, 'Visual appearance of indicator', 'Visual appearance of indicator');
end.