Deukhoofd/PkmnLibSharp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update to latest version of PkmnLib
Some checks failed
continuous-integration/drone/push Build is failing
Details
continuous-integration/drone Build is passing
Details

Browse Source
This commit is contained in:
Deukhoofd
2022-03-12 10:32:31 +01:00
parent aaad311158
commit cb3d3c74a1
27 changed files with 91 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
PkmnLibSharp/Library/Items/Item.cs
View File

@@ -9,21 +9,24 @@ namespace PkmnLibSharp.Library.Items
private string? _name;
public Item(string name, ItemCategory category, BattleItemCategory battleCategory, int price, string effectName,
EffectParameter[] parameters, string[] flags, byte flingPower)
EffectParameter[] parameters, string battleTriggerEffectName, EffectParameter[] battleTriggerParameters,
string[] flags, byte flingPower)
{
var convertedFlags = flags.Select(x => x.ToPtr()).ToArray().ArrayPtr();
var pars = parameters.Select(x => x.Ptr).ToArray().ArrayPtr();
var p = Pkmnlib.Generated.Item.Construct(name.ToPtr(), (Pkmnlib.ItemCategory) category,
(Pkmnlib.BattleItemCategory) battleCategory, price, effectName.ToPtr(), pars, (ulong) parameters.Length,
convertedFlags, (ulong) flags.Length, flingPower);
var battlePars = battleTriggerParameters.Select(x => x.Ptr).ToArray().ArrayPtr();
var p = Pkmnlib.Generated.Item.Construct(name.ToPtr(), (Pkmnlib.ItemCategory)category,
(Pkmnlib.BattleItemCategory)battleCategory, price, effectName.ToPtr(), pars, (ulong)parameters.Length,
battleTriggerEffectName.ToPtr(), battlePars, (ulong)battleTriggerParameters.Length, convertedFlags,
(ulong)flags.Length, flingPower);
Initialize(p);
}
public string Name => _name ??= Creaturelib.Generated.Item.GetName(Ptr).PtrString()!;
public ItemCategory Category => (ItemCategory) Creaturelib.Generated.Item.GetCategory(Ptr);
public ItemCategory Category => (ItemCategory)Creaturelib.Generated.Item.GetCategory(Ptr);
public BattleItemCategory BattleCategory =>
(BattleItemCategory) Creaturelib.Generated.Item.GetBattleCategory(Ptr);
(BattleItemCategory)Creaturelib.Generated.Item.GetBattleCategory(Ptr);
public int Price => Creaturelib.Generated.Item.GetPrice(Ptr);
public byte FlingPower => Pkmnlib.Generated.Item.GetFlingPower(Ptr);

2
PkmnLibSharp/Library/Items/ItemLibrary.cs
View File

@@ -28,8 +28,8 @@ namespace PkmnLibSharp.Library.Items
public void Delete(string key)
{
Creaturelib.Generated.ItemLibrary.Delete(Ptr, key.ToPtr()).Assert();
_cache.Remove(key);
Creaturelib.Generated.ItemLibrary.Delete(Ptr, key.ToPtr()).Assert();
}
public bool TryGet(string key, out Item? item)

2
PkmnLibSharp/Library/Moves/MoveLibrary.cs
View File

@@ -24,8 +24,8 @@ namespace PkmnLibSharp.Library.Moves
public void Delete(string key)
{
AttackLibrary.Delete(Ptr, key.ToPtr()).Assert();
_cache.Remove(key);
AttackLibrary.Delete(Ptr, key.ToPtr()).Assert();
}
public bool TryGet(string key, out MoveData? move)

2
PkmnLibSharp/Library/SpeciesLibrary.cs
View File

@@ -20,13 +20,13 @@ namespace PkmnLibSharp.Library
public void Delete(string key)
{
Creaturelib.Generated.SpeciesLibrary.Delete(Ptr, key.ToPtr()).Assert();
if (_cache.TryGetValue(key, out var s))
{
_cache.Remove(key);
if (s != null)
_idCache.Remove(s.Id);
}
Creaturelib.Generated.SpeciesLibrary.Delete(Ptr, key.ToPtr()).Assert();
}
public bool TryGet(string key, out Species? species)