Skip to content

Commit 3ff9da9

Browse files
committed
Fix species name
1 parent 0795a46 commit 3ff9da9

File tree

5 files changed

+19
-19
lines changed

5 files changed

+19
-19
lines changed
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@
44
namespace GW2Scratch.EVTCAnalytics.Model.Agents;
55

66
/// <summary>
7-
/// Represents the specie of a NPC
7+
/// Represents the species of a NPC
88
/// </summary>
9-
public class Specie(uint id)
9+
public class Species(uint id)
1010
{
1111
/// <summary>
12-
/// The ID of the specie.
12+
/// The ID of the species.
1313
/// </summary>
1414
public uint Id { get; } = id;
1515

1616
/// <summary>
17-
/// The content GUID of this specie stored as 16 bytes.
17+
/// The content GUID of this species stored as 16 bytes.
1818
/// </summary>
1919
public byte[] ContentGuid { get; internal set; }
2020

EVTCAnalytics/Model/Log.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ public class Log
4343
public IReadOnlyList<Marker> Markers { get; }
4444

4545
/// <summary>
46-
/// Provides a list of all <see cref="Specie"/>s that appear in the log.
46+
/// Provides a list of all <see cref="Agents.Species"/>s that appear in the log.
4747
/// </summary>
48-
public IReadOnlyList<Specie> Species { get; }
48+
public IReadOnlyList<Species> Species { get; }
4949

5050
/// <summary>
5151
/// Provides a string with the version of arcdps used to record this log, prefixed with "EVTC".
@@ -188,7 +188,7 @@ internal Log(LogProcessorState state)
188188
/// Creates a new instance of a <see cref="Log"/> without requiring a <see cref="LogProcessorState"/>.
189189
/// </summary>
190190
internal Log(Agent mainTarget, LogType logType, IEnumerable<Event> events, IEnumerable<Agent> agents,
191-
IEnumerable<Skill> skills, IEnumerable<Effect> effects, IEnumerable<Marker> markers, IEnumerable<Specie> species, IEnumerable<LogError> errors, string arcdpsBuild,
191+
IEnumerable<Skill> skills, IEnumerable<Effect> effects, IEnumerable<Marker> markers, IEnumerable<Species> species, IEnumerable<LogError> errors, string arcdpsBuild,
192192
IEncounterData encounterData, GameLanguage gameLanguage, string evtcVersion, LogTime startTime,
193193
LogTime endTime, Player pointOfView, int? language, int? gameBuild, int? gameShardId, int? mapId,
194194
InstanceStart instanceStart, int? fractalScale)
@@ -213,7 +213,7 @@ internal Log(Agent mainTarget, LogType logType, IEnumerable<Event> events, IEnum
213213
Skills = skills as Skill[] ?? skills.ToArray();
214214
Effects = effects as Effect[] ?? effects.ToArray();
215215
Markers = markers as Marker[] ?? markers.ToArray();
216-
Species = species as Specie[] ?? species.ToArray();
216+
Species = species as Species[] ?? species.ToArray();
217217
Errors = errors as LogError[] ?? errors.ToArray();
218218
}
219219
}

EVTCAnalytics/Processing/LogProcessor.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public Log ProcessLog(ParsedLog log)
7979
state.AgentsById = new Dictionary<int, List<Agent>>();
8080
state.EffectsById = new Dictionary<uint, Effect>();
8181
state.MarkersById = new Dictionary<uint, Marker>();
82-
state.SpeciesById = new Dictionary<uint, Specie>();
82+
state.SpeciesById = new Dictionary<uint, Species>();
8383
state.Errors = new List<LogError>();
8484
state.OngoingEffects = new Dictionary<uint, EffectStartEvent>();
8585
foreach (var agent in state.Agents)
@@ -194,7 +194,7 @@ private Log ProcessLog(EVTCParser.SinglePassEVTCReader reader)
194194
state.Errors = new List<LogError>();
195195
state.EffectsById = new Dictionary<uint, Effect>();
196196
state.MarkersById = new Dictionary<uint, Marker>();
197-
state.SpeciesById = new Dictionary<uint, Specie>();
197+
state.SpeciesById = new Dictionary<uint, Species>();
198198
state.OngoingEffects = new Dictionary<uint, EffectStartEvent>();
199199

200200
var combatItemReader = reader.GetCombatItemReader(bossData, state.MainTarget, state.Agents, state.GameBuild, state.LogType, EncounterIdentifier, EncounterDataProvider);
@@ -862,7 +862,7 @@ private void ProcessCombatItem(LogProcessorState state, in ParsedCombatItem item
862862
{
863863
if (!state.SpeciesById.TryGetValue(item.SkillId, out var specie))
864864
{
865-
specie = new Specie(item.SkillId);
865+
specie = new Species(item.SkillId);
866866
state.SpeciesById[item.SkillId] = specie;
867867
}
868868

EVTCAnalytics/Processing/LogProcessorState.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public class LogProcessorState
2020
public Dictionary<uint, Skill> SkillsById { get; set; }
2121
public Dictionary<uint, Effect> EffectsById { get; set; }
2222
public Dictionary<uint, Marker> MarkersById { get; set; }
23-
public Dictionary<uint, Specie> SpeciesById { get; set; }
23+
public Dictionary<uint, Species> SpeciesById { get; set; }
2424
public List<Skill> Skills { get; set; }
2525
public List<Event> Events { get; set; }
2626
public List<LogError> Errors { get; set; }

EVTCInspector/InspectorForm.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public sealed class InspectorForm : Form
5454
private readonly FilterCollection<Marker> markers = new FilterCollection<Marker>();
5555

5656
// Processed species
57-
private readonly FilterCollection<Specie> species = new FilterCollection<Specie>();
57+
private readonly FilterCollection<Species> species = new FilterCollection<Species>();
5858

5959
// Statistics
6060
private readonly PropertyGrid statisticsPropertyGrid = new PropertyGrid();
@@ -103,7 +103,7 @@ public InspectorForm()
103103
processedTabControl.Pages.Add(new TabPage(skillSplitter) {Text = "Skills"});
104104
processedTabControl.Pages.Add(new TabPage(ConstructEffectGridView()) {Text = "Effects"});
105105
processedTabControl.Pages.Add(new TabPage(ConstructMarkerGridView()) {Text = "Markers"});
106-
processedTabControl.Pages.Add(new TabPage(ConstructSpecieGridView()) {Text = "Species"});
106+
processedTabControl.Pages.Add(new TabPage(ConstructSpeciesGridView()) {Text = "Species"});
107107

108108
var statisticsLayout = new DynamicLayout();
109109
statisticsLayout.Add(statisticsPropertyGrid);
@@ -547,23 +547,23 @@ private GridView<Marker> ConstructMarkerGridView()
547547
return grid;
548548
}
549549

550-
private GridView<Specie> ConstructSpecieGridView()
550+
private GridView<Species> ConstructSpeciesGridView()
551551
{
552-
var grid = new GridView<Specie>();
552+
var grid = new GridView<Species>();
553553
grid.Columns.Add(new GridColumn
554554
{
555555
HeaderText = "ID",
556556
DataCell = new TextBoxCell
557557
{
558-
Binding = new DelegateBinding<Specie, string>(x => x.Id.ToString())
558+
Binding = new DelegateBinding<Species, string>(x => x.Id.ToString())
559559
}
560560
});
561561
grid.Columns.Add(new GridColumn
562562
{
563563
HeaderText = "Content GUID",
564564
DataCell = new TextBoxCell
565565
{
566-
Binding = new DelegateBinding<Specie, string>(x => GuidToString(x.ContentGuid))
566+
Binding = new DelegateBinding<Species, string>(x => GuidToString(x.ContentGuid))
567567
},
568568
});
569569

@@ -593,7 +593,7 @@ private GridView<Specie> ConstructSpecieGridView()
593593
grid.ContextMenu = menu;
594594

595595
grid.DataStore = species;
596-
new GridViewSorter<Specie>(grid, species).EnableSorting();
596+
new GridViewSorter<Species>(grid, species).EnableSorting();
597597

598598
return grid;
599599
}

0 commit comments

Comments
 (0)