Final fixes for GameData.

This commit is contained in:
Ottermandias 2021-07-25 02:45:48 +02:00
parent 702f8e3967
commit ea40d5bc9c
20 changed files with 133 additions and 153 deletions

View file

@ -11,7 +11,7 @@ using Race = Penumbra.GameData.Enums.Race;
namespace Penumbra.GameData
{
internal class ObjectIdentification
internal class ObjectIdentification : IObjectIdentifier
{
private readonly List< (ulong, HashSet< Item >) > _weapons;
private readonly List< (ulong, HashSet< Item >) > _equipment;
@ -267,7 +267,7 @@ namespace Penumbra.GameData
private void IdentifyVfx( IDictionary< string, object? > set, GamePath path )
{
var key = GamePathParser.VfxToKey( path );
var key = GameData.GamePathParser.VfxToKey( path );
if( key.Length == 0 || !_actions.TryGetValue( key, out var actions ) )
{
return;
@ -287,11 +287,18 @@ namespace Penumbra.GameData
}
else
{
var info = GamePathParser.GetFileInfo( path );
var info = GameData.GamePathParser.GetFileInfo( path );
IdentifyParsed( set, info );
}
}
public Dictionary< string, object? > Identify( GamePath path )
{
Dictionary< string, object? > ret = new();
Identify( ret, path );
return ret;
}
public Item? Identify( SetId setId, WeaponType weaponType, ushort variant, EquipSlot slot )
{
switch( slot )
@ -313,4 +320,4 @@ namespace Penumbra.GameData
}
}
}
}
}