X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fgame%2Fg_player.pas;h=22813f1dfac378f0f37af6fa05e0c3e7c9faaa1c;hb=9f9f3134df288e1c3d288fe14ec9a397c663c6f6;hp=f926798cf4b4772defe298bbab189217006c474c;hpb=3b7ef59c450d979b7011cdeaadd6d8e59c34f197;p=d2df-sdl.git diff --git a/src/game/g_player.pas b/src/game/g_player.pas index f926798..22813f1 100644 --- a/src/game/g_player.pas +++ b/src/game/g_player.pas @@ -112,6 +112,7 @@ type Name: String; Team: Byte; Frags: SmallInt; + Assists: SmallInt; Deaths: SmallInt; Lives: Byte; Kills: Word; @@ -160,6 +161,7 @@ type FKills: Integer; FMonsterKills: Integer; FFrags: Integer; + FAssists: Integer; FFragCombo: Byte; FLastFrag: LongWord; FComboEvnt: Integer; @@ -383,6 +385,7 @@ type property Air: Integer read FAir write FAir; property JetFuel: Integer read FJetFuel write FJetFuel; property Frags: Integer read FFrags write FFrags; + property Assists: Integer read FAssists write FAssists; property Death: Integer read FDeath write FDeath; property Kills: Integer read FKills write FKills; property CurrWeap: Byte read FCurrWeap write FCurrWeap; @@ -419,6 +422,7 @@ type property eAir: Integer read FAir write FAir; property eJetFuel: Integer read FJetFuel write FJetFuel; property eFrags: Integer read FFrags write FFrags; + property eAssists: Integer read FAssists write FAssists; property eDeath: Integer read FDeath write FDeath; property eKills: Integer read FKills write FKills; property eCurrWeap: Byte read FCurrWeap write FCurrWeap; @@ -600,6 +604,10 @@ procedure g_Gibs_SetMax(Count: Word); function g_Gibs_GetMax(): Word; procedure g_Corpses_SetMax(Count: Word); function g_Corpses_GetMax(): Word; +procedure g_Force_Model_Set(Mode: Word); +function g_Force_Model_Get(): Word; +procedure g_Forced_Model_SetName(Model: String); +function g_Forced_Model_GetName(): String; procedure g_Shells_SetMax(Count: Word); function g_Shells_GetMax(): Word; @@ -619,7 +627,7 @@ procedure g_Player_ResetAll(Force, Silent: Boolean); function g_Player_Get(UID: Word): TPlayer; function g_Player_GetCount(): Byte; function g_Player_GetStats(): TPlayerStatArray; -function g_Player_ValidName(Name: String): Boolean; +function g_Player_ExistingName(Name: String): Boolean; function g_Player_CreateCorpse(Player: TPlayer): Integer; procedure g_Player_CreateGibs(fX, fY: Integer; ModelName: String; fColor: TRGB); procedure g_Player_CreateShell(fX, fY, dX, dY: Integer; T: Byte); @@ -729,6 +737,8 @@ var MaxGibs: Word = 150; MaxCorpses: Word = 20; MaxShells: Word = 300; + ForceModel: Word = 0; + ForcedModelName: String = STD_PLAYER_MODEL; CurrentGib: Integer = 0; CurrentShell: Integer = 0; BotNames: Array of String; @@ -796,6 +806,26 @@ begin Result := MaxCorpses; end; +procedure g_Force_Model_Set(Mode: Word); +begin + ForceModel := Mode; +end; + +function g_Force_Model_Get(): Word; +begin + Result := ForceModel; +end; + +procedure g_Forced_Model_SetName(Model: String); +begin + ForcedModelName := Model; +end; + +function g_Forced_Model_GetName(): String; +begin + Result := ForcedModelName; +end; + function g_Player_Create(ModelName: String; Color: TRGB; Team: Byte; Bot: Boolean): Word; var a: Integer; @@ -831,6 +861,8 @@ begin gPlayers[a].FActualModelName := ModelName; gPlayers[a].SetModel(ModelName); + if Bot and (g_Force_Model_Get() <> 0) then + gPlayers[a].SetModel(g_Forced_Model_GetName()); // Íåò ìîäåëè - ñîçäàíèå íå âîçìîæíî: if gPlayers[a].FModel = nil then @@ -899,7 +931,11 @@ begin // create entity and load state if Bot then - gPlayers[a] := TBot.Create() + begin + gPlayers[a] := TBot.Create(); + if (g_Force_Model_Get() <> 0) then + gPlayers[a].SetModel(g_Forced_Model_GetName()); + end else gPlayers[a] := TPlayer.Create(); gPlayers[a].FPhysics := True; // ??? @@ -992,7 +1028,7 @@ begin _name := ''; if BotNames <> nil then for a := 0 to High(BotNames) do - if g_Player_ValidName(BotNames[a]) then + if g_Player_ExistingName(BotNames[a]) then begin _name := BotNames[a]; Break; @@ -1064,26 +1100,33 @@ begin Team := BotList[num].team; // CTF / TDM // Âûáèðàåì íàñòðîéêè áîòà èç ñïèñêà ïî íîìåðó èëè èìåíè: - lName := AnsiLowerCase(lName); - if (num < 0) or (num > Length(BotList)-1) then - num := -1; - if (num = -1) and (lName <> '') and (BotList <> nil) then - for a := 0 to High(BotList) do - if AnsiLowerCase(BotList[a].name) = lName then - begin - num := a; - Break; - end; - if num = -1 then - Exit; + if lName = '' then + num := Random(Length(BotList)) + else + begin + if (num < 0) or (num > Length(BotList)-1) then + num := -1; + if (num = -1) and (BotList <> nil) then + lName := AnsiLowerCase(lName); + for a := 0 to High(BotList) do + if AnsiLowerCase(BotList[a].name) = lName then + begin + num := a; + Break; + end; + if num = -1 then + Exit; + end; // Èìÿ áîòà: _name := BotList[num].name; -// Çàíÿòî - âûáèðàåì ñëó÷àéíîå: - if not g_Player_ValidName(_name) then - repeat - _name := Format('DFBOT%.2d', [Random(100)]); - until g_Player_ValidName(_name); + if (_name = '') and (BotNames <> nil) then + for a := 0 to High(BotNames) do + if g_Player_ExistingName(BotNames[a]) then + begin + _name := BotNames[a]; + Break; + end; // Ìîäåëü: _model := BotList[num].model; @@ -1094,7 +1137,10 @@ begin // Ñîçäàåì áîòà: with g_Player_Get(g_Player_Create(_model, BotList[num].color, Team, True)) as TBot do begin - Name := _name; + // Åñëè èìåíè íåò, äåëàåì åãî èç UID áîòà + if _name = '' + then Name := Format('DFBOT%.5d', [UID]) + else Name := _name; FDifficult.DiagFire := BotList[num].diag_fire; FDifficult.InvisFire := BotList[num].invis_fire; @@ -1185,90 +1231,96 @@ var path: AnsiString; begin BotNames := nil; + BotList := nil; path := BOTNAMES_FILENAME; - if e_FindResource(DataDirs, path) = false then - Exit; - -// ×èòàåì âîçìîæíûå èìåíà áîòîâ èç ôàéëà: - AssignFile(F, path); - Reset(F); - - while not EOF(F) do + if e_FindResource(DataDirs, path) then begin - ReadLn(F, s); + // ×èòàåì âîçìîæíûå èìåíà áîòîâ èç ôàéëà: + AssignFile(F, path); + Reset(F); - s := Trim(s); - if s = '' then - Continue; + while not EOF(F) do + begin + ReadLn(F, s); - SetLength(BotNames, Length(BotNames)+1); - BotNames[High(BotNames)] := s; - end; + s := Trim(s); + if s = '' then + Continue; - CloseFile(F); + SetLength(BotNames, Length(BotNames)+1); + BotNames[High(BotNames)] := s; + end; -// Ïåðåìåøèâàåì èõ: - g_Bot_MixNames(); + CloseFile(F); -// ×èòàåì ôàéë ñ ïàðàìåòðàìè áîòîâ: - config := TConfig.CreateFile(path); - BotList := nil; - a := 0; + // Ïåðåìåøèâàåì èõ: + g_Bot_MixNames(); + end; - while config.SectionExists(IntToStr(a)) do + path := BOTLIST_FILENAME; + if e_FindResource(DataDirs, path) then begin - SetLength(BotList, Length(BotList)+1); + // ×èòàåì ôàéë ñ ïàðàìåòðàìè áîòîâ: + config := TConfig.CreateFile(path); + a := 0; - with BotList[High(BotList)] do + while config.SectionExists(IntToStr(a)) do begin - // Èìÿ áîòà: - name := config.ReadStr(IntToStr(a), 'name', ''); - // Ìîäåëü: - model := config.ReadStr(IntToStr(a), 'model', ''); - // Êîìàíäà: - if config.ReadStr(IntToStr(a), 'team', 'red') = 'red' then - team := TEAM_RED - else - team := TEAM_BLUE; - // Öâåò ìîäåëè: - sa := parse(config.ReadStr(IntToStr(a), 'color', '')); - color.R := StrToIntDef(sa[0], 0); - color.G := StrToIntDef(sa[1], 0); - color.B := StrToIntDef(sa[2], 0); - // Âåðîÿòíîñòü ñòðåëüáû ïîä óãëîì: - diag_fire := config.ReadInt(IntToStr(a), 'diag_fire', 0); - // Âåðîÿòíîñòü îòâåòíîãî îãíÿ ïî íåâèäèìîìó ñîïåðíèêó: - invis_fire := config.ReadInt(IntToStr(a), 'invis_fire', 0); - // Òî÷íîñòü ñòðåëüáû ïîä óãëîì: - diag_precision := config.ReadInt(IntToStr(a), 'diag_precision', 0); - // Òî÷íîñòü ñòðåëüáû â ïîëåòå: - fly_precision := config.ReadInt(IntToStr(a), 'fly_precision', 0); - // Òî÷íîñòü óêëîíåíèÿ îò ñíàðÿäîâ: - cover := config.ReadInt(IntToStr(a), 'cover', 0); - // Âåðîÿòíîñòü ïðûæêà ïðè ïðèáëèæåíèè ñîïåðíèêà: - close_jump := config.ReadInt(IntToStr(a), 'close_jump', 0); - // Ïðèîðèòåòû îðóæèÿ äëÿ äàëüíåãî áîÿ: - sa := parse(config.ReadStr(IntToStr(a), 'w_prior1', '')); - if Length(sa) = 10 then - for b := 0 to 9 do - w_prior1[b] := EnsureRange(StrToInt(sa[b]), 0, 9); - // Ïðèîðèòåòû îðóæèÿ äëÿ áëèæíåãî áîÿ: - sa := parse(config.ReadStr(IntToStr(a), 'w_prior2', '')); - if Length(sa) = 10 then - for b := 0 to 9 do - w_prior2[b] := EnsureRange(StrToInt(sa[b]), 0, 9); - - {sa := parse(config.ReadStr(IntToStr(a), 'w_prior3', '')); - if Length(sa) = 10 then - for b := 0 to 9 do - w_prior3[b] := EnsureRange(StrToInt(sa[b]), 0, 9);} + SetLength(BotList, Length(BotList)+1); + + with BotList[High(BotList)] do + begin + name := config.ReadStr(IntToStr(a), 'name', ''); // Èìÿ áîòà + model := config.ReadStr(IntToStr(a), 'model', ''); // Ìîäåëü + + // Êîìàíäà + s := config.ReadStr(IntToStr(a), 'team', ''); + if s = 'red' then + team := TEAM_RED + else if s = 'blue' then + team := TEAM_BLUE + else + team := TEAM_NONE; + + // Öâåò ìîäåëè + sa := parse(config.ReadStr(IntToStr(a), 'color', '')); + SetLength(sa, 3); + color.R := StrToIntDef(sa[0], 0); + color.G := StrToIntDef(sa[1], 0); + color.B := StrToIntDef(sa[2], 0); + + diag_fire := config.ReadInt(IntToStr(a), 'diag_fire', 0); // Âåðîÿòíîñòü ñòðåëüáû ïîä óãëîì + invis_fire := config.ReadInt(IntToStr(a), 'invis_fire', 0); // Âåðîÿòíîñòü îòâåòíîãî îãíÿ ïî íåâèäèìîìó ñîïåðíèêó + diag_precision := config.ReadInt(IntToStr(a), 'diag_precision', 0); // Òî÷íîñòü ñòðåëüáû ïîä óãëîì + fly_precision := config.ReadInt(IntToStr(a), 'fly_precision', 0); // Òî÷íîñòü ñòðåëüáû â ïîëåòå + cover := config.ReadInt(IntToStr(a), 'cover', 0); // Òî÷íîñòü óêëîíåíèÿ îò ñíàðÿäîâ + close_jump := config.ReadInt(IntToStr(a), 'close_jump', 0); // Âåðîÿòíîñòü ïðûæêà ïðè ïðèáëèæåíèè ñîïåðíèêà + + // Ïðèîðèòåòû îðóæèÿ äëÿ äàëüíåãî áîÿ + sa := parse(config.ReadStr(IntToStr(a), 'w_prior1', '')); + if Length(sa) = 10 then + for b := 0 to 9 do + w_prior1[b] := EnsureRange(StrToInt(sa[b]), 0, 9); + + // Ïðèîðèòåòû îðóæèÿ äëÿ áëèæíåãî áîÿ + sa := parse(config.ReadStr(IntToStr(a), 'w_prior2', '')); + if Length(sa) = 10 then + for b := 0 to 9 do + w_prior2[b] := EnsureRange(StrToInt(sa[b]), 0, 9); + + {sa := parse(config.ReadStr(IntToStr(a), 'w_prior3', '')); + if Length(sa) = 10 then + for b := 0 to 9 do + w_prior3[b] := EnsureRange(StrToInt(sa[b]), 0, 9);} + end; + + a += 1; end; - a := a + 1; + config.Free(); end; - config.Free(); SetLength(SavedStates, 0); end; @@ -1449,6 +1501,7 @@ begin Name := gPlayers[a].FName; Team := gPlayers[a].FTeam; Frags := gPlayers[a].FFrags; + Assists := gPlayers[a].FAssists; Deaths := gPlayers[a].FDeath; Kills := gPlayers[a].FKills; Color := gPlayers[a].FModel.Color; @@ -2299,13 +2352,8 @@ begin end; if t = HIT_WATER then - begin - g_GFX_Bubbles(FObj.X+PLAYER_RECT.X+(PLAYER_RECT.Width div 2), - FObj.Y+PLAYER_RECT.Y-4, value div 2, 8, 4); - if Random(2) = 0 - then g_Sound_PlayExAt('SOUND_GAME_BUBBLE1', FObj.X, FObj.Y) - else g_Sound_PlayExAt('SOUND_GAME_BUBBLE2', FObj.X, FObj.Y); - end; + g_Game_Effect_Bubbles(FObj.X+PLAYER_RECT.X+(PLAYER_RECT.Width div 2), + FObj.Y+PLAYER_RECT.Y-4, value div 2, 8, 4); end; // Áóôåð óðîíà: @@ -2736,7 +2784,7 @@ var X, Y, SY, a, p, m: Integer; tw, th: Word; cw, ch: Byte; - s: string; + s, t: string; stat: TPlayerStatArray; begin X := gPlayerScreenSize.X; @@ -2792,10 +2840,12 @@ begin if gShowStat then begin s := IntToStr(Frags); + t := IntToStr(Assists); e_CharFont_GetSize(gMenuFont, s, tw, th); e_CharFont_PrintEx(gMenuFont, X-16-tw, Y, s, _RGB(255, 0, 0)); s := ''; + t := ''; p := 1; m := 0; stat := g_Player_GetStats(); @@ -2811,10 +2861,16 @@ begin end; end; + // FRAGS s := IntToStr(p)+' / '+IntToStr(Length(stat))+' '; if Frags >= m then s := s+'+' else s := s+'-'; s := s+IntToStr(Abs(Frags-m)); + // ASSISTS + t := IntToStr(p)+' / '+IntToStr(Length(stat))+' '; + if Assists >= m then t := t+'+' else t := t+'-'; + t := t+IntToStr(Abs(Assists-m)); + e_CharFont_GetSize(gMenuSmallFont, s, tw, th); e_CharFont_PrintEx(gMenuSmallFont, X-16-tw, Y+32, s, _RGB(255, 0, 0)); end; @@ -3796,6 +3852,31 @@ begin FNextWeapDelay := 0; end; + +// Assists block +{procedure TPlayer.Assist(KillType: Byte; SpawnerUID: Word); +var + DoAssists: Boolean; + AP: TPlayer; + + procedure Accumulate(FDamage: Byte;); + begin + + end; + + +begin + DoAssists := (gGameSettings.GameMode = GM_TDM) or (gGameSettings.GameMode = GM_CTF); + if DoAssists then + begin + if (FAccumulatedDamage >= 65) then + begin + Inc(AP.FAssists); + end; + end; +end;} + + function TPlayer.hasAmmoForWeapon (weapon: Byte): Boolean; begin result := false; @@ -4472,6 +4553,7 @@ begin FNoTarget := False; FNoReload := False; FFrags := 0; + FAssists := 0; FLastFrag := 0; FComboEvnt := -1; FKills := 0; @@ -5376,12 +5458,8 @@ begin FAir := 0; end else if (FAir mod 31 = 0) and not blockmon then - begin - g_GFX_Bubbles(FObj.X+PLAYER_RECT.X+(PLAYER_RECT.Width div 2), FObj.Y+PLAYER_RECT.Y-4, 5+Random(6), 8, 4); - if Random(2) = 0 - then g_Sound_PlayExAt('SOUND_GAME_BUBBLE1', FObj.X, FObj.Y) - else g_Sound_PlayExAt('SOUND_GAME_BUBBLE2', FObj.X, FObj.Y); - end; + g_Game_Effect_Bubbles(FObj.X+PLAYER_RECT.X+(PLAYER_RECT.Width div 2), + FObj.Y+PLAYER_RECT.Y-4, 5+Random(6), 8, 4); end else if FAir < AIR_DEF then FAir := AIR_DEF; @@ -5521,7 +5599,7 @@ begin (y >= 0) and (y <= PLAYER_RECT.Height); end; -function g_Player_ValidName(Name: string): Boolean; +function g_Player_ExistingName(Name: string): Boolean; var a: Integer; begin @@ -6116,6 +6194,8 @@ begin utils.writeInt(st, LongInt(FMonsterKills)); // Ôðàãîâ utils.writeInt(st, LongInt(FFrags)); + // Àññèñòîâ + utils.writeInt(st, LongInt(FAssists)); // Ôðàãîâ ïîäðÿä utils.writeInt(st, Byte(FFragCombo)); // Âðåìÿ ïîñëåäíåãî ôðàãà @@ -6220,6 +6300,8 @@ begin FMonsterKills := utils.readLongInt(st); // Ôðàãîâ FFrags := utils.readLongInt(st); + // Àññèñòîâ + FAssists := utils.readLongInt(st); // Ôðàãîâ ïîäðÿä FFragCombo := utils.readByte(st); // Âðåìÿ ïîñëåäíåãî ôðàãà @@ -6479,11 +6561,8 @@ begin if BodyInLiquid(0, 0) then begin - g_GFX_Bubbles(Obj.X+Obj.Rect.X+(Obj.Rect.Width div 2)+Random(3)-1, - Obj.Y+Obj.Rect.Height+8, 1, 8, 4); - if Random(2) = 0 - then g_Sound_PlayExAt('SOUND_GAME_BUBBLE1', FObj.X, FObj.Y) - else g_Sound_PlayExAt('SOUND_GAME_BUBBLE2', FObj.X, FObj.Y); + g_Game_Effect_Bubbles(Obj.X+Obj.Rect.X+(Obj.Rect.Width div 2)+Random(3)-1, + Obj.Y+Obj.Rect.Height+8, 1, 8, 4); Exit; end;